From 8645e5e5202e434c1d26aeca045ef84ddcd0fc26 Mon Sep 17 00:00:00 2001
From: Ewoud <ewowi@icloud.com>
Date: Thu, 23 Nov 2023 16:15:13 +0100
Subject: [PATCH] Bugfix: disables for _S but not for _M and _XL (build_unflag)

---
 platformio.ini | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 6354b2e2..1b31eba9 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -906,6 +906,16 @@ board_build.partitions = ${esp32.default_partitions}
 
 ; shared build flags and lib deps for minimum and maximum environment
 [common_mm]
+
+build_disables =
+  -D WLED_DISABLE_LOXONE
+  -D WLED_DISABLE_ALEXA
+  -D WLED_DISABLE_HUESYNC
+  -D WLED_DISABLE_MQTT
+  -D WLED_DISABLE_INFRARED
+  -D WLED_DISABLE_ADALIGHT  ;; WLEDMM this board does not have a serial-to-USB chip. Better to disable serial protocols, to avoid crashes (see upstream #3128)
+  -D WLED_DISABLE_ESPNOW ;; ESP-NOW requires wifi, may crash with ethernet only
+
 build_flags_S = 
   -Wall -Wformat -Woverflow -Wuninitialized -Winit-self -Warray-bounds ; enables more warnings
   -Wno-attributes -Wno-unused-variable -Wno-unused-function -Wno-deprecated-declarations ;disables some stupid warnings
@@ -918,13 +928,7 @@ build_flags_S =
   ; -D USERMOD_ARTIFX  ;; WLEDMM usermod - temporarily moved into "_M", due to problems in "_S" when compiling with -O2
   -D WLEDMM_FASTPATH ;; WLEDMM experimental option. Reduces audio lag (latency), and allows for faster LED framerates. May break compatibility with previous versions.
   ; -D WLED_DEBUG_HEAP ;; WLEDMM enable heap debugging
-  -D WLED_DISABLE_LOXONE
-  -D WLED_DISABLE_ALEXA
-  -D WLED_DISABLE_HUESYNC
-  -D WLED_DISABLE_MQTT
-  -D WLED_DISABLE_INFRARED
-  -D WLED_DISABLE_ADALIGHT  ;; WLEDMM this board does not have a serial-to-USB chip. Better to disable serial protocols, to avoid crashes (see upstream #3128)
-  -D WLED_DISABLE_ESPNOW ;; ESP-NOW requires wifi, may crash with ethernet only
+  ${common_mm.build_disables}
 
 lib_deps_S =
   ;; https://github.com/kosme/arduinoFFT#develop @ 1.9.2+sha.419d7b0 ;; used for USERMOD_AUDIOREACTIVE - using "known working" hash
@@ -1018,12 +1022,14 @@ monitor_filters = esp32_exception_decoder
 [esp32_4MB_M_base]
 extends = esp32_4MB_S_base
 build_flags = ${esp32_4MB_S_base.build_flags} ${common_mm.build_flags_M}
+build_unflags = ${common.build_unflags} ${common_mm.build_disables}
 lib_deps = ${esp32_4MB_S_base.lib_deps} ${common_mm.lib_deps_M}
 ; board_build.partitions = tools/WLED_ESP32-wrover_4MB.csv
 
 [esp32_4MB_XL_base]
 extends = esp32_4MB_M_base
 build_flags = ${esp32_4MB_M_base.build_flags} ${common_mm.build_flags_XL}
+build_unflags = ${common.build_unflags} ${common_mm.build_disables}
 lib_deps = ${esp32_4MB_M_base.lib_deps} ${common_mm.lib_deps_XL}
 ; board_build.partitions = tools/WLED_ESP32-wrover_4MB.csv
 
@@ -1152,7 +1158,7 @@ build_flags = ${esp32_4MB_M_base.build_flags}
 extends = esp32_4MB_XL_base
 build_flags = ${esp32_4MB_XL_base.build_flags}
   -D WLED_RELEASE_NAME=esp32_4MB_XL
-build_unflags = 
+build_unflags = ${esp32_4MB_XL_base.build_unflags}
   -D USERMOD_ANIMARTRIX ;; Tips our memory usage over the limit
 ; RAM:   [==        ]  24.4% (used 80060 bytes from 327680 bytes)
 ; Flash: [==========]  95.3% (used 1499037 bytes from 1572864 bytes)