From e3444174c084c45d298252c309be2373d045f3ee Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 30 Oct 2024 15:52:39 +0100
Subject: [PATCH] align PSRAM build flags on all MM targets

---
 platformio.ini  | 27 +++++++++++++++++++--------
 wled00/wled.cpp | 18 +-----------------
 wled00/wled.h   |  2 +-
 3 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 1e4359c1..33907262 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -731,6 +731,7 @@ build_flags = ${common.build_flags} ${esp32s3.build_flags}
   -D ARDUINO_USB_CDC_ON_BOOT=1 -D ARDUINO_USB_MODE=1      ;; for boards with USB-OTG connector only (USBCDC or "TinyUSB")
   ; -D WLED_RELEASE_NAME=ESP32-S3_PSRAM
   -D WLED_USE_PSRAM -DBOARD_HAS_PSRAM ; tells WLED that PSRAM shall be used
+  -D WLED_USE_PSRAM_JSON -DALL_JSON_TO_PSRAM ; WLEDMM --> force all JSON stuff into PSRAM; gives more free heap
 lib_deps = ${esp32s3.lib_deps}
   ${esp32.AR_lib_deps}
 board_build.partitions = ${esp32.large_partitions}
@@ -827,6 +828,7 @@ build_flags = ${common.build_flags} ${esp32s2.build_flags} -D WLED_RELEASE_NAME=
   -DARDUINO_USB_DFU_ON_BOOT=0
   -DLOLIN_WIFI_FIX ; seems to work much better with this
   -D WLED_USE_PSRAM
+  -D WLED_USE_PSRAM_JSON -DALL_JSON_TO_PSRAM ; WLEDMM --> force all JSON stuff into PSRAM; gives more free heap
   ; -D WLED_USE_UNREAL_MATH ;; may cause wrong sunset/sunrise times, but saves 6792 bytes FLASH
   -D WLED_WATCHDOG_TIMEOUT=0
   -D CONFIG_ASYNC_TCP_USE_WDT=0
@@ -1802,7 +1804,8 @@ build_flags = ${esp32_4MB_V4_S_base.esp32_build_flags}
   -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.
-  -DBOARD_HAS_PSRAM -D WLED_USE_PSRAM_JSON ;; -D WLED_USE_PSRAM ;; WLED_USE_PSRAM causes major slow-down (slow LEDs) on some ESP32 boards
+  -DBOARD_HAS_PSRAM ;; -D WLED_USE_PSRAM ;; WLED_USE_PSRAM causes major slow-down (slow LEDs) on some ESP32 boards
+  -D WLED_USE_PSRAM_JSON -DALL_JSON_TO_PSRAM ; WLEDMM --> force all JSON stuff into PSRAM; gives more free heap
   -D WLED_DISABLE_LOXONE ;  FLASH 1272 bytes
   -D WLED_DISABLE_HUESYNC ; RAM 122 bytes; FLASH  6308 bytes
   -D WLED_DISABLE_ALEXA ;   RAM 116 bytes; FLASH 13524 bytes
@@ -1837,7 +1840,8 @@ build_flags = ${esp32_4MB_V4_S_base.esp32_build_flags}
   -DCONFIG_MBEDTLS_DYNAMIC_BUFFER=1 ;; optional - seems to move more buffers into PSRAM
   ;;${Speed_Flags.build_flags_V4}  ;; optimize for speed instead of size --> over 100% flash, but works with 256KB filesystem (alternative partitions file)
   -D WLEDMM_FASTPATH ; WLEDMM experimental option. Reduces audio lag (latency), and allows for faster LED framerates. May break compatibility with previous versions.
-  -DBOARD_HAS_PSRAM -D WLED_USE_PSRAM_JSON ;; -D WLED_USE_PSRAM ;; WLED_USE_PSRAM causes major slow-down (slow LEDs) on some ESP32 boards
+  -DBOARD_HAS_PSRAM  ;; -D WLED_USE_PSRAM ;; WLED_USE_PSRAM causes major slow-down (slow LEDs) on some ESP32 boards
+  -D WLED_USE_PSRAM_JSON -DALL_JSON_TO_PSRAM ; WLEDMM --> force all JSON stuff into PSRAM; gives more free heap
   ;;-D CONFIG_ESP32_REV_MIN=3  ;;  disables PSRAM bug workarounds in the core, reducing the code size and improving overall performance.
   -D WLED_RELEASE_NAME=esp32_4MB_PSRAM_REV3_S
   -D WLED_WATCHDOG_TIMEOUT=0 #-D WLED_DISABLE_BROWNOUT_DET
