Merge pull request #14 from makermelissa/main

Increased timeout to reduce errors
adafruit · Aug 2, 2021 · e66d5c3 · e66d5c3
2 parents 18bfe29 + 48e30d4
commit e66d5c3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/js/esptool.js b/js/esptool.js
@@ -944,7 +944,7 @@ class EspLoader {
     this.logMsg("Running stub...")
     await this.memFinish(stub['entry']);
 
-    let p = await this.readBuffer(100);
+    let p = await this.readBuffer(500);
     p = String.fromCharCode(...p);
 
     if (p != 'OHAI') {

diff --git a/js/script.js b/js/script.js
@@ -143,8 +143,9 @@ function debugMsg(...args) {
   function getStackTrace() {
     let stack = new Error().stack;
     stack = stack.split("\n").map(v => v.trim());
-    stack.shift();
-    stack.shift();
+    for (let i=0; i<3; i++) {
+        stack.shift();
+    }
 
     let trace = [];
     for (let line of stack) {
@@ -460,7 +461,7 @@ function toggleUIConnected(connected) {
 function loadAllSettings() {
   // Load all saved settings or defaults
   autoscroll.checked = loadSetting('autoscroll', true);
-  baudRate.value = loadSetting('baudrate', 921600);
+  baudRate.value = loadSetting('baudrate', baudRates[0]);
   darkMode.checked = loadSetting('darkmode', false);
 }