squeezelite must be on pthread core + BT sink start in internal stack

2025-12-06 11:36:59 +03:00 · 2021-12-20 23:35:47 -08:00
parent 088825102e
commit e16b7dd15b
3 changed files with 112 additions and 96 deletions
--- a/components/platform_console/app_squeezelite/cmd_squeezelite.c
+++ b/components/platform_console/app_squeezelite/cmd_squeezelite.c
@@ -115,8 +115,8 @@ static int launchsqueezelite(int argc, char **argv) {
 	}

 	ESP_LOGD(TAG,"Starting Squeezelite Thread");
-	xTaskCreateStatic(squeezelite_thread, "squeezelite", SQUEEZELITE_THREAD_STACK_SIZE, 
-					  NULL, CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT, xStack, &xTaskBuffer);
+	xTaskCreateStaticPinnedToCore(squeezelite_thread, "squeezelite", SQUEEZELITE_THREAD_STACK_SIZE, 
+					  NULL, CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT, xStack, &xTaskBuffer, CONFIG_PTHREAD_TASK_CORE_DEFAULT);
 	ESP_LOGD(TAG ,"Back to console thread!");

    return 0;
--- a/components/squeezelite/decode_external.c
+++ b/components/squeezelite/decode_external.c
@@ -9,9 +9,14 @@
 *
 */

+#include <math.h>
+#ifdef ESP_PLATFORM
+#include "freertos/FreeRTOS.h"
+#include "freertos/timers.h"
+#endif
 #include "platform_config.h"
 #include "squeezelite.h"
-#include <math.h>
+

 #if CONFIG_BT_SINK
 #include "bt_app_sink.h"
@@ -399,6 +404,21 @@ static bool cspot_cmd_handler(cspot_event_t cmd, va_list args)
 /****************************************************************************************
 * We provide the generic codec register option
 */
