esp32tool 1.3.6 → 1.3.7

package/dist/const.d.ts

@@ -56,8 +56,10 @@ export declare const ESP32_SPI_MISO_DLEN_OFFS = 44;
 export declare const ESP32_SPI_W0_OFFS = 128;
 export declare const ESP32_UART_DATE_REG_ADDR = 1610612856;
 export declare const ESP32_BOOTLOADER_FLASH_OFFSET = 4096;
+export declare const ESP32_APB_CTL_DATE_ADDR: number;
 export declare const ESP32S2_SPI_REG_BASE = 1061167104;
 export declare const ESP32S2_BASEFUSEADDR = 1061265408;
+export declare const ESP32S2_EFUSE_BLOCK1_ADDR: number;
 export declare const ESP32S2_MACFUSEADDR = 1061265476;
 export declare const ESP32S2_SPI_USR_OFFS = 24;
 export declare const ESP32S2_SPI_USR1_OFFS = 28;
@@ -81,6 +83,7 @@ export declare const ESP32S2_UARTDEV_BUF_NO = 1073741076;
 export declare const ESP32S2_UARTDEV_BUF_NO_USB_OTG = 2;
 export declare const ESP32S3_SPI_REG_BASE = 1610620928;
 export declare const ESP32S3_BASEFUSEADDR = 1610641408;
+export declare const ESP32S3_EFUSE_BLOCK1_ADDR: number;
 export declare const ESP32S3_MACFUSEADDR: number;
 export declare const ESP32S3_SPI_USR_OFFS = 24;
 export declare const ESP32S3_SPI_USR1_OFFS = 28;
@@ -105,6 +108,7 @@ export declare const ESP32S3_UARTDEV_BUF_NO_USB_OTG = 3;
 export declare const ESP32S3_UARTDEV_BUF_NO_USB_JTAG_SERIAL = 4;
 export declare const ESP32C2_SPI_REG_BASE = 1610620928;
 export declare const ESP32C2_BASEFUSEADDR = 1610647552;
+export declare const ESP32C2_EFUSE_BLOCK2_ADDR: number;
 export declare const ESP32C2_MACFUSEADDR: number;
 export declare const ESP32C2_SPI_USR_OFFS = 24;
 export declare const ESP32C2_SPI_USR1_OFFS = 28;
@@ -146,6 +150,7 @@ export declare const ESP32C3_EFUSE_RD_MAC_SPI_SYS_3_REG = 1610647632;
 export declare const ESP32C3_EFUSE_RD_MAC_SPI_SYS_5_REG = 1610647640;
 export declare const ESP32C5_SPI_REG_BASE = 1610625024;
 export declare const ESP32C5_BASEFUSEADDR = 1611352064;
+export declare const ESP32C5_EFUSE_BLOCK1_ADDR: number;
 export declare const ESP32C5_MACFUSEADDR: number;
 export declare const ESP32C5_SPI_USR_OFFS = 24;
 export declare const ESP32C5_SPI_USR1_OFFS = 28;
@@ -154,11 +159,16 @@ export declare const ESP32C5_SPI_MOSI_DLEN_OFFS = 36;
 export declare const ESP32C5_SPI_MISO_DLEN_OFFS = 40;
 export declare const ESP32C5_SPI_W0_OFFS = 88;
 export declare const ESP32C5_UART_DATE_REG_ADDR = 1610612860;
+export declare const ESP32C5_UART_CLKDIV_REG = 1610612756;
 export declare const ESP32C5_BOOTLOADER_FLASH_OFFSET = 8192;
+export declare const ESP32C5_PCR_SYSCLK_CONF_REG = 1611227408;
+export declare const ESP32C5_PCR_SYSCLK_XTAL_FREQ_V: number;
+export declare const ESP32C5_PCR_SYSCLK_XTAL_FREQ_S = 24;
 export declare const ESP32C5_UARTDEV_BUF_NO = 1082520852;
 export declare const ESP32C5_UARTDEV_BUF_NO_USB_JTAG_SERIAL = 3;
 export declare const ESP32C6_SPI_REG_BASE = 1610625024;
 export declare const ESP32C6_BASEFUSEADDR = 1611335680;
+export declare const ESP32C6_EFUSE_BLOCK1_ADDR: number;
 export declare const ESP32C6_MACFUSEADDR: number;
 export declare const ESP32C6_SPI_USR_OFFS = 24;
 export declare const ESP32C6_SPI_USR1_OFFS = 28;
@@ -186,6 +196,7 @@ export declare const ESP32C5_C6_RTC_CNTL_SWD_AUTO_FEED_EN: number;
 export declare const ESP32C5_C6_RTC_CNTL_SWD_WPROTECT_REG: number;
 export declare const ESP32C61_SPI_REG_BASE = 1610625024;
 export declare const ESP32C61_BASEFUSEADDR = 1611352064;
