[paparazzi-commits] [5502] not just a tiny 2

[Christophe De Wagter]

Revision: 5502
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5502
Author:   dewagter
Date:     2010-08-20 11:59:02 +0000 (Fri, 20 Aug 2010)
Log Message:
-----------
not just a tiny 2

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml
    paparazzi3/trunk/conf/airframes/microjet_example.xml
    paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/autopilot.makefile
    paparazzi3/trunk/conf/boards/pc.makefile
    paparazzi3/trunk/conf/boards/tiny_0.99.makefile
    paparazzi3/trunk/conf/boards/tiny_1.1.makefile
    paparazzi3/trunk/conf/boards/tiny_2.1.makefile
    paparazzi3/trunk/conf/boards/twog_1.makefile

Modified: paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml        
2010-08-20 11:46:26 UTC (rev 5501)
+++ paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml        
2010-08-20 11:59:02 UTC (rev 5502)
@@ -168,7 +168,6 @@
       <param name="FLASH_MODE"                 value="IAP" />
       <define name="AGR_CLIMB" />
       <define name="LOITER_TRIM" />
-      <define name="WIND_INFO" />
       <define name="TRAFFIC_INFO" />
       <define name="ALT_KALMAN" />
     </target>

Modified: paparazzi3/trunk/conf/airframes/microjet_example.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/microjet_example.xml        2010-08-20 
11:46:26 UTC (rev 5501)
+++ paparazzi3/trunk/conf/airframes/microjet_example.xml        2010-08-20 
11:59:02 UTC (rev 5502)
@@ -160,15 +160,11 @@
   </section>
 
   <firmware name="fixedwing">
-    <target name="sim"                         board="pc" >
-      <define name="TRAFFIC_INFO" />
-    </target>
+    <target name="sim"                         board="pc" />
     <target name="ap"                  board="tiny_2.11">
       <param name="FLASH_MODE"                 value="IAP" />
       <define name="AGR_CLIMB" />
       <define name="LOITER_TRIM" />
-      <define name="WIND_INFO" />
-      <define name="TRAFFIC_INFO" />
       <define name="ALT_KALMAN" />
     </target>
 

Modified: 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/autopilot.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/autopilot.makefile     
2010-08-20 11:46:26 UTC (rev 5501)
+++ paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/autopilot.makefile     
2010-08-20 11:59:02 UTC (rev 5502)
@@ -22,14 +22,17 @@
 #
 #
 
+# All targets need the board config
+$(TARGET).CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 
-sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK 
-DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DLED -DWIND_INFO
+$(TARGET).CFLAGS += -DWIND_INFO -DTRAFFIC_INFO
+
+sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK 
-DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DLED
 sim.srcs += latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c 
infrared.c estimator.c sys_time.c main_fbw.c main_ap.c datalink.c 
$(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c 
$(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/sim_adc_generic.c 
$(SRC_ARCH)/led_hw.c
 
 
 
 ap.CFLAGS += $(FIXEDWING_INC)
-ap.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 ap.srcs    = $(SRC_FIXEDWING)/main.c
 
 ifeq ($(ARCHI), stm32)

Modified: paparazzi3/trunk/conf/boards/pc.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/pc.makefile    2010-08-20 11:46:26 UTC (rev 
5501)
+++ paparazzi3/trunk/conf/boards/pc.makefile    2010-08-20 11:59:02 UTC (rev 
5502)
@@ -14,5 +14,3 @@
 sim.TARGET = autopilot
 sim.TARGETDIR = autopilot
 
-sim.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
-

Modified: paparazzi3/trunk/conf/boards/tiny_0.99.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/tiny_0.99.makefile     2010-08-20 11:46:26 UTC 
(rev 5501)
+++ paparazzi3/trunk/conf/boards/tiny_0.99.makefile     2010-08-20 11:59:02 UTC 
(rev 5502)
@@ -3,3 +3,10 @@
 #
 # http://paparazzi.enac.fr/wiki/Tiny_v0.99
 #
+
+
+include tiny_2.11.makefile
+
+BOARD_CFG = \"tiny_0_99.h\"
+
+

Modified: paparazzi3/trunk/conf/boards/tiny_1.1.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/tiny_1.1.makefile      2010-08-20 11:46:26 UTC 
(rev 5501)
+++ paparazzi3/trunk/conf/boards/tiny_1.1.makefile      2010-08-20 11:59:02 UTC 
(rev 5502)
@@ -3,3 +3,10 @@
 #
 # http://paparazzi.enac.fr/wiki/Tiny_v1.1
 #
+
+
+include tiny_2.11.makefile
+
+BOARD_CFG = \"tiny_1_1.h\"
+
+

Modified: paparazzi3/trunk/conf/boards/tiny_2.1.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/tiny_2.1.makefile      2010-08-20 11:46:26 UTC 
(rev 5501)
+++ paparazzi3/trunk/conf/boards/tiny_2.1.makefile      2010-08-20 11:59:02 UTC 
(rev 5502)
@@ -6,4 +6,7 @@
 
 include tiny_2.11.makefile
 
+BOARD_CFG = \"tiny_2_1.h\"
 
+
+

Modified: paparazzi3/trunk/conf/boards/twog_1.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/twog_1.makefile        2010-08-20 11:46:26 UTC 
(rev 5501)
+++ paparazzi3/trunk/conf/boards/twog_1.makefile        2010-08-20 11:59:02 UTC 
(rev 5502)
@@ -6,4 +6,4 @@
 
 include tiny_2.11.makefile
 
-
+fi