esp32tool 1.6.6 → 1.7.0

package/css/style.css

@@ -69,7 +69,8 @@
 }
 
 @keyframes pulse {
-  0%, 100% {
+  0%,
+  100% {
     transform: scale(1);
     box-shadow: 0 0 0 0 rgba(255, 107, 0, 0.7);
   }
@@ -90,7 +91,9 @@ button,
 }
 
 body {
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, "Helvetica Neue", Arial, sans-serif;
+  font-family:
+    -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu,
+    "Helvetica Neue", Arial, sans-serif;
   font-style: normal;
   font-weight: 400;
   margin: 0;
@@ -261,7 +264,9 @@ div.clear {
 
 #log {
   max-width: 100%;
-  font-family: "SF Mono", "Menlo", "Monaco", "Consolas", "Liberation Mono", "Courier New", monospace;
+  font-family:
+    "SF Mono", "Menlo", "Monaco", "Consolas", "Liberation Mono", "Courier New",
+    monospace;
   font-style: normal;
   font-weight: 400;
   font-size: 16px;
@@ -343,7 +348,9 @@ div.clear {
   line-height: 25px;
   font-size: 14px;
   color: white;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, "Helvetica Neue", Arial, sans-serif;
+  font-family:
+    -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu,
+    "Helvetica Neue", Arial, sans-serif;
   font-style: normal;
   font-weight: 600;
   box-sizing: border-box;
@@ -391,8 +398,6 @@ div.clear {
   border-color: #67ac38;
 }
 
-
-
 #commands {
   min-width: 600px;
   justify-content: center;
@@ -410,7 +415,7 @@ div.clear {
 }
 
 /* Hide upload rows 2-8 by default, show dynamically via JavaScript */
-#commands .upload:nth-child(n+2):nth-child(-n+8) {
+#commands .upload:nth-child(n + 2):nth-child(-n + 8) {
   display: none;
 }
 
@@ -486,8 +491,12 @@ div.clear {
 }
 
 @keyframes indeterminate-stripes {
-  0% { background-position: 0 0; }
-  100% { background-position: 28px 0; }
+  0% {
+    background-position: 0 0;
+  }
+  100% {
+    background-position: 28px 0;
+  }
 }
 
 #eraseProgress {
@@ -625,7 +634,9 @@ div.clear {
   border-style: solid;
   cursor: pointer;
   background-color: transparent;
-  transition: background-color 0.2s, color 0.2s;
+  transition:
+    background-color 0.2s,
+    color 0.2s;
 }
 
 .partition-download-btn:hover {
@@ -976,7 +987,10 @@ div.clear {
   border-radius: 25px;
   cursor: pointer;
   margin-top: 20px;
-  transition: background-color 0.2s, color 0.2s, border-color 0.2s;
+  transition:
+    background-color 0.2s,
+    color 0.2s,
+    border-color 0.2s;
   display: inline-flex;
   align-items: center;
   justify-content: center;
@@ -1089,7 +1103,9 @@ div.clear {
 
 .file-viewer-body pre {
   margin: 0;
-  font-family: "SF Mono", "Menlo", "Monaco", "Consolas", "Liberation Mono", "Courier New", monospace;
+  font-family:
+    "SF Mono", "Menlo", "Monaco", "Consolas", "Liberation Mono", "Courier New",
+    monospace;
   font-size: 13px;
   line-height: 1.5;
   white-space: pre;
@@ -1100,7 +1116,9 @@ div.clear {
 }
 
 .file-viewer-body .hex-view {
-  font-family: "SF Mono", "Menlo", "Monaco", "Consolas", "Liberation Mono", "Courier New", monospace;
+  font-family:
+    "SF Mono", "Menlo", "Monaco", "Consolas", "Liberation Mono", "Courier New",
+    monospace;
   font-size: 12px;
   line-height: 1.6;
 }
@@ -1134,6 +1152,262 @@ div.clear {
   gap: 10px;
 }
 
+/* NVS Editor Dialog Styles */
+.nvs-dialog-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.7);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 10000;
+}
+
+.nvs-dialog {
+  background-color: #fff;
+  border-radius: 10px;
+  box-shadow: 0 5px 30px rgba(0, 0, 0, 0.3);
+  max-width: 600px;
+  max-height: 80vh;
+  width: 90%;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+}
+
+.nvs-dialog-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20px 25px;
+  border-bottom: 2px solid #e0e0e0;
+  background-color: #f8f8f8;
+}
+
+.nvs-dialog-header h3 {
+  margin: 0;
+  font-size: 18px;
+  color: #333;
+}
+
+.nvs-dialog-close {
+  background: none;
+  border: none;
+  font-size: 24px;
+  color: #999;
+  cursor: pointer;
+  padding: 0;
+  width: 30px;
+  height: 30px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 50%;
+  transition: all 0.2s;
+}
+
+.nvs-dialog-close:hover {
+  background-color: #f0f0f0;
+  color: #333;
+}
+
+.nvs-dialog-close:focus,
+.nvs-dialog-close:focus-visible {
+  outline: 2px solid #0078d4;
+  outline-offset: 2px;
+  background-color: #f0f0f0;
+  color: #333;
+}
+
+.nvs-dialog-body {
+  padding: 25px;
+  overflow-y: auto;
+  flex: 1;
+  color: #333;
+}
+
+.nvs-dialog-body h4 {
+  margin: 0 0 12px 0;
+  font-size: 15px;
+  color: #333;
+  text-transform: uppercase;
+  font-weight: 700;
+  letter-spacing: 0.5px;
+}
+
+.nvs-dialog-body pre {
+  background-color: #f5f5f5;
+  padding: 12px 15px;
+  border-radius: 6px;
+  margin: 0 0 18px 0;
+  font-family:
+    "SF Mono", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New",
+    monospace;
+  font-size: 14px;
+  line-height: 1.6;
+  white-space: pre-wrap;
+  overflow-wrap: break-word;
+  border: 1px solid #e0e0e0;
+}
+
+.nvs-ok {
+  color: #71ae1e;
+  font-weight: 600;
+}
+
+.nvs-warn {
+  color: #ff6b00;
+  font-weight: 600;
+}
+
+.nvs-error {
+  color: #c64141;
+  font-weight: 600;
+}
+
+.nvs-blob-item {
+  background-color: #f8f8f8;
+  border: 1px solid #e0e0e0;
+  border-radius: 5px;
+  padding: 15px;
+  margin-bottom: 10px;
+}
+
+.nvs-blob-item div {
+  margin: 5px 0;
+  font-size: 13px;
+}
+
+.nvs-blob-item button {
+  margin-right: 10px;
+  margin-top: 10px;
+  padding: 5px 12px;
+  font-size: 12px;
+  border-style: solid;
+  cursor: pointer;
+  border-radius: 12px;
+}
+
+.nvs-blob-item button:focus,
+.nvs-blob-item button:focus-visible {
+  outline: 2px solid #0078d4;
+  outline-offset: 2px;
+}
+
+.nvs-issue-group {
+  margin: 6px 0 14px 0;
+  padding: 8px 10px;
+  background-color: #fff8f3;
+  border: 1px solid #ffd9b8;
+  border-radius: 6px;
+}
+
+.nvs-issue-title {
+  font-weight: 700;
+  font-size: 13px;
+  margin-bottom: 6px;
+}
+
+pre.nvs-issue {
+  background-color: #fff;
+  border: 1px solid #f0d3b8;
+  border-radius: 4px;
+  padding: 6px 8px;
+  margin: 4px 0;
+  font-family:
+    "SF Mono", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New",
+    monospace;
+  font-size: 12px;
+  line-height: 1.5;
+  white-space: pre-wrap;
+  overflow-wrap: break-word;
+  color: #333;
+  flex: 1;
+}
+
+.nvs-issue-row {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  flex-wrap: wrap;
+  margin: 4px 0;
+}
+
+.nvs-issue-actions {
+  display: inline-flex;
+  gap: 4px;
+  flex-shrink: 0;
+}
+
+.nvs-issue-btn {
+  padding: 4px 8px;
+  font-size: 12px;
+  border: 1px solid #c0c0c0;
+  border-radius: 4px;
+  background: #fafafa;
+  color: #333;
+  cursor: pointer;
+  white-space: nowrap;
+}
+
+.nvs-issue-btn:hover {
+  background: #f0f0f0;
+  border-color: #888;
+}
+
+.nvs-issue-btn:focus,
+.nvs-issue-btn:focus-visible {
+  outline: 2px solid #0078d4;
+  outline-offset: 2px;
+  background: #f0f0f0;
+  border-color: #888;
+}
+
+.nvs-issue-delete:hover {
+  background: #ffe0e0;
+  border-color: #c64141;
+  color: #c64141;
+}
+
+.nvs-issue-delete:focus,
+.nvs-issue-delete:focus-visible {
+  outline: 2px solid #c64141;
+  outline-offset: 2px;
+  background: #ffe0e0;
+  border-color: #c64141;
+  color: #c64141;
+}
+
+/* Highlight effect when jumping to entry/page */
+.nvs-row-highlight {
+  animation: nvs-flash-row 2.2s ease-out;
+}
+
+.nvs-page-highlight {
+  animation: nvs-flash-page 2.2s ease-out;
+}
+
+@keyframes nvs-flash-row {
+  0% {
+    background-color: #fff3a8;
+  }
+  100% {
+    background-color: transparent;
+  }
+}
+
+@keyframes nvs-flash-page {
+  0% {
+    box-shadow: 0 0 0 3px #ffb74d;
+  }
+  100% {
+    box-shadow: 0 0 0 0 transparent;
+  }
+}
+
 /* Mobile Optimizations */
 @media (max-width: 768px) {
   /* Larger touch targets and better readability */
@@ -2313,7 +2587,8 @@ body.console-active .main {
   background-color: #1c1c1c;
   display: flex;
   flex-direction: column;
-  font-family: SFMono-Regular, Consolas, "Liberation Mono", Menlo, Courier, monospace;
+  font-family:
+    SFMono-Regular, Consolas, "Liberation Mono", Menlo, Courier, monospace;
   color: #ddd;
 }
 
@@ -2638,8 +2913,11 @@ body.hexeditor-active .main {
 /* 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);
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.85);
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -2776,7 +3054,9 @@ body.hexeditor-active .main {
   background-color: #1c1c1c;
   display: flex;
   flex-direction: column;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
+  font-family:
+    -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial,
+    sans-serif;
   color: #ddd;
 }
 
@@ -2952,10 +3232,18 @@ body.nvseditor-active .main {
   border-bottom: 1px solid #3a3a3a;
 }
 
-.nvs-page-header.state-active { border-left: 4px solid #43a047; }
-.nvs-page-header.state-full { border-left: 4px solid #ffa726; }
-.nvs-page-header.state-freeing { border-left: 4px solid #ef5350; }
-.nvs-page-header.state-other { border-left: 4px solid #666; }
+.nvs-page-header.state-active {
+  border-left: 4px solid #43a047;
+}
+.nvs-page-header.state-full {
+  border-left: 4px solid #ffa726;
+}
+.nvs-page-header.state-freeing {
+  border-left: 4px solid #ef5350;
+}
+.nvs-page-header.state-other {
+  border-left: 4px solid #666;
+}
 
 .nvs-page-state {
   font-weight: bold;
@@ -2965,10 +3253,22 @@ body.nvseditor-active .main {
   text-transform: uppercase;
 }
 
-.state-active .nvs-page-state { background: #1b5e20; color: #a5d6a7; }
-.state-full .nvs-page-state { background: #e65100; color: #ffcc80; }
-.state-freeing .nvs-page-state { background: #b71c1c; color: #ef9a9a; }
-.state-other .nvs-page-state { background: #424242; color: #999; }
+.state-active .nvs-page-state {
+  background: #1b5e20;
+  color: #a5d6a7;
+}
+.state-full .nvs-page-state {
+  background: #e65100;
+  color: #ffcc80;
+}
+.state-freeing .nvs-page-state {
+  background: #b71c1c;
+  color: #ef9a9a;
+}
+.state-other .nvs-page-state {
+  background: #424242;
+  color: #999;
+}
 
 /* NVS Namespace */
 .nvs-namespace {

package/dist/const.d.ts

@@ -307,7 +307,7 @@ export declare const ESP32P4_PMU_EXT_LDO_P0_0P1A_REG: number;
 export declare const ESP32P4_PMU_0P1A_TARGET0_0: number;
 export declare const ESP32P4_PMU_0P1A_FORCE_TIEH_SEL_0: number;
 export declare const ESP32P4_PMU_DATE_REG: number;
-export declare const ESP32S31_SPI_REG_BASE = 542113792;
+export declare const ESP32S31_SPI_REG_BASE = 542117888;
 export declare const ESP32S31_BASEFUSEADDR = 544296960;
 export declare const ESP32S31_EFUSE_BLOCK1_ADDR: number;
 export declare const ESP32S31_MACFUSEADDR: number;
@@ -319,6 +319,11 @@ export declare const ESP32S31_SPI_MISO_DLEN_OFFS = 40;
 export declare const ESP32S31_SPI_W0_OFFS = 88;
 export declare const ESP32S31_UART_DATE_REG_ADDR: number;
 export declare const ESP32S31_BOOTLOADER_FLASH_OFFSET = 8192;
+export declare const ESP32S31_DR_REG_LP_WDT_BASE = 545263616;
+export declare const ESP32S31_RTC_CNTL_WDTCONFIG0_REG: number;
+export declare const ESP32S31_RTC_CNTL_WDTCONFIG1_REG: number;
+export declare const ESP32S31_RTC_CNTL_WDTWPROTECT_REG: number;
+export declare const ESP32S31_RTC_CNTL_WDT_WKEY = 1356348065;
 export interface SpiFlashAddresses {
     regBase: number;
     baseFuse: number;

package/dist/const.js

@@ -352,10 +352,10 @@ export const ESP32P4_PMU_EXT_LDO_P0_0P1A_REG = ESP32P4_DR_REG_PMU_BASE + 0x1b8;
 export const ESP32P4_PMU_0P1A_TARGET0_0 = 0xff << 23;
 export const ESP32P4_PMU_0P1A_FORCE_TIEH_SEL_0 = 1 << 7;
 export const ESP32P4_PMU_DATE_REG = ESP32P4_DR_REG_PMU_BASE + 0x3fc;
-export const ESP32S31_SPI_REG_BASE = 0x20500000;
+export const ESP32S31_SPI_REG_BASE = 0x20501000;
 export const ESP32S31_BASEFUSEADDR = 0x20715000;
-export const ESP32S31_EFUSE_BLOCK1_ADDR = ESP32S31_BASEFUSEADDR + 0x044;
-export const ESP32S31_MACFUSEADDR = 0x20715000 + 0x044;
+export const ESP32S31_EFUSE_BLOCK1_ADDR = ESP32S31_BASEFUSEADDR + 0x050;
+export const ESP32S31_MACFUSEADDR = ESP32S31_BASEFUSEADDR + 0x050;
 export const ESP32S31_SPI_USR_OFFS = 0x18;
 export const ESP32S31_SPI_USR1_OFFS = 0x1c;
 export const ESP32S31_SPI_USR2_OFFS = 0x20;
@@ -364,6 +364,12 @@ export const ESP32S31_SPI_MISO_DLEN_OFFS = 0x28;
 export const ESP32S31_SPI_W0_OFFS = 0x58;
 export const ESP32S31_UART_DATE_REG_ADDR = 0x2038a000 + 0x8c;
 export const ESP32S31_BOOTLOADER_FLASH_OFFSET = 0x2000;
+// ESP32-S31 RTC Watchdog Timer registers (LP_WDT)
+export const ESP32S31_DR_REG_LP_WDT_BASE = 0x20801000;
+export const ESP32S31_RTC_CNTL_WDTCONFIG0_REG = ESP32S31_DR_REG_LP_WDT_BASE + 0x0000; // LP_WDT_RWDT_CONFIG0_REG
+export const ESP32S31_RTC_CNTL_WDTCONFIG1_REG = ESP32S31_DR_REG_LP_WDT_BASE + 0x0004; // LP_WDT_RWDT_CONFIG1_REG
+export const ESP32S31_RTC_CNTL_WDTWPROTECT_REG = ESP32S31_DR_REG_LP_WDT_BASE + 0x0018; // LP_WDT_RWDT_WPROTECT_REG
+export const ESP32S31_RTC_CNTL_WDT_WKEY = 0x50d83aa1;
 export const SYNC_PACKET = toByteArray("\x07\x07\x12 UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU");
 export const CHIP_DETECT_MAGIC_REG_ADDR = 0x40001000;
 // Image Chip IDs (used by ESP32-C3 and later for chip detection)

package/dist/esp_loader.js

@@ -1,5 +1,5 @@
 /// <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 { 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, ESP32S31_RTC_CNTL_WDTWPROTECT_REG, ESP32S31_RTC_CNTL_WDTCONFIG0_REG, ESP32S31_RTC_CNTL_WDTCONFIG1_REG, ESP32S31_RTC_CNTL_WDT_WKEY, 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, padTo, sleep, slipEncode, toHex } from "./util";
 import { FLASH_MANUFACTURERS, FLASH_DEVICES } from "./flash_jedec";
@@ -1269,6 +1269,13 @@ export class ESPLoader extends EventTarget {
             WDTCONFIG1_REG = ESP32P4_RTC_CNTL_WDTCONFIG1_REG;
             WDT_WKEY = ESP32P4_RTC_CNTL_WDT_WKEY;
         }
+        else if (this.chipFamily === CHIP_FAMILY_ESP32S31) {
+            // S31 uses LP_WDT (Low Power Watchdog Timer)
+            WDTWPROTECT_REG = ESP32S31_RTC_CNTL_WDTWPROTECT_REG;
+            WDTCONFIG0_REG = ESP32S31_RTC_CNTL_WDTCONFIG0_REG;
+            WDTCONFIG1_REG = ESP32S31_RTC_CNTL_WDTCONFIG1_REG;
+            WDT_WKEY = ESP32S31_RTC_CNTL_WDT_WKEY;
+        }
         else {
             throw new Error(`rtcWdtResetChipSpecific() is not supported for ${this.chipFamily}`);
         }
@@ -1311,11 +1318,12 @@ export class ESPLoader extends EventTarget {
                 }
                 // Check if chip supports WDT reset
                 // WDT reset is not needed for ESP32-C3
-                // WDT reset is supported by: ESP32-S2, ESP32-S3, ESP32-P4
+                // WDT reset is supported by: ESP32-S2, ESP32-S3, ESP32-P4, ESP32-S31
                 // WDT reset is NOT supported by: ESP32-C5, ESP32-C6, ESP32-C61, ESP32-H2
                 const supportsWdtReset = this.chipFamily === CHIP_FAMILY_ESP32S2 ||
                     this.chipFamily === CHIP_FAMILY_ESP32S3 ||
-                    this.chipFamily === CHIP_FAMILY_ESP32P4;
+                    this.chipFamily === CHIP_FAMILY_ESP32P4 ||
+                    this.chipFamily === CHIP_FAMILY_ESP32S31;
                 if (!supportsWdtReset) {
                     this.logger.debug(`${this.chipName} does not support WDT reset - using classic reset instead`);
                     // Use classic reset for chips without WDT support
@@ -3539,7 +3547,6 @@ export class ESPLoader extends EventTarget {
             // Retry loop for this chunk
             while (!chunkSuccess && retryCount <= MAX_RETRIES) {
                 let resp = new Uint8Array(0);
-                let lastAckedLength = 0; // Track last acknowledged length
                 try {
                     // Only log on first attempt or retries
                     if (retryCount === 0) {
@@ -3571,7 +3578,10 @@ export class ESPLoader extends EventTarget {
                         blockSize = base * 65; // 63 * 65 = 4095 (close to 0x1000)
                         maxInFlight = base * 130; // 63 * 130 = 8190 (close to blockSize * 2)
                     }
-                    const pkt = pack("<IIII", currentAddr, chunkSize, blockSize, maxInFlight);
+                    // The stub (legacy approach) interprets the 4th READ_FLASH parameter as
+                    // max_unacked_packets (a packet count), not bytes. Convert accordingly.
+                    const maxUnackedPackets = Math.max(1, Math.ceil(maxInFlight / blockSize));
+                    const pkt = pack("<IIII", currentAddr, chunkSize, blockSize, maxUnackedPackets);
                     const chunkStartTime = Date.now();
                     const [res] = await this.checkCommand(ESP_READ_FLASH, pkt);
                     if (res != 0) {
@@ -3586,11 +3596,12 @@ export class ESPLoader extends EventTarget {
                         catch (err) {
                             if (err instanceof SlipReadError) {
                                 this.logger.debug(`${err.message} at byte 0x${resp.length.toString(16)}`);
-                                // Send empty SLIP frame to abort the stub's read operation
-                                // The stub expects 4 bytes (ACK), if we send less it will break out
+                                // Send a 1-byte SLIP frame to abort the stub's read operation.
+                                // The stub checks ack_size == 4; a differently-sized frame
+                                // causes it to break out of its send loop.
+                                // (Empty frames 0xC0 0xC0 are silently ignored by the stub.)
                                 try {
-                                    // Send SLIP frame with no data (just delimiters)
-                                    const abortFrame = [this.SLIP_END, this.SLIP_END]; // Empty SLIP frame
+                                    const abortFrame = [this.SLIP_END, 0x00, this.SLIP_END];
                                     await this.writeToStream(abortFrame);
                                     this.logger.debug(`Sent abort frame to stub`);
                                     // Give stub time to process abort
@@ -3615,21 +3626,23 @@ export class ESPLoader extends EventTarget {
                             newResp.set(resp);
                             newResp.set(packetData, resp.length);
                             resp = newResp;
-                            // Send acknowledgment when we've received maxInFlight bytes
-                            // The stub sends packets until (num_sent - num_acked) >= max_in_flight
-                            // We MUST wait for all packets before sending ACK
-                            const shouldAck = resp.length >= chunkSize || // End of chunk
-                                resp.length >= lastAckedLength + maxInFlight; // Received all packets
-                            if (shouldAck) {
-                                const ackData = pack("<I", resp.length);
-                                const slipEncodedAck = slipEncode(ackData);
-                                await this.writeToStream(slipEncodedAck);
-                                // Update lastAckedLength to current response length
-                                // This ensures next ACK is sent at the right time
-                                lastAckedLength = resp.length;
-                            }
+                            // Send ACK after every packet (mirrors Python esptool behaviour).
+                            // The stub (legacy approach) uses ACK count for flow-control; sending
+                            // after each packet keeps the pipeline flowing without overwhelming
+                            // the USB buffer.
+                            const ackData = pack("<I", resp.length);
+                            const slipEncodedAck = slipEncode(ackData);
+                            await this.writeToStream(slipEncodedAck);
                         }
                     }
+                    // The stub sends a 16-byte MD5 hash after every chunk.
+                    // Read and discard it so it doesn't corrupt the next command response.
+                    try {
+                        await this.readPacket(FLASH_READ_TIMEOUT);
+                    }
+                    catch {
+                        // Ignore timeout — stub may not have sent MD5 yet if something failed
+                    }
                     // Chunk read successfully - append to all data
                     const newAllData = new Uint8Array(allData.length + resp.length);
                     newAllData.set(allData);

package/dist/flash_jedec.js

@@ -12,6 +12,7 @@ export const FLASH_MANUFACTURERS = {
     0x5e: "Zbit",
     0x37: "AMIC",
     0xe0: "Berg Micro",
+    0x46: "XTX Technology",
 };
 export const FLASH_DEVICES = {
     0x010219: "S25FL256S (256Mbit)",
@@ -110,4 +111,8 @@ export const FLASH_DEVICES = {
     0xef6011: "W25Q10EW (1Mbit)",
     0xef6012: "W25Q20EW (2Mbit)",
     0xef6013: "W25Q40EW (4Mbit)",
+    0x464015: "XT25F16B (16Mbit)",
+    0x464016: "XT25F32B (32Mbit)",
+    0x464017: "XT25F64B (64Mbit)",
+    0x464018: "XT25F128B (128Mbit)",
 };