Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-30 03:27:33 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

[gps] remove duplicated elements (configured by common gps module)

Browse Source
This commit is contained in:
Gautier Hattenberger
2016-06-16 21:23:52 +02:00
parent 2c12e96e02
commit 21b9d4043b
11 changed files with 0 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/modules/gps_furuno.xml
-5
View File
@@ -8,7 +8,6 @@
</description> </description>
<configure name="FURUNO_GPS_PORT" value="UARTx" description="UART where the GPS is connected to (UART1, UART2, etc"/> <configure name="FURUNO_GPS_PORT" value="UARTx" description="UART where the GPS is connected to (UART1, UART2, etc"/>
<configure name="FURUNO_GPS_BAUD" value="B38400" description="UART baud rate"/> <configure name="FURUNO_GPS_BAUD" value="B38400" description="UART baud rate"/>
<configure name="GPS_LED" value="2" description="LED number to indicate fix or none"/>
</doc> </doc>
<autoload name="gps"/> <autoload name="gps"/>
<autoload name="gps_nps"/> <autoload name="gps_nps"/>
@@ -22,16 +21,12 @@
<makefile target="ap"> <makefile target="ap">
<configure name="FURUNO_GPS_PORT" default="$(GPS_PORT)" case="upper|lower"/> <configure name="FURUNO_GPS_PORT" default="$(GPS_PORT)" case="upper|lower"/>
<configure name="FURUNO_GPS_BAUD" default="$(GPS_BAUD)"/> <configure name="FURUNO_GPS_BAUD" default="$(GPS_BAUD)"/>
<configure name="GPS_LED" default="none"/>
<file name="gps.c" dir="subsystems"/>
<file name="gps_nmea.c" dir="subsystems/gps"/> <file name="gps_nmea.c" dir="subsystems/gps"/>
<define name="USE_GPS"/>
<define name="USE_$(FURUNO_GPS_PORT_UPPER)"/> <define name="USE_$(FURUNO_GPS_PORT_UPPER)"/>
<define name="NMEA_GPS_LINK" value="$(FURUNO_GPS_PORT_LOWER)"/> <define name="NMEA_GPS_LINK" value="$(FURUNO_GPS_PORT_LOWER)"/>
<define name="$(FURUNO_GPS_PORT_UPPER)_BAUD" value="$(FURUNO_GPS_BAUD)"/> <define name="$(FURUNO_GPS_PORT_UPPER)_BAUD" value="$(FURUNO_GPS_BAUD)"/>
<define name="GPS_LED" value="$(GPS_LED)" cond="ifneq ($(GPS_LED),none)"/>
<!-- furuno extension --> <!-- furuno extension -->
<define name="NMEA_PARSE_PROP"/> <define name="NMEA_PARSE_PROP"/>
conf/modules/gps_mediatek_diy.xml
-5
View File
@@ -8,7 +8,6 @@
</description> </description>
<configure name="MTK_GPS_PORT" value="UARTx" description="UART where the GPS is connected to (UART1, UART2, etc"/> <configure name="MTK_GPS_PORT" value="UARTx" description="UART where the GPS is connected to (UART1, UART2, etc"/>
<configure name="MTK_GPS_BAUD" value="B38400" description="UART baud rate"/> <configure name="MTK_GPS_BAUD" value="B38400" description="UART baud rate"/>
<configure name="GPS_LED" value="2" description="LED number to indicate fix or none"/>
</doc> </doc>
<autoload name="gps"/> <autoload name="gps"/>
<autoload name="gps_nps"/> <autoload name="gps_nps"/>
@@ -22,16 +21,12 @@
<makefile target="ap"> <makefile target="ap">
<configure name="MTK_GPS_PORT" default="$(GPS_PORT)" case="upper|lower"/> <configure name="MTK_GPS_PORT" default="$(GPS_PORT)" case="upper|lower"/>
<configure name="MTK_GPS_BAUD" default="$(GPS_BAUD)"/> <configure name="MTK_GPS_BAUD" default="$(GPS_BAUD)"/>
<configure name="GPS_LED" default="none"/>
<file name="gps.c" dir="subsystems"/>
<file name="gps_mtk.c" dir="subsystems/gps"/> <file name="gps_mtk.c" dir="subsystems/gps"/>
<define name="USE_GPS"/>
<define name="USE_$(MTK_GPS_PORT_UPPER)"/> <define name="USE_$(MTK_GPS_PORT_UPPER)"/>
<define name="MTK_GPS_LINK" value="$(MTK_GPS_PORT_LOWER)"/> <define name="MTK_GPS_LINK" value="$(MTK_GPS_PORT_LOWER)"/>
<define name="$(MTK_GPS_PORT_UPPER)_BAUD" value="$(MTK_GPS_BAUD)"/> <define name="$(MTK_GPS_PORT_UPPER)_BAUD" value="$(MTK_GPS_BAUD)"/>
<define name="GPS_LED" value="$(GPS_LED)" cond="ifneq ($(GPS_LED),none)"/>
<raw> <raw>
ifdef SECONDARY_GPS ifdef SECONDARY_GPS
ifneq (,$(findstring $(SECONDARY_GPS), mtk mediatek)) ifneq (,$(findstring $(SECONDARY_GPS), mtk mediatek))
conf/modules/gps_nmea.xml
-5
View File
@@ -8,7 +8,6 @@
</description> </description>
<configure name="NMEA_GPS_PORT" value="UARTx" description="UART where the GPS is connected to (UART1, UART2, etc"/> <configure name="NMEA_GPS_PORT" value="UARTx" description="UART where the GPS is connected to (UART1, UART2, etc"/>
<configure name="NMEA_GPS_BAUD" value="B38400" description="UART baud rate"/> <configure name="NMEA_GPS_BAUD" value="B38400" description="UART baud rate"/>
<configure name="GPS_LED" value="2" description="LED number to indicate fix or none"/>
</doc> </doc>
<autoload name="gps"/> <autoload name="gps"/>
<autoload name="gps_nps"/> <autoload name="gps_nps"/>
@@ -22,16 +21,12 @@
<makefile target="ap"> <makefile target="ap">
<configure name="NMEA_GPS_PORT" default="$(GPS_PORT)" case="upper|lower"/> <configure name="NMEA_GPS_PORT" default="$(GPS_PORT)" case="upper|lower"/>
<configure name="NMEA_GPS_BAUD" default="$(GPS_BAUD)"/> <configure name="NMEA_GPS_BAUD" default="$(GPS_BAUD)"/>
<configure name="GPS_LED" default="none"/>
<file name="gps.c" dir="subsystems"/>
<file name="gps_nmea.c" dir="subsystems/gps"/> <file name="gps_nmea.c" dir="subsystems/gps"/>
<define name="USE_GPS"/>
<define name="USE_$(NMEA_GPS_PORT_UPPER)"/> <define name="USE_$(NMEA_GPS_PORT_UPPER)"/>
<define name="NMEA_GPS_LINK" value="$(NMEA_GPS_PORT_LOWER)"/> <define name="NMEA_GPS_LINK" value="$(NMEA_GPS_PORT_LOWER)"/>
<define name="$(NMEA_GPS_PORT_UPPER)_BAUD" value="$(NMEA_GPS_BAUD)"/> <define name="$(NMEA_GPS_PORT_UPPER)_BAUD" value="$(NMEA_GPS_BAUD)"/>
<define name="GPS_LED" value="$(GPS_LED)" cond="ifneq ($(GPS_LED),none)"/>
<raw> <raw>
ifdef SECONDARY_GPS ifdef SECONDARY_GPS
ifneq (,$(findstring $(SECONDARY_GPS), nmea)) ifneq (,$(findstring $(SECONDARY_GPS), nmea))
conf/modules/gps_nps.xml
-2
View File
@@ -15,9 +15,7 @@
<init fun="gps_nps_init()"/> <init fun="gps_nps_init()"/>
<periodic fun="gps_nps_periodic_check()" freq="1." autorun="TRUE"/> <periodic fun="gps_nps_periodic_check()" freq="1." autorun="TRUE"/>
<makefile target="nps"> <makefile target="nps">
<file name="gps.c" dir="subsystems"/>
<file name="gps_sim_nps.c" dir="subsystems/gps"/> <file name="gps_sim_nps.c" dir="subsystems/gps"/>
<define name="USE_GPS"/>
<define name="GPS_TYPE_H" value="subsystems/gps/gps_sim_nps.h" type="string"/> <define name="GPS_TYPE_H" value="subsystems/gps/gps_sim_nps.h" type="string"/>
</makefile> </makefile>
</module> </module>
conf/modules/gps_piksi.xml
-5
View File
@@ -8,7 +8,6 @@
</description> </description>
<configure name="PIKSI_GPS_PORT" value="UARTx" description="UART where the GPS is connected to (UART1, UART2, etc"/> <configure name="PIKSI_GPS_PORT" value="UARTx" description="UART where the GPS is connected to (UART1, UART2, etc"/>
<configure name="PIKSI_GPS_BAUD" value="B115200" description="UART baud rate"/> <configure name="PIKSI_GPS_BAUD" value="B115200" description="UART baud rate"/>
<configure name="GPS_LED" value="2" description="LED number to indicate fix or none"/>
</doc> </doc>
<autoload name="gps"/> <autoload name="gps"/>
<autoload name="gps_nps"/> <autoload name="gps_nps"/>
@@ -22,19 +21,15 @@
<makefile target="ap"> <makefile target="ap">
<configure name="PIKSI_GPS_PORT" default="$(GPS_PORT)" case="upper|lower"/> <configure name="PIKSI_GPS_PORT" default="$(GPS_PORT)" case="upper|lower"/>
<configure name="PIKSI_GPS_BAUD" default="B115200"/> <configure name="PIKSI_GPS_BAUD" default="B115200"/>
<configure name="GPS_LED" default="none"/>
<file name="gps.c" dir="subsystems"/>
<file name="gps_piksi.c" dir="subsystems/gps"/> <file name="gps_piksi.c" dir="subsystems/gps"/>
<include name="$(PAPARAZZI_SRC)/sw/ext/libsbp/c/include"/> <include name="$(PAPARAZZI_SRC)/sw/ext/libsbp/c/include"/>
<file name="sbp.c" dir="$(PAPARAZZI_SRC)/sw/ext/libsbp/c/src"/> <file name="sbp.c" dir="$(PAPARAZZI_SRC)/sw/ext/libsbp/c/src"/>
<file name="edc.c" dir="$(PAPARAZZI_SRC)/sw/ext/libsbp/c/src"/> <file name="edc.c" dir="$(PAPARAZZI_SRC)/sw/ext/libsbp/c/src"/>
<define name="USE_GPS"/>
<define name="USE_$(PIKSI_GPS_PORT_UPPER)"/> <define name="USE_$(PIKSI_GPS_PORT_UPPER)"/>
<define name="PIKSI_GPS_LINK" value="$(PIKSI_GPS_PORT_LOWER)"/> <define name="PIKSI_GPS_LINK" value="$(PIKSI_GPS_PORT_LOWER)"/>
<define name="$(PIKSI_GPS_PORT_UPPER)_BAUD" value="$(PIKSI_GPS_BAUD)"/> <define name="$(PIKSI_GPS_PORT_UPPER)_BAUD" value="$(PIKSI_GPS_BAUD)"/>
<define name="GPS_LED" value="$(GPS_LED)" cond="ifneq ($(GPS_LED),none)"/>
<raw> <raw>
ifdef SECONDARY_GPS ifdef SECONDARY_GPS
ifneq (,$(findstring $(SECONDARY_GPS), piksi)) ifneq (,$(findstring $(SECONDARY_GPS), piksi))
conf/modules/gps_sim.xml
-2
View File
@@ -14,9 +14,7 @@
<init fun="gps_sim_init()"/> <init fun="gps_sim_init()"/>
<periodic fun="gps_sim_periodic_check()" freq="1." autorun="TRUE"/> <periodic fun="gps_sim_periodic_check()" freq="1." autorun="TRUE"/>
<makefile target="sim"> <makefile target="sim">
<file name="gps.c" dir="subsystems"/>
<file name="gps_sim.c" dir="subsystems/gps"/> <file name="gps_sim.c" dir="subsystems/gps"/>
<define name="USE_GPS"/>
<define name="GPS_TYPE_H" value="subsystems/gps/gps_sim.h" type="string"/> <define name="GPS_TYPE_H" value="subsystems/gps/gps_sim.h" type="string"/>
</makefile> </makefile>
</module> </module>
conf/modules/gps_sim_hitl.xml
-5
View File
@@ -6,7 +6,6 @@
Sim HITL GPS Sim HITL GPS
Simulate GPS for HITL (HardwareInTheLoop) from rotorcrafts horizontal/vertical reference system. Simulate GPS for HITL (HardwareInTheLoop) from rotorcrafts horizontal/vertical reference system.
</description> </description>
<configure name="GPS_LED" value="2" description="LED number to indicate fix or none"/>
</doc> </doc>
<autoload name="gps"/> <autoload name="gps"/>
<autoload name="gps_nps"/> <autoload name="gps_nps"/>
@@ -16,14 +15,10 @@
<init fun="gps_sim_hitl_init()"/> <init fun="gps_sim_hitl_init()"/>
<event fun="gps_sim_hitl_event()"/> <event fun="gps_sim_hitl_event()"/>
<makefile target="ap" firmware="rotorcraft"> <makefile target="ap" firmware="rotorcraft">
<configure name="GPS_LED" default="none"/>
<file name="gps.c" dir="subsystems"/>
<file name="gps_sim_hitl.c" dir="subsystems/gps"/> <file name="gps_sim_hitl.c" dir="subsystems/gps"/>
<define name="HITL"/> <define name="HITL"/>
<define name="USE_GPS"/>
<define name="GPS_LED" value="$(GPS_LED)" cond="ifneq ($(GPS_LED),none)"/>
<define name="GPS_TYPE_H" value="subsystems/gps/gps_sim_hitl.h" type="string"/> <define name="GPS_TYPE_H" value="subsystems/gps/gps_sim_hitl.h" type="string"/>
</makefile> </makefile>
</module> </module>
conf/modules/gps_sirf.xml
-5
View File
@@ -8,7 +8,6 @@
</description> </description>
<configure name="SIRF_GPS_PORT" value="UARTx" description="UART where the GPS is connected to (UART1, UART2, etc"/> <configure name="SIRF_GPS_PORT" value="UARTx" description="UART where the GPS is connected to (UART1, UART2, etc"/>
<configure name="SIRF_GPS_BAUD" value="B38400" description="UART baud rate"/> <configure name="SIRF_GPS_BAUD" value="B38400" description="UART baud rate"/>
<configure name="GPS_LED" value="2" description="LED number to indicate fix or none"/>
</doc> </doc>
<autoload name="gps"/> <autoload name="gps"/>
<autoload name="gps_nps"/> <autoload name="gps_nps"/>
@@ -22,16 +21,12 @@
<makefile target="ap"> <makefile target="ap">
<configure name="SIRF_GPS_PORT" default="$(GPS_PORT)" case="upper|lower"/> <configure name="SIRF_GPS_PORT" default="$(GPS_PORT)" case="upper|lower"/>
<configure name="SIRF_GPS_BAUD" default="$(GPS_BAUD)"/> <configure name="SIRF_GPS_BAUD" default="$(GPS_BAUD)"/>
<configure name="GPS_LED" default="none"/>
<file name="gps.c" dir="subsystems"/>
<file name="gps_sirf.c" dir="subsystems/gps"/> <file name="gps_sirf.c" dir="subsystems/gps"/>
<define name="USE_GPS"/>
<define name="USE_$(SIRF_GPS_PORT_UPPER)"/> <define name="USE_$(SIRF_GPS_PORT_UPPER)"/>
<define name="SIRF_GPS_LINK" value="$(SIRF_GPS_PORT_LOWER)"/> <define name="SIRF_GPS_LINK" value="$(SIRF_GPS_PORT_LOWER)"/>
<define name="$(SIRF_GPS_PORT_UPPER)_BAUD" value="$(SIRF_GPS_BAUD)"/> <define name="$(SIRF_GPS_PORT_UPPER)_BAUD" value="$(SIRF_GPS_BAUD)"/>
<define name="GPS_LED" value="$(GPS_LED)" cond="ifneq ($(GPS_LED),none)"/>
<raw> <raw>
ifdef SECONDARY_GPS ifdef SECONDARY_GPS
ifneq (,$(findstring $(SECONDARY_GPS), sirf)) ifneq (,$(findstring $(SECONDARY_GPS), sirf))
conf/modules/gps_skytraq.xml
-5
View File
@@ -8,7 +8,6 @@
</description> </description>
<configure name="SKYTRAQ_GPS_PORT" value="UARTx" description="UART where the GPS is connected to (UART1, UART2, etc"/> <configure name="SKYTRAQ_GPS_PORT" value="UARTx" description="UART where the GPS is connected to (UART1, UART2, etc"/>
<configure name="SKYTRAQ_GPS_BAUD" value="B38400" description="UART baud rate"/> <configure name="SKYTRAQ_GPS_BAUD" value="B38400" description="UART baud rate"/>
<configure name="GPS_LED" value="2" description="LED number to indicate fix or none"/>
</doc> </doc>
<autoload name="gps"/> <autoload name="gps"/>
<autoload name="gps_nps"/> <autoload name="gps_nps"/>
@@ -22,16 +21,12 @@
<makefile target="ap"> <makefile target="ap">
<configure name="SKYTRAQ_GPS_PORT" default="$(GPS_PORT)" case="upper|lower"/> <configure name="SKYTRAQ_GPS_PORT" default="$(GPS_PORT)" case="upper|lower"/>
<configure name="SKYTRAQ_GPS_BAUD" default="$(GPS_BAUD)"/> <configure name="SKYTRAQ_GPS_BAUD" default="$(GPS_BAUD)"/>
<configure name="GPS_LED" default="none"/>
<file name="gps.c" dir="subsystems"/>
<file name="gps_skytraq.c" dir="subsystems/gps"/> <file name="gps_skytraq.c" dir="subsystems/gps"/>
<define name="USE_GPS"/>
<define name="USE_$(SKYTRAQ_GPS_PORT_UPPER)"/> <define name="USE_$(SKYTRAQ_GPS_PORT_UPPER)"/>
<define name="SKYTRAQ_GPS_LINK" value="$(SKYTRAQ_GPS_PORT_LOWER)"/> <define name="SKYTRAQ_GPS_LINK" value="$(SKYTRAQ_GPS_PORT_LOWER)"/>
<define name="$(SKYTRAQ_GPS_PORT_UPPER)_BAUD" value="$(SKYTRAQ_GPS_BAUD)"/> <define name="$(SKYTRAQ_GPS_PORT_UPPER)_BAUD" value="$(SKYTRAQ_GPS_BAUD)"/>
<define name="GPS_LED" value="$(GPS_LED)" cond="ifneq ($(GPS_LED),none)"/>
<raw> <raw>
ifdef SECONDARY_GPS ifdef SECONDARY_GPS
ifneq (,$(findstring $(SECONDARY_GPS), skytraq)) ifneq (,$(findstring $(SECONDARY_GPS), skytraq))
conf/modules/gps_ublox.xml
-5
View File
@@ -8,7 +8,6 @@
</description> </description>
<configure name="UBX_GPS_PORT" value="UARTx" description="UART where the GPS is connected to (UART1, UART2, etc"/> <configure name="UBX_GPS_PORT" value="UARTx" description="UART where the GPS is connected to (UART1, UART2, etc"/>
<configure name="UBX_GPS_BAUD" value="B38400" description="UART baud rate"/> <configure name="UBX_GPS_BAUD" value="B38400" description="UART baud rate"/>
<configure name="GPS_LED" value="2" description="LED number to indicate fix or none"/>
</doc> </doc>
<autoload name="gps"/> <autoload name="gps"/>
<autoload name="gps_nps"/> <autoload name="gps_nps"/>
@@ -22,16 +21,12 @@
<makefile target="ap"> <makefile target="ap">
<configure name="UBX_GPS_PORT" default="$(GPS_PORT)" case="upper|lower"/> <configure name="UBX_GPS_PORT" default="$(GPS_PORT)" case="upper|lower"/>
<configure name="UBX_GPS_BAUD" default="$(GPS_BAUD)"/> <configure name="UBX_GPS_BAUD" default="$(GPS_BAUD)"/>
<configure name="GPS_LED" default="none"/>
<file name="gps.c" dir="subsystems"/>
<file name="gps_ubx.c" dir="subsystems/gps"/> <file name="gps_ubx.c" dir="subsystems/gps"/>
<define name="USE_GPS"/>
<define name="USE_$(UBX_GPS_PORT_UPPER)"/> <define name="USE_$(UBX_GPS_PORT_UPPER)"/>
<define name="UBX_GPS_LINK" value="$(UBX_GPS_PORT_LOWER)"/> <define name="UBX_GPS_LINK" value="$(UBX_GPS_PORT_LOWER)"/>
<define name="$(UBX_GPS_PORT_UPPER)_BAUD" value="$(UBX_GPS_BAUD)"/> <define name="$(UBX_GPS_PORT_UPPER)_BAUD" value="$(UBX_GPS_BAUD)"/>
<define name="GPS_LED" value="$(GPS_LED)" cond="ifneq ($(GPS_LED),none)"/>
<raw> <raw>
ifdef SECONDARY_GPS ifdef SECONDARY_GPS
ifneq (,$(findstring $(SECONDARY_GPS), ublox)) ifneq (,$(findstring $(SECONDARY_GPS), ublox))
conf/modules/gps_udp.xml
-5
View File
@@ -7,7 +7,6 @@
Read GPS messages from UDP port 7000. Read GPS messages from UDP port 7000.
</description> </description>
<define name="GPS_UDP_HOST" value="192.168.1.2" description="host sending GPS messages"/> <define name="GPS_UDP_HOST" value="192.168.1.2" description="host sending GPS messages"/>
<configure name="GPS_LED" value="2" description="LED number to indicate fix or none"/>
</doc> </doc>
<autoload name="gps"/> <autoload name="gps"/>
<autoload name="gps_nps"/> <autoload name="gps_nps"/>
@@ -18,13 +17,9 @@
<init fun="gps_udp_init()"/> <init fun="gps_udp_init()"/>
<periodic fun="gps_udp_periodic_check()" freq="1." autorun="TRUE"/> <periodic fun="gps_udp_periodic_check()" freq="1." autorun="TRUE"/>
<makefile target="ap"> <makefile target="ap">
<configure name="GPS_LED" default="none"/>
<file name="gps.c" dir="subsystems"/>
<file name="gps_udp.c" dir="subsystems/gps"/> <file name="gps_udp.c" dir="subsystems/gps"/>
<define name="USE_GPS"/>
<define name="GPS_LED" value="$(GPS_LED)" cond="ifneq ($(GPS_LED),none)"/>
<raw> <raw>
ifdef SECONDARY_GPS ifdef SECONDARY_GPS
ifneq (,$(findstring $(SECONDARY_GPS), udp)) ifneq (,$(findstring $(SECONDARY_GPS), udp))