Support: Add support of proper console baudrate for chips with 26MHz …

…frequency.
RushikeshPatange · Feb 5, 2024 · 0ff7eda · 0ff7eda
1 parent ca01866
commit 0ff7eda
Show file tree

Hide file tree

Showing 5 changed files with 120 additions and 25 deletions.
diff --git a/config/config.toml b/config/config.toml
@@ -20,4 +20,6 @@ image.esp32-c3 = "SINGLE_BIN_FOR_ESP32-C3.bin"
 android_app_url = ""
 ios_app_url = ""
 # Optional: URL of the Markdown file for additional information about the app
-readme.text = "<URL to your Markdown file>"
+readme.text = "<URL to your Markdown file>"
+# Optional: Supported console baudrate for app firmware (default value is 115200)
+console_baudrate = <SUPPORTED_CONSOLE_BAUDRATE>
diff --git a/js/index.js b/js/index.js
@@ -58,6 +58,7 @@ let device = null;
 let transport = undefined;
 let chip = "default";
 let chipDesc = "default";
+let consoleBaudrateFromToml;
 let esploader;
 let connected = false;
 let ios_app_url = "";
@@ -137,6 +138,10 @@ function buildQuickTryUI_v1_0() {
         if (config[supported_apps[0]].readme?.text) {
             markdown_payload_url = config[supported_apps[0]].readme.text;
         }
+
+        if (config[supported_apps[0]].console_baudrate) {
+            consoleBaudrateFromToml = config[supported_apps[0]].console_baudrate;
+        }
     }
     setAppURLs(config[supported_apps[0]]);
 }
@@ -227,6 +232,10 @@ $('#device').on('change', function() {
     } else {
         markdown_payload_url = "";
     }
+
+    if (config[deviceTypeSelect.value].console_baudrate) {
+        consoleBaudrateFromToml = config[deviceTypeSelect.value].console_baudrate;
+    }
 });
 
 $(function () {
@@ -263,10 +272,10 @@ async function connectToDevice() {
         };
         esploader = new ESPLoader(loaderOptions);
         connected = true;
-        chipDesc = await esploader.main_fn();
+        chipDesc = await esploader.main();
         chip = esploader.chip.CHIP_NAME;
 
-        await esploader.flash_id();
+        await esploader.flashId();
     } catch(e) {
     }
 
@@ -319,7 +328,7 @@ resetButton.onclick = async () => {
             await device.close();
         }
     }
-    await transport.connect();
+    await transport.connect(consoleBaudrateFromToml);
     await transport.setDTR(false);
     await new Promise(resolve => setTimeout(resolve, 100));
     await transport.setDTR(true);
@@ -350,7 +359,7 @@ eraseButton.onclick = async () => {
     terminalContainer.classList.remove("fade-in-down");
     eraseButton.disabled = true;
     $('#v-pills-console-tab').click();
-    await esploader.erase_flash();
+    await esploader.eraseFlash();
     postFlashDone();
     eraseButton.disabled = false;
 }
@@ -511,7 +520,7 @@ programButton.onclick = async () => {
             eraseAll: false,
             compress: true,
         };
-        await esploader.write_flash(flashOptions);
+        await esploader.writeFlash(flashOptions);
         postFlashDone();
         terminalContainer.classList.remove("fade-in-down");
     } catch (e) {
@@ -531,7 +540,7 @@ async function downloadAndFlash(fileURL) {
                 eraseAll: false,
                 compress: true,
             };
-            await esploader.write_flash(flashOptions);
+            await esploader.writeFlash(flashOptions);
         }
     } catch (e) {
     }

diff --git a/minimal-launchpad/minimal_ui_index.js b/minimal-launchpad/minimal_ui_index.js
@@ -46,6 +46,7 @@ let device = null;
 let transport;
 let chip = "default";
 let chipDesc = "default";
+let consoleBaudrateFromToml;
 let esploader;
 let connected = false;
 let resizeTimeout = false;
@@ -92,7 +93,7 @@ async function downloadAndFlash() {
             eraseAll: true, // Always erasing before flash
             compress: true,
         };
-        await esploader.write_flash(flashOptions);
+        await esploader.writeFlash(flashOptions);
     } catch (error) {
         errorTroubleshootModalToggleButton.click();
         waitButton.style.display = "none";
@@ -232,14 +233,14 @@ async function connectToDevice() {
         esploader = new ESPLoader(loaderOptions);
         connected = true;
 
-        chipDesc = await esploader.main_fn();
+        chipDesc = await esploader.main();
         clearTimeout(deviceConnectionTimeout);
         if (errorTroubleshootModal.classList.contains("show")) {
             errorTroubleshootModalToggleButton.click();
         }
         chip = esploader.chip.CHIP_NAME;
 
-        await esploader.flash_id();
+        await esploader.flashId();
     } catch (error) {
         clearTimeout(deviceConnectionTimeout);
         if (!errorTroubleshootModal.classList.contains("show")) {
@@ -300,7 +301,8 @@ consoleStartButton.onclick = async () => {
     if (config.portConnectionOptions?.length) {
         await transport.connect(parseInt(config.portConnectionOptions[0]?.baudRate), serialOptions);
     } else {
-        await transport.connect();
+        consoleBaudrateFromToml = config[config['supported_apps'][0]].console_baudrate;
+        await transport.connect(consoleBaudrateFromToml);
     }
     await transport.setDTR(false);
     await new Promise(resolve => setTimeout(resolve, 100));

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.3.2",
+		"esptool-js": "^0.4.1",
 		"smol-toml": "^1.1.2",
 		"xterm": "^4.17.0",
 		"xterm-addon-fit": "^0.5.0"