[paparazzi-commits] [5509] adding a amkefile-free airframe with one target for stm32 and one target for overo

[antoine drouin]

Revision: 5509
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5509
Author:   poine
Date:     2010-08-20 13:50:09 +0000 (Fri, 20 Aug 2010)
Log Message:
-----------
adding a amkefile-free airframe with one target for stm32 and one target for 
overo

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/Poine/booz2_a7.xml
    paparazzi3/trunk/conf/airframes/Poine/booz2_a8.xml
    paparazzi3/trunk/conf/autopilot/lisa_passthrough.makefile

Modified: paparazzi3/trunk/conf/airframes/Poine/booz2_a7.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/Poine/booz2_a7.xml  2010-08-20 13:44:56 UTC 
(rev 5508)
+++ paparazzi3/trunk/conf/airframes/Poine/booz2_a7.xml  2010-08-20 13:50:09 UTC 
(rev 5509)
@@ -178,6 +178,7 @@
     <target name="test_periodic" board="lisa_l_1.0" />
   </firmware>
 
+
  <makefile>
 
 

Modified: paparazzi3/trunk/conf/airframes/Poine/booz2_a8.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/Poine/booz2_a8.xml  2010-08-20 13:44:56 UTC 
(rev 5508)
+++ paparazzi3/trunk/conf/airframes/Poine/booz2_a8.xml  2010-08-20 13:50:09 UTC 
(rev 5509)
@@ -1,6 +1,6 @@
 <!-- this is the biplan equiped with  Lisa/L#XXX, aspirin IMU and asctec V2 
controllers -->
 
-<airframe name="booz2_a7">
+<airframe name="booz2_a8">
 
   <servos min="0" neutral="0" max="0xff">
     <servo name="FRONT"   no="0" min="0" neutral="0" max="255"/>
@@ -180,9 +180,7 @@
 
   </section>
 
-<!-- -->
 
-
  <section name="BAT">
    <define name="MILLIAMP_PER_PERCENT" value="0.86"/>
    <define name="CATASTROPHIC_BAT_LEVEL" value="9.3" unit="V"/>
@@ -190,44 +188,24 @@
  </section>
 
 
- <makefile>
+  <firmware name="lisa_passthrough">
 
+    <target name="stm_passthrough"        board="lisa_l_1.0">
+    </target>
+    <subsystem name="radio_control" type="spektrum">
+      <param name="RADIO_CONTROL_SPEKTRUM_MODEL" 
+             
value="\\\"booz/radio_control/booz_radio_control_spektrum_dx7se.h\\\""/>
+    </subsystem>
 
 
-USER =
-#HOST = 10.31.4.22
-#HOST = overo
-HOST = auto7
-#HOST = 192.168.2.230
-TARGET_DIR = ~
+    <target name="overo_test_passthrough" board="lisa_l_1.0"  >
+      <param name="HOST"          value="auto1"/>
+      <param name="USER"          value=""/>
+      <param name="TARGET_DIR"    value="~"/>
+      <param name="PERIODIC_FREQ" value="512"/>
+    </target>
 
-SRC_FMS=fms
+  </firmware>
 
 
-ARCH=stm32
-ARCHI=stm32
-BOARD_CFG=\"boards/lisa_0.99.h\"
-FLASH_MODE = JTAG
-
-PERIODIC_FREQ = 512
-
-include $(PAPARAZZI_SRC)/conf/autopilot/lisa_test_progs.makefile
-
-
-CONFIG_PASSTHROUGH = 
$(PAPARAZZI_SRC)/conf/autopilot/subsystems/lisa_passthrough
-SERVOS_REFRESH_FREQ=50
-
-include $(PAPARAZZI_SRC)/conf/autopilot/lisa_passthrough.makefile
-
-RADIO_CONTROL_SPEKTRUM_MODEL=\"booz/radio_control/booz_radio_control_spektrum_dx7se.h\"
-include $(CONFIG_PASSTHROUGH)/radio_control_spektrum.makefile
-
-
-#
-# 
-#
-
-
- </makefile>
-
 </airframe>

Modified: paparazzi3/trunk/conf/autopilot/lisa_passthrough.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/lisa_passthrough.makefile   2010-08-20 
13:44:56 UTC (rev 5508)
+++ paparazzi3/trunk/conf/autopilot/lisa_passthrough.makefile   2010-08-20 
13:50:09 UTC (rev 5509)
@@ -4,6 +4,16 @@
 #
 #
 
+SRC_ARCH=$(ARCH)
+SRC_BOOZ=booz
+SRC_BOOZ_ARCH=$(SRC_BOOZ)/arch/$(ARCH)
+SRC_LISA=lisa
+SRC_LISA_ARCH=$(SRC_LISA)/arch/$(ARCH)
+SRC_CSC=csc
+
+CFG_LISA_PASSTHROUGH = 
$(PAPARAZZI_SRC)/conf/autopilot/subsystems/lisa_passthrough
+
+
 stm_passthrough.ARCHDIR = stm32
 stm_passthrough.TARGET = stm_passthrough
 stm_passthrough.TARGETDIR = stm_passthrough
@@ -36,6 +46,7 @@
 
 # IMU
 stm_passthrough.CFLAGS += -DBOOZ_IMU_TYPE_H=\"imu/booz_imu_b2.h\"
+stm_passthrough.CFLAGS += -DIMU_B2_VERSION_1_1
 stm_passthrough.CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_MS2001
 stm_passthrough.srcs += $(SRC_BOOZ)/booz_imu.c
 stm_passthrough.CFLAGS += -DUSE_SPI2 -DUSE_DMA1_C4_IRQ -DUSE_EXTI2_IRQ 
-DUSE_SPI2_IRQ
@@ -91,3 +102,35 @@
 
 # Battery monitor
 
+
+
+
+
+
+
+
+
+#
+#
+#
+#
+# test passthrough , aka using stm32 as io processor
+# this demonstrates
+#   -link with io processor
+#   -periodic event
+#   -telemetry and datalink
+#
+SRC_FMS=fms
+
+overo_test_passthrough.ARCHDIR  = omap
+overo_test_passthrough.LDFLAGS += -levent -lm
+overo_test_passthrough.CFLAGS  += -I$(ACINCLUDE) -I. 
-I$(PAPARAZZI_HOME)/var/include
+overo_test_passthrough.CFLAGS  += -DOVERO_LINK_MSG_UP=AutopilotMessagePTUp 
-DOVERO_LINK_MSG_DOWN=AutopilotMessagePTDown
+overo_test_passthrough.srcs     = $(SRC_FMS)/overo_test_passthrough.c
+overo_test_passthrough.CFLAGS  += -DFMS_PERIODIC_FREQ=512
+overo_test_passthrough.srcs    += $(SRC_FMS)/fms_periodic.c
+overo_test_passthrough.srcs    += $(SRC_FMS)/fms_spi_link.c
+overo_test_passthrough.srcs    += $(SRC_FMS)/fms_gs_com.c
+overo_test_passthrough.CFLAGS  += -DDOWNLINK -DDOWNLINK_TRANSPORT=UdpTransport
+overo_test_passthrough.srcs    += $(SRC_FMS)/udp_transport2.c downlink.c
+overo_test_passthrough.srcs    += $(SRC_FMS)/fms_network.c