From 3239118eca9d4fd875d2597be7542a24c7fa207d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Fri, 13 Jul 2018 16:28:44 +0200 Subject: [PATCH] GPS: update submodule & account for changed interface --- qgroundcontrol.pro | 4 ++++ src/GPS/Drivers | 2 +- src/GPS/GPSProvider.cc | 1 + src/GPS/vehicle_gps_position.h | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index c09b079ef..769e02934 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -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 += \ 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 \ diff --git a/src/GPS/Drivers b/src/GPS/Drivers index 41223e860..ecc26a430 160000 --- a/src/GPS/Drivers +++ b/src/GPS/Drivers @@ -1 +1 @@ -Subproject commit 41223e860e0f3b7fed5075be8ac17ecb7e07e428 +Subproject commit ecc26a43033fc1b9a3dc6dae053d28438aa2f6a1 diff --git a/src/GPS/GPSProvider.cc b/src/GPS/GPSProvider.cc index 8e77aa0b7..d993908c0 100644 --- a/src/GPS/GPSProvider.cc +++ b/src/GPS/GPSProvider.cc @@ -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) { diff --git a/src/GPS/vehicle_gps_position.h b/src/GPS/vehicle_gps_position.h index e8fa23dbc..1a3f8d324 100644 --- a/src/GPS/vehicle_gps_position.h +++ b/src/GPS/vehicle_gps_position.h @@ -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; -- 2.22.0