Merge pull request #7533 from DonLakeFlyer/MavlinkNegotiate

Mavlink protocol version negotiation fixes

src/Vehicle/Vehicle.h

@@ -1232,6 +1232,7 @@ private slots:
     void _trafficUpdate         (bool alert, QString traffic_id, QString vehicle_id, QGeoCoordinate location, float heading);
     void _adsbTimerTimeout      ();
     void _orbitTelemetryTimeout (void);
+    void _protocolVersionTimeOut(void);
 
 private:
     bool _containsLink(LinkInterface* link);
@@ -1299,6 +1300,8 @@ private:
     void _updateArmed(bool armed);
     bool _apmArmingNotRequired(void);
     void _pidTuningAdjustRates(bool setRatesForTuning);
+    void _handleUnsupportedRequestAutopilotCapabilities(void);
+    void _handleUnsupportedRequestProtocolVersion(void);
 
     int     _id;                    ///< Mavlink system id
     int     _defaultComponentId;
@@ -1356,6 +1359,7 @@ private:
     uint32_t        _telemetryTXBuffer;
     int             _telemetryLNoise;
     int             _telemetryRNoise;
+    bool            _mavlinkProtocolRequestComplete;
     unsigned        _maxProtoVersion;
     bool            _vehicleCapabilitiesKnown;
     uint64_t        _capabilityBits;