fix: upload firmware was not working (#18)

Author: dni

src/Connector.jsx

@@ -30,7 +30,6 @@ export const Connector = () => {
       await esploader.main_fn();
       setEsploader(esploader);
       setConnected(true);
-      await esploader.hard_reset();
     } catch (e) {
       console.error(e);
       term.writeln(`Error: ${e.message}`);

src/Programmer.jsx

@@ -31,8 +31,6 @@ export const Programmer = () => {
     }
     try {
       setRunning(true);
-      await esploader().transport.run_stub();
-      await new Promise((resolve) => setTimeout(resolve, 1000));
       await esploader().write_flash({
         fileArray: fileArray,
         flashSize: "keep",
@@ -53,7 +51,6 @@ export const Programmer = () => {
   const erase = async () => {
     try {
       setRunning(true);
-      await new Promise((resolve) => setTimeout(resolve, 1000));
       await esploader().erase_flash();
     } catch (e) {
       console.error(e);
@@ -63,18 +60,37 @@ export const Programmer = () => {
     }
   };
 
+  const reset = async () => {
+    await esploader().hard_reset();
+    await new Promise((resolve) => setTimeout(resolve, 1000));
+  };
+
+  const reconnect = async () => {
+    setRunning(true);
+    await esploader().transport.waitForUnlock(1500);
+    await esploader().transport.disconnect();
+    await esploader().transport.waitForUnlock(1500);
+    term.clear();
+    await esploader().connect();
+    await esploader().run_stub();
+    setRunning(false);
+  };
+
   return (
     <div id="programmer">
       <Show when={connected()}>
             <h3>Upload Firmware</h3>
             <Show when={connected()}>
+              <button disabled={running()} onClick={reconnect}>Reconnect</button>
+              <button disabled={running()} onClick={reset}>Reset device</button>
               <button disabled={running()} onClick={erase}>
                 Erase Firmware
               </button>
             </Show>
             <For each={data.devices} fallback={<div>Loading...</div>}>
               {(device) => (
                 <div className="device">
+                  <h2>{device}</h2>
                   <For each={data.versions} fallback={<div>Loading...</div>}>
                     {(version) => (
                       <div class="version">

src/config.js

@@ -1,19 +1,19 @@
 export const addressesAndFiles = [
   {
     address: "0x1000",
-    fileName: "genericInstaller.ino.bootloader.bin",
+    fileName: "bootloader.bin",
   },
   {
     address: "0x8000",
-    fileName: "genericInstaller.ino.partitions.bin",
+    fileName: "partitions.bin",
   },
   {
     address: "0xE000",
     fileName: "boot_app0.bin",
   },
   {
     address: "0x10000",
-    fileName: "genericInstaller.ino.bin",
+    fileName: "main.bin",
   },
 ];
 

src/versions.json

@@ -1,9 +1,11 @@
 {
   "name": "genericInstaller",
   "devices": [
-    "esp32"
+    "esp32",
+    "tdisplay"
   ],
   "versions": [
+    "v0.1.0",
     "v0.0.0"
   ]
 }