Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-21 11:55:41 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

[modules] move gps from subsystems to modules

Browse Source
This commit is contained in:
Gautier Hattenberger
2021-11-11 00:00:07 +01:00
parent f638a40b83
commit a4632c33ca
125 changed files with 176 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/autopilot/fixedwing_autopilot.xml
+1 -1
View File
@@ -17,7 +17,7 @@
<include name="guidance/guidance_common.h"/>
<include name="guidance/guidance_h.h"/>
<include name="stabilization/stabilization_attitude.h"/>
<include name="subsystems/gps.h"/>
<include name="modules/gps/gps.h"/>
</includes>
<control_block name="actuators_ap">
conf/autopilot/fixedwing_rusty.xml
+1 -1
View File
@@ -18,7 +18,7 @@
<include name="guidance/guidance_common.h"/>
<include name="guidance/guidance_h.h"/>
<include name="stabilization/stabilization_attitude.h"/>
<include name="subsystems/gps.h"/>
<include name="modules/gps/gps.h"/>
<!-- We have to manually include the module's header files, so
we can use the provided functions -->
conf/autopilot/rotorcraft_autopilot.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<include name="guidance.h"/>
<include name="stabilization/stabilization_attitude.h"/>
<include name="modules/radio_control/radio_control.h"/>
<include name="subsystems/gps.h"/>
<include name="modules/gps/gps.h"/>
<include name="subsystems/actuators.h"/>
<include name="subsystems/actuators/motor_mixing.h"/>
<!--define name="MODE_MANUAL" value="AP_MODE_ATTITUDE_DIRECT" cond="ifndef MODE_MANUAL"/>
conf/autopilot/rover.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<include name="generated/airframe.h"/>
<include name="autopilot.h"/>
<include name="autopilot_rc_helpers.h"/>
<include name="subsystems/gps.h"/>
<include name="modules/gps/gps.h"/>
<include name="subsystems/actuators.h"/>
<include name="navigation.h"/>
<include name="guidance/rover_guidance.h"/>
conf/autopilot/rover_holonomic.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<include name="generated/airframe.h"/>
<include name="autopilot.h"/>
<include name="autopilot_rc_helpers.h"/>
<include name="subsystems/gps.h"/>
<include name="modules/gps/gps.h"/>
<include name="subsystems/actuators.h"/>
<include name="navigation.h"/>
<include name="guidance/rover_guidance_holonomic.h"/>
conf/modules/gps.xml
+3 -3
View File
@@ -14,7 +14,7 @@
<settings>
<dl_settings>
<dl_settings name="gps">
<dl_setting MAX="2" MIN="0" STEP="1" values="AUTO|PRIMARY|SECONDARY" module="subsystems/gps" VAR="multi_gps_mode" shortname="multi_mode" param="MULTI_GPS_MODE">
<dl_setting MAX="2" MIN="0" STEP="1" values="AUTO|PRIMARY|SECONDARY" module="modules/gps/gps" VAR="multi_gps_mode" shortname="multi_mode" param="MULTI_GPS_MODE">
<!-- uncomment this if you want strip buttons for the multi GPS modes
<strip_button name="GPS AUTO" icon="gps.png" value="0" group="gps_mode"/>
<strip_button name="GPS PRIMARY" icon="gps1.png" value="1" group="gps_mode_setting"/>
@@ -25,13 +25,13 @@
</settings>
<header>
<file name="gps.h" dir="subsystems"/>
<file name="gps.h"/>
</header>
<init fun="gps_init()"/>
<makefile target="fbw|ap|sim|nps|hitl">
<configure name="GPS_LED" default="none"/>
<file name="gps.c" dir="subsystems"/>
<file name="gps.c"/>
<define name="USE_GPS"/>
<define name="GPS_LED" value="$(GPS_LED)" cond="ifneq ($(GPS_LED),none)"/>
<test>
conf/modules/gps_datalink.xml
+5 -5
View File
@@ -15,7 +15,7 @@
<autoload name="gps_nps"/>
<autoload name="gps_sim"/>
<header>
<file name="gps.h" dir="subsystems"/>
<file name="gps.h"/>
</header>
<init fun="gps_datalink_init()"/>
<periodic fun="gps_datalink_periodic_check()" freq="1." autorun="TRUE"/>
@@ -23,20 +23,20 @@
<datalink message="REMOTE_GPS_SMALL" fun="gps_datalink_parse_REMOTE_GPS_SMALL(buf)"/>
<datalink message="REMOTE_GPS_LOCAL" fun="gps_datalink_parse_REMOTE_GPS_LOCAL(buf)"/>
<makefile target="ap|fbw">
<file name="gps_datalink.c" dir="subsystems/gps"/>
<file name="gps_datalink.c"/>
<raw>
ifdef SECONDARY_GPS
ifneq (,$(findstring $(SECONDARY_GPS), datalink))
# this is the secondary GPS
$(TARGET).CFLAGS += -DGPS_SECONDARY_TYPE_H=\"subsystems/gps/gps_datalink.h\"
$(TARGET).CFLAGS += -DGPS_SECONDARY_TYPE_H=\"modules/gps/gps_datalink.h\"
$(TARGET).CFLAGS += -DSECONDARY_GPS=GPS_DATALINK
else
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_datalink.h\"
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"modules/gps/gps_datalink.h\"
$(TARGET).CFLAGS += -DPRIMARY_GPS=GPS_DATALINK
endif
else
# plain old single GPS usage
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_datalink.h\"
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"modules/gps/gps_datalink.h\"
endif
</raw>
<test firmware="rotorcraft">
conf/modules/gps_furuno.xml
+6 -6
View File
@@ -16,7 +16,7 @@
<autoload name="gps_nps"/>
<autoload name="gps_sim"/>
<header>
<file name="gps.h" dir="subsystems"/>
<file name="gps.h"/>
</header>
<init fun="gps_nmea_init()"/>
<periodic fun="gps_nmea_periodic_check()" freq="1." autorun="TRUE"/>
@@ -25,7 +25,7 @@
<configure name="FURUNO_GPS_PORT" default="$(GPS_PORT)" case="upper|lower"/>
<configure name="FURUNO_GPS_BAUD" default="$(GPS_BAUD)"/>
<file name="gps_nmea.c" dir="subsystems/gps"/>
<file name="gps_nmea.c"/>
<define name="USE_$(FURUNO_GPS_PORT_UPPER)"/>
<define name="NMEA_GPS_LINK" value="$(FURUNO_GPS_PORT_LOWER)"/>
@@ -33,20 +33,20 @@
<!-- furuno extension -->
<define name="NMEA_PARSE_PROP"/>
<file name="gps_furuno.c" dir="subsystems/gps"/>
<file name="gps_furuno.c"/>
<raw>
ifdef SECONDARY_GPS
ifneq (,$(findstring $(SECONDARY_GPS), nmea furuno))
# this is the secondary GPS
$(TARGET).CFLAGS += -DGPS_SECONDARY_TYPE_H=\"subsystems/gps/gps_nmea.h\"
$(TARGET).CFLAGS += -DGPS_SECONDARY_TYPE_H=\"modules/gps/gps_nmea.h\"
$(TARGET).CFLAGS += -DSECONDARY_GPS=GPS_NMEA
else
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_nmea.h\"
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"modules/gps/gps_nmea.h\"
$(TARGET).CFLAGS += -DPRIMARY_GPS=GPS_NMEA
endif
else
# plain old single GPS usage
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_nmea.h\"
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"modules/gps/gps_nmea.h\"
endif
</raw>
<test>
conf/modules/gps_mediatek_diy.xml
+5 -5
View File
@@ -16,7 +16,7 @@
<autoload name="gps_nps"/>
<autoload name="gps_sim"/>
<header>
<file name="gps.h" dir="subsystems"/>
<file name="gps.h"/>
</header>
<init fun="gps_mtk_init()"/>
<periodic fun="gps_mtk_periodic_check()" freq="1." autorun="TRUE"/>
@@ -25,7 +25,7 @@
<configure name="MTK_GPS_PORT" default="$(GPS_PORT)" case="upper|lower"/>
<configure name="MTK_GPS_BAUD" default="$(GPS_BAUD)"/>
<file name="gps_mtk.c" dir="subsystems/gps"/>
<file name="gps_mtk.c"/>
<define name="USE_$(MTK_GPS_PORT_UPPER)"/>
<define name="MTK_GPS_LINK" value="$(MTK_GPS_PORT_LOWER)"/>
@@ -34,15 +34,15 @@
ifdef SECONDARY_GPS
ifneq (,$(findstring $(SECONDARY_GPS), mtk mediatek))
# this is the secondary GPS
$(TARGET).CFLAGS += -DGPS_SECONDARY_TYPE_H=\"subsystems/gps/gps_mtk.h\"
$(TARGET).CFLAGS += -DGPS_SECONDARY_TYPE_H=\"modules/gps/gps_mtk.h\"
$(TARGET).CFLAGS += -DSECONDARY_GPS=GPS_MTK
else
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_mtk.h\"
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"modules/gps/gps_mtk.h\"
$(TARGET).CFLAGS += -DPRIMARY_GPS=GPS_MTK
endif
else
# plain old single GPS usage
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_mtk.h\"
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"modules/gps/gps_mtk.h\"
endif
</raw>
<test>
conf/modules/gps_nmea.xml
+5 -5
View File
@@ -16,7 +16,7 @@
<autoload name="gps_nps"/>
<autoload name="gps_sim"/>
<header>
<file name="gps.h" dir="subsystems"/>
<file name="gps.h"/>
</header>
<init fun="gps_nmea_init()"/>
<periodic fun="gps_nmea_periodic_check()" freq="1." autorun="TRUE"/>
@@ -25,7 +25,7 @@
<configure name="NMEA_GPS_PORT" default="$(GPS_PORT)" case="upper|lower"/>
<configure name="NMEA_GPS_BAUD" default="$(GPS_BAUD)"/>
<file name="gps_nmea.c" dir="subsystems/gps"/>
<file name="gps_nmea.c"/>
<define name="USE_$(NMEA_GPS_PORT_UPPER)"/>
<define name="NMEA_GPS_LINK" value="$(NMEA_GPS_PORT_LOWER)"/>
@@ -34,15 +34,15 @@
ifdef SECONDARY_GPS
ifneq (,$(findstring $(SECONDARY_GPS), nmea))
# this is the secondary GPS
$(TARGET).CFLAGS += -DGPS_SECONDARY_TYPE_H=\"subsystems/gps/gps_nmea.h\"
$(TARGET).CFLAGS += -DGPS_SECONDARY_TYPE_H=\"modules/gps/gps_nmea.h\"
$(TARGET).CFLAGS += -DSECONDARY_GPS=GPS_NMEA
else
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_nmea.h\"
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"modules/gps/gps_nmea.h\"
$(TARGET).CFLAGS += -DPRIMARY_GPS=GPS_NMEA
endif
else
# plain old single GPS usage
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_nmea.h\"
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"modules/gps/gps_nmea.h\"
endif
</raw>
<test>
conf/modules/gps_nps.xml
+3 -3
View File
@@ -13,13 +13,13 @@
<provides>gps</provides>
</dep>
<header>
<file name="gps.h" dir="subsystems"/>
<file name="gps.h"/>
</header>
<init fun="gps_nps_init()"/>
<periodic fun="gps_nps_periodic_check()" freq="1." autorun="TRUE"/>
<makefile target="nps|hitl">
<file name="gps_sim_nps.c" dir="subsystems/gps"/>
<define name="GPS_TYPE_H" value="subsystems/gps/gps_sim_nps.h" type="string"/>
<file name="gps_sim_nps.c"/>
<define name="GPS_TYPE_H" value="modules/gps/gps_sim_nps.h" type="string"/>
<test>
<include name="../simulator/nps"/>
<shell cmd="pkg-config glib-2.0 --cflags"/>
conf/modules/gps_piksi.xml
+5 -5
View File
@@ -16,7 +16,7 @@
<autoload name="gps_nps"/>
<autoload name="gps_sim"/>
<header>
<file name="gps.h" dir="subsystems"/>
<file name="gps.h"/>
</header>
<init fun="gps_piksi_init()"/>
<periodic fun="gps_piksi_periodic_check()" freq="1." autorun="TRUE"/>
@@ -25,7 +25,7 @@
<configure name="PIKSI_GPS_PORT" default="$(GPS_PORT)" case="upper|lower"/>
<configure name="PIKSI_GPS_BAUD" default="B115200"/>
<file name="gps_piksi.c" dir="subsystems/gps"/>
<file name="gps_piksi.c"/>
<include name="../ext/libsbp/c/include"/>
<file name="sbp.c" dir="../ext/libsbp/c/src"/>
<file name="edc.c" dir="../ext/libsbp/c/src"/>
@@ -37,15 +37,15 @@
ifdef SECONDARY_GPS
ifneq (,$(findstring $(SECONDARY_GPS), piksi))
# this is the secondary GPS
$(TARGET).CFLAGS += -DGPS_SECONDARY_TYPE_H=\"subsystems/gps/gps_piksi.h\"
$(TARGET).CFLAGS += -DGPS_SECONDARY_TYPE_H=\"modules/gps/gps_piksi.h\"
$(TARGET).CFLAGS += -DSECONDARY_GPS=GPS_PIKSI
else
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_piksi.h\"
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"modules/gps/gps_piksi.h\"
$(TARGET).CFLAGS += -DPRIMARY_GPS=GPS_PIKSI
endif
else
# plain old single GPS usage
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_piksi.h\"
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"modules/gps/gps_piksi.h\"
endif
</raw>
<test firmware="rotorcraft">
conf/modules/gps_sim.xml
+3 -3
View File
@@ -12,13 +12,13 @@
<provides>gps</provides>
</dep>
<header>
<file name="gps.h" dir="subsystems"/>
<file name="gps.h"/>
</header>
<init fun="gps_sim_init()"/>
<periodic fun="gps_sim_periodic_check()" freq="1." autorun="TRUE"/>
<makefile target="sim">
<file name="gps_sim.c" dir="subsystems/gps"/>
<define name="GPS_TYPE_H" value="subsystems/gps/gps_sim.h" type="string"/>
<file name="gps_sim.c"/>
<define name="GPS_TYPE_H" value="modules/gps/gps_sim.h" type="string"/>
<test/>
</makefile>
</module>
conf/modules/gps_sim_hitl.xml
+3 -3
View File
@@ -13,14 +13,14 @@
</dep>
<autoload name="gps_nps"/>
<header>
<file name="gps.h" dir="subsystems"/>
<file name="gps.h"/>
</header>
<init fun="gps_sim_hitl_init()"/>
<event fun="gps_sim_hitl_event()"/>
<makefile target="ap" firmware="rotorcraft">
<file name="gps_sim_hitl.c" dir="subsystems/gps"/>
<file name="gps_sim_hitl.c"/>
<define name="HITL"/>
<define name="GPS_TYPE_H" value="subsystems/gps/gps_sim_hitl.h" type="string"/>
<define name="GPS_TYPE_H" value="modules/gps/gps_sim_hitl.h" type="string"/>
<test firmware="rotorcraft"/>
</makefile>
</module>
conf/modules/gps_sirf.xml
+5 -5
View File
@@ -16,7 +16,7 @@
<autoload name="gps_nps"/>
<autoload name="gps_sim"/>
<header>
<file name="gps.h" dir="subsystems"/>
<file name="gps.h"/>
</header>
<init fun="gps_sirf_init()"/>
<periodic fun="gps_sirf_periodic_check()" freq="1." autorun="TRUE"/>
@@ -25,7 +25,7 @@
<configure name="SIRF_GPS_PORT" default="$(GPS_PORT)" case="upper|lower"/>
<configure name="SIRF_GPS_BAUD" default="$(GPS_BAUD)"/>
<file name="gps_sirf.c" dir="subsystems/gps"/>
<file name="gps_sirf.c"/>
<define name="USE_$(SIRF_GPS_PORT_UPPER)"/>
<define name="SIRF_GPS_LINK" value="$(SIRF_GPS_PORT_LOWER)"/>
@@ -34,15 +34,15 @@
ifdef SECONDARY_GPS
ifneq (,$(findstring $(SECONDARY_GPS), sirf))
# this is the secondary GPS
$(TARGET).CFLAGS += -DGPS_SECONDARY_TYPE_H=\"subsystems/gps/gps_sirf.h\"
$(TARGET).CFLAGS += -DGPS_SECONDARY_TYPE_H=\"modules/gps/gps_sirf.h\"
$(TARGET).CFLAGS += -DSECONDARY_GPS=GPS_SIRF
else
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_sirf.h\"
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"modules/gps/gps_sirf.h\"
$(TARGET).CFLAGS += -DPRIMARY_GPS=GPS_SIRF
endif
else
# plain old single GPS usage
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_sirf.h\"
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"modules/gps/gps_sirf.h\"
endif
</raw>
<test>
conf/modules/gps_skytraq.xml
+5 -5
View File
@@ -16,7 +16,7 @@
<autoload name="gps_nps"/>
<autoload name="gps_sim"/>
<header>
<file name="gps.h" dir="subsystems"/>
<file name="gps.h"/>
</header>
<init fun="gps_skytraq_init()"/>
<periodic fun="gps_skytraq_periodic_check()" freq="1." autorun="TRUE"/>
@@ -25,7 +25,7 @@
<configure name="SKYTRAQ_GPS_PORT" default="$(GPS_PORT)" case="upper|lower"/>
<configure name="SKYTRAQ_GPS_BAUD" default="$(GPS_BAUD)"/>
<file name="gps_skytraq.c" dir="subsystems/gps"/>
<file name="gps_skytraq.c"/>
<define name="USE_$(SKYTRAQ_GPS_PORT_UPPER)"/>
<define name="SKYTRAQ_GPS_LINK" value="$(SKYTRAQ_GPS_PORT_LOWER)"/>
@@ -34,15 +34,15 @@
ifdef SECONDARY_GPS
ifneq (,$(findstring $(SECONDARY_GPS), skytraq))
# this is the secondary GPS
$(TARGET).CFLAGS += -DGPS_SECONDARY_TYPE_H=\"subsystems/gps/gps_skytraq.h\"
$(TARGET).CFLAGS += -DGPS_SECONDARY_TYPE_H=\"modules/gps/gps_skytraq.h\"
$(TARGET).CFLAGS += -DSECONDARY_GPS=GPS_SKYTRAQ
else
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_skytraq.h\"
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"modules/gps/gps_skytraq.h\"
$(TARGET).CFLAGS += -DPRIMARY_GPS=GPS_SKYTRAQ
endif
else
# plain old single GPS usage
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_skytraq.h\"
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"modules/gps/gps_skytraq.h\"
endif
</raw>
<test>
conf/modules/gps_ublox.xml
+5 -5
View File
@@ -16,7 +16,7 @@
<autoload name="gps_nps"/>
<autoload name="gps_sim"/>
<header>
<file name="gps.h" dir="subsystems"/>
<file name="gps.h"/>
</header>
<init fun="gps_ubx_init()"/>
<periodic fun="gps_ubx_periodic_check()" freq="1." autorun="TRUE"/>
@@ -25,7 +25,7 @@
<configure name="UBX_GPS_PORT" default="$(GPS_PORT)" case="upper|lower"/>
<configure name="UBX_GPS_BAUD" default="$(GPS_BAUD)"/>
<file name="gps_ubx.c" dir="subsystems/gps"/>
<file name="gps_ubx.c"/>
<define name="USE_$(UBX_GPS_PORT_UPPER)"/>
<define name="UBX_GPS_LINK" value="$(UBX_GPS_PORT_LOWER)"/>
@@ -34,15 +34,15 @@
ifdef SECONDARY_GPS
ifneq (,$(findstring $(SECONDARY_GPS), ublox))
# this is the secondary GPS
$(TARGET).CFLAGS += -DGPS_SECONDARY_TYPE_H=\"subsystems/gps/gps_ubx.h\"
$(TARGET).CFLAGS += -DGPS_SECONDARY_TYPE_H=\"modules/gps/gps_ubx.h\"
$(TARGET).CFLAGS += -DSECONDARY_GPS=GPS_UBX
else
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_ubx.h\"
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"modules/gps/gps_ubx.h\"
$(TARGET).CFLAGS += -DPRIMARY_GPS=GPS_UBX
endif
else
# plain old single GPS usage
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_ubx.h\"
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"modules/gps/gps_ubx.h\"
endif
</raw>
<test>
conf/modules/gps_udp.xml
+5 -5
View File
@@ -17,27 +17,27 @@
<autoload name="gps_nps"/>
<autoload name="gps_sim"/>
<header>
<file name="gps.h" dir="subsystems"/>
<file name="gps.h"/>
</header>
<init fun="gps_udp_init()"/>
<periodic fun="gps_udp_periodic_check()" freq="1." autorun="TRUE"/>
<makefile target="ap">
<file name="gps_udp.c" dir="subsystems/gps"/>
<file name="gps_udp.c"/>
<raw>
ifdef SECONDARY_GPS
ifneq (,$(findstring $(SECONDARY_GPS), udp))
# this is the secondary GPS
ap.CFLAGS += -DGPS_SECONDARY_TYPE_H=\"subsystems/gps/gps_udp.h\"
ap.CFLAGS += -DGPS_SECONDARY_TYPE_H=\"modules/gps/gps_udp.h\"
ap.CFLAGS += -DSECONDARY_GPS=GPS_UDP
else
ap.CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_udp.h\"
ap.CFLAGS += -DGPS_TYPE_H=\"modules/gps/gps_udp.h\"
ap.CFLAGS += -DPRIMARY_GPS=GPS_UDP
endif
else
# plain old single GPS usage
ap.CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_udp.h\"
ap.CFLAGS += -DGPS_TYPE_H=\"modules/gps/gps_udp.h\"
endif
</raw>
</makefile>
conf/modules/ins_vectornav.xml
+2 -2
View File
@@ -38,7 +38,7 @@
<file name="ins_vectornav_wrapper.c" dir="subsystems/ins"/>
<define name="INS_TYPE_H" value="subsystems/ins/ins_vectornav_wrapper.h" type="string"/>
<file name="gps.c" dir="subsystems"/>
<file name="gps.c" dir="modules/gps"/>
<define name="USE_GPS"/>
<raw>
ifdef SECONDARY_GPS
@@ -52,7 +52,7 @@
endif
else
# plain old single GPS usage
ap.CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_ubx.h\"
ap.CFLAGS += -DGPS_TYPE_H=\"modules/gps/gps_ubx.h\"
endif
</raw>
<test firmware="fixedwing">
conf/modules/ins_xsens.xml
+1 -1
View File
@@ -34,7 +34,7 @@
<define name="XSENS_OUTPUT_MODE" value="0x1836"/>
<define name="AHRS_TRIGGERED_ATTITUDE_LOOP"/>
<file name="gps.c" dir="subsystems"/>
<file name="gps.c" dir="modules/gps"/>
<define name="USE_GPS"/>
<define name="USE_GPS_XSENS"/>
<define name="USE_GPS_XSENS_RAW_DATA"/>
conf/modules/ins_xsens700.xml
+1 -1
View File
@@ -34,7 +34,7 @@
<define name="XSENS_OUTPUT_MODE" value="0x1836"/>
<define name="AHRS_TRIGGERED_ATTITUDE_LOOP"/>
<file name="gps.c" dir="subsystems"/>
<file name="gps.c" dir="modules/gps"/>
<define name="USE_GPS"/>
<define name="USE_GPS_XSENS"/>
<define name="GPS_NB_CHANNELS" value="50"/>
conf/settings/nps.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<dl_settings NAME="Sim">
<dl_setting var="nps_bypass_ahrs" min="0" step="1" max="1" module="nps/nps_autopilot" shortname="bypass_ahrs" values="No|Yes"/>
<dl_setting var="nps_bypass_ins" min="0" step="1" max="1" module="nps/nps_autopilot" shortname="bypass_ins" values="No|Yes"/>
<dl_setting var="gps_has_fix" min="0" step="1" max="1" module="subsystems/gps/gps_sim_nps" shortname="gps_fix" values="No|Yes"/>
<dl_setting var="gps_has_fix" min="0" step="1" max="1" module="modules/gps/gps_sim_nps" shortname="gps_fix" values="No|Yes"/>
<dl_setting var="datalink_enabled" min="0" step="1" max="1" module="subsystems/datalink/datalink" shortname="datalink" values="OFF|ON"/>
<dl_setting var="nps_electrical.supply_voltage" min="0" step="0.1" max="24" module="nps/nps_electrical" shortname="bat_voltage" unit="V"/>
<dl_setting var="nps_atmosphere.wind_speed" min="0" step="0.1" max="25" module="nps/nps_atmosphere" shortname="wind_speed" unit="m/s" handler="set_wind_speed"/>
conf/settings/rotorcraft_basic_multi.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<strip_button name="POWER OFF" icon="off.png" value="0" group="power_switch"/>
</dl_setting>
<dl_setting var="autopilot.mode" min="0" step="1" max="19" module="autopilot" shortname="mode" values="KILL|Fail|HOME|Rate|Att|Rate_rcC|Att_rcC|Att_C|Rate_Z|Att_Z|Hover|Hover_C|Hover_Z|Nav|RC_D|CareFree|Forward|Module|Flip|Guided" handler="SetModeHandler"/>
<dl_setting var="multi_gps_mode" min="0" step="1" max="2" module="subsystems/gps" shortname="gpsmode" values="AUTO|PRIMARY|SECONDARY">
<dl_setting var="multi_gps_mode" min="0" step="1" max="2" module="modules/gps/gps" shortname="gpsmode" values="AUTO|PRIMARY|SECONDARY">
<strip_button name="AUTO" icon="gps.png" value="0" group="gps_mode"/>
<strip_button name="PRIMARY" icon="gps1.png" value="1" group="gps_mode_setting"/>
<strip_button name="SECONDARY" icon="gps2.png" value="2" group="gps_mode_setting"/>
sw/airborne/arch/sim/sim_ap.c
+1 -1
View File
@@ -12,7 +12,7 @@
#include "std.h"
#include "inter_mcu.h"
#include "autopilot.h"
#include "subsystems/gps.h"
#include "modules/gps/gps.h"
#include "generated/settings.h"
#include "firmwares/fixedwing/nav.h"
#include "firmwares/fixedwing/stabilization/stabilization_attitude.h"
sw/airborne/arch/sim/sim_gps.c
+1 -1
View File
@@ -7,7 +7,7 @@
/** From airborne/autopilot/ */
#include "generated/airframe.h"
#include "generated/flight_plan.h"
#include "subsystems/gps/gps_sim.h"
#include "modules/gps/gps_sim.h"
#include "math/pprz_geodetic_float.h"
#include "math/pprz_geodetic_int.h"
sw/airborne/boards/apogee/baro_board.c
+1 -1
View File
@@ -39,7 +39,7 @@
// sd-log
#if APOGEE_BARO_SDLOG
#include "modules/loggers/sdlog_chibios.h"
#include "subsystems/gps.h"
#include "modules/gps/gps.h"
bool log_apogee_baro_started;
#endif
sw/airborne/boards/bebop/board.c
+1 -1
View File
@@ -31,7 +31,7 @@
#include <unistd.h>
#include "mcu.h"
#include "boards/bebop.h"
#include "subsystems/gps.h"
#include "modules/gps/gps.h"
static int kill_gracefull(char *process_name)
{
sw/airborne/firmwares/fixedwing/autopilot_static.c
+1 -1
View File
@@ -40,7 +40,7 @@
#include "modules/nav/nav_geofence.h"
#if USE_GPS
#include "subsystems/gps.h"
#include "modules/gps/gps.h"
#endif
static bool gps_lost;
sw/airborne/firmwares/fixedwing/fixedwing_datalink.c
+1 -1
View File
@@ -42,7 +42,7 @@
#endif
#ifdef HITL
#include "subsystems/gps.h"
#include "modules/gps/gps.h"
#endif
#define MOfMM(_x) (((float)(_x))/1000.)
sw/airborne/firmwares/fixedwing/nav.c
+1 -1
View File
@@ -35,7 +35,7 @@ static unit_t unit __attribute__((unused));
#include "firmwares/fixedwing/stabilization/stabilization_attitude.h"
#include "autopilot.h"
#include "inter_mcu.h"
#include "subsystems/gps.h"
#include "modules/gps/gps.h"
#include "generated/flight_plan.h"
sw/airborne/firmwares/rotorcraft/autopilot_firmware.c
+1 -1
View File
@@ -37,7 +37,7 @@
#include "modules/radio_control/radio_control.h"
#if USE_GPS
#include "subsystems/gps.h"
#include "modules/gps/gps.h"
#else
#if NO_GPS_NEEDED_FOR_NAV
#define GpsIsLost() FALSE
sw/airborne/firmwares/rotorcraft/autopilot_static.c
+1 -1
View File
@@ -51,7 +51,7 @@
#include "generated/settings.h"
#if USE_GPS
#include "subsystems/gps.h"
#include "modules/gps/gps.h"
#else
#if NO_GPS_NEEDED_FOR_NAV
#define GpsIsLost() FALSE
sw/airborne/firmwares/rotorcraft/navigation.c
+1 -1
View File
@@ -31,7 +31,7 @@
#include "firmwares/rotorcraft/navigation.h"
#include "pprz_debug.h"
#include "subsystems/gps.h" // needed by auto_nav from the flight plan
#include "modules/gps/gps.h" // needed by auto_nav from the flight plan
#include "subsystems/ins.h"
#include "state.h"
sw/airborne/firmwares/rover/autopilot_firmware.c
+1 -1
View File
@@ -35,7 +35,7 @@
#include "modules/radio_control/radio_control.h"
#if USE_GPS
#include "subsystems/gps.h"
#include "modules/gps/gps.h"
#else
#if NO_GPS_NEEDED_FOR_NAV
#define GpsIsLost() FALSE
sw/airborne/firmwares/rover/navigation.c
+1 -1
View File
@@ -30,7 +30,7 @@
#include "firmwares/rover/navigation.h"
#include "pprz_debug.h"
#include "subsystems/gps.h" // needed by auto_nav from the flight plan
#include "modules/gps/gps.h" // needed by auto_nav from the flight plan
#include "subsystems/ins.h"
#include "state.h"
sw/airborne/modules/cam_control/point.c
+1 -1
View File
@@ -77,7 +77,7 @@
#include "autopilot.h"
#include "generated/flight_plan.h"
#include "subsystems/navigation/common_nav.h"
#include "subsystems/gps.h"
#include "modules/gps/gps.h"
#include "math/pprz_geodetic_float.h"
#include "state.h"
sw/airborne/modules/com/generic_com.c
+1 -1
View File
@@ -28,7 +28,7 @@
#include "mcu_periph/i2c.h"
#include "state.h"
#include "subsystems/gps.h"
#include "modules/gps/gps.h"
#include "modules/energy/electrical.h"
#include "generated/airframe.h"
#include "inter_mcu.h"
sw/airborne/modules/computer_vision/lib/exif/exif_module.c
+1 -1
View File
@@ -22,7 +22,7 @@
#include "exif_module.h"
#include "state.h"
#include "subsystems/gps.h"
#include "modules/gps/gps.h"
//////////////////////////////////////////////////////////////
sw/airborne/modules/core/abi_common.h
+2 -2
View File
@@ -32,9 +32,9 @@
#include "std.h"
#include "math/pprz_algebra_int.h"
#include "math/pprz_algebra_float.h"
#include "subsystems/gps.h"
#include "modules/gps/gps.h"
/* Include here headers with structure definition you may want to use with ABI
* Ex: '#include "subsystems/gps.h"' in order to use the GpsState structure
* Ex: '#include "modules/gps/gps.h"' in order to use the GpsState structure
*/
#include "modules/core/abi_sender_ids.h"
sw/airborne/modules/datalink/mavlink.c
+1 -1
View File
@@ -661,7 +661,7 @@ static void mavlink_send_attitude_quaternion(struct transport_tx *trans, struct
}
#if USE_GPS
#include "subsystems/gps.h"
#include "modules/gps/gps.h"
#endif
static void mavlink_send_gps_raw_int(struct transport_tx *trans, struct link_device *dev)
sw/airborne/modules/decawave/dw1000_arduino.c
+1 -1
View File
@@ -31,7 +31,7 @@
#include "subsystems/datalink/downlink.h"
#include "modules/core/abi.h"
#include "modules/decawave/trilateration.h"
#include "subsystems/gps.h"
#include "modules/gps/gps.h"
#include "state.h"
#include "generated/flight_plan.h"
#include "generated/airframe.h"
sw/airborne/modules/digital_cam/dc.c
+1 -1
View File
@@ -96,7 +96,7 @@ uint16_t dc_photo_nr = 0;
#include "pprzlink/messages.h"
#include "subsystems/datalink/downlink.h"
#include "state.h"
#include "subsystems/gps.h"
#include "modules/gps/gps.h"
#if DC_SHOT_EXTRA_DL
#include "modules/datalink/extra_pprz_dl.h"
#endif
sw/airborne/modules/digital_cam/dc.h
+1 -1
View File
@@ -40,7 +40,7 @@
#include "std.h"
#include "state.h"
#include "generated/airframe.h"
#include "subsystems/gps.h"
#include "modules/gps/gps.h"
/** export the number of the last photo */
extern uint16_t dc_photo_nr;
sw/airborne/modules/digital_cam/dc_ctrl_parrot_mykonos.c
+2 -2
View File
@@ -54,7 +54,7 @@
#include "pprzlink/messages.h"
#include "subsystems/datalink/downlink.h"
#include "state.h"
#include "subsystems/gps.h"
#include "modules/gps/gps.h"
#include "subsystems/datalink/telemetry.h" //? or just downlink.h should be enough
@@ -109,7 +109,7 @@ static inline void dc_ctrl_parrot_mykonos_send_shot_position(void)
#if DC_CTRL_PARROT_MYKONOS_LOG
#include "state.h"
#include "subsystems/gps.h"
#include "modules/gps/gps.h"
#endif
struct Dc_Ctrl_Parrot_Mykonos dc_ctrl_parrot_mykonos;
sw/airborne/modules/digital_cam/hackhd.c
+2 -2
View File
@@ -86,7 +86,7 @@ static inline uint16_t pin_of_gpio(uint32_t __attribute__((unused)) port, uint16
#include "pprzlink/messages.h"
#include "subsystems/datalink/downlink.h"
#include "state.h"
#include "subsystems/gps.h"
#include "modules/gps/gps.h"
static inline void hackhd_send_shot_position(void)
{
@@ -117,7 +117,7 @@ static inline void hackhd_send_shot_position(void)
#if HACKHD_LOG
#include "modules/loggers/sdlog_chibios.h"
#include "state.h"
#include "subsystems/gps.h"
#include "modules/gps/gps.h"
static inline void hackhd_log_shot_position(void)
{
sw/airborne/modules/e_identification_fr/e_identification_fr.c
+1 -1
View File
@@ -26,7 +26,7 @@
#include "modules/e_identification_fr/e_identification_fr.h"
#include "state.h"
#include "mcu_periph/uart.h"
#include "subsystems/gps.h"
#include "modules/gps/gps.h"
#include "generated/airframe.h"
#include "generated/flight_plan.h"
sw/airborne/modules/geo_mag/geo_mag.c
+1 -1
View File
@@ -29,7 +29,7 @@
#include "modules/geo_mag/geo_mag.h"
#include "math/pprz_geodetic_wmm2020.h"
#include "math/pprz_algebra_double.h"
#include "subsystems/gps.h"
#include "modules/gps/gps.h"
#include "modules/core/abi.h"
//FIXME: should not be in this spot
sw/airborne/subsystems/gps.c → sw/airborne/modules/gps/gps.c
+1 -1
View File
@@ -38,7 +38,7 @@
*/
#include "modules/core/abi.h"
#include "subsystems/gps.h"
#include "modules/gps/gps.h"
#include "led.h"
#include "modules/core/settings.h"
#include "generated/settings.h"
sw/airborne/subsystems/gps.h → sw/airborne/modules/gps/gps.h
View File
sw/airborne/subsystems/gps/gps_datalink.c → sw/airborne/modules/gps/gps_datalink.c
+1 -1
View File
@@ -30,7 +30,7 @@
#include "generated/flight_plan.h" // reference lla NAV_XXX0
#include "subsystems/gps.h"
#include "modules/gps/gps.h"
#include "modules/core/abi.h"
#include "subsystems/imu.h"
#include "subsystems/datalink/datalink.h"

Some files were not shown because too many files have changed in this diff Show More