Browse Source

Merge pull request #8587 from dakejahl/pr-GPS_message_name_update

Update GPS struct name to match PX4
QGC4.4
Don Gagne 5 years ago committed by GitHub
parent
commit
e28a6c9c89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/GPS/Drivers
  2. 2
      src/GPS/GPSPositionMessage.h
  3. 4
      src/GPS/GPSProvider.h
  4. 2
      src/GPS/vehicle_gps_position.h

2
src/GPS/Drivers

@ -1 +1 @@ @@ -1 +1 @@
Subproject commit 2a4865adc3808687d6c6f550f497a02eb920c382
Subproject commit 2bfc6ffb3ba74b60deab5aef8e34c2cb909c4edc

2
src/GPS/GPSPositionMessage.h

@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
*/
struct GPSPositionMessage
{
vehicle_gps_position_s position_data;
sensor_gps_s position_data;
};
Q_DECLARE_METATYPE(GPSPositionMessage);

4
src/GPS/GPSProvider.h

@ -85,8 +85,8 @@ private: @@ -85,8 +85,8 @@ private:
float _fixedBaseAltitudeMeters;
float _fixedBaseAccuracyMeters;
struct vehicle_gps_position_s _reportGpsPos;
struct satellite_info_s *_pReportSatInfo = nullptr;
struct sensor_gps_s _reportGpsPos;
struct satellite_info_s *_pReportSatInfo = nullptr;
QSerialPort *_serial = nullptr;
};

2
src/GPS/vehicle_gps_position.h

@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
* and was manually copied here.
*/
struct vehicle_gps_position_s {
struct sensor_gps_s {
uint64_t timestamp;
uint64_t time_utc_usec;
int32_t lat;

Loading…
Cancel
Save