diff --git a/.project b/.project index dec6168..37ebea3 100644 --- a/.project +++ b/.project @@ -278,16 +278,6 @@ 1 /home/karl/espressif/esp-idf-v5.1.1/components/esp_pm/pm_trace.c - - build/ide/esp_idf_components/esp_psram/esp_psram.c - 1 - /home/karl/espressif/esp-idf-v5.1.1/components/esp_psram/esp_psram.c - - - build/ide/esp_idf_components/esp_psram/mmu_psram_flash.c - 1 - /home/karl/espressif/esp-idf-v5.1.1/components/esp_psram/mmu_psram_flash.c - build/ide/esp_idf_components/esp_ringbuf/ringbuf.c 1 @@ -1643,21 +1633,6 @@ 1 /home/karl/espressif/esp-idf-v5.1.1/components/esp_phy/src/phy_override.c - - build/ide/esp_idf_components/esp_psram/esp32/esp_himem.c - 1 - /home/karl/espressif/esp-idf-v5.1.1/components/esp_psram/esp32/esp_himem.c - - - build/ide/esp_idf_components/esp_psram/esp32/esp_psram_extram_cache.c - 1 - /home/karl/espressif/esp-idf-v5.1.1/components/esp_psram/esp32/esp_psram_extram_cache.c - - - build/ide/esp_idf_components/esp_psram/esp32/esp_psram_impl_quad.c - 1 - /home/karl/espressif/esp-idf-v5.1.1/components/esp_psram/esp32/esp_psram_impl_quad.c - build/ide/esp_idf_components/esp_rom/patches/esp_rom_crc.c 1 diff --git a/components/lightsnapcast/player.c b/components/lightsnapcast/player.c index d966408..7f33579 100644 --- a/components/lightsnapcast/player.c +++ b/components/lightsnapcast/player.c @@ -1584,6 +1584,26 @@ static void player_task(void *pvParameters) { usec = diff2Server - sec * 1000000; msec = usec / 1000; usec = usec % 1000; + + // ESP_LOGI(TAG, "%d, %lldus, q %d", dir, avg, + // uxQueueMessagesWaiting(pcmChkQHdl)); + + // ESP_LOGI(TAG, "%d, %lldus, %lldus %llds, %lld.%lldms", dir, age, + // avg, + // sec, msec, usec); + + // ESP_LOGI(TAG, "%d, %lldus, %lldus, %lldus, q:%d", dir, avg, + // shortMedian, miniMedian, + // uxQueueMessagesWaiting(pcmChkQHdl)); + + // ESP_LOGI( TAG, "8b f + // %d b %d", heap_caps_get_free_size(MALLOC_CAP_8BIT | + // MALLOC_CAP_INTERNAL), + // heap_caps_get_largest_free_block(MALLOC_CAP_8BIT | + // MALLOC_CAP_INTERNAL)); ESP_LOGI( TAG, "32b f %d b %d", + // heap_caps_get_free_size(MALLOC_CAP_32BIT | + // MALLOC_CAP_EXEC), heap_caps_get_largest_free_block + // (MALLOC_CAP_32BIT | MALLOC_CAP_EXEC)); } dir = 0; diff --git a/sdkconfig b/sdkconfig index 2024409..ccaffa9 100644 --- a/sdkconfig +++ b/sdkconfig @@ -378,7 +378,12 @@ CONFIG_ESP_LYRAT_V4_3_BOARD=y # # Snapclient Ethernet Configuration # -# CONFIG_SNAPCLIENT_ENABLE_ETHERNET is not set +CONFIG_ENV_GPIO_RANGE_MIN=0 +CONFIG_ENV_GPIO_RANGE_MAX=39 +CONFIG_ENV_GPIO_IN_RANGE_MAX=39 +CONFIG_ENV_GPIO_OUT_RANGE_MAX=33 +# CONFIG_SNAPCLIENT_USE_INTERNAL_ETHERNET is not set +# CONFIG_SNAPCLIENT_USE_SPI_ETHERNET is not set # end of Snapclient Ethernet Configuration # @@ -391,9 +396,9 @@ CONFIG_SNTP_SERVER="pool.ntp.org" # # Wifi Configuration # -CONFIG_ENABLE_WIFI_PROVISIONING=y -CONFIG_WIFI_PROVISIONING_SSID="prov_snapclient" -CONFIG_WIFI_PROVISIONING_PASSWORD="12345678" +# CONFIG_ENABLE_WIFI_PROVISIONING is not set +CONFIG_WIFI_SSID="zuhause" +CONFIG_WIFI_PASSWORD="dErtischlEr" CONFIG_WIFI_MAXIMUM_RETRY=0 # end of Wifi Configuration diff --git a/sdkconfig.old b/sdkconfig.old index 9dd97b2..d167f80 100644 --- a/sdkconfig.old +++ b/sdkconfig.old @@ -352,7 +352,7 @@ CONFIG_SNAPCLIENT_NAME="esp-snapclient" CONFIG_WEB_PORT=8000 # end of HTTP Server Setting -CONFIG_USE_SAMPLE_INSERTION=y +# CONFIG_USE_SAMPLE_INSERTION is not set # end of Snapclient Configuration # @@ -378,7 +378,12 @@ CONFIG_ESP_LYRAT_V4_3_BOARD=y # # Snapclient Ethernet Configuration # -# CONFIG_SNAPCLIENT_ENABLE_ETHERNET is not set +CONFIG_ENV_GPIO_RANGE_MIN=0 +CONFIG_ENV_GPIO_RANGE_MAX=39 +CONFIG_ENV_GPIO_IN_RANGE_MAX=39 +CONFIG_ENV_GPIO_OUT_RANGE_MAX=33 +# CONFIG_SNAPCLIENT_USE_INTERNAL_ETHERNET is not set +# CONFIG_SNAPCLIENT_USE_SPI_ETHERNET is not set # end of Snapclient Ethernet Configuration # @@ -391,9 +396,9 @@ CONFIG_SNTP_SERVER="pool.ntp.org" # # Wifi Configuration # -CONFIG_ENABLE_WIFI_PROVISIONING=y -CONFIG_WIFI_PROVISIONING_SSID="prov_snapclient" -CONFIG_WIFI_PROVISIONING_PASSWORD="12345678" +# CONFIG_ENABLE_WIFI_PROVISIONING is not set +CONFIG_WIFI_SSID="zuhause" +CONFIG_WIFI_PASSWORD="dErtischlEr" CONFIG_WIFI_MAXIMUM_RETRY=0 # end of Wifi Configuration @@ -716,9 +721,7 @@ CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4 # # Sleep Config # -CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND=y -CONFIG_ESP_SLEEP_PSRAM_LEAKAGE_WORKAROUND=y -# CONFIG_ESP_SLEEP_MSPI_NEED_ALL_IO_PU is not set +CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y # CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND is not set CONFIG_ESP_SLEEP_DEEP_SLEEP_WAKEUP_DELAY=2000 @@ -806,86 +809,7 @@ CONFIG_ESP_PHY_CALIBRATION_MODE=0 # # ESP PSRAM # -CONFIG_SPIRAM=y - -# -# SPI RAM config -# -CONFIG_SPIRAM_MODE_QUAD=y -CONFIG_SPIRAM_TYPE_AUTO=y -# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set -# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set -# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set -# CONFIG_SPIRAM_SPEED_40M is not set -CONFIG_SPIRAM_SPEED_80M=y -CONFIG_SPIRAM_SPEED=80 -CONFIG_SPIRAM_BOOT_INIT=y -# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set -# CONFIG_SPIRAM_USE_MEMMAP is not set -# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set -CONFIG_SPIRAM_USE_MALLOC=y -CONFIG_SPIRAM_MEMTEST=y -CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=2048 -# CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is not set -CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768 -# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set -# CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set -CONFIG_SPIRAM_CACHE_WORKAROUND=y - -# -# SPIRAM cache workaround debugging -# -CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_MEMW=y -# CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_DUPLDST is not set -# CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_NOPS is not set -# end of SPIRAM cache workaround debugging - -# -# SPIRAM workaround libraries placement -# -CONFIG_SPIRAM_CACHE_LIBJMP_IN_IRAM=y -CONFIG_SPIRAM_CACHE_LIBMATH_IN_IRAM=y -CONFIG_SPIRAM_CACHE_LIBNUMPARSER_IN_IRAM=y -CONFIG_SPIRAM_CACHE_LIBIO_IN_IRAM=y -CONFIG_SPIRAM_CACHE_LIBTIME_IN_IRAM=y -CONFIG_SPIRAM_CACHE_LIBCHAR_IN_IRAM=y -CONFIG_SPIRAM_CACHE_LIBMEM_IN_IRAM=y -CONFIG_SPIRAM_CACHE_LIBSTR_IN_IRAM=y -CONFIG_SPIRAM_CACHE_LIBRAND_IN_IRAM=y -CONFIG_SPIRAM_CACHE_LIBENV_IN_IRAM=y -CONFIG_SPIRAM_CACHE_LIBFILE_IN_IRAM=y -CONFIG_SPIRAM_CACHE_LIBMISC_IN_IRAM=y -# end of SPIRAM workaround libraries placement - -CONFIG_SPIRAM_BANKSWITCH_ENABLE=y -CONFIG_SPIRAM_BANKSWITCH_RESERVE=8 -# CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY is not set -# CONFIG_SPIRAM_OCCUPY_HSPI_HOST is not set -CONFIG_SPIRAM_OCCUPY_VSPI_HOST=y -# CONFIG_SPIRAM_OCCUPY_NO_HOST is not set - -# -# PSRAM clock and cs IO for ESP32-DOWD -# -CONFIG_D0WD_PSRAM_CLK_IO=17 -CONFIG_D0WD_PSRAM_CS_IO=16 -# end of PSRAM clock and cs IO for ESP32-DOWD - -# -# PSRAM clock and cs IO for ESP32-D2WD -# -CONFIG_D2WD_PSRAM_CLK_IO=9 -CONFIG_D2WD_PSRAM_CS_IO=10 -# end of PSRAM clock and cs IO for ESP32-D2WD - -# -# PSRAM clock and cs IO for ESP32-PICO -# -CONFIG_PICO_PSRAM_CS_IO=10 -# end of PSRAM clock and cs IO for ESP32-PICO - -# CONFIG_SPIRAM_2T_MODE is not set -# end of SPI RAM config +# CONFIG_SPIRAM is not set # end of ESP PSRAM # @@ -979,7 +903,6 @@ CONFIG_ESP_BROWNOUT_DET_LVL=4 # end of Brownout Detector # CONFIG_ESP32_DISABLE_BASIC_ROM_CONSOLE is not set -CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y CONFIG_ESP_SYSTEM_BROWNOUT_INTR=y # end of ESP System Settings @@ -1015,15 +938,14 @@ CONFIG_ESP_WIFI_ENABLED=y CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=8 CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64 CONFIG_ESP_WIFI_STATIC_TX_BUFFER=y +# CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER is not set CONFIG_ESP_WIFI_TX_BUFFER_TYPE=0 CONFIG_ESP_WIFI_STATIC_TX_BUFFER_NUM=8 -CONFIG_ESP_WIFI_CACHE_TX_BUFFER_NUM=32 # CONFIG_ESP_WIFI_CSI_ENABLED is not set CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y CONFIG_ESP_WIFI_TX_BA_WIN=8 CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y CONFIG_ESP_WIFI_RX_BA_WIN=16 -# CONFIG_ESP_WIFI_AMSDU_TX_ENABLED is not set CONFIG_ESP_WIFI_NVS_ENABLED=y CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_0=y # CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1 is not set @@ -1106,7 +1028,6 @@ CONFIG_FATFS_CODEPAGE=437 CONFIG_FATFS_FS_LOCK=0 CONFIG_FATFS_TIMEOUT_MS=10000 CONFIG_FATFS_PER_FILE_CACHE=y -CONFIG_FATFS_ALLOC_PREFER_EXTRAM=y # CONFIG_FATFS_USE_FASTSEEK is not set CONFIG_FATFS_VFS_FSTAT_BLKSIZE=0 # end of FAT Filesystem support @@ -1370,7 +1291,6 @@ CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y # mbedTLS # CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y -# CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC is not set # CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC is not set # CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC is not set CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y @@ -1831,6 +1751,7 @@ CONFIG_POST_EVENTS_FROM_ISR=y # CONFIG_TWO_UNIVERSAL_MAC_ADDRESS is not set CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4 +CONFIG_ESP_SYSTEM_PD_FLASH=y CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000 CONFIG_ESP32_RTC_CLK_SRC_INT_RC=y CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y @@ -1851,9 +1772,8 @@ CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20 CONFIG_ESP32_PHY_MAX_TX_POWER=20 CONFIG_REDUCE_PHY_TX_POWER=y CONFIG_ESP32_REDUCE_PHY_TX_POWER=y -CONFIG_SPIRAM_SUPPORT=y -CONFIG_ESP32_SPIRAM_SUPPORT=y -# CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST is not set +# CONFIG_SPIRAM_SUPPORT is not set +# CONFIG_ESP32_SPIRAM_SUPPORT is not set # CONFIG_ESP32_DEFAULT_CPU_FREQ_80 is not set # CONFIG_ESP32_DEFAULT_CPU_FREQ_160 is not set CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y @@ -1911,9 +1831,9 @@ CONFIG_ESP32_WIFI_ENABLED=y CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=8 CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=64 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y +# CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER is not set CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=8 -CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=32 # CONFIG_ESP32_WIFI_CSI_ENABLED is not set CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y CONFIG_ESP32_WIFI_TX_BA_WIN=8 @@ -1921,7 +1841,6 @@ CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y CONFIG_ESP32_WIFI_RX_BA_WIN=16 CONFIG_ESP32_WIFI_RX_BA_WIN=16 -# CONFIG_ESP32_WIFI_AMSDU_TX_ENABLED is not set CONFIG_ESP32_WIFI_NVS_ENABLED=y CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y # CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1 is not set