auto update screen while serial port is still open

liamcottle · Dec 15, 2024 · abff26c · abff26c
1 parent ff7b16c
commit abff26c
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 7 deletions.
diff --git a/index.html b/index.html
@@ -289,6 +289,7 @@
                 isFlashing: false,
                 flashingProgress: 0,
 
+                currentSerialPort: null,
                 rnodeDisplayImage: null,
 
                 selectedProduct: null,
@@ -806,11 +807,23 @@
                     return null;
                 }
 
+                // close existing serial port
+                if(this.currentSerialPort){
+                    try {
+                        this.currentSerialPort.close();
+                        this.currentSerialPort = null;
+                    } catch(e) {
+                        console.log(e);
+                    }
+                }
+
                 // ask user to select device
-                return await navigator.serial.requestPort({
+                this.currentSerialPort = await navigator.serial.requestPort({
                     filters: [],
                 });
 
+                return this.currentSerialPort;
+
             },
             async enterDfuMode() {
 
@@ -1172,14 +1185,29 @@
                     return;
                 }
 
-                // read display
-                const displayBuffer = await rnode.readDisplay();
+                // update screen every second
+                const interval = setInterval(async () => {
 
-                // disconnect from rnode
-                await rnode.close();
+                    // stop reloading display when disconnected from serial port
+                    if(!serialPort.readable){
+                        clearInterval(interval);
+                        this.rnodeDisplayImage = null;
+                        return;
+                    }
+
+                    try {
+
+                        // read display
+                        const displayBuffer = await rnode.readDisplay();
+
+                        // update ui
+                        this.rnodeDisplayImage = this.rnodeDisplayBufferToPng(displayBuffer);
+
+                    } catch(e) {
+                        console.log(e);
+                    }
 
-                // update ui
-                this.rnodeDisplayImage = this.rnodeDisplayBufferToPng(displayBuffer);
+                }, 1000);
 
             },
             async dumpEeprom() {

diff --git a/js/rnode.js b/js/rnode.js
@@ -578,6 +578,9 @@ class RNode {
 
         // read response from device
         const [ command, ...displayBuffer ] = await this.readFromSerialPort();
+        if(command !== this.CMD_DISP_READ){
+            throw `unexpected command response: ${command}`;
+        }
 
         return displayBuffer;