post-merge updates

CONFIG_ASYNC_TCP_TASK_STACK_SIZE => CONFIG_ASYNC_TCP_STACK_SIZE

Author: softhack007

platformio.ini

@@ -366,6 +366,7 @@ build_flagsV4 = -g
   -DCONFIG_LITTLEFS_FOR_IDF_3_2 -DLFS_THREADSAFE
   -D CONFIG_ASYNC_TCP_USE_WDT=0
   -D CONFIG_ASYNC_TCP_TASK_STACK_SIZE=9472              ;; WLEDMM increase stack by 1.25Kb, as audioreactive needs bigger SETTINGS_STACK_BUF_SIZE
+  -D CONFIG_ASYNC_TCP_STACK_SIZE=9472                   ;; *sigh* newer asyncTCP uses this instead of .._TASK_..
   ; -D WLEDMM_TWOPATH  ;; use I2S1 as the second bus --> slightly faster on some setups
   ; -D WLEDMM_SLOWPATH ;; don't use I2S for LED bus
   ; -DARDUINO_USB_CDC_ON_BOOT=0 ;; mandatory for "classic ESP32" when building with arduino-esp32 >=2.0.3
@@ -399,6 +400,7 @@ build_flags = -g
   #-DCONFIG_LITTLEFS_FOR_IDF_3_2
   -D CONFIG_ASYNC_TCP_USE_WDT=0
   -D CONFIG_ASYNC_TCP_TASK_STACK_SIZE=9472              ;; WLEDMM increase stack by 1.25Kb, as audioreactive needs bigger SETTINGS_STACK_BUF_SIZE
+  -D CONFIG_ASYNC_TCP_STACK_SIZE=9472                   ;; *sigh* newer asyncTCP uses this instead of .._TASK_..
   -DARDUINO_USB_CDC_ON_BOOT=0 ;; this flag is mandatory for "classic ESP32" when building with arduino-esp32 >=2.0.3
   ; -D WLEDMM_TWOPATH  ;; use I2S1 as the second bus --> slightly faster on some setups
   ; -D WLEDMM_SLOWPATH ;; don't use I2S for LED bus
@@ -430,6 +432,7 @@ build_flags = -g
   -DCONFIG_LITTLEFS_FOR_IDF_3_2 -DLFS_THREADSAFE   ;; WLEDMM
   -D CONFIG_ASYNC_TCP_USE_WDT=0
   -D CONFIG_ASYNC_TCP_TASK_STACK_SIZE=8614         ;; WLEDMM increase stack by 1Kb, as audioreactive needs bigger SETTINGS_STACK_BUF_SIZE
+  -D CONFIG_ASYNC_TCP_STACK_SIZE=8614                   ;; *sigh* newer asyncTCP uses this instead of .._TASK_..
   -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0
   -DCO
   -DARDUINO_USB_MODE=0 ;; this flag is mandatory for ESP32-S2 !
@@ -454,6 +457,7 @@ build_flags = -g
   -DCONFIG_LITTLEFS_FOR_IDF_3_2 -DLFS_THREADSAFE   ;; WLEDMM
   -D CONFIG_ASYNC_TCP_USE_WDT=0
   -D CONFIG_ASYNC_TCP_TASK_STACK_SIZE=9472         ;; WLEDMM increase stack by 1.25Kb, as audioreactive needs bigger SETTINGS_STACK_BUF_SIZE
+  -D CONFIG_ASYNC_TCP_STACK_SIZE=9472                   ;; *sigh* newer asyncTCP uses this instead of .._TASK_..
   -DCO
   -DARDUINO_USB_MODE=1 ;; this flag is mandatory for ESP32-C3
   ;; please make sure that the following flags are properly set (to 0 or 1) by your board.json, or included in your custom platformio_override.ini entry:
@@ -479,6 +483,7 @@ build_flags = -g
   -DWLEDMM_NO_SERIAL_WAIT                          ;; WLEDMM don't wait for serial on -S3 (unless WLED_DEBUG is set)
   -D CONFIG_ASYNC_TCP_USE_WDT=0
   -D CONFIG_ASYNC_TCP_TASK_STACK_SIZE=9472         ;; WLEDMM increase stack by 1.25Kb, as audioreactive needs bigger SETTINGS_STACK_BUF_SIZE
+  -D CONFIG_ASYNC_TCP_STACK_SIZE=9472                   ;; *sigh* newer asyncTCP uses this instead of .._TASK_..
   -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_DFU_ON_BOOT=0
   -DCO
   ;; please make sure that the following flags are properly set (to 0 or 1) by your board.json, or included in your custom platformio_override.ini entry:

usermods/audioreactive/audio_reactive.h

@@ -111,12 +111,12 @@
 
 // sanity checks
 #ifdef ARDUINO_ARCH_ESP32
-  // we need more space in for oappend() stack buffer -> SETTINGS_STACK_BUF_SIZE and CONFIG_ASYNC_TCP_TASK_STACK_SIZE
+  // we need more space in for oappend() stack buffer -> SETTINGS_STACK_BUF_SIZE and CONFIG_ASYNC_TCP_STACK_SIZE
   #if SETTINGS_STACK_BUF_SIZE < 3904    // 3904 is required for WLEDMM-0.14.0-b28
     #warning please increase SETTINGS_STACK_BUF_SIZE >= 3904
   #endif
-  #if (CONFIG_ASYNC_TCP_TASK_STACK_SIZE - SETTINGS_STACK_BUF_SIZE) < 4352 // at least 4096+256 words of free task stack is needed by async_tcp alone
-    #error remaining async_tcp stack will be too low - please increase CONFIG_ASYNC_TCP_TASK_STACK_SIZE
+  #if (CONFIG_ASYNC_TCP_STACK_SIZE - SETTINGS_STACK_BUF_SIZE) < 4352 // at least 4096+256 words of free task stack is needed by async_tcp alone
+    #error remaining async_tcp stack will be too low - please increase CONFIG_ASYNC_TCP_STACK_SIZE
   #endif
 #endif
 

wled00/const.h

@@ -435,7 +435,7 @@
   #if !defined(USERMOD_AUDIOREACTIVE)
     #define SETTINGS_STACK_BUF_SIZE 3834   // WLEDMM added 696+32 bytes of margin (was 3096)
   #else
-    #define SETTINGS_STACK_BUF_SIZE 4000   // WLEDMM more buffer for audioreactive UI (add '-D CONFIG_ASYNC_TCP_TASK_STACK_SIZE=9216' to your build_flags)
+    #define SETTINGS_STACK_BUF_SIZE 4000   // WLEDMM more buffer for audioreactive UI (add '-D CONFIG_ASYNC_TCP_STACK_SIZE=9216' to your build_flags)
   #endif
 #endif