@@ -1867,7 +1871,8 @@ 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
-  -DBOARD_HAS_PSRAM -D WLED_USE_PSRAM_JSON ;; -D WLED_USE_PSRAM ;; WLED_USE_PSRAM causes major slow-down (slow LEDs) on some ESP32 boards
+  -DBOARD_HAS_PSRAM ;; -D WLED_USE_PSRAM ;; WLED_USE_PSRAM causes major slow-down (slow LEDs) on some ESP32 boards
+  -D WLED_USE_PSRAM_JSON -DALL_JSON_TO_PSRAM ; WLEDMM --> force all JSON stuff into PSRAM; gives more free heap
   -D WLED_DISABLE_LOXONE  ;;  FLASH 1272 bytes
   -D WLED_DISABLE_HUESYNC ;;  RAM 122 bytes; FLASH  6308 bytes
   -D WLED_DISABLE_ALEXA ;;     RAM 116 bytes; FLASH 13524 bytes
@@ -1929,6 +1934,7 @@ build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-inden
   ${common_mm.HUB75_build_flags}
   ${common_mm.animartrix_build_flags}
   ; -DBOARD_HAS_PSRAM -D WLED_USE_PSRAM_JSON -D WLED_USE_PSRAM ;; un-comment in case your board supports PSRAM
+  ;; -D WLED_USE_PSRAM_JSON -DALL_JSON_TO_PSRAM ; WLEDMM --> force all JSON stuff into PSRAM; gives more free heap
   -D WLED_RELEASE_NAME=esp32S3_8MB_M 
   -DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0   ;; for Serial-to-USB chip
   ;;-DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=1 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=1 ;; for Hardware-CDC USB mode
@@ -1977,7 +1983,8 @@ build_unflags = ${env:esp32S3_8MB_M.build_unflags}   ;; use the same as "normal"
 build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-indentation -Wno-format-truncation
   ${common_mm.build_flags_S} ${common_mm.build_flags_M}
   ${common_mm.HUB75_build_flags}
-  -DBOARD_HAS_PSRAM -D WLED_USE_PSRAM_JSON ;; -D WLED_USE_PSRAM ;; your board supports PSRAM
+  -DBOARD_HAS_PSRAM ;; -D WLED_USE_PSRAM ;; your board supports PSRAM
+  -D WLED_USE_PSRAM_JSON -DALL_JSON_TO_PSRAM ; WLEDMM --> force all JSON stuff into PSRAM; gives more free heap
   -D WLED_RELEASE_NAME=esp32S3_8MB_PSRAM_M
   -DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0     ;; for Serial-to-USB chip
   ;;-DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=1 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=1   ;; for Hardware-CDC USB mode
@@ -2063,7 +2070,8 @@ board_build.partitions = tools/WLED_ESP32_4MB_256KB_FS.csv   ;; 1.8MB firmware,
 build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-indentation -Wno-format-truncation
   ${common_mm.build_flags_S}
   -D WLED_RELEASE_NAME=esp32S3_4MB_S
-  -DBOARD_HAS_PSRAM -D WLED_USE_PSRAM_JSON ;; -D WLED_USE_PSRAM
+  -DBOARD_HAS_PSRAM ;; -D WLED_USE_PSRAM
+  -D WLED_USE_PSRAM_JSON -DALL_JSON_TO_PSRAM ; WLEDMM --> force all JSON stuff into PSRAM; gives more free heap
   -DCONFIG_MBEDTLS_DYNAMIC_BUFFER=1 ;; optional - allows some buffers to use PSRAM
   -DLOLIN_WIFI_FIX -DWLEDMM_WIFI_POWERON_HACK ;; seems to work much better with this
   -DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=1   ;; for Serial-to-USB chip
@@ -2099,7 +2107,8 @@ board_build.partitions = ${esp32.default_partitions}
 build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-indentation -Wno-format-truncation
   ${common_mm.build_flags_S} ${common_mm.build_flags_M}
   -D WLED_RELEASE_NAME=esp32S3_4MB_M
-  -DBOARD_HAS_PSRAM -D WLED_USE_PSRAM_JSON ;; -D WLED_USE_PSRAM
+  -DBOARD_HAS_PSRAM ;; -D WLED_USE_PSRAM
+  -D WLED_USE_PSRAM_JSON -DALL_JSON_TO_PSRAM ; WLEDMM --> force all JSON stuff into PSRAM; gives more free heap
   -DCONFIG_MBEDTLS_DYNAMIC_BUFFER=1 ;; optional - allows some buffers to use PSRAM
   -DLOLIN_WIFI_FIX -DWLEDMM_WIFI_POWERON_HACK ;; seems to work much better with this
   -DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=1   ;; for Serial-to-USB chip