+export declare const ESP32C61_EFUSE_BLOCK1_ADDR: number;
 export declare const ESP32C61_MACFUSEADDR: number;
 export declare const ESP32C61_SPI_USR_OFFS = 24;
 export declare const ESP32C61_SPI_USR1_OFFS = 28;
@@ -197,6 +208,7 @@ export declare const ESP32C61_UART_DATE_REG_ADDR = 1610612860;
 export declare const ESP32C61_BOOTLOADER_FLASH_OFFSET = 0;
 export declare const ESP32H2_SPI_REG_BASE = 1610625024;
 export declare const ESP32H2_BASEFUSEADDR = 1611335680;
+export declare const ESP32H2_EFUSE_BLOCK1_ADDR: number;
 export declare const ESP32H2_MACFUSEADDR: number;
 export declare const ESP32H2_SPI_USR_OFFS = 24;
 export declare const ESP32H2_SPI_USR1_OFFS = 28;
@@ -216,6 +228,7 @@ export declare const ESP32H2_UARTDEV_BUF_NO = 1082457852;
 export declare const ESP32H2_UARTDEV_BUF_NO_USB_JTAG_SERIAL = 3;
 export declare const ESP32H4_SPI_REG_BASE = 1611239424;
 export declare const ESP32H4_BASEFUSEADDR = 1611339776;
+export declare const ESP32H4_EFUSE_BLOCK1_ADDR: number;
 export declare const ESP32H4_MACFUSEADDR: number;
 export declare const ESP32H4_SPI_USR_OFFS = 24;
 export declare const ESP32H4_SPI_USR1_OFFS = 28;
@@ -233,6 +246,7 @@ export declare const ESP32H4_RTC_CNTL_WDT_WKEY = 1356348065;
 export declare const ESP32H4_RTC_CNTL_SWD_WKEY = 1356348065;
 export declare const ESP32H21_SPI_REG_BASE = 1610625024;
 export declare const ESP32H21_BASEFUSEADDR = 1611350016;
+export declare const ESP32H21_EFUSE_BLOCK1_ADDR: number;
 export declare const ESP32H21_MACFUSEADDR: number;
 export declare const ESP32H21_SPI_USR_OFFS = 24;
 export declare const ESP32H21_SPI_USR1_OFFS = 28;

package/dist/const.js

@@ -75,8 +75,10 @@ export const ESP32_SPI_MISO_DLEN_OFFS = 0x2c;
 export const ESP32_SPI_W0_OFFS = 0x80;
 export const ESP32_UART_DATE_REG_ADDR = 0x60000078;
 export const ESP32_BOOTLOADER_FLASH_OFFSET = 0x1000;
+export const ESP32_APB_CTL_DATE_ADDR = 0x3ff66000 + 0x7c;
 export const ESP32S2_SPI_REG_BASE = 0x3f402000;
 export const ESP32S2_BASEFUSEADDR = 0x3f41a000;
+export const ESP32S2_EFUSE_BLOCK1_ADDR = ESP32S2_BASEFUSEADDR + 0x044;
 export const ESP32S2_MACFUSEADDR = 0x3f41a044;
 export const ESP32S2_SPI_USR_OFFS = 0x18;
 export const ESP32S2_SPI_USR1_OFFS = 0x1c;
@@ -102,6 +104,7 @@ export const ESP32S2_UARTDEV_BUF_NO = 0x3ffffd14; // Variable in ROM .bss which
 export const ESP32S2_UARTDEV_BUF_NO_USB_OTG = 2; // Value of the above indicating that USB-OTG is in use
 export const ESP32S3_SPI_REG_BASE = 0x60002000;
 export const ESP32S3_BASEFUSEADDR = 0x60007000;
+export const ESP32S3_EFUSE_BLOCK1_ADDR = ESP32S3_BASEFUSEADDR + 0x044;
 export const ESP32S3_MACFUSEADDR = 0x60007000 + 0x044;
 export const ESP32S3_SPI_USR_OFFS = 0x18;
 export const ESP32S3_SPI_USR1_OFFS = 0x1c;
@@ -128,6 +131,7 @@ export const ESP32S3_UARTDEV_BUF_NO_USB_OTG = 3; // The above var when USB-OTG i
 export const ESP32S3_UARTDEV_BUF_NO_USB_JTAG_SERIAL = 4; // The above var when USB-JTAG/Serial is used
 export const ESP32C2_SPI_REG_BASE = 0x60002000;
 export const ESP32C2_BASEFUSEADDR = 0x60008800;
