Move MockLink start methods to MockLink

src/QmlControls/QGroundControlQmlGlobal.cc

@@ -74,28 +74,10 @@ bool QGroundControlQmlGlobal::loadBoolGlobalSetting (const QString& key, bool de
     return settings.value(key, defaultValue).toBool();
 }
 
-#ifdef QT_DEBUG
-void QGroundControlQmlGlobal::_startMockLink(MockConfiguration* mockConfig)
-{
-    LinkManager* linkManager = qgcApp()->toolbox()->linkManager();
-
-    mockConfig->setDynamic(true);
-    linkManager->linkConfigurations()->append(mockConfig);
-
-    linkManager->createConnectedLink(mockConfig);
-}
-#endif
-
 void QGroundControlQmlGlobal::startPX4MockLink(bool sendStatusText)
 {
 #ifdef QT_DEBUG
-    MockConfiguration* mockConfig = new MockConfiguration("PX4 MockLink");
-
-    mockConfig->setFirmwareType(MAV_AUTOPILOT_PX4);
-    mockConfig->setVehicleType(MAV_TYPE_QUADROTOR);
-    mockConfig->setSendStatusText(sendStatusText);
-
-    _startMockLink(mockConfig);
+    MockLink::startPX4MockLink(sendStatusText);
 #else
     Q_UNUSED(sendStatusText);
 #endif
@@ -104,13 +86,7 @@ void QGroundControlQmlGlobal::startPX4MockLink(bool sendStatusText)
 void QGroundControlQmlGlobal::startGenericMockLink(bool sendStatusText)
 {
 #ifdef QT_DEBUG
-    MockConfiguration* mockConfig = new MockConfiguration("Generic MockLink");
-
-    mockConfig->setFirmwareType(MAV_AUTOPILOT_GENERIC);
-    mockConfig->setVehicleType(MAV_TYPE_QUADROTOR);
-    mockConfig->setSendStatusText(sendStatusText);
-
-    _startMockLink(mockConfig);
+    MockLink::startGenericMockLink(sendStatusText);
 #else
     Q_UNUSED(sendStatusText);
 #endif
@@ -119,13 +95,7 @@ void QGroundControlQmlGlobal::startGenericMockLink(bool sendStatusText)
 void QGroundControlQmlGlobal::startAPMArduCopterMockLink(bool sendStatusText)
 {
 #ifdef QT_DEBUG
-    MockConfiguration* mockConfig = new MockConfiguration("APM ArduCopter MockLink");
-
-    mockConfig->setFirmwareType(MAV_AUTOPILOT_ARDUPILOTMEGA);
-    mockConfig->setVehicleType(MAV_TYPE_QUADROTOR);
-    mockConfig->setSendStatusText(sendStatusText);
-
-    _startMockLink(mockConfig);
+    MockLink::startAPMArduCopterMockLink(sendStatusText);
 #else
     Q_UNUSED(sendStatusText);
 #endif
@@ -134,13 +104,7 @@ void QGroundControlQmlGlobal::startAPMArduCopterMockLink(bool sendStatusText)
 void QGroundControlQmlGlobal::startAPMArduPlaneMockLink(bool sendStatusText)
 {
 #ifdef QT_DEBUG
-    MockConfiguration* mockConfig = new MockConfiguration("APM ArduPlane MockLink");
-
-    mockConfig->setFirmwareType(MAV_AUTOPILOT_ARDUPILOTMEGA);
-    mockConfig->setVehicleType(MAV_TYPE_FIXED_WING);
-    mockConfig->setSendStatusText(sendStatusText);
-
-    _startMockLink(mockConfig);
+    MockLink::startAPMArduPlaneMockLink(sendStatusText);
 #else
     Q_UNUSED(sendStatusText);
 #endif

src/QmlControls/QGroundControlQmlGlobal.h

@@ -132,9 +132,6 @@ signals:
     void virtualTabletJoystickChanged   (bool enabled);
 
 private:
-#ifdef QT_DEBUG
-    void _startMockLink(MockConfiguration* mockConfig);
-#endif
 
     FlightMapSettings*      _flightMapSettings;
     HomePositionManager*    _homePositionManager;

src/comm/MockLink.cc

@@ -929,3 +929,58 @@ void MockConfiguration::updateSettings()
         }
     }
 }
+
+MockLink*  MockLink::_startMockLink(MockConfiguration* mockConfig)
+{
+    LinkManager* linkManager = qgcApp()->toolbox()->linkManager();
+
+    mockConfig->setDynamic(true);
+    linkManager->linkConfigurations()->append(mockConfig);
+
+    return qobject_cast<MockLink*>(linkManager->createConnectedLink(mockConfig));
+}
+
+MockLink*  MockLink::startPX4MockLink(bool sendStatusText)
+{
+    MockConfiguration* mockConfig = new MockConfiguration("PX4 MockLink");
+
+    mockConfig->setFirmwareType(MAV_AUTOPILOT_PX4);
+    mockConfig->setVehicleType(MAV_TYPE_QUADROTOR);
+    mockConfig->setSendStatusText(sendStatusText);
+
+    return _startMockLink(mockConfig);
+}
+
+MockLink*  MockLink::startGenericMockLink(bool sendStatusText)
+{
+    MockConfiguration* mockConfig = new MockConfiguration("Generic MockLink");
+
+    mockConfig->setFirmwareType(MAV_AUTOPILOT_GENERIC);
+    mockConfig->setVehicleType(MAV_TYPE_QUADROTOR);
+    mockConfig->setSendStatusText(sendStatusText);
+
+    return _startMockLink(mockConfig);
+}
+
+MockLink*  MockLink::startAPMArduCopterMockLink(bool sendStatusText)
+{
+    MockConfiguration* mockConfig = new MockConfiguration("APM ArduCopter MockLink");
+
+    mockConfig->setFirmwareType(MAV_AUTOPILOT_ARDUPILOTMEGA);
+    mockConfig->setVehicleType(MAV_TYPE_QUADROTOR);
+    mockConfig->setSendStatusText(sendStatusText);
+
+    return _startMockLink(mockConfig);
+}
+
+MockLink*  MockLink::startAPMArduPlaneMockLink(bool sendStatusText)
+{
+    MockConfiguration* mockConfig = new MockConfiguration("APM ArduPlane MockLink");
+
+    mockConfig->setFirmwareType(MAV_AUTOPILOT_ARDUPILOTMEGA);
+    mockConfig->setVehicleType(MAV_TYPE_FIXED_WING);
+    mockConfig->setSendStatusText(sendStatusText);
+
+    return _startMockLink(mockConfig);
+}
+

src/comm/MockLink.h

@@ -146,6 +146,11 @@ public:
     /// Reset the state of the MissionItemHandler to no items, no transactions in progress.
     void resetMissionItemHandler(void) { _missionItemHandler.reset(); }
 
+    static MockLink* startPX4MockLink            (bool sendStatusText);
+    static MockLink* startGenericMockLink        (bool sendStatusText);
+    static MockLink* startAPMArduCopterMockLink  (bool sendStatusText);
+    static MockLink* startAPMArduPlaneMockLink   (bool sendStatusText);
+
 signals:
     /// @brief Used internally to move data to the thread.
     void _incomingBytes(const QByteArray bytes);
@@ -189,6 +194,8 @@ private:
     void _sendGpsRawInt(void);
     void _sendStatusTextMessages(void);
 
+    static MockLink* _startMockLink(MockConfiguration* mockConfig);
+
     MockLinkMissionItemHandler  _missionItemHandler;
 
     QString _name;