Multi GCS update

cmake/CustomOptions.cmake

@@ -95,7 +95,7 @@ option(QGC_ENABLE_QT_VIDEOSTREAMING "Enable QtMultimedia video backend" OFF)
 # ============================================================================
 
 set(QGC_MAVLINK_GIT_REPO "https://github.com/mavlink/mavlink.git" CACHE STRING "MAVLink repository URL")
-set(QGC_MAVLINK_GIT_TAG "c409cf690454db6d3e004bd14173bc6c7ff1e0ff" CACHE STRING "MAVLink repository commit/tag")
+set(QGC_MAVLINK_GIT_TAG "362f7e0f8f37cacd79f85b567a8ae6193e8afbd0" CACHE STRING "MAVLink repository commit/tag")
 set(QGC_MAVLINK_DIALECT "all" CACHE STRING "MAVLink dialect")
 set(QGC_MAVLINK_VERSION "2.0" CACHE STRING "MAVLink protocol version")
 

src/Comms/MockLink/MockLink.cc

@@ -1733,6 +1733,10 @@ void MockLink::_handleCommandLong(const mavlink_message_t &msg)
         _handleTakeoff(request);
         commandResult = MAV_RESULT_ACCEPTED;
         break;
+    case MAV_CMD_REQUEST_OPERATOR_CONTROL:
+        // Result is settable so tests can exercise the pending (FAILED) vs rejected paths
+        commandResult = _requestOperatorControlResult;
+        break;
     case MAV_CMD_MOCKLINK_ALWAYS_RESULT_ACCEPTED:
         // Test command which always returns MAV_RESULT_ACCEPTED
         commandResult = MAV_RESULT_ACCEPTED;

src/Comms/MockLink/MockLink.h

@@ -99,6 +99,8 @@ class MockLink : public LinkInterface
     void clearReceivedMavCommandCounts() { _receivedMavCommandCountMap.clear(); _receivedMavCommandByCompCountMap.clear(); _receivedRequestMessageByCompAndMsgCountMap.clear(); }
     int receivedMavCommandCount(MAV_CMD command) const { return _receivedMavCommandCountMap.value(command, 0); }
     int receivedMavCommandCount(MAV_CMD command, int compId) const { return _receivedMavCommandByCompCountMap.value(command).value(compId, 0); }
+    /// Result acked for MAV_CMD_REQUEST_OPERATOR_CONTROL (defaults to MAV_RESULT_UNSUPPORTED: not implemented)
+    void setRequestOperatorControlResult(MAV_RESULT result) { _requestOperatorControlResult = result; }
     int receivedRequestMessageCount(int compId, int messageId) const { return _receivedRequestMessageByCompAndMsgCountMap.value(compId).value(messageId, 0); }
     void clearReceivedRequestMessageCounts() { _receivedRequestMessageCountMap.clear(); _receivedRequestMessageByCompAndMsgCountMap.clear(); }
     int receivedRequestMessageCount(uint32_t messageId) const { return _receivedRequestMessageCountMap.value(messageId, 0); }
@@ -384,6 +386,7 @@ private slots:
     bool _paramRequestReadFailureFirstAttemptPending = false;
     bool _hashCheckNoResponse = false;
     int _hashCheckRequestCount = 0;
+    MAV_RESULT _requestOperatorControlResult = MAV_RESULT_UNSUPPORTED;
     bool _paramRequestListHashCheckSent = false;
     bool _resetSysAutostartOnParamReset = false;
 

src/FirmwarePlugin/FirmwarePlugin.cc

@@ -209,10 +209,7 @@ const QVariantList &FirmwarePlugin::toolIndicators(const Vehicle*)
             QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/EscIndicator.qml")),
             QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/JoystickIndicator.qml")),
             QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/MultiVehicleSelector.qml")),
-#ifdef QT_DEBUG
-            // ControlIndicator is only available in debug builds for the moment
             QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/GCSControlIndicator.qml")),
-#endif
         });
     }
 

src/Toolbar/CMakeLists.txt

@@ -101,7 +101,10 @@ qt_add_resources(${CMAKE_PROJECT_NAME} toolbar_gcscontrol_resources
     PREFIX "/gcscontrolIndicator"
     BASE "${CMAKE_SOURCE_DIR}/resources/gcscontrolIndicator"
     FILES
-        "${CMAKE_SOURCE_DIR}/resources/gcscontrolIndicator/gcscontrol_device.svg"
-        "${CMAKE_SOURCE_DIR}/resources/gcscontrolIndicator/gcscontrol_gcs.svg"
-        "${CMAKE_SOURCE_DIR}/resources/gcscontrolIndicator/gcscontrol_line.svg"
+        "${CMAKE_SOURCE_DIR}/resources/gcscontrolIndicator/multigcs_aircraft.svg"
+        "${CMAKE_SOURCE_DIR}/resources/gcscontrolIndicator/multigcs_line.svg"
+        "${CMAKE_SOURCE_DIR}/resources/gcscontrolIndicator/multigcs_device.svg"
+        "${CMAKE_SOURCE_DIR}/resources/gcscontrolIndicator/multigcs_device_alt.svg"
+        "${CMAKE_SOURCE_DIR}/resources/gcscontrolIndicator/multigcs_lock_open.svg"
+        "${CMAKE_SOURCE_DIR}/resources/gcscontrolIndicator/multigcs_lock_closed.svg"
 )