Update to latest mavlink headers

Put back commented out code

src/AutoPilotPlugins/PX4/AirframeComponent.cc

@@ -30,9 +30,6 @@
 /// @brief Parameters which signal a change in setupComplete state
 static const char* triggerParams[] = { "SYS_AUTOSTART", NULL };
 
-#if 0
-// Broken by latest mavlink module changes. Not used yet. Comment out for now.
-// Discussing mavlink fix.
 struct mavType {
     int         type;
     const char* description;
@@ -61,18 +58,19 @@ static const struct mavType mavTypeInfo[] = {
     { MAV_TYPE_ONBOARD_CONTROLLER,  "Onbard companion controller" },
     { MAV_TYPE_VTOL_DUOROTOR,       "Two-rotor VTOL" },
     { MAV_TYPE_VTOL_QUADROTOR,      "Quad-rotor VTOL" },
+    { MAV_TYPE_VTOL_RESERVED1,      "Reserved" },
+    { MAV_TYPE_VTOL_RESERVED2,      "Reserved" },
+    { MAV_TYPE_VTOL_RESERVED3,      "Reserved" },
+    { MAV_TYPE_VTOL_RESERVED4,      "Reserved" },
+    { MAV_TYPE_VTOL_RESERVED5,      "Reserved" },
     { MAV_TYPE_GIMBAL,              "Gimbal" },
 };
 static size_t cMavTypes = sizeof(mavTypeInfo) / sizeof(mavTypeInfo[0]);
-#endif
 
 AirframeComponent::AirframeComponent(UASInterface* uas, AutoPilotPlugin* autopilot, QObject* parent) :
     PX4Component(uas, autopilot, parent),
     _name(tr("Airframe"))
 {
-#if 0
-    // Broken by latest mavlink module changes. Not used yet. Comment out for now.
-    // Discussing mavlink fix.
     Q_UNUSED(mavTypeInfo);  // Keeping this around for later use
     
     // Validate that our mavTypeInfo array hasn't gotten out of sync
@@ -102,6 +100,11 @@ AirframeComponent::AirframeComponent(UASInterface* uas, AutoPilotPlugin* autopil
         MAV_TYPE_ONBOARD_CONTROLLER,
         MAV_TYPE_VTOL_DUOROTOR,
         MAV_TYPE_VTOL_QUADROTOR,
+        MAV_TYPE_VTOL_RESERVED1,
+        MAV_TYPE_VTOL_RESERVED2,
+        MAV_TYPE_VTOL_RESERVED3,
+        MAV_TYPE_VTOL_RESERVED4,
+        MAV_TYPE_VTOL_RESERVED5,
         MAV_TYPE_GIMBAL,
     };
     Q_UNUSED(mavTypes); // Keeping this around for later use
@@ -109,7 +112,6 @@ AirframeComponent::AirframeComponent(UASInterface* uas, AutoPilotPlugin* autopil
     for (size_t i=0; i<cMavTypes; i++) {
         Q_ASSERT(mavTypeInfo[i].type == mavTypes[i]);
     }
-#endif
 }
 
 QString AirframeComponent::name(void) const