Mobile: Option to disable CAN scan on connect and hopefully better au…

…to-scan behavior in general
vedderb · Aug 26, 2024 · 809ae62 · 809ae62
1 parent 7f49dbb
commit 809ae62
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 9 deletions.
diff --git a/mobile/CanScreen.qml b/mobile/CanScreen.qml
@@ -37,6 +37,14 @@ Item {
         scanButton.enabled = VescIf.isPortConnected()
     }
 
+    function scanIfEmpty() {
+        if (canList.count == 0 &&
+                VescIf.isPortConnected() &&
+                scanButton.enabled) {
+            scanButton.clicked()
+        }
+    }
+
     function selectDeviceInList() {
         if (mCommands.getSendCan()) {
             for (var i = 0; i < canModel.count;i++) {
@@ -63,10 +71,17 @@ Item {
                 mCommands.setSendCan(false, -1)
                 canList.currentIndex = 0;
                 canModel.clear()
-                scanButton.enabled = VescIf.isPortConnected()
+                scanButton.enabled = false
             } else {
                 selectDeviceInList()
             }
+
+            if (VescIf.scanCanOnConnect() &&
+                    scanButton.enabled && canList.count == 0 &&
+                    VescIf.isPortConnected() &&
+                    VescIf.fwRx() && VescIf.customConfigRxDone()) {
+                scanButton.clicked()
+            }
         }
     }
 
@@ -259,10 +274,6 @@ Item {
 
         function onPortConnectedChanged() {
             scanButton.enabled = VescIf.isPortConnected()
-
-            if (canList.count == 0 && VescIf.isPortConnected()) {
-                scanButton.clicked()
-            }
         }
     }
 
@@ -276,6 +287,7 @@ Item {
 
             scanButton.enabled = true
             scanButton.text = qsTr("Scan")
+
             if (VescIf.isPortConnected()) {
                 canModel.clear()
                 var params = Utility.getFwVersionBlockingCan(VescIf, -1)
@@ -321,18 +333,17 @@ Item {
                                         "deviceIconPath": devicePath,
                                         "logoIconPath": logoPath})
                 }
+
                 canList.currentIndex = 0
-                if (!isTimeout){
-                    scanButton.enabled = true
+
+                if (!isTimeout) {
                     VescIf.emitStatusMessage("CAN Scan Finished", true)
                 } else {
-                    scanButton.enabled = true
                     VescIf.emitStatusMessage("CAN Scan Timed Out", false)
                 }
 
                 selectDeviceInList()
             } else {
-                scanButton.enabled = true
                 VescIf.emitStatusMessage("Device not connected", false)
             }
         }

diff --git a/mobile/Settings.qml b/mobile/Settings.qml
@@ -109,6 +109,13 @@ Item {
                     checked: VescIf.reconnectLastCan()
                 }
 
+                CheckBox {
+                    id: scanCanConnectBox
+                    Layout.fillWidth: true
+                    text: "Scan CAN on connect"
+                    checked: VescIf.scanCanOnConnect()
+                }
+
                 CheckBox {
                     id: darkModeBox
                     Layout.fillWidth: true
@@ -129,6 +136,7 @@ Item {
             qmlUiBox.checked = VescIf.getLoadQmlUiOnConnect()
             qmlUiAskBox.checked = VescIf.askQmlLoad()
             reconnectLastCanBox.checked = VescIf.reconnectLastCan()
+            scanCanConnectBox.checked = VescIf.scanCanOnConnect()
         }
 
         onClosed: {
@@ -139,6 +147,7 @@ Item {
             VescIf.setLoadQmlUiOnConnect(qmlUiBox.checked)
             VescIf.setAskQmlLoad(qmlUiAskBox.checked)
             VescIf.setReconnectLastCan(reconnectLastCanBox.checked)
+            VescIf.setScanCanOnConnect(scanCanConnectBox.checked)
             VescIf.storeSettings()
 
             Utility.keepScreenOn(VescIf.keepScreenOn())

diff --git a/mobile/main.qml b/mobile/main.qml
@@ -128,6 +128,12 @@ ApplicationWindow {
                 id: canScreen
                 anchors.fill: parent
             }
+
+            onVisibleChanged: {
+                if (visible) {
+                    canScreen.scanIfEmpty()
+                }
+            }
         }
     }
 

diff --git a/vescinterface.cpp b/vescinterface.cpp
@@ -4200,6 +4200,16 @@ void VescInterface::setReconnectLastCan(bool set)
     mSettings.setValue("reconnectLastCan", set);
 }
 
+bool VescInterface::scanCanOnConnect()
+{
+    return mSettings.value("scanCanOnConnect", true).toBool();
+}
+
+void VescInterface::setScanCanOnConnect(bool set)
+{
+    mSettings.setValue("scanCanOnConnect", set);
+}
+
 int VescInterface::getLastTcpHubPort() const
 {
     return mLastTcpHubPort;

diff --git a/vescinterface.h b/vescinterface.h
@@ -269,6 +269,9 @@ class VescInterface : public QObject
     Q_INVOKABLE bool reconnectLastCan();
     Q_INVOKABLE void setReconnectLastCan(bool set);
 
+    Q_INVOKABLE bool scanCanOnConnect();
+    Q_INVOKABLE void setScanCanOnConnect(bool set);
+
 signals:
     void statusMessage(const QString &msg, bool isGood);
     void messageDialog(const QString &title, const QString &msg, bool isGood, bool richText);