cleanup

Author: haslinghuis

src/js/data_storage.js

@@ -11,8 +11,6 @@ const CONFIGURATOR = {
 
     connectionValid: false,
     connectionValidCliOnly: false,
-    bluetoothMode: false,
-    manualMode: false,
     virtualMode: false,
     virtualApiVersion: "0.0.1",
     cliActive: false,

src/js/protocols/WebSerial.js

@@ -1,7 +1,7 @@
 import { webSerialDevices, vendorIdNames } from "./devices";
 import GUI from "../gui";
 
-const logHead = "[SERIAL]";
+const logHead = "[WEBSERIAL]";
 
 async function* streamAsyncIterable(reader, keepReadingFlag) {
     try {

src/js/serial.js

@@ -30,9 +30,6 @@ class Serial extends EventTarget {
             virtual: this._virtual,
         };
 
-        // Initialize with default protocol
-        this.selectProtocol(false);
-
         // Forward events from all protocols to the Serial class
         this._setupEventForwarding();
     }
@@ -114,59 +111,28 @@ class Serial extends EventTarget {
     }
 
     /**
-     * Selects the appropriate protocol based on port path or CONFIGURATOR settings
+     * Selects the appropriate protocol based on port path
      * @param {string|null} portPath - Optional port path to determine protocol
      * @param {boolean} forceDisconnect - Whether to force disconnect from current protocol
      */
     selectProtocol(portPath = null, forceDisconnect = true) {
-        // Determine which protocol to use based on port path first, then fall back to CONFIGURATOR
+        // Determine which protocol to use based on port path
         let newProtocol;
 
         if (portPath) {
             // Select protocol based on port path
             if (portPath === "virtual") {
                 console.log(`${this.logHead} Using virtual protocol (based on port path)`);
                 newProtocol = this._virtual;
-                // Update CONFIGURATOR flags for consistency
-                CONFIGURATOR.virtualMode = true;
-                CONFIGURATOR.bluetoothMode = false;
-                CONFIGURATOR.manualMode = false;
             } else if (portPath === "manual") {
                 console.log(`${this.logHead} Using websocket protocol (based on port path)`);
                 newProtocol = this._websocket;
-                // Update CONFIGURATOR flags for consistency
-                CONFIGURATOR.virtualMode = false;
-                CONFIGURATOR.bluetoothMode = false;
-                CONFIGURATOR.manualMode = true;
             } else if (portPath.startsWith("bluetooth")) {
                 console.log(`${this.logHead} Using bluetooth protocol (based on port path: ${portPath})`);
                 newProtocol = this._bluetooth;
-                // Update CONFIGURATOR flags for consistency
-                CONFIGURATOR.virtualMode = false;
-                CONFIGURATOR.bluetoothMode = true;
-                CONFIGURATOR.manualMode = false;
             } else {
                 console.log(`${this.logHead} Using web serial protocol (based on port path: ${portPath})`);
                 newProtocol = this._webSerial;
-                // Update CONFIGURATOR flags for consistency
-                CONFIGURATOR.virtualMode = false;
-                CONFIGURATOR.bluetoothMode = false;
-                CONFIGURATOR.manualMode = false;
-            }
-        } else {
-            // Fall back to CONFIGURATOR flags if no port path is provided
-            if (CONFIGURATOR.virtualMode) {
-                console.log(`${this.logHead} Using virtual protocol (based on CONFIGURATOR flags)`);
-                newProtocol = this._virtual;
-            } else if (CONFIGURATOR.manualMode) {
-                console.log(`${this.logHead} Using websocket protocol (based on CONFIGURATOR flags)`);
-                newProtocol = this._websocket;
-            } else if (CONFIGURATOR.bluetoothMode) {
-                console.log(`${this.logHead} Using bluetooth protocol (based on CONFIGURATOR flags)`);
-                newProtocol = this._bluetooth;
-            } else {
-                console.log(`${this.logHead} Using web serial protocol (based on CONFIGURATOR flags)`);
-                newProtocol = this._webSerial;
             }
         }
 
@@ -184,8 +150,6 @@ class Serial extends EventTarget {
             // Set new protocol
             this._protocol = newProtocol;
             console.log(`${this.logHead} Protocol switched successfully to:`, this._protocol);
-        } else {
-            console.log(`${this.logHead} Same protocol selected, no switch needed`);
         }
 
         return this._protocol;
@@ -251,8 +215,6 @@ class Serial extends EventTarget {
             return false;
         }
 
-        console.log(`${this.logHead} Disconnecting from current protocol`, this._protocol);
-
         try {
             // Handle case where we're already disconnected
             if (!this._protocol.connected) {

src/js/serial_backend.js

@@ -125,12 +125,9 @@ function connectDisconnect() {
 
             // Set configuration flags for consistency with other code
             CONFIGURATOR.virtualMode = selectedPort === "virtual";
-            CONFIGURATOR.bluetoothMode = selectedPort.startsWith("bluetooth");
-            CONFIGURATOR.manualMode = selectedPort === "manual";
 
             // Select the appropriate protocol based directly on the port path
             serial.selectProtocol(selectedPort);
-            console.log("Serial protocol selected:", serial._protocol, "using port", portName);
 
             if (CONFIGURATOR.virtualMode) {
                 CONFIGURATOR.virtualApiVersion = PortHandler.portPicker.virtualMspVersion;
@@ -186,7 +183,11 @@ function finishClose(finishedCallback) {
         $("#dialogResetToCustomDefaults")[0].close();
     }
 
-    serial.disconnect(onClosed);
+    serial.disconnect();
+
+    if (CONFIGURATOR.virtualMode) {
+        onClosed(true);
+    }
 
     MSP.disconnect_cleanup();
     PortUsage.reset();