From c574f68e3b5ca669bd3759bac8c5bc1aae94c12f Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 18 Dec 2023 16:35:31 +0100
Subject: [PATCH] trying to fix horribly broken build envs for -S2 and -C3

Flags for -S3 and "classic esp32" were mixed into specific flags for S2/C3, leading to subtly chaotic results.

WHODUNIT?
---
 platformio.ini | 77 ++++++++++++++++++++++++++++++--------------------
 1 file changed, 47 insertions(+), 30 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 84e9b3ae..e1506af6 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -256,7 +256,7 @@ extra_scripts = ${scripts_defaults.extra_scripts}
 
 [esp8266]
 build_flags =
-  -DESP8266
+  -DESP8266 -DZSHIT
   -DFP_IN_IROM
   ;-Wno-deprecated-declarations
   ;-Wno-register  ;; leaves some warnings when compiling C files: command-line option '-Wno-register' is valid for C++/ObjC++ but not for C
@@ -284,6 +284,7 @@ lib_deps =
   ;; makuna/NeoPixelBus @ 2.6.9 ;; WLEDMM use if you have problems with 2.7.5
   makuna/NeoPixelBus @ 2.7.5
   ${env.lib_deps}
+  stiffupper8266.lib ;; for probing the buildenv.
 
 [esp32]
 #platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.2.3/platform-espressif32-2.0.2.3.zip
@@ -292,7 +293,7 @@ platform = espressif32@3.5.0
 platform_packages = framework-arduinoespressif32 @ https://github.com/Aircoookie/arduino-esp32.git#1.0.6.4
 
 build_flags = -g
-  -DARDUINO_ARCH_ESP32
+  -DARDUINO_ARCH_ESP32  -DYSHIT
   #-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
@@ -310,6 +311,7 @@ lib_deps =
   https://github.com/softhack007/LITTLEFS-threadsafe.git#master
   makuna/NeoPixelBus @ 2.7.5
   ${env.lib_deps}
+  stiffupper.lib ;; for probing the buildenv.
 
 ;; WLEDMM begin
 
@@ -328,7 +330,7 @@ platformV4_packages_xp = platformio/framework-arduinoespressif32 @ ~3.20009.0
 ;; platformV4_packages_xp = platformio/framework-arduinoespressif32 @ ~3.20011.0    ;; arduino-esp32 v2.0.11 (latest one supported in platformio)
 
 build_flagsV4 = -g
-  -DARDUINO_ARCH_ESP32 -DESP32
+  -DARDUINO_ARCH_ESP32 -DESP32 -DXSHIT
   -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
@@ -338,6 +340,7 @@ lib_depsV4 =
   https://github.com/pbolduc/AsyncTCP.git @ 1.2.0 ;; WLEDMM this must be first in the list, otherwise Aircoookie/ESPAsyncWebServer pulls in an older version of AsyncTCP !!
   makuna/NeoPixelBus @ 2.7.5
   ${env.lib_deps}
+  stiffupperV4.lib ;; for probing the buildenv.
 
 ;; WLEDMM end
 
@@ -351,7 +354,7 @@ platform = espressif32@5.3.0
 platform_packages =
 build_flags = -g
   -Wshadow=compatible-local ;; emit warning in case a local variable "shadows" another local one
-  -DARDUINO_ARCH_ESP32 -DESP32
+  -DARDUINO_ARCH_ESP32 -DESP32  -DXSHIT
   #-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
@@ -361,18 +364,19 @@ lib_deps =
   https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
   makuna/NeoPixelBus @ 2.7.5
   ${env.lib_deps}
+  stiffupperVV.lib ;; for probing the buildenv.
 
 [esp32s2]
 ;; generic definitions for all ESP32-S2 boards
 platform = espressif32@5.3.0
 platform_packages =
 build_flags = -g
