Fixed displaying of empty satinfo messages, fixed custom dialect includes

src/comm/QGCMAVLink.h

@@ -34,7 +34,9 @@ This file is part of the QGROUNDCONTROL project
 #include <mavlink.h>
 
 #ifdef MAVLINK_CONF
-#include MAVLINK_CONF
+#define MY_MACRO(x) <x>
+#include MY_MACRO(MAVLINK_CONF)
+//#include MAVLINK_CONF
 #endif
 
 

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 {

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);