From 0ac5125f3fa857cc9a8b904c02b37de0f9066bfc Mon Sep 17 00:00:00 2001
From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Wed, 8 Jan 2025 16:43:23 -0800
Subject: [PATCH] Make no_reset work consistently

---
 index.html   |  2 +-
 js/script.js | 22 +++++++++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index 3ae14c8..61e4b93 100644
--- a/index.html
+++ b/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"
diff --git a/js/script.js b/js/script.js
index f82af0b..1884f79 100644
--- a/js/script.js
+++ b/js/script.js
@@ -135,25 +135,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 +172,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 +188,6 @@ async function clickConnect() {
         toggleUIConnected(true);
         toggleUIToolbar(true);
 
-
     } catch (e) {
         console.error(e);
         errorMsg(e.message);