Fix Issue #298 and a few other iOS build fixes (#299)

* increase sw freq limit * Halfway done with config tool stuff * added enable boxes * more work on motor setup and testing * Cleaned up some stuff * intermediate changes for apps setup * Update boardsetupwindow.cpp * more progress on tool * beta version of tool * fixed minor bugs * Update boardsetupwindow.cpp * fixed compilation issues for 3.01 * Fixed autodetection of USB on windows * remove extra file * fixed a few minor issues * make ios work again * fix for package store data on iOS issue #298 * Fixed firmware archive on iOS and patched a few build issues introduced from recent changes - QProcess is not supported on iOS among a couple other platforms - Added timer workaround to not freeze UI when archive is downloaded on iOS - Apparently on iOS a mkpath call is required before writing to appdata. This keeps files hidden nicely and seems to work well. Also prevents need for platform specific #ifdefs which is nice
vedderb · Feb 19, 2023 · a1268bb · a1268bb
1 parent a539edb
commit a1268bb
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 17 deletions.
diff --git a/codeloader.cpp b/codeloader.cpp
@@ -799,7 +799,11 @@ bool CodeLoader::installVescPackageFromPath(QString path)
 QVariantList CodeLoader::reloadPackageArchive()
 {
     QVariantList res;
-    QString path = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/vesc_pkg_all.rcc";
+    QString appDataLoc = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
+    if(!QDir(appDataLoc).exists()) {
+            QDir().mkpath(appDataLoc);
+    }
+    QString path = appDataLoc + "/vesc_pkg_all.rcc";
     QFile file(path);
     if (file.exists()) {
         QResource::unregisterResource(path);
@@ -850,7 +854,11 @@ bool CodeLoader::downloadPackageArchive()
     loop.exec();
 
     if (reply->error() == QNetworkReply::NoError) {
-        QString path = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/vesc_pkg_all.rcc";
+        QString appDataLoc = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
+        if(!QDir(appDataLoc).exists()) {
+                QDir().mkpath(appDataLoc);
+        }
+        QString path = appDataLoc + "/vesc_pkg_all.rcc";
         QResource::unregisterResource(path);
         QFile file(path);
         if (file.open(QIODevice::WriteOnly)) {

diff --git a/ios/Info.plist b/ios/Info.plist
@@ -3,25 +3,25 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDisplayName</key>
-	<string>$(Vesc Tool)</string>
+	<string>Vesc Tool</string>
 	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
+	<string>VESC Tool</string>
 	<key>CFBundleGetInfoString</key>
 	<string>Created by Qt/QMake</string>
 	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<string>com.vesc-project.vesc-tool</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
+	<string>VESC Tool</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>$(MARKETING_VERSION)</string>
+	<string>6.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<string>6.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>
@@ -37,7 +37,7 @@
 	<key>NSBluetoothAlwaysUsageDescription</key>
 	<string>Need access to connect to VESC</string>
 	<key>NSBluetoothPeripheralUsageDescription</key>
-	<string>$(PRODUCT_NAME) searches Bluetooth LE Devices (WaiterLock, Barcode Scanner, eGK)</string>
+	<string>VESC Tool searches Bluetooth LE Devices (WaiterLock, Barcode Scanner, eGK)</string>
 	<key>NSDocumentsFolderUsageDescription</key>
 	<string>Saves log files here</string>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
@@ -47,13 +47,13 @@
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>Used for Ride Tracking</string>
 	<key>NSPhotoLibraryUsageDescription</key>
-	<string>$(PRODUCT_NAME) uses photos</string>
+	<string>VESC Tool uses photos</string>
 	<key>NSSupportsAutomaticGraphicsSwitching</key>
 	<true/>
 	<key>UIBackgroundModes</key>
 	<array>
-		<string>location</string>
 		<string>bluetooth-central</string>
+		<string>location</string>
 	</array>
 	<key>UIFileSharingEnabled</key>
 	<true/>

diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -23,6 +23,7 @@
 #include <QDebug>
 #include <QInputDialog>
 #include <QFileDialog>
+#include <QProcess>
 #include <QListWidgetItem>
 #include <cmath>
 #include <QEventLoop>
@@ -1171,6 +1172,7 @@ void MainWindow::on_actionExit_triggered()
     qApp->exit();
 }
 
+#ifndef Q_OS_IOS
 void MainWindow::on_actionLaunchBoardConfigurator_triggered()
 {
     QString program = qApp->arguments()[0];
@@ -1186,6 +1188,7 @@ void MainWindow::on_actionLaunchMobileTool_triggered()
     qApp->quit();
     QProcess::startDetached(program, params);
 }
+#endif
 
 void MainWindow::on_actionAbout_triggered()
 {

diff --git a/mainwindow.h b/mainwindow.h
@@ -111,8 +111,10 @@ private slots:
     void on_actionSaveAppconfXml_triggered();
     void on_actionLoadAppconfXml_triggered();
     void on_actionExit_triggered();
+    #ifndef Q_OS_IOS
     void on_actionLaunchBoardConfigurator_triggered();
     void on_actionLaunchMobileTool_triggered();
+    #endif
     void on_actionAbout_triggered();
     void on_actionLibrariesUsed_triggered();
     void on_dutyButton_clicked();

diff --git a/mobile/FwUpdate.qml b/mobile/FwUpdate.qml
@@ -625,6 +625,17 @@ Item {
 
         onAccepted: {
             archUpdateButton.enabled = false
+            workaroundTimerDl.start()
+        }
+    }
+
+    Timer {
+        id: workaroundTimerDl
+        interval: 0
+        repeat: false
+        running: false
+        onTriggered: {
+            // dlArchive...
             VescIf.downloadFwArchive()
             updateArch(VescIf.getLastFwRxParams())
             archUpdateButton.enabled = true

diff --git a/mobile/fwhelper.cpp b/mobile/fwhelper.cpp
@@ -212,8 +212,11 @@ bool FwHelper::uploadFirmwareSingleShotTimer(QString filename, VescInterface *ve
 QVariantMap FwHelper::getArchiveDirs()
 {
     QVariantMap fws;
-
-    QString path = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/res_fw.rcc";
+    QString appDataLoc = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
+    if(!QDir(appDataLoc).exists()) {
+        QDir().mkpath(appDataLoc);
+    }
+    QString path = appDataLoc + "/res_fw.rcc";
     QFile file(path);
     if (file.exists()) {
         QResource::unregisterResource(path);

diff --git a/vescinterface.cpp b/vescinterface.cpp
@@ -1,4 +1,4 @@
-/*
+/*
     Copyright 2016 - 2020 Benjamin Vedder	[email protected]
 
     This file is part of VESC Tool.
@@ -3993,8 +3993,11 @@ bool VescInterface::downloadFwArchive()
     QNetworkAccessManager manager;
     QNetworkRequest request(url);
     QNetworkReply *reply = manager.get(request);
-
-    QString path = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/res_fw.rcc";
+    QString appDataLoc = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
+    if(!QDir(appDataLoc).exists()) {
+        QDir().mkpath(appDataLoc);
+    }
+    QString path = appDataLoc + "/res_fw.rcc";
     QFile file(path);
     QResource::unregisterResource(path);
     if (file.open(QIODevice::WriteOnly)) {

diff --git a/widgets/experimentplot.cpp b/widgets/experimentplot.cpp
@@ -17,7 +17,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
     */
 
-
+#include <QFileDialog>
+#include <QMessageBox>
 #include "experimentplot.h"
 #include "ui_experimentplot.h"
 #include "utility.h"