Merge pull request #5378 from DonLakeFlyer/MobileLogging

Mobile telemetry logging

src/api/QGCCorePlugin.cc

@@ -171,7 +171,7 @@ bool QGCCorePlugin::adjustSettingMetaData(FactMetaData& metaData)
     } else if (metaData.name() == AppSettings::telemetrySaveName) {
 #if defined (__mobile__)
         metaData.setRawDefaultValue(false);
-        return false;
+        return true;
 #else
         metaData.setRawDefaultValue(true);
         return true;

src/comm/MAVLinkProtocol.cc

@@ -102,7 +102,8 @@ void MAVLinkProtocol::setToolbox(QGCToolbox *toolbox)
    connect(this, &MAVLinkProtocol::saveTelemetryLog,        _app, &QGCApplication::saveTelemetryLogOnMainThread);
    connect(this, &MAVLinkProtocol::checkTelemetrySavePath,  _app, &QGCApplication::checkTelemetrySavePathOnMainThread);
 
-   connect(_multiVehicleManager->vehicles(), &QmlObjectListModel::countChanged, this, &MAVLinkProtocol::_vehicleCountChanged);
+   connect(_multiVehicleManager, &MultiVehicleManager::vehicleAdded, this, &MAVLinkProtocol::_vehicleCountChanged);
+   connect(_multiVehicleManager, &MultiVehicleManager::vehicleRemoved, this, &MAVLinkProtocol::_vehicleCountChanged);
 
    emit versionCheckChanged(m_enable_version_check);
 }
@@ -327,8 +328,9 @@ void MAVLinkProtocol::enableVersionCheck(bool enabled)
     emit versionCheckChanged(enabled);
 }
 
-void MAVLinkProtocol::_vehicleCountChanged(int count)
+void MAVLinkProtocol::_vehicleCountChanged(void)
 {
+    int count = _multiVehicleManager->vehicles()->count();
     if (count == 0) {
         // Last vehicle is gone, close out logging
         _stopLogging();

src/comm/MAVLinkProtocol.h

@@ -163,7 +163,7 @@ signals:
     void checkTelemetrySavePath(void);
 
 private slots:
-    void _vehicleCountChanged(int count);
+    void _vehicleCountChanged(void);
     
 private:
     bool _closeLogFile(void);

src/ui/preferences/GeneralSettings.qml

@@ -253,7 +253,7 @@ QGCView {
                             id:         promptSaveLog
                             text:       qsTr("Save telemetry log after each flight")
                             fact:       _telemetrySave
-                            visible:    !ScreenTools.isMobile && _telemetrySave.visible
+                            visible:    _telemetrySave.visible
                             property Fact _telemetrySave: QGroundControl.settingsManager.appSettings.telemetrySave
                         }
                         //-----------------------------------------------------------------
@@ -261,7 +261,7 @@ QGCView {
                         FactCheckBox {
                             text:       qsTr("Save telemetry log even if vehicle was not armed")
                             fact:       _telemetrySaveNotArmed
-                            visible:    !ScreenTools.isMobile && _telemetrySaveNotArmed.visible
+                            visible:    _telemetrySaveNotArmed.visible
                             enabled:    promptSaveLog.checked
                             property Fact _telemetrySaveNotArmed: QGroundControl.settingsManager.appSettings.telemetrySaveNotArmed
                         }