Merge pull request #7505 from mavlink/multipleVehicleTypes

Multiple vehicle types

src/FirmwarePlugin/FirmwarePluginManager.cc

@@ -16,7 +16,7 @@
 
 FirmwarePluginManager::FirmwarePluginManager(QGCApplication* app, QGCToolbox* toolbox)
     : QGCTool(app, toolbox)
-    , _genericFirmwarePlugin(NULL)
+    , _genericFirmwarePlugin(nullptr)
 {
 
 }
@@ -58,7 +58,7 @@ QList<MAV_TYPE> FirmwarePluginManager::supportedVehicleTypes(MAV_AUTOPILOT firmw
 FirmwarePlugin* FirmwarePluginManager::firmwarePluginForAutopilot(MAV_AUTOPILOT firmwareType, MAV_TYPE vehicleType)
 {
     FirmwarePluginFactory*  factory = _findPluginFactory(firmwareType);
-    FirmwarePlugin*         plugin = NULL;
+    FirmwarePlugin*         plugin = nullptr;
 
     if (factory) {
         plugin = factory->firmwarePluginForAutopilot(firmwareType, vehicleType);

src/FirmwarePlugin/PX4/PX4FirmwarePluginFactory.cc

@@ -16,7 +16,7 @@
 PX4FirmwarePluginFactory PX4FirmwarePluginFactory;
 
 PX4FirmwarePluginFactory::PX4FirmwarePluginFactory(void)
-    : _pluginInstance(NULL)
+    : _pluginInstance(nullptr)
 {
 
 }
@@ -40,5 +40,5 @@ FirmwarePlugin* PX4FirmwarePluginFactory::firmwarePluginForAutopilot(MAV_AUTOPIL
         return _pluginInstance;
     }
 
-    return NULL;
+    return nullptr;
 }

src/PlanView/MissionSettingsEditor.qml

@@ -30,6 +30,7 @@ Rectangle {
     property bool   _showCruiseSpeed:               !_missionVehicle.multiRotor
     property bool   _showHoverSpeed:                _missionVehicle.multiRotor || _missionVehicle.vtol
     property bool   _multipleFirmware:              QGroundControl.supportedFirmwareCount > 2
+    property bool   _multipleVehicleTypes:          QGroundControl.supportedVehicleCount > 1
     property real   _fieldWidth:                    ScreenTools.defaultFontPixelWidth * 16
     property bool   _mobile:                        ScreenTools.isMobile
     property var    _savePath:                      QGroundControl.settingsManager.appSettings.missionSavePath
@@ -158,13 +159,13 @@ Rectangle {
                 QGCLabel {
                     text:               _vehicleLabel
                     Layout.fillWidth:   true
-                    visible:            _showOfflineVehicleCombos
+                    visible:            _multipleVehicleTypes
                 }
                 FactComboBox {
                     fact:                   QGroundControl.settingsManager.appSettings.offlineEditingVehicleType
                     indexModel:             false
                     Layout.preferredWidth:  _fieldWidth
-                    visible:                _showOfflineVehicleCombos
+                    visible:                _multipleVehicleTypes
                     enabled:                _enableOfflineVehicleCombos
                 }
 

src/QmlControls/QGroundControlQmlGlobal.cc

@@ -190,6 +190,18 @@ int QGroundControlQmlGlobal::supportedFirmwareCount()
     return _firmwarePluginManager->supportedFirmwareTypes().count();
 }
 
+int QGroundControlQmlGlobal::supportedVehicleCount()
+{
+    int count = 0;
+    QList<MAV_AUTOPILOT> list = _firmwarePluginManager->supportedFirmwareTypes();
+    foreach(auto firmware, list) {
+        if(firmware != MAV_AUTOPILOT_GENERIC) {
+            count += _firmwarePluginManager->supportedVehicleTypes(firmware).count();
+        }
+    }
+    return count;
+}
+
 bool QGroundControlQmlGlobal::px4ProFirmwareSupported()
 {
     return _firmwarePluginManager->supportedFirmwareTypes().contains(MAV_AUTOPILOT_PX4);

src/QmlControls/QGroundControlQmlGlobal.h

@@ -77,6 +77,7 @@ public:
     Q_PROPERTY(bool                 microhardSupported  READ microhardSupported     CONSTANT)
 
     Q_PROPERTY(int      supportedFirmwareCount          READ supportedFirmwareCount CONSTANT)
+    Q_PROPERTY(int      supportedVehicleCount           READ supportedVehicleCount  CONSTANT)
     Q_PROPERTY(bool     px4ProFirmwareSupported         READ px4ProFirmwareSupported CONSTANT)
     Q_PROPERTY(int      apmFirmwareSupported            READ apmFirmwareSupported   CONSTANT)
 
@@ -203,6 +204,7 @@ public:
 #endif
 
     int     supportedFirmwareCount  ();
+    int     supportedVehicleCount   ();
     bool    px4ProFirmwareSupported ();
     bool    apmFirmwareSupported    ();
     bool    skipSetupPage           () { return _skipSetupPage; }