Browse Source

Vehicle: don't update _coordinate from GPS2

QGC4.4
david sastre 4 years ago committed by Don Gagne
parent
commit
2a1de00211
  1. 24
      src/Vehicle/Vehicle.cc
  2. 1
      src/Vehicle/Vehicle.h

24
src/Vehicle/Vehicle.cc

@ -670,9 +670,6 @@ void Vehicle::_mavlinkMessageReceived(LinkInterface* link, mavlink_message_t mes @@ -670,9 +670,6 @@ void Vehicle::_mavlinkMessageReceived(LinkInterface* link, mavlink_message_t mes
case MAVLINK_MSG_ID_GPS_RAW_INT:
_handleGpsRawInt(message);
break;
case MAVLINK_MSG_ID_GPS2_RAW:
_handleGps2Raw(message);
break;
case MAVLINK_MSG_ID_GLOBAL_POSITION_INT:
_handleGlobalPositionInt(message);
break;
@ -1036,27 +1033,6 @@ void Vehicle::_handleGpsRawInt(mavlink_message_t& message) @@ -1036,27 +1033,6 @@ void Vehicle::_handleGpsRawInt(mavlink_message_t& message)
}
}
void Vehicle::_handleGps2Raw(mavlink_message_t& message)
{
mavlink_gps2_raw_t gpsRaw;
mavlink_msg_gps2_raw_decode(&message, &gpsRaw);
_gps2RawMessageAvailable = true;
if (gpsRaw.fix_type >= GPS_FIX_TYPE_3D_FIX) {
if (!_globalPositionIntMessageAvailable) {
QGeoCoordinate newPosition(gpsRaw.lat / (double)1E7, gpsRaw.lon / (double)1E7, gpsRaw.alt / 1000.0);
if (newPosition != _coordinate) {
_coordinate = newPosition;
emit coordinateChanged(_coordinate);
}
if (!_altitudeMessageAvailable) {
_altitudeAMSLFact.setRawValue(gpsRaw.alt / 1000.0);
}
}
}
}
void Vehicle::_handleGlobalPositionInt(mavlink_message_t& message)
{
mavlink_global_position_int_t globalPositionInt;

1
src/Vehicle/Vehicle.h

@ -913,7 +913,6 @@ private: @@ -913,7 +913,6 @@ private:
void _handleExtendedSysState (mavlink_message_t& message);
void _handleCommandAck (mavlink_message_t& message);
void _handleGpsRawInt (mavlink_message_t& message);
void _handleGps2Raw (mavlink_message_t& message);
void _handleGlobalPositionInt (mavlink_message_t& message);
void _handleAltitude (mavlink_message_t& message);
void _handleVfrHud (mavlink_message_t& message);

Loading…
Cancel
Save