esp32tool 1.4.0 → 1.5.0

package/css/style.css

@@ -2269,3 +2269,466 @@ body.console-active .main {
   padding-top: 0 !important;
   overflow: hidden !important;
 }
+
+/* ========== Hex Editor Container ========== */
+.hexeditor-container {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 1001;
+  background-color: #1c1c1c;
+  display: flex;
+  flex-direction: column;
+  font-family: SFMono-Regular, Consolas, "Liberation Mono", Menlo, Courier, monospace;
+  color: #ddd;
+}
+
+.hexeditor-container.hidden {
+  display: none;
+}
+
+/* Hide header and commands when hex editor is active */
+body.hexeditor-active .header {
+  display: none !important;
+}
+body.hexeditor-active #commands {
+  display: none !important;
+}
+body.hexeditor-active #notSupported {
+  display: none !important;
+}
+body.hexeditor-active .main {
+  padding-top: 0 !important;
+  overflow: hidden !important;
+}
+
+/* Hex Editor Header / Toolbar */
+.hexeditor-toolbar {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 6px 12px;
+  background-color: #2a2a2a;
+  border-bottom: 1px solid #444;
+  flex-wrap: wrap;
+  min-height: 40px;
+}
+
+.hexeditor-toolbar h3 {
+  margin: 0;
+  font-size: 14px;
+  font-weight: 600;
+  white-space: nowrap;
+}
+
+.hexeditor-toolbar .spacer {
+  flex: 1;
+}
+
+.hexeditor-toolbar button {
+  padding: 4px 14px;
+  font-size: 12px;
+  background-color: #444;
+  color: #ddd;
+  border: 1px solid #555;
+  border-radius: 3px;
+  cursor: pointer;
+  white-space: nowrap;
+}
+
+.hexeditor-toolbar button:hover {
+  background-color: #555;
+}
+
+.hexeditor-toolbar button.primary {
+  background-color: #2e7d32;
+  border-color: #388e3c;
+}
+
+.hexeditor-toolbar button.primary:hover {
+  background-color: #388e3c;
+}
+
+.hexeditor-toolbar button.danger {
+  background-color: #c62828;
+  border-color: #d32f2f;
+}
+
+.hexeditor-toolbar button.danger:hover {
+  background-color: #d32f2f;
+}
+
+.hexeditor-toolbar button:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
+/* Search bar */
+.hexeditor-search {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  padding: 4px 12px;
+  background-color: #252525;
+  border-bottom: 1px solid #333;
+}
+
+.hexeditor-search label {
+  font-size: 12px;
+  color: #aaa;
+  white-space: nowrap;
+}
+
+.hexeditor-search input[type="text"] {
+  padding: 3px 8px;
+  font-size: 12px;
+  font-family: inherit;
+  background-color: #333;
+  color: #ddd;
+  border: 1px solid #555;
+  border-radius: 3px;
+  outline: none;
+  width: 200px;
+}
+
+.hexeditor-search input[type="text"]:focus {
+  border-color: #71ae1e;
+}
+
+.hexeditor-search select {
+  padding: 3px 6px;
+  font-size: 12px;
+  font-family: inherit;
+  background-color: #333;
+  color: #ddd;
+  border: 1px solid #555;
+  border-radius: 3px;
+  outline: none;
+}
+
+.hexeditor-search button {
+  padding: 3px 10px;
+  font-size: 12px;
+  background-color: #444;
+  color: #ddd;
+  border: 1px solid #555;
+  border-radius: 3px;
+  cursor: pointer;
+}
+
+.hexeditor-search button:hover {
+  background-color: #555;
+}
+
+.hexeditor-search .search-info {
+  font-size: 11px;
+  color: #888;
+  margin-left: 4px;
+}
+
+/* Status bar */
+.hexeditor-statusbar {
+  display: flex;
+  align-items: center;
+  gap: 16px;
+  padding: 4px 12px;
+  background-color: #1a3a1a;
+  border-top: 1px solid #444;
+  font-size: 11px;
+  color: #aaa;
+}
+
+.hexeditor-statusbar .status-item {
+  white-space: nowrap;
+}
+
+.hexeditor-statusbar .status-modified {
+  color: #ffab40;
+  font-weight: 600;
+}
+
+/* Main hex content area */
+.hexeditor-body {
+  flex: 1;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+}
+
+.hexeditor-viewport {
+  flex: 1;
+  overflow-y: auto;
+  overflow-x: auto;
+  position: relative;
+}
+
+/* Row layout */
+.hexeditor-row {
+  display: flex;
+  line-height: 20px;
+  height: 20px;
+  white-space: nowrap;
+}
+
+.hexeditor-row:hover {
+  background-color: #2a2a2a;
+}
+
+.hexeditor-row.highlight-row {
+  background-color: #3a3a1a !important;
+}
+
+/* Address gutter */
+.hexeditor-addr {
+  width: 80px;
+  min-width: 80px;
+  text-align: right;
+  padding-right: 12px;
+  color: #6a9955;
+  font-size: 12px;
+  user-select: none;
+  -webkit-user-select: none;
+}
+
+/* Hex cells area */
+.hexeditor-hex {
+  display: flex;
+  gap: 0;
+  padding-right: 16px;
+}
+
+.hexeditor-hex .hex-cell {
+  width: 26px;
+  text-align: center;
+  font-size: 12px;
+  cursor: text;
+  color: #ddd;
+  border: 1px solid transparent;
+  padding: 0 1px;
+  box-sizing: border-box;
+}
+
+.hexeditor-hex .hex-cell:nth-child(8n) {
+  margin-right: 6px;
+}
+
+.hexeditor-hex .hex-cell.modified {
+  color: #ff6b6b;
+  font-weight: bold;
+}
+
+.hexeditor-hex .hex-cell.selected {
+  background-color: #264f78;
+  border-color: #3a7cbf;
+}
+
+.hexeditor-hex .hex-cell.search-match {
+  background-color: #5a5a00;
+  border-color: #8a8a00;
+}
+
+.hexeditor-hex .hex-cell.search-current {
+  background-color: #8a6a00;
+  border-color: #bb9b00;
+}
+
+.hexeditor-hex .hex-cell.editing {
+  background-color: #1e3a5f;
+  border-color: #4a90d9;
+  outline: none;
+}
+
+.hexeditor-hex .hex-cell.zero {
+  color: #555;
+}
+
+.hexeditor-hex .hex-cell.ff {
+  color: #666;
+}
+
+/* Separator between hex and ASCII */
+.hexeditor-sep {
+  width: 2px;
+  min-width: 2px;
+  background-color: #444;
+  margin: 0 4px;
+}
+
+/* ASCII area */
+.hexeditor-ascii {
+  display: flex;
+  gap: 0;
+}
+
+.hexeditor-ascii .ascii-cell {
+  width: 9px;
+  text-align: center;
+  font-size: 12px;
+  cursor: text;
+  color: #b5cea8;
+  border: 1px solid transparent;
+  box-sizing: border-box;
+}
+
+.hexeditor-ascii .ascii-cell.non-printable {
+  color: #555;
+}
+
+.hexeditor-ascii .ascii-cell.modified {
+  color: #ff6b6b;
+  font-weight: bold;
+}
+
+.hexeditor-ascii .ascii-cell.selected {
+  background-color: #264f78;
+  border-color: #3a7cbf;
+}
+
+.hexeditor-ascii .ascii-cell.search-match {
+  background-color: #5a5a00;
+  border-color: #8a8a00;
+}
+
+.hexeditor-ascii .ascii-cell.search-current {
+  background-color: #8a6a00;
+  border-color: #bb9b00;
+}
+
+.hexeditor-ascii .ascii-cell.editing {
+  background-color: #1e3a5f;
+  border-color: #4a90d9;
+  outline: none;
+}
+
+/* Progress overlay for loading */
+.hexeditor-progress-overlay {
+  position: absolute;
+  top: 0; left: 0; right: 0; bottom: 0;
+  background-color: rgba(0,0,0,0.85);
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  z-index: 10;
+}
+
+.hexeditor-progress-overlay.hidden {
+  display: none;
+}
+
+.hexeditor-progress-overlay .progress-text {
+  font-size: 16px;
+  color: #ddd;
+  margin-bottom: 16px;
+}
+
+.hexeditor-progress-overlay .progress-bar-outer {
+  width: 400px;
+  max-width: 80%;
+  height: 20px;
+  background-color: #333;
+  border-radius: 10px;
+  overflow: hidden;
+}
+
+.hexeditor-progress-overlay .progress-bar-inner {
+  height: 100%;
+  background-color: #71ae1e;
+  width: 0%;
+  transition: width 0.15s linear;
+  border-radius: 10px;
+}
+
+/* Goto address input */
+.hexeditor-goto {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
+
+.hexeditor-goto input {
+  width: 100px;
+  padding: 3px 8px;
+  font-size: 12px;
+  font-family: inherit;
+  background-color: #333;
+  color: #ddd;
+  border: 1px solid #555;
+  border-radius: 3px;
+  outline: none;
+}
+
+.hexeditor-goto input:focus {
+  border-color: #71ae1e;
+}
+
+/* Responsive hex editor for narrow viewports */
+@media (max-width: 768px) {
+  .hexeditor-container {
+    font-size: 11px;
+  }
+
+  .hexeditor-toolbar {
+    padding: 4px 8px;
+    gap: 4px;
+  }
+
+  .hexeditor-toolbar h3 {
+    font-size: 12px;
+  }
+
+  .hexeditor-toolbar button {
+    padding: 3px 8px;
+    font-size: 11px;
+  }
+
+  .hexeditor-search {
+    flex-wrap: wrap;
+    gap: 4px;
+    padding: 4px 8px;
+  }
+
+  .hexeditor-search input[type="text"] {
+    width: 140px;
+    font-size: 11px;
+  }
+
+  .hexeditor-addr {
+    width: 64px;
+    min-width: 64px;
+    padding-right: 6px;
+    font-size: 11px;
+  }
+
+  .hexeditor-hex .hex-cell {
+    width: 20px;
+    font-size: 11px;
+  }
+
+  .hexeditor-hex .hex-cell:nth-child(8n) {
+    margin-right: 3px;
+  }
+
+  .hexeditor-ascii .ascii-cell {
+    width: 7px;
+    font-size: 11px;
+  }
+
+  .hexeditor-sep {
+    margin: 0 2px;
+  }
+
+  .hexeditor-statusbar {
+    gap: 8px;
+    padding: 3px 8px;
+    font-size: 10px;
+    flex-wrap: wrap;
+  }
+
+  .hexeditor-goto input {
+    width: 70px;
+  }
+}

package/dist/cli.js

@@ -218,7 +218,7 @@ async function connectViaUSB(targetVid, targetPid, baudRate) {
             try {
                 await webPort.close();
             }
-            catch (closeErr) {
+            catch (_closeErr) {
                 // Ignore close errors
             }
         }
@@ -427,7 +427,7 @@ async function main() {
             try {
                 await esploader.disconnect();
             }
-            catch (disconnectErr) {
+            catch (_disconnectErr) {
                 // Ignore disconnect errors during error handling
             }
         }

package/dist/esp_loader.js

@@ -1,7 +1,7 @@
 /// <reference types="@types/w3c-web-serial" />
 import { CHIP_FAMILY_ESP32, CHIP_FAMILY_ESP32S2, CHIP_FAMILY_ESP32S3, CHIP_FAMILY_ESP32C2, CHIP_FAMILY_ESP32C3, CHIP_FAMILY_ESP32C5, CHIP_FAMILY_ESP32C6, CHIP_FAMILY_ESP32C61, CHIP_FAMILY_ESP32H2, CHIP_FAMILY_ESP32H4, CHIP_FAMILY_ESP32H21, CHIP_FAMILY_ESP32P4, CHIP_FAMILY_ESP32S31, CHIP_FAMILY_ESP8266, MAX_TIMEOUT, DEFAULT_TIMEOUT, ERASE_REGION_TIMEOUT_PER_MB, ESP_CHANGE_BAUDRATE, ESP_CHECKSUM_MAGIC, ESP_FLASH_BEGIN, ESP_FLASH_DATA, ESP_FLASH_END, ESP_MEM_BEGIN, ESP_MEM_DATA, ESP_MEM_END, ESP_READ_REG, ESP_WRITE_REG, ESP_SPI_ATTACH, ESP_SYNC, ESP_GET_SECURITY_INFO, FLASH_SECTOR_SIZE, FLASH_WRITE_SIZE, STUB_FLASH_WRITE_SIZE, MEM_END_ROM_TIMEOUT, ROM_INVALID_RECV_MSG, SYNC_PACKET, SYNC_TIMEOUT, USB_RAM_BLOCK, ESP_ERASE_FLASH, ESP_ERASE_REGION, ESP_READ_FLASH, CHIP_ERASE_TIMEOUT, FLASH_READ_TIMEOUT, timeoutPerMb, ESP_ROM_BAUD, USB_JTAG_SERIAL_PID, ESP_FLASH_DEFL_BEGIN, ESP_FLASH_DEFL_DATA, ESP_FLASH_DEFL_END, getSpiFlashAddresses, DETECTED_FLASH_SIZES, CHIP_DETECT_MAGIC_REG_ADDR, CHIP_DETECT_MAGIC_VALUES, CHIP_ID_TO_INFO, ESP32_BASEFUSEADDR, ESP32_APB_CTL_DATE_ADDR, ESP32S2_EFUSE_BLOCK1_ADDR, ESP32S3_EFUSE_BLOCK1_ADDR, ESP32C2_EFUSE_BLOCK2_ADDR, ESP32C5_EFUSE_BLOCK1_ADDR, ESP32C6_EFUSE_BLOCK1_ADDR, ESP32C61_EFUSE_BLOCK1_ADDR, ESP32H2_EFUSE_BLOCK1_ADDR, ESP32P4_EFUSE_BLOCK1_ADDR, ESP32S31_EFUSE_BLOCK1_ADDR, SlipReadError, ESP32S2_RTC_CNTL_WDTWPROTECT_REG, ESP32S2_RTC_CNTL_WDTCONFIG0_REG, ESP32S2_RTC_CNTL_WDTCONFIG1_REG, ESP32S2_RTC_CNTL_WDT_WKEY, ESP32S2_RTC_CNTL_OPTION1_REG, ESP32S2_RTC_CNTL_FORCE_DOWNLOAD_BOOT_MASK, ESP32S3_RTC_CNTL_WDTWPROTECT_REG, ESP32S3_RTC_CNTL_WDTCONFIG0_REG, ESP32S3_RTC_CNTL_WDTCONFIG1_REG, ESP32S3_RTC_CNTL_WDT_WKEY, ESP32S3_RTC_CNTL_OPTION1_REG, ESP32S3_RTC_CNTL_FORCE_DOWNLOAD_BOOT_MASK, ESP32C3_EFUSE_RD_MAC_SPI_SYS_3_REG, ESP32C3_EFUSE_RD_MAC_SPI_SYS_5_REG, ESP32C3_RTC_CNTL_WDTWPROTECT_REG, ESP32C3_RTC_CNTL_WDTCONFIG0_REG, ESP32C3_RTC_CNTL_WDTCONFIG1_REG, ESP32C3_RTC_CNTL_WDT_WKEY, ESP32C5_C6_RTC_CNTL_WDTWPROTECT_REG, ESP32C5_C6_RTC_CNTL_WDTCONFIG0_REG, ESP32C5_C6_RTC_CNTL_WDTCONFIG1_REG, ESP32C5_C6_RTC_CNTL_WDT_WKEY, ESP32C5_UART_CLKDIV_REG, ESP32C5_PCR_SYSCLK_CONF_REG, ESP32C5_PCR_SYSCLK_XTAL_FREQ_V, ESP32C5_PCR_SYSCLK_XTAL_FREQ_S, ESP32P4_RTC_CNTL_WDTWPROTECT_REG, ESP32P4_RTC_CNTL_WDTCONFIG0_REG, ESP32P4_RTC_CNTL_WDTCONFIG1_REG, ESP32P4_RTC_CNTL_WDT_WKEY, ESP32P4_RTC_CNTL_OPTION1_REG, ESP32P4_RTC_CNTL_FORCE_DOWNLOAD_BOOT_MASK, ESP32P4_LP_SYSTEM_REG_ANA_XPD_PAD_GROUP_REG, ESP32P4_PMU_EXT_LDO_P0_0P1A_ANA_REG, ESP32P4_PMU_ANA_0P1A_EN_CUR_LIM_0, ESP32P4_PMU_EXT_LDO_P0_0P1A_REG, ESP32P4_PMU_0P1A_TARGET0_0, ESP32P4_PMU_0P1A_FORCE_TIEH_SEL_0, ESP32P4_PMU_DATE_REG, ESP32S2_UARTDEV_BUF_NO, ESP32S2_UARTDEV_BUF_NO_USB_OTG, ESP32S3_UARTDEV_BUF_NO, ESP32S3_UARTDEV_BUF_NO_USB_OTG, ESP32S3_UARTDEV_BUF_NO_USB_JTAG_SERIAL, ESP32C3_UARTDEV_BUF_NO_USB_JTAG_SERIAL, ESP32C3_BUF_UART_NO_OFFSET, ESP32C5_UARTDEV_BUF_NO, ESP32C5_UARTDEV_BUF_NO_USB_JTAG_SERIAL, ESP32C6_UARTDEV_BUF_NO, ESP32C6_UARTDEV_BUF_NO_USB_JTAG_SERIAL, ESP32C61_UARTDEV_BUF_NO_REV_LE2, ESP32C61_UARTDEV_BUF_NO_REV_GT2, ESP32C61_UARTDEV_BUF_NO_USB_JTAG_SERIAL_REV_LE2, ESP32C61_UARTDEV_BUF_NO_USB_JTAG_SERIAL_REV_GT2, ESP32H2_UARTDEV_BUF_NO, ESP32H2_UARTDEV_BUF_NO_USB_JTAG_SERIAL, ESP32H4_UARTDEV_BUF_NO, ESP32H4_UARTDEV_BUF_NO_USB_JTAG_SERIAL, ESP32P4_UARTDEV_BUF_NO_REV0, ESP32P4_UARTDEV_BUF_NO_REV300, ESP32P4_UARTDEV_BUF_NO_USB_OTG, ESP32P4_UARTDEV_BUF_NO_USB_JTAG_SERIAL, } from "./const";
 import { getStubCode } from "./stubs";
-import { hexFormatter, sleep, slipEncode, toHex } from "./util";
+import { hexFormatter, padTo, sleep, slipEncode, toHex } from "./util";
 import { FLASH_MANUFACTURERS, FLASH_DEVICES } from "./flash_jedec";
 import { deflate } from "pako";
 import { pack, unpack } from "./struct";
@@ -714,14 +714,20 @@ export class ESPLoader extends EventTarget {
             }
             else {
                 if (step.dtr !== undefined) {
-                    webusb
-                        ? await this.setDTRWebUSB(step.dtr)
-                        : await this.setDTR(step.dtr);
+                    if (webusb) {
+                        await this.setDTRWebUSB(step.dtr);
+                    }
+                    else {
+                        await this.setDTR(step.dtr);
+                    }
                 }
                 if (step.rts !== undefined) {
-                    webusb
-                        ? await this.setRTSWebUSB(step.rts)
-                        : await this.setRTS(step.rts);
+                    if (webusb) {
+                        await this.setRTSWebUSB(step.rts);
+                    }
+                    else {
+                        await this.setRTS(step.rts);
+                    }
                 }
             }
             if (step.delayMs)
@@ -1078,8 +1084,12 @@ export class ESPLoader extends EventTarget {
                     });
                 }
             }
