From 6c0b73be32279a74e301a9de3fdc8f59f81bb875 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 6 May 2024 12:53:48 +0200
Subject: [PATCH] Update platformio.ini

* added ${common_mm.NetDebug_build_flags} to de-dupliate flags
* small update to pico V4 env
* removed refs to non-existing file (comments only)
---
 platformio.ini | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 48ddc574..9471b484 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1022,6 +1022,11 @@ HUB75_build_flags =
 HUB75_lib_deps = https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA.git @ 3.0.10
 HUB75_lib_ignore = ESP32 HUB75 LED MATRIX PANEL DMA Display ;; to remove the HUB75 lib dependancy (saves a few bytes)
 
+NetDebug_build_flags =
+  ;; WLEDMM: only setting WLED_DEBUG_HOST is enough, ip and port can be defined in sync settings as well
+  -D WLED_DEBUG_HOST='"192.168.x.x"' ;; to send debug messages over network to host 192.168.x.y - FQDN is also possible
+  -D WLED_DEBUG_PORT=1768 ;; port for network debugging. default = 7868
+
 
 build_flags_S = 
   -Wall -Wformat -Woverflow -Wuninitialized -Winit-self -Warray-bounds ; enables more warnings
@@ -1051,9 +1056,7 @@ build_flags_M =
   -D USERMOD_ROTARY_ENCODER_UI
   -D USERMOD_AUTO_SAVE
   ${common_mm.animartrix_build_flags}
-  ;WLEDMM: only setting WLED_DEBUG_HOST is enough, ip and port can be defined in sync settings as well
-  -D WLED_DEBUG_HOST='"192.168.x.x"' ;; to send debug messages over network to host 192.168.x.y - FQDN is also possible
-  -D WLED_DEBUG_PORT=1768 ;; port for network debugging. default = 7868
+  ${common_mm.NetDebug_build_flags}
 
 lib_deps_M =
   ;https://github.com/blazoncek/OneWire.git ; includes bugfixes for inconsistent readings
@@ -1127,14 +1130,12 @@ extends = esp32_4MB_S_base
 build_flags = ${common.build_flags_esp32} ${common_mm.build_flags_S} ${common_mm.build_flags_M} ;; we don't want common_mm.build_disable_sync_interfaces, so we cannot inherit from esp32_4MB_S_base
 build_unflags = ${esp32_4MB_S_base.build_unflags}
 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 = ${esp32_4MB_M_base.build_unflags}
 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, including -S3, -S2, -C3
 [esp32_4MB_V4_S_base]
@@ -1241,9 +1242,8 @@ build_flags = ${esp32_4MB_S_base.build_flags}
   ;-D WLED_DISABLE_MQTT
   ;-D WLED_DISABLE_INFRARED
   -D WLEDMM_SAVE_FLASH
-  ;WLEDMM: disable the next two lines if you don't need "net Debug". It will free ~2% of flash
-  -D WLED_DEBUG_HOST='"192.168.x.x"' ;; to send debug messages over network to host 192.168.x.y - FQDN is also possible
-  -D WLED_DEBUG_PORT=1768 ;; port for network debugging. default = 7868
+  ;WLEDMM: disable the next line if you don't need "net Debug". It will free ~2% of flash
+  ${common_mm.NetDebug_build_flags}
 ;; normal build
 ; RAM:   [===       ]  25.0% (used 81988 bytes from 327680 bytes)
 ; Flash: [========= ]  87.4% (used 1374677 bytes from 1572864 bytes) WLEDMM: Earlier 85.7
@@ -1385,8 +1385,7 @@ build_flags = ${common.build_flags_esp8266}
   ;; -D WLED_DISABLE_INFRARED ;RAM 136 bytes; FLASH 24492 bytes
   ; -D WLED_DISABLE_2D
   ; -UWLED_USE_MY_CONFIG
-  -D WLED_DEBUG_HOST='"192.168.x.x"' ;; to send debug messages over network to host 192.168.x.y - FQDN is also possible
-  -D WLED_DEBUG_PORT=1768 ;; port for network debugging. default = 7868
+  ${common_mm.NetDebug_build_flags}
   ; -D WLED_DEBUG
 ; monitor_filters = esp8266_exception_decoder
 ;; lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
