Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-04 22:17:01 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

[gps] update gps ublox module to comply with multi gps

Browse Source
This commit is contained in:
Gautier Hattenberger
2016-02-12 21:13:02 +01:00
parent 2d2349f421
commit 664bc8a775
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/modules/gps_ublox.xml
+17 -3
View File
@@ -18,17 +18,31 @@
<!--periodic fun="gps_periodic_check()" freq="1." autorun="TRUE"/--> <!--periodic fun="gps_periodic_check()" freq="1." autorun="TRUE"/-->
<!--event fun="GpsEvent(on_gps_solution)"/--> <!--event fun="GpsEvent(on_gps_solution)"/-->
<makefile target="ap"> <makefile target="ap">
<configure name="UBX_GPS_PORT" default="$(GPS_PORT)" case="upper|lower"/>
<configure name="UBX_GPS_BAUD" default="$(GPS_BAUD)"/>
<file name="gps.c" dir="subsystems"/> <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_GPS"/>
<configure name="GPS_PORT" case="upper|lower"/> <configure name="GPS_PORT" case="upper|lower"/>
<define name="USE_$(GPS_PORT_UPPER)"/> <define name="USE_$(UBX_GPS_PORT_UPPER)"/>
<define name="GPS_LINK" value="$(GPS_PORT_LOWER)"/> <define name="UBX_GPS_LINK" value="$(UBX_GPS_PORT_LOWER)"/>
<define name="$(GPS_PORT_UPPER)_BAUD" value="$(GPS_BAUD)"/> <define name="$(UBX_GPS_PORT_UPPER)_BAUD" value="$(UBX_GPS_BAUD)"/>
<configure name="GPS_LED" default="none"/> <configure name="GPS_LED" default="none"/>
<define name="GPS_LED" value="$(GPS_LED)" cond="ifneq ($(GPS_LED),none)"/> <define name="GPS_LED" value="$(GPS_LED)" cond="ifneq ($(GPS_LED),none)"/>
<raw> <raw>
ifdef SECONDARY_GPS
ifneq (,$(findstring $(SECONDARY_GPS), ublox))
# this is the secondary GPS
ap.CFLAGS += -DGPS_SECONDARY_TYPE_H=\"subsystems/gps/gps_ubx.h\"
ap.CFLAGS += -DSECONDARY_GPS=gps_ubx
else
ap.CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_ubx.h\" ap.CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_ubx.h\"
ap.CFLAGS += -DPRIMARY_GPS=gps_ubx
endif
else
# plain old single GPS usage
ap.CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_ubx.h\"
endif
</raw> </raw>
</makefile> </makefile>
<makefile target="nps"> <makefile target="nps">