Minor adjustments

breiler · Dec 22, 2024 · 7f09516 · 7f09516
1 parent 6d1058c
commit 7f09516
Show file tree

Hide file tree

Showing 5 changed files with 107 additions and 88 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -65,7 +65,7 @@
         "@xterm/xterm": "^5.5.0",
         "bootstrap": "^5.3.0",
         "crypto-js": "^4.2.0",
-        "esptool-js": "^0.4.7",
+        "esptool-js": "^0.5.3",
         "firebase": "^10.6.0",
         "js-yaml": "^4.1.0",
         "react": "^18.2.0",

diff --git a/src/pages/filebrowser/FileBrowser.tsx b/src/pages/filebrowser/FileBrowser.tsx
@@ -70,8 +70,8 @@ const FileBrowser = () => {
             return;
         }
 
-        await controllerService.write(Buffer.from([0x0c])); // CTRL-L Restting echo mode
         setIsLoading(true);
+        await controllerService.write(Buffer.from([0x0c])); // CTRL-L Restting echo mode
         await refreshFileList();
 
         setConfigFilename(

diff --git a/src/pages/wifisettings/WiFiSettings.tsx b/src/pages/wifisettings/WiFiSettings.tsx
@@ -134,86 +134,94 @@ const WiFiSettings = () => {
     };
 
     const saveSettings = async () => {
-        if (hostname !== settings?.hostname) {
-            await controllerService?.send(new Command("$Hostname=" + hostname));
-        }
-
-        if (wifiMode !== settings?.wifiMode) {
-            await controllerService?.send(
-                new Command("$WiFi/Mode=" + wifiMode)
-            );
-        }
-
-        if (stationSSID !== settings?.stationSSID) {
-            await controllerService?.send(
-                new Command("$Sta/SSID=" + stationSSID)
-            );
-        }
-
-        if (stationIpMode !== settings?.stationIpMode) {
-            await controllerService?.send(
-                new Command("$Sta/IPMode=" + stationIpMode)
-            );
-        }
-
-        if (stationPassword !== settings?.stationPassword) {
-            await controllerService?.send(
-                new Command(
-                    "$Sta/Password=" + encodePassword(stationPassword ?? "")
-                )
-            );
-        }
-
-        if (stationMinSecurity !== settings?.stationMinSecurity) {
-            await controllerService?.send(
-                new Command("$Sta/MinSecurity=" + stationMinSecurity)
-            );
-        }
-
-        if (stationIP !== settings?.stationIP) {
-            await controllerService?.send(new Command("$Sta/IP=" + stationIP));
-        }
-
-        if (stationGateway !== settings?.stationGateway) {
-            await controllerService?.send(
-                new Command("$Sta/Gateway=" + stationGateway)
-            );
-        }
-
-        if (stationNetmask !== settings?.stationNetmask) {
-            await controllerService?.send(
-                new Command("$Sta/Netmask=" + stationNetmask)
-            );
-        }
-
-        if (apSSID !== settings?.apSSID) {
-            await controllerService?.send(new Command("$AP/SSID=" + apSSID));
-        }
-
-        if (apPassword !== settings?.apPassword) {
-            await controllerService?.send(
-                new Command("$AP/Password=" + encodePassword(apPassword ?? ""))
-            );
-        }
-
-        if (apChannel !== settings?.apChannel) {
-            await controllerService?.send(
-                new Command("$AP/Channel=" + apChannel)
-            );
-        }
-
-        if (apIP !== settings?.apIP) {
-            await controllerService?.send(new Command("$AP/IP=" + apIP));
-        }
-
-        if (apCountry !== settings?.apCountry) {
-            await controllerService?.send(
-                new Command("$AP/Country=" + apCountry)
-            );
-        }
-
+        setIsSaving(true);
         try {
-            setIsSaving(true);
+            if (hostname !== settings?.hostname) {
+                await controllerService?.send(
+                    new Command("$Hostname=" + hostname)
+                );
+            }
+
+            if (wifiMode !== settings?.wifiMode) {
+                await controllerService?.send(
+                    new Command("$WiFi/Mode=" + wifiMode)
+                );
+            }
+
+            if (stationSSID !== settings?.stationSSID) {
+                await controllerService?.send(
+                    new Command("$Sta/SSID=" + stationSSID)
+                );
+            }
+
+            if (stationIpMode !== settings?.stationIpMode) {
+                await controllerService?.send(
+                    new Command("$Sta/IPMode=" + stationIpMode)
+                );
+            }
+
+            if (stationPassword !== settings?.stationPassword) {
+                await controllerService?.send(
+                    new Command(
+                        "$Sta/Password=" + encodePassword(stationPassword ?? "")
+                    )
+                );
+            }
+
+            if (stationMinSecurity !== settings?.stationMinSecurity) {
+                await controllerService?.send(
+                    new Command("$Sta/MinSecurity=" + stationMinSecurity)
+                );
+            }
+
+            if (stationIP !== settings?.stationIP) {
+                await controllerService?.send(
+                    new Command("$Sta/IP=" + stationIP)
+                );
+            }
+
+            if (stationGateway !== settings?.stationGateway) {
+                await controllerService?.send(
+                    new Command("$Sta/Gateway=" + stationGateway)
+                );
+            }
+
+            if (stationNetmask !== settings?.stationNetmask) {
+                await controllerService?.send(
+                    new Command("$Sta/Netmask=" + stationNetmask)
+                );
+            }
+
+            if (apSSID !== settings?.apSSID) {
+                await controllerService?.send(
+                    new Command("$AP/SSID=" + apSSID)
+                );
+            }
+
+            if (apPassword !== settings?.apPassword) {
+                await controllerService?.send(
+                    new Command(
+                        "$AP/Password=" + encodePassword(apPassword ?? "")
+                    )
+                );
+            }
+
+            if (apChannel !== settings?.apChannel) {
+                await controllerService?.send(
+                    new Command("$AP/Channel=" + apChannel)
+                );
+            }
+
+            if (apIP !== settings?.apIP) {
+                await controllerService?.send(new Command("$AP/IP=" + apIP));
+            }
+
+            if (apCountry !== settings?.apCountry) {
+                await controllerService?.send(
+                    new Command("$AP/Country=" + apCountry)
+                );
+            }
+
             await controllerService?.hardReset();
             await refresh();
         } finally {

diff --git a/src/utils/serialport/SerialPort.ts b/src/utils/serialport/SerialPort.ts
@@ -98,6 +98,7 @@ export class SerialPort {
     private readers: SerialReader[] = [];
     private reader: ReadableStreamDefaultReader<Uint8Array>;
     private deviceInfo: DeviceInfo;
+    private dtrState: boolean = false;
 
     constructor(serialPort: NativeSerialPort) {
         this.serialPort = serialPort;
@@ -155,9 +156,15 @@ export class SerialPort {
     };
 
     async setDTR(enabled: boolean) {
+        this.dtrState = enabled;
         await this.serialPort.setSignals({ dataTerminalReady: enabled });
     }
 
+    async setRTS(enabled: boolean) {
+        await this.serialPort.setSignals({ requestToSend: enabled });
+        this.setDTR(this.dtrState);
+    }
+
     open = async (baudRate = 115200): Promise<void> => {
         if (this.state === SerialPortState.DISCONNECTING) {
             await new Promise((r) => setTimeout(r, 1000));
@@ -226,6 +233,10 @@ export class SerialPort {
         }
 
         try {
+            while (this.serialPort.writable.locked) {
+                await sleep(100);
+            }
+
             const writer = this.serialPort.writable!.getWriter();
             return writer.write(data).finally(() => {
                 writer.releaseLock();