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

[gps] fix typo in piksi makefile and add multi gps example

Browse Source
This commit is contained in:
Felix Ruess
2016-02-07 22:17:09 +01:00
parent 34052fb37a
commit e4288d1694
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/examples/quadrotor_lisa_mx.xml
+4 -1
View File
@@ -21,7 +21,6 @@
<subsystem name="radio_control" type="spektrum"> <subsystem name="radio_control" type="spektrum">
<define name="RADIO_MODE" value="RADIO_AUX1"/> <define name="RADIO_MODE" value="RADIO_AUX1"/>
<configure name="USE_SECONDARY_SPEKTRUM_RECEIVER" value="1"/>
</subsystem> </subsystem>
<subsystem name="motor_mixing"/> <subsystem name="motor_mixing"/>
@@ -32,6 +31,10 @@
<subsystem name="telemetry" type="transparent"/> <subsystem name="telemetry" type="transparent"/>
<subsystem name="imu" type="lisa_mx_v2.1"/> <subsystem name="imu" type="lisa_mx_v2.1"/>
<subsystem name="gps" type="ublox"/> <subsystem name="gps" type="ublox"/>
<subsystem name="gps" type="piksi">
<configure name="PIKSI_GPS_PORT" value="UART5"/>
<configure name="SECONDARY_GPS" value="piksi"/>
</subsystem>
<subsystem name="stabilization" type="int_quat"/> <subsystem name="stabilization" type="int_quat"/>
<subsystem name="stabilization" type="rate"/> <subsystem name="stabilization" type="rate"/>
<subsystem name="ahrs" type="float_mlkf"> <subsystem name="ahrs" type="float_mlkf">
conf/firmwares/subsystems/shared/gps_piksi.makefile
+1 -1
View File
@@ -10,7 +10,7 @@ PIKSI_GPS_PORT_LOWER=$(shell echo $(PIKSI_GPS_PORT) | tr A-Z a-z)
ap.CFLAGS += -DUSE_GPS ap.CFLAGS += -DUSE_GPS
ap.CFLAGS += -DUSE_$(PIKSI_GPS_PORT) -D$(PIKSI_GPS_PORT)_BAUD=B115200 ap.CFLAGS += -DUSE_$(PIKSI_GPS_PORT) -D$(PIKSI_GPS_PORT)_BAUD=B115200
ap.CFLAGS += -DPIKSI_GPS_LINK=$PIKSI_(GPS_PORT_LOWER) ap.CFLAGS += -DPIKSI_GPS_LINK=$(PIKSI_GPS_PORT_LOWER)
ifneq ($(GPS_LED),none) ifneq ($(GPS_LED),none)
ap.CFLAGS += -DGPS_LED=$(GPS_LED) ap.CFLAGS += -DGPS_LED=$(GPS_LED)