[paparazzi-commits] [5148] AirborneCodeReorg/TinyFw

[Christophe De Wagter]

Revision: 5148
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5148
Author:   dewagter
Date:     2010-07-25 18:12:14 +0000 (Sun, 25 Jul 2010)
Log Message:
-----------
AirborneCodeReorg/TinyFw

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml
    paparazzi3/trunk/conf/autopilot/fixedwing_autopilot.makefile

Added Paths:
-----------
    
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing_attitude_infrared.makefile
    
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing_radio_control_ppm.makefile

Modified: paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml        
2010-07-25 16:30:28 UTC (rev 5147)
+++ paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml        
2010-07-25 18:12:14 UTC (rev 5148)
@@ -89,7 +89,7 @@
   </section>
 
   <section name="BAT">
-    <define name="MILLIAMP_AT_FULL_THROTTLE" value="2000"/>
+    <define name="MILLIAMP_AT_FULL_THROTTLE" value="4000"/>
 
     <define name="CATASTROPHIC_BAT_LEVEL" value="9.3" unit="V"/>
   </section>
@@ -174,10 +174,17 @@
 BOARD_CFG=\"tiny_2_1_1.h\"
 FLASH_MODE=IAP
 
+# Board Specifics
 include $(PAPARAZZI_SRC)/conf/autopilot/tiny.makefile
+
+# Fixed Wing Specifics
 include $(PAPARAZZI_SRC)/conf/autopilot/fixedwing_common.makefile
 include $(CFG_FIXEDWING)/fixedwing_autopilot.makefile
+include $(CFG_FIXEDWING)/subsystems/fixedwing_attitude_infrared.makefile
 
+# IO Options
+include $(CFG_FIXEDWING)/subsystems/fixedwing_radio_control_ppm.makefile
+
 GPS_UART=Uart0
 GPS_BAUD=38400
 include $(CFG_FIXEDWING)/subsystems/fixedwing_gps_ublox.makefile
@@ -187,22 +194,19 @@
 include $(CFG_FIXEDWING)/subsystems/fixedwing_telemetry_transparent.makefile
 
 
-ap.CFLAGS += -DRADIO_CONTROL
-ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c  
+# Special options
+ap.CFLAGS += -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN
 
 
+######################################
+# Todo
+
 ap.CFLAGS += -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3
-
-ap.CFLAGS += -DINFRARED -DALT_KALMAN
-ap.srcs += infrared.c 
-
-ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM
-ap.srcs += nav.c fw_h_ctl.c fw_v_ctl.c
-
 ap.CFLAGS += -DGYRO -DADXRS150
 ap.srcs += gyro.c
-ap.srcs += nav_line.c nav_survey_rectangle.c
 
+
+######################################
 # Config for SITL simulation
 include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN 
-DTRAFFIC_INFO

Modified: paparazzi3/trunk/conf/autopilot/fixedwing_autopilot.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/fixedwing_autopilot.makefile        
2010-07-25 16:30:28 UTC (rev 5147)
+++ paparazzi3/trunk/conf/autopilot/fixedwing_autopilot.makefile        
2010-07-25 18:12:14 UTC (rev 5148)
@@ -77,7 +77,9 @@
 ap.CFLAGS += -DAP
 ap.srcs += $(SRC_FIXEDWING)/main_ap.c
 ap.srcs += $(SRC_FIXEDWING)/estimator.c
-
+ap.CFLAGS += -DNAV
+ap.srcs += $(SRC_FIXEDWING)/nav.c $(SRC_FIXEDWING)/fw_h_ctl.c 
$(SRC_FIXEDWING)/fw_v_ctl.c
+ap.srcs += $(SRC_FIXEDWING)/nav_survey_rectangle.c $(SRC_FIXEDWING)/nav_line.c
 #
 # InterMCU Commands
 #

Added: 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing_attitude_infrared.makefile
===================================================================
--- 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing_attitude_infrared.makefile 
                            (rev 0)
+++ 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing_attitude_infrared.makefile 
    2010-07-25 18:12:14 UTC (rev 5148)
@@ -0,0 +1,5 @@
+
+ap.CFLAGS += -DINFRARED
+ap.srcs += $(SRC_FIXEDWING)/infrared.c 
+
+

Added: 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing_radio_control_ppm.makefile
===================================================================
--- 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing_radio_control_ppm.makefile 
                            (rev 0)
+++ 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing_radio_control_ppm.makefile 
    2010-07-25 18:12:14 UTC (rev 5148)
@@ -0,0 +1,5 @@
+
+ap.CFLAGS += -DRADIO_CONTROL
+ap.srcs += $(SRC_FIXEDWING)/radio_control.c $(SRC_ARCH)/ppm_hw.c  
+
+