@@ -2162,7 +2171,8 @@ build_flags = ${common.build_flags} ${esp32s2.build_flags}
   -D WLED_DISABLE_ADALIGHT     ;; disables serial protocols when using CDC USB (Serial RX will receive junk commands, unless its pulled down by resistor)
   -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0
   -D SERVERNAME='"WLED-S2"'
-  -DBOARD_HAS_PSRAM -D WLED_USE_PSRAM_JSON ;; -D WLED_USE_PSRAM
+  -DBOARD_HAS_PSRAM ;; -D WLED_USE_PSRAM
+  -D WLED_USE_PSRAM_JSON -DALL_JSON_TO_PSRAM ; WLEDMM --> force all JSON stuff into PSRAM; gives more free heap
   -D WLED_DISABLE_LOXONE  ;;  FLASH 1272 bytes
   -D WLED_DISABLE_HUESYNC ;;   RAM 122 bytes; FLASH  6308 bytes
   -D WLED_DISABLE_ALEXA ;;     RAM 116 bytes; FLASH 13524 bytes
@@ -2214,7 +2224,8 @@ build_flags = ${common.build_flags} ${esp32s2.build_flags}
   ${common_mm.build_flags_S} ${common_mm.build_flags_M}
   -Wno-misleading-indentation -Wno-format-truncation
   -D WLED_RELEASE_NAME=esp32s2_4MB_M
-  -DBOARD_HAS_PSRAM -D WLED_USE_PSRAM_JSON ;; -D WLED_USE_PSRAM
+  -DBOARD_HAS_PSRAM ;; -D WLED_USE_PSRAM
+  -D WLED_USE_PSRAM_JSON -DALL_JSON_TO_PSRAM ; WLEDMM --> force all JSON stuff into PSRAM; gives more free heap
   -DLOLIN_WIFI_FIX -DWLEDMM_WIFI_POWERON_HACK ;; seems to work much better with this
   -DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=1
   -D WLED_DISABLE_ADALIGHT     ;; disables serial protocols, as the board only has CDC USB
diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index 73e5e8d8..e6b62c1a 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -404,22 +404,6 @@ void WLED::loop()
   #endif
 #endif
 
-#if 0 && defined(ALL_JSON_TO_PSRAM) && defined(WLED_USE_PSRAM_JSON)
-// WLEDMM experiment - JSON garbagecollect once per minute. Warning: may crash at random
-  static unsigned long last_gc_time = 0;
-  // try once in 60 seconds
-  if ((millis() - last_gc_time) > 60000) {
-    // look for a perfect moment -> make sure no strip or segments or presets activity, no configs being updated, no realtime external control
-    if (!suspendStripService && !doInitBusses && !doReboot && !doCloseFile && !realtimeMode && !loadLedmap && !presetsActionPending()) {
-      // make sure JSON buffer is not in use
-      if ( (doSerializeConfig == false) && (jsonBufferLock == 0) && (fileDoc == nullptr)) {
-        USER_PRINTLN(F("JSON gabage collection (regular)."));
-        doc.garbageCollect();                   // WLEDMM experimental - trigger garbage collection on JSON doc memory pool.
-                                                // this will make any pending reference to JSON objects _invalid_
-        last_gc_time = millis();
-  } } }
-#endif
-
 }
 
 #if defined(ARDUINO_ARCH_ESP32) && defined(WLEDMM_FASTPATH)
@@ -656,7 +640,7 @@ void WLED::setup()
   pinManager.allocatePin(2, true, PinOwner::DMX);
 #endif
 
-#if defined(ALL_JSON_TO_PSRAM) && defined(WLED_USE_PSRAM_JSON)
+#if defined(ALL_JSON_TO_PSRAM) && (defined(WLED_USE_PSRAM_JSON) || defined(WLED_USE_PSRAM))
   USER_PRINTLN(F("JSON gabage collection (initial)."));
   doc.garbageCollect();   // WLEDMM experimental - this seems to move the complete doc[] into PSRAM
 #endif
diff --git a/wled00/wled.h b/wled00/wled.h
index 781a55e6..b38c42e9 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -809,7 +809,7 @@ WLED_GLOBAL int8_t spi_sclk  _INIT(HW_PIN_CLOCKSPI);
 #endif
 
 // global ArduinoJson buffer
-#if defined(ALL_JSON_TO_PSRAM) && defined(WLED_USE_PSRAM_JSON)
+#if defined(ALL_JSON_TO_PSRAM) && (defined(WLED_USE_PSRAM_JSON) || defined(WLED_USE_PSRAM))
 // WLEDMM experimental : always use dynamic JSON
   #ifndef WLED_DEFINE_GLOBAL_VARS
   WLED_GLOBAL PSRAMDynamicJsonDocument doc;