Pleasing sonar

Author: haslinghuis

src/js/port_handler.js

@@ -122,9 +122,8 @@ PortHandler.removedSerialDevice = function (device) {
 PortHandler.addedUsbDevice = function (device) {
     this.updateDeviceList("usb").then(() => {
         const selectedPort = this.selectActivePort(device);
-        console.log(`${this.logHead} Added USB device:`, device, selectedPort);
-        if (selectedPort === device.path) {
-            // Emit an event with the proper type for backward compatibility
+        if (selectedPort === device?.path) {
+            // Send event when the port handler auto selects a new USB device
             EventBus.$emit("port-handler:auto-select-usb-device", selectedPort);
         }
     });

src/js/protocols/WebSerial.js

@@ -5,7 +5,6 @@ const logHead = "[SERIAL]";
 
 // Update streamAsyncIterable function
 async function* streamAsyncIterable(reader, keepReadingFlag) {
-    let lockReleased = false;
     try {
         while (keepReadingFlag()) {
             try {
@@ -22,9 +21,8 @@ async function* streamAsyncIterable(reader, keepReadingFlag) {
     } finally {
         // Only release the lock if we still have the reader and it hasn't been released
         try {
-            if (reader && !reader.closed && !lockReleased) {
+            if (!reader?.closed) {
                 reader.releaseLock();
-                lockReleased = true;
             }
         } catch (error) {
             console.warn(`${logHead} Error releasing reader lock:`, error);
@@ -276,15 +274,11 @@ class WebSerial extends EventTarget {
 
             // Cancel reader first if it exists - this doesn't release the lock
             if (this.reader) {
-                // try {
                 try {
                     await this.reader.cancel();
                 } catch (e) {
                     console.warn(`${logHead} Reader cancel error (can be ignored):`, e);
                 }
-                // } catch (e) {
-                //     // Ignore errors here - reader might already be canceled
-                // }
             }
 
             // Don't try to release the reader lock - streamAsyncIterable will handle it

src/js/protocols/__tests__/WebBluetooth.test.js

@@ -61,7 +61,7 @@ export function initializeSerialBackend() {
             !GUI.connecting_to &&
             GUI.active_tab !== "firmware_flasher" &&
             ((PortHandler.portPicker.autoConnect && !["manual", "virtual"].includes(device)) ||
-                Date.now() - rebootTimestamp > REBOOT_CONNECT_MAX_TIME_MS)
+                Date.now() - rebootTimestamp < REBOOT_CONNECT_MAX_TIME_MS)
         ) {
             connectDisconnect();
         }
@@ -73,7 +73,7 @@ export function initializeSerialBackend() {
             !GUI.connecting_to &&
             GUI.active_tab !== "firmware_flasher" &&
             ((PortHandler.portPicker.autoConnect && !["manual", "virtual"].includes(device)) ||
-                Date.now() - rebootTimestamp > REBOOT_CONNECT_MAX_TIME_MS)
+                Date.now() - rebootTimestamp < REBOOT_CONNECT_MAX_TIME_MS)
         ) {
             connectDisconnect();
         }
@@ -812,15 +812,9 @@ export function reinitializeConnection() {
     if (CONFIGURATOR.virtualMode) {
         connectDisconnect();
         if (PortHandler.portPicker.autoConnect) {
-<<<<<<< HEAD
             return setTimeout(function () {
                 $("a.connection_button__link").trigger("click");
             }, 500);
-=======
-            clickConnectDisconnect();
-        } else {
-            return connectDisconnect();
->>>>>>> d8b258f5 (Update autoconnect)
         }
     }
 
@@ -832,20 +826,11 @@ export function reinitializeConnection() {
     // Send reboot command to the flight controller
     MSP.send_message(MSPCodes.MSP_SET_REBOOT, false, false);
 
-<<<<<<< HEAD
     if (currentPort.startsWith("bluetooth")) {
         if (!PortHandler.portPicker.autoConnect) {
             return setTimeout(function () {
                 $("a.connection_button__link").trigger("click");
             }, 1500);
-=======
-    if (CONFIGURATOR.bluetoothMode) {
-        if (PortHandler.portPicker.autoConnect) {
-            // Bluetooth devices are not disconnected when rebooting
-        } else {
-            // Disconnect from the device
-            clickConnectDisconnect();
->>>>>>> d8b258f5 (Update autoconnect)
         }
     }
 
@@ -904,13 +889,6 @@ function showRebootDialog() {
         }
     }, 100);
 
-    const timeout = !CONFIGURATOR.bluetoothMode && !CONFIGURATOR.virtualMode && !CONFIGURATOR.manualMode ? 5000 : 1500;
-
-    // Set a maximum timeout for the reboot process (5 seconds)
-    setTimeout(function () {
-        executeCallbackOnce();
-    }, timeout);
-
     // Helper function to create the reboot dialog if it doesn't exist
     function createRebootProgressDialog() {
         const dialog = document.createElement("dialog");