Kaynağa Gözat

Bump esptool-js to 0.3.0 (#390)

Paulus Schoutsen 2 yıl önce
ebeveyn
işleme
2f736cbc80
3 değiştirilmiş dosya ile 22 ekleme ve 18 silme
  1. 7 7
      package-lock.json
  2. 1 1
      package.json
  3. 14 10
      src/flash.ts

+ 7 - 7
package-lock.json

@@ -16,7 +16,7 @@
         "@material/mwc-formfield": "^0.27.0",
         "@material/mwc-icon-button": "^0.27.0",
         "@material/mwc-textfield": "^0.27.0",
-        "esptool-js": "^0.2.2",
+        "esptool-js": "^0.3.0",
         "improv-wifi-serial-sdk": "^2.5.0",
         "lit": "^2.7.5",
         "pako": "^2.1.0",
@@ -1914,9 +1914,9 @@
       }
     },
     "node_modules/esptool-js": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/esptool-js/-/esptool-js-0.2.2.tgz",
-      "integrity": "sha512-Lsw/PEqxzNf6lTxEzH4jRBlUiFo0l0sfTijpJuDrtqoAoR2tvwqwviuWp0L2UPQzHUNVj+PgHKGLYycRkJ/iZw==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/esptool-js/-/esptool-js-0.3.0.tgz",
+      "integrity": "sha512-DQQt/hyh45VvnDv6/lBIhUq9cD7ajZa9x3s/BftvT/zpQN2v5ZnRnBAQsNL0RXwUIGyJoI7MgPp7iGyq0Z2gJg==",
       "dependencies": {
         "pako": "^2.1.0",
         "tslib": "^2.4.1"
@@ -4430,9 +4430,9 @@
       "dev": true
     },
     "esptool-js": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/esptool-js/-/esptool-js-0.2.2.tgz",
-      "integrity": "sha512-Lsw/PEqxzNf6lTxEzH4jRBlUiFo0l0sfTijpJuDrtqoAoR2tvwqwviuWp0L2UPQzHUNVj+PgHKGLYycRkJ/iZw==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/esptool-js/-/esptool-js-0.3.0.tgz",
+      "integrity": "sha512-DQQt/hyh45VvnDv6/lBIhUq9cD7ajZa9x3s/BftvT/zpQN2v5ZnRnBAQsNL0RXwUIGyJoI7MgPp7iGyq0Z2gJg==",
       "requires": {
         "pako": "^2.1.0",
         "tslib": "^2.4.1"

+ 1 - 1
package.json

@@ -30,7 +30,7 @@
     "@material/mwc-formfield": "^0.27.0",
     "@material/mwc-icon-button": "^0.27.0",
     "@material/mwc-textfield": "^0.27.0",
-    "esptool-js": "^0.2.2",
+    "esptool-js": "^0.3.0",
     "improv-wifi-serial-sdk": "^2.5.0",
     "lit": "^2.7.5",
     "pako": "^2.1.0",

+ 14 - 10
src/flash.ts

@@ -38,7 +38,11 @@ export const flash = async (
     });
 
   const transport = new Transport(port);
-  const esploader = new ESPLoader(transport, 115200, undefined);
+  const esploader = new ESPLoader({
+    transport,
+    baudrate: 115200,
+    romBaudrate: 115200,
+  });
 
   // For debugging
   (window as any).esploader = esploader;
@@ -181,15 +185,15 @@ export const flash = async (
   let totalWritten = 0;
 
   try {
-    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;
 
@@ -212,8 +216,8 @@ export const flash = async (
             percentage: newPct,
           },
         });
-      }
-    );
+      },
+    });
   } catch (err: any) {
     fireStateEvent({
       state: FlashStateType.ERROR,