From 2f042d25a8b5cb566fd762593e09052c8ea97267 Mon Sep 17 00:00:00 2001 From: Sebastien Date: Tue, 29 Oct 2019 17:28:30 -0400 Subject: [PATCH] AirPlay fix: increase RECVMBOX_SIZE to 32 --- build-scripts/I2S-16MFlash-sdkconfig.defaults | 4 +-- build-scripts/I2S-4MFlash-sdkconfig.defaults | 4 +-- .../NonOTA-I2S-16MFlash-sdkconfig.defaults | 4 +-- .../NonOTA-I2S-4MFlash-sdkconfig.defaults | 4 +-- .../NonOTA-SqueezeAmp-sdkconfig.defaults | 4 +-- .../SqueezeAmp4MBFlash-sdkconfig.defaults | 4 +-- .../SqueezeAmp8MBFlash-sdkconfig.defaults | 4 +-- ...lite-esp32-I2S-16MFlash-sdkconfig.defaults | 4 +-- ...2-I2S-4MFlash-NOAirplay-sdkconfig.defaults | 4 +-- ...elite-esp32-I2S-4MFlash-sdkconfig.defaults | 34 +++++++++++++++++-- ...zelite-esp32-SqueezeAmp-sdkconfig.defaults | 4 +-- 11 files changed, 52 insertions(+), 22 deletions(-) diff --git a/build-scripts/I2S-16MFlash-sdkconfig.defaults b/build-scripts/I2S-16MFlash-sdkconfig.defaults index 4720cff6..e274336c 100644 --- a/build-scripts/I2S-16MFlash-sdkconfig.defaults +++ b/build-scripts/I2S-16MFlash-sdkconfig.defaults @@ -648,7 +648,7 @@ CONFIG_LWIP_TCP_OVERSIZE_MSS=y CONFIG_LWIP_MAX_UDP_PCBS=16 -CONFIG_LWIP_UDP_RECVMBOX_SIZE=6 +CONFIG_LWIP_UDP_RECVMBOX_SIZE=32 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072 CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y @@ -1124,7 +1124,7 @@ CONFIG_TCP_QUEUE_OOSEQ=y CONFIG_TCP_OVERSIZE_MSS=y -CONFIG_UDP_RECVMBOX_SIZE=6 +CONFIG_UDP_RECVMBOX_SIZE=32 CONFIG_TCPIP_TASK_STACK_SIZE=3072 CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y diff --git a/build-scripts/I2S-4MFlash-sdkconfig.defaults b/build-scripts/I2S-4MFlash-sdkconfig.defaults index 4530e562..4b125fd3 100644 --- a/build-scripts/I2S-4MFlash-sdkconfig.defaults +++ b/build-scripts/I2S-4MFlash-sdkconfig.defaults @@ -647,7 +647,7 @@ CONFIG_LWIP_TCP_OVERSIZE_MSS=y CONFIG_LWIP_MAX_UDP_PCBS=16 -CONFIG_LWIP_UDP_RECVMBOX_SIZE=6 +CONFIG_LWIP_UDP_RECVMBOX_SIZE=32 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072 CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y @@ -1123,7 +1123,7 @@ CONFIG_TCP_QUEUE_OOSEQ=y CONFIG_TCP_OVERSIZE_MSS=y -CONFIG_UDP_RECVMBOX_SIZE=6 +CONFIG_UDP_RECVMBOX_SIZE=32 CONFIG_TCPIP_TASK_STACK_SIZE=3072 CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y diff --git a/build-scripts/NonOTA-I2S-16MFlash-sdkconfig.defaults b/build-scripts/NonOTA-I2S-16MFlash-sdkconfig.defaults index a79bb781..6f3f49b0 100644 --- a/build-scripts/NonOTA-I2S-16MFlash-sdkconfig.defaults +++ b/build-scripts/NonOTA-I2S-16MFlash-sdkconfig.defaults @@ -648,7 +648,7 @@ CONFIG_LWIP_TCP_OVERSIZE_MSS=y CONFIG_LWIP_MAX_UDP_PCBS=16 -CONFIG_LWIP_UDP_RECVMBOX_SIZE=6 +CONFIG_LWIP_UDP_RECVMBOX_SIZE=32 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072 CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y @@ -1123,7 +1123,7 @@ CONFIG_TCP_QUEUE_OOSEQ=y CONFIG_TCP_OVERSIZE_MSS=y -CONFIG_UDP_RECVMBOX_SIZE=6 +CONFIG_UDP_RECVMBOX_SIZE=32 CONFIG_TCPIP_TASK_STACK_SIZE=3072 CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y diff --git a/build-scripts/NonOTA-I2S-4MFlash-sdkconfig.defaults b/build-scripts/NonOTA-I2S-4MFlash-sdkconfig.defaults index 7b57e684..bd98f8ff 100644 --- a/build-scripts/NonOTA-I2S-4MFlash-sdkconfig.defaults +++ b/build-scripts/NonOTA-I2S-4MFlash-sdkconfig.defaults @@ -647,7 +647,7 @@ CONFIG_LWIP_TCP_OVERSIZE_MSS=y CONFIG_LWIP_MAX_UDP_PCBS=16 -CONFIG_LWIP_UDP_RECVMBOX_SIZE=6 +CONFIG_LWIP_UDP_RECVMBOX_SIZE=32 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072 CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y @@ -1122,7 +1122,7 @@ CONFIG_TCP_QUEUE_OOSEQ=y CONFIG_TCP_OVERSIZE_MSS=y -CONFIG_UDP_RECVMBOX_SIZE=6 +CONFIG_UDP_RECVMBOX_SIZE=32 CONFIG_TCPIP_TASK_STACK_SIZE=3072 CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y diff --git a/build-scripts/NonOTA-SqueezeAmp-sdkconfig.defaults b/build-scripts/NonOTA-SqueezeAmp-sdkconfig.defaults index 3606e647..4b15eded 100644 --- a/build-scripts/NonOTA-SqueezeAmp-sdkconfig.defaults +++ b/build-scripts/NonOTA-SqueezeAmp-sdkconfig.defaults @@ -636,7 +636,7 @@ CONFIG_LWIP_TCP_OVERSIZE_MSS=y CONFIG_LWIP_MAX_UDP_PCBS=16 -CONFIG_LWIP_UDP_RECVMBOX_SIZE=6 +CONFIG_LWIP_UDP_RECVMBOX_SIZE=32 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072 CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y @@ -1111,7 +1111,7 @@ CONFIG_TCP_QUEUE_OOSEQ=y CONFIG_TCP_OVERSIZE_MSS=y -CONFIG_UDP_RECVMBOX_SIZE=6 +CONFIG_UDP_RECVMBOX_SIZE=32 CONFIG_TCPIP_TASK_STACK_SIZE=3072 CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y diff --git a/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults b/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults index 9d8af4ff..549c9b63 100644 --- a/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults +++ b/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults @@ -636,7 +636,7 @@ CONFIG_LWIP_TCP_OVERSIZE_MSS=y CONFIG_LWIP_MAX_UDP_PCBS=16 -CONFIG_LWIP_UDP_RECVMBOX_SIZE=6 +CONFIG_LWIP_UDP_RECVMBOX_SIZE=32 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072 CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y @@ -1112,7 +1112,7 @@ CONFIG_TCP_QUEUE_OOSEQ=y CONFIG_TCP_OVERSIZE_MSS=y -CONFIG_UDP_RECVMBOX_SIZE=6 +CONFIG_UDP_RECVMBOX_SIZE=32 CONFIG_TCPIP_TASK_STACK_SIZE=3072 CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y diff --git a/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults b/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults index a1cdfdde..5c363eff 100644 --- a/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults +++ b/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults @@ -318,7 +318,7 @@ CONFIG_LWIP_TCP_RECVMBOX_SIZE=32 CONFIG_LWIP_TCP_QUEUE_OOSEQ=y CONFIG_LWIP_TCP_OVERSIZE_MSS=y CONFIG_LWIP_MAX_UDP_PCBS=16 -CONFIG_LWIP_UDP_RECVMBOX_SIZE=6 +CONFIG_LWIP_UDP_RECVMBOX_SIZE=32 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072 CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF @@ -550,7 +550,7 @@ CONFIG_TCP_WND_DEFAULT=32768 CONFIG_TCP_RECVMBOX_SIZE=32 CONFIG_TCP_QUEUE_OOSEQ=y CONFIG_TCP_OVERSIZE_MSS=y -CONFIG_UDP_RECVMBOX_SIZE=6 +CONFIG_UDP_RECVMBOX_SIZE=32 CONFIG_TCPIP_TASK_STACK_SIZE=3072 CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y CONFIG_TCPIP_TASK_AFFINITY=0x7FFFFFFF diff --git a/build-scripts/squeezelite-esp32-I2S-16MFlash-sdkconfig.defaults b/build-scripts/squeezelite-esp32-I2S-16MFlash-sdkconfig.defaults index 0722f815..ae61448b 100644 --- a/build-scripts/squeezelite-esp32-I2S-16MFlash-sdkconfig.defaults +++ b/build-scripts/squeezelite-esp32-I2S-16MFlash-sdkconfig.defaults @@ -647,7 +647,7 @@ CONFIG_LWIP_TCP_OVERSIZE_MSS=y CONFIG_LWIP_MAX_UDP_PCBS=16 -CONFIG_LWIP_UDP_RECVMBOX_SIZE=6 +CONFIG_LWIP_UDP_RECVMBOX_SIZE=32 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072 CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y @@ -1122,7 +1122,7 @@ CONFIG_TCP_QUEUE_OOSEQ=y CONFIG_TCP_OVERSIZE_MSS=y -CONFIG_UDP_RECVMBOX_SIZE=6 +CONFIG_UDP_RECVMBOX_SIZE=32 CONFIG_TCPIP_TASK_STACK_SIZE=3072 CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y diff --git a/build-scripts/squeezelite-esp32-I2S-4MFlash-NOAirplay-sdkconfig.defaults b/build-scripts/squeezelite-esp32-I2S-4MFlash-NOAirplay-sdkconfig.defaults index 097c6bec..73991c73 100644 --- a/build-scripts/squeezelite-esp32-I2S-4MFlash-NOAirplay-sdkconfig.defaults +++ b/build-scripts/squeezelite-esp32-I2S-4MFlash-NOAirplay-sdkconfig.defaults @@ -642,7 +642,7 @@ CONFIG_LWIP_TCP_OVERSIZE_MSS=y CONFIG_LWIP_MAX_UDP_PCBS=16 -CONFIG_LWIP_UDP_RECVMBOX_SIZE=6 +CONFIG_LWIP_UDP_RECVMBOX_SIZE=32 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072 CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y @@ -1117,7 +1117,7 @@ CONFIG_TCP_QUEUE_OOSEQ=y CONFIG_TCP_OVERSIZE_MSS=y -CONFIG_UDP_RECVMBOX_SIZE=6 +CONFIG_UDP_RECVMBOX_SIZE=32 CONFIG_TCPIP_TASK_STACK_SIZE=3072 CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y diff --git a/build-scripts/squeezelite-esp32-I2S-4MFlash-sdkconfig.defaults b/build-scripts/squeezelite-esp32-I2S-4MFlash-sdkconfig.defaults index 86e97eb5..75714129 100644 --- a/build-scripts/squeezelite-esp32-I2S-4MFlash-sdkconfig.defaults +++ b/build-scripts/squeezelite-esp32-I2S-4MFlash-sdkconfig.defaults @@ -9,6 +9,7 @@ CONFIG_IDF_TARGET="esp32" # SDK tool configuration # CONFIG_SDK_TOOLPREFIX="xtensa-esp32-elf-" + CONFIG_SDK_MAKE_WARN_UNDEFINED_VARIABLES=y CONFIG_APP_COMPILE_TIME_DATE=y @@ -31,7 +32,15 @@ CONFIG_BOOTLOADER_WDT_TIME_MS=9000 +CONFIG_ESPTOOLPY_PORT="com6" +CONFIG_ESPTOOLPY_BAUD_2MB=y + + + + CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 +CONFIG_ESPTOOLPY_BAUD=2000000 +CONFIG_ESPTOOLPY_COMPRESSED=y CONFIG_ESPTOOLPY_FLASHMODE_QIO=y @@ -48,6 +57,7 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_ESPTOOLPY_FLASHSIZE="4MB" + CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y CONFIG_ESPTOOLPY_BEFORE_RESET=y @@ -105,6 +115,13 @@ CONFIG_BT_SINK_PIN=1234 CONFIG_AIRPLAY_SINK=y CONFIG_AIRPLAY_NAME="ESP32-AirPlay" CONFIG_AIRPLAY_PORT="5000" + + + + + + + CONFIG_WIFI_MANAGER_TASK_PRIORITY=5 CONFIG_WIFI_MANAGER_MAX_RETRY=2 CONFIG_DEFAULT_AP_SSID="squeezelite" @@ -386,7 +403,9 @@ CONFIG_SPIRAM_SIZE=-1 CONFIG_SPIRAM_SPEED_80M=y CONFIG_SPIRAM_MEMTEST=y CONFIG_SPIRAM_CACHE_WORKAROUND=y + CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=256 + CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=65536 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y @@ -503,6 +522,8 @@ CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=12 + + CONFIG_ESP32_WIFI_NVS_ENABLED=y CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y @@ -519,6 +540,10 @@ CONFIG_ESP32_PHY_MAX_TX_POWER=20 CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y + + + + CONFIG_FATFS_CODEPAGE_437=y @@ -646,7 +671,7 @@ CONFIG_LWIP_TCP_OVERSIZE_MSS=y CONFIG_LWIP_MAX_UDP_PCBS=16 -CONFIG_LWIP_UDP_RECVMBOX_SIZE=6 +CONFIG_LWIP_UDP_RECVMBOX_SIZE=32 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072 CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y @@ -793,12 +818,17 @@ CONFIG_SEMIHOSTFS_HOST_PATH_MAX_LEN=128 CONFIG_WL_SECTOR_SIZE_4096=y CONFIG_WL_SECTOR_SIZE=4096 + + + + CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16 # Deprecated options for backward compatibility CONFIG_TOOLPREFIX="xtensa-esp32-elf-" + CONFIG_MAKE_WARN_UNDEFINED_VARIABLES=y @@ -1121,7 +1151,7 @@ CONFIG_TCP_QUEUE_OOSEQ=y CONFIG_TCP_OVERSIZE_MSS=y -CONFIG_UDP_RECVMBOX_SIZE=6 +CONFIG_UDP_RECVMBOX_SIZE=32 CONFIG_TCPIP_TASK_STACK_SIZE=3072 CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y diff --git a/build-scripts/squeezelite-esp32-SqueezeAmp-sdkconfig.defaults b/build-scripts/squeezelite-esp32-SqueezeAmp-sdkconfig.defaults index f8bddf8f..c726e1a1 100644 --- a/build-scripts/squeezelite-esp32-SqueezeAmp-sdkconfig.defaults +++ b/build-scripts/squeezelite-esp32-SqueezeAmp-sdkconfig.defaults @@ -635,7 +635,7 @@ CONFIG_LWIP_TCP_OVERSIZE_MSS=y CONFIG_LWIP_MAX_UDP_PCBS=16 -CONFIG_LWIP_UDP_RECVMBOX_SIZE=6 +CONFIG_LWIP_UDP_RECVMBOX_SIZE=32 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072 CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y @@ -1110,7 +1110,7 @@ CONFIG_TCP_QUEUE_OOSEQ=y CONFIG_TCP_OVERSIZE_MSS=y -CONFIG_UDP_RECVMBOX_SIZE=6 +CONFIG_UDP_RECVMBOX_SIZE=32 CONFIG_TCPIP_TASK_STACK_SIZE=3072 CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y