diff --git a/components/esp-face b/components/esp-face index 34a5be7..39d4ee9 160000 --- a/components/esp-face +++ b/components/esp-face @@ -1 +1 @@ -Subproject commit 34a5be7cf43ac5948ae8342b56975e544b480557 +Subproject commit 39d4ee97c87314ea42506198e6401c908dae0e03 diff --git a/examples/single_chip/camera_web_server/sdkconfig.defaults b/examples/single_chip/camera_web_server/sdkconfig.defaults index 96ff546..59d5469 100755 --- a/examples/single_chip/camera_web_server/sdkconfig.defaults +++ b/examples/single_chip/camera_web_server/sdkconfig.defaults @@ -8,10 +8,10 @@ CONFIG_ESPTOOLPY_BAUD_OTHER= CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 CONFIG_ESPTOOLPY_BAUD=921600 CONFIG_ESPTOOLPY_COMPRESSED=y -CONFIG_FLASHMODE_QIO=y -CONFIG_FLASHMODE_QOUT= -CONFIG_FLASHMODE_DIO= -CONFIG_FLASHMODE_DOUT= +CONFIG_ESPTOOLPY_FLASHMODE_QIO=y +CONFIG_ESPTOOLPY_FLASHMODE_QOUT= +CONFIG_ESPTOOLPY_FLASHMODE_DIO= +CONFIG_ESPTOOLPY_FLASHMODE_DOUT= CONFIG_ESPTOOLPY_FLASHMODE="dio" CONFIG_ESPTOOLPY_FLASHFREQ_80M=y CONFIG_ESPTOOLPY_FLASHFREQ_40M= @@ -31,15 +31,15 @@ CONFIG_ESPTOOLPY_BEFORE="default_reset" CONFIG_ESPTOOLPY_AFTER_RESET=y CONFIG_ESPTOOLPY_AFTER_NORESET= CONFIG_ESPTOOLPY_AFTER="hard_reset" -CONFIG_MONITOR_BAUD_9600B= -CONFIG_MONITOR_BAUD_57600B= -CONFIG_MONITOR_BAUD_115200B=y -CONFIG_MONITOR_BAUD_230400B= -CONFIG_MONITOR_BAUD_921600B= -CONFIG_MONITOR_BAUD_2MB= -CONFIG_MONITOR_BAUD_OTHER= -CONFIG_MONITOR_BAUD_OTHER_VAL=115200 -CONFIG_MONITOR_BAUD=115200 +CONFIG_ESPTOOLPY_MONITOR_BAUD_9600B= +CONFIG_ESPTOOLPY_MONITOR_BAUD_57600B= +CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y +CONFIG_ESPTOOLPY_MONITOR_BAUD_230400B= +CONFIG_ESPTOOLPY_MONITOR_BAUD_921600B= +CONFIG_ESPTOOLPY_MONITOR_BAUD_2MB= +CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER= +CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200 +CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 # # Partition Table @@ -65,27 +65,27 @@ CONFIG_ESP32_DEFAULT_CPU_FREQ_80= CONFIG_ESP32_DEFAULT_CPU_FREQ_160= CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240 -CONFIG_SPIRAM_SUPPORT=y +CONFIG_ESP32_SPIRAM_SUPPORT=y # # SPI RAM config # -CONFIG_SPIRAM_BOOT_INIT=y -CONFIG_SPIRAM_IGNORE_NOTFOUND= -CONFIG_SPIRAM_USE_MEMMAP= -CONFIG_SPIRAM_USE_CAPS_ALLOC=y -CONFIG_SPIRAM_USE_MALLOC= -CONFIG_SPIRAM_TYPE_AUTO=y -CONFIG_SPIRAM_TYPE_ESPPSRAM32= -CONFIG_SPIRAM_TYPE_ESPPSRAM64= -CONFIG_SPIRAM_SIZE=-1 -CONFIG_SPIRAM_SPEED_40M= -CONFIG_SPIRAM_SPEED_80M=y -CONFIG_SPIRAM_MEMTEST=y -CONFIG_SPIRAM_CACHE_WORKAROUND=y -CONFIG_SPIRAM_BANKSWITCH_ENABLE=y -CONFIG_SPIRAM_BANKSWITCH_RESERVE=8 -CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST= +CONFIG_ESP32_SPIRAM_BOOT_INIT=y +CONFIG_ESP32_SPIRAM_IGNORE_NOTFOUND= +CONFIG_ESP32_SPIRAM_USE_MEMMAP= +CONFIG_ESP32_SPIRAM_USE_CAPS_ALLOC=y +CONFIG_ESP32_SPIRAM_USE_MALLOC= +CONFIG_ESP32_SPIRAM_TYPE_AUTO=y +CONFIG_ESP32_SPIRAM_TYPE_ESPPSRAM32= +CONFIG_ESP32_SPIRAM_TYPE_ESPPSRAM64= +CONFIG_ESP32_SPIRAM_SIZE=-1 +CONFIG_ESP32_SPIRAM_SPEED_40M= +CONFIG_ESP32_SPIRAM_SPEED_80M=y +CONFIG_ESP32_SPIRAM_MEMTEST=y +CONFIG_ESP32_SPIRAM_CACHE_WORKAROUND=y +CONFIG_ESP32_SPIRAM_BANKSWITCH_ENABLE=y +CONFIG_ESP32_SPIRAM_BANKSWITCH_RESERVE=8 +CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP= CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY= -CONFIG_TASK_WDT= +CONFIG_ESP_TASK_WDT= diff --git a/examples/single_chip/detection_with_command_line/sdkconfig.defaults b/examples/single_chip/detection_with_command_line/sdkconfig.defaults index 96ff546..59d5469 100644 --- a/examples/single_chip/detection_with_command_line/sdkconfig.defaults +++ b/examples/single_chip/detection_with_command_line/sdkconfig.defaults @@ -8,10 +8,10 @@ CONFIG_ESPTOOLPY_BAUD_OTHER= CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 CONFIG_ESPTOOLPY_BAUD=921600 CONFIG_ESPTOOLPY_COMPRESSED=y -CONFIG_FLASHMODE_QIO=y -CONFIG_FLASHMODE_QOUT= -CONFIG_FLASHMODE_DIO= -CONFIG_FLASHMODE_DOUT= +CONFIG_ESPTOOLPY_FLASHMODE_QIO=y +CONFIG_ESPTOOLPY_FLASHMODE_QOUT= +CONFIG_ESPTOOLPY_FLASHMODE_DIO= +CONFIG_ESPTOOLPY_FLASHMODE_DOUT= CONFIG_ESPTOOLPY_FLASHMODE="dio" CONFIG_ESPTOOLPY_FLASHFREQ_80M=y CONFIG_ESPTOOLPY_FLASHFREQ_40M= @@ -31,15 +31,15 @@ CONFIG_ESPTOOLPY_BEFORE="default_reset" CONFIG_ESPTOOLPY_AFTER_RESET=y CONFIG_ESPTOOLPY_AFTER_NORESET= CONFIG_ESPTOOLPY_AFTER="hard_reset" -CONFIG_MONITOR_BAUD_9600B= -CONFIG_MONITOR_BAUD_57600B= -CONFIG_MONITOR_BAUD_115200B=y -CONFIG_MONITOR_BAUD_230400B= -CONFIG_MONITOR_BAUD_921600B= -CONFIG_MONITOR_BAUD_2MB= -CONFIG_MONITOR_BAUD_OTHER= -CONFIG_MONITOR_BAUD_OTHER_VAL=115200 -CONFIG_MONITOR_BAUD=115200 +CONFIG_ESPTOOLPY_MONITOR_BAUD_9600B= +CONFIG_ESPTOOLPY_MONITOR_BAUD_57600B= +CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y +CONFIG_ESPTOOLPY_MONITOR_BAUD_230400B= +CONFIG_ESPTOOLPY_MONITOR_BAUD_921600B= +CONFIG_ESPTOOLPY_MONITOR_BAUD_2MB= +CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER= +CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200 +CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 # # Partition Table @@ -65,27 +65,27 @@ CONFIG_ESP32_DEFAULT_CPU_FREQ_80= CONFIG_ESP32_DEFAULT_CPU_FREQ_160= CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240 -CONFIG_SPIRAM_SUPPORT=y +CONFIG_ESP32_SPIRAM_SUPPORT=y # # SPI RAM config # -CONFIG_SPIRAM_BOOT_INIT=y -CONFIG_SPIRAM_IGNORE_NOTFOUND= -CONFIG_SPIRAM_USE_MEMMAP= -CONFIG_SPIRAM_USE_CAPS_ALLOC=y -CONFIG_SPIRAM_USE_MALLOC= -CONFIG_SPIRAM_TYPE_AUTO=y -CONFIG_SPIRAM_TYPE_ESPPSRAM32= -CONFIG_SPIRAM_TYPE_ESPPSRAM64= -CONFIG_SPIRAM_SIZE=-1 -CONFIG_SPIRAM_SPEED_40M= -CONFIG_SPIRAM_SPEED_80M=y -CONFIG_SPIRAM_MEMTEST=y -CONFIG_SPIRAM_CACHE_WORKAROUND=y -CONFIG_SPIRAM_BANKSWITCH_ENABLE=y -CONFIG_SPIRAM_BANKSWITCH_RESERVE=8 -CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST= +CONFIG_ESP32_SPIRAM_BOOT_INIT=y +CONFIG_ESP32_SPIRAM_IGNORE_NOTFOUND= +CONFIG_ESP32_SPIRAM_USE_MEMMAP= +CONFIG_ESP32_SPIRAM_USE_CAPS_ALLOC=y +CONFIG_ESP32_SPIRAM_USE_MALLOC= +CONFIG_ESP32_SPIRAM_TYPE_AUTO=y +CONFIG_ESP32_SPIRAM_TYPE_ESPPSRAM32= +CONFIG_ESP32_SPIRAM_TYPE_ESPPSRAM64= +CONFIG_ESP32_SPIRAM_SIZE=-1 +CONFIG_ESP32_SPIRAM_SPEED_40M= +CONFIG_ESP32_SPIRAM_SPEED_80M=y +CONFIG_ESP32_SPIRAM_MEMTEST=y +CONFIG_ESP32_SPIRAM_CACHE_WORKAROUND=y +CONFIG_ESP32_SPIRAM_BANKSWITCH_ENABLE=y +CONFIG_ESP32_SPIRAM_BANKSWITCH_RESERVE=8 +CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP= CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY= -CONFIG_TASK_WDT= +CONFIG_ESP_TASK_WDT= diff --git a/examples/single_chip/recognition_solution/sdkconfig.defaults b/examples/single_chip/recognition_solution/sdkconfig.defaults index 7fe2217..a84e174 100644 --- a/examples/single_chip/recognition_solution/sdkconfig.defaults +++ b/examples/single_chip/recognition_solution/sdkconfig.defaults @@ -8,10 +8,10 @@ CONFIG_ESPTOOLPY_BAUD_OTHER= CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 CONFIG_ESPTOOLPY_BAUD=921600 CONFIG_ESPTOOLPY_COMPRESSED=y -CONFIG_FLASHMODE_QIO=y -CONFIG_FLASHMODE_QOUT= -CONFIG_FLASHMODE_DIO= -CONFIG_FLASHMODE_DOUT= +CONFIG_ESPTOOLPY_FLASHMODE_QIO=y +CONFIG_ESPTOOLPY_FLASHMODE_QOUT= +CONFIG_ESPTOOLPY_FLASHMODE_DIO= +CONFIG_ESPTOOLPY_FLASHMODE_DOUT= CONFIG_ESPTOOLPY_FLASHMODE="dio" CONFIG_ESPTOOLPY_FLASHFREQ_80M=y CONFIG_ESPTOOLPY_FLASHFREQ_40M= @@ -31,15 +31,15 @@ CONFIG_ESPTOOLPY_BEFORE="default_reset" CONFIG_ESPTOOLPY_AFTER_RESET=y CONFIG_ESPTOOLPY_AFTER_NORESET= CONFIG_ESPTOOLPY_AFTER="hard_reset" -CONFIG_MONITOR_BAUD_9600B= -CONFIG_MONITOR_BAUD_57600B= -CONFIG_MONITOR_BAUD_115200B=y -CONFIG_MONITOR_BAUD_230400B= -CONFIG_MONITOR_BAUD_921600B= -CONFIG_MONITOR_BAUD_2MB= -CONFIG_MONITOR_BAUD_OTHER= -CONFIG_MONITOR_BAUD_OTHER_VAL=115200 -CONFIG_MONITOR_BAUD=115200 +CONFIG_ESPTOOLPY_MONITOR_BAUD_9600B= +CONFIG_ESPTOOLPY_MONITOR_BAUD_57600B= +CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y +CONFIG_ESPTOOLPY_MONITOR_BAUD_230400B= +CONFIG_ESPTOOLPY_MONITOR_BAUD_921600B= +CONFIG_ESPTOOLPY_MONITOR_BAUD_2MB= +CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER= +CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200 +CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 # # Partition Table @@ -65,27 +65,27 @@ CONFIG_ESP32_DEFAULT_CPU_FREQ_80= CONFIG_ESP32_DEFAULT_CPU_FREQ_160= CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240 -CONFIG_SPIRAM_SUPPORT=y +CONFIG_ESP32_SPIRAM_SUPPORT=y # # SPI RAM config # -CONFIG_SPIRAM_BOOT_INIT=y -CONFIG_SPIRAM_IGNORE_NOTFOUND= -CONFIG_SPIRAM_USE_MEMMAP= -CONFIG_SPIRAM_USE_CAPS_ALLOC=y -CONFIG_SPIRAM_USE_MALLOC= -CONFIG_SPIRAM_TYPE_AUTO=y -CONFIG_SPIRAM_TYPE_ESPPSRAM32= -CONFIG_SPIRAM_TYPE_ESPPSRAM64= -CONFIG_SPIRAM_SIZE=-1 -CONFIG_SPIRAM_SPEED_40M= -CONFIG_SPIRAM_SPEED_80M=y -CONFIG_SPIRAM_MEMTEST=y -CONFIG_SPIRAM_CACHE_WORKAROUND=y -CONFIG_SPIRAM_BANKSWITCH_ENABLE=y -CONFIG_SPIRAM_BANKSWITCH_RESERVE=8 -CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST= +CONFIG_ESP32_SPIRAM_BOOT_INIT=y +CONFIG_ESP32_SPIRAM_IGNORE_NOTFOUND= +CONFIG_ESP32_SPIRAM_USE_MEMMAP= +CONFIG_ESP32_SPIRAM_USE_CAPS_ALLOC=y +CONFIG_ESP32_SPIRAM_USE_MALLOC= +CONFIG_ESP32_SPIRAM_TYPE_AUTO=y +CONFIG_ESP32_SPIRAM_TYPE_ESPPSRAM32= +CONFIG_ESP32_SPIRAM_TYPE_ESPPSRAM64= +CONFIG_ESP32_SPIRAM_SIZE=-1 +CONFIG_ESP32_SPIRAM_SPEED_40M= +CONFIG_ESP32_SPIRAM_SPEED_80M=y +CONFIG_ESP32_SPIRAM_MEMTEST=y +CONFIG_ESP32_SPIRAM_CACHE_WORKAROUND=y +CONFIG_ESP32_SPIRAM_BANKSWITCH_ENABLE=y +CONFIG_ESP32_SPIRAM_BANKSWITCH_RESERVE=8 +CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP= CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY= -CONFIG_TASK_WDT= +CONFIG_ESP_TASK_WDT= diff --git a/examples/single_chip/recognition_wechat/sdkconfig.defaults b/examples/single_chip/recognition_wechat/sdkconfig.defaults index ac20d40..bd2ad51 100644 --- a/examples/single_chip/recognition_wechat/sdkconfig.defaults +++ b/examples/single_chip/recognition_wechat/sdkconfig.defaults @@ -8,10 +8,10 @@ CONFIG_ESPTOOLPY_BAUD_OTHER= CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 CONFIG_ESPTOOLPY_BAUD=921600 CONFIG_ESPTOOLPY_COMPRESSED=y -CONFIG_FLASHMODE_QIO=y -CONFIG_FLASHMODE_QOUT= -CONFIG_FLASHMODE_DIO= -CONFIG_FLASHMODE_DOUT= +CONFIG_ESPTOOLPY_FLASHMODE_QIO=y +CONFIG_ESPTOOLPY_FLASHMODE_QOUT= +CONFIG_ESPTOOLPY_FLASHMODE_DIO= +CONFIG_ESPTOOLPY_FLASHMODE_DOUT= CONFIG_ESPTOOLPY_FLASHMODE="dio" CONFIG_ESPTOOLPY_FLASHFREQ_80M=y CONFIG_ESPTOOLPY_FLASHFREQ_40M= @@ -31,15 +31,15 @@ CONFIG_ESPTOOLPY_BEFORE="default_reset" CONFIG_ESPTOOLPY_AFTER_RESET=y CONFIG_ESPTOOLPY_AFTER_NORESET= CONFIG_ESPTOOLPY_AFTER="hard_reset" -CONFIG_MONITOR_BAUD_9600B= -CONFIG_MONITOR_BAUD_57600B= -CONFIG_MONITOR_BAUD_115200B=y -CONFIG_MONITOR_BAUD_230400B= -CONFIG_MONITOR_BAUD_921600B= -CONFIG_MONITOR_BAUD_2MB= -CONFIG_MONITOR_BAUD_OTHER= -CONFIG_MONITOR_BAUD_OTHER_VAL=115200 -CONFIG_MONITOR_BAUD=115200 +CONFIG_ESPTOOLPY_MONITOR_BAUD_9600B= +CONFIG_ESPTOOLPY_MONITOR_BAUD_57600B= +CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y +CONFIG_ESPTOOLPY_MONITOR_BAUD_230400B= +CONFIG_ESPTOOLPY_MONITOR_BAUD_921600B= +CONFIG_ESPTOOLPY_MONITOR_BAUD_2MB= +CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER= +CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200 +CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 # # Partition Table @@ -65,28 +65,28 @@ CONFIG_ESP32_DEFAULT_CPU_FREQ_80= CONFIG_ESP32_DEFAULT_CPU_FREQ_160= CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240 -CONFIG_SPIRAM_SUPPORT=y +CONFIG_ESP32_SPIRAM_SUPPORT=y # # SPI RAM config # -CONFIG_SPIRAM_BOOT_INIT=y -CONFIG_SPIRAM_IGNORE_NOTFOUND= -CONFIG_SPIRAM_USE_MEMMAP= -CONFIG_SPIRAM_USE_CAPS_ALLOC= -CONFIG_SPIRAM_USE_MALLOC=y -CONFIG_SPIRAM_TYPE_AUTO=y -CONFIG_SPIRAM_TYPE_ESPPSRAM32= -CONFIG_SPIRAM_TYPE_ESPPSRAM64= -CONFIG_SPIRAM_SIZE=-1 -CONFIG_SPIRAM_SPEED_40M= -CONFIG_SPIRAM_SPEED_80M=y -CONFIG_SPIRAM_MEMTEST=y -CONFIG_SPIRAM_CACHE_WORKAROUND=y -CONFIG_SPIRAM_BANKSWITCH_ENABLE=y -CONFIG_SPIRAM_BANKSWITCH_RESERVE=8 -CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=3096 -CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST= +CONFIG_ESP32_SPIRAM_BOOT_INIT=y +CONFIG_ESP32_SPIRAM_IGNORE_NOTFOUND= +CONFIG_ESP32_SPIRAM_USE_MEMMAP= +CONFIG_ESP32_SPIRAM_USE_CAPS_ALLOC= +CONFIG_ESP32_SPIRAM_USE_MALLOC=y +CONFIG_ESP32_SPIRAM_TYPE_AUTO=y +CONFIG_ESP32_SPIRAM_TYPE_ESPPSRAM32= +CONFIG_ESP32_SPIRAM_TYPE_ESPPSRAM64= +CONFIG_ESP32_SPIRAM_SIZE=-1 +CONFIG_ESP32_SPIRAM_SPEED_40M= +CONFIG_ESP32_SPIRAM_SPEED_80M=y +CONFIG_ESP32_SPIRAM_MEMTEST=y +CONFIG_ESP32_SPIRAM_CACHE_WORKAROUND=y +CONFIG_ESP32_SPIRAM_BANKSWITCH_ENABLE=y +CONFIG_ESP32_SPIRAM_BANKSWITCH_RESERVE=8 +CONFIG_ESP32_SPIRAM_MALLOC_ALWAYSINTERNAL=3096 +CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP= CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768 CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY= CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY= diff --git a/examples/single_chip/recognition_with_command_line/sdkconfig.defaults b/examples/single_chip/recognition_with_command_line/sdkconfig.defaults index 96ff546..59d5469 100644 --- a/examples/single_chip/recognition_with_command_line/sdkconfig.defaults +++ b/examples/single_chip/recognition_with_command_line/sdkconfig.defaults @@ -8,10 +8,10 @@ CONFIG_ESPTOOLPY_BAUD_OTHER= CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 CONFIG_ESPTOOLPY_BAUD=921600 CONFIG_ESPTOOLPY_COMPRESSED=y -CONFIG_FLASHMODE_QIO=y -CONFIG_FLASHMODE_QOUT= -CONFIG_FLASHMODE_DIO= -CONFIG_FLASHMODE_DOUT= +CONFIG_ESPTOOLPY_FLASHMODE_QIO=y +CONFIG_ESPTOOLPY_FLASHMODE_QOUT= +CONFIG_ESPTOOLPY_FLASHMODE_DIO= +CONFIG_ESPTOOLPY_FLASHMODE_DOUT= CONFIG_ESPTOOLPY_FLASHMODE="dio" CONFIG_ESPTOOLPY_FLASHFREQ_80M=y CONFIG_ESPTOOLPY_FLASHFREQ_40M= @@ -31,15 +31,15 @@ CONFIG_ESPTOOLPY_BEFORE="default_reset" CONFIG_ESPTOOLPY_AFTER_RESET=y CONFIG_ESPTOOLPY_AFTER_NORESET= CONFIG_ESPTOOLPY_AFTER="hard_reset" -CONFIG_MONITOR_BAUD_9600B= -CONFIG_MONITOR_BAUD_57600B= -CONFIG_MONITOR_BAUD_115200B=y -CONFIG_MONITOR_BAUD_230400B= -CONFIG_MONITOR_BAUD_921600B= -CONFIG_MONITOR_BAUD_2MB= -CONFIG_MONITOR_BAUD_OTHER= -CONFIG_MONITOR_BAUD_OTHER_VAL=115200 -CONFIG_MONITOR_BAUD=115200 +CONFIG_ESPTOOLPY_MONITOR_BAUD_9600B= +CONFIG_ESPTOOLPY_MONITOR_BAUD_57600B= +CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y +CONFIG_ESPTOOLPY_MONITOR_BAUD_230400B= +CONFIG_ESPTOOLPY_MONITOR_BAUD_921600B= +CONFIG_ESPTOOLPY_MONITOR_BAUD_2MB= +CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER= +CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200 +CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 # # Partition Table @@ -65,27 +65,27 @@ CONFIG_ESP32_DEFAULT_CPU_FREQ_80= CONFIG_ESP32_DEFAULT_CPU_FREQ_160= CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240 -CONFIG_SPIRAM_SUPPORT=y +CONFIG_ESP32_SPIRAM_SUPPORT=y # # SPI RAM config # -CONFIG_SPIRAM_BOOT_INIT=y -CONFIG_SPIRAM_IGNORE_NOTFOUND= -CONFIG_SPIRAM_USE_MEMMAP= -CONFIG_SPIRAM_USE_CAPS_ALLOC=y -CONFIG_SPIRAM_USE_MALLOC= -CONFIG_SPIRAM_TYPE_AUTO=y -CONFIG_SPIRAM_TYPE_ESPPSRAM32= -CONFIG_SPIRAM_TYPE_ESPPSRAM64= -CONFIG_SPIRAM_SIZE=-1 -CONFIG_SPIRAM_SPEED_40M= -CONFIG_SPIRAM_SPEED_80M=y -CONFIG_SPIRAM_MEMTEST=y -CONFIG_SPIRAM_CACHE_WORKAROUND=y -CONFIG_SPIRAM_BANKSWITCH_ENABLE=y -CONFIG_SPIRAM_BANKSWITCH_RESERVE=8 -CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST= +CONFIG_ESP32_SPIRAM_BOOT_INIT=y +CONFIG_ESP32_SPIRAM_IGNORE_NOTFOUND= +CONFIG_ESP32_SPIRAM_USE_MEMMAP= +CONFIG_ESP32_SPIRAM_USE_CAPS_ALLOC=y +CONFIG_ESP32_SPIRAM_USE_MALLOC= +CONFIG_ESP32_SPIRAM_TYPE_AUTO=y +CONFIG_ESP32_SPIRAM_TYPE_ESPPSRAM32= +CONFIG_ESP32_SPIRAM_TYPE_ESPPSRAM64= +CONFIG_ESP32_SPIRAM_SIZE=-1 +CONFIG_ESP32_SPIRAM_SPEED_40M= +CONFIG_ESP32_SPIRAM_SPEED_80M=y +CONFIG_ESP32_SPIRAM_MEMTEST=y +CONFIG_ESP32_SPIRAM_CACHE_WORKAROUND=y +CONFIG_ESP32_SPIRAM_BANKSWITCH_ENABLE=y +CONFIG_ESP32_SPIRAM_BANKSWITCH_RESERVE=8 +CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP= CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY= -CONFIG_TASK_WDT= +CONFIG_ESP_TASK_WDT=