-  -DARDUINO_ARCH_ESP32 -DESP32                     ;; WLEDMM
+  -DARDUINO_ARCH_ESP32 -DESP32    -DS2XSHIT                   ;; WLEDMM
   -DARDUINO_ARCH_ESP32S2
   -DCONFIG_IDF_TARGET_ESP32S2=1
   -DCONFIG_LITTLEFS_FOR_IDF_3_2 -DLFS_THREADSAFE   ;; WLEDMM
   -D CONFIG_ASYNC_TCP_USE_WDT=0
-  -D CONFIG_ASYNC_TCP_TASK_STACK_SIZE=9216         ;; WLEDMM increase stack by 1Kb, as audioreactive needs bigger SETTINGS_STACK_BUF_SIZE
+  -D CONFIG_ASYNC_TCP_TASK_STACK_SIZE=8614         ;; WLEDMM increase stack by 1Kb, as audioreactive needs bigger SETTINGS_STACK_BUF_SIZE
   -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0
   -DCO
   -DARDUINO_USB_MODE=0 ;; this flag is mandatory for ESP32-S2 !
@@ -383,13 +387,14 @@ lib_deps =
   https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
   makuna/NeoPixelBus @ 2.7.5
   ${env.lib_deps}
+  ;;; stiffupperS2.lib ;; for probing the buildenv. Nothing more. Did I mention that I like AC/DC?
 
 [esp32c3]
 ;; generic definitions for all ESP32-C3 boards
 platform = espressif32@5.3.0
 platform_packages =
 build_flags = -g
-  -DARDUINO_ARCH_ESP32 -DESP32                     ;; WLEDMM
+  -DARDUINO_ARCH_ESP32 -DESP32       -DC3XSHIT                ;; WLEDMM
   -DARDUINO_ARCH_ESP32C3
   -DCONFIG_IDF_TARGET_ESP32C3=1
   -DCONFIG_LITTLEFS_FOR_IDF_3_2 -DLFS_THREADSAFE   ;; WLEDMM
@@ -404,6 +409,7 @@ lib_deps =
   https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
   makuna/NeoPixelBus @ 2.7.5
   ${env.lib_deps}
+  stiffupperC3.lib
 
 [esp32s3]
 ;; generic definitions for all ESP32-S3 boards
@@ -411,7 +417,7 @@ platform = espressif32@5.3.0
 platform_packages =
 build_flags = -g
   -DESP32
-  -DARDUINO_ARCH_ESP32
+  -DARDUINO_ARCH_ESP32   -DS3XSHIT
   -DARDUINO_ARCH_ESP32S3
   -DCONFIG_IDF_TARGET_ESP32S3=1
   -DCONFIG_LITTLEFS_FOR_IDF_3_2 -DLFS_THREADSAFE   ;; WLEDMM
@@ -426,6 +432,7 @@ lib_deps =
   https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
   makuna/NeoPixelBus @ 2.7.5
   ${env.lib_deps}
+  stiffupperS3.lib
 
 
 # ------------------------------------------------------------------------------
@@ -1055,23 +1062,23 @@ build_unflags = ${esp32_4MB_M_base.build_unflags} ${common_mm.build_disable_sync
 lib_deps = ${esp32_4MB_M_base.lib_deps} ${common_mm.lib_deps_XL}
 ; board_build.partitions = tools/WLED_ESP32-wrover_4MB.csv
 
-;common default for all V4 min environments
+;common default for all V4 min environments, including -S3, -S2, -C3
 [esp32_4MB_V4_S_base]
 board = esp32dev
 upload_speed = 460800 ; or 921600
 platform = ${esp32.platformV4}
-platform_packages = 
-  ${esp32.platformV4_packages}
-  toolchain-xtensa-esp32 @ 8.4.0+2021r2-patch5 ; align main tools with riscV tools
+platform_packages = ${esp32.platformV4_packages}
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} ${esp32.build_flagsV4} ${common_mm.build_flags_S}
+build_flags = ${common.build_flags} ${common_mm.build_flags_S}   ;; do not include ${esp32.build_flagsV4} here !!!!
   -Wno-misleading-indentation -Wno-format-truncation 
   -Wshadow=compatible-local ;; emit warning in case a local variable "shadows" another local one
   ;-Wstack-usage=2732       ;; warn if a function needs more that 30% of availeable stack ("stack usage might be unbounded", "stack usage is 2824 bytes")
   ;-Wsuggest-attribute=const -Wsuggest-attribute=pure ;;  ask compiler for hints on attributes
   -D WLED_ENABLE_DMX_INPUT