@@ -1407,8 +1406,7 @@ build_flags = ${common.build_flags_esp8266}
   ;; -D WLED_DISABLE_INFRARED ;RAM 136 bytes; FLASH 24492 bytes
   ; -D WLED_DISABLE_2D
   ; -UWLED_USE_MY_CONFIG
- -D WLED_DEBUG_HOST='"192.168.x.x"' ;; to send debug messages over network to host 192.168.x.y - FQDN is also possible
- -D WLED_DEBUG_PORT=1768 ;; port for network debugging. default = 7868  
+  ${common_mm.NetDebug_build_flags}
   ; -D WLED_DEBUG
 ; monitor_filters = esp8266_exception_decoder
 ;; lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
@@ -1436,8 +1434,7 @@ build_flags = ${common.build_flags_esp8266}
   ; -D USERMOD_ARTIFX ; this is compiling but not working due to low memory on 8266
   -D USERMOD_BATTERY ;; enable Battery usermod
   -D USERMOD_BATTERY_USE_LIPO ;; use new "discharging curve" for LiPo cells
-  -D WLED_DEBUG_HOST='"192.168.x.x"' ;; to send debug messages over network to host 192.168.x.y - FQDN is also possible
-  -D WLED_DEBUG_PORT=1768 ;; port for network debugging. default = 7868
+  ${common_mm.NetDebug_build_flags}
   ; -D WLED_DEBUG
 monitor_filters = esp8266_exception_decoder
 lib_deps = ${esp8266.lib_deps}
@@ -1492,8 +1489,7 @@ build_flags = ${common.build_flags_esp8266}
   -D WLED_DISABLE_ALEXA
   -D WLED_DISABLE_HUESYNC
   ; -D WLED_DEBUG ${common.debug_flags} ;; un-comment for debug messages
-  -D WLED_DEBUG_HOST='"192.168.x.x"' ;; to send debug messages over network to host 192.168.x.y - FQDN is also possible
-  -D WLED_DEBUG_PORT=1768 ;; port for network debugging. default = 7868
+  ${common_mm.NetDebug_build_flags}
   ;; -D WLED_DISABLE_ESPNOW  ;; might help in case of WiFi connectivity problems
   ; -D WLED_DISABLE_LOXONE ;  FLASH 1272 bytes
   ; -D WLED_DISABLE_MQTT ;    RAM 216 bytes; FLASH 16496 bytes
@@ -1533,8 +1529,7 @@ build_flags = ${common.build_flags_esp8266}
   -D USERMOD_FOUR_LINE_DISPLAY
   -D USERMOD_MPU6050_IMU ; gyro/accelero for USERMOD_GAMES (ONLY WORKS IF USERMOD_FOUR_LINE_DISPLAY NOT INCLUDED - I2C SHARING BUG)
   -D USERMOD_GAMES ; WLEDMM usermod
-  -D WLED_DEBUG_HOST='"192.168.x.x"' ;; to send debug messages over network to host 192.168.x.y - FQDN is also possible
-  -D WLED_DEBUG_PORT=1768 ;; port for network debugging. default = 7868
+  ${common_mm.NetDebug_build_flags}
   ; -D WLED_DEBUG
 monitor_filters = esp8266_exception_decoder
 lib_deps = ${esp8266.lib_deps}
@@ -2448,6 +2443,7 @@ build_flags = ${esp32_4MB_V4_S_base.esp32_build_flags}
   -D WLED_WATCHDOG_TIMEOUT=0
   ; -D WLED_WATCHDOG_TIMEOUT=60
   -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)
+  ${common_mm.NetDebug_build_flags}  ;; net debug is not included in normal _S builds
   ; -D WLED_DEBUG
   ; -D SR_DEBUG
   -D LEDPIN=2
@@ -2459,9 +2455,11 @@ build_flags = ${esp32_4MB_V4_S_base.esp32_build_flags}
   -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:   [===       ]  27.9% (used 91448 bytes from 327680 bytes)
-; Flash: [==========]  96.2% (used 1513557 bytes from 1572864 bytes)
+lib_ignore = 
+  IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
+  ${common_mm.HUB75_lib_ignore}
+; RAM:   [===       ]  27.9% (used 91528 bytes from 327680 bytes)
+; Flash: [==========]  96.7% (used 1521457 bytes from 1572864 bytes)
 ;