+
+#if defined(ESP_PLATFORM) && defined(CONFIG_BT_SINK)
+void bt_delay_start(TimerHandle_t xTimer) {
+	xTimerDelete(xTimer, portMAX_DELAY);
+	bt_sink_init(bt_sink_cmd_handler, sink_data_handler);
+	LOG_INFO("Initializing BT sink");
+}	
+
+void bt_delay_stop(TimerHandle_t xTimer) {
+	xTimerDelete(xTimer, portMAX_DELAY);
+	bt_sink_deinit();
+	LOG_INFO("Stopping BT sink");
+}	
+#endif
+
 void register_external(void) {
 	char *p;

@@ -426,8 +446,13 @@ void register_external(void) {
 #if CONFIG_BT_SINK	
 	if (!strcasestr(output.device, "BT ") ) {
 		if(enable_bt_sink){
+#ifdef ESP_PLATFORM
+			// we need to delay the start because current task is in spiram
+			TimerHandle_t timer = xTimerCreate("delay", 1, pdFALSE, NULL, bt_delay_start);
+			xTimerStart(timer, portMAX_DELAY);
+#else
 			bt_sink_init(bt_sink_cmd_handler, sink_data_handler);
-			LOG_INFO("Initializing BT sink");
+#endif
 		}
 	} else {
 		LOG_WARN("Cannot be a BT sink and source");
@@ -452,16 +477,23 @@ void register_external(void) {
 void deregister_external(void) {
 #if CONFIG_BT_SINK
 	if (!strcasestr(output.device, "BT ") && enable_bt_sink) {
-		LOG_INFO("Stopping BT sink");
+#ifdef ESP_PLATFORM
+		// we need to delay the stop because current task is in spiram
+		TimerHandle_t timer = xTimerCreate("delay", 1, pdFALSE, NULL, bt_delay_stop);
+		xTimerStart(timer, portMAX_DELAY);
+#else
 		bt_sink_deinit();
+#endif
 	}
 #endif
+
 #if CONFIG_AIRPLAY_SINK
 	if (enable_airplay){
 		LOG_INFO("Stopping AirPlay sink");		
 		raop_sink_deinit();
 	}
 #endif
+
 #if CONFIG_CSPOT_SINK
 	if (enable_cspot){
 		LOG_INFO("Stopping CSpot sink");		
--- a/166
+++ b/166
@@ -64,6 +64,7 @@ CONFIG_BOOTLOADER_WDT_TIME_MS=9000
 # CONFIG_BOOTLOADER_SKIP_VALIDATE_ALWAYS is not set
 CONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0
 # CONFIG_BOOTLOADER_CUSTOM_RESERVE_RTC is not set
+CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT=y
 # end of Bootloader config

 #
@@ -165,6 +166,8 @@ CONFIG_ETH_SPI_SPEED=20000000
 # end of Ethernet Options
 # end of Network Manager Configuration

+CONFIG_LWIP_MAX_SOCKETS=20
+
 #
 # Squeezelite-ESP32
 #
@@ -192,6 +195,7 @@ CONFIG_PROJECT_NAME="Squeezelite-ESP32"
 CONFIG_FW_PLATFORM_NAME="ESP32"
 CONFIG_DAC_CONFIG=""
 CONFIG_SPDIF_CONFIG=""
+CONFIG_GPIO_EXP_CONFIG=""
 CONFIG_SPI_CONFIG=""
 CONFIG_DISPLAY_CONFIG=""
 CONFIG_ETH_CONFIG=""
@@ -202,13 +206,6 @@ CONFIG_DAC_CONTROLSET=""
 # Audio settings
 #

-#
-# Known Configurations
-#
-CONFIG_DAC_KNOWN_CONFIGURATIONS="ESP-A1S-AC101(audio kit 2.2)-Fixed GPIOs|ESP-A1S-ES8388(audio kit 2.2+)-Fixed GPIOs"
-CONFIG_DAC_KNOWN_CONFIGURATIONS_GPIOS="model=AC101,bck=27,ws=26,do=25,di=35,sda=33,scl=32|model=ES8388,bck=5,ws=25,do=26,sda=18,scl=23,i2c=16"
-# end of Known Configurations
-
 #
 # DAC settings
 #
@@ -261,6 +258,7 @@ CONFIG_BT_SINK_PIN=1234
 CONFIG_AIRPLAY_SINK=y
 CONFIG_AIRPLAY_NAME="ESP32-AirPlay"
 CONFIG_AIRPLAY_PORT="5000"
+CONFIG_CSPOT_SINK=y
 # end of Audio Input

 #
@@ -319,7 +317,8 @@ CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 # CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE is not set
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
 # CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set
-# CONFIG_COMPILER_CXX_EXCEPTIONS is not set
+CONFIG_COMPILER_CXX_EXCEPTIONS=y
+CONFIG_COMPILER_CXX_EXCEPTIONS_EMG_POOL_SIZE=0
 # CONFIG_COMPILER_CXX_RTTI is not set
 CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y
 # CONFIG_COMPILER_STACK_CHECK_MODE_NORM is not set
@@ -447,12 +446,13 @@ CONFIG_BT_SSP_ENABLED=y
 # CONFIG_BT_BLE_ENABLED is not set
 CONFIG_BT_STACK_NO_LOG=y
 CONFIG_BT_ACL_CONNECTIONS=4
-CONFIG_BT_MULTI_CONNECTION_ENBALE=y
+# CONFIG_BT_MULTI_CONNECTION_ENBALE is not set
 CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST=y
 CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=y
 # CONFIG_BT_BLE_HOST_QUEUE_CONG_CHECK is not set
 CONFIG_BT_SMP_ENABLE=y
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
+CONFIG_BT_MAX_DEVICE_NAME_LEN=32
 # CONFIG_BT_BLE_RPA_SUPPORTED is not set
 CONFIG_BT_RESERVE_DRAM=0xdb5c
 # end of Bluedroid Options
@@ -487,8 +487,8 @@ CONFIG_ADC_DISABLE_DAC=y
 #
 CONFIG_SPI_MASTER_IN_IRAM=y
 CONFIG_SPI_MASTER_ISR_IN_IRAM=y
-CONFIG_SPI_SLAVE_IN_IRAM=y
-CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
+# CONFIG_SPI_SLAVE_IN_IRAM is not set
+# CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set
 # end of SPI configuration

 #
@@ -545,11 +545,11 @@ CONFIG_ESP_TLS_USING_MBEDTLS=y
 # ESP32-specific
 #
 CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
-CONFIG_ESP32_REV_MIN_0=y
-# CONFIG_ESP32_REV_MIN_1 is not set
+# CONFIG_ESP32_REV_MIN_0 is not set
+CONFIG_ESP32_REV_MIN_1=y
 # CONFIG_ESP32_REV_MIN_2 is not set
 # CONFIG_ESP32_REV_MIN_3 is not set
-CONFIG_ESP32_REV_MIN=0
+CONFIG_ESP32_REV_MIN=1
 CONFIG_ESP32_DPORT_WORKAROUND=y
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_80 is not set
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_160 is not set
@@ -587,8 +587,7 @@ CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_MEMW=y
 # CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_NOPS is not set
 # end of SPIRAM cache workaround debugging

-CONFIG_SPIRAM_BANKSWITCH_ENABLE=y
-CONFIG_SPIRAM_BANKSWITCH_RESERVE=8
+# CONFIG_SPIRAM_BANKSWITCH_ENABLE is not set
 CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
 # CONFIG_SPIRAM_OCCUPY_HSPI_HOST is not set
 CONFIG_SPIRAM_OCCUPY_VSPI_HOST=y
@@ -670,7 +669,7 @@ CONFIG_ADC_CAL_LUT_ENABLE=y
 #
 CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
 CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32
-CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304
+CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=3400
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
 CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
 CONFIG_ESP_IPC_USES_CALLERS_PRIORITY=y
@@ -733,7 +732,7 @@ CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR=y
 #
 # ESP HTTP client
 #
-CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y
+# CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS is not set
 # CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH is not set
 # end of ESP HTTP client

@@ -751,7 +750,7 @@ CONFIG_HTTPD_PURGE_BUF_LEN=32
 #
 # ESP HTTPS OTA
 #
-CONFIG_OTA_ALLOW_HTTP=y
+# CONFIG_OTA_ALLOW_HTTP is not set
 # end of ESP HTTPS OTA

 #
@@ -782,6 +781,8 @@ CONFIG_ESP_NETIF_TCPIP_ADAPTER_COMPATIBLE_LAYER=y
 CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y
 # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
 # CONFIG_ESP_SYSTEM_PANIC_GDBSTUB is not set
+# CONFIG_ESP_SYSTEM_PSRAM_LEAKAGE_WORKAROUND is not set
+# CONFIG_ESP_SYSTEM_FLASH_LEAKAGE_WORKAROUND is not set

 #
 # Memory protection
@@ -844,18 +845,8 @@ CONFIG_ESP32_PHY_MAX_TX_POWER=20
 #
 # Core dump
 #
-CONFIG_ESP_COREDUMP_ENABLE_TO_UART=y
-# CONFIG_ESP_COREDUMP_ENABLE_TO_NONE is not set
-# CONFIG_ESP_COREDUMP_DATA_FORMAT_BIN is not set
-CONFIG_ESP_COREDUMP_DATA_FORMAT_ELF=y
-CONFIG_ESP_COREDUMP_CHECKSUM_CRC32=y
-# CONFIG_ESP_COREDUMP_CHECKSUM_SHA256 is not set
-CONFIG_ESP_COREDUMP_ENABLE=y
-CONFIG_ESP_COREDUMP_MAX_TASKS_NUM=64
-CONFIG_ESP_COREDUMP_UART_DELAY=0
-CONFIG_ESP_COREDUMP_DECODE_INFO=y
-# CONFIG_ESP_COREDUMP_DECODE_DISABLE is not set
-CONFIG_ESP_COREDUMP_DECODE="info"
+# CONFIG_ESP_COREDUMP_ENABLE_TO_UART is not set
+CONFIG_ESP_COREDUMP_ENABLE_TO_NONE=y
 # end of Core dump

 #
@@ -897,11 +888,8 @@ CONFIG_FATFS_ALLOC_PREFER_EXTRAM=y
 #
 # Modbus configuration
 #
-CONFIG_FMB_COMM_MODE_TCP_EN=y
-CONFIG_FMB_TCP_PORT_DEFAULT=502
-CONFIG_FMB_TCP_PORT_MAX_CONN=5
-CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20
-CONFIG_FMB_COMM_MODE_RTU_EN=y
+# CONFIG_FMB_COMM_MODE_TCP_EN is not set
+# CONFIG_FMB_COMM_MODE_RTU_EN is not set
 CONFIG_FMB_COMM_MODE_ASCII_EN=y
 CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=150
 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200
@@ -911,14 +899,20 @@ CONFIG_FMB_SERIAL_BUF_SIZE=256
 CONFIG_FMB_SERIAL_ASCII_BITS_PER_SYMB=8
 CONFIG_FMB_SERIAL_ASCII_TIMEOUT_RESPOND_MS=1000
 CONFIG_FMB_PORT_TASK_PRIO=10
+# CONFIG_FMB_PORT_TASK_AFFINITY_NO_AFFINITY is not set
+CONFIG_FMB_PORT_TASK_AFFINITY_CPU0=y
+# CONFIG_FMB_PORT_TASK_AFFINITY_CPU1 is not set
+CONFIG_FMB_PORT_TASK_AFFINITY=0x0
 # CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT is not set
 CONFIG_FMB_CONTROLLER_NOTIFY_TIMEOUT=20
 CONFIG_FMB_CONTROLLER_NOTIFY_QUEUE_SIZE=20
 CONFIG_FMB_CONTROLLER_STACK_SIZE=4096
 CONFIG_FMB_EVENT_QUEUE_TIMEOUT=20
-CONFIG_FMB_TIMER_PORT_ENABLED=y
+# CONFIG_FMB_TIMER_PORT_ENABLED is not set
 CONFIG_FMB_TIMER_GROUP=0
 CONFIG_FMB_TIMER_INDEX=0
+CONFIG_FMB_MASTER_TIMER_GROUP=0
+CONFIG_FMB_MASTER_TIMER_INDEX=0
 # CONFIG_FMB_TIMER_ISR_IN_IRAM is not set
 # end of Modbus configuration

@@ -937,21 +931,25 @@ CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y
 # CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set
 CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y
 CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1
-# CONFIG_FREERTOS_ASSERT_FAIL_ABORT is not set
+CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y
 # CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE is not set
-CONFIG_FREERTOS_ASSERT_DISABLE=y
+# CONFIG_FREERTOS_ASSERT_DISABLE is not set
 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1536
-CONFIG_FREERTOS_ISR_STACKSIZE=2096
+CONFIG_FREERTOS_ISR_STACKSIZE=1536
 # CONFIG_FREERTOS_LEGACY_HOOKS is not set
 CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
 CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
 # CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set
 CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1
-CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2432
+CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=3800
 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10
 CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0
-# CONFIG_FREERTOS_USE_TRACE_FACILITY is not set
-# CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS is not set
+CONFIG_FREERTOS_USE_TRACE_FACILITY=y
+CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS=y
+# CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID is not set
+CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y
+CONFIG_FREERTOS_RUN_TIME_STATS_USING_ESP_TIMER=y
+# CONFIG_FREERTOS_RUN_TIME_STATS_USING_CPU_CLK is not set
 CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y
 # CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE is not set
 CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
@@ -1001,22 +999,21 @@ CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
 #
 # LWIP
 #
-CONFIG_LWIP_LOCAL_HOSTNAME="esp32a1s"
+CONFIG_LWIP_LOCAL_HOSTNAME="SqueezeESP32"
 CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y
 # CONFIG_LWIP_L2_TO_L3_COPY is not set
 # CONFIG_LWIP_IRAM_OPTIMIZATION is not set
 CONFIG_LWIP_TIMERS_ONDEMAND=y
-CONFIG_LWIP_MAX_SOCKETS=16
 # CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set
 # CONFIG_LWIP_SO_LINGER is not set
 CONFIG_LWIP_SO_REUSE=y
 CONFIG_LWIP_SO_REUSE_RXTOALL=y
 # CONFIG_LWIP_SO_RCVBUF is not set
 # CONFIG_LWIP_NETBUF_RECVINFO is not set
-CONFIG_LWIP_IP4_FRAG=y
-CONFIG_LWIP_IP6_FRAG=y
-# CONFIG_LWIP_IP4_REASSEMBLY is not set
-# CONFIG_LWIP_IP6_REASSEMBLY is not set
+# CONFIG_LWIP_IP4_FRAG is not set
+# CONFIG_LWIP_IP6_FRAG is not set
+CONFIG_LWIP_IP4_REASSEMBLY=y
+CONFIG_LWIP_IP6_REASSEMBLY=y
 # CONFIG_LWIP_IP_FORWARD is not set
 # CONFIG_LWIP_STATS is not set
 # CONFIG_LWIP_ETHARP_TRUST_IP_MAC is not set
@@ -1062,7 +1059,7 @@ CONFIG_LWIP_TCP_OVERSIZE_MSS=y
 # CONFIG_LWIP_TCP_OVERSIZE_QUARTER_MSS is not set
 # CONFIG_LWIP_TCP_OVERSIZE_DISABLE is not set
 # CONFIG_LWIP_WND_SCALE is not set
-CONFIG_LWIP_TCP_RTO_TIME=1500
+CONFIG_LWIP_TCP_RTO_TIME=3000
 # end of TCP

 #
@@ -1111,7 +1108,7 @@ CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
 CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
 # end of SNTP

-CONFIG_LWIP_ESP_LWIP_ASSERT=y
+# CONFIG_LWIP_ESP_LWIP_ASSERT is not set

 #
 # Hooks
@@ -1137,17 +1134,20 @@ CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_NONE=y
 CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y
 # CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC is not set
 # CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC is not set
-CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
-# CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
-# CONFIG_MBEDTLS_DYNAMIC_BUFFER is not set
+CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y
+CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=16384
+CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=4096
+CONFIG_MBEDTLS_DYNAMIC_BUFFER=y
+# CONFIG_MBEDTLS_DYNAMIC_FREE_PEER_CERT is not set
+# CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA is not set
 # CONFIG_MBEDTLS_DEBUG is not set

 #
 # Certificate Bundle
 #
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y
-# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL is not set
-CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN=y
+CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL=y
+# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN is not set
 # CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_NONE is not set
 # CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE is not set
 # end of Certificate Bundle
@@ -1187,7 +1187,7 @@ CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA=y
 CONFIG_MBEDTLS_SSL_RENEGOTIATION=y
 # CONFIG_MBEDTLS_SSL_PROTO_SSL3 is not set
 # CONFIG_MBEDTLS_SSL_PROTO_TLS1 is not set
-CONFIG_MBEDTLS_SSL_PROTO_TLS1_1=y
+# CONFIG_MBEDTLS_SSL_PROTO_TLS1_1 is not set
 CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y
 # CONFIG_MBEDTLS_SSL_PROTO_DTLS is not set
 CONFIG_MBEDTLS_SSL_ALPN=y
@@ -1266,10 +1266,8 @@ CONFIG_MDNS_TIMER_PERIOD_MS=100
 #
 # ESP-MQTT Configurations
 #
-CONFIG_MQTT_PROTOCOL_311=y
-CONFIG_MQTT_TRANSPORT_SSL=y
-CONFIG_MQTT_TRANSPORT_WEBSOCKET=y
-CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=y
+# CONFIG_MQTT_PROTOCOL_311 is not set
+# CONFIG_MQTT_TRANSPORT_SSL is not set
 # CONFIG_MQTT_MSG_ID_INCREMENTAL is not set
 # CONFIG_MQTT_SKIP_PUBLISH_IF_DISCONNECTED is not set
 # CONFIG_MQTT_REPORT_DELETED_MESSAGES is not set
@@ -1299,7 +1297,7 @@ CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y
 # OpenSSL
 #
 # CONFIG_OPENSSL_DEBUG is not set
-CONFIG_OPENSSL_ERROR_STACK=y
+# CONFIG_OPENSSL_ERROR_STACK is not set
 CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
 # CONFIG_OPENSSL_ASSERT_EXIT is not set
 # end of OpenSSL
@@ -1391,8 +1389,7 @@ CONFIG_SPIFFS_USE_MTIME=y
 #
 # Websocket
 #
-CONFIG_WS_TRANSPORT=y
-CONFIG_WS_BUFFER_SIZE=1024
+# CONFIG_WS_TRANSPORT is not set
 # end of Websocket
 # end of TCP Transport

@@ -1417,9 +1414,8 @@ CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y
 #
 CONFIG_VFS_SUPPORT_IO=y
 CONFIG_VFS_SUPPORT_DIR=y
-CONFIG_VFS_SUPPORT_SELECT=y
-CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT=y
-CONFIG_VFS_SUPPORT_TERMIOS=y
+# CONFIG_VFS_SUPPORT_SELECT is not set
+# CONFIG_VFS_SUPPORT_TERMIOS is not set

 #
 # Host File System I/O (Semihosting)
@@ -1432,12 +1428,9 @@ CONFIG_VFS_SEMIHOSTFS_HOST_PATH_MAX_LEN=128
 #
 # Wear Levelling
 #
-CONFIG_WL_SECTOR_SIZE_512=y
-# CONFIG_WL_SECTOR_SIZE_4096 is not set
-CONFIG_WL_SECTOR_SIZE=512
-# CONFIG_WL_SECTOR_MODE_PERF is not set
-CONFIG_WL_SECTOR_MODE_SAFE=y
-CONFIG_WL_SECTOR_MODE=1
+# CONFIG_WL_SECTOR_SIZE_512 is not set
+CONFIG_WL_SECTOR_SIZE_4096=y
+CONFIG_WL_SECTOR_SIZE=4096
 # end of Wear Levelling

 #
@@ -1445,6 +1438,7 @@ CONFIG_WL_SECTOR_MODE=1
 #
 CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
 CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
+# CONFIG_WIFI_PROV_BLE_BONDING is not set
 # end of Wi-Fi Provisioning Manager

 #
@@ -1510,7 +1504,8 @@ CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
 # CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED is not set
 CONFIG_OPTIMIZATION_ASSERTIONS_SILENT=y
 # CONFIG_OPTIMIZATION_ASSERTIONS_DISABLED is not set
-# CONFIG_CXX_EXCEPTIONS is not set
+CONFIG_CXX_EXCEPTIONS=y
+CONFIG_CXX_EXCEPTIONS_EMG_POOL_SIZE=0
 CONFIG_STACK_CHECK_NONE=y
 # CONFIG_STACK_CHECK_NORM is not set
 # CONFIG_STACK_CHECK_STRONG is not set
@@ -1573,7 +1568,7 @@ CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y
 # CONFIG_DISABLE_BASIC_ROM_CONSOLE is not set
 # CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set
 CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32
-CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304
+CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=3400
 CONFIG_MAIN_TASK_STACK_SIZE=8192
 CONFIG_IPC_TASK_STACK_SIZE=1024
 CONFIG_CONSOLE_UART_DEFAULT=y
@@ -1599,18 +1594,8 @@ CONFIG_ESP32S2_PANIC_PRINT_REBOOT=y
 # CONFIG_ESP32S2_PANIC_GDBSTUB is not set
 CONFIG_TIMER_TASK_STACK_SIZE=3584
 CONFIG_SW_COEXIST_ENABLE=y
-CONFIG_ESP32_ENABLE_COREDUMP_TO_UART=y
-# CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE is not set
-# CONFIG_ESP32_COREDUMP_DATA_FORMAT_BIN is not set
-CONFIG_ESP32_COREDUMP_DATA_FORMAT_ELF=y
-CONFIG_ESP32_COREDUMP_CHECKSUM_CRC32=y
-# CONFIG_ESP32_COREDUMP_CHECKSUM_SHA256 is not set
-CONFIG_ESP32_ENABLE_COREDUMP=y
-CONFIG_ESP32_CORE_DUMP_MAX_TASKS_NUM=64
-CONFIG_ESP32_CORE_DUMP_UART_DELAY=0
-CONFIG_ESP32_CORE_DUMP_DECODE_INFO=y
-# CONFIG_ESP32_CORE_DUMP_DECODE_DISABLE is not set
-CONFIG_ESP32_CORE_DUMP_DECODE="info"
+# CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set
+CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y
 CONFIG_MB_MASTER_TIMEOUT_MS_RESPOND=150
 CONFIG_MB_MASTER_DELAY_MS_CONVERT=200
 CONFIG_MB_QUEUE_LENGTH=20
@@ -1622,12 +1607,12 @@ CONFIG_MB_CONTROLLER_NOTIFY_TIMEOUT=20
 CONFIG_MB_CONTROLLER_NOTIFY_QUEUE_SIZE=20
 CONFIG_MB_CONTROLLER_STACK_SIZE=4096
 CONFIG_MB_EVENT_QUEUE_TIMEOUT=20
-CONFIG_MB_TIMER_PORT_ENABLED=y
+# CONFIG_MB_TIMER_PORT_ENABLED is not set
 CONFIG_MB_TIMER_GROUP=0
 CONFIG_MB_TIMER_INDEX=0
 # CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set
 CONFIG_TIMER_TASK_PRIORITY=1
-CONFIG_TIMER_TASK_STACK_DEPTH=2432
+CONFIG_TIMER_TASK_STACK_DEPTH=3800
 CONFIG_TIMER_QUEUE_LENGTH=10
 # CONFIG_L2_TO_L3_COPY is not set
 # CONFIG_USE_ONLY_LWIP_SELECT is not set
@@ -1664,8 +1649,7 @@ CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"
 CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y
 # CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_FAILS is not set
 # CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ALLOWED is not set
-CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y
-CONFIG_SUPPORT_TERMIOS=y
+# CONFIG_SUPPORT_TERMIOS is not set
 CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1
 CONFIG_SEMIHOSTFS_HOST_PATH_MAX_LEN=128
 # End of deprecated options