adafruit-mirror/Adafruit_WebSerial_ESPTool
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #304 from mikeysklar/fix-passthru-noReset

Browse source 
fix : Passthrough logic inside hardReset()
This commit is contained in:
Dan Halbert 2024-11-15 18:37:54 -05:00 committed by GitHub
commit 01bf969941
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
js/script.js
View file

@ -46,7 +46,10 @@ document.addEventListener("DOMContentLoaded", () => {
autoscroll.addEventListener("click", clickAutoscroll);
baudRate.addEventListener("change", changeBaudRate);
darkMode.addEventListener("click", clickDarkMode);
noReset.addEventListener("click", clickNoReset);
noReset.addEventListener("change", () => {
console.log("Checkbox changed:", noReset.checked); // Log checkbox state changes
});
window.addEventListener("error", function (event) {
console.log("Got an uncaught error: ", event.error);
});
@ -248,15 +251,8 @@ async function clickDarkMode() {
* Change handler for ESP32 co-processor boards
*/
async function clickNoReset() {
console.log("Checkbox state:", noReset.checked); // Debugging output
saveSetting("noReset", noReset.checked);
if (espStub) {
try {
// Assuming espStub has a setNoReset method, similar to setBaudrate
await espStub.setNoReset(noReset.checked);
} catch (error) {
console.error("Failed to set noReset:", error);
}
}
}
/**

18
src/esp_loader.ts
View file

@ -164,17 +164,15 @@ export class ESPLoader extends EventTarget {
}
async hardReset(bootloader = false) {
this.logger.log("Try hard reset.");
// Passthrough mode defaults to "off"
// Passthrough checkbox is "on" will prevent a controller reset
const noResetCheckbox = document.getElementById(
"noReset",
) as HTMLInputElement;
const noReset = noResetCheckbox ? noResetCheckbox.checked : false;
// Check for noReset toggle
const noResetCheckbox = document.getElementById("noReset");
const noResetEnabled = noResetCheckbox
? (noResetCheckbox as HTMLInputElement).checked
: false;
if (noResetEnabled) {
this.logger.log("No reset requested; skipping hard reset.");
return; // Skip reset if noReset is enabled
if (noReset) {
return; // Skip reset if noReset is true
}
if (bootloader) {