From 044a87b0b7046693cd394e4078d70c00855c910b Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Fri, 28 Jul 2023 21:33:45 +0200
Subject: [PATCH] pio: all animartix dependencies in one place

* central place for animartix dependencies
* removed animartix from `esp32_4MB_V4_M` (V4 "M" build  - flash size exceeded)
---
 platformio.ini | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index e87370e6..d5728ee2 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -913,7 +913,10 @@ build_flags_S =
   ; -D WLED_ENABLE_DMX
 
 lib_deps_S =
-  https://github.com/kosme/arduinoFFT#develop @ 1.9.2+sha.419d7b0 ; used for USERMOD_AUDIOREACTIVE - using "known working" hash
+  https://github.com/kosme/arduinoFFT#develop @ 1.9.2+sha.419d7b0 ;; used for USERMOD_AUDIOREACTIVE - using "known working" hash
+
+animartrix_build_flags = -D USERMOD_ANIMARTRIX ;; WLEDMM usermod: CC BY-NC 3.0 licensed effects by Stefan Petrick
+animartrix_lib_deps = https://github.com/netmindz/animartrix.git#f070fefc42febe2de3a2ab5d6d39e78bbc539702
 
 build_flags_M = 
   -D WLED_MAX_USERMODS=25 ; default only 4-6, also for _XL configs takes 25 pointers in memory
@@ -923,7 +926,7 @@ build_flags_M =
   -D USE_ALT_DISPLAY ; new versions of USERMOD_FOUR_LINE_DISPLAY and USERMOD_ROTARY_ENCODER_UI
   -D USERMOD_FOUR_LINE_DISPLAY
   -D USERMOD_ROTARY_ENCODER_UI
-  -D USERMOD_ANIMARTRIX ; WLEDMM usermod: CC BY-NC 3.0 licensed effects by Stefan Petrick
+  ${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
@@ -931,14 +934,14 @@ build_flags_M =
 lib_deps_M =
   ;https://github.com/blazoncek/OneWire.git ; includes bugfixes for inconsistent readings
   OneWire@~2.3.5 ; used for USERMOD_FOUR_LINE_DISPLAY and USERMOD_DALLASTEMPERATURE
-  olikraus/U8g2 @ ^2.28.8 ; used for USERMOD_FOUR_LINE_DISPLAY 
-  https://github.com/netmindz/animartrix.git#f070fefc42febe2de3a2ab5d6d39e78bbc539702
+  olikraus/U8g2 @ ^2.28.8 ; used for USERMOD_FOUR_LINE_DISPLAY
+  ${common_mm.animartrix_lib_deps}
 
 lib_deps_V4_M =
   ;https://github.com/blazoncek/OneWire.git ; includes bugfixes for inconsistent readings
   paulstoffregen/OneWire@ ^2.3.7 ; used for USERMOD_DALLASTEMPERATURE -> need newer release with bugfixes for -S3; still requires TEMPERATURE_PIN < 46
   olikraus/U8g2@ ^2.34.5 ; used for USERMOD_FOUR_LINE_DISPLAY -> need newer version with bugfixes for arduino-esp32 v2.0.4 (Wire inititialization) 
-  https://github.com/netmindz/animartrix.git#f070fefc42febe2de3a2ab5d6d39e78bbc539702
+  ${common_mm.animartrix_lib_deps}
 
 build_flags_XL = 
   -D USERMOD_AUTO_SAVE
@@ -963,7 +966,7 @@ build_flags_XL =
   ; -D USERMOD_SHT ;; experimental
   -D USERMOD_VL53L0X_GESTURES
   -D WLED_ENABLE_PIXART
-  -D USERMOD_ANIMARTRIX ; WLEDMM usermod: CC BY-NC 3.0 licensed effects by Stefan Petrick
+  ${common_mm.animartrix_build_flags}
 
 lib_deps_XL =
   ElectronicCats/MPU6050 @ 0.6.0 ; used for USERMOD_MPU6050_IMU
@@ -1380,8 +1383,11 @@ build_flags = ${esp32_4MB_V4_M_base.build_flags}
   ;-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_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
-;; RAM:   [==        ]  24.7% (used 80884 bytes from 327680 bytes)
-;; Flash: [==========]  99.0% (used 1556429 bytes from 1572864 bytes)
+build_unflags = ${esp32_4MB_V4_M_base.build_unflags}
+  -D USERMOD_ANIMARTRIX ;; Tips our memory usage over the limit
+
+;; RAM:   [===       ]  25.9% (used 84708 bytes from 327680 bytes)
+;; Flash: [==========]  98.5% (used 1549033 bytes from 1572864 bytes)
 
 ;; V4 build for 16MB flash, optimized for speed
 [env:esp32_16MB_V4_S]