[paparazzi-commits] [5649] remove need to use navigation subsystem AND navigatin extra subsystem

[Felix Ruess]

Revision: 5649
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5649
Author:   flixr
Date:     2010-08-24 10:14:49 +0000 (Tue, 24 Aug 2010)
Log Message:
-----------
remove need to use navigation subsystem AND navigatin extra subsystem

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/mentor_tum.xml
    paparazzi3/trunk/conf/autopilot/fixedwing.xml
    
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/navigation_extra.makefile

Modified: paparazzi3/trunk/conf/airframes/mentor_tum.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/mentor_tum.xml      2010-08-24 10:07:37 UTC 
(rev 5648)
+++ paparazzi3/trunk/conf/airframes/mentor_tum.xml      2010-08-24 10:14:49 UTC 
(rev 5649)
@@ -30,7 +30,6 @@
     <subsystem name="actuators" type="4017"/>
     <subsystem name="attitude" type="infrared"/>
     <subsystem name="gps" type="ublox_lea5h"/>
-    <subsystem name="navigation"/>
     <subsystem name="navigation" type="extra"/>
   </firmware>
 

Modified: paparazzi3/trunk/conf/autopilot/fixedwing.xml
===================================================================
--- paparazzi3/trunk/conf/autopilot/fixedwing.xml       2010-08-24 10:07:37 UTC 
(rev 5648)
+++ paparazzi3/trunk/conf/autopilot/fixedwing.xml       2010-08-24 10:14:49 UTC 
(rev 5649)
@@ -42,8 +42,7 @@
    <param name="GPS_BAUD"       values="B9600|B38400|B57600|B115200"/>
  </subsystem>
  <subsystem name="airspeed"     types="ets"/>
- <subsystem name="navigation"   types="NONE"/>
- <subsystem name="navigation"   types="extra"/>
+ <subsystem name="navigation"   types="NONE|extra"/>
  <subsystem name="joystick"     types="NONE"/>
  <subsystem name="payload"      types="hum_baro"/>
 

Modified: 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/navigation_extra.makefile
===================================================================
--- 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/navigation_extra.makefile  
    2010-08-24 10:07:37 UTC (rev 5648)
+++ 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/navigation_extra.makefile  
    2010-08-24 10:14:49 UTC (rev 5649)
@@ -1,8 +1,13 @@
-# extra fixed wing navigation
+# standard and extra fixed wing navigation
 
 
 #add these to all targets
 
+$(TARGET).CFLAGS += -DNAV
+$(TARGET).srcs += $(SRC_FIXEDWING)/nav.c $(SRC_FIXEDWING)/fw_h_ctl.c 
$(SRC_FIXEDWING)/fw_v_ctl.c
+$(TARGET).srcs += $(SRC_FIXEDWING)/traffic_info.c
+$(TARGET).srcs += $(SRC_FIXEDWING)/nav_survey_rectangle.c 
$(SRC_FIXEDWING)/nav_line.c
+
 $(TARGET).srcs += $(SRC_FIXEDWING)/nav_cube.c
 $(TARGET).srcs += $(SRC_FIXEDWING)/discsurvey.c
 $(TARGET).srcs += $(SRC_FIXEDWING)/OSAMNav.c