+export const ESP32C2_EFUSE_BLOCK2_ADDR = ESP32C2_BASEFUSEADDR + 0x040;
 export const ESP32C2_MACFUSEADDR = ESP32C2_BASEFUSEADDR + 0x040;
 export const ESP32C2_SPI_USR_OFFS = 0x18;
 export const ESP32C2_SPI_USR1_OFFS = 0x1c;
@@ -174,6 +178,7 @@ export const ESP32C3_EFUSE_RD_MAC_SPI_SYS_3_REG = 0x60008850;
 export const ESP32C3_EFUSE_RD_MAC_SPI_SYS_5_REG = 0x60008858;
 export const ESP32C5_SPI_REG_BASE = 0x60003000;
 export const ESP32C5_BASEFUSEADDR = 0x600b4800;
+export const ESP32C5_EFUSE_BLOCK1_ADDR = ESP32C5_BASEFUSEADDR + 0x044;
 export const ESP32C5_MACFUSEADDR = 0x600b4800 + 0x044;
 export const ESP32C5_SPI_USR_OFFS = 0x18;
 export const ESP32C5_SPI_USR1_OFFS = 0x1c;
@@ -182,12 +187,18 @@ export const ESP32C5_SPI_MOSI_DLEN_OFFS = 0x24;
 export const ESP32C5_SPI_MISO_DLEN_OFFS = 0x28;
 export const ESP32C5_SPI_W0_OFFS = 0x58;
 export const ESP32C5_UART_DATE_REG_ADDR = 0x6000007c;
+export const ESP32C5_UART_CLKDIV_REG = 0x60000014;
 export const ESP32C5_BOOTLOADER_FLASH_OFFSET = 0x2000;
+// ESP32-C5 Crystal frequency detection registers
+export const ESP32C5_PCR_SYSCLK_CONF_REG = 0x60096110;
+export const ESP32C5_PCR_SYSCLK_XTAL_FREQ_V = 0x7f << 24;
+export const ESP32C5_PCR_SYSCLK_XTAL_FREQ_S = 24;
 // ESP32-C5 USB-JTAG/Serial detection
 export const ESP32C5_UARTDEV_BUF_NO = 0x4085f514; // Variable in ROM .bss which indicates the port in use
 export const ESP32C5_UARTDEV_BUF_NO_USB_JTAG_SERIAL = 3; // The above var when USB-JTAG/Serial is used
 export const ESP32C6_SPI_REG_BASE = 0x60003000;
 export const ESP32C6_BASEFUSEADDR = 0x600b0800;
+export const ESP32C6_EFUSE_BLOCK1_ADDR = ESP32C6_BASEFUSEADDR + 0x044;
 export const ESP32C6_MACFUSEADDR = 0x600b0800 + 0x044;
 export const ESP32C6_SPI_USR_OFFS = 0x18;
 export const ESP32C6_SPI_USR1_OFFS = 0x1c;
@@ -218,6 +229,7 @@ export const ESP32C5_C6_RTC_CNTL_SWD_AUTO_FEED_EN = 1 << 18;
 export const ESP32C5_C6_RTC_CNTL_SWD_WPROTECT_REG = ESP32C5_C6_DR_REG_LP_WDT_BASE + 0x0020; // LP_WDT_SWD_WPROTECT_REG
 export const ESP32C61_SPI_REG_BASE = 0x60003000;
 export const ESP32C61_BASEFUSEADDR = 0x600b4800;
+export const ESP32C61_EFUSE_BLOCK1_ADDR = ESP32C61_BASEFUSEADDR + 0x044;
 export const ESP32C61_MACFUSEADDR = 0x600b4800 + 0x044;
 export const ESP32C61_SPI_USR_OFFS = 0x18;
 export const ESP32C61_SPI_USR1_OFFS = 0x1c;
@@ -229,6 +241,7 @@ export const ESP32C61_UART_DATE_REG_ADDR = 0x6000007c;
 export const ESP32C61_BOOTLOADER_FLASH_OFFSET = 0x0000;
 export const ESP32H2_SPI_REG_BASE = 0x60003000;
 export const ESP32H2_BASEFUSEADDR = 0x600b0800;
+export const ESP32H2_EFUSE_BLOCK1_ADDR = ESP32H2_BASEFUSEADDR + 0x044;
 export const ESP32H2_MACFUSEADDR = 0x600b0800 + 0x044;
 export const ESP32H2_SPI_USR_OFFS = 0x18;
 export const ESP32H2_SPI_USR1_OFFS = 0x1c;
