From c2b932a06be75d54f527ee66bfe570e935397b48 Mon Sep 17 00:00:00 2001 From: Wizmo2 Date: Sat, 14 Oct 2023 02:00:24 -0400 Subject: [PATCH] updated builds and scripts --- CMakeLists.txt | 1 + .../I2S-4MFlash-S3-sdkconfig.defaults | 140 +++------- build-scripts/I2S-4MFlash-sdkconfig.defaults | 256 +++++++----------- build-scripts/tembed-sdconfig.defaults | 145 +++------- components/driver_bt/CMakeLists.txt | 2 +- components/raop/CMakeLists.txt | 2 +- components/spotify/CMakeLists.txt | 2 +- components/squeezelite/CMakeLists.txt | 2 +- sdkconfig | 142 +++------- version.txt | 2 +- 10 files changed, 217 insertions(+), 477 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b116c8a07..b49d4e4d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,7 @@ add_definitions(-DMODEL_NAME=SqueezeESP32) if (NOT DEFINED NOPURE) message(STATUS "*** PURE IS ENABLED ***") + set(PURE) message(STATUS "All BT, AirPlay, and CSpot must be disabled in menuconfig") endif() diff --git a/build-scripts/I2S-4MFlash-S3-sdkconfig.defaults b/build-scripts/I2S-4MFlash-S3-sdkconfig.defaults index ee71089bb..6e37be8ee 100644 --- a/build-scripts/I2S-4MFlash-S3-sdkconfig.defaults +++ b/build-scripts/I2S-4MFlash-S3-sdkconfig.defaults @@ -158,8 +158,6 @@ CONFIG_LOGGING_DECODE="info" CONFIG_LOGGING_OUTPUT="info" # end of Logging -CONFIG_MUTE_GPIO_LEVEL=0 - # # Target # @@ -167,139 +165,79 @@ CONFIG_MUTE_GPIO_LEVEL=0 # CONFIG_MUSE is not set CONFIG_BASIC_I2C_BT=y # CONFIG_TWATCH2020 is not set +CONFIG_WITH_CONFIG_UI=y +# CONFIG_WITH_METRICS is not set CONFIG_RELEASE_API="https://api.github.com/repos/sle118/squeezelite-esp32/releases" CONFIG_SQUEEZELITE_ESP32_RELEASE_URL="https://github.com/sle118/squeezelite-esp32/releases" -CONFIG_PROJECT_NAME="Squeezelite-ESP32" +CONFIG_PROJECT_NAME="SqueezeESP32" CONFIG_FW_PLATFORM_NAME="ESP32" # -# Target Configuration +# Factory Configuration # +# CONFIG_DAC_LOCKED is not set CONFIG_DAC_CONFIG="" +CONFIG_DAC_CONTROLSET="" +CONFIG_DAC_I2S_NUM=0 +# CONFIG_SPDIF_LOCKED is not set CONFIG_SPDIF_CONFIG="" -CONFIG_GPIO_EXP_CONFIG="" -CONFIG_SPI_CONFIG="" +# CONFIG_DISPLAY_LOCKED is not set CONFIG_DISPLAY_CONFIG="" +# CONFIG_I2C_LOCKED is not set +CONFIG_I2C_CONFIG="" +# CONFIG_SPI_LOCKED is not set +CONFIG_SPI_CONFIG="" +# CONFIG_LED_VU_LOCKED is not set CONFIG_LED_VU_CONFIG="" +# CONFIG_ROTARY_ENCODER_LOCKED is not set CONFIG_ROTARY_ENCODER="" +CONFIG_GPIO_EXP_CONFIG="" CONFIG_ETH_CONFIG="" -CONFIG_DAC_CONTROLSET="" CONFIG_AUDIO_CONTROLS="" CONFIG_BAT_CONFIG="" CONFIG_TARGET="" + +# +# Factory GPIO Configuration +# CONFIG_AMP_GPIO=-1 -CONFIG_POWER_GPIO=-1 +CONFIG_AMP_GPIO_LEVEL=1 CONFIG_JACK_GPIO=-1 -CONFIG_SPKFAULT_GPIO=-1 -CONFIG_BAT_CHANNEL=-1 +CONFIG_JACK_GPIO_LEVEL=0 CONFIG_LED_GREEN_GPIO=-1 +CONFIG_LED_GREEN_GPIO_LEVEL=1 CONFIG_LED_RED_GPIO=-1 -CONFIG_SET_GPIO="" -# end of Target Configuration -# end of Target - -# -# Audio settings -# - -# -# DAC settings -# - -# -# I2S settings -# -CONFIG_I2S_NUM=0 -CONFIG_I2S_BCK_IO=-1 -CONFIG_I2S_WS_IO=-1 -CONFIG_I2S_DO_IO=-1 -CONFIG_I2S_DI_IO=-1 -CONFIG_I2S_MCK_IO=-1 -# end of I2S settings - -# -# I2C settings -# -CONFIG_I2C_SDA=-1 -CONFIG_I2C_SCL=-1 -# end of I2C settings - +CONFIG_LED_RED_GPIO_LEVEL=1 CONFIG_MUTE_GPIO=-1 -# end of DAC settings - -# -# SPDIF settings -# -CONFIG_SDIF_NUM=0 -CONFIG_SPDIF_BCK_IO=-1 -CONFIG_SPDIF_WS_IO=-1 -CONFIG_SPDIF_DO_IO=-1 -# end of SPDIF settings +CONFIG_MUTE_GPIO_LEVEL=0 +CONFIG_POWER_GPIO=-1 +CONFIG_POWER_GPIO_LEVEL=1 +CONFIG_SPKFAULT_GPIO=-1 +CONFIG_SPKFAULT_GPIO_LEVEL=0 +CONFIG_SET_GPIO="46=vcc,16=ir" +# end of Factory GPIO Configuration +# end of Factory Configuration # -# A2DP settings +# Factory A2DP settings # CONFIG_A2DP_SINK_NAME="SMSL BT4.2" CONFIG_A2DP_DEV_NAME="Squeezelite" CONFIG_A2DP_CONTROL_DELAY_MS=500 CONFIG_A2DP_CONNECT_TIMEOUT_MS=1000 -# end of A2DP settings -# end of Audio settings +# end of Factory A2DP settings +# end of Target # # Audio Input # # CONFIG_BT_SINK is not set -# CONFIG_AIRPLAY_SINK is not set -# CONFIG_CSPOT_SINK is not set +CONFIG_AIRPLAY_SINK=y +CONFIG_AIRPLAY_NAME="ESP32-AirPlay" +CONFIG_AIRPLAY_PORT="5000" +CONFIG_CSPOT_SINK=y # end of Audio Input -# -# Controls -# -# end of Controls - -# -# Display Screen -# -# end of Display Screen - -# -# Various I/O -# -CONFIG_I2C_CONFIG="" -# end of Various I/O - -# -# LED configuration -# -# end of LED configuration - -# -# Audio JACK -# -# end of Audio JACK - -# -# External amplifier control -# -# end of External amplifier control - -# -# Power on/off status -# -# end of Power on/off status - -# -# Speaker Fault -# -# end of Speaker Fault - -# -# Battery measure -# -# end of Battery measure - # # Command sets # diff --git a/build-scripts/I2S-4MFlash-sdkconfig.defaults b/build-scripts/I2S-4MFlash-sdkconfig.defaults index 967d3ba63..838d76e8c 100644 --- a/build-scripts/I2S-4MFlash-sdkconfig.defaults +++ b/build-scripts/I2S-4MFlash-sdkconfig.defaults @@ -181,76 +181,75 @@ CONFIG_LOGGING_DECODE="info" CONFIG_LOGGING_OUTPUT="info" # end of Logging -CONFIG_MUTE_GPIO_LEVEL=0 -CONFIG_TARGET_LOCKED=n - # # Target # # CONFIG_SQUEEZEAMP is not set +# CONFIG_MUSE is not set CONFIG_BASIC_I2C_BT=y # CONFIG_TWATCH2020 is not set +CONFIG_WITH_CONFIG_UI=y +# CONFIG_WITH_METRICS is not set CONFIG_RELEASE_API="https://api.github.com/repos/sle118/squeezelite-esp32/releases" CONFIG_SQUEEZELITE_ESP32_RELEASE_URL="https://github.com/sle118/squeezelite-esp32/releases" -CONFIG_PROJECT_NAME="Squeezelite-ESP32" +CONFIG_PROJECT_NAME="SqueezeESP32" CONFIG_FW_PLATFORM_NAME="ESP32" + +# +# Factory Configuration +# +# CONFIG_DAC_LOCKED is not set CONFIG_DAC_CONFIG="" +CONFIG_DAC_CONTROLSET="" +CONFIG_DAC_I2S_NUM=0 +# CONFIG_SPDIF_LOCKED is not set CONFIG_SPDIF_CONFIG="" -CONFIG_GPIO_EXP_CONFIG="" -CONFIG_SPI_CONFIG="" +# CONFIG_DISPLAY_LOCKED is not set CONFIG_DISPLAY_CONFIG="" +# CONFIG_I2C_LOCKED is not set +CONFIG_I2C_CONFIG="" +# CONFIG_SPI_LOCKED is not set +CONFIG_SPI_CONFIG="" +# CONFIG_LED_VU_LOCKED is not set +CONFIG_LED_VU_CONFIG="" +# CONFIG_ROTARY_ENCODER_LOCKED is not set +CONFIG_ROTARY_ENCODER="" +CONFIG_GPIO_EXP_CONFIG="" CONFIG_ETH_CONFIG="" -CONFIG_DAC_CONTROLSET="" +CONFIG_AUDIO_CONTROLS="" +CONFIG_BAT_CONFIG="" CONFIG_TARGET="" -# end of Target - -# -# Audio settings -# - -# -# DAC settings -# # -# I2S settings -# -CONFIG_I2S_NUM=0 -CONFIG_I2S_MCK_IO=-1 -CONFIG_I2S_BCK_IO=-1 -CONFIG_I2S_WS_IO=-1 -CONFIG_I2S_DO_IO=-1 -CONFIG_I2S_DI_IO=-1 -# end of I2S settings - +# Factory GPIO Configuration # -# I2C settings -# -CONFIG_I2C_SDA=-1 -CONFIG_I2C_SCL=-1 -# end of I2C settings - +CONFIG_AMP_GPIO=-1 +CONFIG_AMP_GPIO_LEVEL=1 +CONFIG_JACK_GPIO=-1 +CONFIG_JACK_GPIO_LEVEL=0 +CONFIG_LED_GREEN_GPIO=-1 +CONFIG_LED_GREEN_GPIO_LEVEL=1 +CONFIG_LED_RED_GPIO=-1 +CONFIG_LED_RED_GPIO_LEVEL=1 CONFIG_MUTE_GPIO=-1 -# end of DAC settings - -# -# SPDIF settings -# -CONFIG_SDIF_NUM=0 -CONFIG_SPDIF_BCK_IO=-1 -CONFIG_SPDIF_WS_IO=-1 -CONFIG_SPDIF_DO_IO=-1 -# end of SPDIF settings +CONFIG_MUTE_GPIO_LEVEL=0 +CONFIG_POWER_GPIO=-1 +CONFIG_POWER_GPIO_LEVEL=1 +CONFIG_SPKFAULT_GPIO=-1 +CONFIG_SPKFAULT_GPIO_LEVEL=0 +CONFIG_SET_GPIO="" +# end of Factory GPIO Configuration +# end of Factory Configuration # -# A2DP settings +# Factory A2DP settings # CONFIG_A2DP_SINK_NAME="SMSL BT4.2" CONFIG_A2DP_DEV_NAME="Squeezelite" CONFIG_A2DP_CONTROL_DELAY_MS=500 CONFIG_A2DP_CONNECT_TIMEOUT_MS=1000 -# end of A2DP settings -# end of Audio settings +# end of Factory A2DP settings +# end of Target # # Audio Input @@ -265,63 +264,12 @@ CONFIG_CSPOT_SINK=y # end of Audio Input # -# Display Screen -# -# end of Display Screen - -# -# Various I/O -# -CONFIG_I2C_CONFIG="" -CONFIG_SET_GPIO="" -CONFIG_ROTARY_ENCODER="" -# end of Various I/O - -# -# LED configuration +# Command sets # -CONFIG_LED_GREEN_GPIO=-1 -CONFIG_LED_RED_GPIO=-1 -# end of LED configuration - - -# -# Audio controls -# -CONFIG_AUDIO_CONTROLS="" -# end of Audio Contorls configuration - -# -# AMP configuration -# -CONFIG_AMP_GPIO=-1 -# end of AMP configuration - -# -# POWER configuration -# -CONFIG_POWER_GPIO=-1 -# end of POWER configuration - -# -# Audio JACK -# -CONFIG_JACK_GPIO=-1 -# end of Audio JACK - -# -# Speaker Fault -# -CONFIG_SPKFAULT_GPIO=-1 -# end of Speaker Fault - -# -# Battery measure -# -CONFIG_BAT_CONFIG="" -# end of Battery measure - CONFIG_DEFAULT_COMMAND_LINE="squeezelite -o I2S -b 500:2000 -d all=info -C 30 -W" +CONFIG_DEFAULT_COMMAND_2_LINE="squeezelite -o spdif -b 500:2000 -d all=info -C 30" +CONFIG_DEFAULT_COMMAND_3_LINE="squeezelite -o bt -b 500:2000 -d all=info -C 30 -Z 44100" +# end of Command sets # end of Squeezelite-ESP32 # @@ -353,7 +301,7 @@ CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y # # Application Level Tracing # -# CONFIG_APPTRACE_DEST_TRAX is not set +# CONFIG_APPTRACE_DEST_JTAG is not set CONFIG_APPTRACE_DEST_NONE=y CONFIG_APPTRACE_LOCK_ENABLE=y # end of Application Level Tracing @@ -368,10 +316,9 @@ CONFIG_APPTRACE_LOCK_ENABLE=y # Bluetooth # CONFIG_BT_ENABLED=y -CONFIG_BT_CTRL_ESP32=y # -# Bluetooth controller(ESP32 Dual Mode Bluetooth) +# Bluetooth controller # # CONFIG_BTDM_CTRL_MODE_BLE_ONLY is not set CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y @@ -409,37 +356,8 @@ CONFIG_BTDM_CTRL_LPCLK_SEL_MAIN_XTAL=y # end of MODEM SLEEP Options CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF=1 -# end of Bluetooth controller(ESP32 Dual Mode Bluetooth) - -CONFIG_BT_CTRL_MODE_EFF=1 -CONFIG_BT_CTRL_BLE_MAX_ACT=10 -CONFIG_BT_CTRL_BLE_MAX_ACT_EFF=10 -CONFIG_BT_CTRL_BLE_STATIC_ACL_TX_BUF_NB=0 -CONFIG_BT_CTRL_PINNED_TO_CORE=0 -CONFIG_BT_CTRL_HCI_TL=1 -CONFIG_BT_CTRL_ADV_DUP_FILT_MAX=30 -CONFIG_BT_CTRL_HW_CCA_EFF=0 -CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=0 -CONFIG_BT_CTRL_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y -CONFIG_BT_CTRL_BLE_ADV_REPORT_FLOW_CTRL_NUM=100 -CONFIG_BT_CTRL_BLE_ADV_REPORT_DISCARD_THRSHOLD=20 -CONFIG_BT_CTRL_BLE_SCAN_DUPL=y -CONFIG_BT_CTRL_SCAN_DUPL_TYPE=0 -CONFIG_BT_CTRL_SCAN_DUPL_CACHE_SIZE=100 - -# -# MODEM SLEEP Options -# -# end of MODEM SLEEP Options - -CONFIG_BT_CTRL_SLEEP_MODE_EFF=0 -CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0 -CONFIG_BT_CTRL_HCI_TL_EFF=1 - -# -# MODEM SLEEP Options -# -# end of MODEM SLEEP Options +CONFIG_BTDM_RESERVE_DRAM=0xdb5c +# end of Bluetooth controller CONFIG_BT_BLUEDROID_ENABLED=y # CONFIG_BT_NIMBLE_ENABLED is not set @@ -471,10 +389,7 @@ 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 - -CONFIG_BT_NIMBLE_USE_ESP_TIMER=y # end of Bluetooth # CONFIG_BLE_MESH is not set @@ -516,6 +431,7 @@ CONFIG_SPI_MASTER_ISR_IN_IRAM=y # CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST is not set # CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID is not set # CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT is not set +# CONFIG_TWAI_ERRATA_FIX_LISTEN_ONLY_DOM is not set # end of TWAI configuration # @@ -555,8 +471,7 @@ CONFIG_ESP_TLS_USING_MBEDTLS=y # CONFIG_ESP_TLS_USE_SECURE_ELEMENT is not set # CONFIG_ESP_TLS_SERVER is not set # CONFIG_ESP_TLS_PSK_VERIFICATION is not set -CONFIG_ESP_TLS_INSECURE=y -CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY=y +# CONFIG_ESP_TLS_INSECURE is not set # end of ESP-TLS # @@ -565,9 +480,16 @@ CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY=y CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y # CONFIG_ESP32_REV_MIN_0 is not set CONFIG_ESP32_REV_MIN_1=y +# CONFIG_ESP32_REV_MIN_1_1 is not set # CONFIG_ESP32_REV_MIN_2 is not set # CONFIG_ESP32_REV_MIN_3 is not set +# CONFIG_ESP32_REV_MIN_3_1 is not set CONFIG_ESP32_REV_MIN=1 +CONFIG_ESP32_REV_MIN_FULL=100 +CONFIG_ESP_REV_MIN_FULL=100 +CONFIG_ESP32_REV_MAX_FULL_STR_OPT=y +CONFIG_ESP32_REV_MAX_FULL=399 +CONFIG_ESP_REV_MAX_FULL=399 CONFIG_ESP32_DPORT_WORKAROUND=y # CONFIG_ESP32_DEFAULT_CPU_FREQ_80 is not set # CONFIG_ESP32_DEFAULT_CPU_FREQ_160 is not set @@ -687,7 +609,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=3400 +CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304 CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192 CONFIG_ESP_IPC_TASK_STACK_SIZE=1024 CONFIG_ESP_IPC_USES_CALLERS_PRIORITY=y @@ -728,9 +650,7 @@ CONFIG_ETH_RMII_CLK_IN_GPIO=0 CONFIG_ETH_DMA_BUFFER_SIZE=512 CONFIG_ETH_DMA_RX_BUFFER_NUM=10 CONFIG_ETH_DMA_TX_BUFFER_NUM=10 -CONFIG_ETH_USE_SPI_ETHERNET=y -CONFIG_ETH_SPI_ETHERNET_DM9051=y -CONFIG_ETH_SPI_ETHERNET_W5500=y +# CONFIG_ETH_USE_SPI_ETHERNET is not set # CONFIG_ETH_USE_OPENETH is not set # end of Ethernet @@ -750,7 +670,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 @@ -802,6 +722,11 @@ CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y # CONFIG_ESP_SYSTEM_PSRAM_LEAKAGE_WORKAROUND is not set # CONFIG_ESP_SYSTEM_FLASH_LEAKAGE_WORKAROUND is not set +# +# RTC Clock Config +# +# end of RTC Clock Config + # # Memory protection # @@ -849,6 +774,7 @@ CONFIG_WIFI_LOG_DEFAULT_LEVEL_INFO=y CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE=y # CONFIG_ESP_WIFI_SLP_IRAM_OPT is not set # CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE is not set +# CONFIG_ESP_WIFI_SLP_BEACON_LOST_OPT is not set # end of Wi-Fi # @@ -949,16 +875,17 @@ 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=2 -# CONFIG_FREERTOS_ASSERT_FAIL_ABORT is not set -CONFIG_FREERTOS_ASSERT_DISABLE=y -CONFIG_FREERTOS_ISR_STACKSIZE=2096 +CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y # CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE is not set +# CONFIG_FREERTOS_ASSERT_DISABLE is not set +CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1536 +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=3800 +CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2800 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10 CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0 CONFIG_FREERTOS_USE_TRACE_FACILITY=y @@ -1040,6 +967,7 @@ CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32 CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y # CONFIG_LWIP_DHCP_DISABLE_CLIENT_ID is not set CONFIG_LWIP_DHCP_RESTORE_LAST_IP=y +CONFIG_LWIP_DHCP_COARSE_TIMER_SECS=1 # # DHCP server @@ -1066,6 +994,7 @@ CONFIG_LWIP_TCP_SYNMAXRTX=6 CONFIG_LWIP_TCP_MSS=1440 CONFIG_LWIP_TCP_TMR_INTERVAL=250 CONFIG_LWIP_TCP_MSL=60000 +CONFIG_LWIP_TCP_FIN_WAIT_TIMEOUT=20000 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=8192 CONFIG_LWIP_TCP_WND_DEFAULT=32768 CONFIG_LWIP_TCP_RECVMBOX_SIZE=32 @@ -1125,7 +1054,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 @@ -1159,6 +1088,15 @@ CONFIG_MBEDTLS_DYNAMIC_BUFFER=y # CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA is not set # CONFIG_MBEDTLS_DEBUG is not set +# +# mbedTLS v2.28.x related +# +# CONFIG_MBEDTLS_SSL_VARIABLE_BUFFER_LENGTH is not set +# CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK is not set +# CONFIG_MBEDTLS_SSL_CONTEXT_SERIALIZATION is not set +CONFIG_MBEDTLS_SSL_KEEP_PEER_CERTIFICATE=y +# end of mbedTLS v2.28.x related + # # Certificate Bundle # @@ -1167,6 +1105,7 @@ 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 +CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS=200 # end of Certificate Bundle # CONFIG_MBEDTLS_ECP_RESTARTABLE is not set @@ -1358,6 +1297,8 @@ CONFIG_SPI_FLASH_SUPPORT_ISSI_CHIP=y CONFIG_SPI_FLASH_SUPPORT_MXIC_CHIP=y CONFIG_SPI_FLASH_SUPPORT_GD_CHIP=y CONFIG_SPI_FLASH_SUPPORT_WINBOND_CHIP=y +# CONFIG_SPI_FLASH_SUPPORT_BOYA_CHIP is not set +# CONFIG_SPI_FLASH_SUPPORT_TH_CHIP is not set # end of Auto-detect flash chips CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=y @@ -1467,6 +1408,7 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y # CONFIG_WPA_TESTING_OPTIONS is not set # CONFIG_WPA_WPS_STRICT is not set # CONFIG_WPA_11KV_SUPPORT is not set +# CONFIG_WPA_DPP_SUPPORT is not set # end of Supplicant # @@ -1532,18 +1474,6 @@ CONFIG_STACK_CHECK_NONE=y # CONFIG_ESP32_APPTRACE_DEST_TRAX is not set CONFIG_ESP32_APPTRACE_DEST_NONE=y CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y -# CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY is not set -CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=y -# CONFIG_BTDM_CONTROLLER_MODE_BTDM is not set -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN=2 -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN=0 -CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=0 -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=2 -CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0 -CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0 -CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI=y -# CONFIG_BTDM_CONTROLLER_HCI_MODE_UART_H4 is not set -CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=y CONFIG_BLUEDROID_ENABLED=y # CONFIG_NIMBLE_ENABLED is not set CONFIG_BTC_TASK_STACK_SIZE=3072 @@ -1585,7 +1515,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=3400 +CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304 CONFIG_MAIN_TASK_STACK_SIZE=8192 CONFIG_IPC_TASK_STACK_SIZE=1024 CONFIG_CONSOLE_UART_DEFAULT=y @@ -1629,7 +1559,7 @@ 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=3800 +CONFIG_TIMER_TASK_STACK_DEPTH=2800 CONFIG_TIMER_QUEUE_LENGTH=10 # CONFIG_L2_TO_L3_COPY is not set # CONFIG_USE_ONLY_LWIP_SELECT is not set diff --git a/build-scripts/tembed-sdconfig.defaults b/build-scripts/tembed-sdconfig.defaults index 2653a821e..253654115 100644 --- a/build-scripts/tembed-sdconfig.defaults +++ b/build-scripts/tembed-sdconfig.defaults @@ -158,8 +158,6 @@ CONFIG_LOGGING_DECODE="info" CONFIG_LOGGING_OUTPUT="info" # end of Logging -CONFIG_MUTE_GPIO_LEVEL=0 - # # Target # @@ -167,84 +165,68 @@ CONFIG_MUTE_GPIO_LEVEL=0 # CONFIG_MUSE is not set CONFIG_BASIC_I2C_BT=y # CONFIG_TWATCH2020 is not set +CONFIG_WITH_CONFIG_UI=y +# CONFIG_WITH_METRICS is not set CONFIG_RELEASE_API="https://api.github.com/repos/sle118/squeezelite-esp32/releases" CONFIG_SQUEEZELITE_ESP32_RELEASE_URL="https://github.com/sle118/squeezelite-esp32/releases" -CONFIG_PROJECT_NAME="Squeezelite-ESP32" +CONFIG_PROJECT_NAME="SqueezeESP32" CONFIG_FW_PLATFORM_NAME="ESP32" # -# Target Configuration +# Factory Configuration # -CONFIG_DAC_CONFIG="" -CONFIG_SPDIF_CONFIG="" +CONFIG_DAC_LOCKED=y +CONFIG_DAC_CONFIG="model=I2S,bck=7,ws=5,do=6" +CONFIG_DAC_CONTROLSET="" +CONFIG_DAC_I2S_NUM=0 +CONFIG_SPDIF_LOCKED=y +CONFIG_SPDIF_CONFIG="bck=7,ws=5,do=17" +CONFIG_DISPLAY_LOCKED=y +CONFIG_DISPLAY_CONFIG="SPI,width=320,height=170,cs=10,reset=9,back=15,speed=8000000,mode=0,driver=ST7789:x=35,VFlip,rotate" +# CONFIG_I2C_LOCKED is not set +CONFIG_I2C_CONFIG="" +CONFIG_SPI_LOCKED=y +CONFIG_SPI_CONFIG="data=11,clk=12,dc=13,host=2" +CONFIG_LED_VU_LOCKED=y +CONFIG_LED_VU_CONFIG="type=APA102,length=7,gpio=42,clk=45,seq=2106543" +CONFIG_ROTARY_ENCODER_LOCKED=y +CONFIG_ROTARY_ENCODER="A=1,B=2,SW=0,knobonly" CONFIG_GPIO_EXP_CONFIG="" -CONFIG_SPI_CONFIG="" -CONFIG_DISPLAY_CONFIG="" -CONFIG_LED_VU_CONFIG="" -CONFIG_ROTARY_ENCODER="" CONFIG_ETH_CONFIG="" -CONFIG_DAC_CONTROLSET="" CONFIG_AUDIO_CONTROLS="" -CONFIG_BAT_CONFIG="" +CONFIG_BAT_CONFIG="channel=3,scale=6.5,cells=1,atten=3" CONFIG_TARGET="" + +# +# Factory GPIO Configuration +# CONFIG_AMP_GPIO=-1 -CONFIG_POWER_GPIO=-1 +CONFIG_AMP_GPIO_LEVEL=1 CONFIG_JACK_GPIO=-1 -CONFIG_SPKFAULT_GPIO=-1 -CONFIG_BAT_CHANNEL=-1 +CONFIG_JACK_GPIO_LEVEL=0 CONFIG_LED_GREEN_GPIO=-1 +CONFIG_LED_GREEN_GPIO_LEVEL=1 CONFIG_LED_RED_GPIO=-1 -CONFIG_SET_GPIO="" -# end of Target Configuration -# end of Target - -# -# Audio settings -# - -# -# DAC settings -# - -# -# I2S settings -# -CONFIG_I2S_NUM=0 -CONFIG_I2S_BCK_IO=-1 -CONFIG_I2S_WS_IO=-1 -CONFIG_I2S_DO_IO=-1 -CONFIG_I2S_DI_IO=-1 -CONFIG_I2S_MCK_IO=-1 -# end of I2S settings - -# -# I2C settings -# -CONFIG_I2C_SDA=-1 -CONFIG_I2C_SCL=-1 -# end of I2C settings - +CONFIG_LED_RED_GPIO_LEVEL=1 CONFIG_MUTE_GPIO=-1 -# end of DAC settings - -# -# SPDIF settings -# -CONFIG_SDIF_NUM=0 -CONFIG_SPDIF_BCK_IO=-1 -CONFIG_SPDIF_WS_IO=-1 -CONFIG_SPDIF_DO_IO=-1 -# end of SPDIF settings +CONFIG_MUTE_GPIO_LEVEL=0 +CONFIG_POWER_GPIO=-1 +CONFIG_POWER_GPIO_LEVEL=1 +CONFIG_SPKFAULT_GPIO=-1 +CONFIG_SPKFAULT_GPIO_LEVEL=0 +CONFIG_SET_GPIO="46=vcc,16=ir" +# end of Factory GPIO Configuration +# end of Factory Configuration # -# A2DP settings +# Factory A2DP settings # CONFIG_A2DP_SINK_NAME="SMSL BT4.2" CONFIG_A2DP_DEV_NAME="Squeezelite" CONFIG_A2DP_CONTROL_DELAY_MS=500 CONFIG_A2DP_CONNECT_TIMEOUT_MS=1000 -# end of A2DP settings -# end of Audio settings +# end of Factory A2DP settings +# end of Target # # Audio Input @@ -254,57 +236,12 @@ CONFIG_A2DP_CONNECT_TIMEOUT_MS=1000 # CONFIG_CSPOT_SINK is not set # end of Audio Input -# -# Controls -# -# end of Controls - -# -# Display Screen -# -# end of Display Screen - -# -# Various I/O -# -CONFIG_I2C_CONFIG="" -# end of Various I/O - -# -# LED configuration -# -# end of LED configuration - -# -# Audio JACK -# -# end of Audio JACK - -# -# External amplifier control -# -# end of External amplifier control - -# -# Power on/off status -# -# end of Power on/off status - -# -# Speaker Fault -# -# end of Speaker Fault - -# -# Battery measure -# -# end of Battery measure - # # Command sets # CONFIG_DEFAULT_COMMAND_LINE="squeezelite -o I2S -b 500:2000 -d all=info -C 30 -W" CONFIG_DEFAULT_COMMAND_2_LINE="squeezelite -o spdif -b 500:2000 -d all=info -C 30" +CONFIG_DEFAULT_COMMAND_3_LINE="squeezelite -o bt -b 500:2000 -d all=info -C 30 -Z 44100" # end of Command sets # end of Squeezelite-ESP32 diff --git a/components/driver_bt/CMakeLists.txt b/components/driver_bt/CMakeLists.txt index 13ff23c1f..8c849ffd2 100644 --- a/components/driver_bt/CMakeLists.txt +++ b/components/driver_bt/CMakeLists.txt @@ -1,4 +1,4 @@ -if (DEFINED ${PURE}) +if (DEFINED PURE) message(STATUS "*** PURE: Skipping bluetooth") return() endif() diff --git a/components/raop/CMakeLists.txt b/components/raop/CMakeLists.txt index 4cd864363..d1456846d 100644 --- a/components/raop/CMakeLists.txt +++ b/components/raop/CMakeLists.txt @@ -1,4 +1,4 @@ -if (NOT DEFINED NOPURE) +if (DEFINED PURE) message(STATUS "*** PURE: Skipping airplay (raop) ***") return() endif() diff --git a/components/spotify/CMakeLists.txt b/components/spotify/CMakeLists.txt index 9068affb8..c5b658182 100644 --- a/components/spotify/CMakeLists.txt +++ b/components/spotify/CMakeLists.txt @@ -1,5 +1,5 @@ # this must be set *before* idf_component_register -if (NOT DEFINED NOPURE) +if (DEFINED PURE) message(STATUS "*** PURE: Skipping spotify (cspot) ***") return() endif() diff --git a/components/squeezelite/CMakeLists.txt b/components/squeezelite/CMakeLists.txt index a6c1d9ef1..87a283334 100644 --- a/components/squeezelite/CMakeLists.txt +++ b/components/squeezelite/CMakeLists.txt @@ -5,7 +5,7 @@ endif() # runs prelink with no dfinition, then with definition. message(STATUS "*** Squeezelite: NOPURE is ${NOPURE} ***") -if (DEFINED NOPURE) +if (NOT DEFINED PURE) message(STATUS "*** Squeezelite: PURE is NOT defined ***") set(cspot_required "spotify") set(airplay_required "raop") diff --git a/sdkconfig b/sdkconfig index 4ddc9a85a..253654115 100644 --- a/sdkconfig +++ b/sdkconfig @@ -158,8 +158,6 @@ CONFIG_LOGGING_DECODE="info" CONFIG_LOGGING_OUTPUT="info" # end of Logging -CONFIG_MUTE_GPIO_LEVEL=0 - # # Target # @@ -171,82 +169,64 @@ CONFIG_WITH_CONFIG_UI=y # CONFIG_WITH_METRICS is not set CONFIG_RELEASE_API="https://api.github.com/repos/sle118/squeezelite-esp32/releases" CONFIG_SQUEEZELITE_ESP32_RELEASE_URL="https://github.com/sle118/squeezelite-esp32/releases" -CONFIG_PROJECT_NAME="Squeezelite-ESP32" +CONFIG_PROJECT_NAME="SqueezeESP32" CONFIG_FW_PLATFORM_NAME="ESP32" # -# Target Configuration +# Factory Configuration # -CONFIG_DAC_CONFIG="" -CONFIG_SPDIF_CONFIG="" +CONFIG_DAC_LOCKED=y +CONFIG_DAC_CONFIG="model=I2S,bck=7,ws=5,do=6" +CONFIG_DAC_CONTROLSET="" +CONFIG_DAC_I2S_NUM=0 +CONFIG_SPDIF_LOCKED=y +CONFIG_SPDIF_CONFIG="bck=7,ws=5,do=17" +CONFIG_DISPLAY_LOCKED=y +CONFIG_DISPLAY_CONFIG="SPI,width=320,height=170,cs=10,reset=9,back=15,speed=8000000,mode=0,driver=ST7789:x=35,VFlip,rotate" +# CONFIG_I2C_LOCKED is not set +CONFIG_I2C_CONFIG="" +CONFIG_SPI_LOCKED=y +CONFIG_SPI_CONFIG="data=11,clk=12,dc=13,host=2" +CONFIG_LED_VU_LOCKED=y +CONFIG_LED_VU_CONFIG="type=APA102,length=7,gpio=42,clk=45,seq=2106543" +CONFIG_ROTARY_ENCODER_LOCKED=y +CONFIG_ROTARY_ENCODER="A=1,B=2,SW=0,knobonly" CONFIG_GPIO_EXP_CONFIG="" -CONFIG_SPI_CONFIG="" -CONFIG_DISPLAY_CONFIG="" -CONFIG_LED_VU_CONFIG="" -CONFIG_ROTARY_ENCODER="" CONFIG_ETH_CONFIG="" -CONFIG_DAC_CONTROLSET="" CONFIG_AUDIO_CONTROLS="" -CONFIG_BAT_CONFIG="" +CONFIG_BAT_CONFIG="channel=3,scale=6.5,cells=1,atten=3" CONFIG_TARGET="" + +# +# Factory GPIO Configuration +# CONFIG_AMP_GPIO=-1 -CONFIG_POWER_GPIO=-1 +CONFIG_AMP_GPIO_LEVEL=1 CONFIG_JACK_GPIO=-1 -CONFIG_SPKFAULT_GPIO=-1 -CONFIG_BAT_CHANNEL=-1 +CONFIG_JACK_GPIO_LEVEL=0 CONFIG_LED_GREEN_GPIO=-1 +CONFIG_LED_GREEN_GPIO_LEVEL=1 CONFIG_LED_RED_GPIO=-1 -CONFIG_SET_GPIO="" -# end of Target Configuration -# end of Target - -# -# Audio settings -# - -# -# DAC settings -# - -# -# I2S settings -# -CONFIG_I2S_NUM=0 -CONFIG_I2S_BCK_IO=-1 -CONFIG_I2S_WS_IO=-1 -CONFIG_I2S_DO_IO=-1 -CONFIG_I2S_DI_IO=-1 -CONFIG_I2S_MCK_IO=-1 -# end of I2S settings - -# -# I2C settings -# -CONFIG_I2C_SDA=-1 -CONFIG_I2C_SCL=-1 -# end of I2C settings - +CONFIG_LED_RED_GPIO_LEVEL=1 CONFIG_MUTE_GPIO=-1 -# end of DAC settings - -# -# SPDIF settings -# -CONFIG_SDIF_NUM=0 -CONFIG_SPDIF_BCK_IO=-1 -CONFIG_SPDIF_WS_IO=-1 -CONFIG_SPDIF_DO_IO=-1 -# end of SPDIF settings +CONFIG_MUTE_GPIO_LEVEL=0 +CONFIG_POWER_GPIO=-1 +CONFIG_POWER_GPIO_LEVEL=1 +CONFIG_SPKFAULT_GPIO=-1 +CONFIG_SPKFAULT_GPIO_LEVEL=0 +CONFIG_SET_GPIO="46=vcc,16=ir" +# end of Factory GPIO Configuration +# end of Factory Configuration # -# A2DP settings +# Factory A2DP settings # CONFIG_A2DP_SINK_NAME="SMSL BT4.2" CONFIG_A2DP_DEV_NAME="Squeezelite" CONFIG_A2DP_CONTROL_DELAY_MS=500 CONFIG_A2DP_CONNECT_TIMEOUT_MS=1000 -# end of A2DP settings -# end of Audio settings +# end of Factory A2DP settings +# end of Target # # Audio Input @@ -256,52 +236,6 @@ CONFIG_A2DP_CONNECT_TIMEOUT_MS=1000 # CONFIG_CSPOT_SINK is not set # end of Audio Input -# -# Controls -# -# end of Controls - -# -# Display Screen -# -# end of Display Screen - -# -# Various I/O -# -CONFIG_I2C_CONFIG="" -# end of Various I/O - -# -# LED configuration -# -# end of LED configuration - -# -# Audio JACK -# -# end of Audio JACK - -# -# External amplifier control -# -# end of External amplifier control - -# -# Power on/off status -# -# end of Power on/off status - -# -# Speaker Fault -# -# end of Speaker Fault - -# -# Battery measure -# -# end of Battery measure - # # Command sets # diff --git a/version.txt b/version.txt index f75ba1555..b5818874e 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -tembed.esp32s3.32-v2023.10.11 +tembed.esp32s3.32-v2023.10.14