GPS: update submodule & account for changed interface

7 years ago · 3239118eca
4 changed files with 7 additions and 1 deletions
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@ -642,6 +642,8 @@ HEADERS += \
				@@ -642,6 +642,8 @@ HEADERS += \
    src/AnalyzeView/GeoTagController.h \
    src/AnalyzeView/MavlinkConsoleController.h \
    src/GPS/Drivers/src/gps_helper.h \
+    src/GPS/Drivers/src/rtcm.h \
+    src/GPS/Drivers/src/ashtech.h \
    src/GPS/Drivers/src/ubx.h \
    src/GPS/GPSManager.h \
    src/GPS/GPSPositionMessage.h \
@ -823,6 +825,8 @@ SOURCES += \
				@@ -823,6 +825,8 @@ SOURCES += \
    src/AnalyzeView/GeoTagController.cc \
    src/AnalyzeView/MavlinkConsoleController.cc \
    src/GPS/Drivers/src/gps_helper.cpp \
+    src/GPS/Drivers/src/rtcm.cpp \
+    src/GPS/Drivers/src/ashtech.cpp \
    src/GPS/Drivers/src/ubx.cpp \
    src/GPS/GPSManager.cc \
    src/GPS/GPSProvider.cc \
--- a/src/GPS/Drivers
+++ b/src/GPS/Drivers
@ -1 +1 @@
				@@ -1 +1 @@
-Subproject commit 41223e860e0f3b7fed5075be8ac17ecb7e07e428
+Subproject commit ecc26a43033fc1b9a3dc6dae053d28438aa2f6a1
--- a/src/GPS/GPSProvider.cc
+++ b/src/GPS/GPSProvider.cc
@ -63,6 +63,7 @@ void GPSProvider::run()
				@@ -63,6 +63,7 @@ void GPSProvider::run()
        }

        gpsDriver = new GPSDriverUBX(GPSDriverUBX::Interface::UART, &callbackEntry, this, &_reportGpsPos, _pReportSatInfo);
+        baudrate = 0; // auto-configure
        gpsDriver->setSurveyInSpecs(_surveyInAccMeters * 10000, _surveryInDurationSecs);

        if (gpsDriver->configure(baudrate, GPSDriverUBX::OutputMode::RTCM) == 0) {
--- a/src/GPS/vehicle_gps_position.h
+++ b/src/GPS/vehicle_gps_position.h
@ -63,6 +63,7 @@ struct vehicle_gps_position_s {
				@@ -63,6 +63,7 @@ struct vehicle_gps_position_s {
 	float vel_d_m_s;
 	float cog_rad;
 	int32_t timestamp_time_relative;
+	float heading;
 	uint8_t fix_type;
 	bool vel_ned_valid;
 	uint8_t satellites_used;