Bump ESPTool-JS to 0.3.0 (esphome#506)

mkaatman · Jul 8, 2023 · cf4fc18 · cf4fc18
1 parent ddda8cc
commit cf4fc18
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 40 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
     "@mdi/js": "^7.2.96",
     "@polymer/paper-tooltip": "^3.0.1",
     "@types/w3c-web-serial": "^1.0.3",
-    "esptool-js": "^0.2.1",
+    "esptool-js": "^0.3.0",
     "improv-wifi-serial-sdk": "^2.5.0",
     "lit": "^2.7.5",
     "tslib": "^2.5.0",

diff --git a/src/web-serial/create-esploader.ts b/src/web-serial/create-esploader.ts
@@ -2,10 +2,9 @@ import { Transport, ESPLoader } from "esptool-js";
 
 export const createESPLoader = (port: SerialPort) => {
   const transport = new Transport(port);
-  return new ESPLoader(
+  return new ESPLoader({
     transport,
-    115200,
-    // Wrong type, fixed in https://github.com/espressif/esptool-js/pull/75/files
-    undefined as any
-  );
+    baudrate: 115200,
+    romBaudrate: 115200,
+  });
 };
diff --git a/src/web-serial/flash.ts b/src/web-serial/flash.ts
@@ -53,15 +53,15 @@ export const flashFiles = async (
   let totalWritten = 0;
   writeProgress(0);
 
-  await esploader.write_flash(
+  await esploader.write_flash({
     fileArray,
-    "keep",
-    "keep",
-    "keep",
-    false,
-    true,
+    flashSize: "keep",
+    flashMode: "keep",
+    flashFreq: "keep",
+    eraseAll: false,
+    compress: true,
     // report progress
-    (fileIndex: number, written: number, total: number) => {
+    reportProgress: (fileIndex: number, written: number, total: number) => {
       const uncompressedWritten =
         (written / total) * fileArray[fileIndex].data.length;
 
@@ -76,8 +76,8 @@ export const flashFiles = async (
       }
 
       writeProgress(newPct);
-    }
-  );
+    },
+  });
 
   writeProgress(100);
 };