Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-05 23:49:00 +08:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

[conf] deprecate navigation type="extra" subsystem

Browse Source
This commit is contained in:
Felix Ruess
2013-08-28 13:38:08 +02:00
parent fe3e8baf1c
commit 7881f20b4c
9 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/CDW/DualBoardApFbw.xml
+2 -2
View File
@@ -248,7 +248,7 @@
</subsystem> </subsystem>
<subsystem name="control"/> <subsystem name="control"/>
<subsystem name="navigation" type="extra"/> <subsystem name="navigation"/>
</target> </target>
<target name="fbw" board="lisa_m_2.0"> <target name="fbw" board="lisa_m_2.0">
@@ -271,7 +271,7 @@
<target name="sim" board="pc"> <target name="sim" board="pc">
<subsystem name="radio_control" type="ppm"/> <subsystem name="radio_control" type="ppm"/>
<subsystem name="control"/> <subsystem name="control"/>
<subsystem name="navigation" type="extra"/> <subsystem name="navigation"/>
</target> </target>
<configure name="FLASH_MODE" value="JTAG"/> <configure name="FLASH_MODE" value="JTAG"/>
conf/airframes/CDW/classix.xml
+2 -2
View File
@@ -189,7 +189,7 @@
<define name="ADC_6" value="AdcBank0\(3\)"/> <define name="ADC_6" value="AdcBank0\(3\)"/>
<subsystem name="control"/> <subsystem name="control"/>
<subsystem name="navigation" type="extra"/> <subsystem name="navigation"/>
</target> </target>
<target name="fbw" board="classix"> <target name="fbw" board="classix">
@@ -206,7 +206,7 @@
<target name="sim" board="pc"> <target name="sim" board="pc">
<subsystem name="radio_control" type="ppm"/> <subsystem name="radio_control" type="ppm"/>
<subsystem name="control"/> <subsystem name="control"/>
<subsystem name="navigation" type="extra"/> <subsystem name="navigation"/>
</target> </target>
<define name="DC_IMAGE_BUFFER" value="65000" /> <define name="DC_IMAGE_BUFFER" value="65000" />
conf/airframes/examples/Twinstar_energyadaptive.xml
+2 -1
View File
@@ -41,7 +41,7 @@ twog_1.0 + aspirin + ETS baro + ETS speed
<subsystem name="ahrs" type="int_cmpl_quat"/> <subsystem name="ahrs" type="int_cmpl_quat"/>
<subsystem name="ins" type="alt_float"/> <subsystem name="ins" type="alt_float"/>
<subsystem name="control" type="energyadaptive"/> <subsystem name="control" type="energyadaptive"/>
<subsystem name="navigation" type="extra"/> <subsystem name="navigation"/>
</firmware> </firmware>
<modules> <modules>
@@ -60,6 +60,7 @@ twog_1.0 + aspirin + ETS baro + ETS speed
<load name="digital_cam.xml"> <load name="digital_cam.xml">
<define name="DC_SHUTTER_LED" value="5"/><!-- led4:aux led5:camsw--> <define name="DC_SHUTTER_LED" value="5"/><!-- led4:aux led5:camsw-->
</load> </load>
<load name="nav_survey_poly_adv.xml"/>
</modules> </modules>
<!-- ################################################## --> <!-- ################################################## -->
conf/airframes/examples/easystar_ets.xml
+1 -1
View File
@@ -25,7 +25,7 @@
<subsystem name="control"/> <subsystem name="control"/>
<subsystem name="ahrs" type="infrared"/> <subsystem name="ahrs" type="infrared"/>
<subsystem name="gps" type="ublox"/> <subsystem name="gps" type="ublox"/>
<subsystem name="navigation" type="extra"/> <subsystem name="navigation"/>
<subsystem name="ins" type="alt_float"/> <subsystem name="ins" type="alt_float"/>
</firmware> </firmware>
conf/airframes/examples/funjet_cam.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<subsystem name="ahrs" type="infrared"/> <subsystem name="ahrs" type="infrared"/>
<subsystem name="gps" type="ublox"/> <subsystem name="gps" type="ublox"/>
<subsystem name="ins" type="gps_passthrough"/> <subsystem name="ins" type="gps_passthrough"/>
<subsystem name="navigation" type="extra"/> <subsystem name="navigation"/>
</firmware> </firmware>
conf/airframes/examples/separate_fbw_ap.xml
+1 -1
View File
@@ -292,7 +292,7 @@
<!-- Actuators --> <!-- Actuators -->
<subsystem name="control"/> <subsystem name="control"/>
<!-- Sensors --> <!-- Sensors -->
<subsystem name="navigation" type="extra"/> <subsystem name="navigation"/>
<subsystem name="gps" type="ublox"> <subsystem name="gps" type="ublox">
<configure name="GPS_PORT" value="UART1"/> <configure name="GPS_PORT" value="UART1"/>
</subsystem> </subsystem>
conf/airframes/flixr_discovery.xml
+1 -1
View File
@@ -34,7 +34,7 @@
<!-- Control --> <!-- Control -->
<subsystem name="control" type="new"/> <subsystem name="control" type="new"/>
<subsystem name="navigation" type="extra"/> <subsystem name="navigation"/>
<subsystem name="ahrs" type="int_cmpl_quat"> <subsystem name="ahrs" type="int_cmpl_quat">
<configure name="USE_MAGNETOMETER" value="0"/> <configure name="USE_MAGNETOMETER" value="0"/>
conf/airframes/obsolete/mentor_tum.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<subsystem name="control"/> <subsystem name="control"/>
<subsystem name="ahrs" type="infrared"/> <subsystem name="ahrs" type="infrared"/>
<subsystem name="gps" type="ublox"/> <subsystem name="gps" type="ublox"/>
<subsystem name="navigation" type="extra"/> <subsystem name="navigation"/>
<subsystem name="ins" type="alt_float"/> <subsystem name="ins" type="alt_float"/>
</firmware> </firmware>
conf/firmwares/subsystems/fixedwing/navigation_extra.makefile
+3 -9
View File
@@ -1,13 +1,7 @@
# Hey Emacs, this is a -*- makefile -*- include $(CFG_FIXEDWING)/navigation.makefile
# standard and extra fixed wing navigation $(warning Warning: Extra navigation routines have been converted to modules.)
$(info Please replace <subsystem name="navigation" type="extra"/> with <subsystem name="navigation"/>)
#add these to all targets
$(TARGET).CFLAGS += -DNAV
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/nav.c
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/common_flight_plan.c
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/traffic_info.c
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/nav_survey_rectangle.c