@@ -250,6 +263,7 @@ export const ESP32H2_UARTDEV_BUF_NO = 0x4084fefc; // Variable in ROM .bss which
 export const ESP32H2_UARTDEV_BUF_NO_USB_JTAG_SERIAL = 3; // The above var when USB-JTAG/Serial is used
 export const ESP32H4_SPI_REG_BASE = 0x60099000;
 export const ESP32H4_BASEFUSEADDR = 0x600b1800;
+export const ESP32H4_EFUSE_BLOCK1_ADDR = ESP32H4_BASEFUSEADDR + 0x044;
 export const ESP32H4_MACFUSEADDR = 0x600b1800 + 0x044;
 export const ESP32H4_SPI_USR_OFFS = 0x18;
 export const ESP32H4_SPI_USR1_OFFS = 0x1c;
@@ -268,6 +282,7 @@ export const ESP32H4_RTC_CNTL_WDT_WKEY = 0x50d83aa1; // LP_WDT_SWD_WKEY, same as
 export const ESP32H4_RTC_CNTL_SWD_WKEY = 0x50d83aa1; // LP_WDT_SWD_WKEY, same as WDT key in this case
 export const ESP32H21_SPI_REG_BASE = 0x60003000;
 export const ESP32H21_BASEFUSEADDR = 0x600b4000;
+export const ESP32H21_EFUSE_BLOCK1_ADDR = ESP32H21_BASEFUSEADDR + 0x044;
 export const ESP32H21_MACFUSEADDR = 0x600b4000 + 0x044;
 export const ESP32H21_SPI_USR_OFFS = 0x18;
 export const ESP32H21_SPI_USR1_OFFS = 0x1c;

package/dist/esp_loader.d.ts