-lib_deps = ${esp32.lib_depsV4} ${common_mm.lib_deps_S}
+lib_deps = ${common_mm.lib_deps_S}                               ;;  do not include ${esp32.lib_depsV4} here !!!!
   https://github.com/someweisguy/esp_dmx.git#v3.0.2-beta  ;; for DMX_INPUT
+esp32_build_flags = ${esp32.build_flagsV4} ${esp32_4MB_V4_S_base.build_flags} ;; this is for esp32 only, including specific "V4" flags
+esp32_lib_deps = ${esp32.lib_depsV4} ${esp32_4MB_V4_S_base.lib_deps}  ;; this is for esp32 only, including specific "V4" flags
 board_build.partitions = ${esp32.default_partitions}
 board_build.f_flash = 80000000L ; use full 80MHz speed for flash (default = 40Mhz) 
 board_build.flash_mode = dio ; (dio = dual i/o; more compatible than qio = quad i/o)
@@ -1080,8 +1087,10 @@ board_build.flash_mode = dio ; (dio = dual i/o; more compatible than qio = quad
 
 [esp32_4MB_V4_M_base]
 extends = esp32_4MB_V4_S_base
-build_flags = ${esp32_4MB_V4_S_base.build_flags} ${common_mm.build_flags_M}
+build_flags = ${esp32_4MB_V4_S_base.build_flags} ${common_mm.build_flags_M}               ;; generic, for all variants
 lib_deps = ${esp32_4MB_V4_S_base.lib_deps} ${common_mm.lib_deps_V4_M}
+esp32_build_flags = ${esp32_4MB_V4_S_base.esp32_build_flags} ${common_mm.build_flags_M}   ;; for esp32 only, including specific "V4" flags
+esp32_lib_deps = ${esp32_4MB_V4_S_base.esp32_lib_deps} ${common_mm.lib_deps_V4_M}
 board_build.partitions = ${esp32_4MB_V4_S_base.board_build.partitions} 
 ;board_build.flash_mode = qio ; (dio = dual i/o; more compatible than qio = quad i/o)
 
@@ -1474,7 +1483,7 @@ lib_deps = ${esp8266.lib_deps}
 ; compiled with ESP-IDF 4.4.1
 [env:esp32_4MB_V4_S]
 extends = esp32_4MB_V4_S_base
-build_flags = ${esp32_4MB_V4_S_base.build_flags}
+build_flags = ${esp32_4MB_V4_S_base.esp32_build_flags}
   -D WLED_RELEASE_NAME=esp32_4MB_V4_S
   -D WLED_WATCHDOG_TIMEOUT=0 #-D WLED_DISABLE_BROWNOUT_DET
   -D ARDUINO_USB_CDC_ON_BOOT=0 ; needed for arduino-esp32 >=2.0.4; avoids errors on startup
@@ -1487,6 +1496,7 @@ build_flags = ${esp32_4MB_V4_S_base.build_flags}
   ; -D WLED_DEBUG
   ; -D SR_DEBUG
   ; -D MIC_LOGGER
+lib_deps = ${esp32_4MB_V4_S_base.esp32_lib_deps}
 lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
   ; RAM:   [===       ]  25.1% (used 82176 bytes from 327680 bytes)
   ; Flash: [========= ]  93.8% (used 1474893 bytes from 1572864 bytes)
@@ -1494,7 +1504,7 @@ lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compila
 ; compiled with ESP-IDF 4.4.1
 [env:esp32_4MB_V4_M]
 extends = esp32_4MB_V4_M_base
-build_flags = ${esp32_4MB_V4_M_base.build_flags}
+build_flags = ${esp32_4MB_V4_M_base.esp32_build_flags}
   -D WLED_RELEASE_NAME=esp32_4MB_V4_M
   -D WLED_WATCHDOG_TIMEOUT=0 #-D WLED_DISABLE_BROWNOUT_DET
   -D ARDUINO_USB_CDC_ON_BOOT=0 ; needed for arduino-esp32 >=2.0.4; avoids errors on startup
@@ -1503,6 +1513,7 @@ build_flags = ${esp32_4MB_V4_M_base.build_flags}
   -D WLED_DISABLE_HUESYNC ;RAM 122 bytes; FLASH  6308 bytes
   ;-D WLED_DISABLE_MQTT ;   RAM 216 bytes; FLASH 16496 bytes
   -D WLED_DISABLE_INFRARED ;RAM 136 bytes; FLASH 24492 bytes  ;; softhack007 disabled to stay below 100% flash size
+lib_deps = ${esp32_4MB_V4_M_base.esp32_lib_deps}
 lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
 build_unflags = ${esp32_4MB_V4_M_base.build_unflags}
   -D USERMOD_ANIMARTRIX ;; Tips our memory usage over the limit
@@ -1515,14 +1526,14 @@ build_unflags = ${esp32_4MB_V4_M_base.build_unflags}
 extends = esp32_4MB_V4_S_base
 build_unflags = ${esp32_4MB_V4_S_base.build_unflags}
   ${Speed_Flags.build_unflags}  ;; to override -Os
-build_flags = ${esp32_4MB_V4_S_base.build_flags}
+build_flags = ${esp32_4MB_V4_S_base.esp32_build_flags}
   ${Speed_Flags.build_flags}  ;; optimize for speed instead of size
   -D WLED_RELEASE_NAME=esp32_16MB_V4_S
   -D WLED_WATCHDOG_TIMEOUT=0 #-D WLED_DISABLE_BROWNOUT_DET
   -D ARDUINO_USB_CDC_ON_BOOT=0 ; needed for arduino-esp32 >=2.0.4; avoids errors on startup
   -D WLEDMM_FASTPATH ; WLEDMM experimental option. Reduces audio lag (latency), and allows for faster LED framerates. May break compatibility with previous versions.
   ;; ${common_mm.animartrix_build_flags} ;; breaks the build - Internal Compiler Error
-lib_deps = ${esp32_4MB_V4_S_base.lib_deps}
+lib_deps = ${esp32_4MB_V4_S_base.esp32_lib_deps}
   ;; ${common_mm.animartrix_lib_deps}
 board = esp32_16MB
 board_build.partitions = tools/WLED_ESP32_16MB.csv         ;; WLED standard for 16MB flash:   2MB firmware, 12 MB filesystem
@@ -1537,7 +1548,7 @@ board_build.partitions = tools/WLED_ESP32_16MB.csv         ;; WLED standard for
 ; compiled with ESP-IDF 4.4.1
 [env:esp32_16MB_V4_M]
 extends = esp32_4MB_V4_M_base
-build_flags = ${esp32_4MB_V4_M_base.build_flags}
+build_flags = ${esp32_4MB_V4_M_base.esp32_build_flags}
   -D WLED_RELEASE_NAME=esp32_16MB_V4_M
   -D WLED_WATCHDOG_TIMEOUT=0 #-D WLED_DISABLE_BROWNOUT_DET
   -D ARDUINO_USB_CDC_ON_BOOT=0 ; needed for arduino-esp32 >=2.0.4; avoids errors on startup
@@ -1548,6 +1559,7 @@ build_flags = ${esp32_4MB_V4_M_base.build_flags}
   -D ENCODER_DT_PIN=35 -D ENCODER_CLK_PIN=39 -D ENCODER_SW_PIN=5  ; WLEDMM spec by @SERG74: use 35 and 39 instead of 18 and 19 (conflicts)
   -D FLD_PIN_SCL=-1 -D FLD_PIN_SDA=-1 ; use global!
   -D HW_PIN_SCL=22 -D HW_PIN_SDA=21
+lib_deps = ${esp32_4MB_V4_M_base.esp32_lib_deps}
 board = esp32_16MB 
 board_build.partitions = tools/WLED_ESP32_16MB.csv         ;; WLED standard for 16MB flash:   2MB firmware, 12 MB filesystem
 ;board_build.partitions = tools/WLED_ESP32_16MB_9MB_FS.csv ;; WLED extended for 16MB flash: 3.2MB firmware,  9 MB filesystem
@@ -1558,14 +1570,15 @@ board_build.partitions = tools/WLED_ESP32_16MB.csv         ;; WLED standard for
 extends = esp32_4MB_V4_M_base
 build_unflags = ${common.build_unflags}
   -D CORE_DEBUG_LEVEL=0
-build_flags = ${esp32_4MB_V4_M_base.build_flags}
+build_flags = ${esp32_4MB_V4_M_base.esp32_build_flags}
   ${Debug_Flags.build_flags}
   -D CORE_DEBUG_LEVEL=4  ;; 0=none, 1=error, 2=warning, 3=info, 4=debug, 5=verbose
   -D WLED_DEBUG_HEAP ;; WLEDMM enable heap debugging
   -D WLED_RELEASE_NAME=esp32_16MB_V4_M_debug
   -D WLED_WATCHDOG_TIMEOUT=0 #-D WLED_DISABLE_BROWNOUT_DET
   -D ARDUINO_USB_CDC_ON_BOOT=0 ; needed for arduino-esp32 >=2.0.4; avoids errors on startup
-board = esp32_16MB 
+lib_deps = ${esp32_4MB_V4_M_base.esp32_lib_deps}
+board = esp32_16MB
 board_build.partitions = tools/WLED_ESP32_16MB.csv         ;; WLED standard for 16MB flash:   2MB firmware, 12 MB filesystem
 ;board_build.partitions = tools/WLED_ESP32_16MB_9MB_FS.csv ;; WLED extended for 16MB flash: 3.2MB firmware,  9 MB filesystem
 monitor_filters = esp32_exception_decoder
@@ -1577,7 +1590,7 @@ monitor_filters = esp32_exception_decoder
 extends = esp32_4MB_V4_S_base
 board = lolin_d32_pro
 ;board = esp32cam
-build_flags = ${esp32_4MB_V4_S_base.build_flags} 
+build_flags = ${esp32_4MB_V4_S_base.esp32_build_flags} 
   -D WLED_RELEASE_NAME=esp32_4MB_PSRAM_S
   -D WLED_WATCHDOG_TIMEOUT=0 #-D WLED_DISABLE_BROWNOUT_DET
   -D ARDUINO_USB_CDC_ON_BOOT=0 ; needed for arduino-esp32 >=2.0.4; avoids errors on startup
@@ -1592,6 +1605,7 @@ build_flags = ${esp32_4MB_V4_S_base.build_flags}
   ; -D WLED_DEBUG
   ; -D SR_DEBUG
   ; -D MIC_LOGGER
+lib_deps = ${esp32_4MB_V4_S_base.esp32_lib_deps}
 lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
 ;; RAM:   [==        ]  24.3% (used 79524 bytes from 327680 bytes)
 ;; Flash: [========= ]  93.2% (used 1466389 bytes from 1572864 bytes)
@@ -1609,7 +1623,7 @@ build_unflags = ${esp32_4MB_V4_S_base.build_unflags}
   -mfix-esp32-psram-cache-issue    ;; this fix is not needed any more for revision 3
   -mfix-esp32-psram-cache-strategy=memw ;; same as above
 
-build_flags = ${esp32_4MB_V4_S_base.build_flags}
+build_flags = ${esp32_4MB_V4_S_base.esp32_build_flags}
   -DARDUINO_EVENT_RUNNING_CORE=0  ;; assign Wifi to core0, to have more CPU on core#1 (arduino loop)
   -DARDUINO_RUNNING_CORE=1        ;; should be default, but does not hurt
   -DCONFIG_MBEDTLS_DYNAMIC_BUFFER=1 ;; optional - seems to move more buffers into PSRAM
@@ -1630,6 +1644,7 @@ build_flags = ${esp32_4MB_V4_S_base.build_flags}
   ; -D WLED_DEBUG
   ; -D SR_DEBUG
   ; -D MIC_LOGGER
+lib_deps = ${esp32_4MB_V4_S_base.esp32_lib_deps}
 lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
 ;; RAM:   [====      ]  35.9% (used 117688 bytes from 327680 bytes)
 ;; Flash: [========= ]  94.5% (used 1487097 bytes from 1572864 bytes)
@@ -1640,7 +1655,7 @@ extends = esp32_4MB_V4_M_base
 board = lolin_d32_pro
 ;board = esp32cam
 board_build.partitions = tools/WLED_ESP32_4MB_256KB_FS.csv   ;; 1.8MB firmware, 256KB filesystem (esptool erase_flash needed when changing from "standard WLED" partitions)
-build_flags = ${esp32_4MB_V4_M_base.build_flags} 
+build_flags = ${esp32_4MB_V4_M_base.esp32_build_flags} 
   -D WLED_RELEASE_NAME=esp32_4MB_PSRAM_M
   -D WLED_WATCHDOG_TIMEOUT=0 #-D WLED_DISABLE_BROWNOUT_DET
   -D ARDUINO_USB_CDC_ON_BOOT=0 ; needed for arduino-esp32 >=2.0.4; avoids errors on startup
@@ -1654,6 +1669,7 @@ build_flags = ${esp32_4MB_V4_M_base.build_flags}
   ; -D WLED_DEBUG
   ; -D SR_DEBUG
   ; -D MIC_LOGGER
+lib_deps = ${esp32_4MB_V4_M_base.esp32_lib_deps}
 ;lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
 ;; RAM:   [==        ]  24.9% (used 81484 bytes from 327680 bytes)
 ;; Flash: [========  ]  84.6% (used 1607857 bytes from 1900544 bytes)
@@ -1808,6 +1824,7 @@ build_unflags = ${common.build_unflags}
   -D USERMOD_DALLASTEMPERATURE ;; disabled because it hangs during usermod setup on -S3 (autodetect broken?)
   -D WLED_ENABLE_DMX ;; disabled because it does not work with ESP-IDF 4.4.x (buggy driver in SparkFunDMX)
   -D WLED_ENABLE_DMX_INPUT ;; needs more testing
+  -DWLEDMM_FASTPATH ;; needs more testing on -S2
 
 build_flags = ${common.build_flags} ${esp32s2.build_flags} 
   ; ${Debug_Flags.build_flags} ;ewowi: enabling debug causes Error: The program size (1463330 bytes) is greater than maximum allowed (1441792 bytes)
@@ -1862,6 +1879,7 @@ build_unflags = ${common.build_unflags}
   -D USERMOD_DALLASTEMPERATURE ;; disabled because it hangs during usermod setup on -S3 (autodetect broken?)
   -D WLED_ENABLE_DMX ;; disabled because it does not work with ESP-IDF 4.4.x (buggy driver in SparkFunDMX)
   -D WLED_ENABLE_DMX_INPUT ;; needs more testing
+  -DWLEDMM_FASTPATH ;; needs more testing on -S2
 build_flags = ${common.build_flags} ${esp32s2.build_flags} 
   ;; ${Debug_Flags.build_flags}
   -D WLED_WATCHDOG_TIMEOUT=0 -D CONFIG_ASYNC_TCP_USE_WDT=0
@@ -1916,6 +1934,7 @@ build_unflags = ${common.build_unflags}
   -D WLED_ENABLE_DMX_INPUT ;; needs more testing
   ;-D WLED_DEBUG_HOST='"192.168.x.x"' ;; to disable net print
   -D USERMOD_ANIMARTRIX ;; Tips our memory usage over the limit
+  -DWLEDMM_FASTPATH ;; needs more testing on -C3
 
 build_flags = ${common.build_flags} ${esp32c3.build_flags} 
   ; -D WLED_DISABLE_OTA          ;;  OTA is not possible for boards with 2MB flash only (like some Ai-Thinker ESP32-C3-12F models)
@@ -1956,6 +1975,7 @@ platform_packages = ${esp32.platformV4_packages_pre}
 board_build.flash_mode = qio
 upload_speed = 460800
 build_unflags = ${env:esp32c3dev_4MB_M.build_unflags}
+  -DWLEDMM_FASTPATH ;; needs more testing on -C3
 build_flags = ${common.build_flags} ${esp32c3.build_flags} 
   -D WLED_WATCHDOG_TIMEOUT=0 -D CONFIG_ASYNC_TCP_USE_WDT=0
   ${common_mm.build_flags_S} -Wno-misleading-indentation -Wno-format-truncation
@@ -2139,18 +2159,14 @@ extends = esp32_4MB_S_base
 build_unflags = ${esp32_4MB_S_base.build_unflags} ${common_mm.build_disable_sync_interfaces}
 build_flags = ${esp32_4MB_S_base.build_flags}
   -D WLED_RELEASE_NAME=abc_wled_controller_v43_M
-
   -D LEDPIN=16
   -D ABL_MILLIAMPS_DEFAULT=5000 ; 5A default. Max 13A depending on the wires connected
-
   -D WLED_USE_ETHERNET
   -D WLED_ETH_DEFAULT=9 ; ABC! WLED V43 & compatible
   -D RLYPIN=-1 -D BTNPIN=-1 ;; Prevent clash
   -D WLED_DISABLE_ESPNOW ;; ESP-NOW requires wifi, may crash with ethernet only
-
   -D AUDIOPIN=-1 
   -D FLD_PIN_SCL=-1 -D FLD_PIN_SDA=-1 ; use global!
-
   ; -D WLED_USE_MY_CONFIG
   -D SR_DMTYPE=4 -D I2S_SDPIN=32 -D I2S_WSPIN=15 -D I2S_CKPIN=14 -D MCLK_PIN=0 ; generic i2s with mclk 0
   -D SR_SQUELCH=1 -D SR_GAIN=60    ; increrase squelch if noise, in test 0 is okay, but only slightly
@@ -2201,7 +2217,7 @@ board = pico32
 ;platform_packages =
 upload_speed = 256000 ;; or 115200 ;; or 460800 ; or 921600  (slower speeds are better when flashing without a soldered connection)
 
-build_flags = ${esp32_4MB_V4_S_base.build_flags}
+build_flags = ${esp32_4MB_V4_S_base.esp32_build_flags}
   -D ARDUINO_USB_CDC_ON_BOOT=0 ; needed for arduino-esp32 >=2.0.4; avoids errors on startup
   -D WLED_RELEASE_NAME=esp32_pico_4MB_V4_S
   -D WLED_DISABLE_BROWNOUT_DET
@@ -2225,6 +2241,7 @@ build_flags = ${esp32_4MB_V4_S_base.build_flags}
   ; -D MCLK_PIN=0
   -D SR_ENABLE_DEFAULT  ;; enable audioreactive at first start - no need to manually set "enable", then reboot
   ; -D WLED_USE_MY_CONFIG
+lib_deps = ${esp32_4MB_V4_S_base.esp32_lib_deps}
 ;lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
 ; RAM:   [===       ]  25.4% (used 83144 bytes from 327680 bytes)
 ; Flash: [==========]  96.4% (used 1516029 bytes from 1572864 bytes)