Merge pull request #322 from makermelissa/passthrufixes

Fixes the passthrough updates

index.html

@@ -52,7 +52,7 @@
       <div class="subheader">
         <div class="title left">Adafruit ESPTool</div>
         <div class="right">
-          <label for="noReset"> Turn on for Passthrough updates</label>
+          <label for="noReset"> No reset for Passthrough updates</label>
           <div class="onoffswitch" style="margin-right: 30px;">
             <input
               type="checkbox"

js/script.js

@@ -1,4 +1,5 @@
-import { ESPLoader, Transport } from "https://unpkg.com/esptool-js@0.5.3/bundle.js";
+import { ESPLoader, Transport } from "https://unpkg.com/esptool-js@0.5.4/bundle.js";
+//import { ESPLoader, Transport } from "./esptool-js/bundle.js";
 
 const baudRates = [921600, 115200, 230400, 460800];
 
@@ -135,25 +136,34 @@ function enableStyleSheet(node, enabled) {
  * Click handler for the connect/disconnect button.
  */
 async function clickConnect() {
+    // Disconnect if connected
     if (transport !== null) {
         await transport.disconnect();
         await transport.waitForUnlock(1500);
         toggleUIConnected(false);
         transport = null;
-        device = null;
+        if (device !== null) {
+            await device.close();
+            device = null;
+        }
         chip = null;
         return;
     }
 
+    // Set up device and transport
     if (device === null) {
         device = await serialLib.requestPort({});
+    }
+
+    if (transport === null) {
         transport = new Transport(device, true);
     }
 
     try {
+        const romBaudrate = parseInt(baudRate.value);
         const loaderOptions = {
             transport: transport,
-            baudrate: parseInt(baudRate.value),
+            baudrate: romBaudrate,
             terminal: espLoaderTerminal,
             debugLogging: false,
         };
@@ -163,7 +173,15 @@ async function clickConnect() {
         let resetMode = "default_reset";
         if (noReset.checked) {
             resetMode = "no_reset";
+            try {
+                // Initiate passthrough serial setup
+                await transport.connect(romBaudrate);
+                await transport.disconnect();
+                await sleep(350);
+            } catch (e) {
+            }
         }
+
         chip = await esploader.main(resetMode);
 
         // Temporarily broken
@@ -171,7 +189,6 @@ async function clickConnect() {
         toggleUIConnected(true);
         toggleUIToolbar(true);
 
-
     } catch (e) {
         console.error(e);
         errorMsg(e.message);