Ardupilotmega flag added

QGCExternalLibs.pri

@@ -58,6 +58,11 @@ isEmpty(MAVLINK_CONF) {
     }
 }
 
+equals (MAVLINK_CONF, ardupilotmega) {
+    MAVLINK_CONF_ARDUPILOTMEGA = 1
+    DEFINES += MAVLINK_CONF_ARDUPILOTMEGA=$$MAVLINK_CONF_ARDUPILOTMEGA
+}
+
 # If defined, all APM specific MAVLink messages are disabled
 contains (CONFIG, QGC_DISABLE_APM_MAVLINK) {
     message("Disable APM MAVLink support")

src/Vehicle/Vehicle.cc

@@ -729,9 +729,11 @@ void Vehicle::_mavlinkMessageReceived(LinkInterface* link, mavlink_message_t mes
     case MAVLINK_MSG_ID_VFR_HUD:
         _handleVfrHud(message);
         break;
+#ifdef MAVLINK_CONF_ARDUPILOTMEGA
     case MAVLINK_MSG_ID_RANGEFINDER:
         _handleRangefinder(message);
         break;
+#endif
     case MAVLINK_MSG_ID_NAV_CONTROLLER_OUTPUT:
         _handleNavControllerOutput(message);
         break;
@@ -1015,9 +1017,11 @@ void Vehicle::_handleVfrHud(mavlink_message_t& message)
 
 void Vehicle::_handleRangefinder(mavlink_message_t& message)
 {
+#ifdef MAVLINK_CONF_ARDUPILOTMEGA
     mavlink_rangefinder_t rangefinder;
     mavlink_msg_rangefinder_decode(&message, &rangefinder);
     _rangeFinderDistFact.setRawValue(qIsNaN(rangefinder.distance) ? 0 : rangefinder.distance);
+#endif
 }