From d5c8fb8eddf9f913d86024b21c3d234e3a5e61b5 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Tue, 11 Jul 2017 23:05:52 -0400 Subject: [PATCH 1/4] NSBluetoothPeripheralUsageDescription requirement for iOS. --- ios/iOSForAppStore-Info-Source.plist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ios/iOSForAppStore-Info-Source.plist b/ios/iOSForAppStore-Info-Source.plist index 09f03af..de8c15e 100644 --- a/ios/iOSForAppStore-Info-Source.plist +++ b/ios/iOSForAppStore-Info-Source.plist @@ -85,6 +85,8 @@ Ground Station Location UILaunchStoryboardName QGCLaunchScreen + NSBluetoothPeripheralUsageDescription + QGroundControl would like to use bluetooth. UIRequiresFullScreen UISupportedInterfaceOrientations From 5f3729db708676cdced5300258b12d9cf709fe20 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Tue, 11 Jul 2017 23:58:12 -0400 Subject: [PATCH 2/4] Enable QtQuick compiler for iOS store builds. Hide "Save Path" as it breaks the UI in General Settings. --- qgroundcontrol.pro | 2 ++ src/api/QGCCorePlugin.cc | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index 06ff98f..23e4fc7 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -55,6 +55,8 @@ iOSBuild { count(APP_ERROR, 1) { error("Error building .plist file. 'ForAppStore' builds are only possible through the official build system.") } + QT += qml-private + CONFIG += qtquickcompiler QMAKE_INFO_PLIST = $${BASEDIR}/ios/iOSForAppStore-Info.plist OTHER_FILES += $${BASEDIR}/ios/iOSForAppStore-Info.plist } else { diff --git a/src/api/QGCCorePlugin.cc b/src/api/QGCCorePlugin.cc index f40fe3d..a427bac 100644 --- a/src/api/QGCCorePlugin.cc +++ b/src/api/QGCCorePlugin.cc @@ -176,6 +176,13 @@ bool QGCCorePlugin::adjustSettingMetaData(FactMetaData& metaData) metaData.setRawDefaultValue(true); return true; #endif +#if defined(__ios__) + } else if (metaData.name() == AppSettings::savePathName) { + QString appName = qgcApp()->applicationName(); + QDir rootDir = QDir(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)); + metaData.setRawDefaultValue(rootDir.filePath(appName)); + return false; +#endif } return true; // Show setting in ui } From 5a5deef879e31828d678d12e067f2ac767a68fa5 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Sat, 15 Jul 2017 11:40:00 -0700 Subject: [PATCH 3/4] Correct creation of MAVLinkDecoder --- src/ui/MainWindow.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index d72e204..19c006e 100644 --- a/src/ui/MainWindow.cc +++ b/src/ui/MainWindow.cc @@ -296,7 +296,7 @@ QString MainWindow::_getWindowGeometryKey() #ifndef __mobile__ MAVLinkDecoder* MainWindow::_mavLinkDecoderInstance(void) { - if (_mavlinkDecoder) { + if (!_mavlinkDecoder) { _mavlinkDecoder = new MAVLinkDecoder(qgcApp()->toolbox()->mavlinkProtocol()); connect(_mavlinkDecoder, &MAVLinkDecoder::valueChanged, this, &MainWindow::valueChanged); } From bcf9e70b5c74a504c3aca9fcb64cd4380ac49ff4 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Sat, 15 Jul 2017 11:40:14 -0700 Subject: [PATCH 4/4] More overlap for image stitching --- src/MissionManager/Survey.SettingsGroup.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MissionManager/Survey.SettingsGroup.json b/src/MissionManager/Survey.SettingsGroup.json index e28cb35..b11c5e4 100644 --- a/src/MissionManager/Survey.SettingsGroup.json +++ b/src/MissionManager/Survey.SettingsGroup.json @@ -64,7 +64,7 @@ "min": 0, "max": 85, "units": "%", - "defaultValue": 10 + "defaultValue": 70 }, { "name": "SideOverlap", @@ -74,7 +74,7 @@ "min": 0, "max": 85, "units": "%", - "defaultValue": 10 + "defaultValue": 70 }, { "name": "CameraSensorWidth",