From acbcb02f1e4bf2b94489943127225ee71c8f515a Mon Sep 17 00:00:00 2001
From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Fri, 30 Jul 2021 15:38:55 -0700
Subject: [PATCH 1/2] Increased timeout to reduce errors

---
 js/esptool.js | 2 +-
 js/script.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/esptool.js b/js/esptool.js
index f9e8bddb..29071e28 100644
--- 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
index 11f0ebb3..e992e726 100644
--- a/js/script.js
+++ b/js/script.js
@@ -460,7 +460,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);
 }
 

From 48e30d4827a861179a0816d3ce3005ad124139b8 Mon Sep 17 00:00:00 2001
From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Fri, 30 Jul 2021 15:42:40 -0700
Subject: [PATCH 2/2] Fix debug message depth

---
 js/script.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/script.js b/js/script.js
index e992e726..b622897a 100644
--- 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) {