From 1d48bd91c9a9430cc120bbe5b849d5702481b06a Mon Sep 17 00:00:00 2001 From: LM Date: Tue, 29 May 2012 14:27:17 +0200 Subject: [PATCH] Fixed displaying of empty satinfo messages, fixed custom dialect includes --- src/comm/QGCMAVLink.h | 4 +++- src/ui/HSIDisplay.cc | 2 +- src/ui/MAVLinkDecoder.cc | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/comm/QGCMAVLink.h b/src/comm/QGCMAVLink.h index a73c4524a..ac2249e3c 100644 --- a/src/comm/QGCMAVLink.h +++ b/src/comm/QGCMAVLink.h @@ -34,7 +34,9 @@ This file is part of the QGROUNDCONTROL project #include #ifdef MAVLINK_CONF -#include MAVLINK_CONF +#define MY_MACRO(x) +#include MY_MACRO(MAVLINK_CONF) +//#include MAVLINK_CONF #endif diff --git a/src/ui/HSIDisplay.cc b/src/ui/HSIDisplay.cc index ddb3bb6af..f43292a67 100644 --- a/src/ui/HSIDisplay.cc +++ b/src/ui/HSIDisplay.cc @@ -990,8 +990,8 @@ void HSIDisplay::updateGlobalPosition(UASInterface*, double lat, double lon, dou void HSIDisplay::updateSatellite(int uasid, int satid, float elevation, float azimuth, float snr, bool used) { Q_UNUSED(uasid); - //qDebug() << "UPDATED SATELLITE"; // If slot is empty, insert object + if (satid != 0) // Satellite PRNs currently range from 1-32, but are never zero if (gpsSatellites.contains(satid)) { gpsSatellites.value(satid)->update(satid, elevation, azimuth, snr, used); } else { diff --git a/src/ui/MAVLinkDecoder.cc b/src/ui/MAVLinkDecoder.cc index f62fd8b68..a2187318b 100644 --- a/src/ui/MAVLinkDecoder.cc +++ b/src/ui/MAVLinkDecoder.cc @@ -28,6 +28,8 @@ MAVLinkDecoder::MAVLinkDecoder(MAVLinkProtocol* protocol, QObject *parent) : messageFilter.insert(MAVLINK_MSG_ID_MISSION_COUNT, false); messageFilter.insert(MAVLINK_MSG_ID_MISSION_ACK, false); messageFilter.insert(MAVLINK_MSG_ID_DATA_STREAM, false); + messageFilter.insert(MAVLINK_MSG_ID_GPS_STATUS, false); + #ifdef MAVLINK_ENABLED_PIXHAWK messageFilter.insert(MAVLINK_MSG_ID_ENCAPSULATED_DATA, false); messageFilter.insert(MAVLINK_MSG_ID_DATA_TRANSMISSION_HANDSHAKE, false); -- 2.22.0