@@ -84,9 +84,6 @@ export declare class ESPLoader extends EventTarget {
      * Detect chip type using GET_SECURITY_INFO (for newer chips) or magic value (for older chips)
      */
     detectChip(): Promise<void>;
-    /**
-     * Get chip revision for ESP32-P4
-     */
     getChipRevision(): Promise<number>;
     /**
      * Power on the flash chip for ESP32-P4 Rev 301 (ECO6)
@@ -210,11 +207,6 @@ export declare class ESPLoader extends EventTarget {
      * This is an alias for rtcWdtResetChipSpecific() for backwards compatibility
      */
     watchdogReset(): Promise<void>;
-    /**
-     * Get chip revision for ESP32-C3
-     * Reads from EFUSE registers and calculates revision
-     */
-    getChipRevisionC3(): Promise<number>;
     /**
      * RTC watchdog timer reset for ESP32-S2, ESP32-S3, ESP32-C3, ESP32-C5, ESP32-C6, and ESP32-P4
      * Uses specific registers for each chip family
@@ -271,7 +263,10 @@ export declare class ESPLoader extends EventTarget {
      * Calculate checksum of a blob, as it is defined by the ROM
      */
     checksum(data: number[], state?: number): number;
+    getC5CrystalFreqRomExpect(): Promise<number>;
+    getC5CrystalFreqDetected(): Promise<number>;
     setBaudrate(baud: number): Promise<void>;
+    private setBaudrateC5Rom;
     reconfigurePort(baud: number): Promise<void>;
     /**
      * @name syncWithTimeout

package/dist/esp_loader.js

@@ -1,7 +1,8 @@
 /// <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, ESP32P4_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, 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, } 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, 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, } from "./const";
 import { getStubCode } from "./stubs";
 import { hexFormatter, sleep, slipEncode, toHex } from "./util";
+import { FLASH_MANUFACTURERS, FLASH_DEVICES } from "./flash_jedec";
 import { deflate } from "pako";
 import { pack, unpack } from "./struct";
 export class ESPLoader extends EventTarget {
@@ -365,7 +366,10 @@ export class ESPLoader extends EventTarget {
         for (let i = 0; i < 4; i++) {
             this._efuses[i] = await this.readRegister(AddrMAC + 4 * i);
         }
-        this.logger.log(`Chip type ${this.chipName}`);
+        const revisionInfo = this.chipRevision !== null && this.chipRevision !== undefined
+            ? ` (revision ${this.chipRevision})`
+            : "";
+        this.logger.log(`Connected to ${this.chipName}${revisionInfo}`);
         this.logger.debug(`Bootloader flash offset: 0x${FlAddr.flashOffs.toString(16)}`);
         // Mark initialization as successful
         this._initializationSucceeded = true;
@@ -382,22 +386,14 @@ export class ESPLoader extends EventTarget {
             if (chipInfo) {
                 this.chipName = chipInfo.name;
                 this.chipFamily = chipInfo.family;
-                // Get chip revision for ESP32-P4 and ESP32-C3
-                if (this.chipFamily === CHIP_FAMILY_ESP32P4) {
-                    this.chipRevision = await this.getChipRevision();
-                    this.logger.debug(`ESP32-P4 revision: ${this.chipRevision}`);
-                    // Set chip variant based on revision
-                    if (this.chipRevision >= 300) {
-                        this.chipVariant = "rev300";
-                    }
-                    else {
-                        this.chipVariant = "rev0";
-                    }
-                    this.logger.debug(`ESP32-P4 variant: ${this.chipVariant}`);
+                this.chipRevision = await this.getChipRevision();
+                this.logger.debug(`${this.chipName} revision: ${this.chipRevision}`);
+                if (this.chipFamily === CHIP_FAMILY_ESP32P4 &&
+                    this.chipRevision >= 300) {
+                    this.chipVariant = "rev300";
                 }
-                else if (this.chipFamily === CHIP_FAMILY_ESP32C3) {
-                    this.chipRevision = await this.getChipRevision();
-                    this.logger.debug(`ESP32-C3 revision: ${this.chipRevision}`);
+                else if (this.chipFamily === CHIP_FAMILY_ESP32P4) {
+                    this.chipVariant = "rev0";
                 }
                 this.logger.debug(`Detected chip via IMAGE_CHIP_ID: ${chipId} (${this.chipName})`);
                 return;
@@ -429,40 +425,109 @@ export class ESPLoader extends EventTarget {
         }
         this.chipName = chip.name;
         this.chipFamily = chip.family;
+        this.chipRevision = await this.getChipRevision();
+        this.logger.debug(`${this.chipName} revision: ${this.chipRevision}`);
         if (this.chipFamily === CHIP_FAMILY_ESP32P4) {
-            this.chipRevision = await this.getChipRevision();
-            if (this.chipRevision >= 300) {
-                this.chipVariant = "rev300";
-            }
-            else {
-                this.chipVariant = "rev0";
-            }
+            this.chipVariant = this.chipRevision >= 300 ? "rev300" : "rev0";
             this.logger.debug(`ESP32-P4 variant: ${this.chipVariant}`);
         }
-        else if (this.chipFamily === CHIP_FAMILY_ESP32C3) {
-            this.chipRevision = await this.getChipRevision();
-        }
         this.logger.debug(`Detected chip via magic value: ${toHex(chipMagicValue >>> 0, 8)} (${this.chipName})`);
     }
-    /**
-     * Get chip revision for ESP32-P4
-     */
     async getChipRevision() {
-        if (this.chipFamily === CHIP_FAMILY_ESP32P4) {
-            // Read from EFUSE_BLOCK1 to get chip revision
-            // Word 2 contains revision info for ESP32-P4
-            const word2 = await this.readRegister(ESP32P4_EFUSE_BLOCK1_ADDR + 8);
-            // Minor revision: bits [3:0]
-            const minorRev = word2 & 0x0f;
-            // Major revision: bits [23] << 2 | bits [5:4]
-            const majorRev = (((word2 >> 23) & 1) << 2) | ((word2 >> 4) & 0x03);
-            // Revision is major * 100 + minor
-            return majorRev * 100 + minorRev;
-        }
-        else if (this.chipFamily === CHIP_FAMILY_ESP32C3) {
-            return await this.getChipRevisionC3();
-        }
-        return 0;
+        var _a;
+        let minor = 0;
+        let major = 0;
+        switch (this.chipFamily) {
+            case CHIP_FAMILY_ESP32: {
+                const efuse3 = await this.readRegister(ESP32_BASEFUSEADDR + 4 * 3);
+                const efuse5 = await this.readRegister(ESP32_BASEFUSEADDR + 4 * 5);
+                minor = (efuse5 >> 24) & 0x3;
+                const revBit0 = (efuse3 >> 15) & 0x1;
+                const revBit1 = (efuse5 >> 20) & 0x1;
+                const apb = await this.readRegister(ESP32_APB_CTL_DATE_ADDR);
+                const revBit2 = (apb >> 31) & 0x1;
+                const combined = (revBit2 << 2) | (revBit1 << 1) | revBit0;
+                major =
+                    (_a = { 0: 0, 1: 1, 3: 2, 7: 3 }[combined]) !== null && _a !== void 0 ? _a : 0;
+                break;
+            }
+            case CHIP_FAMILY_ESP32S2: {
+                const w3 = await this.readRegister(ESP32S2_EFUSE_BLOCK1_ADDR + 4 * 3);
+                const w4 = await this.readRegister(ESP32S2_EFUSE_BLOCK1_ADDR + 4 * 4);
+                const hi = (w3 >> 20) & 0x01;
+                const lo = (w4 >> 4) & 0x07;
+                minor = (hi << 3) + lo;
+                major = (w3 >> 18) & 0x03;
+                break;
+            }
+            case CHIP_FAMILY_ESP32S3: {
+                const w3 = await this.readRegister(ESP32S3_EFUSE_BLOCK1_ADDR + 4 * 3);
+                const w5 = await this.readRegister(ESP32S3_EFUSE_BLOCK1_ADDR + 4 * 5);
+                const hi = (w5 >> 23) & 0x01;
+                const lo = (w3 >> 18) & 0x07;
+                minor = (hi << 3) + lo;
+                major = (w5 >> 24) & 0x03;
+                break;
+            }
+            case CHIP_FAMILY_ESP32C2: {
+                const w1 = await this.readRegister(ESP32C2_EFUSE_BLOCK2_ADDR + 4 * 1);
+                minor = (w1 >> 16) & 0x0f;
+                major = (w1 >> 20) & 0x03;
+                break;
+            }
+            case CHIP_FAMILY_ESP32C3: {
+                const w3 = await this.readRegister(ESP32C3_EFUSE_RD_MAC_SPI_SYS_3_REG);
+                const w5 = await this.readRegister(ESP32C3_EFUSE_RD_MAC_SPI_SYS_5_REG);
+                const hi = (w5 >> 23) & 0x01;
+                const lo = (w3 >> 18) & 0x07;
+                minor = (hi << 3) + lo;
+                major = (w5 >> 24) & 0x03;
+                break;
+            }
+            case CHIP_FAMILY_ESP32C5: {
+                const w2 = await this.readRegister(ESP32C5_EFUSE_BLOCK1_ADDR + 4 * 2);
+                minor = w2 & 0x0f;
+                major = (w2 >> 4) & 0x03;
+                break;
+            }
+            case CHIP_FAMILY_ESP32C6: {
+                const w3 = await this.readRegister(ESP32C6_EFUSE_BLOCK1_ADDR + 4 * 3);
+                minor = (w3 >> 18) & 0x0f;
+                major = (w3 >> 22) & 0x03;
+                break;
+            }
+            case CHIP_FAMILY_ESP32C61: {
+                const w2 = await this.readRegister(ESP32C61_EFUSE_BLOCK1_ADDR + 4 * 2);
+                minor = w2 & 0x0f;
+                major = (w2 >> 4) & 0x03;
+                break;
+            }
+            case CHIP_FAMILY_ESP32H2: {
+                const w3 = await this.readRegister(ESP32H2_EFUSE_BLOCK1_ADDR + 4 * 3);
+                minor = (w3 >> 18) & 0x07;
+                major = (w3 >> 21) & 0x03;
+                break;
+            }
+            case CHIP_FAMILY_ESP32H4: {
+                break;
+            }
+            case CHIP_FAMILY_ESP32H21: {
+                break;
+            }
+            case CHIP_FAMILY_ESP32P4: {
+                const w2 = await this.readRegister(ESP32P4_EFUSE_BLOCK1_ADDR + 4 * 2);
+                minor = w2 & 0x0f;
+                major = (((w2 >> 23) & 1) << 2) | ((w2 >> 4) & 0x03);
+                break;
+            }
+            case CHIP_FAMILY_ESP32S31: {
+                const w2 = await this.readRegister(ESP32S31_EFUSE_BLOCK1_ADDR + 4 * 2);
+                minor = w2 & 0x0f;
+                major = (w2 >> 4) & 0x03;
+                break;
+            }
+        }
+        return major * 100 + minor;
     }
     /**
      * Power on the flash chip for ESP32-P4 Rev 301 (ECO6)
@@ -1171,7 +1236,7 @@ export class ESPLoader extends EventTarget {
                     try {
                         await Promise.race([syncPromise, timeoutPromise]);
                         // Sync succeeded
-                        this.logger.log(`Connected CDC/JTAG successfully with ${strategy.name} reset.`);
+                        this.logger.debug(`Connected CDC/JTAG successfully with ${strategy.name} reset.`);
                         return;
                     }
                     catch (error) {
@@ -1212,24 +1277,6 @@ export class ESPLoader extends EventTarget {
     async watchdogReset() {
         await this.rtcWdtResetChipSpecific();
     }
-    /**
-     * Get chip revision for ESP32-C3
-     * Reads from EFUSE registers and calculates revision
-     */
-    async getChipRevisionC3() {
-        if (this.chipFamily !== CHIP_FAMILY_ESP32C3) {
-            return 0;
-        }
-        // Read EFUSE_RD_MAC_SPI_SYS_3_REG (bits [20:18] = lower 3 bits of revision)
-        const word3 = await this.readRegister(ESP32C3_EFUSE_RD_MAC_SPI_SYS_3_REG);
-        const low = (word3 >> 18) & 0x07;
-        // Read EFUSE_RD_MAC_SPI_SYS_5_REG (bits [25:23] = upper 3 bits of revision)
-        const word5 = await this.readRegister(ESP32C3_EFUSE_RD_MAC_SPI_SYS_5_REG);
-        const hi = (word5 >> 23) & 0x07;
-        // Combine: upper 3 bits from word5, lower 3 bits from word3
-        const revision = (hi << 3) | low;
-        return revision;
-    }
     /**
      * RTC watchdog timer reset for ESP32-S2, ESP32-S3, ESP32-C3, ESP32-C5, ESP32-C6, and ESP32-P4
      * Uses specific registers for each chip family
@@ -1780,15 +1827,34 @@ export class ESPLoader extends EventTarget {
         }
         return state;
     }
+    async getC5CrystalFreqRomExpect() {
+        const reg = await this.readRegister(ESP32C5_PCR_SYSCLK_CONF_REG);
+        return ((reg & ESP32C5_PCR_SYSCLK_XTAL_FREQ_V) >>> ESP32C5_PCR_SYSCLK_XTAL_FREQ_S);
+    }
+    async getC5CrystalFreqDetected() {
+        const UART_CLKDIV_MASK = 0xfffff;
+        const uartDiv = (await this.readRegister(ESP32C5_UART_CLKDIV_REG)) & UART_CLKDIV_MASK;
+        const estXtal = (ESP_ROM_BAUD * uartDiv) / 1e6;
+        if (estXtal > 45)
+            return 48;
+        if (estXtal > 33)
+            return 40;
+        return 26;
+    }
     async setBaudrate(baud) {
-        try {
-            // Send ESP_ROM_BAUD(115200) as the old one if running STUB otherwise 0
-            const buffer = pack("<II", baud, this.IS_STUB ? ESP_ROM_BAUD : 0);
-            await this.checkCommand(ESP_CHANGE_BAUDRATE, buffer);
+        const chipFamily = this._parent ? this._parent.chipFamily : this.chipFamily;
+        if (!this.IS_STUB && chipFamily === CHIP_FAMILY_ESP32C5) {
+            await this.setBaudrateC5Rom(baud);
         }
-        catch (e) {
-            this.logger.error(`Baudrate change error: ${e}`);
-            throw new Error(`Unable to change the baud rate to ${baud}: No response from set baud rate command.`);
+        else {
+            try {
+                const buffer = pack("<II", baud, this.IS_STUB ? ESP_ROM_BAUD : 0);
+                await this.checkCommand(ESP_CHANGE_BAUDRATE, buffer);
+            }
+            catch (e) {
+                this.logger.error(`Baudrate change error: ${e}`);
+                throw new Error(`Unable to change the baud rate to ${baud}: No response from set baud rate command.`);
+            }
         }
         if (this._parent) {
             await this._parent.reconfigurePort(baud);
@@ -1813,7 +1879,29 @@ export class ESPLoader extends EventTarget {
             this.logger.log(`⚠️  WARNING: Baudrate ${baud} exceeds USB-Serial chip limit (${maxBaud})!`);
             this.logger.log(`⚠️  This may cause data corruption or connection failures!`);
         }
-        this.logger.log(`Changed baud rate to ${baud}`);
+        this.logger.debug(`Changed baud rate to ${baud}`);
+    }
+    async setBaudrateC5Rom(baud) {
+        const crystalFreqRomExpect = await this.getC5CrystalFreqRomExpect();
+        const crystalFreqDetect = await this.getC5CrystalFreqDetected();
+        this.logger.log(`ROM expects crystal freq: ${crystalFreqRomExpect} MHz, detected ${crystalFreqDetect} MHz.`);
+        let baudRate = baud;
+        if (crystalFreqDetect === 48 && crystalFreqRomExpect === 40) {
+            baudRate = Math.trunc((baud * 40) / 48);
+        }
+        else if (crystalFreqDetect === 40 && crystalFreqRomExpect === 48) {
+            baudRate = Math.trunc((baud * 48) / 40);
+        }
+        this.logger.log(`Changing baud rate to ${baudRate}...`);
+        try {
+            const buffer = pack("<II", baudRate, 0);
+            await this.checkCommand(ESP_CHANGE_BAUDRATE, buffer);
+        }
+        catch (e) {
+            this.logger.error(`Baudrate change error: ${e}`);
+            throw new Error(`Unable to change the baud rate to ${baudRate}: No response from set baud rate command.`);
+        }
+        this.logger.log("Changed.");
     }
     async reconfigurePort(baud) {
         var _a;
@@ -2279,13 +2367,17 @@ export class ESPLoader extends EventTarget {
         return status;
     }
     async detectFlashSize() {
-        this.logger.log("Detecting Flash Size");
+        this.logger.debug("Detecting Flash Size");
         const flashId = await this.flashId();
         const manufacturer = flashId & 0xff;
         const flashIdLowbyte = (flashId >> 16) & 0xff;
-        this.logger.log(`FlashId: ${toHex(flashId)}`);
-        this.logger.log(`Flash Manufacturer: ${manufacturer.toString(16)}`);
-        this.logger.log(`Flash Device: ${((flashId >> 8) & 0xff).toString(16)}${flashIdLowbyte.toString(16)}`);
+        const deviceTypeByte = (flashId >> 8) & 0xff;
+        const deviceId = (deviceTypeByte << 8) | flashIdLowbyte;
+        const jedecId = (manufacturer << 16) | deviceId;
+        const mfrName = FLASH_MANUFACTURERS[manufacturer];
+        const deviceName = FLASH_DEVICES[jedecId];
+        this.logger.log(`Flash Manufacturer: ${mfrName || "Unknown"} (0x${manufacturer.toString(16)})`);
+        this.logger.log(`Flash Device: ${deviceName || `Unknown (0x${deviceId.toString(16)})`}`);
         this.flashSize = DETECTED_FLASH_SIZES[flashIdLowbyte];
         this.logger.log(`Auto-detected Flash size: ${this.flashSize}`);
     }
@@ -2347,7 +2439,7 @@ export class ESPLoader extends EventTarget {
         // We're transferring over USB, right?
         const ramBlock = USB_RAM_BLOCK;
         // Upload
-        this.logger.log("Uploading stub...");
+        this.logger.debug("Uploading stub...");
         for (const field of ["text", "data"]) {
             const fieldData = stub[field];
             const offset = stub[`${field}_start`];
@@ -2369,7 +2461,7 @@ export class ESPLoader extends EventTarget {
         if (pChar != "OHAI") {
             throw new Error("Failed to start stub. Unexpected response: " + pChar);
         }
-        this.logger.log("Stub is now running...");
+        this.logger.debug("Stub is now running...");
         const espStubLoader = new EspStubLoader(this.port, this.logger, this);
         // Try to autodetect the flash size.
         if (!skipFlashDetection) {
@@ -2827,8 +2919,7 @@ export class ESPLoader extends EventTarget {
                 if (portWillChange) {
                     // Port will change - release reader/writer and let the port become invalid
                     await this.releaseReaderWriter();
-                    this.logger.log(`${this.chipName} USB-OTG: Port will change after WDT reset`);
-                    this.logger.log("Please select the new port for console mode");
+                    this.logger.debug(`${this.chipName} USB-OTG: Port will change after WDT reset`);
                     // Dispatch event to signal port change
                     this.dispatchEvent(new CustomEvent("usb-otg-port-change", {
                         detail: {
@@ -3065,7 +3156,7 @@ export class ESPLoader extends EventTarget {
             await this.connectWithResetStrategies();
             // Detect chip type
             await this.detectChip();
-            this.logger.log(`Reconnected to bootloader: ${this.chipName}`);
+            this.logger.debug(`Reconnected to bootloader: ${this.chipName}`);
         }
         catch (err) {
             // Ensure flag is reset on error
@@ -3102,7 +3193,7 @@ export class ESPLoader extends EventTarget {
         }
         if (isUsbOtgChip && isUsbJtagOrOtg) {
             // USB-OTG devices: Need to reset to bootloader, which will cause port change
-            this.logger.log(`${this.chipName} USB: Resetting to bootloader mode`);
+            this.logger.debug(`${this.chipName} USB: Resetting to bootloader mode`);
             // Perform hardware reset to bootloader (GPIO0=LOW)
             // This will cause the port to change from CDC (firmware) to JTAG (bootloader)
             try {
@@ -3119,7 +3210,7 @@ export class ESPLoader extends EventTarget {
             }
             // Wait for reset to complete and port to change
             await sleep(500);
-            this.logger.log(`${this.chipName}: Port changed. Please select the bootloader port.`);
+            this.logger.debug(`${this.chipName}: Port changed. Please select the bootloader port.`);
             // Dispatch event to signal port change
             this.dispatchEvent(new CustomEvent("usb-otg-port-change", {
                 detail: {

package/dist/flash_jedec.d.ts

@@ -0,0 +1,2 @@
+export declare const FLASH_MANUFACTURERS: Record<number, string>;
+export declare const FLASH_DEVICES: Record<number, string>;