-            // Add general fallback strategies only for non-CP2102 and non-ESP32-S2 Native USB chips
-            if (!isCP2102 && !isESP32S2NativeUSB) {
+            // Add general fallback strategies only for Native USB chips (not USB-Serial)
+            // and only for chips not already handled by specific blocks above
+            if (!isUSBSerialChip &&
+                !isCP2102 &&
+                !isESP32S2NativeUSB &&
+                !isUSBJTAGSerial) {
                 // Classic reset (for chips not handled above)
                 if (portInfo.usbVendorId !== 0x1a86) {
                     resetStrategies.push({
@@ -1111,7 +1121,7 @@ export class ESPLoader extends EventTarget {
                     },
                 });
                 // WebUSB Strategy: USB-JTAG/Serial fallback
-                if (!isUSBJTAGSerial && !isEspressifUSB) {
+                if (!isEspressifUSB) {
                     resetStrategies.push({
                         name: "USB-JTAG/Serial fallback (WebUSB)",
                         fn: async function () {
@@ -1189,7 +1199,7 @@ export class ESPLoader extends EventTarget {
                         this.logger.debug(`Connected CDC/JTAG successfully with ${strategy.name} reset.`);
                         return;
                     }
-                    catch (error) {
+                    catch (_error) {
                         throw new Error("Sync timeout or abandoned");
                     }
                 }
@@ -1991,7 +2001,7 @@ export class ESPLoader extends EventTarget {
             // Restart Readloop
             this.readLoop();
         }
-        catch (e) {
+        catch (_e) {
             //      this.logger.error(`Reconfigure port error: ${e}`);
             //      throw new Error(`Unable to change the baud rate to ${baud}: ${e}`);
         }
@@ -2100,6 +2110,8 @@ export class ESPLoader extends EventTarget {
             const headerFlashSizeFreq = header[3];
             this.logger.log(`Image header, Magic=${toHex(headerMagic)}, FlashMode=${toHex(headerFlashMode)}, FlashSizeFreq=${toHex(headerFlashSizeFreq)}`);
         }
+        const paddedData = padTo(new Uint8Array(binaryData), 4);
+        binaryData = paddedData.buffer;
         const uncompressedFilesize = binaryData.byteLength;
         let compressedFilesize = 0;
         let dataToFlash;
@@ -2596,7 +2608,7 @@ export class ESPLoader extends EventTarget {
         try {
             await this._writeChain;
         }
-        catch (err) {
+        catch (_err) {
             //      this.logger.debug(`Pending write error during disconnect: ${err}`);
         }
         // Release persistent writer before closing
@@ -2605,7 +2617,7 @@ export class ESPLoader extends EventTarget {
                 await this._writer.close();
                 this._writer.releaseLock();
             }
-            catch (err) {
+            catch (_err) {
                 //        this.logger.debug(`Writer close/release error: ${err}`);
             }
             this._writer = undefined;
@@ -2618,7 +2630,7 @@ export class ESPLoader extends EventTarget {
                 await writer.close();
                 writer.releaseLock();
             }
-            catch (err) {
+            catch (_err) {
                 //        this.logger.debug(`Direct writer close error: ${err}`);
             }
         }
@@ -2640,7 +2652,7 @@ export class ESPLoader extends EventTarget {
             try {
                 this._reader.cancel();
             }
-            catch (err) {
+            catch (_err) {
                 // Reader already released, resolve immediately
                 clearTimeout(timeout);
                 resolve(undefined);
@@ -2670,7 +2682,7 @@ export class ESPLoader extends EventTarget {
         try {
             await this._writeChain;
         }
-        catch (err) {
+        catch (_err) {
             //      this.logger.debug(`Pending write error during release: ${err}`);
         }
         // Release writer