From 2f8dacc81723c2d221b61cba5c3bfa0411e83c23 Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Tue, 3 Dec 2024 16:36:22 -0800 Subject: [PATCH] Update script --- js/script.js | 72 ++++------------------------------------------------ 1 file changed, 5 insertions(+), 67 deletions(-) diff --git a/js/script.js b/js/script.js index 178a710..180feee 100644 --- a/js/script.js +++ b/js/script.js @@ -32,7 +32,7 @@ document.addEventListener("DOMContentLoaded", () => { console.error(e); errorMsg(e.message || e); if (espStub) { - await espStub.disconnect(); + await espStub.disconnect(); } toggleUIConnected(false); }); @@ -109,60 +109,6 @@ const espLoaderTerminal = { }, }; -function debugMsg(...args) { - function getStackTrace() { - let stack = new Error().stack; - //console.log(stack); - stack = stack.split("\n").map((v) => v.trim()); - stack.shift(); - stack.shift(); - - let trace = []; - for (let line of stack) { - line = line.replace("at ", ""); - trace.push({ - func: line.substr(0, line.indexOf("(") - 1), - pos: line.substring(line.indexOf(".js:") + 4, line.lastIndexOf(":")), - }); - } - - return trace; - } - - let stack = getStackTrace(); - stack.shift(); - let top = stack.shift(); - let prefix = '[' + top.func + ":" + top.pos + "] "; - for (let arg of args) { - if (arg === undefined) { - logMsg(prefix + "undefined"); - } else if (arg === null) { - logMsg(prefix + "null"); - } else if (typeof arg == "string") { - logMsg(prefix + arg); - } else if (typeof arg == "number") { - logMsg(prefix + arg); - } else if (typeof arg == "boolean") { - logMsg(prefix + (arg ? "true" : "false")); - } else if (Array.isArray(arg)) { - logMsg(prefix + "[" + arg.map((value) => toHex(value)).join(", ") + "]"); - } else if (typeof arg == "object" && arg instanceof Uint8Array) { - logMsg( - prefix + - "[" + - Array.from(arg) - .map((value) => toHex(value)) - .join(", ") + - "]" - ); - } else { - logMsg(prefix + "Unhandled type of argument:" + typeof arg); - console.log(arg); - } - prefix = ""; // Only show for first argument - } -} - function errorMsg(text) { logMsg('Error: ' + text); console.error(text); @@ -191,12 +137,6 @@ function enableStyleSheet(node, enabled) { node.disabled = !enabled; } -function formatMacAddr(macAddr) { - return macAddr - .map((value) => value.toString(16).toUpperCase().padStart(2, "0")) - .join(":"); -} - /** * @name clickConnect * Click handler for the connect/disconnect button. @@ -233,6 +173,8 @@ async function clickConnect() { // await esploader.flashId(); toggleUIConnected(true); toggleUIToolbar(true); + + } catch (e) { console.error(e); errorMsg(e.message); @@ -245,12 +187,8 @@ async function clickConnect() { * Change handler for the Baud Rate selector. */ async function changeBaudRate() { - saveSetting("baudrate", baudRate.value); - if (espStub) { - let baud = parseInt(baudRate.value); - if (baudRates.includes(baud)) { - await espStub.setBaudrate(baud); - } + if (baudRates.includes(parseInt(baudRate.value))) { + saveSetting("baudrate", baudRate.value); } }