Merge pull request #215 from makermelissa/serial-file-transfer

Use newest REPL JS Library
circuitpython · Jul 17, 2024 · 5065085 · 5065085
2 parents f9228ce + abcf5a9
commit 5065085
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 23 deletions.
diff --git a/js/workflows/usb.js b/js/workflows/usb.js
@@ -236,6 +236,9 @@ class USBWorkflow extends Workflow {
     // Workflow specific Functions
     async _switchToDevice(device) {
         device.addEventListener("message", this.onSerialReceive.bind(this));
+        device.addEventListener("disconnect", async (e) => {
+            await this.onDisconnected(e, false);
+        });
 
         this._serialDevice = device;
         console.log("switch to", this._serialDevice);
@@ -253,13 +256,13 @@ class USBWorkflow extends Workflow {
             await this.writer.ready;
         }
 
-        await this.showBusy(this._getDeviceUid());
-
         this.updateConnected(CONNSTATE.connected);
 
         // At this point we should see if we should init the file client and check if have a saved dir handle
         let fileops = new FileOps(this.repl, false);
         if (await fileops.isReadOnly()) {
+            // UID Only needed for matching the CIRCUITPY drive with the Serial Terminal
+            await this.showBusy(this._getDeviceUid());
             let modal = this.connectDialog.getModal();
 
             // Show the last step

diff --git a/js/workflows/workflow.js b/js/workflows/workflow.js
@@ -66,6 +66,7 @@ class Workflow {
         this._showSerial = params.showSerialFunc;
 
         this.repl.setTitle = this.setTerminalTitle.bind(this);
+        this.repl.writeToTerminal = this.writeToTerminal.bind(this);
         this.repl.serialTransmit = this.serialTransmit.bind(this);
     }
 
@@ -115,7 +116,7 @@ class Workflow {
     }
 
     async onSerialReceive(e) {
-        this.writeToTerminal(await this.repl.onSerialReceive(e));
+        await this.repl.onSerialReceive(e);
     }
 
     connectionStatus(partialConnectionsAllowed = false) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@adafruit/ble-file-transfer-js": "adafruit/ble-file-transfer-js#1.0.2",
-    "@adafruit/circuitpython-repl-js": "adafruit/circuitpython-repl-js#2.1.1",
+    "@adafruit/circuitpython-repl-js": "adafruit/circuitpython-repl-js#3.0.0",
     "@codemirror/lang-python": "^6.1.6",
     "@fortawesome/fontawesome-free": "^6.5.2",
     "@xterm/addon-fit": "^0.10.0",

diff --git a/sass/base/_base.scss b/sass/base/_base.scss
@@ -48,14 +48,13 @@ h5 {
     border: none;
     background-color: $purple;
     margin: 10px 0 10px 10px;
+    cursor: pointer;
+    white-space: nowrap;
 
     i {
         padding-left: 10px;
     }
 
-    cursor: pointer;
-    white-space: nowrap;
-
     &:first-of-type, &.first-item {
         margin-left: 0;
     }

diff --git a/sass/layout/_grid.scss b/sass/layout/_grid.scss
@@ -35,9 +35,6 @@
         counter-increment: step;
 
         .step-number {
-            &::before {
-                content: counter(step);
-            }
             width: 75px;
             height: 75px;
             color: #333;
@@ -49,6 +46,10 @@
             border: solid 5px #333;
             border-radius: 100%;
             min-width: 75px;
+
+            &::before {
+                content: counter(step);
+            }
         }
 
         &.hidden {
@@ -59,6 +60,9 @@
 
 @media (max-width: $screen-xs-max) {
     .connection-layout {
+        max-height: calc(100vh - 100px);
+        padding: 20px;
+
         .step {
             .step-number {
                 width: 50px;
@@ -68,8 +72,5 @@
                 min-width: 50px;
             }
         }
-
-        max-height: calc(100vh - 100px);
-        padding: 20px;
     }
 }
diff --git a/sass/layout/_header.scss b/sass/layout/_header.scss
@@ -101,8 +101,10 @@
 
     button {
         @include rounded-button;
-        background-color: transparent;
-        margin: 0;
+        & {
+            background-color: transparent;
+            margin: 0;
+        }
     }
 }
 

diff --git a/sass/layout/_layout.scss b/sass/layout/_layout.scss
@@ -355,6 +355,12 @@
             border: 1px solid #888;
 
             a {
+                padding-left: 5px;
+                display: grid;
+                grid-template-columns: 30px minmax(60px, 1fr) 60px 1fr;
+                grid-gap: 10px;
+                cursor: default;
+
                 &.hidden-file {
 
                     i,
@@ -363,12 +369,6 @@
                     }
                 }
 
-                padding-left: 5px;
-                display: grid;
-                grid-template-columns: 30px minmax(60px, 1fr) 60px 1fr;
-                grid-gap: 10px;
-                cursor: default;
-
                 &.selected {
                     background-color: $light-purple;
                 }