Merge pull request #17 from RushikeshPatange/fix/support_esptooljs_3.0.0

Fix : Add Support for esptool-js 3.0.0 Release in ESPLaunchpad
RushikeshPatange · Jul 18, 2023 · 832a4e5 · 832a4e5
2 parents b225ed6 + 9cf1b02
commit 832a4e5
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 15 deletions.
diff --git a/js/index.js b/js/index.js
@@ -270,9 +270,13 @@ async function connectToDevice() {
     }
 
     try {
-        esploader = new ESPLoader(transport, baudrates.value, espLoaderTerminal);
+        const loaderOptions = {
+            transport,
+            baudrate: baudrates.value,
+            terminal: espLoaderTerminal
+        };
+        esploader = new ESPLoader(loaderOptions);
         connected = true;
-
         chipDesc = await esploader.main_fn();
         chip = esploader.chip.CHIP_NAME;
 
@@ -524,8 +528,19 @@ programButton.onclick = async () => {
         fileArr.push({data:fileObj.data, address:offset});
     }
     $('#v-pills-console-tab').click();
-    await esploader.write_flash(fileArr, 'keep');
-    postFlashDone();
+    try {
+        const flashOptions = {
+            fileArray : fileArr,
+            flashSize: "keep",
+            flashMode: undefined,
+            flashFreq: undefined,
+            eraseAll: false,
+            compress: true,
+        };
+        await esploader.write_flash(flashOptions);
+        postFlashDone();
+    } catch (e) {
+    }
 }
 
 async function downloadAndFlash(fileURL) {
@@ -552,9 +567,20 @@ async function downloadAndFlash(fileURL) {
             resolve(undefined);
         }
     });
-    if (data !== undefined) {
-        $('#v-pills-console-tab').click();
-        await esploader.write_flash([{data:data, address:0x0000}], 'keep');
+    try {
+        if (data !== undefined) {
+            $('#v-pills-console-tab').click();
+            const flashOptions = {
+                fileArray : [{data:data, address:0x0000}],
+                flashSize: "keep",
+                flashMode: undefined,
+                flashFreq: undefined,
+                eraseAll: false,
+                compress: true,
+            };
+            await esploader.write_flash(flashOptions);
+        }
+    } catch (e) {
     }
 }
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
 	"name": "esp-launchpad",
 	"dependencies": {
 		"crypto-js": "^4.1.1",
-		"esptool-js": "^0.2.2",
+		"esptool-js": "^0.3.0",
 		"toml-js": "^0.0.8",
 		"xterm": "^4.17.0",
 		"xterm-addon-fit": "^0.5.0"