From 67d777f474aee1a60416bd5b52e517278d7f8da8 Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Wed, 17 Jul 2024 14:33:23 -0400
Subject: [PATCH 001/232] 2D Effect Snow Fall Added

---
 wled00/FX.cpp | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++
 wled00/FX.h   |   3 +-
 2 files changed, 117 insertions(+), 1 deletion(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 1ea7f2ac..d0dcc920 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5367,6 +5367,120 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
 } // mode_2Dgameoflife()
 static const char _data_FX_MODE_2DGAMEOFLIFE[] PROGMEM = "Game Of Life@!,Color Mutation ☾,Blur ☾,,,All Colors ☾,Overlay BG ☾,Wrap ☾,;!,!;!;2;sx=56,ix=2,c1=128,o1=0,o2=0,o3=1"; 
 
+/////////////////////////
+//     2D SnowFall     //
+/////////////////////////
+
+uint16_t mode_2DSnowFall(void) { // By: Brandon Butler
+  // Uses Game of Life style bit array to track snow/particles
+  if (!strip.isMatrix) return mode_static(); // Not a 2D set-up
+  const uint16_t cols = SEGMENT.virtualWidth();
+  const uint16_t rows = SEGMENT.virtualHeight();
+  const size_t dataSize = (SEGMENT.length() + 7) / 8; // Round up to nearest byte
+  
+  if (!SEGENV.allocateData(dataSize)) return mode_static(); // Allocation failed
+  byte *grid = reinterpret_cast<byte*>(SEGENV.data);
+  
+  bool overlay = SEGMENT.check2; // Overlay is inverted. Only draws non-snow. Layer 1 controls snow color
+  uint32_t bgColor = SEGCOLOR(1);
+
+  if (SEGENV.call == 0) {
+    SEGMENT.setUpLeds();
+    SEGMENT.fill(bgColor);
+    SEGENV.aux0 = 0; // Overflow value
+    memset(grid, 0, dataSize);
+  }
+
+  // Draw non snow for inverted overlay
+  if (overlay) {
+    for (int x = 0; x < cols; x++) for (int y = 0; y < rows; y++) {
+      if (!getBitValue(grid, y * cols + x)) SEGMENT.setPixelColorXY(x, y, bgColor);
+    }
+  }
+   
+  uint8_t speed = map(SEGMENT.speed, 0, 255, 0, 60);                      // Updates per second
+  if (!speed || strip.now - SEGENV.step < 1000 / speed) return FRAMETIME; // Not enough time passed
+
+  uint8_t blur = map(SEGMENT.custom2, 0, 255, 255, 0);
+  uint8_t sway = SEGMENT.custom3;
+
+  // Despawn snow
+  bool overflow = SEGENV.aux0 && SEGMENT.check3;
+  int despawnChance = SEGMENT.custom1 == 255 ? 256 : map(SEGMENT.custom1, 0, 255, 0, 100); // 255 goes to 256, allows always despawn
+  int y = rows - 1;
+  for (int x = 0; x < cols; x++) {
+    if (overflow || random8() < despawnChance) setBitValue(grid, y * cols + x, 0);
+    if (overlay  || getBitValue(grid, y * cols + x)) continue; // Skip drawing if inverted overlay or snow
+    SEGMENT.blendPixelColorXY(x, y, bgColor, blur);
+  }
+  if (SEGENV.aux0) --SEGENV.aux0; // Decrease overflow 
+
+  // Precompute shuffled indices, helps randomize snow movement
+  int shuffledIndices[cols];
+  for (int i = 0; i < cols; i++) shuffledIndices[i] = i;
+  std::random_shuffle(shuffledIndices, shuffledIndices + cols);
+
+  // Update snow, loop from 2nd bottom row to top with precomputed random order
+  for (int y = rows - 2; y >= 0; y--) {
+    for (int i = 0; i < cols; i++) {
+      int x = shuffledIndices[i];
+
+      int pos = XY(x, y);
+
+      uint32_t xyColor = SEGMENT.getPixelColorXY(x, y); // Limit getPixelColorXY calls
+      if (!getBitValue(grid, pos)) { // No snow, fade if needed and skip
+        if (!overlay && blur) SEGMENT.setPixelColorXY(x, y, color_blend(xyColor, bgColor, blur));
+        continue;
+      }
+
+      int newX = x, newY = y + 1;
+      int newPos = XY(newX, newY);
+      // Open Position Booleans
+      bool down      = !getBitValue(grid, newPos);
+      bool downLeft  = x > 0 && !getBitValue(grid, newPos - 1);
+      bool downRight = x < cols - 1 && !getBitValue(grid, newPos + 1);
+
+      if (!down) { 
+        if (downLeft && downRight) newX = random8(2) ? x - 1 : x + 1;
+        else if (downLeft)  newX = x - 1;
+        else if (downRight) newX = x + 1;   
+        else                newY = y; // Snow is stuck
+      }
+      else if (sway && random8(30) < sway) { // Sway falling snow if horizontal and diagonal directions are open
+        if      (x % 2 == 1 && downLeft  && !getBitValue(grid, pos - 1)) newX = x - 1; // Odd  Columns Move Left
+        else if (x % 2 == 0 && downRight && !getBitValue(grid, pos + 1)) newX = x + 1; // Even Columns Move Right
+      }
+        
+      if (newY == y && newX == x) continue; // Snow didn't move. Don't update grid or pixels
+        
+      setBitValue(grid, pos, 0);            // Clear old
+      setBitValue(grid, XY(newX, newY), 1); // Set new
+
+      if (overlay) continue; // Skip drawing if inverted overlay
+      
+      SEGMENT.setPixelColorXY(newX, newY, xyColor);                       // Draw new
+      SEGMENT.setPixelColorXY(x, y, color_blend(xyColor, bgColor, blur)); // Fade old
+    }
+  }
+
+  // Spawn snow
+  int spawnChance = map(SEGMENT.intensity, 0, 255, 0, 100);
+  for (int x = 0; x < cols; x++) { // y = 0
+    if (random8() >= spawnChance) continue;
+    if (getBitValue(grid, x)) {SEGENV.aux0 = rows; continue;} // Snow exists, overflowing
+
+    setBitValue(grid, x, 1); // Spawn snow
+    if (overlay) continue;   // Skip drawing if inverted overlay
+
+    if (SEGMENT.check1) SEGMENT.setPixelColorXY(x, 0, ColorFromPalette(SEGPALETTE, random8())); // Use palette
+    else {int c = random8(80,200); SEGMENT.setPixelColorXY(x, 0, c, c, c);}                     // Use snow color
+  }
+  
+  SEGENV.step = strip.now;
+  return FRAMETIME;
+} // mode_2DSnowFall()
+static const char _data_FX_MODE_2DSNOWFALL[] PROGMEM = "Snow Fall@!,Spawn Rate,Despawn Rate,Blur,Sway Chance,Use Palette,Inverted Overlay,Prevent Overflow,;!,!;!;2;sx=128,ix=16,c1=17,c2=0,c3=0,o1=0,o2=0,o3=1";
+
 /////////////////////////
 //     2D Hiphotic     //
 /////////////////////////
@@ -8792,6 +8906,7 @@ void WS2812FX::setupEffectData() {
   addEffect(FX_MODE_2DSOAP, &mode_2Dsoap, _data_FX_MODE_2DSOAP);
   addEffect(FX_MODE_2DOCTOPUS, &mode_2Doctopus, _data_FX_MODE_2DOCTOPUS);
   addEffect(FX_MODE_2DWAVINGCELL, &mode_2Dwavingcell, _data_FX_MODE_2DWAVINGCELL);
+  addEffect(FX_MODE_2DSNOWFALL, &mode_2DSnowFall, _data_FX_MODE_2DSNOWFALL);
 
   addEffect(FX_MODE_2DAKEMI, &mode_2DAkemi, _data_FX_MODE_2DAKEMI); // audio
 
diff --git a/wled00/FX.h b/wled00/FX.h
index af707b41..15d3436a 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -349,8 +349,9 @@ bool strip_uses_global_leds(void);              // WLEDMM implemented in FX_fcn.
 // #define FX_MODE_PALETTE_AR             193 // WLED-SR audioreactive palette
 #define FX_MODE_FIREWORKS_AR           194 // WLED-SR audioreactive fireworks
 #define FX_MODE_GEQLASER                  195 // WLED-MM GEQ Laser
+#define FX_MODE_2DSNOWFALL             196 // WLED-MM Snowfall
 
-#define MODE_COUNT                     196
+#define MODE_COUNT                     197
 
 typedef enum mapping1D2D {
   M12_Pixels = 0,

From e759c4bd16f435465802e0cc388094926e3a50a5 Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Wed, 17 Jul 2024 14:34:17 -0400
Subject: [PATCH 002/232] blendPixelColor Shortcut

Don't call color_blend if not needed.
---
 wled00/FX_2Dfcn.cpp | 3 ++-
 wled00/FX_fcn.cpp   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 83ec0f54..eb1c5aee 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -403,7 +403,8 @@ uint32_t IRAM_ATTR_YN Segment::getPixelColorXY(int x, int y) {
 
 // Blends the specified color with the existing pixel color.
 void Segment::blendPixelColorXY(uint16_t x, uint16_t y, uint32_t color, uint8_t blend) {
-  setPixelColorXY(x, y, color_blend(getPixelColorXY(x,y), color, blend));
+  if (blend == UINT8_MAX) setPixelColorXY(x, y, color);
+  else setPixelColorXY(x, y, color_blend(getPixelColorXY(x,y), color, blend));
 }
 
 // Adds the specified color with the existing pixel color perserving color balance.
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 65849ff1..8cf35b7d 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -1362,7 +1362,8 @@ void Segment::fill(uint32_t c) {
 
 // Blends the specified color with the existing pixel color.
 void Segment::blendPixelColor(int n, uint32_t color, uint8_t blend) {
-  setPixelColor(n, color_blend(getPixelColor(n), color, blend));
+  if (blend == UINT8_MAX) setPixelColor(n, color); 
+  else setPixelColor(n, color_blend(getPixelColor(n), color, blend));
 }
 
 // Adds the specified color with the existing pixel color perserving color balance.

From 9500f7badf144a0abc8e658a8af59e43505a513c Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Wed, 17 Jul 2024 18:04:51 -0400
Subject: [PATCH 003/232] Snow Fall - Drawing change

Fixes snow disappearing due to auto brightness limiter (?)  by redrawing stuck snow.
---
 wled00/FX.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index d0dcc920..2f79662e 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5451,15 +5451,12 @@ uint16_t mode_2DSnowFall(void) { // By: Brandon Butler
         else if (x % 2 == 0 && downRight && !getBitValue(grid, pos + 1)) newX = x + 1; // Even Columns Move Right
       }
         
-      if (newY == y && newX == x) continue; // Snow didn't move. Don't update grid or pixels
-        
-      setBitValue(grid, pos, 0);            // Clear old
-      setBitValue(grid, XY(newX, newY), 1); // Set new
-
-      if (overlay) continue; // Skip drawing if inverted overlay
-      
-      SEGMENT.setPixelColorXY(newX, newY, xyColor);                       // Draw new
-      SEGMENT.setPixelColorXY(x, y, color_blend(xyColor, bgColor, blur)); // Fade old
+      if (newY != y || newX != x) { // Snow moved
+        setBitValue(grid, pos, 0);            // Clear old
+        setBitValue(grid, XY(newX, newY), 1); // Set new
+        if (!overlay) SEGMENT.setPixelColorXY(x, y, color_blend(xyColor, bgColor, blur)); // Fade old
+      } 
+      if (!overlay) SEGMENT.setPixelColorXY(newX, newY, xyColor); // Draw new / redraw stuck
     }
   }
 

From c2adb5be34240183678e2db64477b08d6c3596c2 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Mon, 9 Sep 2024 18:47:49 -0400
Subject: [PATCH 004/232] HUB75 PSRAM Buffers

---
 wled00/bus_manager.cpp | 41 +++++++++++++++++++++++++++++++++++++++++
 wled00/bus_manager.h   |  2 +-
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 5f10ec77..a214e901 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -588,6 +588,29 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   mxconfig.gpio.d = 35;
   mxconfig.gpio.e = 21;
 
+#elif defined(CONFIG_IDF_TARGET_ESP32S3) && defined(HUB75_TROYHACKS) // ESP32-S3
+
+  // TroyHacks HUB75
+
+  USER_PRINTLN("MatrixPanel_I2S_DMA - TroyHacks with PSRAM");
+
+  mxconfig.gpio.r1 =  1;
+  mxconfig.gpio.g1 =  2;
+  mxconfig.gpio.b1 =  42;
+  // 4th pin is GND
+  mxconfig.gpio.r2 =  41;
+  mxconfig.gpio.g2 =  40;
+  mxconfig.gpio.b2 =  39;
+  mxconfig.gpio.e =   38;
+  mxconfig.gpio.a =   45;
+  mxconfig.gpio.b =   48;
+  mxconfig.gpio.c =   47;
+  mxconfig.gpio.d =   21;   // this says GND but should be the "D" pin
+  mxconfig.gpio.clk = 20;
+  mxconfig.gpio.lat = 19;
+  mxconfig.gpio.oe  = 0;
+  // 16th pin is GND
+
 #elif defined(CONFIG_IDF_TARGET_ESP32S3) // ESP32-S3
 
   // Huidu HD-WF2 ESP32-S3
@@ -704,6 +727,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
 #endif
 
+  mxconfig.clkphase = false;
   mxconfig.chain_length = max((u_int8_t) 1, min(bc.pins[0], (u_int8_t) 4)); // prevent bad data preventing boot due to low memory
 
   USER_PRINTF("MatrixPanel_I2S_DMA config - %ux%u length: %u\n", mxconfig.mx_width, mxconfig.mx_height, mxconfig.chain_length);
@@ -750,7 +774,16 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
     if (_ledBuffer) free(_ledBuffer);                 // should not happen
     if (_ledsDirty) free(_ledsDirty);                 // should not happen
+
+    #if defined(ARDUINO_ARCH_ESP32) && defined(BOARD_HAS_PSRAM) && defined(WLED_USE_PSRAM)
+    if (psramFound()){
+      _ledsDirty = (byte*) ps_malloc(getBitArrayBytes(_len));  // create LEDs dirty bits
+    } else {
+      _ledsDirty = (byte*) malloc(getBitArrayBytes(_len));  // create LEDs dirty bits
+    }
+    #else
     _ledsDirty = (byte*) malloc(getBitArrayBytes(_len));  // create LEDs dirty bits
+    #endif
 
     if (_ledsDirty == nullptr) {
       display->stopDMAoutput();
@@ -762,7 +795,15 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
     setBitArray(_ledsDirty, _len, false);             // reset dirty bits
 
     if (mxconfig.double_buff == false) {
+      #if defined(ARDUINO_ARCH_ESP32) && defined(BOARD_HAS_PSRAM) && defined(WLED_USE_PSRAM)
+      if (psramFound()){
+        _ledBuffer = (CRGB*) ps_calloc(_len, sizeof(CRGB));  // create LEDs buffer (initialized to BLACK)
+      } else {
+        _ledBuffer = (CRGB*) calloc(_len, sizeof(CRGB));  // create LEDs buffer (initialized to BLACK)
+      }
+      #else
       _ledBuffer = (CRGB*) calloc(_len, sizeof(CRGB));  // create LEDs buffer (initialized to BLACK)
+      #endif
     }
   }
   
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 2379f430..b3360881 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -360,7 +360,7 @@ class BusHub75Matrix : public Bus {
   public:
     BusHub75Matrix(BusConfig &bc);
 
-    uint16_t getMaxPixels() const override { return 4096; };
+    uint16_t getMaxPixels() const override { return MAX_LEDS; };
 
     bool hasRGB() const override { return true; }
     bool hasWhite() const override { return false; }

From 3ee05a74b4263c15a9a6520e356840ae6e55cda5 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Tue, 10 Sep 2024 15:11:17 -0400
Subject: [PATCH 005/232] PSRAM buffer fixes as per SoftHack007

---
 wled00/bus_manager.cpp | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index bbae989d..a29ae468 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -719,7 +719,12 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
 #endif
 
-  mxconfig.clkphase = false;
+  // mxconfig.double_buff = true; // <------------- Turn on double buffer
+  // mxconfig.driver = HUB75_I2S_CFG::ICN2038S;  // experimental - use specific shift register driver
+  // mxconfig.latch_blanking = 3;
+  // mxconfig.i2sspeed = HUB75_I2S_CFG::HZ_10M;  // experimental - 5MHZ should be enugh, but colours looks slightly better at 10MHz
+  // mxconfig.min_refresh_rate = 90;
+  mxconfig.clkphase = false; // can help in case that the leftmost column is invisible, or pixels on the right side "bleeds out" to the left.
   mxconfig.chain_length = max((u_int8_t) 1, min(bc.pins[0], (u_int8_t) 4)); // prevent bad data preventing boot due to low memory
 
   USER_PRINTF("MatrixPanel_I2S_DMA config - %ux%u length: %u\n", mxconfig.mx_width, mxconfig.mx_height, mxconfig.chain_length);
@@ -769,15 +774,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
     if (_ledBuffer) free(_ledBuffer);                 // should not happen
     if (_ledsDirty) free(_ledsDirty);                 // should not happen
 
-    #if defined(ARDUINO_ARCH_ESP32) && defined(BOARD_HAS_PSRAM) && defined(WLED_USE_PSRAM)
-    if (psramFound()){
-      _ledsDirty = (byte*) ps_malloc(getBitArrayBytes(_len));  // create LEDs dirty bits
-    } else {
-      _ledsDirty = (byte*) malloc(getBitArrayBytes(_len));  // create LEDs dirty bits
-    }
-    #else
     _ledsDirty = (byte*) malloc(getBitArrayBytes(_len));  // create LEDs dirty bits
-    #endif
 
     if (_ledsDirty == nullptr) {
       display->stopDMAoutput();
@@ -789,7 +786,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
     setBitArray(_ledsDirty, _len, false);             // reset dirty bits
 
     if (mxconfig.double_buff == false) {
-      #if defined(ARDUINO_ARCH_ESP32) && defined(BOARD_HAS_PSRAM) && defined(WLED_USE_PSRAM)
+      #if defined(CONFIG_IDF_TARGET_ESP32S3) && defined(BOARD_HAS_PSRAM) && defined(WLED_USE_PSRAM) && defined(CONFIG_SPIRAM_MODE_OCT)
       if (psramFound()){
         _ledBuffer = (CRGB*) ps_calloc(_len, sizeof(CRGB));  // create LEDs buffer (initialized to BLACK)
       } else {

From 645b45a22d8540ca7203f2cea605e6b952a17a17 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Mon, 16 Sep 2024 14:19:06 -0400
Subject: [PATCH 006/232] Added WLEDMM_NO_MAP_RESET

Allows use of ledmaps with segments without messing with the segments. LEDs can remain remapped even with segments on top of them. (For Dom)
---
 wled00/FX_fcn.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 1f086fe0..95e0028c 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -2558,6 +2558,7 @@ bool WS2812FX::deserializeMap(uint8_t n) {
     uint16_t maxHeight = atoi(cleanUpName(fileName));
     //DEBUG_PRINTF(" (\"height\": %s) \n", fileName)
 
+    #ifndef WLEDMM_NO_MAP_RESET
     //WLEDMM: support ledmap file properties width and height: if found change segment
     if (maxWidth * maxHeight > 0) {
       Segment::maxWidth = maxWidth;
@@ -2566,6 +2567,7 @@ bool WS2812FX::deserializeMap(uint8_t n) {
     }
     else
       setUpMatrix(); //reset segment sizes to panels
+    #endif
   }
 
   USER_PRINTF("deserializeMap %d x %d\n", Segment::maxWidth, Segment::maxHeight);

From 9fc279a3a6b5bd7ba4f2d70d6e5e2968f7b203bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Kristan?= <blaz@kristan-sp.si>
Date: Sat, 14 Sep 2024 22:51:19 +0200
Subject: [PATCH 007/232] Merge pull request #4142 from
 willmmiles/fix-webserver-pin

Fix AsyncWebServer version pin
---
 platformio.ini | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index b5b93187..34b118e7 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -248,7 +248,7 @@ lib_deps =
     ;;makuna/NeoPixelBus @ 2.7.5 ;; WLEDMM will be added in board specific sections
     ;;https://github.com/Aircoookie/ESPAsyncWebServer.git @ ~2.0.7
     ;; https://github.com/lost-hope/ESPAsyncWebServer.git#master  ;; WLEDMM to display .log and .wled files in /edit
-    https://github.com/Aircoookie/ESPAsyncWebServer.git @ 2.2.1  ;; newer with bugfixes and stability improvements
+    https://github.com/Aircoookie/ESPAsyncWebServer.git#v2.2.1  ;; newer with bugfixes and stability improvements
   #For use of the TTGO T-Display ESP32 Module with integrated TFT display uncomment the following line
     #TFT_eSPI
   #For compatible OLED display uncomment following
@@ -297,6 +297,37 @@ lib_deps =
   makuna/NeoPixelBus @ 2.7.5
   ${env.lib_deps}
 
+;; compatibilty flags - same as 0.14.0 which seems to work better on some 8266 boards. Not using PIO_FRAMEWORK_ARDUINO_MMU_CACHE16_IRAM48
+build_flags_compat =
+  -DESP8266
+  -DFP_IN_IROM
+  ;;-Wno-deprecated-declarations
+  -Wno-misleading-indentation
+  ;;-Wno-attributes ;; silence warnings about unknown attribute 'maybe_unused' in NeoPixelBus
+  -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703
+  -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH
+  -DVTABLES_IN_FLASH
+  -DMIMETYPE_MINIMAL
+  -DWLED_SAVE_IRAM ;; needed to prevent linker error
+
+;; this platform version was used for WLED 0.14.0
+platform_compat = espressif8266@4.2.0
+platform_packages_compat =
+                    platformio/toolchain-xtensa @ ~2.100300.220621 #2.40802.200502
+                    platformio/tool-esptool #@ ~1.413.0
+                    platformio/tool-esptoolpy #@ ~1.30000.0
+
+;; experimental - for using older NeoPixelBus 2.7.9
+lib_deps_compat =
+  ESPAsyncTCP @ 1.2.2
+  ESPAsyncUDP
+  ESP8266PWM
+  fastled/FastLED @ 3.6.0
+  IRremoteESP8266 @ 2.8.2
+  makuna/NeoPixelBus @ 2.7.9
+  https://github.com/Aircoookie/ESPAsyncWebServer.git#v2.2.1
+
+
 [esp32]
 #platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.2.3/platform-espressif32-2.0.2.3.zip
 platform = espressif32@3.5.0

From 08c2446f61ce8f8d185f83ed2b96f42f53b46039 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 17 Sep 2024 18:11:06 +0200
Subject: [PATCH 008/232] better PSRAM flags handling (minor)

in MM, we can have WLED_USE_PSRAM_JSON instead of WLED_USE_PSRAM.
---
 wled00/bus_manager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index a29ae468..0811ea5d 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -786,8 +786,8 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
     setBitArray(_ledsDirty, _len, false);             // reset dirty bits
 
     if (mxconfig.double_buff == false) {
-      #if defined(CONFIG_IDF_TARGET_ESP32S3) && defined(BOARD_HAS_PSRAM) && defined(WLED_USE_PSRAM) && defined(CONFIG_SPIRAM_MODE_OCT)
-      if (psramFound()){
+      #if defined(CONFIG_IDF_TARGET_ESP32S3) && CONFIG_SPIRAM_MODE_OCT && defined(BOARD_HAS_PSRAM) && (defined(WLED_USE_PSRAM) || defined(WLED_USE_PSRAM_JSON))
+      if (psramFound()) {
         _ledBuffer = (CRGB*) ps_calloc(_len, sizeof(CRGB));  // create LEDs buffer (initialized to BLACK)
       } else {
         _ledBuffer = (CRGB*) calloc(_len, sizeof(CRGB));  // create LEDs buffer (initialized to BLACK)

From 22bd52198f16a5a2e560dd034a852be7cbbd9bcb Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sat, 21 Sep 2024 15:59:35 +0100
Subject: [PATCH 009/232] Cleanup Hub75 config

---
 wled00/bus_manager.cpp | 51 ++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 0811ea5d..2c5f0b37 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -525,10 +525,32 @@ void BusNetwork::cleanup() {
 BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWhite) {
 
   _valid = false;
-  mxconfig.double_buff = false; // default to off, known to cause issue with some effects but needs more memory
-
   fourScanPanel = nullptr;
 
+    mxconfig.double_buff = false; // Use our own memory-optimised buffer rather than the driver's own double-buffer  
+ 
+  // mxconfig.driver = HUB75_I2S_CFG::ICN2038S;  // experimental - use specific shift register driver
+  // mxconfig.latch_blanking = 3;
+  // mxconfig.i2sspeed = HUB75_I2S_CFG::HZ_10M;  // experimental - 5MHZ should be enugh, but colours looks slightly better at 10MHz
+  // mxconfig.min_refresh_rate = 90;
+  mxconfig.clkphase = false; // can help in case that the leftmost column is invisible, or pixels on the right side "bleeds out" to the left.
+ 
+  // How many panels we have connected, cap at sane value
+  mxconfig.chain_length = max((u_int8_t) 1, min(bc.pins[0], (u_int8_t) 4)); // prevent bad data preventing boot due to low memory
+
+  #if defined(CONFIG_IDF_TARGET_ESP32S3) && defined(BOARD_HAS_PSRAM)
+  if(bc.pins[0] > 4) {
+    USER_PRINT("WARNING, chain limited to 4");
+  }
+  # else
+  // Disable this check if you are want to try bigger setups and accept you
+  // might need to do full erase to recover from memory relayed boot-loop if you push too far
+  if(mxconfig.mx_height >= 64 && (bc.pins[0] > 1)) {
+    USER_PRINT("WARNING, only single panel can be used of 64 pixel boards due to memory");
+    mxconfig.chain_length = 1;
+  }
+  #endif
+
   switch(bc.type) {
     case 101:
       mxconfig.mx_width = 32;
@@ -556,21 +578,12 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
       break;
   }
 
-  if(mxconfig.mx_height >= 64 && (bc.pins[0] > 1)) {
-    USER_PRINT("WARNING, only single panel can be used of 64 pixel boards due to memory");
-    mxconfig.chain_length = 1;
-  }
-
-  // mxconfig.driver   = HUB75_I2S_CFG::SHIFTREG;
-
 #if defined(ARDUINO_ADAFRUIT_MATRIXPORTAL_ESP32S3) // MatrixPortal ESP32-S3
 
   // https://www.adafruit.com/product/5778
 
   USER_PRINTLN("MatrixPanel_I2S_DMA - Matrix Portal S3 config");
 
-  //mxconfig.double_buff = true; // <------------- Turn on double buffer
-
   mxconfig.gpio.r1 = 42;
   mxconfig.gpio.g1 = 41;
   mxconfig.gpio.b1 = 40;
@@ -588,11 +601,9 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   mxconfig.gpio.d = 35;
   mxconfig.gpio.e = 21;
 
-#elif defined(CONFIG_IDF_TARGET_ESP32S3) && defined(HUB75_TROYHACKS) // ESP32-S3
+#elif defined(CONFIG_IDF_TARGET_ESP32S3) && defined(BOARD_HAS_PSRAM)// ESP32-S3
 
-  // TroyHacks HUB75
-
-  USER_PRINTLN("MatrixPanel_I2S_DMA - TroyHacks with PSRAM");
+  USER_PRINTLN("MatrixPanel_I2S_DMA - S3 with PSRAM");
 
   mxconfig.gpio.r1 =  1;
   mxconfig.gpio.g1 =  2;
@@ -719,14 +730,6 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
 #endif
 
-  // mxconfig.double_buff = true; // <------------- Turn on double buffer
-  // mxconfig.driver = HUB75_I2S_CFG::ICN2038S;  // experimental - use specific shift register driver
-  // mxconfig.latch_blanking = 3;
-  // mxconfig.i2sspeed = HUB75_I2S_CFG::HZ_10M;  // experimental - 5MHZ should be enugh, but colours looks slightly better at 10MHz
-  // mxconfig.min_refresh_rate = 90;
-  mxconfig.clkphase = false; // can help in case that the leftmost column is invisible, or pixels on the right side "bleeds out" to the left.
-  mxconfig.chain_length = max((u_int8_t) 1, min(bc.pins[0], (u_int8_t) 4)); // prevent bad data preventing boot due to low memory
-
   USER_PRINTF("MatrixPanel_I2S_DMA config - %ux%u length: %u\n", mxconfig.mx_width, mxconfig.mx_height, mxconfig.chain_length);
 
   // OK, now we can create our matrix object
@@ -996,7 +999,7 @@ int BusManager::add(BusConfig &bc) {
     busses[numBusses] = new BusHub75Matrix(bc);
     USER_PRINTLN("[BusHub75Matrix] ");
 #else
-    USER_PRINTLN("[unsupported! BusHub75Matrix] ");
+    USER_PRINTLN("[unsupported! BusHub75Matrix - add flag -D WLED_ENABLE_HUB75MATRIX] ");
     return -1;
 #endif
   } else if (IS_DIGITAL(bc.type)) {

From 2781be375f6458970416f91a98f2d28e49b1773c Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sat, 21 Sep 2024 16:52:32 +0100
Subject: [PATCH 010/232] Swap pins used for S3 with PSRAM to avoid conflict

---
 wled00/bus_manager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 2c5f0b37..287f3b51 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -617,8 +617,8 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   mxconfig.gpio.b =   48;
   mxconfig.gpio.c =   47;
   mxconfig.gpio.d =   21;   // this says GND but should be the "D" pin
-  mxconfig.gpio.clk = 20;
-  mxconfig.gpio.lat = 19;
+  mxconfig.gpio.clk = 18;
+  mxconfig.gpio.lat = 8;
   mxconfig.gpio.oe  = 0;
   // 16th pin is GND
 

From 24d2a43767dff331f3b388a10e21d122c7d9ce34 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sat, 21 Sep 2024 16:53:13 +0100
Subject: [PATCH 011/232] Enable HUB75 for esp32S3_8MB_PSRAM_M

---
 platformio.ini | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 34b118e7..05be0617 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1974,6 +1974,7 @@ board_build.flash_mode = qio ;; use "dio" if your board gets unstable with "qio"
 build_unflags = ${env:esp32S3_8MB_M.build_unflags}   ;; use the same as "normal" S3 buildenv
 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
   -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
@@ -1998,10 +1999,12 @@ build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-inden
   ; -D SR_DEBUG
   ; -D MIC_LOGGER
 lib_deps = ${esp32s3.lib_deps} ${common_mm.lib_deps_S}  ${common_mm.lib_deps_V4_M}
+     ${common_mm.HUB75_lib_deps}
+
 ;lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
 board_build.partitions = tools/WLED_ESP32_8MB.csv
-; RAM:   [====      ]  36.3% (used 118828 bytes from 327680 bytes)
-; Flash: [=======   ]  70.7% (used 1483465 bytes from 2097152 bytes)
+; RAM:   [==        ]  21.1% (used 69156 bytes from 327680 bytes)
+; Flash: [========  ]  75.9% (used 1591817 bytes from 2097152 bytes)
 
 ;; MM for ESP32-S3 boards - FASTPATH + optimize for speed
 [env:esp32S3_8MB_S]

From 095d18bca59bc076e441eba212b2917e96a640c8 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 21 Sep 2024 19:27:17 +0200
Subject: [PATCH 012/232] board definition for T7-S3 (LILYGO / TTGO)

---
 boards/lilygo-t7-s3.json | 47 ++++++++++++++++++++++++++++++++++++++++
 wled00/pin_manager.cpp   |  7 ++++++
 2 files changed, 54 insertions(+)
 create mode 100644 boards/lilygo-t7-s3.json

diff --git a/boards/lilygo-t7-s3.json b/boards/lilygo-t7-s3.json
new file mode 100644
index 00000000..4bf071fc
--- /dev/null
+++ b/boards/lilygo-t7-s3.json
@@ -0,0 +1,47 @@
+{
+    "build": {
+        "arduino":{
+            "ldscript": "esp32s3_out.ld",
+            "memory_type": "qio_opi",
+            "partitions": "default_16MB.csv"
+        },
+        "core": "esp32",
+        "extra_flags": [
+			"-DARDUINO_TTGO_T7_S3",
+            "-DBOARD_HAS_PSRAM",
+            "-DARDUINO_USB_MODE=1"
+        ],
+        "f_cpu": "240000000L",
+        "f_flash": "80000000L",
+        "flash_mode": "qio",
+        "hwids": [
+            [
+                "0X303A",
+                "0x1001"
+            ]
+        ],
+        "mcu": "esp32s3",
+        "variant": "esp32s3"
+    },
+    "connectivity": [
+        "wifi",
+        "bluetooth"
+    ],
+    "debug": {
+        "openocd_target": "esp32s3.cfg"
+    },
+    "frameworks": [
+        "arduino",
+        "espidf"
+    ],
+    "name": "LILYGO T3-S3",
+    "upload": {
+        "flash_size": "16MB",
+        "maximum_ram_size": 327680,
+        "maximum_size": 16777216,
+        "require_upload_port": true,
+        "speed": 921600
+    },
+    "url": "https://www.aliexpress.us/item/3256804591247074.html",
+    "vendor": "LILYGO"
+}
\ No newline at end of file
diff --git a/wled00/pin_manager.cpp b/wled00/pin_manager.cpp
index d1e7a18b..07b5d42d 100644
--- a/wled00/pin_manager.cpp
+++ b/wled00/pin_manager.cpp
@@ -120,6 +120,13 @@ String PinManagerClass::getPinSpecialText(int gpio) {  // special purpose PIN in
         if (gpio > 32 && gpio < 38)  return (F("(reserved) Octal PSRAM or Octal Flash"));
       #endif
       //if (gpio == 0 || gpio == 3 || gpio == 45 || gpio == 46) return (F("(strapping pin)"));
+      #ifdef ARDUINO_TTGO_T7_S3
+      // experimental: a few special pins of the T7-S3 board
+      if (gpio == 2) return  (F("(reserved) _VBAT voltage monitoring"));
+      if (gpio == 17) return (F("onboard LED"));
+      //if (gpio == 3) return  (F("(cross-connected to pin  3-1)")); // WLEDMM experimental
+      //if (gpio == 12) return (F("(cross-connected to pin 12-1)")); // WLEDMM experimental
+      #endif
 
     #elif defined(CONFIG_IDF_TARGET_ESP32S2)
       // ESP32-S2

From 569ba1c6267280fd3d246c38f618d50d6e78e8b2 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 21 Sep 2024 19:29:28 +0200
Subject: [PATCH 013/232] s3: better handling of PSRAM pins

---
 wled00/pin_manager.cpp | 16 ++++++++++------
 wled00/wled.cpp        | 12 +++++++++---
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/wled00/pin_manager.cpp b/wled00/pin_manager.cpp
index 07b5d42d..b9d90a7d 100644
--- a/wled00/pin_manager.cpp
+++ b/wled00/pin_manager.cpp
@@ -113,10 +113,8 @@ String PinManagerClass::getPinSpecialText(int gpio) {  // special purpose PIN in
   #ifdef ARDUINO_ARCH_ESP32
     #if defined(CONFIG_IDF_TARGET_ESP32S3)
       // ESP32-S3
-      if (gpio > 18 && gpio < 21) return (F("USB (CDC) / JTAG"));
-      #if !defined(BOARD_HAS_PSRAM)
-        if (gpio > 32 && gpio < 38)  return (F("(optional) Octal Flash or PSRAM"));
-      #else
+      if (gpio > 18 && gpio < 21) return (F("USB (CDC) or JTAG"));
+      #if CONFIG_SPIRAM_MODE_OCT && defined(BOARD_HAS_PSRAM)
         if (gpio > 32 && gpio < 38)  return (F("(reserved) Octal PSRAM or Octal Flash"));
       #endif
       //if (gpio == 0 || gpio == 3 || gpio == 45 || gpio == 46) return (F("(strapping pin)"));
@@ -136,7 +134,7 @@ String PinManagerClass::getPinSpecialText(int gpio) {  // special purpose PIN in
 
     #elif defined(CONFIG_IDF_TARGET_ESP32C3)
       // ESP32-C3
-      if (gpio > 17 && gpio < 20) return (F("USB (CDC) / JTAG"));
+      if (gpio > 17 && gpio < 20) return (F("USB (CDC) or JTAG"));
       //if (gpio == 2 || gpio == 8 || gpio == 9) return (F("(strapping pin)"));
 
     #else
@@ -737,12 +735,18 @@ bool PinManagerClass::isPinOk(byte gpio, bool output) const
   #if defined(CONFIG_IDF_TARGET_ESP32C3)
     // strapping pins: 2, 8, & 9
     if (gpio > 11 && gpio < 18) return false;     // 11-17 SPI FLASH
+    #if ARDUINO_USB_CDC_ON_BOOT == 1 || ARDUINO_USB_DFU_ON_BOOT == 1
     if (gpio > 17 && gpio < 20) return false;     // 18-19 USB-JTAG
+    #endif
   #elif defined(CONFIG_IDF_TARGET_ESP32S3)
     // 00 to 18 are for general use. Be careful about straping pins GPIO0 and GPIO3 - these may be pulled-up or pulled-down on your board.
+    #if ARDUINO_USB_CDC_ON_BOOT == 1 || ARDUINO_USB_DFU_ON_BOOT == 1
     if (gpio > 18 && gpio < 21) return false;     // 19 + 20 = USB-JTAG. Not recommended for other uses.
+    #endif
     if (gpio > 21 && gpio < 33) return false;     // 22 to 32: not connected + SPI FLASH
-    //if (gpio > 32 && gpio < 38) return false;     // 33 to 37: not available if using _octal_ SPI Flash or _octal_ PSRAM
+    // #if CONFIG_SPIRAM_MODE_OCT && defined(BOARD_HAS_PSRAM)
+    //   if (gpio > 32 && gpio < 38) return !psramFound(); // 33 to 37: not available if using _octal_ SPI Flash or _octal_ PSRAM
+    // #endif
     // 38 to 48 are for general use. Be careful about straping pins GPIO45 and GPIO46 - these may be pull-up or pulled-down on your board.
   #elif defined(CONFIG_IDF_TARGET_ESP32S2)
     // strapping pins: 0, 45 & 46
diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index 9d54631f..52eb569a 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -594,9 +594,11 @@ void WLED::setup()
 #if defined(ARDUINO_ARCH_ESP32) && defined(BOARD_HAS_PSRAM)
   //psramInit(); //WLEDMM?? softhack007: not sure if explicit init is really needed ... lets disable it here and see if that works
   #if defined(CONFIG_IDF_TARGET_ESP32S3)
-  // S3: reserve GPIO 33-37 for "octal" PSRAM
-  managed_pin_type pins[] = { {33, true}, {34, true}, {35, true}, {36, true}, {37, true} };
-  pinManager.allocateMultiplePins(pins, sizeof(pins)/sizeof(managed_pin_type), PinOwner::SPI_RAM);
+    #if CONFIG_SPIRAM_MODE_OCT && defined(BOARD_HAS_PSRAM)
+      // S3: reserve GPIO 33-37 for "octal" PSRAM
+      managed_pin_type pins[] = { {33, true}, {34, true}, {35, true}, {36, true}, {37, true} };
+      pinManager.allocateMultiplePins(pins, sizeof(pins)/sizeof(managed_pin_type), PinOwner::SPI_RAM);
+    #endif
   #elif defined(CONFIG_IDF_TARGET_ESP32S2)
   // S2: reserve GPIO 26-32 for PSRAM (may fail due to isPinOk() but that will also prevent other allocation)
   //managed_pin_type pins[] = { {26, true}, {27, true}, {28, true}, {29, true}, {30, true}, {31, true}, {32, true} };
@@ -815,7 +817,11 @@ void WLED::setup()
   USER_PRINTLN(F("\nGPIO\t| Assigned to\t\t| Info"));
   USER_PRINTLN(F("--------|-----------------------|------------"));
   for(int pinNr = 0; pinNr < WLED_NUM_PINS; pinNr++) { // 49 = highest PIN on ESP32-S3
+#if defined(CONFIG_IDF_TARGET_ESP32S3)
+    if((pinManager.isPinOk(pinNr, false)) || (pinNr > 18 && pinNr < 21)) {  // softhack007: list USB pins
+#else
     if(pinManager.isPinOk(pinNr, false)) {
+#endif
       //if ((!pinManager.isPinAllocated(pinNr)) && (pinManager.getPinSpecialText(pinNr).length() == 0)) continue;      // un-comment to hide no-name,unused GPIO pins
       bool is_inOut = pinManager.isPinOk(pinNr, true);
 #if 0 // for testing

From 80a2f2b85b096c49e6bc24dd4b317f9865b9e031 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 21 Sep 2024 19:41:51 +0200
Subject: [PATCH 014/232] minor corrections

* fix some override problems bus_manager (canShow() must not be const!!!)
* fixing some "comparing integer with different signedness" warnings
---
 wled00/FX_2Dfcn.cpp  |  6 +++---
 wled00/FX_fcn.cpp    | 18 +++++++++---------
 wled00/bus_manager.h | 28 ++++++++++++++--------------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 56d81443..ea5c4307 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -351,9 +351,9 @@ void IRAM_ATTR_YN Segment::setPixelColorXY(int x, int y, uint32_t col) //WLEDMM:
     return;
   }
 
-  const int_fast16_t glen_ = groupLength(); // WLEDMM optimization
-  const int_fast16_t wid_ =  width();
-  const int_fast16_t hei_ = height();
+  const uint_fast16_t glen_ = groupLength(); // WLEDMM optimization
+  const uint_fast16_t wid_ =  width();
+  const uint_fast16_t hei_ = height();
 
   x *= glen_; // expand to physical pixels
   y *= glen_; // expand to physical pixels
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 95e0028c..e2250a47 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -1413,12 +1413,12 @@ void __attribute__((hot)) Segment::fill(uint32_t c) {
       if (_bri_t < 255) scaled_col = color_fade(c, _bri_t);
     }
     // fill 2D segment
-    for(int y = 0; y < rows; y++) for (int x = 0; x < cols; x++) {
+    for(unsigned y = 0; y < rows; y++) for (unsigned x = 0; x < cols; x++) {
       if (simpleSegment) setPixelColorXY_fast(x, y, c, scaled_col, cols, rows);
       else setPixelColorXY_slow(x, y, c);
     }
   } else { // fill 1D strip
-    for (int x = 0; x < cols; x++) setPixelColor(x, c);
+    for (unsigned x = 0; x < cols; x++) setPixelColor(int(x), c);
   }
 }
 
@@ -1471,8 +1471,8 @@ void __attribute__((hot)) Segment::fade_out(uint8_t rate) {
   int g2 = G(color2);
   int b2 = B(color2);
 
-  for (int y = 0; y < rows; y++) for (int x = 0; x < cols; x++) {
-    uint32_t color = is2D() ? getPixelColorXY(x, y) : getPixelColor(x);
+  for (unsigned y = 0; y < rows; y++) for (unsigned x = 0; x < cols; x++) {
+    uint32_t color = is2D() ? getPixelColorXY(int(x), int(y)) : getPixelColor(int(x));
     if (color == color2) continue;  // WLEDMM speedup - pixel color = target color, so nothing to do
     int w1 = W(color);
     int r1 = R(color);
@@ -1492,8 +1492,8 @@ void __attribute__((hot)) Segment::fade_out(uint8_t rate) {
     uint32_t colorNew = RGBW32(r1 + rdelta, g1 + gdelta, b1 + bdelta, w1 + wdelta); // WLEDMM
 
     if (colorNew != color) {                                                        // WLEDMM speedup - do not repaint the same color
-      if (is2D()) setPixelColorXY(x, y, colorNew);
-      else        setPixelColor(x, colorNew);
+      if (is2D()) setPixelColorXY(int(x), int(y), colorNew);
+      else        setPixelColor(int(x), colorNew);
     }
   }
 }
@@ -1507,11 +1507,11 @@ void __attribute__((hot)) Segment::fadeToBlackBy(uint8_t fadeBy) {
 
   // WLEDMM minor optimization
   if(is2D()) {
-    for (int y = 0; y < rows; y++) for (int x = 0; x < cols; x++) {
-      uint32_t cc = getPixelColorXY(x,y);                            // WLEDMM avoid RGBW32 -> CRGB -> RGBW32 conversion
+    for (unsigned y = 0; y < rows; y++) for (unsigned x = 0; x < cols; x++) {
+      uint32_t cc = getPixelColorXY(int(x),int(y));                            // WLEDMM avoid RGBW32 -> CRGB -> RGBW32 conversion
       uint32_t cc2 = color_fade(cc, scaledown);                      // fade
       //if (cc2 != cc)                                               // WLEDMM only re-paint if faded color is different - disabled - causes problem with text overlay
-        setPixelColorXY((uint16_t)x, (uint16_t)y, cc2);
+        setPixelColorXY(int(x), int(y), cc2);
     }
   } else {
     for (uint_fast16_t x = 0; x < cols; x++) {
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index b3360881..b7a50cf0 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -65,7 +65,7 @@ struct BusConfig {
     else if (type > 47) nPins = 2;
     else if (type > 40 && type < 46) nPins = NUM_PWM_PINS(type);
     else if (type >= TYPE_HUB75MATRIX && type <= (TYPE_HUB75MATRIX + 10)) nPins = 0;
-    for (uint8_t i = 0; i < nPins; i++) pins[i] = ppins[i];
+    for (uint8_t i = 0; i < min(unsigned(nPins),5U); i++) pins[i] = ppins[i];   //softhack007 fix for potential array out-of-bounds access
   }
 
   //validates start and length and extends total if needed
@@ -135,21 +135,21 @@ class Bus {
     virtual void     setStatusPixel(uint32_t c) {}
     virtual void     setPixelColor(uint16_t pix, uint32_t c) = 0;
     virtual uint32_t getPixelColor(uint16_t pix) const { return 0; }
-    virtual void     setBrightness(uint8_t b, bool immediate=false) { _bri = b; };
+    virtual void     setBrightness(uint8_t b, bool immediate=false) { _bri = b; }
     virtual void     cleanup() = 0;
     virtual uint8_t  getPins(uint8_t* pinArray) const { return 0; }
-    virtual uint16_t getLength() const { return _len; }
+    virtual inline uint16_t getLength() const { return _len; }
     virtual void     setColorOrder() {}
     virtual uint8_t  getColorOrder() const { return COL_ORDER_RGB; }
-    virtual uint8_t  skippedLeds() { return 0; }
+    virtual uint8_t  skippedLeds() const { return 0; }
     virtual uint16_t getFrequency() const { return 0U; }
     inline  uint16_t getStart() const { return _start; }
     inline  void     setStart(uint16_t start) { _start = start; }
     inline  uint8_t  getType() const { return _type; }
     inline  bool     isOk() const { return _valid; }
     inline  bool     isOffRefreshRequired() const { return _needsRefresh; }
-            bool     containsPixel(uint16_t pix) const { return pix >= _start && pix < _start+_len; }
-    virtual uint16_t getMaxPixels() const { return MAX_LEDS_PER_BUS; };
+    //inline  bool     containsPixel(uint16_t pix) const { return pix >= _start && pix < _start+_len; } // WLEDMM not used, plus wrong - it does not consider skipped pixels
+    virtual uint16_t getMaxPixels() const { return MAX_LEDS_PER_BUS; }
 
     virtual bool hasRGB() const {
       if ((_type >= TYPE_WS2812_1CH && _type <= TYPE_WS2812_WWA) || _type == TYPE_ANALOG_1CH || _type == TYPE_ANALOG_2CH || _type == TYPE_ONOFF) return false;
@@ -207,7 +207,7 @@ class BusDigital : public Bus {
 
     inline void show();
 
-    bool canShow() const;
+    bool canShow() override;
 
     void setBrightness(uint8_t b, bool immediate);
 
@@ -215,13 +215,13 @@ class BusDigital : public Bus {
 
     void setPixelColor(uint16_t pix, uint32_t c);
 
-    uint32_t getPixelColor(uint16_t pix) const;
+    uint32_t getPixelColor(uint16_t pix) const override;
 
     uint8_t getColorOrder() const {
       return _colorOrder;
     }
 
-    uint16_t getLength() const {
+    uint16_t getLength() const override {
       return _len - _skip;
     }
 
@@ -229,11 +229,11 @@ class BusDigital : public Bus {
 
     void setColorOrder(uint8_t colorOrder);
 
-    uint8_t skippedLeds() const {
+    uint8_t skippedLeds() const override {
       return _skip;
     }
 
-    uint16_t getFrequency() const { return _frequencykHz; }
+    uint16_t getFrequency() const override { return _frequencykHz; }
 
     void reinit();
 
@@ -267,7 +267,7 @@ class BusPwm : public Bus {
 
     uint8_t getPins(uint8_t* pinArray) const;
 
-    uint16_t getFrequency() const { return _frequency; }
+    uint16_t getFrequency() const override { return _frequency; }
 
     void cleanup() {
       deallocatePins();
@@ -329,14 +329,14 @@ class BusNetwork : public Bus {
 
     void show();
 
-    bool canShow()  const {
+    bool canShow() override {
       // this should be a return value from UDP routine if it is still sending data out
       return !_broadcastLock;
     }
 
     uint8_t getPins(uint8_t* pinArray)  const;
 
-    uint16_t getLength()  const {
+    uint16_t getLength()  const override {
       return _len;
     }
 

From 087f156d35aa89185524f3fe039ef7446d120311 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sat, 21 Sep 2024 18:51:55 +0100
Subject: [PATCH 015/232] Reset ESP32-HUB75-MatrixPanel-DMA library version
 back to one with the S3_LCD_DIV_NUM fix

---
 platformio.ini | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 05be0617..57f0337d 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1071,10 +1071,7 @@ HUB75_build_flags =
   -D NO_FAST_FUNCTIONS ;; If you are not using AdafruitGFX than you probably do not need this either, save memory/code size
   -D NO_CIE1931 ;; Do not use LED brightness compensation described in CIE 1931. We use FastLED dimming already
   -D S3_LCD_DIV_NUM=20 ;; Attempt to fix wifi performance issue when panel active with S3 chips
-;; HUB75_lib_deps = https://github.com/mrcodetastic/ESP32-HUB75-MatrixPanel-DMA.git @ 3.0.11 ;; breaks the build (2024-07-30)
-;; HUB75_lib_deps = https://github.com/mrcodetastic/ESP32-HUB75-MatrixPanel-DMA.git#1e4c80a26454aca7b8129bd5a966b0af329d2703 ;; 3.0.10 - something strange is going on here ...
-;; HUB75_lib_deps = https://github.com/mrcodetastic/ESP32-HUB75-MatrixPanel-DMA.git#1e4c80a26454aca7b8129bd5a966b0af329d2703 ;; 3.0.10 - something strange is going on here ...
-HUB75_lib_deps = https://github.com/mrcodetastic/ESP32-HUB75-MatrixPanel-DMA.git#c4ecdcfeeb5aa668d92ddf3c3c74bc93316f6e10 ;;  3.0.11
+HUB75_lib_deps = https://github.com/mrcodetastic/ESP32-HUB75-MatrixPanel-DMA.git#aa28e2a9 ;; S3_LCD_DIV_NUM fix
 HUB75_lib_ignore = ESP32 HUB75 LED MATRIX PANEL DMA Display ;; to remove the HUB75 lib dependancy (saves a few bytes)
 
 NetDebug_build_flags =

From 3669946a09206816160aaf683672c481e276443c Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sat, 21 Sep 2024 18:54:38 +0100
Subject: [PATCH 016/232] Swap pins used for S3 to avoid gpio0

---
 wled00/bus_manager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 287f3b51..d0fc80fa 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -616,10 +616,10 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   mxconfig.gpio.a =   45;
   mxconfig.gpio.b =   48;
   mxconfig.gpio.c =   47;
-  mxconfig.gpio.d =   21;   // this says GND but should be the "D" pin
+  mxconfig.gpio.d =   21;
   mxconfig.gpio.clk = 18;
   mxconfig.gpio.lat = 8;
-  mxconfig.gpio.oe  = 0;
+  mxconfig.gpio.oe  = 3;
   // 16th pin is GND
 
 #elif defined(CONFIG_IDF_TARGET_ESP32S3) // ESP32-S3

From 28fe5cbd8b5eb70cc5eb725b1cf718ac5d9a1f3e Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 21 Sep 2024 20:04:06 +0200
Subject: [PATCH 017/232] forgot one

---
 wled00/bus_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index d0fc80fa..61cc90fb 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -162,7 +162,7 @@ void BusDigital::show() {
   PolyBus::show(_busPtr, _iType);
 }
 
-bool BusDigital::canShow() const {
+bool BusDigital::canShow() {
   return PolyBus::canShow(_busPtr, _iType);
 }
 

From e100a2d69a36b4f08bc7d76a44efa4909bcc1cc7 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 21 Sep 2024 20:07:52 +0200
Subject: [PATCH 018/232] switch off brightness reduction

this was added due to a recommendation from MrF (HUB75)  but it seems to work without, too.
---
 wled00/bus_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 61cc90fb..e0e875e3 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -885,7 +885,7 @@ uint32_t BusHub75Matrix::getPixelColor(uint16_t pix) const {
 
 void BusHub75Matrix::setBrightness(uint8_t b, bool immediate) {
   _bri = b;
-  if (_bri > 238) _bri=238;
+  // if (_bri > 238) _bri=238; // not strictly needed. Enable this line if you see glitches at highest brightness.
   display->setBrightness(_bri);
 }
 

From f1088bb5c0376e8a6d2e954cb5fda02694359db6 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 21 Sep 2024 20:41:05 +0200
Subject: [PATCH 019/232] (experimental) loop2 to get fresh audio just before
 drawing

* introducing usermod::loop2() - runs just before strip.service()
--> expecting to reduce lagging between audio and visual to an absolute minimum.
---
 usermods/audioreactive/audio_reactive.h |  5 +++++
 wled00/fcn_declare.h                    |  2 ++
 wled00/um_manager.cpp                   |  1 +
 wled00/wled.cpp                         | 13 +++++++++++++
 wled00/wled.h                           |  2 +-
 5 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index 709a5960..1c46e33a 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -2352,6 +2352,11 @@ class AudioReactive : public Usermod {
 #endif
     }
 
+#if defined(_MoonModules_WLED_) && defined(WLEDMM_FASTPATH)
+    void loop2(void) { 
+      loop();
+    }
+#endif
 
     bool getUMData(um_data_t **data)
     {
diff --git a/wled00/fcn_declare.h b/wled00/fcn_declare.h
index 09f9724b..31b82293 100644
--- a/wled00/fcn_declare.h
+++ b/wled00/fcn_declare.h
@@ -299,6 +299,7 @@ class Usermod {
     virtual ~Usermod() { if (um_data) delete um_data; }
     virtual void setup() = 0; // pure virtual, has to be overriden
     virtual void loop() = 0;  // pure virtual, has to be overriden
+    virtual void loop2() {}                                                  // WLEDMM called just before effects will be processed
     virtual void handleOverlayDraw() {}                                      // called after all effects have been processed, just before strip.show()
     virtual bool handleButton(uint8_t b) { return false; }                   // button overrides are possible here
     virtual bool getUMData(um_data_t **data) { if (data) *data = nullptr; return false; }; // usermod data exchange [see examples for audio effects]
@@ -329,6 +330,7 @@ class UsermodManager {
 
   public:
     void loop();
+    void loop2();   // WLEDMM loop just before drawing effects (presets and everything already handled)
     void handleOverlayDraw();
     bool handleButton(uint8_t b);
     bool getUMData(um_data_t **um_data, uint8_t mod_id = USERMOD_ID_RESERVED); // USERMOD_ID_RESERVED will poll all usermods
diff --git a/wled00/um_manager.cpp b/wled00/um_manager.cpp
index 2fe44db9..45647d60 100644
--- a/wled00/um_manager.cpp
+++ b/wled00/um_manager.cpp
@@ -9,6 +9,7 @@ void UsermodManager::connected()         { for (byte i = 0; i < numMods; i++) um
 void UsermodManager::loop()              { for (byte i = 0; i < numMods; i++) ums[i]->loop();  }
 void UsermodManager::handleOverlayDraw() { for (byte i = 0; i < numMods; i++) ums[i]->handleOverlayDraw(); }
 // void UsermodManager::appendConfigData()  { for (byte i = 0; i < numMods; i++) ums[i]->appendConfigData(); } //WLEDMM not used
+void UsermodManager::loop2()             { for (unsigned i = 0; i < numMods; i++) ums[i]->loop2(); }
 bool UsermodManager::handleButton(uint8_t b) {
   bool overrideIO = false;
   for (byte i = 0; i < numMods; i++) {
diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index 52eb569a..41e04d1a 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -213,6 +213,19 @@ void WLED::loop()
     handlePresets();
     yield();
 
+#if defined(_MoonModules_WLED_) && defined(WLEDMM_FASTPATH)
+    #ifdef WLED_DEBUG
+    unsigned long usermod2Millis = millis();
+    #endif
+    usermods.loop2();
+    #ifdef WLED_DEBUG
+    usermod2Millis = millis() - usermod2Millis;
+    avgUsermodMillis += usermod2Millis;
+    if (usermod2Millis > maxUsermodMillis) maxUsermodMillis = usermod2Millis;
+    #endif
+    yield();
+#endif
+
     #ifdef WLED_DEBUG
     unsigned long stripMillis = millis();
     #endif
diff --git a/wled00/wled.h b/wled00/wled.h
index 9bfd7dd1..82116ee6 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2409060
+#define VERSION 2409210
 
 // WLEDMM  - you can check for this define in usermods, to only enabled WLEDMM specific code in the "right" fork. Its not defined in AC WLED.
 #define _MoonModules_WLED_

From 18b35d11f8ed27cb507511ce7a6152ffb5d1089d Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 21 Sep 2024 20:42:03 +0200
Subject: [PATCH 020/232] usermod manager - small optimization

* use native types only (faster, smaller)
---
 wled00/fcn_declare.h  |  2 +-
 wled00/um_manager.cpp | 36 ++++++++++++++++++------------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/wled00/fcn_declare.h b/wled00/fcn_declare.h
index 31b82293..694e9c9f 100644
--- a/wled00/fcn_declare.h
+++ b/wled00/fcn_declare.h
@@ -326,7 +326,7 @@ class Usermod {
 class UsermodManager {
   private:
     Usermod* ums[WLED_MAX_USERMODS];
-    byte numMods = 0;
+    unsigned numMods = 0;
 
   public:
     void loop();
diff --git a/wled00/um_manager.cpp b/wled00/um_manager.cpp
index 45647d60..7c6153f5 100644
--- a/wled00/um_manager.cpp
+++ b/wled00/um_manager.cpp
@@ -4,50 +4,50 @@
  */
 
 //Usermod Manager internals
-void UsermodManager::setup()             { for (byte i = 0; i < numMods; i++) ums[i]->setup(); }
-void UsermodManager::connected()         { for (byte i = 0; i < numMods; i++) ums[i]->connected(); }
-void UsermodManager::loop()              { for (byte i = 0; i < numMods; i++) ums[i]->loop();  }
-void UsermodManager::handleOverlayDraw() { for (byte i = 0; i < numMods; i++) ums[i]->handleOverlayDraw(); }
-// void UsermodManager::appendConfigData()  { for (byte i = 0; i < numMods; i++) ums[i]->appendConfigData(); } //WLEDMM not used
+void UsermodManager::setup()             { for (unsigned i = 0; i < numMods; i++) ums[i]->setup(); }
+void UsermodManager::connected()         { for (unsigned i = 0; i < numMods; i++) ums[i]->connected(); }
+void UsermodManager::loop()              { for (unsigned i = 0; i < numMods; i++) ums[i]->loop();  }
 void UsermodManager::loop2()             { for (unsigned i = 0; i < numMods; i++) ums[i]->loop2(); }
+void UsermodManager::handleOverlayDraw() { for (unsigned i = 0; i < numMods; i++) ums[i]->handleOverlayDraw(); }
+// void UsermodManager::appendConfigData()  { for (unsigned i = 0; i < numMods; i++) ums[i]->appendConfigData(); } //WLEDMM not used
 bool UsermodManager::handleButton(uint8_t b) {
   bool overrideIO = false;
-  for (byte i = 0; i < numMods; i++) {
+  for (unsigned i = 0; i < numMods; i++) {
     if (ums[i]->handleButton(b)) overrideIO = true;
   }
   return overrideIO;
 }
 bool UsermodManager::getUMData(um_data_t **data, uint8_t mod_id) {
-  for (byte i = 0; i < numMods; i++) {
+  for (unsigned i = 0; i < numMods; i++) {
     if (mod_id > 0 && ums[i]->getId() != mod_id) continue;  // only get data form requested usermod if provided
     if (ums[i]->getUMData(data)) return true;               // if usermod does provide data return immediately (only one usermod can provide data at one time)
   }
   return false;
 }
-void UsermodManager::addToJsonState(JsonObject& obj)    { for (byte i = 0; i < numMods; i++) ums[i]->addToJsonState(obj); }
-void UsermodManager::addToJsonInfo(JsonObject& obj)     { for (byte i = 0; i < numMods; i++) ums[i]->addToJsonInfo(obj); }
-void UsermodManager::readFromJsonState(JsonObject& obj) { for (byte i = 0; i < numMods; i++) ums[i]->readFromJsonState(obj); }
-void UsermodManager::addToConfig(JsonObject& obj)       { for (byte i = 0; i < numMods; i++) ums[i]->addToConfig(obj); }
+void UsermodManager::addToJsonState(JsonObject& obj)    { for (unsigned i = 0; i < numMods; i++) ums[i]->addToJsonState(obj); }
+void UsermodManager::addToJsonInfo(JsonObject& obj)     { for (unsigned i = 0; i < numMods; i++) ums[i]->addToJsonInfo(obj); }
+void UsermodManager::readFromJsonState(JsonObject& obj) { for (unsigned i = 0; i < numMods; i++) ums[i]->readFromJsonState(obj); }
+void UsermodManager::addToConfig(JsonObject& obj)       { for (unsigned i = 0; i < numMods; i++) ums[i]->addToConfig(obj); }
 bool UsermodManager::readFromConfig(JsonObject& obj)    {
   bool allComplete = true;
-  for (byte i = 0; i < numMods; i++) {
+  for (unsigned i = 0; i < numMods; i++) {
     if (!ums[i]->readFromConfig(obj)) allComplete = false;
   }
   return allComplete;
 }
-void UsermodManager::onMqttConnect(bool sessionPresent) { for (byte i = 0; i < numMods; i++) ums[i]->onMqttConnect(sessionPresent); }
+void UsermodManager::onMqttConnect(bool sessionPresent) { for (unsigned i = 0; i < numMods; i++) ums[i]->onMqttConnect(sessionPresent); }
 bool UsermodManager::onMqttMessage(char* topic, char* payload) {
-  for (byte i = 0; i < numMods; i++) if (ums[i]->onMqttMessage(topic, payload)) return true;
+  for (unsigned i = 0; i < numMods; i++) if (ums[i]->onMqttMessage(topic, payload)) return true;
   return false;
 }
-void UsermodManager::onUpdateBegin(bool init) { for (byte i = 0; i < numMods; i++) ums[i]->onUpdateBegin(init); } // notify usermods that update is to begin
-void UsermodManager::onStateChange(uint8_t mode) { for (byte i = 0; i < numMods; i++) ums[i]->onStateChange(mode); } // notify usermods that WLED state changed
+void UsermodManager::onUpdateBegin(bool init) { for (unsigned i = 0; i < numMods; i++) ums[i]->onUpdateBegin(init); } // notify usermods that update is to begin
+void UsermodManager::onStateChange(uint8_t mode) { for (unsigned i = 0; i < numMods; i++) ums[i]->onStateChange(mode); } // notify usermods that WLED state changed
 
 /*
  * Enables usermods to lookup another Usermod.
  */
 Usermod* UsermodManager::lookup(uint16_t mod_id) {
-  for (byte i = 0; i < numMods; i++) {
+  for (unsigned i = 0; i < numMods; i++) {
     if (ums[i]->getId() == mod_id) {
       return ums[i];
     }
@@ -58,7 +58,7 @@ Usermod* UsermodManager::lookup(uint16_t mod_id) {
 //WLEDMM: used by Usermods in xml.cpp
 Usermod* UsermodManager::lookupName(const char *mod_name) {
   //WLEDMM: hack to get the usermod object with the mod_name (better would be to store the usermod name in the class but that requires change to all usermods)
-  for (byte i = 0; i < numMods; i++) {
+  for (unsigned i = 0; i < numMods; i++) {
     // StaticJsonDocument <1024> docx;
     JsonObject um = doc.createNestedObject("um"); //WLEDMM reuse the global doc variable here
 

From 3a638bb396b68d13d84867bf4342981eca645e76 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 22 Sep 2024 16:22:53 +0200
Subject: [PATCH 021/232] busmanger cannot handle more than 5 pins (hardcoded)

sizeof(pins)/sizeof(pins[0]) is the number of array elements in pins[].
---
 wled00/bus_manager.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index b7a50cf0..eb431333 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -54,7 +54,7 @@ struct BusConfig {
   uint8_t skipAmount;
   bool refreshReq;
   uint8_t autoWhite;
-  uint8_t pins[5] = {LEDPIN, 255, 255, 255, 255};
+  uint8_t pins[5] = {LEDPIN, 255, 255, 255, 255}; // WLEDMM warning: this means that BusConfig cannot handle nore than 5 pins per bus!
   uint16_t frequency;
   BusConfig(uint8_t busType, uint8_t* ppins, uint16_t pstart, uint16_t len = 1, uint8_t pcolorOrder = COL_ORDER_GRB, bool rev = false, uint8_t skip = 0, byte aw=RGBW_MODE_MANUAL_ONLY, uint16_t clock_kHz=0U) {
     refreshReq = (bool) GET_BIT(busType,7);
@@ -65,7 +65,7 @@ struct BusConfig {
     else if (type > 47) nPins = 2;
     else if (type > 40 && type < 46) nPins = NUM_PWM_PINS(type);
     else if (type >= TYPE_HUB75MATRIX && type <= (TYPE_HUB75MATRIX + 10)) nPins = 0;
-    for (uint8_t i = 0; i < min(unsigned(nPins),5U); i++) pins[i] = ppins[i];   //softhack007 fix for potential array out-of-bounds access
+    for (uint8_t i = 0; i < min(unsigned(nPins), sizeof(pins)/sizeof(pins[0])); i++) pins[i] = ppins[i];   //softhack007 fix for potential array out-of-bounds access
   }
 
   //validates start and length and extends total if needed

From ffc9ec3cfbd11034dd345add23cb8875c69279ca Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 22 Sep 2024 17:07:26 +0200
Subject: [PATCH 022/232] exclude HUB75 from auto brightness limiter

For a 64x64 panel, ABL assumes 4A of standby current. This does not make any sense.
---
 wled00/FX.h       |  1 +
 wled00/FX_fcn.cpp | 18 ++++++++++++++++--
 wled00/const.h    |  2 ++
 wled00/json.cpp   |  2 +-
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/wled00/FX.h b/wled00/FX.h
index a0f3e90f..505721c7 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -963,6 +963,7 @@ class WS2812FX {  // 96 bytes
       ablMilliampsMax,
       currentMilliamps,
       getLengthPhysical(void) const,
+      getLengthPhysical2(void) const, // WLEDMM total length including HUB75, network busses excluded
       __attribute__((pure)) getLengthTotal(void) const, // will include virtual/nonexistent pixels in matrix //WLEDMM attribute added
       getFps() const;
 
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index e2250a47..9e2368ab 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -1985,7 +1985,8 @@ void WS2812FX::estimateCurrentAndLimitBri() {
 
   for (uint_fast8_t bNum = 0; bNum < busses.getNumBusses(); bNum++) {
     Bus *bus = busses.getBus(bNum);
-    if (bus->getType() >= TYPE_NET_DDP_RGB) continue; //exclude non-physical network busses
+    auto btype = bus->getType();
+    if (EXCLUDE_FROM_ABL(btype)) continue; // WLEDMM exclude non-ABL and network busses
     uint16_t len = bus->getLength();
     uint32_t busPowerSum = 0;
     for (uint_fast16_t i = 0; i < len; i++) { //sum up the usage of each LED
@@ -2196,7 +2197,20 @@ uint16_t WS2812FX::getLengthPhysical(void) const {  // WLEDMM fast int types
   uint_fast16_t len = 0;
   for (unsigned b = 0; b < busses.getNumBusses(); b++) {   //  WLEDMM use native (fast) types
     Bus *bus = busses.getBus(b);
-    if (bus->getType() >= TYPE_NET_DDP_RGB) continue; //exclude non-physical network busses
+    auto btype = bus->getType();
+    if (EXCLUDE_FROM_ABL(btype)) continue;  //exclude HUB75, and non-physical network busses
+    len += bus->getLength();
+  }
+  return len;
+}
+
+//WLEDMM - getLengthPhysical plus plysical busses not supporting ABL (i.e. HUB75)
+uint16_t WS2812FX::getLengthPhysical2(void) const {
+  uint_fast16_t len = 0;
+  for (unsigned b = 0; b < busses.getNumBusses(); b++) {
+    Bus *bus = busses.getBus(b);
+    auto btype = bus->getType();
+    if (IS_VIRTUAL(btype)) continue;
     len += bus->getLength();
   }
   return len;
diff --git a/wled00/const.h b/wled00/const.h
index ff8b0371..2792f158 100644
--- a/wled00/const.h
+++ b/wled00/const.h
@@ -257,6 +257,8 @@
 #define IS_PWM(t)     ((t) > 40 && (t) < 46)
 #define NUM_PWM_PINS(t) ((t) - 40) //for analog PWM 41-45 only
 #define IS_2PIN(t)      ((t) > 47)
+#define IS_VIRTUAL(t)        ( ((t) <= TYPE_RESERVED) || (((t) >= TYPE_NET_DDP_RGB) && ((t) < (TYPE_NET_DDP_RGB + 16))) ) // WLEDMM 80..95 are network "virtual" busses
+#define EXCLUDE_FROM_ABL(t)  ( IS_VIRTUAL(t) || ( (t) >= (TYPE_HUB75MATRIX + 10) && (t) < (TYPE_HUB75MATRIX + 10)))  // WLEDMM do not apply ato-brightness-limiter on these bus types 
 
 //Color orders
 #define COL_ORDER_GRB             0           //GRB(w),defaut
diff --git a/wled00/json.cpp b/wled00/json.cpp
index f0f189b2..f3a84061 100644
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@@ -904,7 +904,7 @@ void serializeInfo(JsonObject root)
 
   JsonObject leds = root.createNestedObject("leds");
   leds[F("count")] = strip.getLengthTotal();
-  leds[F("countP")] = strip.getLengthPhysical(); //WLEDMM
+  leds[F("countP")] = strip.getLengthPhysical2(); //WLEDMM - getLengthPhysical plus plysical busses not supporting ABL (i.e. HUB75)
   leds[F("pwr")] = strip.currentMilliamps;
   leds["fps"] = strip.getFps();
   leds[F("maxpwr")] = (strip.currentMilliamps)? strip.ablMilliampsMax : 0;

From c5a0ab33eabe469650804371412fe6956b34da39 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 22 Sep 2024 17:10:21 +0200
Subject: [PATCH 023/232] clean up BusConfig nPins chaos

still very confusing logic, but documented in a better way.
---
 wled00/bus_manager.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index eb431333..089020a0 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -60,11 +60,11 @@ struct BusConfig {
     refreshReq = (bool) GET_BIT(busType,7);
     type = busType & 0x7F;  // bit 7 may be/is hacked to include refresh info (1=refresh in off state, 0=no refresh)
     count = len; start = pstart; colorOrder = pcolorOrder; reversed = rev; skipAmount = skip; autoWhite = aw; frequency = clock_kHz;
-    uint8_t nPins = 1;
-    if (type >= TYPE_NET_DDP_RGB && type < 96) nPins = 4; //virtual network bus. 4 "pins" store IP address
-    else if (type > 47) nPins = 2;
-    else if (type > 40 && type < 46) nPins = NUM_PWM_PINS(type);
-    else if (type >= TYPE_HUB75MATRIX && type <= (TYPE_HUB75MATRIX + 10)) nPins = 0;
+    uint8_t nPins = 1;                                                                 // default = only one pin (clockless LEDs like WS281x)
+    if ((type >= TYPE_NET_DDP_RGB) && (type < (TYPE_NET_DDP_RGB + 16))) nPins = 4;     // virtual network bus. 4 "pins" store IP address
+    else if ((type > 47) && (type < 63)) nPins = 2;                                    // (data + clock / SPI) busses - two pins
+    else if (IS_PWM(type)) nPins = NUM_PWM_PINS(type);                                 // PWM needs 1..5 pins
+    else if (type >= TYPE_HUB75MATRIX && type <= (TYPE_HUB75MATRIX + 10)) nPins = 0;   // HUB75 does not use LED pins
     for (uint8_t i = 0; i < min(unsigned(nPins), sizeof(pins)/sizeof(pins[0])); i++) pins[i] = ppins[i];   //softhack007 fix for potential array out-of-bounds access
   }
 

From 0a0192675858e5aed2340587e820a008d832b8e4 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 22 Sep 2024 17:13:34 +0200
Subject: [PATCH 024/232] docu

---
 wled00/const.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/wled00/const.h b/wled00/const.h
index 2792f158..fe9b9ca6 100644
--- a/wled00/const.h
+++ b/wled00/const.h
@@ -245,7 +245,9 @@
 #define TYPE_P9813               53
 #define TYPE_LPD6803             54
 
+// WLEDMM additional types
 #define TYPE_HUB75MATRIX         100 // 100 - 110
+// WLEDMM caution - do not use bus types > 127
 
 //Network types (master broadcast) (80-95)
 #define TYPE_NET_DDP_RGB         80            //network DDP RGB bus (master broadcast bus)

From 1ddc9e38a25428ba01f3c913fbb30c6ab69b3d3f Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 26 Sep 2024 16:55:40 +0200
Subject: [PATCH 025/232] HUB75 bugfix - preserve chain length parameter

chain length was always replaced with "4"
---
 wled00/bus_manager.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 089020a0..80488b6a 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -64,7 +64,7 @@ struct BusConfig {
     if ((type >= TYPE_NET_DDP_RGB) && (type < (TYPE_NET_DDP_RGB + 16))) nPins = 4;     // virtual network bus. 4 "pins" store IP address
     else if ((type > 47) && (type < 63)) nPins = 2;                                    // (data + clock / SPI) busses - two pins
     else if (IS_PWM(type)) nPins = NUM_PWM_PINS(type);                                 // PWM needs 1..5 pins
-    else if (type >= TYPE_HUB75MATRIX && type <= (TYPE_HUB75MATRIX + 10)) nPins = 0;   // HUB75 does not use LED pins
+    else if (type >= TYPE_HUB75MATRIX && type <= (TYPE_HUB75MATRIX + 10)) nPins = 1;   // HUB75 does not use LED pins, but we need to preserve the "chain length" parameter
     for (uint8_t i = 0; i < min(unsigned(nPins), sizeof(pins)/sizeof(pins[0])); i++) pins[i] = ppins[i];   //softhack007 fix for potential array out-of-bounds access
   }
 

From bc11ec4b4e99a3f81c31a886a31f57aff08b0d8e Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 26 Sep 2024 17:33:40 +0200
Subject: [PATCH 026/232] HUB75 bugfixes

* exclude HUB75 from ABL (bad macro in const.h; "pwr" item in json.cpp)
* show HUB75 as "physical" (LEDs preferences)
* minor corrections
---
 wled00/bus_manager.cpp        | 2 +-
 wled00/const.h                | 2 +-
 wled00/data/settings_leds.htm | 2 +-
 wled00/json.cpp               | 2 +-
 wled00/wled.h                 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index e0e875e3..963409c6 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -536,7 +536,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   mxconfig.clkphase = false; // can help in case that the leftmost column is invisible, or pixels on the right side "bleeds out" to the left.
  
   // How many panels we have connected, cap at sane value
-  mxconfig.chain_length = max((u_int8_t) 1, min(bc.pins[0], (u_int8_t) 4)); // prevent bad data preventing boot due to low memory
+  mxconfig.chain_length = max((uint8_t) 1, min(bc.pins[0], (uint8_t) 4)); // prevent bad data preventing boot due to low memory
 
   #if defined(CONFIG_IDF_TARGET_ESP32S3) && defined(BOARD_HAS_PSRAM)
   if(bc.pins[0] > 4) {
diff --git a/wled00/const.h b/wled00/const.h
index fe9b9ca6..55f9f780 100644
--- a/wled00/const.h
+++ b/wled00/const.h
@@ -260,7 +260,7 @@
 #define NUM_PWM_PINS(t) ((t) - 40) //for analog PWM 41-45 only
 #define IS_2PIN(t)      ((t) > 47)
 #define IS_VIRTUAL(t)        ( ((t) <= TYPE_RESERVED) || (((t) >= TYPE_NET_DDP_RGB) && ((t) < (TYPE_NET_DDP_RGB + 16))) ) // WLEDMM 80..95 are network "virtual" busses
-#define EXCLUDE_FROM_ABL(t)  ( IS_VIRTUAL(t) || ( (t) >= (TYPE_HUB75MATRIX + 10) && (t) < (TYPE_HUB75MATRIX + 10)))  // WLEDMM do not apply ato-brightness-limiter on these bus types 
+#define EXCLUDE_FROM_ABL(t)  ( IS_VIRTUAL(t) || ( (t) >= (TYPE_HUB75MATRIX) && (t) < (TYPE_HUB75MATRIX + 10)))  // WLEDMM do not apply auto-brightness-limiter on these bus types 
 
 //Color orders
 #define COL_ORDER_GRB             0           //GRB(w),defaut
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 6d7c36c9..1fd0e4ba 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -250,7 +250,7 @@
 						if (s+c > sLC) sLC = s+c; //update total count
 						if(c>maxLC)maxLC=c; //max per output
 						var t = parseInt(d.getElementsByName("LT"+n)[0].value); // LED type SELECT
-						if (t<80) sPC+=c; //virtual out busses do not count towards physical LEDs
+						if ((t<128) && ((t<80) || ((t>99)))) sPC+=c; //virtual out busses do not count towards physical LEDs //WLEDMM include HUB75 (>=100)
 					} // increase led count
 					continue;
 				}
diff --git a/wled00/json.cpp b/wled00/json.cpp
index f3a84061..a2b9514b 100644
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@@ -905,7 +905,7 @@ void serializeInfo(JsonObject root)
   JsonObject leds = root.createNestedObject("leds");
   leds[F("count")] = strip.getLengthTotal();
   leds[F("countP")] = strip.getLengthPhysical2(); //WLEDMM - getLengthPhysical plus plysical busses not supporting ABL (i.e. HUB75)
-  leds[F("pwr")] = strip.currentMilliamps;
+  leds[F("pwr")] = strip.currentMilliamps > 100 ? strip.currentMilliamps : 0; // WLEDMM show "not calculated" for HUB75, or when all LEDs are out
   leds["fps"] = strip.getFps();
   leds[F("maxpwr")] = (strip.currentMilliamps)? strip.ablMilliampsMax : 0;
   leds[F("maxseg")] = strip.getMaxSegments();
diff --git a/wled00/wled.h b/wled00/wled.h
index 82116ee6..74deeace 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2409210
+#define VERSION 2409260
 
 // WLEDMM  - you can check for this define in usermods, to only enabled WLEDMM specific code in the "right" fork. Its not defined in AC WLED.
 #define _MoonModules_WLED_

From 0ca3f136b12b560d95be671cad57720c9fbf4641 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 28 Sep 2024 02:06:48 +0200
Subject: [PATCH 027/232] ws error printing improvement

* limit to 3 messages per second
* print size when alloc failed
---
 wled00/ws.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/wled00/ws.cpp b/wled00/ws.cpp
index 22c5afd2..85bad64d 100644
--- a/wled00/ws.cpp
+++ b/wled00/ws.cpp
@@ -215,7 +215,11 @@ static bool sendLiveLedsWs(uint32_t wsClient)  // WLEDMM added "static"
   if ((bufSize < 1) || (used < 1)) return(false); // WLEDMM should not happen
   AsyncWebSocketBuffer wsBuf(bufSize);
   if (!wsBuf) {
-	  USER_PRINTLN(F("WS buffer allocation failed."));
+    static unsigned long last_err_time = 0;
+    if (millis() - last_err_time > 300) { // WLEDMM limit to 3 messages per second   
+      USER_PRINTF("WS buffer allocation failed (!wsBuf %u bytes).\n", bufSize);
+      last_err_time = millis();
+    }
 	  errorFlag = ERR_LOW_WS_MEM;
 	  return false; //out of memory
   }

From 3a506aded272cb8de323078d2aa94082fac497e7 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 28 Sep 2024 02:12:53 +0200
Subject: [PATCH 028/232] trying to keep scrolling text readable

the problem (partly solved) is that scrolling text does not erase any previous text, but simply paints pixels in addition.

* add a "shadow" area around each letter, which is explicitly painted black
* only possible when  Trail=0, and overlay option selected
---
 wled00/FX.cpp       |  5 +++--
 wled00/FX.h         |  2 +-
 wled00/FX_2Dfcn.cpp | 35 ++++++++++++++++++++++++++++-------
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 1fbc74e6..ea5b7415 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -6371,7 +6371,7 @@ uint16_t mode_2Dscrollingtext(void) {
   if (SEGMENT.name) for (size_t i=0,j=0; i<maxLen; i++) if (SEGMENT.name[i]>31 && SEGMENT.name[i]<128) text[j++] = SEGMENT.name[i];
   const bool zero = strchr(text, '0') != nullptr;
 
-  if (!strlen(text) || !strncmp_P(text,PSTR("#F"),2) || !strncmp_P(text,PSTR("#P"),2) || !strncmp_P(text,PSTR("#DATE"),5) || !strncmp_P(text,PSTR("#DDMM"),5) || !strncmp_P(text,PSTR("#MMDD"),5) || !strncmp_P(text,PSTR("#TIME"),5) || !strncmp_P(text,PSTR("#HH"),3) || !strncmp_P(text,PSTR("#MM"),3)) { // fallback if empty segment name: display date and time
+  if (!strlen(text) || !strncmp_P(text,PSTR("#F"),2) || !strncmp_P(text,PSTR("#P"),2) || !strncmp_P(text,PSTR("#A"),2) || !strncmp_P(text,PSTR("#DATE"),5) || !strncmp_P(text,PSTR("#DDMM"),5) || !strncmp_P(text,PSTR("#MMDD"),5) || !strncmp_P(text,PSTR("#TIME"),5) || !strncmp_P(text,PSTR("#HH"),3) || !strncmp_P(text,PSTR("#MM"),3)) { // fallback if empty segment name: display date and time
     char sec[5]= {'\0'};
     byte AmPmHour = hour(localTime);
     boolean isitAM = true;
@@ -6404,6 +6404,7 @@ uint16_t mode_2Dscrollingtext(void) {
         SEGMENT.blendPixelColorXY(x, y, SEGCOLOR(1), 255 - (SEGMENT.custom1>>1));
     }
   }
+  bool drawShadow = (SEGMENT.check2) && (SEGMENT.custom1 == 0);
   for (int i = 0; i < numberOfLetters; i++) {
     if (int(cols) - int(SEGENV.aux0) + letterWidth*(i+1) < 0) continue; // don't draw characters off-screen
     uint32_t col1 = SEGMENT.color_from_palette(SEGENV.aux1, false, PALETTE_SOLID_WRAP, 0);
@@ -6412,7 +6413,7 @@ uint16_t mode_2Dscrollingtext(void) {
       col1 = SEGCOLOR(0);
       col2 = SEGCOLOR(2);
     }
-    SEGMENT.drawCharacter(text[i], int(cols) - int(SEGENV.aux0) + letterWidth*i, yoffset, letterWidth, letterHeight, col1, col2);
+    SEGMENT.drawCharacter(text[i], int(cols) - int(SEGENV.aux0) + letterWidth*i, yoffset, letterWidth, letterHeight, col1, col2, drawShadow);
   }
 
   return FRAMETIME;
diff --git a/wled00/FX.h b/wled00/FX.h
index 505721c7..677005f2 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -761,7 +761,7 @@ typedef struct Segment {
     inline void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, CRGB c, bool soft = false, uint8_t depth = UINT8_MAX) { drawLine(x0, y0, x1, y1, RGBW32(c.r,c.g,c.b,0), soft, depth); } // automatic inline
     void drawArc(unsigned x0, unsigned y0, int radius, uint32_t color, uint32_t fillColor = 0);
     inline void drawArc(unsigned x0, unsigned y0, int radius, CRGB color, CRGB fillColor = BLACK) { drawArc(x0, y0, radius, RGBW32(color.r,color.g,color.b,0), RGBW32(fillColor.r,fillColor.g,fillColor.b,0)); } // automatic inline
-    void drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, uint32_t color, uint32_t col2 = 0);
+    void drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, uint32_t color, uint32_t col2 = 0, bool drawShadow = false);
     inline void drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, CRGB c, CRGB c2) { drawCharacter(chr, x, y, w, h, RGBW32(c.r,c.g,c.b,0), RGBW32(c2.r,c2.g,c2.b,0)); } // automatic inline
     void wu_pixel(uint32_t x, uint32_t y, CRGB c);
     //void blur1d(fract8 blur_amount); // blur all rows in 1 dimension
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index ea5c4307..7a090416 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -880,7 +880,7 @@ bool Segment::jsonToPixels(char * name, uint8_t fileNr) {
 
 // draws a raster font character on canvas
 // only supports: 4x6=24, 5x8=40, 5x12=60, 6x8=48 and 7x9=63 fonts ATM
-void Segment::drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, uint32_t color, uint32_t col2) {
+void Segment::drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, uint32_t color, uint32_t col2, bool drawShadow) {
   if (!isActive()) return; // not active
   if (chr < 32 || chr > 126) return; // only ASCII 32-126 supported
   chr -= 32; // align with font table entries
@@ -890,6 +890,7 @@ void Segment::drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w,
 
   CRGB col = CRGB(color);
   CRGBPalette16 grad = CRGBPalette16(col, col2 ? CRGB(col2) : col);
+  uint32_t bgCol = SEGCOLOR(1);
 
   //if (w<5 || w>6 || h!=8) return;
   for (int i = 0; i<h; i++) { // character height
@@ -897,19 +898,39 @@ void Segment::drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w,
     if (y0 < 0) continue; // drawing off-screen
     if (y0 >= rows) break; // drawing off-screen
     uint8_t bits = 0;
+    uint8_t bits_up = 0; // WLEDMM this is the previous line: font[(chr * h) + i -1]
     switch (font) {
-      case 24: bits = pgm_read_byte_near(&console_font_4x6[(chr * h) + i]); break;  // 5x8 font
-      case 40: bits = pgm_read_byte_near(&console_font_5x8[(chr * h) + i]); break;  // 5x8 font
-      case 48: bits = pgm_read_byte_near(&console_font_6x8[(chr * h) + i]); break;  // 6x8 font
-      case 63: bits = pgm_read_byte_near(&console_font_7x9[(chr * h) + i]); break;  // 7x9 font
-      case 60: bits = pgm_read_byte_near(&console_font_5x12[(chr * h) + i]); break; // 5x12 font
+      case 24: bits = pgm_read_byte_near(&console_font_4x6[(chr * h) + i]);
+        if ((i>0) && drawShadow) bits_up = pgm_read_byte_near(&console_font_4x6[(chr * h) + i -1]);
+        break;  // 5x8 font
+      case 40: bits = pgm_read_byte_near(&console_font_5x8[(chr * h) + i]); 
+        if ((i>0) && drawShadow) bits_up = pgm_read_byte_near(&console_font_5x8[(chr * h) + i -1]);
+        break;  // 5x8 font
+      case 48: bits = pgm_read_byte_near(&console_font_6x8[(chr * h) + i]); 
+        if ((i>0) && drawShadow) bits_up = pgm_read_byte_near(&console_font_6x8[(chr * h) + i -1]);
+        break;  // 6x8 font
+      case 63: bits = pgm_read_byte_near(&console_font_7x9[(chr * h) + i]); 
+        if ((i>0) && drawShadow) bits_up = pgm_read_byte_near(&console_font_7x9[(chr * h) + i -1]);
+        break;  // 7x9 font
+      case 60: bits = pgm_read_byte_near(&console_font_5x12[(chr * h) + i]); 
+        if ((i>0) && drawShadow) bits_up = pgm_read_byte_near(&console_font_5x12[(chr * h) + i -1]);
+        break; // 5x12 font
       default: return;
     }
     col = ColorFromPalette(grad, (i+1)*255/h, 255, NOBLEND);
     for (int j = 0; j<w; j++) { // character width
       int16_t x0 = x + (w-1) - j;
-      if ((x0 >= 0 || x0 < cols) && ((bits>>(j+(8-w))) & 0x01)) { // bit set & drawing on-screen
+      if ((x0 >= 0) || (x0 < cols)) {
+        if ((bits>>(j+(8-w))) & 0x01) { // bit set & drawing on-screen
         setPixelColorXY(x0, y0, col);
+        } else {
+          if (drawShadow) {
+			// WLEDMM
+            if ((j < (w-1)) && (bits>>(j+(8-w) +1)) & 0x01) setPixelColorXY(x0, y0, bgCol); // blank when pixel to the right is set
+            else if ((j > 0) && (bits>>(j+(8-w) -1)) & 0x01) setPixelColorXY(x0, y0, bgCol);// blank when pixel to the left is set
+            else if ((bits_up>>(j+(8-w))) & 0x01) setPixelColorXY(x0, y0, bgCol);           // blank when pixel above is set
+          }
+        }
       }
     }
   }

From 8338b58b8846954f92ad7196edcc81b2cc993457 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 28 Sep 2024 02:15:41 +0200
Subject: [PATCH 029/232] HUB75 memory usage info on serial

---
 wled00/bus_manager.cpp | 15 +++++++++++----
 wled00/wled.cpp        |  1 +
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 963409c6..fa205c44 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -523,6 +523,7 @@ void BusNetwork::cleanup() {
 #warning "HUB75 driver enabled (experimental)"
 
 BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWhite) {
+  size_t lastHeap = ESP.getFreeHeap();
 
   _valid = false;
   fourScanPanel = nullptr;
@@ -540,14 +541,14 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
   #if defined(CONFIG_IDF_TARGET_ESP32S3) && defined(BOARD_HAS_PSRAM)
   if(bc.pins[0] > 4) {
-    USER_PRINT("WARNING, chain limited to 4");
+    USER_PRINTLN("WARNING, chain limited to 4");
   }
   # else
   // Disable this check if you are want to try bigger setups and accept you
   // might need to do full erase to recover from memory relayed boot-loop if you push too far
   if(mxconfig.mx_height >= 64 && (bc.pins[0] > 1)) {
-    USER_PRINT("WARNING, only single panel can be used of 64 pixel boards due to memory");
-    mxconfig.chain_length = 1;
+    USER_PRINTLN("WARNING, only single panel can be used of 64 pixel boards due to memory");
+    //mxconfig.chain_length = 1;
   }
   #endif
 
@@ -730,7 +731,8 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
 #endif
 
-  USER_PRINTF("MatrixPanel_I2S_DMA config - %ux%u length: %u\n", mxconfig.mx_width, mxconfig.mx_height, mxconfig.chain_length);
+  USER_PRINTF("MatrixPanel_I2S_DMA config - %ux%u (type %u) length: %u, %u bits/pixel.\n", mxconfig.mx_width, mxconfig.mx_height, bc.type, mxconfig.chain_length, mxconfig.getPixelColorDepthBits() * 3);
+  DEBUG_PRINT(F("Free heap: ")); DEBUG_PRINTLN(ESP.getFreeHeap()); lastHeap = ESP.getFreeHeap();
 
   // OK, now we can create our matrix object
   display = new MatrixPanel_I2S_DMA(mxconfig);
@@ -762,13 +764,16 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   _bri = 25;
 
   delay(24); // experimental
+  DEBUG_PRINT(F("heap usage: ")); DEBUG_PRINTLN(lastHeap - ESP.getFreeHeap());
   // Allocate memory and start DMA display
   if( not display->begin() ) {
       USER_PRINTLN("****** MatrixPanel_I2S_DMA !KABOOM! I2S memory allocation failed ***********");
+      USER_PRINT(F("heap usage: ")); USER_PRINTLN(lastHeap - ESP.getFreeHeap());
       return;
   }
   else {
     USER_PRINTLN("MatrixPanel_I2S_DMA begin ok");
+    USER_PRINT(F("heap usage: ")); USER_PRINTLN(lastHeap - ESP.getFreeHeap());
     delay(18);   // experiment - give the driver a moment (~ one full frame @ 60hz) to settle
     _valid = true;
     display->clearScreen();   // initially clear the screen buffer
@@ -784,6 +789,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
       delete display; display = nullptr;
       _valid = false;
       USER_PRINTLN(F("MatrixPanel_I2S_DMA not started - not enough memory for dirty bits!"));
+      USER_PRINT(F("heap usage: ")); USER_PRINTLN(lastHeap - ESP.getFreeHeap());
       return;  //  fail is we cannot get memory for the buffer
     }
     setBitArray(_ledsDirty, _len, false);             // reset dirty bits
@@ -837,6 +843,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
     USER_PRINT((_ledBuffer? _len*sizeof(CRGB) :0) + (_ledsDirty? getBitArrayBytes(_len) :0));
     USER_PRINTLN(F(" bytes."));
   }
+  USER_PRINT(F("heap usage: ")); USER_PRINTLN(lastHeap - ESP.getFreeHeap());
 }
 
 void __attribute__((hot)) BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c) {
diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index 41e04d1a..5858f800 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -876,6 +876,7 @@ void WLED::setup()
   USER_PRINTLN(F("\n"));
 #endif
 
+  USER_PRINT(F("Free heap ")); USER_PRINTLN(ESP.getFreeHeap());USER_PRINTLN();
   USER_PRINTLN(F("WLED initialization done.\n"));
   delay(50);
   // repeat Ada prompt

From 0555b8e5f258415e7d038689c6636cbd659bdffe Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 28 Sep 2024 02:18:24 +0200
Subject: [PATCH 030/232] HUB75: avoid allocating ledMap

based on an idea by @troyhacks : fight heap fragmentation by avoiding to allocate ledMap when not needed.
---
 wled00/FX_2Dfcn.cpp | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 7a090416..73c7bf77 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -66,9 +66,26 @@ void WS2812FX::setUpMatrix() {
 
     USER_PRINTF("setUpMatrix %d x %d\n", Segment::maxWidth, Segment::maxHeight);
     
+    // WLEDMM check if mapping table is necessary (avoiding heap fragmentation)
+#if defined(WLED_ENABLE_HUB75MATRIX)
+    bool needLedMap = (loadedLedmap >0);              // ledmap loaded
+    needLedMap |= WLED_FS.exists(F("/2d-gaps.json")); // gapFile found
+    needLedMap |= panel.size() > 1;                   // 2D config: more than one panel
+    if (panel.size() == 1) {
+      Panel &p = panel[0];
+      needLedMap |= p.serpentine;                        // panel serpentine
+      needLedMap |= p.vertical;                          // panel not horizotal
+      needLedMap |= p.bottomStart | p.rightStart;        // panel not top left, or not left->light
+      needLedMap |= (p.xOffset > 0) || (p.yOffset > 0);  // panel does not start at (0,0)
+    }
+#else
+    bool needLedMap = true;                              // always use ledMaps on non-HUB75 builds
+#endif
+
     //WLEDMM recreate customMappingTable if more space needed
     if (Segment::maxWidth * Segment::maxHeight > customMappingTableSize) {
       size_t size = max(ledmapMaxSize, size_t(Segment::maxWidth * Segment::maxHeight)); // TroyHacks
+      if (!needLedMap) size = 0;                                                        // softhack007
       USER_PRINTF("setupmatrix customMappingTable alloc %d from %d\n", size, customMappingTableSize);
       //if (customMappingTable != nullptr) delete[] customMappingTable;
       //customMappingTable = new uint16_t[size];
@@ -88,8 +105,9 @@ void WS2812FX::setUpMatrix() {
       if (customMappingTable != nullptr) customMappingTableSize = size;
     }
 
-    if (customMappingTable != nullptr) {
+    if ((customMappingTable != nullptr) || (!needLedMap)) {                                          // softhack007
       customMappingSize = Segment::maxWidth * Segment::maxHeight;
+      if (!needLedMap) customMappingSize = 0;                                                        // softhack007
 
       // fill with empty in case we don't fill the entire matrix
       for (size_t i = 0; i< customMappingTableSize; i++) { //WLEDMM use customMappingTableSize
@@ -130,6 +148,7 @@ void WS2812FX::setUpMatrix() {
         releaseJSONBufferLock();
       }
 
+      if (needLedMap && customMappingTable != nullptr) {  // softhack007
       uint16_t x, y, pix=0; //pixel
       for (size_t pan = 0; pan < panel.size(); pan++) {
         Panel &p = panel[pan];
@@ -146,6 +165,7 @@ void WS2812FX::setUpMatrix() {
           }
         }
       }
+      }
 
       // delete gap array as we no longer need it
       if (gapTable) {delete[] gapTable; gapTable=nullptr;}   // softhack prevent dangling pointer

From b245112d2a80b0df5534fc957be09f6799bf374b Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 28 Sep 2024 02:19:53 +0200
Subject: [PATCH 031/232] some drawing speedups

* speedups for addPixelColorXY, fadePixelColorXY, fadeToBlackBy
---
 wled00/FX.cpp       |  3 +++
 wled00/FX_2Dfcn.cpp | 16 +++++++++-------
 wled00/FX_fcn.cpp   |  4 +++-
 wled00/wled.h       |  2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index ea5b7415..9e7a25cf 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -37,6 +37,9 @@
 
 #define indexToVStrip(index, stripNr) ((index) | (int((stripNr)+1)<<16))
 
+// WLEDMM replace abs8 by abs, as abs8 does not work for numbers >127
+#define abs8(x) abs(x)
+
 // effect utility functions
 static uint8_t sin_gap(uint16_t in) {
   if (in & 0x100) return 0;
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 73c7bf77..9ac62e1d 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -463,8 +463,9 @@ uint32_t IRAM_ATTR_YN Segment::getPixelColorXY(int x, int y) const {
   if (reverse  ) x = virtualWidth()  - x - 1;
   if (reverse_y) y = virtualHeight() - y - 1;
   if (transpose) { uint16_t t = x; x = y; y = t; } // swap X & Y if segment transposed
-  x *= groupLength(); // expand to physical pixels
-  y *= groupLength(); // expand to physical pixels
+  const uint_fast16_t groupLength_ = groupLength(); // WLEDMM small optimization
+  x *= groupLength_; // expand to physical pixels
+  y *= groupLength_; // expand to physical pixels
   if (x >= width() || y >= height()) return 0;
   return strip.getPixelColorXY(start + x, startY + y);
 }
@@ -479,15 +480,16 @@ void Segment::blendPixelColorXY(uint16_t x, uint16_t y, uint32_t color, uint8_t
 void IRAM_ATTR_YN Segment::addPixelColorXY(int x, int y, uint32_t color, bool fast) {
   // if (!isActive()) return; // not active //WLEDMM sanity check is repeated in getPixelColorXY / setPixelColorXY
   // if (x >= virtualWidth() || y >= virtualHeight() || x<0 || y<0) return;  // if pixel would fall out of virtual segment just exit //WLEDMM
-  uint32_t col = getPixelColorXY(x,y);
-  col = color_add(col, color, fast);
-  setPixelColorXY(x, y, col);
+  uint32_t oldCol = getPixelColorXY(x,y);
+  uint32_t col = color_add(oldCol, color, fast);
+  if (col != oldCol) setPixelColorXY(x, y, col);
 }
 
 void Segment::fadePixelColorXY(uint16_t x, uint16_t y, uint8_t fade) {
   // if (!isActive()) return; // not active //WLEDMM sanity check is repeated in getPixelColorXY / setPixelColorXY
-  CRGB pix = CRGB(getPixelColorXY(x,y)).nscale8_video(fade);
-  setPixelColorXY(x, y, pix);
+  CRGB oldPix = CRGB(getPixelColorXY(x,y));
+  CRGB pix = oldPix.nscale8_video(fade);
+  if (pix != oldPix) setPixelColorXY(int(x), int(y), pix);
 }
 
 // blurRow: perform a blur on a row of a rectangular matrix
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 9e2368ab..51087562 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -1510,7 +1510,9 @@ void __attribute__((hot)) Segment::fadeToBlackBy(uint8_t fadeBy) {
     for (unsigned y = 0; y < rows; y++) for (unsigned x = 0; x < cols; x++) {
       uint32_t cc = getPixelColorXY(int(x),int(y));                            // WLEDMM avoid RGBW32 -> CRGB -> RGBW32 conversion
       uint32_t cc2 = color_fade(cc, scaledown);                      // fade
-      //if (cc2 != cc)                                               // WLEDMM only re-paint if faded color is different - disabled - causes problem with text overlay
+#ifdef WLEDMM_FASTPATH
+      if (cc2 != cc)                                               // WLEDMM only re-paint if faded color is different - normally disabled - causes problem with text overlay
+#endif
         setPixelColorXY(int(x), int(y), cc2);
     }
   } else {
diff --git a/wled00/wled.h b/wled00/wled.h
index 74deeace..33174183 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2409260
+#define VERSION 2409280
 
 // WLEDMM  - you can check for this define in usermods, to only enabled WLEDMM specific code in the "right" fork. Its not defined in AC WLED.
 #define _MoonModules_WLED_

From 2aa0d4703687c5c61d8786bb9986753c483b61da Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 28 Sep 2024 02:43:12 +0200
Subject: [PATCH 032/232] adding getPixelColorRestored()

similar to getPixelColor, but returns the original pixel without brightness adjustments.

* getPixelColorRestored is used by segment::sPC and segment::gPC
* getPixelColor is still used by ABL (auto brightness limiter)
---
 wled00/FX.h            |  3 +++
 wled00/FX_2Dfcn.cpp    | 13 ++++++++++++-
 wled00/FX_fcn.cpp      |  8 +++++++-
 wled00/bus_manager.cpp | 29 +++++++++++++++++++++++++++++
 wled00/bus_manager.h   | 16 ++++++++++++++++
 wled00/ws.cpp          |  1 +
 6 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/wled00/FX.h b/wled00/FX.h
index 677005f2..4e408254 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -976,6 +976,7 @@ class WS2812FX {  // 96 bytes
       now,
       timebase;
     uint32_t __attribute__((pure)) getPixelColor(uint_fast16_t)  const;   // WLEDMM attribute pure = does not have side-effects
+    uint32_t __attribute__((pure)) getPixelColorRestored(uint_fast16_t i)  const;// WLEDMM gets the original color from the driver (without downscaling by _bri)
 
     inline uint32_t getLastShow(void)  const { return _lastShow; }
     inline uint32_t segColor(uint8_t i)  const { return _colors_t[i]; }
@@ -1068,6 +1069,8 @@ class WS2812FX {  // 96 bytes
     std::vector<segment> _segments;
     friend class Segment;
 
+    uint32_t getPixelColorXYRestored(uint16_t x, uint16_t y)  const;  // WLEDMM gets the original color from the driver (without downscaling by _bri)
+
   private:
     uint16_t _length;
     uint8_t  _brightness;
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 9ac62e1d..0803ad1a 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -249,6 +249,17 @@ uint32_t __attribute__((hot)) WS2812FX::getPixelColorXY(uint16_t x, uint16_t y)
   return busses.getPixelColor(index);
 }
 
+uint32_t __attribute__((hot)) WS2812FX::getPixelColorXYRestored(uint16_t x, uint16_t y)  const {  // WLEDMM gets the original color from the driver (without downscaling by _bri)
+  #ifndef WLED_DISABLE_2D
+    uint_fast16_t index = (y * Segment::maxWidth + x); //WLEDMM: use fast types
+  #else
+    uint16_t index = x;
+  #endif
+  if (index < customMappingSize) index = customMappingTable[index];
+  if (index >= _length) return 0;
+  return busses.getPixelColorRestored(index);
+}
+
 ///////////////////////////////////////////////////////////
 // Segment:: routines
 ///////////////////////////////////////////////////////////
@@ -467,7 +478,7 @@ uint32_t IRAM_ATTR_YN Segment::getPixelColorXY(int x, int y) const {
   x *= groupLength_; // expand to physical pixels
   y *= groupLength_; // expand to physical pixels
   if (x >= width() || y >= height()) return 0;
-  return strip.getPixelColorXY(start + x, startY + y);
+  return strip.getPixelColorXYRestored(start + x, startY + y);
 }
 
 // Blends the specified color with the existing pixel color.
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 51087562..f2ed3e20 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -1304,7 +1304,7 @@ uint32_t __attribute__((hot)) Segment::getPixelColor(int i) const
   if (offset < INT16_MAX) i += offset; // WLEDMM
   if ((i >= stop) && (stop>0)) i -= length(); // WLEDMM avoid negative index (stop = 0 is a possible value)
   if (i<0) i=0; // WLEDMM just to be 100% sure
-  return strip.getPixelColor(i);
+  return strip.getPixelColorRestored(i);
 }
 
 uint8_t Segment::differs(Segment& b) const {
@@ -1943,6 +1943,12 @@ uint32_t WS2812FX::getPixelColor(uint_fast16_t i) const // WLEDMM fast int types
   return busses.getPixelColor(i);
 }
 
+uint32_t WS2812FX::getPixelColorRestored(uint_fast16_t i)  const  // WLEDMM gets the original color from the driver (without downscaling by _bri)
+{
+  if (i < customMappingSize) i = customMappingTable[i];
+  if (i >= _length) return 0;
+  return busses.getPixelColorRestored(i);
+}
 
 //DISCLAIMER
 //The following function attemps to calculate the current LED power usage,
diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index fa205c44..66a417e8 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -890,6 +890,14 @@ uint32_t BusHub75Matrix::getPixelColor(uint16_t pix) const {
     return getBitFromArray(_ledsDirty, pix) ? DARKGREY: BLACK;   // just a hack - we only know if the pixel is black or not
 }
 
+uint32_t __attribute__((hot)) BusHub75Matrix::getPixelColorRestored(uint16_t pix) const {
+  if (!_valid || pix >= _len) return BLACK;
+  if (_ledBuffer)
+    return uint32_t(_ledBuffer[pix]) & 0x00FFFFFF;
+  else
+    return getBitFromArray(_ledsDirty, pix) ? DARKGREY: BLACK;   // just a hack - we only know if the pixel is black or not
+}
+
 void BusHub75Matrix::setBrightness(uint8_t b, bool immediate) {
   _bri = b;
   // if (_bri > 238) _bri=238; // not strictly needed. Enable this line if you see glitches at highest brightness.
@@ -1106,6 +1114,27 @@ uint32_t IRAM_ATTR  __attribute__((hot)) BusManager::getPixelColor(uint_fast16_t
   return 0;
 }
 
+uint32_t IRAM_ATTR  __attribute__((hot)) BusManager::getPixelColorRestored(uint_fast16_t pix) {     // WLEDMM uses bus::getPixelColorRestored()
+  if ((pix >= laststart) && (pix < lastend ) && (lastBus != nullptr)) {
+    // WLEDMM same bus as last time - no need to search again
+    return lastBus->getPixelColorRestored(pix - laststart);
+  }
+
+  for (uint_fast8_t i = 0; i < numBusses; i++) {
+    Bus* b = busses[i];
+    uint_fast16_t bstart = b->getStart();
+    if (pix < bstart || pix >= bstart + b->getLength()) continue;
+    else {
+      // WLEDMM remember last Bus we took
+      lastBus = b;
+      laststart = bstart; 
+      lastend = bstart + b->getLength();
+      return b->getPixelColorRestored(pix - bstart);
+    }
+  }
+  return 0;
+}
+
 bool BusManager::canAllShow() const {
   for (uint8_t i = 0; i < numBusses; i++) {
     if (!busses[i]->canShow()) return false;
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 80488b6a..677e71de 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -135,6 +135,7 @@ class Bus {
     virtual void     setStatusPixel(uint32_t c) {}
     virtual void     setPixelColor(uint16_t pix, uint32_t c) = 0;
     virtual uint32_t getPixelColor(uint16_t pix) const { return 0; }
+    virtual uint32_t getPixelColorRestored(uint16_t pix) const { return restore_Color_Lossy(getPixelColor(pix), _bri); } // override in case your bus has a lossless buffer (HUB75, FastLED, Art-Net)
     virtual void     setBrightness(uint8_t b, bool immediate=false) { _bri = b; }
     virtual void     cleanup() = 0;
     virtual uint8_t  getPins(uint8_t* pinArray) const { return 0; }
@@ -183,6 +184,17 @@ class Bus {
     inline static void    setGlobalAWMode(uint8_t m)  { if (m < 5) _gAWM = m; else _gAWM = AW_GLOBAL_DISABLED; }
     inline static uint8_t getGlobalAWMode()           { return _gAWM; }
 
+    inline uint32_t restore_Color_Lossy(uint32_t c, uint8_t restoreBri) const { // shamelessly grabbed from upstream, who grabbed from NPB, who ..
+      if (restoreBri < 255) {
+        uint8_t* chan = (uint8_t*) &c;
+        for (uint_fast8_t i=0; i<4; i++) {
+          uint_fast16_t val = chan[i];
+          chan[i] = ((val << 8) + restoreBri) / (restoreBri + 1); //adding _bri slightly improves recovery / stops degradation on re-scale
+        }
+      }
+      return c;
+    }
+
     bool reversed = false;
 
   protected:
@@ -296,6 +308,7 @@ class BusOnOff : public Bus {
     void setPixelColor(uint16_t pix, uint32_t c);
 
     uint32_t getPixelColor(uint16_t pix) const;
+    uint32_t getPixelColorRestored(uint16_t pix) const override { return getPixelColor(pix);}  // WLEDMM BusOnOff ignores brightness
 
     void show();
 
@@ -326,6 +339,7 @@ class BusNetwork : public Bus {
     void setPixelColor(uint16_t pix, uint32_t c);
 
     uint32_t __attribute__((pure)) getPixelColor(uint16_t pix) const;  // WLEDMM attribute added
+    uint32_t __attribute__((pure)) getPixelColorRestored(uint16_t pix) const override { return getPixelColor(pix);}  // WLEDMM BusNetwork ignores brightness
 
     void show();
 
@@ -367,6 +381,7 @@ class BusHub75Matrix : public Bus {
 
     void setPixelColor(uint16_t pix, uint32_t c) override;
     uint32_t getPixelColor(uint16_t pix) const override;
+    uint32_t getPixelColorRestored(uint16_t pix) const override; // lossless getPixelColor supported
 
     void show(void) override;
 
@@ -418,6 +433,7 @@ class BusManager {
     void setSegmentCCT(int16_t cct, bool allowWBCorrection = false);
 
     uint32_t __attribute__((pure)) getPixelColor(uint_fast16_t pix); // WLEDMM attribute added
+    uint32_t __attribute__((pure)) getPixelColorRestored(uint_fast16_t pix);  // WLEDMM
 
     bool canAllShow() const;
 
diff --git a/wled00/ws.cpp b/wled00/ws.cpp
index 85bad64d..f6c1e862 100644
--- a/wled00/ws.cpp
+++ b/wled00/ws.cpp
@@ -251,6 +251,7 @@ static bool sendLiveLedsWs(uint32_t wsClient)  // WLEDMM added "static"
     }
   #endif
     uint32_t c = restoreColorLossy(strip.getPixelColor(i), stripBrightness); // WLEDMM full bright preview - does _not_ recover ABL reductions
+    //uint32_t c = strip.getPixelColorRestored(i);
     // WLEDMM begin: preview with color gamma correction
     if (gammaCorrectPreview) {
       uint8_t w = W(c);  // not sure why, but it looks better if using "white" without corrections

From 59ca792c9d7bc6b90f04ae640c6e2827ea826f15 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 28 Sep 2024 02:45:16 +0200
Subject: [PATCH 033/232] HUB75: trade bit depth against memory needs

gradually reduce bitdepts on esp32
---
 wled00/bus_manager.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 66a417e8..cb3d8fac 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -579,6 +579,14 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
       break;
   }
 
+#if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32S2)// classic esp32, or esp32-s2: reduce bitdepth for large panels
+  if (mxconfig.mx_height >= 64) {
+    if (mxconfig.chain_length * mxconfig.mx_width > 192) mxconfig.setPixelColorDepthBits(3);
+    else if (mxconfig.chain_length * mxconfig.mx_width > 64)  mxconfig.setPixelColorDepthBits(4);
+    else mxconfig.setPixelColorDepthBits(8);
+  } else mxconfig.setPixelColorDepthBits(8);
+#endif
+
 #if defined(ARDUINO_ADAFRUIT_MATRIXPORTAL_ESP32S3) // MatrixPortal ESP32-S3
 
   // https://www.adafruit.com/product/5778

From 559d86256c213c8eccb8097a39651141c2741402 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 28 Sep 2024 02:56:46 +0200
Subject: [PATCH 034/232] live preview speedup

---
 wled00/ws.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/wled00/ws.cpp b/wled00/ws.cpp
index f6c1e862..5a7f34eb 100644
--- a/wled00/ws.cpp
+++ b/wled00/ws.cpp
@@ -10,9 +10,11 @@ static volatile unsigned long wsLastLiveTime = 0;   // WLEDMM
 //uint8_t* wsFrameBuffer = nullptr;
 
 #if !defined(ARDUINO_ARCH_ESP32) || defined(WLEDMM_FASTPATH)   // WLEDMM
-#define WS_LIVE_INTERVAL 120
+#define WS_LIVE_INTERVAL_MAX 120
+#define WS_LIVE_INTERVAL_MIN 25
 #else
-#define WS_LIVE_INTERVAL 80
+#define WS_LIVE_INTERVAL_MAX 80
+#define WS_LIVE_INTERVAL_MIN 40
 #endif
 
 void wsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len)
@@ -274,7 +276,7 @@ static bool sendLiveLedsWs(uint32_t wsClient)  // WLEDMM added "static"
 
 void handleWs()
 {
-  if ((millis() - wsLastLiveTime) > (unsigned long)(max((strip.getLengthTotal()/20), WS_LIVE_INTERVAL))) //WLEDMM dynamic nr of peek frames per second
+  if ((millis() - wsLastLiveTime) > (unsigned long)(max(WS_LIVE_INTERVAL_MIN, min((strip.getLengthTotal()/80), WS_LIVE_INTERVAL_MAX)))) //WLEDMM dynamic nr of peek frames per second
   {
     #ifdef ESP8266
     ws.cleanupClients(3);

From b650c15997193a8bf2372b37145f2ce08afcae63 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 29 Sep 2024 02:01:57 +0200
Subject: [PATCH 035/232] platformio.ini updates for HUB75

* -D WLEDMM_SLOWPATH prevents using I2S#1 for ws281x leds
- matrixPortal S3: minor update to use more PSRAM (and keep more RAM availeable)
---
 platformio.ini | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/platformio.ini b/platformio.ini
index 57f0337d..07c03129 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1071,6 +1071,7 @@ HUB75_build_flags =
   -D NO_FAST_FUNCTIONS ;; If you are not using AdafruitGFX than you probably do not need this either, save memory/code size
   -D NO_CIE1931 ;; Do not use LED brightness compensation described in CIE 1931. We use FastLED dimming already
   -D S3_LCD_DIV_NUM=20 ;; Attempt to fix wifi performance issue when panel active with S3 chips
+  -D WLEDMM_SLOWPATH   ;; WLEDMM: do not use I2S for driving ws2812 LEDs (HUB75 driver needs I2S#1)
 HUB75_lib_deps = https://github.com/mrcodetastic/ESP32-HUB75-MatrixPanel-DMA.git#aa28e2a9 ;; S3_LCD_DIV_NUM fix
 HUB75_lib_ignore = ESP32 HUB75 LED MATRIX PANEL DMA Display ;; to remove the HUB75 lib dependancy (saves a few bytes)
 
@@ -2667,6 +2668,8 @@ build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-inden
   -D LOLIN_WIFI_FIX ;; try this in case Wifi does not work
   -D WLED_WATCHDOG_TIMEOUT=0 -D CONFIG_ASYNC_TCP_USE_WDT=0
   -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
+  ; -DCONFIG_MBEDTLS_DYNAMIC_BUFFER=1 ;; optional - seems to move more buffers into PSRAM
   ${common_mm.HUB75_build_flags}
   -D DEFAULT_LED_TYPE=101
 lib_deps = ${esp32s3.lib_deps} ${common_mm.lib_deps_S} ;; ;;  do not include ${esp32.lib_depsV4} !!!!

From a0f07cabcb82e5a3e8cb65d41e0eb2bf88e19505 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 29 Sep 2024 14:59:54 +0200
Subject: [PATCH 036/232] make a few getters "constexpr" as they just return a
 constant

constexpr ensures that the compiler will replace the "getter" call with the value return, saving function call overhead.

based on an idea from @blazoncek
---
 wled00/FX.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wled00/FX.h b/wled00/FX.h
index 4e408254..04eabe70 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -951,13 +951,13 @@ class WS2812FX {  // 96 bytes
       setPixelSegment(uint8_t n);
 
     inline uint8_t getBrightness(void)  const { return _brightness; }
-    inline uint8_t getMaxSegments(void)  const { return MAX_NUM_SEGMENTS; }  // returns maximum number of supported segments (fixed value)
     inline uint8_t getSegmentsNum(void)  const { return _segments.size(); }  // returns currently present segments
     inline uint8_t getCurrSegmentId(void)  const { return _segment_index; }
     inline uint8_t getMainSegmentId(void)  const { return _mainSegment; }
-    inline uint8_t getPaletteCount()  const { return 13 + GRADIENT_PALETTE_COUNT; }  // will only return built-in palette count
     inline uint8_t getTargetFps()  const { return _targetFps; }
     inline uint8_t getModeCount()  const { return _modeCount; }
+    inline static constexpr uint8_t getMaxSegments(void)  { return MAX_NUM_SEGMENTS; }  // returns maximum number of supported segments (fixed value)
+    inline static constexpr uint8_t getPaletteCount()  { return 13 + GRADIENT_PALETTE_COUNT; }  // will only return built-in palette count
 
     uint16_t
       ablMilliampsMax,

From 7e9474e78ce9caabc863eb8cb0ed62952fd152d7 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 29 Sep 2024 17:51:44 +0200
Subject: [PATCH 037/232] depricate sPC(float, float)

the function is already removed in upstream.
You can use wu_pixel() instead, which is much faster and more accurate.
---
 wled00/FX.cpp       | 5 ++++-
 wled00/FX_2Dfcn.cpp | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 9e7a25cf..931f74b2 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5539,7 +5539,10 @@ uint16_t mode_2DLissajous(void) {            // By: Andrew Tuline
         float ylocn = float(cos8(phase/2 + i*2)) / 255.0f;
         //SEGMENT.setPixelColorXY(xlocn, ylocn, SEGMENT.color_from_palette(strip.now/100+i, false, PALETTE_SOLID_WRAP, 0)); // draw pixel with anti-aliasing
         unsigned palIndex = (256*ylocn) + phase/2 + (i* SEGMENT.speed)/64;
-        SEGMENT.setPixelColorXY(xlocn, ylocn, SEGMENT.color_from_palette(palIndex, false, PALETTE_SOLID_WRAP, 0)); // draw pixel with anti-aliasing - color follows rotation
+        //SEGMENT.setPixelColorXY(xlocn, ylocn, SEGMENT.color_from_palette(palIndex, false, PALETTE_SOLID_WRAP, 0)); // draw pixel with anti-aliasing - color follows rotation
+        // WLEDMM wu_pixel is 50% faster, and still lokks better
+        SEGMENT.wu_pixel(uint32_t(xlocn * (cols <<8)), uint32_t(ylocn * (rows <<8)), 
+                         CRGB(SEGMENT.color_from_palette(palIndex, false, PALETTE_SOLID_WRAP, 0)));
       }
   } else
   for (int i=0; i < 256; i ++) {
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 0803ad1a..a277c521 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -413,6 +413,8 @@ void IRAM_ATTR_YN Segment::setPixelColorXY(int x, int y, uint32_t col) //WLEDMM:
   }
 }
 
+#if 0
+// WLEDMM setPixelColorXY(float x, float y, uint32_t col, ..) is depricated. use wu_pixel(x,y,col) instead.
 // anti-aliased version of setPixelColorXY()
 void Segment::setPixelColorXY(float x, float y, uint32_t col, bool aa, bool fast) // WLEDMM some speedups due to fast int and faster sqrt16
 {
@@ -463,6 +465,7 @@ void Segment::setPixelColorXY(float x, float y, uint32_t col, bool aa, bool fast
     setPixelColorXY(uint16_t(roundf(fX)), uint16_t(roundf(fY)), col);
   }
 }
+#endif
 
 // returns RGBW values of pixel
 uint32_t IRAM_ATTR_YN Segment::getPixelColorXY(int x, int y) const {

From 3110b0a4769e3f8206258f0a8e2511b03773809e Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 29 Sep 2024 18:02:39 +0200
Subject: [PATCH 038/232] fix for XL builds

some usermod still seems to used sPC(float, float, c).

> Linking .pio/build/esp32_4MB_XL/firmware.elf
.pio/build/esp32_4MB_XL/src/usermods_list.cpp.o:(.literal._ZN7Frame3DD5Ev[Frame3D::~Frame3D()]+0x4): undefined reference to `Segment::setPixelColorXY(float, float, unsigned int, bool, bool)'
---
 wled00/FX_2Dfcn.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index a277c521..42865933 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -413,7 +413,6 @@ void IRAM_ATTR_YN Segment::setPixelColorXY(int x, int y, uint32_t col) //WLEDMM:
   }
 }
 
-#if 0
 // WLEDMM setPixelColorXY(float x, float y, uint32_t col, ..) is depricated. use wu_pixel(x,y,col) instead.
 // anti-aliased version of setPixelColorXY()
 void Segment::setPixelColorXY(float x, float y, uint32_t col, bool aa, bool fast) // WLEDMM some speedups due to fast int and faster sqrt16
@@ -421,6 +420,7 @@ void Segment::setPixelColorXY(float x, float y, uint32_t col, bool aa, bool fast
   if (Segment::maxHeight==1) return; // not a matrix set-up
   if (x<0.0f || x>1.0f || y<0.0f || y>1.0f) return; // not normalized
 
+#if 0 // depricated
   const uint_fast16_t cols = virtualWidth();
   const uint_fast16_t rows = virtualHeight();
 
@@ -464,8 +464,13 @@ void Segment::setPixelColorXY(float x, float y, uint32_t col, bool aa, bool fast
   } else {
     setPixelColorXY(uint16_t(roundf(fX)), uint16_t(roundf(fY)), col);
   }
-}
+
+#else // replacement using wu_pixel
+  unsigned px = x * (virtualWidth() <<8);
+  unsigned py = y * (virtualHeight() <<8);
+  wu_pixel(px, py, CRGB(col));
 #endif
+}
 
 // returns RGBW values of pixel
 uint32_t IRAM_ATTR_YN Segment::getPixelColorXY(int x, int y) const {

From 63ff7205d61c4bdf7e9b952e392222e46b93e1d6 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 29 Sep 2024 18:37:18 +0200
Subject: [PATCH 039/232] wu_pixel small optimization

5% faster
---
 wled00/FX_2Dfcn.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 42865933..03919f8e 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -987,12 +987,14 @@ void Segment::wu_pixel(uint32_t x, uint32_t y, CRGB c) {      //awesome wu_pixel
                    WU_WEIGHT(ix, yy), WU_WEIGHT(xx, yy)};
   // multiply the intensities by the colour, and saturating-add them to the pixels
   for (int i = 0; i < 4; i++) {
-    CRGB led = getPixelColorXY((x >> 8) + (i & 1), (y >> 8) + ((i >> 1) & 1));
+    int wu_x = (x >> 8) + (i & 1);        // WLEDMM precalculate x
+    int wu_y = (y >> 8) + ((i >> 1) & 1); // WLEDMM precalculate y
+    CRGB led = getPixelColorXY(wu_x, wu_y);
     CRGB oldLed = led;
     led.r = qadd8(led.r, c.r * wu[i] >> 8);
     led.g = qadd8(led.g, c.g * wu[i] >> 8);
     led.b = qadd8(led.b, c.b * wu[i] >> 8);
-    if (led != oldLed) setPixelColorXY(int((x >> 8) + (i & 1)), int((y >> 8) + ((i >> 1) & 1)), led); // WLEDMM don't repaint same color
+    if (led != oldLed) setPixelColorXY(wu_x, wu_y, led); // WLEDMM don't repaint same color
   }
 }
 #undef WU_WEIGHT

From 813b3705c1fb823851e8293e575c7d2d89e0d3c2 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 30 Sep 2024 17:33:25 +0200
Subject: [PATCH 040/232] Akemi bugfix for panel width > 32

due to a math accident, Akemi did not show proper GEQ bands in its hands when width>32.
---
 wled00/FX.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 931f74b2..2d44708d 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -7998,11 +7998,12 @@ uint16_t mode_2DAkemi(void) {
 
   //add geq left and right
   if (um_data) {
-    for (int x=0; x < cols/8; x++) {
-      uint16_t band = x * cols/8;
+    int xMax = cols/8;
+    for (int x=0; x < xMax; x++) {
+      size_t band = map2(x, 0, max(xMax,4), 0, 15);  // map 0..cols/8 to 16 GEQ bands
+      CRGB color = SEGMENT.color_from_palette((band * 35), false, PALETTE_SOLID_WRAP, 0);
       band = constrain(band, 0, 15);
       uint16_t barHeight = map(fftResult[band], 0, 255, 0, 17*rows/32);
-      CRGB color = SEGMENT.color_from_palette((band * 35), false, PALETTE_SOLID_WRAP, 0);
 
       for (int y=0; y < barHeight; y++) {
         SEGMENT.setPixelColorXY(x, rows/2-y, color);

From b0a7330a310ba1cf58b0f4b6715630ab4a3e6b23 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 30 Sep 2024 17:35:14 +0200
Subject: [PATCH 041/232] Akemi memory saver

lossless getPixelColor buffer is not needed for Akemi.
---
 wled00/FX.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 2d44708d..c2b66d83 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -7957,7 +7957,7 @@ uint16_t mode_2DAkemi(void) {
   const uint16_t cols = SEGMENT.virtualWidth();
   const uint16_t rows = SEGMENT.virtualHeight();
 
-  if (SEGENV.call == 0) {SEGMENT.setUpLeds(); SEGMENT.fill(BLACK);}
+  if (SEGENV.call == 0) {SEGMENT.fill(BLACK);}
 
   uint16_t counter = (strip.now * ((SEGMENT.speed >> 2) +2)) & 0xFFFF;
   counter = counter >> 8;

From 9ed787c0860bb0297a25a962cc83dcc92a9db0ff Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 30 Sep 2024 18:35:14 +0200
Subject: [PATCH 042/232] colored burst effect bugfix (swapped XY dimensions)

fixing a bug where width and height got swapped (visible on non-square panels)
---
 wled00/FX.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index c2b66d83..494d03d7 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -4982,8 +4982,8 @@ uint16_t mode_2DColoredBursts() {              // By: ldirko   https://editor.so
   SEGMENT.fadeToBlackBy(40);
   for (size_t i = 0; i < numLines; i++) {
     byte x1 = beatsin8(2 + SEGMENT.speed/16, 0, (cols - 1));
-    byte x2 = beatsin8(1 + SEGMENT.speed/16, 0, (cols - 1));
-    byte y1 = beatsin8(5 + SEGMENT.speed/16, 0, (rows - 1), 0, i * 24);
+    byte x2 = beatsin8(1 + SEGMENT.speed/16, 0, (rows - 1));
+    byte y1 = beatsin8(5 + SEGMENT.speed/16, 0, (cols - 1), 0, i * 24);
     byte y2 = beatsin8(3 + SEGMENT.speed/16, 0, (rows - 1), 0, i * 48 + 64);
     CRGB color = ColorFromPalette(SEGPALETTE, i * 255 / numLines + (SEGENV.aux0&0xFF), 255, LINEARBLEND);
 

From 283a7284b491bf3d11f663b25d86bb17f20549b3 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Wed, 2 Oct 2024 09:15:46 -0400
Subject: [PATCH 043/232] ES8311 support added for the ESP32-P4 EV board with
 mic.

---
 usermods/audioreactive/audio_reactive.h |  16 +++-
 usermods/audioreactive/audio_source.h   | 100 ++++++++++++++++++++++++
 2 files changed, 115 insertions(+), 1 deletion(-)

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index 1c46e33a..cbf21523 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -2022,7 +2022,16 @@ class AudioReactive : public Usermod {
           if ((sclPin >= 0) && (i2c_scl < 0)) i2c_scl = sclPin;
           if (i2c_sda >= 0) sdaPin = -1;                        // -1 = use global
           if (i2c_scl >= 0) sclPin = -1;
-
+        case 9:
+          DEBUGSR_PRINTLN(F("AR: ES8311 Source (Mic)"));
+          audioSource = new ES8311Source(SAMPLE_RATE, BLOCK_SIZE, 1.0f);
+          //useInputFilter = 0; // to disable low-cut software filtering and restore previous behaviour
+          delay(100);
+          // WLEDMM align global pins
+          if ((sdaPin >= 0) && (i2c_sda < 0)) i2c_sda = sdaPin; // copy usermod prefs into globals (if globals not defined)
+          if ((sclPin >= 0) && (i2c_scl < 0)) i2c_scl = sclPin;
+          if (i2c_sda >= 0) sdaPin = -1;                        // -1 = use global
+          if (i2c_scl >= 0) sclPin = -1;
           if (audioSource) audioSource->initialize(i2swsPin, i2ssdPin, i2sckPin, mclkPin);
           break;
 
@@ -2934,6 +2943,11 @@ class AudioReactive : public Usermod {
       #else
         oappend(SET_F("addOption(dd,'AC101 ☾',8);"));
       #endif
+      #if SR_DMTYPE==9
+        oappend(SET_F("addOption(dd,'ES8311 ☾ (⎌)',9);"));
+      #else
+        oappend(SET_F("addOption(dd,'ES8311 ☾',9);"));
+      #endif
       #ifdef SR_SQUELCH
         oappend(SET_F("addInfo(ux+':config:squelch',1,'<i>&#9100; ")); oappendi(SR_SQUELCH); oappend("</i>');");  // 0 is field type, 1 is actual field
       #endif
diff --git a/usermods/audioreactive/audio_source.h b/usermods/audioreactive/audio_source.h
index 77111446..61f37c4f 100644
--- a/usermods/audioreactive/audio_source.h
+++ b/usermods/audioreactive/audio_source.h
@@ -640,6 +640,106 @@ class ES8388Source : public I2SSource {
 
 };
 
+/* ES8311 Sound Module
+   This is an I2S sound processing unit that requires initialization over
+   I2C before I2S data can be received. 
+*/
+class ES8311Source : public I2SSource {
+  private:
+    // I2C initialization functions for es8311
+    void _es8311I2cBegin() {
+      Wire.setClock(100000);
+    }
+
+    void _es8311I2cWrite(uint8_t reg, uint8_t val) {
+      #ifndef ES8311_ADDR
+        #define ES8311_ADDR 0x18   // default address is... foggy
+      #endif
+      Wire.beginTransmission(ES8311_ADDR);
+      Wire.write((uint8_t)reg);
+      Wire.write((uint8_t)val);
+      uint8_t i2cErr = Wire.endTransmission();  // i2cErr == 0 means OK
+      if (i2cErr != 0) {
+        DEBUGSR_PRINTF("AR: ES8311 I2C write failed with error=%d  (addr=0x%X, reg 0x%X, val 0x%X).\n", i2cErr, ES8311_ADDR, reg, val);
+      }
+    }
+
+    void _es8311InitAdc() {
+      // 
+      // Currently only tested with the ESP32-P4 EV board with the onboard mic.
+      // Datasheet with I2C commands: https://dl.xkwy2018.com/downloads/RK3588/01_Official%20Release/04_Product%20Line%20Branch_NVR/02_Key%20Device%20Specifications/ES8311%20DS.pdf
+      //
+      _es8311I2cBegin(); 
+      _es8311I2cWrite(0x00, 0b00011111); // RESET, default value
+      _es8311I2cWrite(0x45, 0b00000000); // GP, default value
+      _es8311I2cWrite(0x01, 0b00111010); // CLOCK MANAGER was 0b00110000 trying 0b00111010 (MCLK enable?)
+
+      _es8311I2cWrite(0x02, 0b00000000); // 22050hz calculated
+      _es8311I2cWrite(0x05, 0b00000000); // 22050hz calculated
+      _es8311I2cWrite(0x03, 0b00010000); // 22050hz calculated
+      _es8311I2cWrite(0x04, 0b00010000); // 22050hz calculated
+      _es8311I2cWrite(0x07, 0b00000000); // 22050hz calculated
+      _es8311I2cWrite(0x08, 0b11111111); // 22050hz calculated
+      _es8311I2cWrite(0x06, 0b11100011); // 22050hz calculated
+
+      _es8311I2cWrite(0x16, 0b00100000); // ADC was 0b00000011 trying 0b00100100 now 
+      _es8311I2cWrite(0x0B, 0b00000000); // SYSTEM at default
+      _es8311I2cWrite(0x0C, 0b00100000); // SYSTEM was 0b00001111 trying 0b00100000
+      _es8311I2cWrite(0x10, 0b00010011); // SYSTEM was 0b00011111 trying 0b00010011
+      _es8311I2cWrite(0x11, 0b01111100); // SYSTEM was 0b01111111 trying 0b01111100
+      _es8311I2cWrite(0x00, 0b11000000); // *** RESET (again - seems important?)
+      _es8311I2cWrite(0x01, 0b00111010); // CLOCK MANAGER was 0b00111111 trying 0b00111010 (again??)
+      _es8311I2cWrite(0x14, 0b00010000); // *** SYSTEM was 0b00011010 trying 0b00010000 (or 0b01111010) (PGA gain)
+      _es8311I2cWrite(0x12, 0b00000000); // SYSTEM - DAC, likely don't care
+      _es8311I2cWrite(0x13, 0b00010000); // SYSTEM - output, likely don't cate
+      _es8311I2cWrite(0x09, 0b00001000); // SDP IN (likely don't care) was 0b00001100 (16-bit) - changed to 0b00001000 (I2S 32-bit)
+      _es8311I2cWrite(0x0A, 0b00001000); // *** SDP OUT, was 0b00001100 trying 0b00001000 (I2S 32-bit)
+      _es8311I2cWrite(0x0E, 0b00000010); // *** SYSTEM was 0b00000010 trying 0b00011010 (seems best so far!) (or 0b00000010)
+      _es8311I2cWrite(0x0F, 0b01000100); // SYSTEM was 0b01000100
+      _es8311I2cWrite(0x15, 0b00000000); // ADC soft ramp (disabled)
+      _es8311I2cWrite(0x1B, 0b00000101); // ADC soft-mute was 0b00000101
+      _es8311I2cWrite(0x1C, 0b01100101); // ADC EQ and offset freeze was 0b01100101 (bad at 0b00101100)
+      _es8311I2cWrite(0x17, 0b10111111); // ADC volume was 0b11111111 trying ADC volume 0b10111111 = 0db (maxgain) 0x16
+      _es8311I2cWrite(0x44, 0b00000000); // 0b10000000 - loopback test. on: 0x88; off: 0x00; mic--" speak
+
+    }
+
+  public:
+    ES8311Source(SRate_t sampleRate, int blockSize, float sampleScale = 1.0f, bool i2sMaster=true) :
+      I2SSource(sampleRate, blockSize, sampleScale, i2sMaster) {
+      _config.channel_format = I2S_CHANNEL_FMT_ONLY_LEFT;
+    };
+
+    void initialize(int8_t i2swsPin, int8_t i2ssdPin, int8_t i2sckPin, int8_t mclkPin) {
+      DEBUGSR_PRINTLN("es8311Source:: initialize();");
+
+      // if ((i2sckPin < 0) || (mclkPin < 0)) { // WLEDMM not sure if this check is needed here, too
+      //    ERRORSR_PRINTF("\nAR: invalid I2S es8311 pin: SCK=%d, MCLK=%d\n", i2sckPin, mclkPin); 
+      //    return;
+      // }
+      // BUG: "use global I2C pins" are valid as -1, and -1 is seen as invalid here.
+      // Workaround: Set I2C pins here, which will also set them globally.
+      // Bug also exists in ES7243.
+       if ((i2c_sda < 0) || (i2c_scl < 0)) {  // check that global I2C pins are not "undefined"
+        ERRORSR_PRINTF("\nAR: invalid es8311 global I2C pins: SDA=%d, SCL=%d\n", i2c_sda, i2c_scl); 
+        return;
+      }
+      if (!pinManager.joinWire(i2c_sda, i2c_scl)) {    // WLEDMM specific: start I2C with globally defined pins
+        ERRORSR_PRINTF("\nAR: failed to join I2C bus with SDA=%d, SCL=%d\n", i2c_sda, i2c_scl); 
+        return;
+      }
+
+      // First route mclk, then configure ADC over I2C, then configure I2S
+      _es8311InitAdc();
+      I2SSource::initialize(i2swsPin, i2ssdPin, i2sckPin, mclkPin);
+    }
+
+    void deinitialize() {
+      I2SSource::deinitialize();
+    }
+
+};
+
 class WM8978Source : public I2SSource {
   private:
     // I2C initialization functions for WM8978

From 79f5db6d65a49a0252831562d763c91651999d5b Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 2 Oct 2024 16:12:48 +0200
Subject: [PATCH 044/232] fadePixelColorXY bugfix

---
 wled00/FX_2Dfcn.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 03919f8e..6ca95e13 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -506,8 +506,9 @@ void IRAM_ATTR_YN Segment::addPixelColorXY(int x, int y, uint32_t color, bool fa
 
 void Segment::fadePixelColorXY(uint16_t x, uint16_t y, uint8_t fade) {
   // if (!isActive()) return; // not active //WLEDMM sanity check is repeated in getPixelColorXY / setPixelColorXY
-  CRGB oldPix = CRGB(getPixelColorXY(x,y));
-  CRGB pix = oldPix.nscale8_video(fade);
+  CRGB pix = CRGB(getPixelColorXY(x,y));
+  CRGB oldPix = pix;
+  pix = pix.nscale8_video(fade);
   if (pix != oldPix) setPixelColorXY(int(x), int(y), pix);
 }
 

From b436a595ef042686b96d3401de974f1569d31812 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 2 Oct 2024 16:34:36 +0200
Subject: [PATCH 045/232] bugfix for holes in 2D DNA Spiral

Holes were visible at height > 32. Root cause: "lerp8x8" seems to be inaccurate --> replaced by a simple linear calculation.
---
 wled00/FX.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 494d03d7..01b9e517 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5067,10 +5067,12 @@ uint16_t mode_2DDNASpiral() {               // By: ldirko  https://editor.soulma
     if ((i + ms / 8) & 3) {
       // draw a gradient line between x and x1
       x = x / 2; x1 = x1 / 2;
-      uint8_t steps = abs8(x - x1) + 1;
+      unsigned steps = abs8(x - x1) + 1;
+      bool positive = (x1 >= x);                         // direction of drawing
       for (size_t k = 1; k <= steps; k++) {
-        uint8_t rate = k * 255 / steps;
-        uint8_t dx = lerp8by8(x, x1, rate);
+        unsigned rate = k * 255 / steps;
+        //unsigned dx = lerp8by8(x, x1, rate);
+        unsigned dx = positive? (x + k-1) : (x - k+1);   // behaves the same as "lerp8by8" but does not create holes
         //SEGMENT.setPixelColorXY(dx, i, ColorFromPalette(SEGPALETTE, hue, 255, LINEARBLEND).nscale8_video(rate));
         SEGMENT.addPixelColorXY(dx, i, ColorFromPalette(SEGPALETTE, hue, 255, LINEARBLEND)); // use setPixelColorXY for different look
         SEGMENT.fadePixelColorXY(dx, i, rate);

From 16644f838ae4819dd5002df5ed6e239bf526d93f Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Wed, 2 Oct 2024 19:20:19 +0100
Subject: [PATCH 046/232] Remove stray commma from _data_FX_MODE_2DGAMEOFLIFE

---
 wled00/FX.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 01b9e517..f96deabe 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5379,7 +5379,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
   SEGENV.step = strip.now;
   return FRAMETIME;
 } // mode_2Dgameoflife()
-static const char _data_FX_MODE_2DGAMEOFLIFE[] PROGMEM = "Game Of Life@!,Color Mutation ☾,Blur ☾,,,All Colors ☾,Overlay BG ☾,Wrap ☾,;!,!;!;2;sx=56,ix=2,c1=128,o1=0,o2=0,o3=1"; 
+static const char _data_FX_MODE_2DGAMEOFLIFE[] PROGMEM = "Game Of Life@!,Color Mutation ☾,Blur ☾,,,All Colors ☾,Overlay BG ☾,Wrap ☾;!,!;!;2;sx=56,ix=2,c1=128,o1=0,o2=0,o3=1"; 
 
 /////////////////////////
 //     2D Hiphotic     //

From 3a38d0cfed9485bb635e3c037f153a4252435f77 Mon Sep 17 00:00:00 2001
From: Blaz Kristan <blaz@kristan-sp.si>
Date: Wed, 2 Oct 2024 20:15:58 +0200
Subject: [PATCH 047/232] Fix for #4005

---
 wled00/wled.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index 5858f800..3c86c4b0 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -308,6 +308,7 @@ void WLED::loop()
       delete busConfigs[i]; busConfigs[i] = nullptr;
     }
     strip.finalizeInit();
+    busses.setBrightness(bri); // fix re-initialised bus' brightness #4005
     loadLedmap = true;
     if (aligned) strip.makeAutoSegments();
     else strip.fixInvalidSegments();

From ebd16f6be4f39a1309b69545216325676e9decc6 Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Wed, 2 Oct 2024 18:12:03 -0400
Subject: [PATCH 048/232] Snow Fall - Minor Changes

---
 wled00/FX.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index ba13aaa5..5b1f3515 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5421,16 +5421,16 @@ uint16_t mode_2DSnowFall(void) { // By: Brandon Butler
   // Despawn snow
   bool overflow = SEGENV.aux0 && SEGMENT.check3;
   int despawnChance = SEGMENT.custom1 == 255 ? 256 : map(SEGMENT.custom1, 0, 255, 0, 100); // 255 goes to 256, allows always despawn
-  int y = rows - 1;
+  int lastY = rows - 1;
   for (int x = 0; x < cols; x++) {
-    if (overflow || random8() < despawnChance) setBitValue(grid, y * cols + x, 0);
-    if (overlay  || getBitValue(grid, y * cols + x)) continue; // Skip drawing if inverted overlay or snow
-    SEGMENT.blendPixelColorXY(x, y, bgColor, blur);
+    if (overflow || random8() < despawnChance) setBitValue(grid, lastY * cols + x, 0);
+    if (overlay  || getBitValue(grid, lastY * cols + x)) continue; // Skip drawing if inverted overlay or snow
+    SEGMENT.blendPixelColorXY(x, lastY, bgColor, blur);
   }
   if (SEGENV.aux0) --SEGENV.aux0; // Decrease overflow 
 
   // Precompute shuffled indices, helps randomize snow movement
-  int shuffledIndices[cols];
+  uint16_t shuffledIndices[cols];
   for (int i = 0; i < cols; i++) shuffledIndices[i] = i;
   std::random_shuffle(shuffledIndices, shuffledIndices + cols);
 
@@ -5484,13 +5484,13 @@ uint16_t mode_2DSnowFall(void) { // By: Brandon Butler
     if (overlay) continue;   // Skip drawing if inverted overlay
 
     if (SEGMENT.check1) SEGMENT.setPixelColorXY(x, 0, ColorFromPalette(SEGPALETTE, random8())); // Use palette
-    else {int c = random8(80,200); SEGMENT.setPixelColorXY(x, 0, c, c, c);}                     // Use snow color
+    else {int c = random8(120,200); SEGMENT.setPixelColorXY(x, 0, c, c, c);}                    // Use snow color
   }
   
   SEGENV.step = strip.now;
   return FRAMETIME;
 } // mode_2DSnowFall()
-static const char _data_FX_MODE_2DSNOWFALL[] PROGMEM = "Snow Fall@!,Spawn Rate,Despawn Rate,Blur,Sway Chance,Use Palette,Inverted Overlay,Prevent Overflow,;!,!;!;2;sx=128,ix=16,c1=17,c2=0,c3=0,o1=0,o2=0,o3=1";
+static const char _data_FX_MODE_2DSNOWFALL[] PROGMEM = "Snow Fall ☾@!,Spawn Rate,Despawn Rate,Blur,Sway Chance,Use Palette,Inverted Overlay,Prevent Overflow,;!,!;!;2;sx=128,ix=16,c1=17,c2=0,c3=0,o1=0,o2=0,o3=1";
 
 /////////////////////////
 //     2D Hiphotic     //

From 1e5b246871b1b034f1e93c4c5d3f4a9863f1b597 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 3 Oct 2024 00:19:18 +0200
Subject: [PATCH 049/232] small fixes

very minor changes:
* HUB75 bus don't leave _len uninitialized, handle display == nullptr before using display members
* __attribute__((pure)) was in the wrong location
* wled00.ino: made lps (loops-per-second) calculation a bit more accurate
---
 wled00/FX.h            | 4 ++--
 wled00/bus_manager.cpp | 6 ++++++
 wled00/wled00.ino      | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/wled00/FX.h b/wled00/FX.h
index 04eabe70..19175985 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -945,9 +945,9 @@ class WS2812FX {  // 96 bytes
       milliampsPerLed,
       cctBlending,
       getActiveSegmentsNum(void)  const,
-      getFirstSelectedSegId(void) __attribute__((pure)),
+      __attribute__((pure)) getFirstSelectedSegId(void),
       getLastActiveSegmentId(void) const,
-      getActiveSegsLightCapabilities(bool selectedOnly = false) __attribute__((pure)),
+      __attribute__((pure)) getActiveSegsLightCapabilities(bool selectedOnly = false),
       setPixelSegment(uint8_t n);
 
     inline uint8_t getBrightness(void)  const { return _brightness; }
diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index cb3d8fac..82e2c015 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -527,6 +527,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
   _valid = false;
   fourScanPanel = nullptr;
+  _len = 0;
 
     mxconfig.double_buff = false; // Use our own memory-optimised buffer rather than the driver's own double-buffer  
  
@@ -744,6 +745,11 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
   // OK, now we can create our matrix object
   display = new MatrixPanel_I2S_DMA(mxconfig);
+  if (display == nullptr) {
+      USER_PRINTLN("****** MatrixPanel_I2S_DMA !KABOOM! driver allocation failed ***********");
+      USER_PRINT(F("heap usage: ")); USER_PRINTLN(lastHeap - ESP.getFreeHeap());
+      return;
+  }
 
   this->_len = (display->width() * display->height());
 
diff --git a/wled00/wled00.ino b/wled00/wled00.ino
index b19441a2..6f1f22d5 100644
--- a/wled00/wled00.ino
+++ b/wled00/wled00.ino
@@ -74,7 +74,10 @@ void loop() {
   //WLEDMM show loops per second
   loopCounter++;
   if (millis() - lastMillis >= 10000) {
-    //USER_PRINTF("%lu lps\n",loopCounter/10);
+    long delta = millis() - lastMillis;
+    if (delta > 0) {
+      //USER_PRINTF("%lu lps\n",(loopCounter*1000U) / delta);
+    }
     lastMillis = millis();
     loopCounter = 0;
   }

From 5b1877e343d763581cf569a1fa908c08b1fa9339 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 3 Oct 2024 20:12:28 +0200
Subject: [PATCH 050/232] Change to EUPL-1.2

---
 Aircoookie_LICENSE |  24 --
 LICENSE            | 965 ++++++++++++++-------------------------------
 package-lock.json  |   2 +-
 package.json       |   2 +-
 readme.md          |   3 +
 5 files changed, 296 insertions(+), 700 deletions(-)
 delete mode 100644 Aircoookie_LICENSE

diff --git a/Aircoookie_LICENSE b/Aircoookie_LICENSE
deleted file mode 100644
index 30fd7534..00000000
--- a/Aircoookie_LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-The license below is valid for the code that is common with upstream "AC WLED" from https://github.com/Aircoookie/WLED.
-Additions and code changes that are exclusive to this fork ("MoonModules WLED") are under GPLv3 license, see LICENSE.
-
-MIT License
-
-Copyright (c) 2016 Christian Schwinne
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index f288702d..22953c3c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,674 +1,291 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+                      EUROPEAN UNION PUBLIC LICENCE v. 1.2
+                      EUPL © the European Union 2007, 2016
+
+This European Union Public Licence (the ‘EUPL’) applies to the Work (as
+defined below) which is provided under the terms of this Licence. Any use of
+the Work, other than as authorised under this Licence is prohibited (to the
+extent such use is covered by a right of the copyright holder of the Work).
+
+The Work is provided under the terms of this Licence when the Licensor (as
+defined below) has placed the following notice immediately following the
+copyright notice for the Work:
+
+        Licensed under the EUPL
+
+or has expressed by any other means his willingness to license under the EUPL.
+
+1. Definitions
+
+In this Licence, the following terms have the following meaning:
+
+- ‘The Licence’: this Licence.
+
+- ‘The Original Work’: the work or software distributed or communicated by the
+  Licensor under this Licence, available as Source Code and also as Executable
+  Code as the case may be.
+
+- ‘Derivative Works’: the works or software that could be created by the
+  Licensee, based upon the Original Work or modifications thereof. This
+  Licence does not define the extent of modification or dependence on the
+  Original Work required in order to classify a work as a Derivative Work;
+  this extent is determined by copyright law applicable in the country
+  mentioned in Article 15.
+
+- ‘The Work’: the Original Work or its Derivative Works.
+
+- ‘The Source Code’: the human-readable form of the Work which is the most
+  convenient for people to study and modify.
+
+- ‘The Executable Code’: any code which has generally been compiled and which
+  is meant to be interpreted by a computer as a program.
+
+- ‘The Licensor’: the natural or legal person that distributes or communicates
+  the Work under the Licence.
+
+- ‘Contributor(s)’: any natural or legal person who modifies the Work under
+  the Licence, or otherwise contributes to the creation of a Derivative Work.
+
+- ‘The Licensee’ or ‘You’: any natural or legal person who makes any usage of
+  the Work under the terms of the Licence.
+
+- ‘Distribution’ or ‘Communication’: any act of selling, giving, lending,
+  renting, distributing, communicating, transmitting, or otherwise making
+  available, online or offline, copies of the Work or providing access to its
+  essential functionalities at the disposal of any other natural or legal
+  person.
+
+2. Scope of the rights granted by the Licence
+
+The Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+sublicensable licence to do the following, for the duration of copyright
+vested in the Original Work:
+
+- use the Work in any circumstance and for all usage,
+- reproduce the Work,
+- modify the Work, and make Derivative Works based upon the Work,
+- communicate to the public, including the right to make available or display
+  the Work or copies thereof to the public and perform publicly, as the case
+  may be, the Work,
+- distribute the Work or copies thereof,
+- lend and rent the Work or copies thereof,
+- sublicense rights in the Work or copies thereof.
+
+Those rights can be exercised on any media, supports and formats, whether now
+known or later invented, as far as the applicable law permits so.
+
+In the countries where moral rights apply, the Licensor waives his right to
+exercise his moral right to the extent allowed by law in order to make
+effective the licence of the economic rights here above listed.
+
+The Licensor grants to the Licensee royalty-free, non-exclusive usage rights
+to any patents held by the Licensor, to the extent necessary to make use of
+the rights granted on the Work under this Licence.
+
+3. Communication of the Source Code
+
+The Licensor may provide the Work either in its Source Code form, or as
+Executable Code. If the Work is provided as Executable Code, the Licensor
+provides in addition a machine-readable copy of the Source Code of the Work
+along with each copy of the Work that the Licensor distributes or indicates,
+in a notice following the copyright notice attached to the Work, a repository
+where the Source Code is easily and freely accessible for as long as the
+Licensor continues to distribute or communicate the Work.
+
+4. Limitations on copyright
+
+Nothing in this Licence is intended to deprive the Licensee of the benefits
+from any exception or limitation to the exclusive rights of the rights owners
+in the Work, of the exhaustion of those rights or of other applicable
+limitations thereto.
+
+5. Obligations of the Licensee
+
+The grant of the rights mentioned above is subject to some restrictions and
+obligations imposed on the Licensee. Those obligations are the following:
+
+Attribution right: The Licensee shall keep intact all copyright, patent or
+trademarks notices and all notices that refer to the Licence and to the
+disclaimer of warranties. The Licensee must include a copy of such notices and
+a copy of the Licence with every copy of the Work he/she distributes or
+communicates. The Licensee must cause any Derivative Work to carry prominent
+notices stating that the Work has been modified and the date of modification.
+
+Copyleft clause: If the Licensee distributes or communicates copies of the
+Original Works or Derivative Works, this Distribution or Communication will be
+done under the terms of this Licence or of a later version of this Licence
+unless the Original Work is expressly distributed only under this version of
+the Licence — for example by communicating ‘EUPL v. 1.2 only’. The Licensee
+(becoming Licensor) cannot offer or impose any additional terms or conditions
+on the Work or Derivative Work that alter or restrict the terms of the
+Licence.
+
+Compatibility clause: If the Licensee Distributes or Communicates Derivative
+Works or copies thereof based upon both the Work and another work licensed
+under a Compatible Licence, this Distribution or Communication can be done
+under the terms of this Compatible Licence. For the sake of this clause,
+‘Compatible Licence’ refers to the licences listed in the appendix attached to
+this Licence. Should the Licensee's obligations under the Compatible Licence
+conflict with his/her obligations under this Licence, the obligations of the
+Compatible Licence shall prevail.
+
+Provision of Source Code: When distributing or communicating copies of the
+Work, the Licensee will provide a machine-readable copy of the Source Code or
+indicate a repository where this Source will be easily and freely available
+for as long as the Licensee continues to distribute or communicate the Work.
+
+Legal Protection: This Licence does not grant permission to use the trade
+names, trademarks, service marks, or names of the Licensor, except as required
+for reasonable and customary use in describing the origin of the Work and
+reproducing the content of the copyright notice.
+
+6. Chain of Authorship
+
+The original Licensor warrants that the copyright in the Original Work granted
+hereunder is owned by him/her or licensed to him/her and that he/she has the
+power and authority to grant the Licence.
+
+Each Contributor warrants that the copyright in the modifications he/she
+brings to the Work are owned by him/her or licensed to him/her and that he/she
+has the power and authority to grant the Licence.
+
+Each time You accept the Licence, the original Licensor and subsequent
+Contributors grant You a licence to their contributions to the Work, under the
+terms of this Licence.
+
+7. Disclaimer of Warranty
+
+The Work is a work in progress, which is continuously improved by numerous
+Contributors. It is not a finished work and may therefore contain defects or
+‘bugs’ inherent to this type of development.
+
+For the above reason, the Work is provided under the Licence on an ‘as is’
+basis and without warranties of any kind concerning the Work, including
+without limitation merchantability, fitness for a particular purpose, absence
+of defects or errors, accuracy, non-infringement of intellectual property
+rights other than copyright as stated in Article 6 of this Licence.
+
+This disclaimer of warranty is an essential part of the Licence and a
+condition for the grant of any rights to the Work.
+
+8. Disclaimer of Liability
+
+Except in the cases of wilful misconduct or damages directly caused to natural
+persons, the Licensor will in no event be liable for any direct or indirect,
+material or moral, damages of any kind, arising out of the Licence or of the
+use of the Work, including without limitation, damages for loss of goodwill,
+work stoppage, computer failure or malfunction, loss of data or any commercial
+damage, even if the Licensor has been advised of the possibility of such
+damage. However, the Licensor will be liable under statutory product liability
+laws as far such laws apply to the Work.
+
+9. Additional agreements
+
+While distributing the Work, You may choose to conclude an additional
+agreement, defining obligations or services consistent with this Licence.
+However, if accepting obligations, You may act only on your own behalf and on
+your sole responsibility, not on behalf of the original Licensor or any other
+Contributor, and only if You agree to indemnify, defend, and hold each
+Contributor harmless for any liability incurred by, or claims asserted against
+such Contributor by the fact You have accepted any warranty or additional
+liability.
+
+10. Acceptance of the Licence
+
+The provisions of this Licence can be accepted by clicking on an icon ‘I
+agree’ placed under the bottom of a window displaying the text of this Licence
+or by affirming consent in any other similar way, in accordance with the rules
+of applicable law. Clicking on that icon indicates your clear and irrevocable
+acceptance of this Licence and all of its terms and conditions.
+
+Similarly, you irrevocably accept this Licence and all of its terms and
+conditions by exercising any rights granted to You by Article 2 of this
+Licence, such as the use of the Work, the creation by You of a Derivative Work
+or the Distribution or Communication by You of the Work or copies thereof.
+
+11. Information to the public
+
+In case of any Distribution or Communication of the Work by means of
+electronic communication by You (for example, by offering to download the Work
+from a remote location) the distribution channel or media (for example, a
+website) must at least provide to the public the information requested by the
+applicable law regarding the Licensor, the Licence and the way it may be
+accessible, concluded, stored and reproduced by the Licensee.
+
+12. Termination of the Licence
+
+The Licence and the rights granted hereunder will terminate automatically upon
+any breach by the Licensee of the terms of the Licence.
+
+Such a termination will not terminate the licences of any person who has
+received the Work from the Licensee under the Licence, provided such persons
+remain in full compliance with the Licence.
+
+13. Miscellaneous
+
+Without prejudice of Article 9 above, the Licence represents the complete
+agreement between the Parties as to the Work.
+
+If any provision of the Licence is invalid or unenforceable under applicable
+law, this will not affect the validity or enforceability of the Licence as a
+whole. Such provision will be construed or reformed so as necessary to make it
+valid and enforceable.
+
+The European Commission may publish other linguistic versions or new versions
+of this Licence or updated versions of the Appendix, so far this is required
+and reasonable, without reducing the scope of the rights granted by the
+Licence. New versions of the Licence will be published with a unique version
+number.
+
+All linguistic versions of this Licence, approved by the European Commission,
+have identical value. Parties can take advantage of the linguistic version of
+their choice.
+
+14. Jurisdiction
+
+Without prejudice to specific agreement between parties,
+
+- any litigation resulting from the interpretation of this License, arising
+  between the European Union institutions, bodies, offices or agencies, as a
+  Licensor, and any Licensee, will be subject to the jurisdiction of the Court
+  of Justice of the European Union, as laid down in article 272 of the Treaty
+  on the Functioning of the European Union,
+
+- any litigation arising between other parties and resulting from the
+  interpretation of this License, will be subject to the exclusive
+  jurisdiction of the competent court where the Licensor resides or conducts
+  its primary business.
+
+15. Applicable Law
+
+Without prejudice to specific agreement between parties,
+
+- this Licence shall be governed by the law of the European Union Member State
+  where the Licensor has his seat, resides or has his registered office,
+
+- this licence shall be governed by Belgian law if the Licensor has no seat,
+  residence or registered office inside a European Union Member State.
+
+Appendix
+
+‘Compatible Licences’ according to Article 5 EUPL are:
+
+- GNU General Public License (GPL) v. 2, v. 3
+- GNU Affero General Public License (AGPL) v. 3
+- Open Software License (OSL) v. 2.1, v. 3.0
+- Eclipse Public License (EPL) v. 1.0
+- CeCILL v. 2.0, v. 2.1
+- Mozilla Public Licence (MPL) v. 2
+- GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3
+- Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) for
+  works other than software
+- European Union Public Licence (EUPL) v. 1.1, v. 1.2
+- Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) or Strong
+  Reciprocity (LiLiQ-R+).
+
+The European Commission may update this Appendix to later versions of the
+above licences without producing a new version of the EUPL, as long as they
+provide the rights granted in Article 2 of this Licence and protect the
+covered Source Code from exclusive appropriation.
+
+All other changes or additions to this Appendix require the production of a
+new EUPL version.
diff --git a/package-lock.json b/package-lock.json
index aa060721..59697131 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,7 +7,7 @@
     "": {
       "name": "wled",
       "version": "0.14.1-b32.41.dev",
-      "license": "GPL-3.0-or-later",
+      "license": "EUPL-1.2",
       "dependencies": {
         "clean-css": "^4.2.3",
         "html-minifier-terser": "^5.1.1",
diff --git a/package.json b/package.json
index c73dd26f..b6763b33 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "url": "git+https://github.com/MoonModules/WLED.git"
   },
   "author": "",
-  "license": "GPL-3.0-or-later",
+  "license": "EUPL-1.2",
   "bugs": {
     "url": "https://github.com/MoonModules/WLED/issues"
   },
diff --git a/readme.md b/readme.md
index c1d5efab..323a712e 100644
--- a/readme.md
+++ b/readme.md
@@ -13,6 +13,9 @@
 # Welcome to WLED MoonModules! ✨
 
 <img width="400" alt="image" src="https://user-images.githubusercontent.com/91013628/230378884-5a0f15ee-1aa2-4998-9df7-ade9f32a3d0f.png">
+Licensed under the [EUPL-1.2](https://joinup.ec.europa.eu/collection/eupl) or later. The official license text is [available in 23 languages](https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12).
+
+<img width="30%" src="https://github.com/user-attachments/assets/c3051e0a-788e-4bcb-aab9-c2c9fedf5a31">
 
 MoonModules/WLED is a fork from [Aircoookie/WLED](https://github.com/Aircoookie/WLED) which contains latest merge of v0.14 of WLED with [additional features](https://mm.kno.wled.ge/moonmodules/what-is-moonmodules/).
 

From ea9dad8918431b070fe78f34ff688c7bd2b9a298 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 3 Oct 2024 20:14:50 +0200
Subject: [PATCH 051/232] Update readme.md

minor edit
---
 readme.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/readme.md b/readme.md
index 323a712e..054bd055 100644
--- a/readme.md
+++ b/readme.md
@@ -13,9 +13,8 @@
 # Welcome to WLED MoonModules! ✨
 
 <img width="400" alt="image" src="https://user-images.githubusercontent.com/91013628/230378884-5a0f15ee-1aa2-4998-9df7-ade9f32a3d0f.png">
-Licensed under the [EUPL-1.2](https://joinup.ec.europa.eu/collection/eupl) or later. The official license text is [available in 23 languages](https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12).
 
-<img width="30%" src="https://github.com/user-attachments/assets/c3051e0a-788e-4bcb-aab9-c2c9fedf5a31">
+Licensed under the [EUPL-1.2](https://joinup.ec.europa.eu/collection/eupl) or later. The official license text is [available in 23 languages](https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12).
 
 MoonModules/WLED is a fork from [Aircoookie/WLED](https://github.com/Aircoookie/WLED) which contains latest merge of v0.14 of WLED with [additional features](https://mm.kno.wled.ge/moonmodules/what-is-moonmodules/).
 

From f4e9292849572495cefe6bf7666460cb88629a3d Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Fri, 4 Oct 2024 22:49:00 +0100
Subject: [PATCH 052/232] Download all artifacts

---
 .github/workflows/wled-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml
index e875ca18..fe50e092 100644
--- a/.github/workflows/wled-ci.yml
+++ b/.github/workflows/wled-ci.yml
@@ -82,8 +82,6 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/')
     steps:
     - uses: actions/download-artifact@v4
-      with:
-        name: firmware-release-*
     - name: List Artifacts
       run: find ./
     - name: Create draft release

From 2bbb890fb933e2f0d02d7f927de05c1d3fcf7fcd Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Fri, 4 Oct 2024 22:51:10 +0100
Subject: [PATCH 053/232] tweak caching of build

---
 .github/workflows/wled-ci.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml
index fe50e092..deed4e69 100644
--- a/.github/workflows/wled-ci.yml
+++ b/.github/workflows/wled-ci.yml
@@ -50,10 +50,7 @@ jobs:
       uses: actions/cache@v4
       with:
         path: ~/.platformio
-        key: ${{ runner.os }}-${{ matrix.environment}}-${{ hashFiles('platformio.ini') }}
-        restore-keys: |
-          ${{ runner.os }}-${{ matrix.environment}}
-
+        key: ${{ runner.os }}-${{ matrix.environment}}
     - name: Set up Python
       uses: actions/setup-python@v5
       with:

From e665b3423687c3caddd921e405883fc88043c9fd Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Fri, 4 Oct 2024 23:02:03 +0100
Subject: [PATCH 054/232] Move bins to single directory

---
 .github/workflows/wled-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml
index deed4e69..4c4de1d7 100644
--- a/.github/workflows/wled-ci.yml
+++ b/.github/workflows/wled-ci.yml
@@ -80,7 +80,7 @@ jobs:
     steps:
     - uses: actions/download-artifact@v4
     - name: List Artifacts
-      run: find ./
+      run: find ./ -type f -name *.bin -exec mv -v {} ./ \;
     - name: Create draft release
       uses: softprops/action-gh-release@v1
       with:

From d429293741dc7ac9aa6ee9396d12ffedb0537ea8 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Fri, 4 Oct 2024 23:10:35 +0100
Subject: [PATCH 055/232] WLEDMM*.bin only

---
 .github/workflows/wled-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml
index 4c4de1d7..d311af4a 100644
--- a/.github/workflows/wled-ci.yml
+++ b/.github/workflows/wled-ci.yml
@@ -86,6 +86,6 @@ jobs:
       with:
         draft: True
         files: |
-          *.bin
+          WLEDMM*.bin
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 4fadcade939f7063114118286f2e6542cff1291a Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 6 Oct 2024 19:59:59 +0200
Subject: [PATCH 056/232] fix for off-by-one error in Lissajous (float version)

---
 wled00/FX.cpp       | 2 +-
 wled00/FX_2Dfcn.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 5b1f3515..a93c2843 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5654,7 +5654,7 @@ uint16_t mode_2DLissajous(void) {            // By: Andrew Tuline
         unsigned palIndex = (256*ylocn) + phase/2 + (i* SEGMENT.speed)/64;
         //SEGMENT.setPixelColorXY(xlocn, ylocn, SEGMENT.color_from_palette(palIndex, false, PALETTE_SOLID_WRAP, 0)); // draw pixel with anti-aliasing - color follows rotation
         // WLEDMM wu_pixel is 50% faster, and still lokks better
-        SEGMENT.wu_pixel(uint32_t(xlocn * (cols <<8)), uint32_t(ylocn * (rows <<8)), 
+        SEGMENT.wu_pixel(uint32_t(xlocn * ((cols-1) <<8)), uint32_t(ylocn * ((rows-1) <<8)), 
                          CRGB(SEGMENT.color_from_palette(palIndex, false, PALETTE_SOLID_WRAP, 0)));
       }
   } else
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 6ca95e13..34eefb58 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -466,8 +466,8 @@ void Segment::setPixelColorXY(float x, float y, uint32_t col, bool aa, bool fast
   }
 
 #else // replacement using wu_pixel
-  unsigned px = x * (virtualWidth() <<8);
-  unsigned py = y * (virtualHeight() <<8);
+  unsigned px = x * ((virtualWidth()-1) <<8);
+  unsigned py = y * ((virtualHeight()-1) <<8);
   wu_pixel(px, py, CRGB(col));
 #endif
 }

From 1b7cae0c593ebbb885956c67ac2132950bd0ff50 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 6 Oct 2024 20:12:56 +0200
Subject: [PATCH 057/232] comment added

---
 wled00/bus_manager.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 82e2c015..ab124b93 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -532,6 +532,8 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
     mxconfig.double_buff = false; // Use our own memory-optimised buffer rather than the driver's own double-buffer  
  
   // mxconfig.driver = HUB75_I2S_CFG::ICN2038S;  // experimental - use specific shift register driver
+  // mxconfig.driver = HUB75_I2S_CFG::FM6124;    // try this driver in case you panel stays dark, or when colors look too pastel
+
   // mxconfig.latch_blanking = 3;
   // mxconfig.i2sspeed = HUB75_I2S_CFG::HZ_10M;  // experimental - 5MHZ should be enugh, but colours looks slightly better at 10MHz
   // mxconfig.min_refresh_rate = 90;

From 16564007466d33411cf656af40f7b55c7b480c23 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 6 Oct 2024 21:32:07 +0200
Subject: [PATCH 058/232] bugfix for broken presets when segment name is very
 long

another off-by-one
---
 wled00/FX_fcn.cpp | 2 +-
 wled00/json.cpp   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index f2ed3e20..d6c80731 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -1747,7 +1747,7 @@ void WS2812FX::enumerateLedmaps() {
   //WLEDMM add segment names to be used as ledmap names
   uint8_t segment_index = 0;
   for (segment &seg : _segments) {
-    if (seg.name != nullptr && strcmp(seg.name, "") != 0) {
+    if (seg.name != nullptr && strlen(seg.name) > 0) {
       char fileName[33];
       snprintf_P(fileName, sizeof(fileName), PSTR("/lm%s.json"), seg.name);
       bool isFile = WLED_FS.exists(fileName);
diff --git a/wled00/json.cpp b/wled00/json.cpp
index a2b9514b..ac4d1ca5 100644
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@@ -145,9 +145,9 @@ bool deserializeSegment(JsonObject elem, byte it, byte presetId)
     const char * name = elem["n"].as<const char*>();
     size_t len = 0;
     if (name != nullptr) len = strlen(name);
-    if (len > 0 && len < 33) {
+    if (len > 0 && len < 32) {
       seg.name = new char[len+1];
-      if (seg.name) strlcpy(seg.name, name, 33);
+      if (seg.name) strlcpy(seg.name, name, len+1);
     } else {
       // but is empty (already deleted above)
       elem.remove("n");

From 8a0888ba8802ff66fbb92a1e440bc47492a22c45 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 6 Oct 2024 21:38:09 +0200
Subject: [PATCH 059/232] Pinwheel update for 128x128 pixels

---
 wled00/FX_fcn.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index d6c80731..1db62a15 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -841,11 +841,14 @@ constexpr int Pinwheel_Size_Big  = 50;         // larger than this -> use "XL"
 constexpr int Pinwheel_Steps_XL  = 368;
 constexpr int Pinwheel_Size_XL   = 58;         // larger than this -> use "XXL"
 constexpr int Pinwheel_Steps_XXL = 456;
+constexpr int Pinwheel_Size_XXL   = 68;        // larger than this -> use "LL"
+constexpr int Pinwheel_Steps_LL = 592;         // 128x64 no holes, 28fps
 constexpr float Int_to_Rad_Small = (DEG_TO_RAD * 360) / Pinwheel_Steps_Small;  // conversion: from 0...72 to Radians
 constexpr float Int_to_Rad_Med =   (DEG_TO_RAD * 360) / Pinwheel_Steps_Medium; // conversion: from 0...192 to Radians
 constexpr float Int_to_Rad_Big =   (DEG_TO_RAD * 360) / Pinwheel_Steps_Big;    // conversion: from 0...304 to Radians
 constexpr float Int_to_Rad_XL =    (DEG_TO_RAD * 360) / Pinwheel_Steps_XL;     // conversion: from 0...368 to Radians
 constexpr float Int_to_Rad_XXL =   (DEG_TO_RAD * 360) / Pinwheel_Steps_XXL;    // conversion: from 0...456 to Radians
+constexpr float Int_to_Rad_LL =   (DEG_TO_RAD * 360) / Pinwheel_Steps_LL;    // conversion: from 0...456 to Radians
 
 constexpr int Fixed_Scale = 512;               // fixpoint scaling factor (9bit for fraction)
 
@@ -856,8 +859,9 @@ static float getPinwheelAngle(int i, int vW, int vH) {
   if (maxXY <= Pinwheel_Size_Medium) return float(i) * Int_to_Rad_Med;
   if (maxXY <= Pinwheel_Size_Big)    return float(i) * Int_to_Rad_Big;
   if (maxXY <= Pinwheel_Size_XL)     return float(i) * Int_to_Rad_XL;
+  if (maxXY <= Pinwheel_Size_XXL)     return float(i) * Int_to_Rad_XXL;
   // else
-  return float(i) * Int_to_Rad_XXL;
+  return float(i) * Int_to_Rad_LL;
 }
 // Pinwheel helper function: matrix dimensions to number of rays
 static int getPinwheelLength(int vW, int vH) {
@@ -866,8 +870,9 @@ static int getPinwheelLength(int vW, int vH) {
   if (maxXY <= Pinwheel_Size_Medium) return Pinwheel_Steps_Medium;
   if (maxXY <= Pinwheel_Size_Big)    return Pinwheel_Steps_Big;
   if (maxXY <= Pinwheel_Size_XL)     return Pinwheel_Steps_XL;
+  if (maxXY <= Pinwheel_Size_XXL)     return Pinwheel_Steps_XXL;
   // else
-  return Pinwheel_Steps_XXL;
+  return Pinwheel_Steps_LL;
 }
 #endif
 

From e400720e40991edeeb7bf41b28f15bd204dcbc8e Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 6 Oct 2024 21:44:19 +0200
Subject: [PATCH 060/232] correct code comment

---
 wled00/FX_fcn.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 1db62a15..65f42a39 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -848,7 +848,7 @@ constexpr float Int_to_Rad_Med =   (DEG_TO_RAD * 360) / Pinwheel_Steps_Medium; /
 constexpr float Int_to_Rad_Big =   (DEG_TO_RAD * 360) / Pinwheel_Steps_Big;    // conversion: from 0...304 to Radians
 constexpr float Int_to_Rad_XL =    (DEG_TO_RAD * 360) / Pinwheel_Steps_XL;     // conversion: from 0...368 to Radians
 constexpr float Int_to_Rad_XXL =   (DEG_TO_RAD * 360) / Pinwheel_Steps_XXL;    // conversion: from 0...456 to Radians
-constexpr float Int_to_Rad_LL =   (DEG_TO_RAD * 360) / Pinwheel_Steps_LL;    // conversion: from 0...456 to Radians
+constexpr float Int_to_Rad_LL =   (DEG_TO_RAD * 360) / Pinwheel_Steps_LL;      // conversion: from 0...592 to Radians
 
 constexpr int Fixed_Scale = 512;               // fixpoint scaling factor (9bit for fraction)
 

From a84216947bfb28488e58837d5a6732836be93d6c Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 6 Oct 2024 22:19:08 +0200
Subject: [PATCH 061/232] forgot one

---
 wled00/FX_fcn.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 65f42a39..88f1e1b6 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -850,7 +850,7 @@ constexpr float Int_to_Rad_XL =    (DEG_TO_RAD * 360) / Pinwheel_Steps_XL;     /
 constexpr float Int_to_Rad_XXL =   (DEG_TO_RAD * 360) / Pinwheel_Steps_XXL;    // conversion: from 0...456 to Radians
 constexpr float Int_to_Rad_LL =   (DEG_TO_RAD * 360) / Pinwheel_Steps_LL;      // conversion: from 0...592 to Radians
 
-constexpr int Fixed_Scale = 512;               // fixpoint scaling factor (9bit for fraction)
+constexpr int Fixed_Scale = 32768;               // fixpoint scaling factor (15bit for fraction)
 
 // Pinwheel helper function: pixel index to radians
 static float getPinwheelAngle(int i, int vW, int vH) {

From 7740c7dc62fadf6f8b39d7fb3e5b421938e27d48 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 7 Oct 2024 13:14:50 +0200
Subject: [PATCH 062/232] drip effect rework

* made effect time-defendant (instead of framerate dependent)
* made effect a bit slower
* fixed physics
* made dropping more random (avoids skipped rows)
* drop traces look better now
* made bounce more realistic
* prevent off-screen drawing
---
 wled00/FX.cpp | 67 ++++++++++++++++++++++++++++++++++++---------------
 wled00/wled.h |  2 +-
 2 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index a93c2843..d345ff79 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -3713,6 +3713,17 @@ uint16_t mode_exploding_fireworks(void)
 static const char _data_FX_MODE_EXPLODING_FIREWORKS[] PROGMEM = "Fireworks 1D@Gravity,Firing side;!,!;!;12;pal=11,ix=128";
 
 
+
+//SparkDrop type is used for drip
+typedef struct __attribute__ ((packed)) SparkDrop {
+  float pos;
+  float boost;  // speed "kick" when dropping
+  float vel; 
+  uint32_t aux; // aux variable (RGBW color)
+  uint16_t col;
+  uint8_t colIndex;
+} sparkdrop;
+
 /*
  * Drip Effect
  * ported of: https://www.youtube.com/watch?v=sru2fXh4r7k
@@ -3723,20 +3734,24 @@ uint16_t mode_drip(void)
   //allocate segment data
   uint16_t strips = SEGMENT.nrOfVStrips();
   const int maxNumDrops = 4;
-  uint16_t dataSize = sizeof(spark) * maxNumDrops;
+  uint16_t dataSize = sizeof(sparkdrop) * maxNumDrops;
   if (!SEGENV.allocateData(dataSize * strips)) return mode_static(); //allocation failed
-  Spark* drops = reinterpret_cast<Spark*>(SEGENV.data);
+  SparkDrop* drops = reinterpret_cast<SparkDrop*>(SEGENV.data);
 
-  if (SEGENV.call == 0) SEGMENT.fill(BLACK);    // WLEDMM clear LEDs at startup
+  if (SEGENV.call == 0) {
+    SEGMENT.fill(BLACK);     // WLEDMM clear LEDs at startup
+    SEGENV.step = strip.now; // initial time
+  }
   if (!SEGMENT.check2) SEGMENT.fill(SEGCOLOR(1));
 
   struct virtualStrip {
-    static void runStrip(uint16_t stripNr, Spark* drops) {
+    static void runStrip(uint16_t stripNr, SparkDrop* drops, float deltaTime) {  // WLEDMM added deltaTime
 
       uint8_t numDrops = 1 + (SEGMENT.intensity >> 6); // 255>>6 = 3
 
-      float gravity = -0.0005f - (float(SEGMENT.speed)/35000.0f); //increased gravity (50000 to 35000)
-      gravity *= min(max(1, SEGLEN-1), 255);                      //WLEDMM speed limit 255
+      float theSpeed = (SEGMENT.speed * SEGMENT.speed) / 255.0f;   // WLEDMM
+      float gravity = -0.0002f - theSpeed/42000.0f; //gravity      // WLEDMM adjusted
+      gravity *= min(max(1, SEGLEN-1), 255);                       // WLEDMM speed limit 255
       const int sourcedrop = 12;
 
       for (int j=0;j<numDrops;j++) {
@@ -3745,37 +3760,44 @@ uint16_t mode_drip(void)
           drops[j].vel = 0;           // speed
           drops[j].col = sourcedrop;  // brightness
           drops[j].colIndex = 1;      // drop state (0 init, 1 forming, 2 falling, 5 bouncing)
-          drops[j].velX = SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0); // random color
+          drops[j].aux = SEGMENT.color_from_palette(1 + random8(254), false, PALETTE_SOLID_WRAP, 0); // random color - WLEDMM avoid 0 which is usually BLACK
+          drops[j].boost = 0.65f + float(random8()) / 512.0f; // between 0.65 and 1.15
         }
-        uint32_t dropColor = drops[j].velX;
+        uint32_t dropColor = drops[j].aux;
 
         SEGMENT.setPixelColor(indexToVStrip(SEGLEN-1, stripNr), color_blend(BLACK,dropColor, sourcedrop));// water source
         if (drops[j].colIndex==1) {
           if (drops[j].col>255) drops[j].col=255;
-          SEGMENT.setPixelColor(indexToVStrip(uint16_t(drops[j].pos), stripNr), color_blend(BLACK,dropColor,drops[j].col));
+          int intPos = max(0.0f, roundf(drops[j].pos));           // WLEDMM round it first
+          SEGMENT.setPixelColor(int(indexToVStrip(intPos, stripNr)), color_blend(BLACK,dropColor,drops[j].col));
 
-          drops[j].col += map(SEGMENT.custom1, 0, 255, 1, 6); // swelling
+          unsigned swell = map(SEGMENT.custom1, 0, 255, 1, 6); // swelling 
+          drops[j].col += swell;
+          if (drops[j].boost < 4.0f) drops[j].boost += 0.012f * float(swell);    // increase mass when swelling
 
           uint32_t fallrate = (drops[j].col * (1 + SEGMENT.custom1 * SEGMENT.custom1)) / 192;  // WLEDMM specific
           if (random16() <= (fallrate / 10)) {                                                 // random drop => 1% ... 20% probalibity
             drops[j].colIndex=2;               //fall
             drops[j].col=255;
+            drops[j].vel = gravity * 2.0f * drops[j].boost;  // WLEDMM initial kick
           }
         }
         if (drops[j].colIndex > 1) {           // falling
           if (drops[j].pos > 0.01f) {          // fall until end of segment
-            drops[j].pos += drops[j].vel;
+            drops[j].pos += drops[j].vel * deltaTime;
             if (drops[j].pos < 0) drops[j].pos = 0;
-            drops[j].vel += gravity;           // gravity is negative
+            drops[j].vel += gravity * deltaTime;         // gravity is negative
 
-            for (int i=1;i<7-drops[j].colIndex;i++) { // some minor math so we don't expand bouncing droplets
-              int intPos = roundf(drops[j].pos) +i;           // WLEDMM round it first
+            int maxLen = 8 + SEGMENT.speed/64;
+            for (int i=1; i < maxLen-drops[j].colIndex; i++) { // some minor math so we don't expand bouncing droplets
+              int intPos = roundf(drops[j].pos + float(i));           // WLEDMM round it first
+              if ((intPos >= SEGLEN) || (intPos < 0)) break;          // WLEDMM skip off-screen pixels
               uint16_t pos = constrain(intPos, 0, SEGLEN-1);  //this is BAD, returns a pos >= SEGLEN occasionally // WLEDMM bad cast to uint16_t removed
               SEGMENT.setPixelColor(indexToVStrip(pos, stripNr), color_blend(BLACK,dropColor,drops[j].col/i)); //spread pixel with fade while falling
             }
 
             if (drops[j].colIndex > 2) {       // during bounce, some water is on the floor
-              SEGMENT.setPixelColor(indexToVStrip(0, stripNr), color_blend(dropColor,BLACK, (2 * drops[j].col)/3)); // WLEDMM reduced brightness
+              SEGMENT.addPixelColor(indexToVStrip(0, stripNr), color_blend(dropColor,BLACK, drops[j].col*4));  // WLEDMM darker
             }
           } else {                             // we hit bottom
             if (drops[j].colIndex > 2) {       // already hit once, so back to forming
@@ -3785,8 +3807,11 @@ uint16_t mode_drip(void)
             } else {
 
               if (drops[j].colIndex==2) {      // init bounce
-                drops[j].vel = -drops[j].vel/4;// reverse velocity with damping
-                drops[j].pos += drops[j].vel;
+                // reverse velocity with damping
+                if (SEGLEN > 16) drops[j].vel = -drops[j].vel/3.5f;
+                else drops[j].vel = -drops[j].vel/4.5f;
+                // do bounce
+                drops[j].pos += drops[j].vel * deltaTime * drops[j].boost*0.5f;
               }
               drops[j].col = sourcedrop*2;
               drops[j].colIndex = 5;           // bouncing
@@ -3797,12 +3822,16 @@ uint16_t mode_drip(void)
     }
   };
 
+  // WLEDMM calculate time passed
+  uint32_t millisPassed = min(max(1UL, strip.now - SEGENV.step), 180UL); // constrain between 1 and 180
+  SEGENV.step = strip.now;
+  float deltaTime = float(millisPassed) / 20.0f;  // base speed 50 FPS
   for (int stripNr=0; stripNr<strips; stripNr++)
-    virtualStrip::runStrip(stripNr, &drops[stripNr*maxNumDrops]);
+    virtualStrip::runStrip(stripNr, &drops[stripNr*maxNumDrops], deltaTime);
 
   return FRAMETIME;
 }
-static const char _data_FX_MODE_DRIP[] PROGMEM = "Drip@Gravity,# of drips,Fall ratio,,,,Overlay;!,!;!;1.5d;c1=127,m12=1"; //bar WLEDMM 1.5d
+static const char _data_FX_MODE_DRIP[] PROGMEM = "Drip ☾@Gravity,# of drips,Fall ratio,,,,Overlay;!,!;!;1.5d;c1=127,m12=1"; //bar WLEDMM 1.5d
 
 
 /*
diff --git a/wled00/wled.h b/wled00/wled.h
index 33174183..c046d3e3 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2409280
+#define VERSION 2410070
 
 // WLEDMM  - you can check for this define in usermods, to only enabled WLEDMM specific code in the "right" fork. Its not defined in AC WLED.
 #define _MoonModules_WLED_

From 5b1f3e1eba3474d8fee2b61cce6df4ce440466ab Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 7 Oct 2024 13:35:31 +0200
Subject: [PATCH 063/232] make all compilers happy

fixing CI build error
---
 wled00/FX.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index d345ff79..0243472f 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -3208,7 +3208,7 @@ static const char _data_FX_MODE_SOLID_GLITTER[] PROGMEM = "Solid Glitter@,!;Bg,,
 
 
 //each needs 19 bytes
-//Spark type is used for popcorn, 1D fireworks, and drip
+//Spark type is used for popcorn, 1D fireworks
 typedef struct Spark {
   float pos, posX;
   float vel, velX;
@@ -3823,7 +3823,7 @@ uint16_t mode_drip(void)
   };
 
   // WLEDMM calculate time passed
-  uint32_t millisPassed = min(max(1UL, strip.now - SEGENV.step), 180UL); // constrain between 1 and 180
+  uint32_t millisPassed = min(max(1U, unsigned(strip.now - SEGENV.step)), 180U); // constrain between 1 and 180
   SEGENV.step = strip.now;
   float deltaTime = float(millisPassed) / 20.0f;  // base speed 50 FPS
   for (int stripNr=0; stripNr<strips; stripNr++)

From bda6dedfa81cc5f05ba34fd4d564c1d8915c95c2 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 7 Oct 2024 15:54:04 +0200
Subject: [PATCH 064/232] popcorn FX minor rework

* made effect time dependent (instead of framerate dependent)
* speed tuning
* add a small trail to prevent jumping dots and blank rows
---
 wled00/FX.cpp | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 0243472f..dd9c9b66 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -3236,6 +3236,11 @@ static uint16_t mode_popcorn_core(bool useaudio) {
 
   Spark* popcorn = reinterpret_cast<Spark*>(SEGENV.data);
 
+  if (SEGENV.call == 0) {
+    SEGMENT.fill(BLACK);     // WLEDMM clear LEDs at startup
+    SEGENV.step = strip.now; // initial time
+  }
+
   bool hasCol2 = SEGCOLOR(2);
   if (!SEGMENT.check2) SEGMENT.fill(hasCol2 ? BLACK : SEGCOLOR(1));
 
@@ -3248,9 +3253,9 @@ static uint16_t mode_popcorn_core(bool useaudio) {
   }
 
   struct virtualStrip {
-    static void runStrip(uint16_t stripNr, Spark* popcorn, bool useaudio, um_data_t *um_data) {  // WLEDMM added useaudio and um_data
-      float gravity = -0.0001f - (SEGMENT.speed/200000.0f); // m/s/s
-      gravity *= SEGLEN;
+    static void runStrip(uint16_t stripNr, Spark* popcorn, bool useaudio, um_data_t *um_data, float deltaTime) {  // WLEDMM added useaudio and um_data
+      float gravity = -0.0001f - (SEGMENT.speed/180000.0f); // m/s/s  // WLEDMM original value was "-0.0001f - (SEGMENT.speed/200000.0f)"
+      gravity *= min(max(1, SEGLEN-1), 255);                          // WLEDMM speed limit 255
 
       uint8_t numPopcorn = SEGMENT.intensity*maxNumPopcorn/255;
       if (numPopcorn == 0) numPopcorn = 1;
@@ -3261,8 +3266,8 @@ static uint16_t mode_popcorn_core(bool useaudio) {
 
       for(int i = 0; i < numPopcorn; i++) {
         if (popcorn[i].pos >= 0.0f) { // if kernel is active, update its position
-          popcorn[i].pos += popcorn[i].vel;
-          popcorn[i].vel += gravity;
+          popcorn[i].pos += popcorn[i].vel * deltaTime;
+          popcorn[i].vel += gravity * deltaTime;
         } else { // if kernel is inactive, randomly pop it
           bool doPopCorn = false;  // WLEDMM allows to inhibit new pops
           // WLEDMM begin
@@ -3281,7 +3286,7 @@ static uint16_t mode_popcorn_core(bool useaudio) {
 
             uint16_t peakHeight = 128 + random8(128); //0-255
             peakHeight = (peakHeight * (SEGLEN -1)) >> 8;
-            popcorn[i].vel = sqrtf(-2.0f * gravity * peakHeight);
+            popcorn[i].vel = sqrtf(-2.01f * gravity * peakHeight);
 
             if (SEGMENT.palette)
             {
@@ -3298,19 +3303,31 @@ static uint16_t mode_popcorn_core(bool useaudio) {
           if (!SEGMENT.palette && popcorn[i].colIndex < NUM_COLORS) col = SEGCOLOR(popcorn[i].colIndex);
           uint16_t ledIndex = popcorn[i].pos;
           if (ledIndex < SEGLEN) SEGMENT.setPixelColor(indexToVStrip(ledIndex, stripNr), col);
+          // WLEDMM add small trail
+          for (int n=1; n<4; n++) {
+            float spdLimit = n;
+            unsigned fade = 128 - 32*n;
+            uint32_t trailColor = color_fade(col, fade, true);
+            if ((popcorn[i].vel < -spdLimit) && (ledIndex+n < SEGLEN)) SEGMENT.setPixelColor(indexToVStrip(ledIndex+n, stripNr), trailColor);
+            if ((popcorn[i].vel > spdLimit) && (ledIndex >= n)) SEGMENT.setPixelColor(indexToVStrip(ledIndex-n, stripNr), trailColor);
+          }
         }
       }
     }
   };
 
+  // WLEDMM calculate time passed
+  uint32_t millisPassed = min(max(1U, unsigned(strip.now - SEGENV.step)), 200U); // constrain between 1 and 200
+  SEGENV.step = strip.now;
+  float deltaTime = useaudio ? float(millisPassed) / 8.0f : float(millisPassed) / 16.0f;  // base speed: 64 FPS (normal) / 120fps (audioreactive) 
   for (int stripNr=0; stripNr<strips; stripNr++)
-    virtualStrip::runStrip(stripNr, &popcorn[stripNr * neededPopcorn], useaudio, um_data); // WLEDMM added useaudio and um_data
+    virtualStrip::runStrip(stripNr, &popcorn[stripNr * neededPopcorn], useaudio, um_data, deltaTime); // WLEDMM added useaudio and um_data
 
   return FRAMETIME;
 }
 
 uint16_t mode_popcorn(void) { return mode_popcorn_core(false); }
-static const char _data_FX_MODE_POPCORN[] PROGMEM = "Popcorn@!,!,,,,,Overlay;!,!,!;!;1.5d;m12=1"; //bar WLEDMM 1.5d
+static const char _data_FX_MODE_POPCORN[] PROGMEM = "Popcorn ☾@!,!,,,,,Overlay;!,!,!;!;1.5d;m12=1"; //bar WLEDMM 1.5d
 
 uint16_t mode_popcorn_audio(void) { return mode_popcorn_core(true); }
 static const char _data_FX_MODE_POPCORN_AR[] PROGMEM = "Popcorn audio ☾@!,!,,,,,Overlay;!,!,!;!;1v,1.5d;m12=1"; //bar WLEDMM 1.5d

From 5381119f9e6f4acfa6932150220c2be88e1dbed9 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 8 Oct 2024 19:00:59 +0200
Subject: [PATCH 065/232] AR: new input type 'None' for network receive only

---
 usermods/audioreactive/audio_reactive.h | 47 +++++++++++++++++--------
 usermods/audioreactive/audio_source.h   | 20 ++++++-----
 2 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index 1c46e33a..a6fcbd7c 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -199,7 +199,6 @@ static uint8_t binNum = 8;           // Used to select the bin for FFT based bea
 
 // use audio source class (ESP32 specific)
 #include "audio_source.h"
-constexpr i2s_port_t I2S_PORT = I2S_NUM_0;       // I2S port to use (do not change !)
 constexpr int BLOCK_SIZE = 128;                  // I2S buffer size (samples)
 
 // globals
@@ -1083,6 +1082,11 @@ class AudioReactive : public Usermod {
   private:
 #ifdef ARDUINO_ARCH_ESP32
 
+// HUB75 workaround - audio receive only
+#ifdef WLED_ENABLE_HUB75MATRIX
+#undef SR_DMTYPE
+#define SR_DMTYPE 254  // "network receive only"
+#endif
     #ifndef AUDIOPIN
     int8_t audioPin = -1;
     #else
@@ -1907,12 +1911,14 @@ class AudioReactive : public Usermod {
 
 #ifdef ARDUINO_ARCH_ESP32
 
-      // Reset I2S peripheral for good measure
+      // Reset I2S peripheral for good measure - not needed in esp-idf v4.4.x and later.
+    #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4, 4, 0)
       i2s_driver_uninstall(I2S_NUM_0);   // E (696) I2S: i2s_driver_uninstall(2006): I2S port 0 has not installed
       #if !defined(CONFIG_IDF_TARGET_ESP32C3)
         delay(100);
         periph_module_reset(PERIPH_I2S0_MODULE);   // not possible on -C3
       #endif
+    #endif
       delay(100);         // Give that poor microphone some time to setup.
 
       #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3)
@@ -2026,6 +2032,14 @@ class AudioReactive : public Usermod {
           if (audioSource) audioSource->initialize(i2swsPin, i2ssdPin, i2sckPin, mclkPin);
           break;
 
+          case 255: // falls through
+          case 254: // dummy "network receive only" driver
+            if (audioSource) delete audioSource;
+            audioSource = nullptr;
+            disableSoundProcessing = true;
+            audioSyncEnabled = AUDIOSYNC_REC; // force udp sound receive mode
+          break;
+
         #if  !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)
         // ADC over I2S is only possible on "classic" ESP32
         case 0:
@@ -2040,18 +2054,16 @@ class AudioReactive : public Usermod {
       }
       delay(250); // give microphone enough time to initialise
 
-      if (!audioSource) enabled = false;                 // audio failed to initialise
+      if (!audioSource && (dmType < 254)) enabled = false;      // audio failed to initialise
 #endif
-      if (enabled) onUpdateBegin(false);                 // create FFT task, and initialize network
+      if (enabled) onUpdateBegin(false);                        // create FFT task, and initialize network
 
 #ifdef ARDUINO_ARCH_ESP32
-      if (FFT_Task == nullptr) enabled = false;          // FFT task creation failed
+      if (audioSource && FFT_Task == nullptr) enabled = false; // FFT task creation failed
       if((!audioSource) || (!audioSource->isInitialized())) {  // audio source failed to initialize. Still stay "enabled", as there might be input arriving via UDP Sound Sync 
-      #ifdef WLED_DEBUG
-        DEBUG_PRINTLN(F("AR: Failed to initialize sound input driver. Please check input PIN settings."));
-      #else
-        USER_PRINTLN(F("AR: Failed to initialize sound input driver. Please check input PIN settings."));
-      #endif
+
+        if (dmType < 254) { USER_PRINTLN(F("AR: Failed to initialize sound input driver. Please check input PIN settings."));}
+        else  { USER_PRINTLN(F("AR: No sound input driver configured - network receive only."));}
         disableSoundProcessing = true;
       } else {
         USER_PRINTLN(F("AR: sound input driver initialized successfully."));        
@@ -2191,7 +2203,7 @@ class AudioReactive : public Usermod {
       if (audioSyncEnabled == AUDIOSYNC_REC) disableSoundProcessing = true;   // make sure everything is disabled IF in audio Receive mode
       if (audioSyncEnabled == AUDIOSYNC_SEND) disableSoundProcessing = false;  // keep running audio IF we're in audio Transmit mode
 #ifdef ARDUINO_ARCH_ESP32
-      if (!audioSource->isInitialized()) {                                                               // no audio source
+      if (!audioSource || !audioSource->isInitialized()) {                                                               // no audio source
         disableSoundProcessing = true;
         if (audioSyncEnabled > AUDIOSYNC_SEND) useNetworkAudio = true;
       }
@@ -2404,7 +2416,8 @@ class AudioReactive : public Usermod {
         if (FFT_Task) {
           vTaskResume(FFT_Task);
           connected(); // resume UDP
-        } else
+        } else {
+          if (audioSource)                    // WLEDMM only create FFT task if we have a valid audio source
 //          xTaskCreatePinnedToCore(
 //          xTaskCreate(                        // no need to "pin" this task to core #0
           xTaskCreateUniversal(
@@ -2416,9 +2429,10 @@ class AudioReactive : public Usermod {
             &FFT_Task                         // Task handle
             , 0                               // Core where the task should run
           );
+        }
       }
       micDataReal = 0.0f;                     // just to be sure
-      if (enabled) disableSoundProcessing = false;
+      if (enabled && audioSource) disableSoundProcessing = false;
       updateIsRunning = init;
 
       #if defined(ARDUINO_ARCH_ESP32) && defined(SR_DEBUG)
@@ -2573,7 +2587,7 @@ class AudioReactive : public Usermod {
           } else {
             // error during audio source setup
             infoArr.add(F("not initialized"));
-            infoArr.add(F(" - check pin settings"));
+            if (dmType < 254) infoArr.add(F(" - check pin settings"));
           }
         }
 
@@ -2880,6 +2894,11 @@ class AudioReactive : public Usermod {
       #endif
 
       oappend(SET_F("dd=addDropdown(ux,'digitalmic:type');"));
+      #if SR_DMTYPE==254
+        oappend(SET_F("addOption(dd,'None - network receive only (⎌)',254);"));
+      #else
+        oappend(SET_F("addOption(dd,'None - network receive only',254);"));
+      #endif
       #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)
         #if SR_DMTYPE==0
           oappend(SET_F("addOption(dd,'Generic Analog (⎌)',0);"));
diff --git a/usermods/audioreactive/audio_source.h b/usermods/audioreactive/audio_source.h
index 77111446..f78a3358 100644
--- a/usermods/audioreactive/audio_source.h
+++ b/usermods/audioreactive/audio_source.h
@@ -37,6 +37,8 @@
 #define SRate_t int
 #endif
 
+constexpr i2s_port_t AR_I2S_PORT = I2S_NUM_0;       // I2S port to use (do not change ! I2S_NUM_1 possible but this has limitation -> no MCLK routing, no ADC support)
+
 //#include <driver/i2s_std.h>
 //#include <driver/i2s_pdm.h>
 //#include <driver/i2s_tdm.h>
@@ -326,7 +328,7 @@ class I2SSource : public AudioSource {
 
       //DEBUGSR_PRINTF("[AR] I2S: SD=%d, WS=%d, SCK=%d, MCLK=%d\n", i2ssdPin, i2swsPin, i2sckPin, mclkPin);
 
-      esp_err_t err = i2s_driver_install(I2S_NUM_0, &_config, 0, nullptr);
+      esp_err_t err = i2s_driver_install(AR_I2S_PORT, &_config, 0, nullptr);
       if (err != ESP_OK) {
         ERRORSR_PRINTF("AR: Failed to install i2s driver: %d\n", err);
         return;
@@ -344,18 +346,18 @@ class I2SSource : public AudioSource {
         DEBUGSR_PRINTLN(F("AR: I2S#0 driver installed in SLAVE mode."));
       }
 
-      err = i2s_set_pin(I2S_NUM_0, &_pinConfig);
+      err = i2s_set_pin(AR_I2S_PORT, &_pinConfig);
       if (err != ESP_OK) {
         ERRORSR_PRINTF("AR: Failed to set i2s pin config: %d\n", err);
-        i2s_driver_uninstall(I2S_NUM_0);  // uninstall already-installed driver
+        i2s_driver_uninstall(AR_I2S_PORT);  // uninstall already-installed driver
         return;
       }
 
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 2, 0)
-      err = i2s_set_clk(I2S_NUM_0, _sampleRate, I2S_SAMPLE_RESOLUTION, I2S_CHANNEL_MONO);  // set bit clocks. Also takes care of MCLK routing if needed.
+      err = i2s_set_clk(AR_I2S_PORT, _sampleRate, I2S_SAMPLE_RESOLUTION, I2S_CHANNEL_MONO);  // set bit clocks. Also takes care of MCLK routing if needed.
       if (err != ESP_OK) {
         ERRORSR_PRINTF("AR: Failed to configure i2s clocks: %d\n", err);
-        i2s_driver_uninstall(I2S_NUM_0);  // uninstall already-installed driver
+        i2s_driver_uninstall(AR_I2S_PORT);  // uninstall already-installed driver
         return;
       }
 #endif
@@ -364,7 +366,7 @@ class I2SSource : public AudioSource {
 
     virtual void deinitialize() {
       _initialized = false;
-      esp_err_t err = i2s_driver_uninstall(I2S_NUM_0);
+      esp_err_t err = i2s_driver_uninstall(AR_I2S_PORT);
       if (err != ESP_OK) {
         DEBUGSR_PRINTF("Failed to uninstall i2s driver: %d\n", err);
         return;
@@ -385,7 +387,7 @@ class I2SSource : public AudioSource {
         I2S_datatype *newSamples = newSampleBuffer; // use global input buffer
         if (num_samples > I2S_SAMPLES_MAX) num_samples = I2S_SAMPLES_MAX; // protect the buffer from overflow
 
-        err = i2s_read(I2S_NUM_0, (void *)newSamples, num_samples * sizeof(I2S_datatype), &bytes_read, portMAX_DELAY);
+        err = i2s_read(AR_I2S_PORT, (void *)newSamples, num_samples * sizeof(I2S_datatype), &bytes_read, portMAX_DELAY);
         if (err != ESP_OK) {
           DEBUGSR_PRINTF("Failed to get samples: %d\n", err);
           return;
@@ -1056,8 +1058,8 @@ class SPH0654 : public I2SSource {
       I2SSource::initialize(i2swsPin, i2ssdPin, i2sckPin);
 #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)
 // these registers are only existing in "classic" ESP32
-      REG_SET_BIT(I2S_TIMING_REG(I2S_NUM_0), BIT(9));
-      REG_SET_BIT(I2S_CONF_REG(I2S_NUM_0), I2S_RX_MSB_SHIFT);
+      REG_SET_BIT(I2S_TIMING_REG(AR_I2S_PORT), BIT(9));
+      REG_SET_BIT(I2S_CONF_REG(AR_I2S_PORT), I2S_RX_MSB_SHIFT);
 #else
       #warning FIX ME! Please.
 #endif

From 1fcb15bcc0f86eaffe56c6a9d2b252583c944a52 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 8 Oct 2024 19:02:55 +0200
Subject: [PATCH 066/232] build number 2410080

---
 wled00/wled.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/wled.h b/wled00/wled.h
index c046d3e3..e3cadc5d 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2410070
+#define VERSION 2410080
 
 // WLEDMM  - you can check for this define in usermods, to only enabled WLEDMM specific code in the "right" fork. Its not defined in AC WLED.
 #define _MoonModules_WLED_

From 98bdbd1eb2e3c6a07a17a7f966cf1ec0cb83804b Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 8 Oct 2024 21:24:06 +0200
Subject: [PATCH 067/232] AR: trying to improve co-existance with HUB75 DMA

bad news: wifi still crashes very frequently when I2S audio is in use.
---
 usermods/audioreactive/audio_source.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/usermods/audioreactive/audio_source.h b/usermods/audioreactive/audio_source.h
index f78a3358..91573956 100644
--- a/usermods/audioreactive/audio_source.h
+++ b/usermods/audioreactive/audio_source.h
@@ -208,14 +208,23 @@ class I2SSource : public AudioSource {
         .communication_format = i2s_comm_format_t(I2S_COMM_FORMAT_STAND_I2S),
         //.intr_alloc_flags = ESP_INTR_FLAG_LEVEL1,
 #ifdef WLEDMM_FASTPATH
+  #ifdef WLED_ENABLE_HUB75MATRIX
+        .intr_alloc_flags = ESP_INTR_FLAG_IRAM|ESP_INTR_FLAG_LEVEL1,    // HUB75 seems to get into trouble if we allocate a higher priority interrupt
+        .dma_buf_count = 18,                                            // 100ms buffer (128 * dma_buf_count / sampleRate)
+  #else
       #if CONFIG_IDF_TARGET_ESP32 && !defined(BOARD_HAS_PSRAM)          // still need to test on boards with PSRAM
         .intr_alloc_flags = ESP_INTR_FLAG_IRAM|ESP_INTR_FLAG_LEVEL2|ESP_INTR_FLAG_LEVEL3,  // IRAM flag reduces missed samples
       #else
         .intr_alloc_flags = ESP_INTR_FLAG_LEVEL2|ESP_INTR_FLAG_LEVEL3,  // seems to reduce noise
       #endif
         .dma_buf_count = 24,                                            // 140ms buffer (128 * dma_buf_count / sampleRate)
+  #endif
 #else
+  #ifdef WLED_ENABLE_HUB75MATRIX
+        .intr_alloc_flags = ESP_INTR_FLAG_LEVEL1,                      // HUB75 seems to get into trouble if we allocate a higher priority interrupt
+  #else
         .intr_alloc_flags = ESP_INTR_FLAG_LEVEL2,
+  #endif
         .dma_buf_count = 8,
 #endif
         .dma_buf_len = _blockSize,

From 54467473f81a5f62ff48b449297eaa7444aae9c4 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 11 Oct 2024 21:19:22 +0200
Subject: [PATCH 068/232] HUB75: fix for crash on -S3

* use a fork of the HUB75 with fixed Bus_Parallel16::release()
* prevent accessing an invalid display object
---
 platformio.ini         | 3 ++-
 wled00/bus_manager.cpp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 07c03129..0e7bf6da 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1072,7 +1072,8 @@ HUB75_build_flags =
   -D NO_CIE1931 ;; Do not use LED brightness compensation described in CIE 1931. We use FastLED dimming already
   -D S3_LCD_DIV_NUM=20 ;; Attempt to fix wifi performance issue when panel active with S3 chips
   -D WLEDMM_SLOWPATH   ;; WLEDMM: do not use I2S for driving ws2812 LEDs (HUB75 driver needs I2S#1)
-HUB75_lib_deps = https://github.com/mrcodetastic/ESP32-HUB75-MatrixPanel-DMA.git#aa28e2a9 ;; S3_LCD_DIV_NUM fix
+;; HUB75_lib_deps = https://github.com/mrcodetastic/ESP32-HUB75-MatrixPanel-DMA.git#aa28e2a9 ;; S3_LCD_DIV_NUM fix
+HUB75_lib_deps = https://github.com/softhack007/ESP32-HUB75-MatrixPanel-DMA_sh7.git#fix_dangling_pointer ;; S3 bugfix for crash in ~MatrixPanel_I2S_DMA()
 HUB75_lib_ignore = ESP32 HUB75 LED MATRIX PANEL DMA Display ;; to remove the HUB75 lib dependancy (saves a few bytes)
 
 NetDebug_build_flags =
diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index ab124b93..f53cfca6 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -916,6 +916,7 @@ uint32_t __attribute__((hot)) BusHub75Matrix::getPixelColorRestored(uint16_t pix
 
 void BusHub75Matrix::setBrightness(uint8_t b, bool immediate) {
   _bri = b;
+  if (!_valid) return;
   // if (_bri > 238) _bri=238; // not strictly needed. Enable this line if you see glitches at highest brightness.
   display->setBrightness(_bri);
 }
@@ -967,7 +968,7 @@ void BusHub75Matrix::cleanup() {
   USER_PRINTLN("HUB75 output ended.");
 
   //if (fourScanPanel != nullptr) delete fourScanPanel;  // warning: deleting object of polymorphic class type 'VirtualMatrixPanel' which has non-virtual destructor might cause undefined behavior
-  delete display;
+  if (display) delete display;
   display = nullptr;
   fourScanPanel = nullptr;
   if (_ledBuffer != nullptr) free(_ledBuffer); _ledBuffer = nullptr;

From 06590890bdee0e252983dc9f9ab595c853608049 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 12 Oct 2024 23:00:35 +0200
Subject: [PATCH 069/232] HUB75: remove driver double-buffer support (obsolete)

We use our own memory-optimised buffer rather than the driver's own double-buffer.
---
 wled00/bus_manager.cpp | 52 +++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 31 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index f53cfca6..6b1aeb09 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -529,7 +529,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   fourScanPanel = nullptr;
   _len = 0;
 
-    mxconfig.double_buff = false; // Use our own memory-optimised buffer rather than the driver's own double-buffer  
+    mxconfig.double_buff = false; // Use our own memory-optimised buffer rather than the driver's own double-buffer
  
   // mxconfig.driver = HUB75_I2S_CFG::ICN2038S;  // experimental - use specific shift register driver
   // mxconfig.driver = HUB75_I2S_CFG::FM6124;    // try this driver in case you panel stays dark, or when colors look too pastel
@@ -782,9 +782,10 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   delay(24); // experimental
   DEBUG_PRINT(F("heap usage: ")); DEBUG_PRINTLN(lastHeap - ESP.getFreeHeap());
   // Allocate memory and start DMA display
-  if( not display->begin() ) {
+  if (display->begin() == false) {
       USER_PRINTLN("****** MatrixPanel_I2S_DMA !KABOOM! I2S memory allocation failed ***********");
       USER_PRINT(F("heap usage: ")); USER_PRINTLN(lastHeap - ESP.getFreeHeap());
+      _valid = false;
       return;
   }
   else {
@@ -799,28 +800,27 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
     if (_ledsDirty) free(_ledsDirty);                 // should not happen
 
     _ledsDirty = (byte*) malloc(getBitArrayBytes(_len));  // create LEDs dirty bits
+    if (_ledsDirty) setBitArray(_ledsDirty, _len, false); // reset dirty bits
 
-    if (_ledsDirty == nullptr) {
-      display->stopDMAoutput();
-      delete display; display = nullptr;
-      _valid = false;
-      USER_PRINTLN(F("MatrixPanel_I2S_DMA not started - not enough memory for dirty bits!"));
-      USER_PRINT(F("heap usage: ")); USER_PRINTLN(lastHeap - ESP.getFreeHeap());
-      return;  //  fail is we cannot get memory for the buffer
-    }
-    setBitArray(_ledsDirty, _len, false);             // reset dirty bits
-
-    if (mxconfig.double_buff == false) {
-      #if defined(CONFIG_IDF_TARGET_ESP32S3) && CONFIG_SPIRAM_MODE_OCT && defined(BOARD_HAS_PSRAM) && (defined(WLED_USE_PSRAM) || defined(WLED_USE_PSRAM_JSON))
+    #if defined(CONFIG_IDF_TARGET_ESP32S3) && CONFIG_SPIRAM_MODE_OCT && defined(BOARD_HAS_PSRAM) && (defined(WLED_USE_PSRAM) || defined(WLED_USE_PSRAM_JSON))
       if (psramFound()) {
         _ledBuffer = (CRGB*) ps_calloc(_len, sizeof(CRGB));  // create LEDs buffer (initialized to BLACK)
       } else {
         _ledBuffer = (CRGB*) calloc(_len, sizeof(CRGB));  // create LEDs buffer (initialized to BLACK)
       }
-      #else
+    #else
       _ledBuffer = (CRGB*) calloc(_len, sizeof(CRGB));  // create LEDs buffer (initialized to BLACK)
-      #endif
-    }
+    #endif
+  }
+
+  if ((_ledBuffer == nullptr) || (_ledsDirty == nullptr)) {
+      // fail is we cannot get memory for the buffer
+      errorFlag = ERR_LOW_MEM; // WLEDMM raise errorflag
+      USER_PRINTLN(F("MatrixPanel_I2S_DMA not started - not enough memory for leds bufer!"));
+      cleanup();  // free buffers, and deallocate pins
+      _valid = false;
+      USER_PRINT(F("heap usage: ")); USER_PRINTLN(int(lastHeap - ESP.getFreeHeap()));
+      return;  //  fail
   }
   
   switch(bc.type) {
@@ -851,7 +851,6 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   USER_PRINT(F("MatrixPanel_I2S_DMA "));
   USER_PRINTF("%sstarted, width=%u, %u pixels.\n", _valid? "":"not ", _panelWidth, _len);
 
-  if (mxconfig.double_buff == true) USER_PRINTLN(F("MatrixPanel_I2S_DMA driver native double-buffering enabled."));
   if (_ledBuffer != nullptr) USER_PRINTLN(F("MatrixPanel_I2S_DMA LEDS buffer enabled."));
   if (_ledsDirty != nullptr) USER_PRINTLN(F("MatrixPanel_I2S_DMA LEDS dirty bit optimization enabled."));
   if ((_ledBuffer != nullptr) || (_ledsDirty != nullptr)) {
@@ -859,7 +858,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
     USER_PRINT((_ledBuffer? _len*sizeof(CRGB) :0) + (_ledsDirty? getBitArrayBytes(_len) :0));
     USER_PRINTLN(F(" bytes."));
   }
-  USER_PRINT(F("heap usage: ")); USER_PRINTLN(lastHeap - ESP.getFreeHeap());
+  USER_PRINT(F("heap usage: ")); USER_PRINTLN(int(lastHeap - ESP.getFreeHeap()));
 }
 
 void __attribute__((hot)) BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c) {
@@ -874,9 +873,7 @@ void __attribute__((hot)) BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c
     }
   }
   else {
-    if ((c == BLACK) && (getBitFromArray(_ledsDirty, pix) == false)) return; // ignore black if pixel is already black
-    setBitInArray(_ledsDirty, pix, c != BLACK);                              // dirty = true means "color is not BLACK"
-
+    // no double buffer allocated --> directly draw pixel
     #ifndef NO_CIE1931
     c = unGamma24(c); // to use the driver linear brightness feature, we first need to undo WLED gamma correction
     #endif
@@ -903,7 +900,7 @@ uint32_t BusHub75Matrix::getPixelColor(uint16_t pix) const {
   if (_ledBuffer)
     return uint32_t(_ledBuffer[pix].scale8(_bri)) & 0x00FFFFFF;  // scale8() is needed to mimic NeoPixelBus, which returns scaled-down colours
   else
-    return getBitFromArray(_ledsDirty, pix) ? DARKGREY: BLACK;   // just a hack - we only know if the pixel is black or not
+    return BLACK;   // we don't know anything about the pixel
 }
 
 uint32_t __attribute__((hot)) BusHub75Matrix::getPixelColorRestored(uint16_t pix) const {
@@ -911,7 +908,7 @@ uint32_t __attribute__((hot)) BusHub75Matrix::getPixelColorRestored(uint16_t pix
   if (_ledBuffer)
     return uint32_t(_ledBuffer[pix]) & 0x00FFFFFF;
   else
-    return getBitFromArray(_ledsDirty, pix) ? DARKGREY: BLACK;   // just a hack - we only know if the pixel is black or not
+    return BLACK;   // we don't know anything about the pixel
 }
 
 void BusHub75Matrix::setBrightness(uint8_t b, bool immediate) {
@@ -951,13 +948,6 @@ void __attribute__((hot)) BusHub75Matrix::show(void) {
     }
     setBitArray(_ledsDirty, _len, false);  // buffer shown - reset all dirty bits
   }
-
-  if(mxconfig.double_buff) {
-    display->flipDMABuffer(); // Show the back buffer, set current output buffer to the back (i.e. no longer being sent to LED panels)
-    // while(!previousBufferFree) delay(1);   // experimental - Wait before we allow any writing to the buffer. Stop flicker.
-    display->clearScreen();   // Now clear the back-buffer
-    setBitArray(_ledsDirty, _len, false);  // dislay buffer is blank - reset all dirty bits
-  }
 }
 
 void BusHub75Matrix::cleanup() {

From d21b9b068788623352a18ec398b4e05ae0193582 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 12 Oct 2024 23:05:08 +0200
Subject: [PATCH 070/232] typo

fixo
---
 wled00/bus_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 6b1aeb09..1b59b50b 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -816,7 +816,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   if ((_ledBuffer == nullptr) || (_ledsDirty == nullptr)) {
       // fail is we cannot get memory for the buffer
       errorFlag = ERR_LOW_MEM; // WLEDMM raise errorflag
-      USER_PRINTLN(F("MatrixPanel_I2S_DMA not started - not enough memory for leds bufer!"));
+      USER_PRINTLN(F("MatrixPanel_I2S_DMA not started - not enough memory for leds buffer!"));
       cleanup();  // free buffers, and deallocate pins
       _valid = false;
       USER_PRINT(F("heap usage: ")); USER_PRINTLN(int(lastHeap - ESP.getFreeHeap()));

From 0dd036cdced71faa02ad9654288ffdf07a45ed62 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 13 Oct 2024 23:06:50 +0200
Subject: [PATCH 071/232] AR: trying to improve coexistence with HUB75

Hub75 is very memory hungry. So we try to make a bit more RAM available
* use 16bit samples when compiling with HUB75 support --> 3KB saved
* avoid using aPLL (HUB75 needs it)
* move audio buffers from BSS (always allocated) to heap (only allocated when FFTtask runs) --> 10Kb saved
* suspend live preview for 6 seconds when out-of-memory
---
 usermods/audioreactive/audio_reactive.h | 72 ++++++++++++++++++-------
 usermods/audioreactive/audio_source.h   | 11 +++-
 wled00/ws.cpp                           | 10 ++++
 3 files changed, 74 insertions(+), 19 deletions(-)

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index a6fcbd7c..7c22cf8d 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -284,7 +284,7 @@ static volatile float    micReal_max2 = 0.0f;             // MicIn data max afte
 // some prototypes, to ensure consistent interfaces
 static float mapf(float x, float in_min, float in_max, float out_min, float out_max); // map function for float
 static float fftAddAvg(int from, int to);   // average of several FFT result bins
-void FFTcode(void * parameter)  __attribute__((noreturn));      // audio processing task: read samples, run FFT, fill GEQ channels from FFT results
+void FFTcode(void * parameter);             // audio processing task: read samples, run FFT, fill GEQ channels from FFT results
 static void runMicFilter(uint16_t numSamples, float *sampleBuffer);          // pre-filtering of raw samples (band-pass)
 static void postProcessFFTResults(bool noiseGateOpen, int numberOfChannels, bool i2sFastpath); // post-processing and post-amp of GEQ channels
 
@@ -393,11 +393,11 @@ constexpr uint16_t samplesFFT_2 = 256;          // meaningful part of FFT result
 #define LOG_256  5.54517744f                            // log(256)
 
 // These are the input and output vectors.  Input vectors receive computed results from FFT.
-static float vReal[samplesFFT] = {0.0f};       // FFT sample inputs / freq output -  these are our raw result bins
-static float vImag[samplesFFT] = {0.0f};       // imaginary parts
+static float* vReal = nullptr;       // FFT sample inputs / freq output -  these are our raw result bins
+static float* vImag = nullptr;       // imaginary parts
 
 #ifdef FFT_MAJORPEAK_HUMAN_EAR
-static float pinkFactors[samplesFFT] = {0.0f};              // "pink noise" correction factors
+static float* pinkFactors = nullptr;                        // "pink noise" correction factors
 constexpr float pinkcenter = 23.66;                         // sqrt(560) - center freq for scaling is 560 hz. 
 constexpr float binWidth = SAMPLE_RATE / (float)samplesFFT; // frequency range of each FFT result bin
 #endif
@@ -414,15 +414,6 @@ constexpr float binWidth = SAMPLE_RATE / (float)samplesFFT; // frequency range o
 #define sqrt_internal sqrtf          // see https://github.com/kosme/arduinoFFT/pull/83
 #include <arduinoFFT.h>
 
-#if defined(FFT_LIB_REV) && FFT_LIB_REV > 0x19
-  // arduinoFFT 2.x has a slightly different API
-  static ArduinoFFT<float> FFT = ArduinoFFT<float>( vReal, vImag, samplesFFT, SAMPLE_RATE, true);
-#else
-  // recommended version optimized by @softhack007 (API version 1.9)
-  static float windowWeighingFactors[samplesFFT] = {0.0f}; // cache for FFT windowing factors
-  static ArduinoFFT<float> FFT = ArduinoFFT<float>( vReal, vImag, samplesFFT, SAMPLE_RATE, windowWeighingFactors);
-#endif
-
 // Helper functions
 
 // float version of map()
@@ -460,6 +451,30 @@ constexpr bool skipSecondFFT = true;
 constexpr bool skipSecondFFT = false;
 #endif
 
+// allocate FFT sample buffers from heap
+static bool alocateFFTBuffers(void) {
+  #ifdef SR_DEBUG
+    USER_PRINT(F("\nFree heap ")); USER_PRINTLN(ESP.getFreeHeap());
+  #endif
+
+  if (vReal) free(vReal); // should not happen
+  if (vImag) free(vImag); // should not happen
+  if ((vReal = (float*) calloc(sizeof(float), samplesFFT)) == nullptr) return false; // calloc or die
+  if ((vImag = (float*) calloc(sizeof(float), samplesFFT)) == nullptr) return false;
+#ifdef FFT_MAJORPEAK_HUMAN_EAR
+  if (pinkFactors) free(pinkFactors);
+  if ((pinkFactors = (float*) calloc(sizeof(float), samplesFFT)) == nullptr) return false;
+#endif
+
+  #ifdef SR_DEBUG
+    USER_PRINTLN("\nalocateFFTBuffers() completed successfully.");
+    USER_PRINT(F("Free heap: ")); USER_PRINTLN(ESP.getFreeHeap());
+    USER_PRINT("FFTtask free stack: "); USER_PRINTLN(uxTaskGetStackHighWaterMark(NULL));
+    USER_FLUSH();
+  #endif
+  return(true); // success
+}
+
 // High-Pass "DC blocker" filter
 // see https://www.dsprelated.com/freebooks/filters/DC_Blocker.html
 static void runDCBlocker(uint_fast16_t numSamples, float *sampleBuffer) {
@@ -496,9 +511,30 @@ void FFTcode(void * parameter)
   static bool isFirstRun = false;
 
 #ifdef FFT_USE_SLIDING_WINDOW
-  static float oldSamples[samplesFFT_2] = {0.0f}; // previous 50% of samples
+  static float* oldSamples = nullptr; // previous 50% of samples
   static bool haveOldSamples = false; // for sliding window FFT
   bool usingOldSamples = false;
+  if (!oldSamples) oldSamples = (float*) calloc(sizeof(float), samplesFFT_2); // allocate on first run
+  if (!oldSamples) { disableSoundProcessing = true; return; }                 // no memory -> die
+#endif
+
+  bool success = true;
+  if ((vReal == nullptr) || (vImag == nullptr)) success = alocateFFTBuffers(); // allocate sample buffers on first run
+  if (success == false) { disableSoundProcessing = true; return; }             // no memory -> die
+
+  // create FFT object - we have to do if after allocating buffers
+#if defined(FFT_LIB_REV) && FFT_LIB_REV > 0x19
+  // arduinoFFT 2.x has a slightly different API
+  static ArduinoFFT<float> FFT = ArduinoFFT<float>( vReal, vImag, samplesFFT, SAMPLE_RATE, true);
+#else
+  // recommended version optimized by @softhack007 (API version 1.9)
+  #if defined(WLED_ENABLE_HUB75MATRIX) && defined(CONFIG_IDF_TARGET_ESP32)
+    static float* windowWeighingFactors = nullptr;
+    if (!windowWeighingFactors) windowWeighingFactors = (float*) calloc(sizeof(float), samplesFFT); // cache for FFT windowing factors - use heap
+  #else
+    static float windowWeighingFactors[samplesFFT] = {0.0f};                                        // cache for FFT windowing factors - use global RAM
+  #endif
+  static ArduinoFFT<float> FFT = ArduinoFFT<float>( vReal, vImag, samplesFFT, SAMPLE_RATE, windowWeighingFactors);
 #endif
 
   #ifdef FFT_MAJORPEAK_HUMAN_EAR
@@ -542,7 +578,7 @@ void FFTcode(void * parameter)
 #endif
 
     // get a fresh batch of samples from I2S
-    memset(vReal, 0, sizeof(vReal)); // start clean
+    memset(vReal, 0, sizeof(float) * samplesFFT); // start clean
 #ifdef FFT_USE_SLIDING_WINDOW
     uint16_t readOffset;
     if (haveOldSamples && (doSlidingFFT > 0)) {
@@ -635,7 +671,7 @@ void FFTcode(void * parameter)
 #endif
 
     // set imaginary parts to 0
-    memset(vImag, 0, sizeof(vImag));
+    memset(vImag, 0, sizeof(float) * samplesFFT);
 
     #ifdef FFT_USE_SLIDING_WINDOW
     memcpy(oldSamples, vReal+samplesFFT_2, sizeof(float) * samplesFFT_2);  // copy last 50% to buffer (for sliding window FFT)
@@ -762,14 +798,14 @@ void FFTcode(void * parameter)
         FFT_MajPeakSmth = FFT_MajPeakSmth + 0.42 * (FFT_MajorPeak - FFT_MajPeakSmth);   // I like this "swooping peak" look
 
       } else { // skip second run --> clear fft results, keep peaks
-        memset(vReal, 0, sizeof(vReal)); 
+        memset(vReal, 0, sizeof(float) * samplesFFT); 
       }
 #if defined(WLED_DEBUG) || defined(SR_DEBUG) || defined(SR_STATS)
       haveDoneFFT = true;
 #endif
 
     } else { // noise gate closed - only clear results as FFT was skipped. MIC samples are still valid when we do this.
-      memset(vReal, 0, sizeof(vReal));
+      memset(vReal, 0, sizeof(float) * samplesFFT);
       FFT_MajorPeak = 1;
       FFT_Magnitude = 0.001;
     }
diff --git a/usermods/audioreactive/audio_source.h b/usermods/audioreactive/audio_source.h
index 91573956..fe065bbf 100644
--- a/usermods/audioreactive/audio_source.h
+++ b/usermods/audioreactive/audio_source.h
@@ -37,7 +37,8 @@
 #define SRate_t int
 #endif
 
-constexpr i2s_port_t AR_I2S_PORT = I2S_NUM_0;       // I2S port to use (do not change ! I2S_NUM_1 possible but this has limitation -> no MCLK routing, no ADC support)
+constexpr i2s_port_t AR_I2S_PORT = I2S_NUM_0;       // I2S port to use (do not change!  I2S_NUM_1 possible but this has 
+                                                    // strong limitations -> no MCLK routing, no ADC support, no PDM support
 
 //#include <driver/i2s_std.h>
 //#include <driver/i2s_pdm.h>
@@ -73,6 +74,11 @@ constexpr i2s_port_t AR_I2S_PORT = I2S_NUM_0;       // I2S port to use (do not c
 // data type requested from the I2S driver - currently we always use 32bit
 //#define I2S_USE_16BIT_SAMPLES   // (experimental) define this to request 16bit - more efficient but possibly less compatible
 
+#if defined(WLED_ENABLE_HUB75MATRIX) && defined(CONFIG_IDF_TARGET_ESP32)
+  // this is bitter, but necessary to survive
+  #define I2S_USE_16BIT_SAMPLES
+#endif
+
 #ifdef I2S_USE_16BIT_SAMPLES
 #define I2S_SAMPLE_RESOLUTION I2S_BITS_PER_SAMPLE_16BIT
 #define I2S_datatype int16_t
@@ -301,6 +307,9 @@ class I2SSource : public AudioSource {
       #if defined(ARDUINO_ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32S3) && !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3)
       if (ESP.getChipRevision() == 0) _config.use_apll = false; // APLL is broken on ESP32 revision 0
       #endif
+      #if defined(WLED_ENABLE_HUB75MATRIX)
+        _config.use_apll = false; // APLL needed for HUB75 DMA driver ?
+      #endif
 #endif
 
       if (_i2sMaster == false) {
diff --git a/wled00/ws.cpp b/wled00/ws.cpp
index 5a7f34eb..df838248 100644
--- a/wled00/ws.cpp
+++ b/wled00/ws.cpp
@@ -186,6 +186,12 @@ static bool sendLiveLedsWs(uint32_t wsClient)  // WLEDMM added "static"
   AsyncWebSocketClient * wsc = ws.client(wsClient);
   if (!wsc || wsc->queueLength() > 0) return false; //only send if queue free
 
+  #ifdef ARDUINO_ARCH_ESP32
+  static unsigned long ws_delay = 0;
+  if ((ws_delay > 0) && (millis() - ws_delay < 6000)) return false; // out of memory -> suspend for 6 seconds 
+  else ws_delay = 0;
+  #endif
+
   #ifdef ESP8266
     constexpr size_t MAX_LIVE_LEDS_WS = 256U;
   #else
@@ -223,6 +229,10 @@ static bool sendLiveLedsWs(uint32_t wsClient)  // WLEDMM added "static"
       last_err_time = millis();
     }
 	  errorFlag = ERR_LOW_WS_MEM;
+    #ifdef ARDUINO_ARCH_ESP32
+      ws_delay = millis(); // suspend for next 6 seconds
+      USER_PRINTLN("out of memory - live preview suspended for 6 seconds.");
+    #endif
 	  return false; //out of memory
   }
   uint8_t* buffer = reinterpret_cast<uint8_t*>(wsBuf.data());

From 68536635d7870c5641768c566330fb5049f4edd7 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 14 Oct 2024 11:25:41 +0200
Subject: [PATCH 072/232] show toast when reboot is needed, or error restart
 happened

less WTF, more information
---
 usermods/audioreactive/audio_reactive.h | 19 +++++++++++++++++++
 wled00/const.h                          |  4 ++++
 wled00/data/index.js                    | 14 +++++++++++++-
 wled00/wled.cpp                         |  3 +++
 4 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index 7c22cf8d..fe084105 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -2859,6 +2859,14 @@ class AudioReactive : public Usermod {
       JsonObject top = root[FPSTR(_name)];
       bool configComplete = !top.isNull();
 
+      // remember previous values
+      auto oldEnabled = enabled;
+      auto oldDMType = dmType;
+      auto oldI2SsdPin = i2ssdPin;
+      auto oldI2SwsPin = i2swsPin;
+      auto oldI2SckPin = i2sckPin;
+      auto oldI2SmclkPin = mclkPin;
+
       configComplete &= getJsonValue(top[FPSTR(_enabled)], enabled);
 #ifdef ARDUINO_ARCH_ESP32
     #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)
@@ -2911,6 +2919,17 @@ class AudioReactive : public Usermod {
       configComplete &= getJsonValue(top["sync"][F("mode")], audioSyncEnabled);
       configComplete &= getJsonValue(top["sync"][F("check_sequence")], audioSyncSequence);
 
+      // WLEDMM notify user when a reboot is necessary
+      #ifdef ARDUINO_ARCH_ESP32
+      if (initDone) {
+        if ((audioSource != nullptr) && (oldDMType != dmType)) errorFlag = ERR_REBOOT_NEEDED;  // changing mic type requires reboot
+        if (   (audioSource != nullptr) && (enabled==true)
+            && ((oldI2SsdPin != i2ssdPin) || (oldI2SsdPin != i2ssdPin) || (oldI2SckPin != i2sckPin)) ) errorFlag = ERR_REBOOT_NEEDED;  // changing mic pins requires reboot
+        if ((audioSource != nullptr) && (oldI2SmclkPin != mclkPin)) errorFlag = ERR_REBOOT_NEEDED;  // changing MCLK pin requires reboot
+        if ((oldDMType != dmType) && (oldDMType == 0)) errorFlag = ERR_POWEROFF_NEEDED;  // changing from analog mic requires power cycle
+        if ((oldDMType != dmType) && (dmType == 0)) errorFlag = ERR_POWEROFF_NEEDED;  // changing to analog mic requires power cycle
+      }
+      #endif
       return configComplete;
     }
 
diff --git a/wled00/const.h b/wled00/const.h
index 55f9f780..26f31ca1 100644
--- a/wled00/const.h
+++ b/wled00/const.h
@@ -357,6 +357,10 @@
 #define ERR_LOW_WS_MEM  35  // WLEDMM: low memory (ws)
 #define ERR_LOW_AJAX_MEM  36 // WLEDMM: low memory (oappend)
 #define ERR_LOW_BUF     37  // WLEDMM: low memory (LED buffer from allocLEDs)
+#define ERR_SYS_REBOOT  90  // WLEDMM: reboot after error
+#define ERR_SYS_BROWNOUT  91 // WLEDMM: reboot after brownout alert
+#define ERR_REBOOT_NEEDED 98 // WLEDMM: reboot needed after changing hardware setting
+#define ERR_POWEROFF_NEEDED 99 // WLEDMM: power-cycle needed after changing hardware setting
 
 // Timer mode types
 #define NL_MODE_SET               0            //After nightlight time elapsed, set to target brightness
diff --git a/wled00/data/index.js b/wled00/data/index.js
index 05aaee05..247ab222 100644
--- a/wled00/data/index.js
+++ b/wled00/data/index.js
@@ -2011,8 +2011,20 @@ function readState(s,command=false)
 		case 37:
 			errstr = "no memory for LEDs buffer.";
 		  break;
+		case 90:
+			errstr = "Unexpected Restart. Check serial monitor.";
+		  break;
+		case 91:
+			errstr = "Brownout Restart.";
+		  break;
+		case 98:
+			errstr = "Please reboot WLED to activate changed settings.";
+		  break;
+		case 99:
+			errstr = "Please switch your device off and back on.";
+		  break;
 		}
-	  showToast('Error ' + s.error + ": " + errstr, true);
+	  showToast(((s.error < 33)?'Error ':'Warning ') + s.error + ": " + errstr, (s.error < 35)||(s.error > 90));
 	}
 
 	selectedPal = i.pal;
diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index 3c86c4b0..69f3d44b 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -548,6 +548,9 @@ void WLED::setup()
   USER_PRINTF("Core#0 %s (%d)", resetCode2Info(core0code).c_str(), core0code);
   if (core1code > 0) {USER_PRINTF("; Core#1 %s (%d)", resetCode2Info(core1code).c_str(), core1code);}
   USER_PRINTLN(F("."));
+  if ((core0code > 1) && (core0code <= 20) && (core0code != 3) && (core0code != 12) && (core0code != 14)) errorFlag = ERR_SYS_REBOOT; // abnormal reboot
+  if ((resetReason >= 4) && (resetReason < 10)) errorFlag = ERR_SYS_REBOOT; // abnormal reboot (crash, brownout, watchdog, etc)
+  if ((resetReason == ESP_RST_BROWNOUT) || (core0code == 15)) errorFlag = ERR_SYS_BROWNOUT; // brownout detected
   // WLEDMM end
 
   USER_PRINT(F("FLASH: ")); USER_PRINT((ESP.getFlashChipSize()/1024)/1024);

From db983d80ca95ae7e5b7511053fde1dd2d191106e Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 14 Oct 2024 11:34:56 +0200
Subject: [PATCH 073/232] fir for 8266 build

---
 usermods/audioreactive/audio_reactive.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index fe084105..6a7aa58f 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -2859,6 +2859,7 @@ class AudioReactive : public Usermod {
       JsonObject top = root[FPSTR(_name)];
       bool configComplete = !top.isNull();
 
+#ifdef ARDUINO_ARCH_ESP32
       // remember previous values
       auto oldEnabled = enabled;
       auto oldDMType = dmType;
@@ -2866,6 +2867,7 @@ class AudioReactive : public Usermod {
       auto oldI2SwsPin = i2swsPin;
       auto oldI2SckPin = i2sckPin;
       auto oldI2SmclkPin = mclkPin;
+#endif
 
       configComplete &= getJsonValue(top[FPSTR(_enabled)], enabled);
 #ifdef ARDUINO_ARCH_ESP32

From 3fa5d0c5ba5f8cb39a7e1c2506616af1869f7921 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 14 Oct 2024 13:05:27 +0200
Subject: [PATCH 074/232] HUB75 on S3: workaround for not working runtime
 reconfiguration

* instead of deleting the driver object, we keep a "secret" reference and re-use it
* prevent having more than one HUB75 object
---
 wled00/bus_manager.cpp | 158 ++++++++++++++++++++++++++++++++---------
 wled00/bus_manager.h   |  12 ++--
 2 files changed, 131 insertions(+), 39 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 1b59b50b..baf73cfe 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -522,19 +522,35 @@ void BusNetwork::cleanup() {
 #ifdef WLED_ENABLE_HUB75MATRIX
 #warning "HUB75 driver enabled (experimental)"
 
+// BusHub75Matrix "global" variables (static members)
+MatrixPanel_I2S_DMA* BusHub75Matrix::activeDisplay = nullptr;
+VirtualMatrixPanel*  BusHub75Matrix::activeFourScanPanel = nullptr;
+HUB75_I2S_CFG BusHub75Matrix::activeMXconfig = HUB75_I2S_CFG();
+uint8_t BusHub75Matrix::activeType = 0;
+uint8_t BusHub75Matrix::instanceCount = 0;
+
 BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWhite) {
+  MatrixPanel_I2S_DMA* display = nullptr;
+  VirtualMatrixPanel*  fourScanPanel = nullptr;
+  HUB75_I2S_CFG mxconfig;
   size_t lastHeap = ESP.getFreeHeap();
 
   _valid = false;
-  fourScanPanel = nullptr;
   _len = 0;
 
+  // allow exactly one instance
+  if (instanceCount > 0) {
+    USER_PRINTLN("****** MatrixPanel_I2S_DMA !KABOOM! already active - preventing attempt to create more than one driver instance.");
+    return;  
+  }
+
     mxconfig.double_buff = false; // Use our own memory-optimised buffer rather than the driver's own double-buffer
  
   // mxconfig.driver = HUB75_I2S_CFG::ICN2038S;  // experimental - use specific shift register driver
   // mxconfig.driver = HUB75_I2S_CFG::FM6124;    // try this driver in case you panel stays dark, or when colors look too pastel
 
-  // mxconfig.latch_blanking = 3;
+  // mxconfig.latch_blanking = 1;                // needed for some ICS panels
+  // mxconfig.latch_blanking = 3;                // use in case you see gost images
   // mxconfig.i2sspeed = HUB75_I2S_CFG::HZ_10M;  // experimental - 5MHZ should be enugh, but colours looks slightly better at 10MHz
   // mxconfig.min_refresh_rate = 90;
   mxconfig.clkphase = false; // can help in case that the leftmost column is invisible, or pixels on the right side "bleeds out" to the left.
@@ -745,11 +761,50 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   USER_PRINTF("MatrixPanel_I2S_DMA config - %ux%u (type %u) length: %u, %u bits/pixel.\n", mxconfig.mx_width, mxconfig.mx_height, bc.type, mxconfig.chain_length, mxconfig.getPixelColorDepthBits() * 3);
   DEBUG_PRINT(F("Free heap: ")); DEBUG_PRINTLN(ESP.getFreeHeap()); lastHeap = ESP.getFreeHeap();
 
+  // check if we can re-use the existing display driver
+  if (activeDisplay) {
+    if (   (memcmp(&(activeMXconfig.gpio), &(mxconfig.gpio), sizeof(mxconfig.gpio)) != 0) // other pins?
+        || (activeMXconfig.chain_length != mxconfig.chain_length)                         // other chain length?
+        || (activeMXconfig.mx_width != mxconfig.mx_width) || (activeMXconfig.mx_height != mxconfig.mx_height) // other size?
+        || (bc.type != activeType)                                                        // different panel type ?
+        || (activeMXconfig.clkphase != mxconfig.clkphase)                                 // different driver options ?
+        || (activeMXconfig.latch_blanking != mxconfig.latch_blanking)
+        || (activeMXconfig.i2sspeed != mxconfig.i2sspeed)
+        || (activeMXconfig.driver != mxconfig.driver)
+        || (activeMXconfig.min_refresh_rate != mxconfig.min_refresh_rate)
+        || (activeMXconfig.getPixelColorDepthBits() != mxconfig.getPixelColorDepthBits())  )
+    {
+      // not the same as before - delete old driver
+      DEBUG_PRINTLN("MatrixPanel_I2S_DMA deleting old driver!");
+      activeDisplay->stopDMAoutput();
+      delay(28);
+      //#if !defined(CONFIG_IDF_TARGET_ESP32S3)  // prevent crash
+      delete activeDisplay;
+      //#endif
+      activeDisplay = nullptr;
+      activeFourScanPanel = nullptr;
+      #if defined(CONFIG_IDF_TARGET_ESP32S3)  // runtime reconfiguration is not working on -S3
+      USER_PRINTLN("\n\n****** MatrixPanel_I2S_DMA !KABOOM WARNING! Reboot needed to change driver options ***********\n");
+      errorFlag = ERR_REBOOT_NEEDED;
+      #endif
+    }
+  }
+
   // OK, now we can create our matrix object
-  display = new MatrixPanel_I2S_DMA(mxconfig);
+  bool newDisplay = false; // true when the previous display object wasn't re-used
+  if (!activeDisplay) {
+    display = new MatrixPanel_I2S_DMA(mxconfig);   // create new matrix object
+    newDisplay = true;
+  } else {
+    display = activeDisplay;                       // continue with existing matrix object
+    fourScanPanel = activeFourScanPanel;
+  }
+
   if (display == nullptr) {
       USER_PRINTLN("****** MatrixPanel_I2S_DMA !KABOOM! driver allocation failed ***********");
-      USER_PRINT(F("heap usage: ")); USER_PRINTLN(lastHeap - ESP.getFreeHeap());
+      activeDisplay = nullptr;
+      activeFourScanPanel = nullptr;
+      USER_PRINT(F("heap usage: ")); USER_PRINTLN(int(lastHeap - ESP.getFreeHeap()));
       return;
   }
 
@@ -776,21 +831,23 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
   USER_PRINTLN("MatrixPanel_I2S_DMA created");
   // let's adjust default brightness
-  display->setBrightness8(25);    // range is 0-255, 0 - 0%, 255 - 100%
+  //display->setBrightness8(25);    // range is 0-255, 0 - 0%, 255 - 100% //  [setBrightness()] Tried to set output brightness before begin()
   _bri = 25;
 
   delay(24); // experimental
-  DEBUG_PRINT(F("heap usage: ")); DEBUG_PRINTLN(lastHeap - ESP.getFreeHeap());
+  DEBUG_PRINT(F("heap usage: ")); DEBUG_PRINTLN(int(lastHeap - ESP.getFreeHeap()));
   // Allocate memory and start DMA display
-  if (display->begin() == false) {
+  if (newDisplay && (display->begin() == false)) {
       USER_PRINTLN("****** MatrixPanel_I2S_DMA !KABOOM! I2S memory allocation failed ***********");
-      USER_PRINT(F("heap usage: ")); USER_PRINTLN(lastHeap - ESP.getFreeHeap());
+      USER_PRINT(F("heap usage: ")); USER_PRINTLN(int(lastHeap - ESP.getFreeHeap()));
       _valid = false;
       return;
   }
   else {
-    USER_PRINTLN("MatrixPanel_I2S_DMA begin ok");
-    USER_PRINT(F("heap usage: ")); USER_PRINTLN(lastHeap - ESP.getFreeHeap());
+    if (newDisplay) { USER_PRINTLN("MatrixPanel_I2S_DMA begin, started ok"); }
+    else { USER_PRINTLN("MatrixPanel_I2S_DMA begin, using existing display."); }
+    
+    USER_PRINT(F("heap usage: ")); USER_PRINTLN(int(lastHeap - ESP.getFreeHeap()));
     delay(18);   // experiment - give the driver a moment (~ one full frame @ 60hz) to settle
     _valid = true;
     display->clearScreen();   // initially clear the screen buffer
@@ -826,19 +883,19 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   switch(bc.type) {
     case 105:
       USER_PRINTLN("MatrixPanel_I2S_DMA FOUR_SCAN_32PX_HIGH - 32x32");
-      fourScanPanel = new VirtualMatrixPanel((*display), 1, 1, 32, 32);
+      if (!fourScanPanel) fourScanPanel = new VirtualMatrixPanel((*display), 1, 1, 32, 32);
       fourScanPanel->setPhysicalPanelScanRate(FOUR_SCAN_32PX_HIGH);
       fourScanPanel->setRotation(0);
       break;
     case 106:
       USER_PRINTLN("MatrixPanel_I2S_DMA FOUR_SCAN_32PX_HIGH - 64x32");
-      fourScanPanel = new VirtualMatrixPanel((*display), 1, 1, 64, 32);
+      if (!fourScanPanel) fourScanPanel = new VirtualMatrixPanel((*display), 1, 1, 64, 32);
       fourScanPanel->setPhysicalPanelScanRate(FOUR_SCAN_32PX_HIGH);
       fourScanPanel->setRotation(0);
       break;
     case 107:
       USER_PRINTLN("MatrixPanel_I2S_DMA FOUR_SCAN_64PX_HIGH");
-      fourScanPanel = new VirtualMatrixPanel((*display), 1, 1, 64, 64);
+      if (!fourScanPanel) fourScanPanel = new VirtualMatrixPanel((*display), 1, 1, 64, 64);
       fourScanPanel->setPhysicalPanelScanRate(FOUR_SCAN_64PX_HIGH);
       fourScanPanel->setRotation(0);
       break;
@@ -858,6 +915,15 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
     USER_PRINT((_ledBuffer? _len*sizeof(CRGB) :0) + (_ledsDirty? getBitArrayBytes(_len) :0));
     USER_PRINTLN(F(" bytes."));
   }
+
+  if (_valid) {
+    // config is active, copy to global
+    activeType = bc.type;
+    activeDisplay = display;
+    activeFourScanPanel = fourScanPanel;
+    if (newDisplay) memcpy(&activeMXconfig, &mxconfig, sizeof(mxconfig));
+  }
+  instanceCount++;
   USER_PRINT(F("heap usage: ")); USER_PRINTLN(int(lastHeap - ESP.getFreeHeap()));
 }
 
@@ -874,6 +940,8 @@ void __attribute__((hot)) BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c
   }
   else {
     // no double buffer allocated --> directly draw pixel
+    MatrixPanel_I2S_DMA* display = BusHub75Matrix::activeDisplay;
+    VirtualMatrixPanel*  fourScanPanel = BusHub75Matrix::activeFourScanPanel;
     #ifndef NO_CIE1931
     c = unGamma24(c); // to use the driver linear brightness feature, we first need to undo WLED gamma correction
     #endif
@@ -914,16 +982,21 @@ uint32_t __attribute__((hot)) BusHub75Matrix::getPixelColorRestored(uint16_t pix
 void BusHub75Matrix::setBrightness(uint8_t b, bool immediate) {
   _bri = b;
   if (!_valid) return;
+  MatrixPanel_I2S_DMA* display = BusHub75Matrix::activeDisplay;
   // if (_bri > 238) _bri=238; // not strictly needed. Enable this line if you see glitches at highest brightness.
-  display->setBrightness(_bri);
+  if ((_bri > 253) && (activeMXconfig.latch_blanking < 2)) _bri=253; // prevent glitches at highest brightness.
+  if (display) display->setBrightness(_bri);
 }
 
 void __attribute__((hot)) BusHub75Matrix::show(void) {
   if (!_valid) return;
+  MatrixPanel_I2S_DMA* display = BusHub75Matrix::activeDisplay;
+  if (!display) return;
   display->setBrightness(_bri);
 
   if (_ledBuffer) {
     // write out buffered LEDs
+    VirtualMatrixPanel*  fourScanPanel = BusHub75Matrix::activeFourScanPanel;
     bool isFourScan = (fourScanPanel != nullptr);
     //if (isFourScan) fourScanPanel->setRotation(0);
     unsigned height = isFourScan ? fourScanPanel->height() : display->height();
@@ -951,38 +1024,53 @@ void __attribute__((hot)) BusHub75Matrix::show(void) {
 }
 
 void BusHub75Matrix::cleanup() {
-  if (display && _valid) display->stopDMAoutput();  // terminate DMA driver (display goes black)
-  _valid = false;
-  _panelWidth = 0;
-  deallocatePins();
-  USER_PRINTLN("HUB75 output ended.");
+  MatrixPanel_I2S_DMA* display = BusHub75Matrix::activeDisplay;
+  VirtualMatrixPanel*  fourScanPanel = BusHub75Matrix::activeFourScanPanel;
+  if (display) display->clearScreen();
 
+#if !defined(CONFIG_IDF_TARGET_ESP32S3) // S3: don't stop, as we want to re-use the driver later
+  if (display && _valid) display->stopDMAoutput();  // terminate DMA driver (display goes black)
+  _panelWidth = 0;
+  USER_PRINTLN("HUB75 output ended.");
+#else
+  USER_PRINTLN("HUB75 output paused.");
+#endif
+
+  _valid = false;
+  deallocatePins();
   //if (fourScanPanel != nullptr) delete fourScanPanel;  // warning: deleting object of polymorphic class type 'VirtualMatrixPanel' which has non-virtual destructor might cause undefined behavior
+#if !defined(CONFIG_IDF_TARGET_ESP32S3) // S3: don't delete, as we want to re-use the driver later
   if (display) delete display;
-  display = nullptr;
-  fourScanPanel = nullptr;
+  activeDisplay = nullptr;
+  activeFourScanPanel = nullptr;
+  USER_PRINTLN("HUB75 deleted.");
+#else
+  USER_PRINTLN("HUB75 cleanup done.");
+#endif
+
+  if (instanceCount > 0) instanceCount--;
   if (_ledBuffer != nullptr) free(_ledBuffer); _ledBuffer = nullptr;
   if (_ledsDirty != nullptr) free(_ledsDirty); _ledsDirty = nullptr;      
 }
 
 void BusHub75Matrix::deallocatePins() {
 
-  pinManager.deallocatePin(mxconfig.gpio.r1, PinOwner::HUB75);
-  pinManager.deallocatePin(mxconfig.gpio.g1, PinOwner::HUB75);
-  pinManager.deallocatePin(mxconfig.gpio.b1, PinOwner::HUB75);
-  pinManager.deallocatePin(mxconfig.gpio.r2, PinOwner::HUB75);
-  pinManager.deallocatePin(mxconfig.gpio.g2, PinOwner::HUB75);
-  pinManager.deallocatePin(mxconfig.gpio.b2, PinOwner::HUB75);
+  pinManager.deallocatePin(activeMXconfig.gpio.r1, PinOwner::HUB75);
+  pinManager.deallocatePin(activeMXconfig.gpio.g1, PinOwner::HUB75);
+  pinManager.deallocatePin(activeMXconfig.gpio.b1, PinOwner::HUB75);
+  pinManager.deallocatePin(activeMXconfig.gpio.r2, PinOwner::HUB75);
+  pinManager.deallocatePin(activeMXconfig.gpio.g2, PinOwner::HUB75);
+  pinManager.deallocatePin(activeMXconfig.gpio.b2, PinOwner::HUB75);
 
-  pinManager.deallocatePin(mxconfig.gpio.lat, PinOwner::HUB75);
-  pinManager.deallocatePin(mxconfig.gpio.oe, PinOwner::HUB75);
-  pinManager.deallocatePin(mxconfig.gpio.clk, PinOwner::HUB75);
+  pinManager.deallocatePin(activeMXconfig.gpio.lat, PinOwner::HUB75);
+  pinManager.deallocatePin(activeMXconfig.gpio.oe, PinOwner::HUB75);
+  pinManager.deallocatePin(activeMXconfig.gpio.clk, PinOwner::HUB75);
 
-  pinManager.deallocatePin(mxconfig.gpio.a, PinOwner::HUB75);
-  pinManager.deallocatePin(mxconfig.gpio.b, PinOwner::HUB75);
-  pinManager.deallocatePin(mxconfig.gpio.c, PinOwner::HUB75);
-  pinManager.deallocatePin(mxconfig.gpio.d, PinOwner::HUB75);
-  pinManager.deallocatePin(mxconfig.gpio.e, PinOwner::HUB75);
+  pinManager.deallocatePin(activeMXconfig.gpio.a, PinOwner::HUB75);
+  pinManager.deallocatePin(activeMXconfig.gpio.b, PinOwner::HUB75);
+  pinManager.deallocatePin(activeMXconfig.gpio.c, PinOwner::HUB75);
+  pinManager.deallocatePin(activeMXconfig.gpio.d, PinOwner::HUB75);
+  pinManager.deallocatePin(activeMXconfig.gpio.e, PinOwner::HUB75);
 
 }
 #endif
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 677e71de..350a5f3f 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -388,7 +388,7 @@ class BusHub75Matrix : public Bus {
     void setBrightness(uint8_t b, bool immediate) override;
 
     uint8_t getPins(uint8_t* pinArray) const override {
-      pinArray[0] = mxconfig.chain_length;
+      pinArray[0] = activeMXconfig.chain_length;
       return 1;
     } // Fake value due to keep finaliseInit happy
 
@@ -401,12 +401,16 @@ class BusHub75Matrix : public Bus {
     }
 
   private:
-    MatrixPanel_I2S_DMA *display = nullptr;
-    VirtualMatrixPanel  *fourScanPanel = nullptr;
-    HUB75_I2S_CFG mxconfig;
     unsigned _panelWidth = 0;
     CRGB *_ledBuffer = nullptr;
     byte *_ledsDirty = nullptr;
+    // C++ dirty trick: private static variables are actually _not_ part of the class (however only visibile to class instances). 
+    // These variables persist when BusHub75Matrix gets deleted.
+    static MatrixPanel_I2S_DMA *activeDisplay;         // active display object
+    static VirtualMatrixPanel  *activeFourScanPanel;   // active fourScan object
+    static HUB75_I2S_CFG activeMXconfig;               // last used mxconfig
+    static uint8_t activeType;                         // last used type
+    static uint8_t instanceCount;                      // active instances - 0 or 1
 };
 #endif
 

From d66720ade818e8a0b66731b2067be580328e9c2b Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 14 Oct 2024 13:19:24 +0200
Subject: [PATCH 075/232] HUB75 128x64 (untested)

128x64 panels are normally "64x64 with chain length 2". But some newer ones appear to be native "128x64"
---
 wled00/bus_manager.cpp        | 14 ++++++++++++++
 wled00/data/settings_leds.htm |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index baf73cfe..79000b0f 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -584,6 +584,10 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
       mxconfig.mx_width = 64;
       mxconfig.mx_height = 64;
       break;
+    case 104: // untested
+      mxconfig.mx_width = 128;
+      mxconfig.mx_height = 64;
+      break;
     case 105:
       mxconfig.mx_width = 32 * 2;
       mxconfig.mx_height = 32 / 2;
@@ -596,6 +600,10 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
       mxconfig.mx_width = 64 * 2;
       mxconfig.mx_height = 64 / 2;
       break;
+    case 108: // untested
+      mxconfig.mx_width = 128 * 2;
+      mxconfig.mx_height = 64 / 2;
+      break;
   }
 
 #if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32S2)// classic esp32, or esp32-s2: reduce bitdepth for large panels
@@ -899,6 +907,12 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
       fourScanPanel->setPhysicalPanelScanRate(FOUR_SCAN_64PX_HIGH);
       fourScanPanel->setRotation(0);
       break;
+    case 108: // untested
+      USER_PRINTLN("MatrixPanel_I2S_DMA 128x64 FOUR_SCAN_64PX_HIGH");
+      if (!fourScanPanel) fourScanPanel = new VirtualMatrixPanel((*display), 1, 1, 128, 64);
+      fourScanPanel->setPhysicalPanelScanRate(FOUR_SCAN_64PX_HIGH);
+      fourScanPanel->setRotation(0);
+      break;
   }  
 
   if (_valid) {
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 1fd0e4ba..ef3671b5 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -383,9 +383,11 @@ ${i+1}:
 <option value="101">Hub75Matrix 32x32</option>
 <option value="102">Hub75Matrix 64x32</option>
 <option value="103">Hub75Matrix 64x64</option>
+<option value="104">(experimental) Hub75Matrix 128x64</option>
 <option value="105">Hub75Matrix 32x32 (Outdoor 8S)</option>
 <option value="106">Hub75Matrix 64x32 (Outdoor 8S)</option>
 <option value="107">Hub75Matrix 64x64 (Outdoor 16S)</option>
+<option value="108">(experimental) Hub75Matrix 128x64 (Outdoor 16S)</option>
 </select><br>
 <div id="co${i}" style="display:inline">Color Order:
 <select name="CO${i}">

From 11864326bf6263adae30976160796cbe73303f4d Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 14 Oct 2024 14:10:35 +0200
Subject: [PATCH 076/232] Update settings_leds.htm - remove "experimental"

---
 wled00/data/settings_leds.htm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index ef3671b5..9aec8d78 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -383,11 +383,11 @@ ${i+1}:
 <option value="101">Hub75Matrix 32x32</option>
 <option value="102">Hub75Matrix 64x32</option>
 <option value="103">Hub75Matrix 64x64</option>
-<option value="104">(experimental) Hub75Matrix 128x64</option>
+<option value="104">Hub75Matrix 128x64</option>
 <option value="105">Hub75Matrix 32x32 (Outdoor 8S)</option>
 <option value="106">Hub75Matrix 64x32 (Outdoor 8S)</option>
 <option value="107">Hub75Matrix 64x64 (Outdoor 16S)</option>
-<option value="108">(experimental) Hub75Matrix 128x64 (Outdoor 16S)</option>
+<option value="108">Hub75Matrix 128x64 (Outdoor 16S)</option>
 </select><br>
 <div id="co${i}" style="display:inline">Color Order:
 <select name="CO${i}">

From d67ba8451aefeed9aa825d150c8a50490420f3fd Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 14 Oct 2024 17:37:37 +0200
Subject: [PATCH 077/232] S3: increase MAX_LEDS

S3 (opi PSRAM) can handle 128x128 pixels on HUB75.
---
 wled00/FX_fcn.cpp             | 5 ++++-
 wled00/bus_manager.h          | 2 +-
 wled00/const.h                | 6 +++++-
 wled00/data/settings_leds.htm | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 88f1e1b6..c10a2201 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -1802,7 +1802,10 @@ void WS2812FX::finalizeInit(void)
   for (uint8_t i=0; i<busses.getNumBusses(); i++) {
     Bus *bus = busses.getBus(i);
     if (bus == nullptr) continue;
-    if (bus->getStart() + bus->getLength() > MAX_LEDS) break;
+    if (bus->getStart() + bus->getLength() > MAX_LEDS) {
+      USER_PRINT("\nError: too many LEDs, max number is "); USER_PRINTLN(MAX_LEDS);
+      break;
+    }
     //RGBW mode is enabled if at least one of the strips is RGBW
     _hasWhiteChannel |= bus->hasWhite();
     //refresh is required to remain off if at least one of the strips requires the refresh.
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 350a5f3f..9259bd1f 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -68,7 +68,7 @@ struct BusConfig {
     for (uint8_t i = 0; i < min(unsigned(nPins), sizeof(pins)/sizeof(pins[0])); i++) pins[i] = ppins[i];   //softhack007 fix for potential array out-of-bounds access
   }
 
-  //validates start and length and extends total if needed
+  //validates start and length and extends total if needed // WLEDMM this function is not used anywhere
   bool adjustBounds(uint16_t& total) {
     if (!count) count = 1;
     if (count > MAX_LEDS_PER_BUS) count = MAX_LEDS_PER_BUS;
diff --git a/wled00/const.h b/wled00/const.h
index 26f31ca1..62fbfb62 100644
--- a/wled00/const.h
+++ b/wled00/const.h
@@ -395,7 +395,11 @@
 #define MAX_LEDS 1664 //can't rely on memory limit to limit this to 1600 LEDs
 #else
 //#define MAX_LEDS 8192
-#define MAX_LEDS 8464 // WLEDMM 92x92
+#if !defined(CONFIG_IDF_TARGET_ESP32S3)
+  #define MAX_LEDS 8464 // WLEDMM 92x92 for esp32, esp32-S2 and esp32-c3
+#else
+  #define MAX_LEDS 18436 // WLEDMM 128x128 + 2048 + 4 for esp32-S3
+#endif
 #endif
 #endif
 
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 9aec8d78..35d32321 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -5,7 +5,7 @@
 	<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport">
 	<title>LED Settings</title>
 	<script>
-		var d=document,laprev=55,maxB=1,maxV=0,maxM=4000,maxPB=8465,maxL=1333,maxLbquot=0; //maximum bytes for LED allocation: 4kB for 8266, 32kB for 32
+		var d=document,laprev=55,maxB=1,maxV=0,maxM=4000,maxPB=18438,maxL=1333,maxLbquot=0; //maximum bytes for LED allocation: 4kB for 8266, 64kB for 32
 		d.um_p = [];
 		d.rsvd = [];
 		d.ro_gpio = [];

From 00a1a5a871e2892917b2506e617d99898a661c12 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 14 Oct 2024 21:26:36 +0200
Subject: [PATCH 078/232] HUB75 bitdepth reduction rules per MCU

---
 wled00/bus_manager.cpp | 49 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 79000b0f..218e50d9 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -529,6 +529,41 @@ HUB75_I2S_CFG BusHub75Matrix::activeMXconfig = HUB75_I2S_CFG();
 uint8_t BusHub75Matrix::activeType = 0;
 uint8_t BusHub75Matrix::instanceCount = 0;
 
+
+// --------------------------
+// Bitdepth reduction based on panel size
+// --------------------------
+#if defined(CONFIG_IDF_TARGET_ESP32S3) && CONFIG_SPIRAM_MODE_OCT && defined(BOARD_HAS_PSRAM) && (defined(WLED_USE_PSRAM) || defined(WLED_USE_PSRAM_JSON))
+  // esp32-S3 with octal PSRAM
+  #if defined(SPIRAM_FRAMEBUFFER)
+    // when PSRAM is used for pixel buffers
+    #define MAX_PIXELS_8BIT (192 * 64)
+    #define MAX_PIXELS_6BIT ( 64 * 64)   // trick: skip this category, so we go directly from 8bit to 4bit
+    #define MAX_PIXELS_4BIT (256 * 128)
+  #else
+    // PSRAM not used for pixel buffers
+    #define MAX_PIXELS_8BIT (128 * 64)
+    #define MAX_PIXELS_6BIT (192 * 64)
+    #define MAX_PIXELS_4BIT (256 * 64)
+  #endif
+#elif defined(CONFIG_IDF_TARGET_ESP32S3)
+  // standard esp32-S3
+  #define MAX_PIXELS_8BIT ( 96 * 64)
+  #define MAX_PIXELS_6BIT (128 * 64)
+  #define MAX_PIXELS_4BIT (160 * 64)
+#elif defined(CONFIG_IDF_TARGET_ESP32S2)
+  // esp32-S2 only has 320KB RAM
+  #define MAX_PIXELS_8BIT ( 48 * 48)
+  #define MAX_PIXELS_6BIT ( 64 * 48)
+  #define MAX_PIXELS_4BIT ( 96 * 64)
+#else
+  // classic esp32, and anything else
+  #define MAX_PIXELS_8BIT ( 64 * 64)
+  #define MAX_PIXELS_6BIT ( 96 * 64)
+  #define MAX_PIXELS_4BIT (128 * 64)
+#endif
+// --------------------------
+
 BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWhite) {
   MatrixPanel_I2S_DMA* display = nullptr;
   VirtualMatrixPanel*  fourScanPanel = nullptr;
@@ -606,13 +641,13 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
       break;
   }
 
-#if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32S2)// classic esp32, or esp32-s2: reduce bitdepth for large panels
-  if (mxconfig.mx_height >= 64) {
-    if (mxconfig.chain_length * mxconfig.mx_width > 192) mxconfig.setPixelColorDepthBits(3);
-    else if (mxconfig.chain_length * mxconfig.mx_width > 64)  mxconfig.setPixelColorDepthBits(4);
-    else mxconfig.setPixelColorDepthBits(8);
-  } else mxconfig.setPixelColorDepthBits(8);
-#endif
+  // reduce bitdepth based on total pixels
+  unsigned numPixels = mxconfig.mx_height * mxconfig.mx_width * mxconfig.chain_length;
+  if (numPixels <= MAX_PIXELS_8BIT)      mxconfig.setPixelColorDepthBits(8);   // 24bit
+  else if (numPixels <= MAX_PIXELS_6BIT) mxconfig.setPixelColorDepthBits(6);   // 18bit
+  else if (numPixels <= MAX_PIXELS_4BIT) mxconfig.setPixelColorDepthBits(4);   // 12bit
+  else mxconfig.setPixelColorDepthBits(3);                                     //  9bit
+
 
 #if defined(ARDUINO_ADAFRUIT_MATRIXPORTAL_ESP32S3) // MatrixPortal ESP32-S3
 

From 22b16ab5429181082684617fd4efd12e6f5bd5f0 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 14 Oct 2024 21:52:52 +0200
Subject: [PATCH 079/232] Align all licensing statements with EUPL-1.2

---
 platformio.ini                                |  2 +-
 tools/ESP32-Chip_info.hpp                     |  2 +-
 usermods/audioreactive/audio_reactive.h       | 10 +------
 usermods/audioreactive/audio_source.h         | 11 +------
 .../usermod_v2_auto_playlist.h                | 11 +------
 wled00/FX.cpp                                 | 30 +------------------
 wled00/FX.h                                   | 18 -----------
 wled00/FX_2Dfcn.cpp                           | 20 -------------
 wled00/FX_fcn.cpp                             | 19 ------------
 wled00/data/settings_sec.htm                  |  2 +-
 wled00/wled.cpp                               |  2 +-
 11 files changed, 8 insertions(+), 119 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 07c03129..b1637bc4 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1053,7 +1053,7 @@ build_disable_sync_interfaces =
   -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
 
-AR_build_flags = -D USERMOD_AUDIOREACTIVE -D UM_AUDIOREACTIVE_USE_NEW_FFT ;; WLEDMM audioreactive usermod, licensed under GPLv3
+AR_build_flags = -D USERMOD_AUDIOREACTIVE -D UM_AUDIOREACTIVE_USE_NEW_FFT ;; WLEDMM audioreactive usermod, licensed under EUPL-1.2
 AR_lib_deps = https://github.com/softhack007/arduinoFFT.git#develop @ 1.9.2      ;; used for USERMOD_AUDIOREACTIVE - optimized version, 10% faster on -S2/-C3
 
 animartrix_build_flags = -D USERMOD_ANIMARTRIX ;; WLEDMM usermod: CC BY-NC 3.0 licensed effects by Stefan Petrick
diff --git a/tools/ESP32-Chip_info.hpp b/tools/ESP32-Chip_info.hpp
index 417ee449..f9c5ebec 100644
--- a/tools/ESP32-Chip_info.hpp
+++ b/tools/ESP32-Chip_info.hpp
@@ -469,7 +469,7 @@ void my_verbose_print_reset_reason(int reason)
 #endif
 
 /* 
- * parts below were created by softhack007, licenced under GPL v3.0
+ * parts below were created by softhack007, licenced under EUPL-1.2
  */
 
 void show_psram_info_part1(void)
diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index 1c46e33a..b60ea36d 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -6,16 +6,8 @@
    @repo      https://github.com/MoonModules/WLED, submit changes to this file as PRs to MoonModules/WLED
    @Authors   https://github.com/MoonModules/WLED/commits/mdev/
    @Copyright © 2024 Github MoonModules Commit Authors (contact moonmodules@icloud.com for details)
-   @license   GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
+   @license   Licensed under the EUPL-1.2 or later
 
-     This file is part of the MoonModules WLED fork also known as "WLED-MM".
-     WLED-MM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License 
-     as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
-
-     WLED-MM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied 
-     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-     
-     You should have received a copy of the GNU General Public License along with WLED-MM. If not, see <https://www.gnu.org/licenses/>.
 */
 
 
diff --git a/usermods/audioreactive/audio_source.h b/usermods/audioreactive/audio_source.h
index 77111446..501dd742 100644
--- a/usermods/audioreactive/audio_source.h
+++ b/usermods/audioreactive/audio_source.h
@@ -6,16 +6,7 @@
    @repo      https://github.com/MoonModules/WLED, submit changes to this file as PRs to MoonModules/WLED
    @Authors   https://github.com/MoonModules/WLED/commits/mdev/
    @Copyright © 2024 Github MoonModules Commit Authors (contact moonmodules@icloud.com for details)
-   @license   GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
-
-     This file is part of the MoonModules WLED fork also known as "WLED-MM".
-     WLED-MM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License 
-     as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
-
-     WLED-MM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied 
-     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-     
-     You should have received a copy of the GNU General Public License along with WLED-MM. If not, see <https://www.gnu.org/licenses/>.
+   @license   Licensed under the EUPL-1.2 or later
 
 */
 
diff --git a/usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h b/usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h
index 4cc50671..a4c557dd 100644
--- a/usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h
+++ b/usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h
@@ -6,16 +6,7 @@
    @repo      https://github.com/MoonModules/WLED, submit changes to this file as PRs to MoonModules/WLED
    @Authors   https://github.com/MoonModules/WLED/commits/mdev/
    @Copyright © 2024 Github MoonModules Commit Authors (contact moonmodules@icloud.com for details)
-   @license   GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
-
-     This file is part of the MoonModules WLED fork also known as "WLED-MM".
-     WLED-MM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License 
-     as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
-
-     WLED-MM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied 
-     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-     
-     You should have received a copy of the GNU General Public License along with WLED-MM. If not, see <https://www.gnu.org/licenses/>.
+   @license   Licensed under the EUPL-1.2 or later
 
 */
 
diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 5b1f3515..3def6085 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -3,25 +3,6 @@
   WS2812FX.cpp contains all effect methods
   Harm Aldick - 2016
   www.aldick.org
-  LICENSE
-  The MIT License (MIT)
-  Copyright (c) 2016  Harm Aldick
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-
   Modified heavily for WLED
 */
 
@@ -8417,16 +8398,7 @@ static const char _data_FX_MODE_2DWAVINGCELL[] PROGMEM = "Waving Cell@!,,Amplitu
    @repo      https://github.com/MoonModules/WLED, submit changes to this file as PRs to MoonModules/WLED
    @Authors   https://github.com/MoonModules/WLED/commits/mdev/
    @Copyright © 2024 Github MoonModules Commit Authors (contact moonmodules@icloud.com for details)
-   @license   GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
-
-     This function is part of the MoonModules WLED fork also known as "WLED-MM".
-     WLED-MM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License 
-     as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
-
-     WLED-MM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied 
-     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-     
-     You should have received a copy of the GNU General Public License along with WLED-MM. If not, see <https://www.gnu.org/licenses/>.
+   @license   Licensed under the EUPL-1.2 or later
 */
 
 /////////////////////////
diff --git a/wled00/FX.h b/wled00/FX.h
index 8f8d83b3..997e30c1 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -2,24 +2,6 @@
   WS2812FX.h - Library for WS2812 LED effects.
   Harm Aldick - 2016
   www.aldick.org
-  LICENSE
-  The MIT License (MIT)
-  Copyright (c) 2016  Harm Aldick
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
 
   Modified for WLED
 */
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 6ca95e13..ea40e675 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -1,25 +1,5 @@
 /*
   FX_2Dfcn.cpp contains all 2D utility functions
-
-  LICENSE
-  The MIT License (MIT)
-  Copyright (c) 2022  Blaz Kristan (https://blaz.at/home)
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-
   Parts of the code adapted from WLED Sound Reactive: Copyright (c) 2022 Andrew Tuline, Ewoud Wijma, Harm Aldick
 */
 #include "wled.h"
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index f2ed3e20..3632331e 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -2,25 +2,6 @@
   WS2812FX_fcn.cpp contains all utility functions
   Harm Aldick - 2016
   www.aldick.org
-  LICENSE
-  The MIT License (MIT)
-  Copyright (c) 2016  Harm Aldick
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-
   Modified heavily for WLED
 */
 #include "wled.h"
diff --git a/wled00/data/settings_sec.htm b/wled00/data/settings_sec.htm
index 16923ea1..031a7440 100644
--- a/wled00/data/settings_sec.htm
+++ b/wled00/data/settings_sec.htm
@@ -121,7 +121,7 @@
 		<a href="https://github.com/Aircoookie/WLED/wiki/Contributors-and-credits" target="_blank">Contributors, dependencies and special thanks</a><br>
 		A huge thank you to everyone who helped me create WLED!<br><br>
 		WLED core (c) 2016-2024 Christian Schwinne <br>
-		<i>WLED MM Licensed under the <a href="https://github.com/MoonModules/WLED/blob/master/LICENSE" target="_blank">GPL v3 license</a></i><br><br>
+		<i>WLED MM Licensed under the <a href="https://github.com/MoonModules/WLED/blob/master/LICENSE" target="_blank">EUPL-1.2 license</a></i><br><br>
 		Server message: <span class="sip"> Response error! </span><hr>
 		<div id="toast"></div>
 		<button type="button" onclick="B()">Back</button><button type="submit">Save</button>
diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index 3c86c4b0..ed39f796 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -5,7 +5,7 @@
 #ifdef ARDUINO_ARCH_ESP32
 #include "esp_ota_ops.h"
 #endif
-#warning WLED-MM GPL-v3. By installing WLED MM you implicitly accept the terms!
+#warning WLED-MM is licensed under the EUPL-1.2. By installing WLED MM you implicitly accept the terms!
 
 #if defined(ARDUINO_ARCH_ESP32) && defined(WLED_DISABLE_BROWNOUT_DET)
 #include "soc/soc.h"

From f11d51cc5909f1aacb2000588318b668dedf6800 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 14 Oct 2024 21:56:16 +0200
Subject: [PATCH 080/232] readme cleanup

---
 readme.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/readme.md b/readme.md
index 054bd055..83c488e4 100644
--- a/readme.md
+++ b/readme.md
@@ -14,8 +14,6 @@
 
 <img width="400" alt="image" src="https://user-images.githubusercontent.com/91013628/230378884-5a0f15ee-1aa2-4998-9df7-ade9f32a3d0f.png">
 
-Licensed under the [EUPL-1.2](https://joinup.ec.europa.eu/collection/eupl) or later. The official license text is [available in 23 languages](https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12).
-
 MoonModules/WLED is a fork from [Aircoookie/WLED](https://github.com/Aircoookie/WLED) which contains latest merge of v0.14 of WLED with [additional features](https://mm.kno.wled.ge/moonmodules/what-is-moonmodules/).
 
 This fork is created by members of the [Atuline/WLED](https://github.com/atuline/WLED) team to make development against v0.14 possible while still preserving [Atuline/WLED v0.13.x](https://github.com/atuline/WLED/tree/dev) as a stable and supported version. The Atuline/WLED fork is also called WLED SR (Sound Reactive).
@@ -25,6 +23,10 @@ More info here: <a href="https://mm.kno.wled.ge/moonmodules/what-is-moonmodules/
 <a href="https://www.paypal.com/donate?business=moonmodules@icloud.com"><img src="https://img.shields.io/badge/send%20me%20a%20small%20gift-paypal-blue.svg" alt="HTML tutorial" style="max-width: 100%;"></a>
 Donations will be used to buy WLED related hardware, software or drinks shared with the contributors of this repo.
 
+## License 
+WLED-MM is licensed under the [EUPL-1.2](https://joinup.ec.europa.eu/collection/eupl) or later. 
+The official license text is [available in 23 languages](https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12).
+
 ## Contributing
 We welcome contributions to this project! See [contributing](https://github.com/MoonModules/WLED/blob/mdev/CONTRIBUTING.md) for more information.
 > We would like to have this repository in a polite and friendly atmosphere, so please be kind and respectful to others. For more details, look at [Code of Conduct](https://github.com/MoonModules/WLED/blob/mdev/CODE_OF_CONDUCT.md).

From ced453d3a05be43011bdde4862e43e21430bf78c Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 15 Oct 2024 17:03:48 +0200
Subject: [PATCH 081/232] undo "fix re-initialised bus' brightness"

---
 wled00/wled.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index 69f3d44b..fede9e09 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -308,7 +308,7 @@ void WLED::loop()
       delete busConfigs[i]; busConfigs[i] = nullptr;
     }
     strip.finalizeInit();
-    busses.setBrightness(bri); // fix re-initialised bus' brightness #4005
+    // busses.setBrightness(bri); // fix re-initialised bus' brightness #4005 //WLEDMM doesn't work.
     loadLedmap = true;
     if (aligned) strip.makeAutoSegments();
     else strip.fixInvalidSegments();

From a3545581ea03dfda23e8f4cd8837a45e7039dd1f Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 15 Oct 2024 19:37:45 +0200
Subject: [PATCH 082/232] Update wled.cpp - redo undo

This line wasn't the causing the problem I'm chasing ...
---
 wled00/wled.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index fede9e09..69f3d44b 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -308,7 +308,7 @@ void WLED::loop()
       delete busConfigs[i]; busConfigs[i] = nullptr;
     }
     strip.finalizeInit();
-    // busses.setBrightness(bri); // fix re-initialised bus' brightness #4005 //WLEDMM doesn't work.
+    busses.setBrightness(bri); // fix re-initialised bus' brightness #4005
     loadLedmap = true;
     if (aligned) strip.makeAutoSegments();
     else strip.fixInvalidSegments();

From 4a3f102c250bf96b611d96bd71ab106fbe6f68c8 Mon Sep 17 00:00:00 2001
From: Damian Schneider <daedae@gmx.ch>
Date: Tue, 15 Oct 2024 13:16:18 +0200
Subject: [PATCH 083/232] Fix for Octopus on ESP32 C3

Apparently the C3 can not convert negative floats to uint8_t directly, casting it into an int first fixes it.
---
 wled00/FX.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index dd9c9b66..1705a497 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8410,7 +8410,7 @@ uint16_t mode_2Doctopus() {
     const uint8_t C_Y = rows / 2 + (SEGMENT.custom2 - 128)*rows/255;
     for (int x = xStart; x < xEnd; x++) {
       for (int y = yStart; y < yEnd; y++) {
-        rMap[XY(x, y)].angle = 40.7436f * atan2f(y - C_Y, x - C_X); // avoid 128*atan2()/PI
+        rMap[XY(x, y)].angle  = int(40.7436f * atan2f((y - C_Y), (x - C_X)));  // avoid 128*atan2()/PI
         rMap[XY(x, y)].radius = hypotf(x - C_X, y - C_Y) * mapp; //thanks Sutaburosu
       }
     }

From c1e75ac127a6f9b17346c075cbe4270db2ddcbfb Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Wed, 16 Oct 2024 12:12:28 -0400
Subject: [PATCH 084/232] Expand1D Arc - No holes

---
 wled00/FX_fcn.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 2e8e0528..98e793d5 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -870,7 +870,8 @@ uint16_t Segment::virtualLength() const {
         break;
       case M12_pCorner:
       case M12_pArc:
-        vLen = max(vW,vH); // get the longest dimension
+        vLen = sqrt16(vW * vW + vH * vH);
+        if (vW != vH) vLen++; // round up
         break;
       case M12_jMap: //WLEDMM jMap
         if (jMap)

From e75fc4d457dd637ebe241b1e33cd7da6b5369806 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 16 Oct 2024 21:25:52 +0200
Subject: [PATCH 085/232] fix holes in DNA effect (>32 pixel high segments)

avoid holes by using drawLine when there is a gap
---
 wled00/FX.cpp       | 16 ++++++++++++++--
 wled00/FX_2Dfcn.cpp |  4 ++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 0296727c..b6a9de0f 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5055,9 +5055,21 @@ uint16_t mode_2Ddna(void) {         // dna originally by by ldirko at https://pa
 
   SEGMENT.fadeToBlackBy(64);
 
+  // WLEDMM optimized to prevent holes at height > 32
+  int lastY1 = -1;
+  int lastY2 = -1;
   for (int i = 0; i < cols; i++) {
-    SEGMENT.setPixelColorXY(i, beatsin8(SEGMENT.speed/8, 0, rows-1, 0, i*4    ), ColorFromPalette(SEGPALETTE, i*5+strip.now/17, beatsin8(5, 55, 255, 0, i*10), LINEARBLEND));
-    SEGMENT.setPixelColorXY(i, beatsin8(SEGMENT.speed/8, 0, rows-1, 0, i*4+128), ColorFromPalette(SEGPALETTE, i*5+128+strip.now/17, beatsin8(5, 55, 255, 0, i*10+128), LINEARBLEND));
+    int posY1 = beatsin8(SEGMENT.speed/8, 0, rows-1, 0, i*4    );
+    int posY2 = beatsin8(SEGMENT.speed/8, 0, rows-1, 0, i*4+128);
+    if ((i==0) || ((abs(lastY1 - posY1) < 2) && (abs(lastY2 - posY2) < 2))) {   // use original code when no holes
+      SEGMENT.setPixelColorXY(i, posY1, ColorFromPalette(SEGPALETTE, i*5+strip.now/17, beatsin8(5, 55, 255, 0, i*10), LINEARBLEND));
+      SEGMENT.setPixelColorXY(i, posY2, ColorFromPalette(SEGPALETTE, i*5+128+strip.now/17, beatsin8(5, 55, 255, 0, i*10+128), LINEARBLEND));
+    } else {                                                                    // draw line to prevent holes
+      SEGMENT.drawLine(i-1, lastY1, i, posY1, ColorFromPalette(SEGPALETTE, i*5+strip.now/17, beatsin8(5, 55, 255, 0, i*10), LINEARBLEND));
+      SEGMENT.drawLine(i-1, lastY2, i, posY2, ColorFromPalette(SEGPALETTE, i*5+128+strip.now/17, beatsin8(5, 55, 255, 0, i*10+128), LINEARBLEND));
+    }
+    lastY1 = posY1;
+    lastY2 = posY2;
   }
   SEGMENT.blur(SEGMENT.intensity>>3);
 
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 219e5a8d..cc4bad5c 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -282,7 +282,7 @@ void IRAM_ATTR __attribute__((hot)) Segment::setPixelColorXY_fast(int x, int y,
   }
 
 #if 0 // this is still a dangerous optimization
-  if ((i < UINT_MAX) && sameColor && (call > 0) && (!transitional) && (ledsrgb[i] == CRGB(scaled_col))) return; // WLEDMM looks like nothing to do
+  if ((i < UINT_MAX) && sameColor && (call > 0) && (!transitional)  && (mode != FX_MODE_2DSCROLLTEXT) && (ledsrgb[i] == CRGB(scaled_col))) return; // WLEDMM looks like nothing to do
 #endif
 
   // handle reverse and transpose
@@ -344,7 +344,7 @@ void IRAM_ATTR_YN Segment::setPixelColorXY(int x, int y, uint32_t col) //WLEDMM:
   }
 
 #if 0 // this is a dangerous optimization
-  if ((i < UINT_MAX) && sameColor && (call > 0) && (!transitional) && (ledsrgb[i] == CRGB(col))) return; // WLEDMM looks like nothing to do
+  if ((i < UINT_MAX) && sameColor && (call > 0) && (!transitional) && (mode != FX_MODE_2DSCROLLTEXT) && (ledsrgb[i] == CRGB(col))) return; // WLEDMM looks like nothing to do
 #endif
 
   if (reverse  ) x = cols  - x - 1;

From 70ab62ed9076c96c629740d1d328611c4a4a25ec Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 16 Oct 2024 21:43:31 +0200
Subject: [PATCH 086/232] scrolling text `#ERR` displays WLED error code

experimental
---
 wled00/FX.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index b6a9de0f..28dfb9cf 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -6529,6 +6529,23 @@ uint16_t mode_2Dscrollingtext(void) {
   if (SEGMENT.name) for (size_t i=0,j=0; i<maxLen; i++) if (SEGMENT.name[i]>31 && SEGMENT.name[i]<128) text[j++] = SEGMENT.name[i];
   const bool zero = strchr(text, '0') != nullptr;
 
+  // #ERR = show last error code
+  if ((strlen(text) > 3) && (strncmp_P(text,PSTR("#ERR"),4) == 0)) {
+    // read wled error code, and keep it for 30sec max
+    static byte lastErr = ERR_NONE;        // errorFlag cache - we can use a static (global) variable here because the error code is global, too
+    static unsigned long lastErrTime = 0;  // time when lastErr was updated
+    if ((errorFlag != ERR_NONE) && (lastErr != errorFlag)) { // new error code arrived
+      lastErr = errorFlag;
+      lastErrTime = millis();
+    }
+    bool haveError = (lastErr != ERR_NONE) && (millis() - lastErrTime < 30000);   // true if we have an "active" error code
+    if (SEGENV.call < 512) haveError = true;                                      // for testing - initially show "E00"
+    if ((!haveError) && (errorFlag == ERR_NONE)) lastErr = ERR_NONE;              // reset error code
+    // print error number
+    if (haveError) sprintf_P(text, PSTR("E%-2.2d"), (int)lastErr);
+    else sprintf_P(text, PSTR("   "));
+  }
+
   if (!strlen(text) || !strncmp_P(text,PSTR("#F"),2) || !strncmp_P(text,PSTR("#P"),2) || !strncmp_P(text,PSTR("#A"),2) || !strncmp_P(text,PSTR("#DATE"),5) || !strncmp_P(text,PSTR("#DDMM"),5) || !strncmp_P(text,PSTR("#MMDD"),5) || !strncmp_P(text,PSTR("#TIME"),5) || !strncmp_P(text,PSTR("#HH"),3) || !strncmp_P(text,PSTR("#MM"),3)) { // fallback if empty segment name: display date and time
     char sec[5]= {'\0'};
     byte AmPmHour = hour(localTime);

From e37afd0cb82d8c6e4e698267d43cb7def8246227 Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Wed, 16 Oct 2024 18:12:56 -0400
Subject: [PATCH 087/232] Expand1D Corner Fix, Arc gPC fix.

Only matripix is not working correctly on arc. Effect starts at the end of the strip and use gPC to fill to beginning.
---
 wled00/FX_fcn.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 98e793d5..099e618c 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -869,6 +869,8 @@ uint16_t Segment::virtualLength() const {
         vLen = vH;
         break;
       case M12_pCorner:
+        vLen = max(vW,vH); // get the longest dimension
+        break;
       case M12_pArc:
         vLen = sqrt16(vW * vW + vH * vH);
         if (vW != vH) vLen++; // round up
@@ -1219,11 +1221,18 @@ uint32_t __attribute__((hot)) Segment::getPixelColor(int i) const
         if (vStrip>0) return getPixelColorXY(vStrip - 1, vH - i -1);
         else          return getPixelColorXY(0, vH - i -1);
         break;
-      case M12_pArc:
       case M12_pCorner:
-        // use longest dimension
-        return vW>vH ? getPixelColorXY(i, 0) : getPixelColorXY(0, i);
+      case M12_pArc: {
+        if (i < max(vW, vH)) { 
+          return vW>vH ? getPixelColorXY(i, 0) : getPixelColorXY(0, i); // Corner and Arc
+          break;
+        }
+        int length = virtualLength();
+        int x = i * vW / length;
+        int y = i * vH / length;
+        return getPixelColorXY(x, y); // Not 100% accurate
         break;
+      }
       case M12_jMap: //WLEDMM jMap
         if (jMap)
           return ((JMapC *)jMap)->getPixelColor(i);

From 617a98ddd87eef057e911b2866a6a350e0146ce5 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 17 Oct 2024 12:00:27 +0200
Subject: [PATCH 088/232] bugfix: preset loading should not resets all error

 preset loading was always resetting errorFlag to NO_ERROR.
Changed so only preset-related error are reset.
---
 wled00/presets.cpp | 9 ++++++---
 wled00/wled.h      | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/wled00/presets.cpp b/wled00/presets.cpp
index 3beab1b8..90784a0d 100644
--- a/wled00/presets.cpp
+++ b/wled00/presets.cpp
@@ -228,6 +228,7 @@ void handlePresets()
 
   presetToApply = 0; //clear request for preset
   callModeToApply = 0;
+  byte presetErrorFlag = ERR_NONE;
 
   DEBUG_PRINT(F("Applying preset: "));
   DEBUG_PRINTLN(tmpPreset);
@@ -235,11 +236,13 @@ void handlePresets()
   #ifdef ARDUINO_ARCH_ESP32
   if (tmpPreset==255 && tmpRAMbuffer!=nullptr) {
     deserializeJson(*fileDoc,tmpRAMbuffer);
-    errorFlag = ERR_NONE;
+    if ((errorFlag == ERR_FS_PLOAD) || (errorFlag == ERR_JSON)) errorFlag = ERR_NONE;  // WLEDMM only reset our own error
   } else
   #endif
   {
-  errorFlag = readObjectFromFileUsingId(filename, tmpPreset, fileDoc) ? ERR_NONE : ERR_FS_PLOAD;
+    presetErrorFlag = readObjectFromFileUsingId(filename, tmpPreset, fileDoc) ? ERR_NONE : ERR_FS_PLOAD;
+    if ((errorFlag == ERR_FS_PLOAD) || (errorFlag == ERR_JSON)) errorFlag = ERR_NONE;  // WLEDMM only reset our own error
+    if (presetErrorFlag == ERR_FS_PLOAD) errorFlag = presetErrorFlag;
   }
   fdo = fileDoc->as<JsonObject>();
 
@@ -258,7 +261,7 @@ void handlePresets()
       fdo.remove("ps"); // remove load request for presets to prevent recursive crash (if not called by button and contains preset cycling string "1~5~")
     deserializeState(fdo, CALL_MODE_NO_NOTIFY, tmpPreset); // may change presetToApply by calling applyPreset()
   }
-  if (!errorFlag && tmpPreset < 255 && changePreset) currentPreset = tmpPreset;
+  if (!presetErrorFlag && tmpPreset < 255 && changePreset) currentPreset = tmpPreset;
 
   #if defined(ARDUINO_ARCH_ESP32)
   //Aircoookie recommended not to delete buffer
diff --git a/wled00/wled.h b/wled00/wled.h
index e3cadc5d..085a888f 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2410080
+#define VERSION 2410170
 
 // WLEDMM  - you can check for this define in usermods, to only enabled WLEDMM specific code in the "right" fork. Its not defined in AC WLED.
 #define _MoonModules_WLED_

From 6fc207b801451b81de5a55f982936252a1f73b09 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 17 Oct 2024 13:29:10 +0200
Subject: [PATCH 089/232] julia effect additional options (experimental)

* limit drift, so we don't drift away too far
* added "show Center" = small crosshair
* added soft blur (faster) and strong blur (slower)
---
 wled00/FX.cpp | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 28dfb9cf..d76e80bd 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5589,8 +5589,11 @@ uint16_t mode_2DJulia(void) {                           // An animated Julia set
     SEGMENT.intensity = 24;
   }
 
-  julias->xcen  = julias->xcen  + (float)(SEGMENT.custom1 - 128)/100000.f;
-  julias->ycen  = julias->ycen  + (float)(SEGMENT.custom2 - 128)/100000.f;
+  // WLEDMM limit drift, so we don't move away into nothing
+  constexpr float maxCenter = 2.5f; // just an educated guess
+  if (fabsf(julias->xcen) < maxCenter) julias->xcen  = julias->xcen  + (float)(SEGMENT.custom1 - 128)/100000.f;
+  if (fabsf(julias->ycen) < maxCenter) julias->ycen  = julias->ycen  + (float)(SEGMENT.custom2 - 128)/100000.f;
+
   julias->xymag = julias->xymag + (float)((SEGMENT.custom3 - 16)<<3)/100000.f; // reduced resolution slider
   if (julias->xymag < 0.01f) julias->xymag = 0.01f;
   if (julias->xymag > 1.0f) julias->xymag = 1.0f;
@@ -5662,11 +5665,23 @@ uint16_t mode_2DJulia(void) {                           // An animated Julia set
     }
     y += dy;
   }
-//  SEGMENT.blur(64);
+
+  // WLEDMM
+  if(SEGMENT.check1)
+    SEGMENT.blurRows(48, false); // slight blurr
+  if(SEGMENT.check2)
+    SEGMENT.blur(64, true);      // strong blurr
+  if(SEGMENT.check3) {           // draw crosshair
+    int screenX = lround((0.5f / maxCenter) * (julias->xcen + maxCenter) * float(cols));
+    int screenY = lround((0.5f / maxCenter) * (julias->ycen + maxCenter) * float(rows));
+    int hair = min(min(cols-1, rows-1)/2, 3);
+    SEGMENT.drawLine(screenX, screenY-hair, screenX, screenY+hair, GREEN, true);
+    SEGMENT.drawLine(screenX-hair, screenY, screenX+hair, screenY, GREEN, true);
+  }
 
   return FRAMETIME;
 } // mode_2DJulia()
-static const char _data_FX_MODE_2DJULIA[] PROGMEM = "Julia@,Max iterations per pixel,X center,Y center,Area size;!;!;2;ix=24,c1=128,c2=128,c3=16";
+static const char _data_FX_MODE_2DJULIA[] PROGMEM = "Julia@,Max iterations per pixel,X center,Y center,Area size,Soft Blur,Strong Blur,Show Center;!;!;2;ix=24,c1=128,c2=128,c3=16";
 
 
 //////////////////////////////

From 670c621ffe9ad273324ea095945f4c275972a4ed Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 19 Oct 2024 22:26:11 +0200
Subject: [PATCH 090/232] Arc - gPC fix by @Brandon502

with fix for missing pixel on 8x32 and similar ratios.
---
 wled00/FX_2Dfcn.cpp | 27 ++++++++++++++-------------
 wled00/FX_fcn.cpp   | 19 +++++++++++++++----
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index cc4bad5c..2259c549 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -827,8 +827,8 @@ void Segment::drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint3
 
 void Segment::drawArc(unsigned x0, unsigned y0, int radius, uint32_t color, uint32_t fillColor) {
   if (!isActive() || (radius <=0)) return; // not active
-  float minradius = float(radius) - .5;
-  float maxradius = float(radius) + .5;
+  float minradius = float(radius) - .5f;
+  float maxradius = float(radius) + .5f;
   // WLEDMM pre-calculate values to speed up the loop
   const int minradius2 = roundf(minradius * minradius);
   const int maxradius2 = roundf(maxradius * maxradius);
@@ -841,17 +841,18 @@ void Segment::drawArc(unsigned x0, unsigned y0, int radius, uint32_t color, uint
   const int starty = max(0, int(y0)-radius-1);
   const int endy = min(height, int(y0)+radius+1);
 
-  for (int x=startx; x<endx; x++) for (int y=starty; y<endy; y++) {
-    int newX2 = x - int(x0); newX2 *= newX2; // (distance from centerX) ^2
-    int newY2 = y - int(y0); newY2 *= newY2; // (distance from centerY) ^2
-    int distance2 = newX2 + newY2;
-
-    if ((distance2 >= minradius2) && (distance2 <= maxradius2)) {
-      setPixelColorXY(x, y, color);
-    } else {
-    if (fillColor != 0)
-      if (distance2 < minradius2)
-        setPixelColorXY(x, y, fillColor);
+  for (int x=startx; x<endx; x++) {
+    int newX2 = x - int(x0); newX2 *= newX2;   // (distance from centerX) ^2
+    for (int y=starty; y<endy; y++) {
+      int newY2 = y - int(y0); newY2 *= newY2; // (distance from centerY) ^2
+      int distance2 = newX2 + newY2;
+      if ((distance2 >= minradius2) && (distance2 <= maxradius2)) {
+        setPixelColorXY(x, y, color);
+      } else {
+      if (fillColor != 0)
+        if (distance2 < minradius2)
+          setPixelColorXY(x, y, fillColor);
+      }
     }
   }
 }
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 099e618c..bd979e62 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -957,6 +957,7 @@ void IRAM_ATTR_YN __attribute__((hot)) Segment::setPixelColor(int i, uint32_t co
         if (i==0)
           setPixelColorXY(0, 0, col);
         else {
+          if (i == virtualLength() - 1) setPixelColorXY(vW-1, vH-1, col); // Last i always fill corner
           if (!_isSuperSimpleSegment) { 
             // WLEDMM: drawArc() is faster if it's NOT "super simple" as the regular M12_pArc
             // can do "useSymmetry" to speed things along, but a more complicated segment likey
@@ -1227,10 +1228,20 @@ uint32_t __attribute__((hot)) Segment::getPixelColor(int i) const
           return vW>vH ? getPixelColorXY(i, 0) : getPixelColorXY(0, i); // Corner and Arc
           break;
         }
-        int length = virtualLength();
-        int x = i * vW / length;
-        int y = i * vH / length;
-        return getPixelColorXY(x, y); // Not 100% accurate
+        float minradius = float(i) - .5f;
+        const int minradius2 = roundf(minradius * minradius);
+        int startX, startY;
+        if (vW >= vH) {startX = vW - 1; startY = 1;} // Last Column
+        else          {startX = 1; startY = vH - 1;} // Last Row
+        // Loop through only last row/column depending on orientation
+        for (int x = startX; x < vW; x++) {
+          int newX2 = x * x;
+          for (int y = startY; y < vH; y++) {
+            int newY2 = y * y;
+            if (newX2 + newY2 >= minradius2) return getPixelColorXY(x, y);        
+          }
+        }
+        return getPixelColorXY(vW-1, vH-1); // Last pixel
         break;
       }
       case M12_jMap: //WLEDMM jMap

From 7c6178418a203fce98353468df677b897e09a2e3 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 19 Oct 2024 23:29:53 +0200
Subject: [PATCH 091/232] cache virtualLength() and some cleanup

speedup for 1D->2D mapping
---
 wled00/FX.h         | 10 +++++++++-
 wled00/FX_2Dfcn.cpp |  3 ++-
 wled00/FX_fcn.cpp   | 24 ++++++++----------------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/wled00/FX.h b/wled00/FX.h
index 997e30c1..77b8b7bc 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -428,6 +428,7 @@ typedef struct Segment {
     bool _firstFill = true;  // dirty HACK support
     uint16_t _2dWidth = 0;  // virtualWidth
     uint16_t _2dHeight = 0; // virtualHeight
+    uint16_t _virtuallength = 0; // virtualLength
 
     void setPixelColorXY_slow(int x, int y, uint32_t c); // set relative pixel within segment with color - full slow version
 #else
@@ -619,7 +620,12 @@ typedef struct Segment {
     void     setCurrentPalette(void);
 
     // 1D strip
-    uint16_t virtualLength(void) const;
+    uint16_t calc_virtualLength(void) const;
+#ifndef WLEDMM_FASTPATH
+    inline uint16_t virtualLength(void) const {return calc_virtualLength();}
+#else
+    inline uint16_t virtualLength(void) const {return _virtuallength;}
+#endif
     void setPixelColor(int n, uint32_t c); // set relative pixel within segment with color
     inline void setPixelColor(int n, byte r, byte g, byte b, byte w = 0) { setPixelColor(n, RGBW32(r,g,b,w)); } // automatically inline
     inline void setPixelColor(int n, CRGB c)                             { setPixelColor(n, RGBW32(c.r,c.g,c.b,0)); } // automatically inline
@@ -660,12 +666,14 @@ typedef struct Segment {
       if (mirror) vWidth = (vWidth + 1) /2;  // divide by 2 if mirror, leave at least a single LED
       return vWidth;
     }
+    inline uint16_t calc_virtualWidth() const { return virtualWidth();}
     inline uint16_t virtualHeight() const {  // WLEDMM use fast types, and make function inline
       uint_fast16_t groupLen = groupLength();
       uint_fast16_t vHeight = ((transpose ? width() : height()) + groupLen - 1) / groupLen;
       if (mirror_y) vHeight = (vHeight + 1) /2;  // divide by 2 if mirror, leave at least a single LED
       return vHeight;
     }
+    inline uint16_t calc_virtualHeight() const { return virtualHeight();}
 #else
     inline uint16_t virtualWidth() const  { return(_2dWidth);}  // WLEDMM get pre-calculated virtualWidth
     inline uint16_t virtualHeight() const { return(_2dHeight);} // WLEDMM get pre-calculated virtualHeight
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 2259c549..850444b8 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -255,8 +255,9 @@ void Segment::startFrame(void) {
   _isValid2D  = isActive() && is2D();
   _brightness = currentBri(on ? opacity : 0);
   // if (reverse_y) _isSimpleSegment = false; // for A/B testing
-  _2dWidth    = is2D() ? calc_virtualWidth() : virtualLength();
+  _2dWidth    = is2D() ? calc_virtualWidth() : calc_virtualLength();
   _2dHeight   = calc_virtualHeight();
+  _virtuallength = calc_virtualLength();
   #if 0 && defined(WLED_ENABLE_HUB75MATRIX)
     _firstFill = true; // dirty HACK
   #endif
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index bd979e62..c7ba1470 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -637,13 +637,13 @@ uint16_t Segment::nrOfVStrips() const {
   if (is2D()) {
     switch (map1D2D) {
       case M12_pBar:
-        vLen = virtualWidth();
+        vLen = calc_virtualWidth();
         break;
       case M12_sCircle: //WLEDMM
-        vLen = (virtualWidth() + virtualHeight()) / 6; // take third of the average width
+        vLen = (calc_virtualWidth() + calc_virtualHeight()) / 6; // take third of the average width
         break;
       case M12_sBlock: //WLEDMM
-        vLen = (virtualWidth() + virtualHeight()) / 8; // take half of the average width
+        vLen = (calc_virtualWidth() + calc_virtualHeight()) / 8; // take half of the average width
         break;
     }
   }
@@ -682,11 +682,7 @@ class JMapC {
       if (size > 0)
         return size;
       else
-#ifndef WLEDMM_FASTPATH
-        return SEGMENT.virtualWidth() * SEGMENT.virtualHeight(); //pixels
-#else
         return SEGMENT.calc_virtualWidth() * SEGMENT.calc_virtualHeight(); // calc pixel sizes
-#endif
     }
     void setPixelColor(uint16_t i, uint32_t col) {
       updatejMapDoc();
@@ -778,11 +774,7 @@ class JMapC {
         jMapFile.close();
 
         maxWidth++; maxHeight++;
-#ifndef WLEDMM_FASTPATH
-        scale = min(SEGMENT.virtualWidth() / maxWidth, SEGMENT.virtualHeight() / maxHeight);  // WLEDMM use native min/max
-#else
         scale = min(SEGMENT.calc_virtualWidth() / maxWidth, SEGMENT.calc_virtualHeight() / maxHeight);  // WLEDMM re-calc width/heiht from active settings
-#endif
         dataSize += sizeof(jVectorMap);
         USER_PRINT("dataSize ");
         USER_PRINT(dataSize);
@@ -858,11 +850,11 @@ static int getPinwheelLength(int vW, int vH) {
 #endif
 
 // 1D strip
-uint16_t Segment::virtualLength() const {
+uint16_t Segment::calc_virtualLength() const {
 #ifndef WLED_DISABLE_2D
   if (is2D()) {
-    uint16_t vW = virtualWidth();
-    uint16_t vH = virtualHeight();
+    uint16_t vW = calc_virtualWidth();
+    uint16_t vH = calc_virtualHeight();
     uint16_t vLen = vW * vH; // use all pixels from segment
     switch (map1D2D) {
       case M12_pBar:
@@ -1905,7 +1897,7 @@ void WS2812FX::service() {
       uint16_t frameDelay = FRAMETIME;    // WLEDMM avoid name clash with "delay" function
 
       if (!seg.freeze) { //only run effect function if not frozen
-        _virtualSegmentLength = seg.virtualLength();
+        _virtualSegmentLength = seg.calc_virtualLength();
         _colors_t[0] = seg.currentColor(0, seg.colors[0]);
         _colors_t[1] = seg.currentColor(1, seg.colors[1]);
         _colors_t[2] = seg.currentColor(2, seg.colors[2]);
@@ -2441,7 +2433,7 @@ uint8_t WS2812FX::setPixelSegment(uint8_t n) {
   uint8_t prevSegId = _segment_index;
   if (n < _segments.size()) {
     _segment_index = n;
-    _virtualSegmentLength = _segments[_segment_index].virtualLength();
+    _virtualSegmentLength = _segments[_segment_index].calc_virtualLength();
   }
   return prevSegId;
 }

From a99a54c9faca7424eca8bd47d1ceb7af4fc7c978 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 20 Oct 2024 01:06:18 +0200
Subject: [PATCH 092/232] cache SEGMENT

actually its just a minor speedup, at least with -O2
---
 wled00/FX.cpp     | 7 +++++++
 wled00/FX.h       | 3 +++
 wled00/FX_fcn.cpp | 3 +++
 3 files changed, 13 insertions(+)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index d76e80bd..4822b984 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -10,6 +10,13 @@
 #include "FX.h"
 #include "fcn_declare.h"
 
+#ifdef WLEDMM_FASTPATH
+#undef SEGMENT
+#undef SEGENV
+#define SEGMENT (*strip._currentSeg) // saves us many calls to strip._segments[strip.getCurrSegmentId()]
+#define SEGENV SEGMENT
+#endif
+
 #define IBN 5100
 
 // paletteBlend: 0 - wrap when moving, 1 - always wrap, 2 - never wrap, 3 - none (undefined)
diff --git a/wled00/FX.h b/wled00/FX.h
index 77b8b7bc..62a0bad9 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -1056,6 +1056,9 @@ class WS2812FX {  // 96 bytes
     // and color transitions
     uint32_t _colors_t[3]; // color used for effect (includes transition)
     uint16_t _virtualSegmentLength;
+#ifdef WLEDMM_FASTPATH
+    segment* _currentSeg = nullptr;  // WLEDMM speed up SEGMENT access
+#endif
 
     std::vector<segment> _segments;
     friend class Segment;
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index c7ba1470..f1dd38a7 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -1884,6 +1884,9 @@ void WS2812FX::service() {
   _isServicing = true;
   _segment_index = 0;
   for (segment &seg : _segments) {
+#ifdef WLEDMM_FASTPATH
+    _currentSeg = &seg;
+#endif
     // reset the segment runtime data if needed
     seg.resetIfRequired();
 

From adf7270ee5f16f2f66337254fa477fdc4698936b Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 20 Oct 2024 01:07:27 +0200
Subject: [PATCH 093/232] build 2410200

---
 wled00/wled.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/wled.h b/wled00/wled.h
index 085a888f..095905fe 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2410170
+#define VERSION 2410200
 
 // WLEDMM  - you can check for this define in usermods, to only enabled WLEDMM specific code in the "right" fork. Its not defined in AC WLED.
 #define _MoonModules_WLED_

From 54cc4cac081f98570d2aa079eb34929cfe3ff3f4 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 20 Oct 2024 10:06:51 +0200
Subject: [PATCH 094/232] Arc - gPC fix 2 by @Brandon502

---
 wled00/FX_fcn.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index f1dd38a7..c010e365 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -1220,7 +1220,7 @@ uint32_t __attribute__((hot)) Segment::getPixelColor(int i) const
           return vW>vH ? getPixelColorXY(i, 0) : getPixelColorXY(0, i); // Corner and Arc
           break;
         }
-        float minradius = float(i) - .5f;
+        float minradius = float(i) - 0.1f;
         const int minradius2 = roundf(minradius * minradius);
         int startX, startY;
         if (vW >= vH) {startX = vW - 1; startY = 1;} // Last Column

From 855d61af4e98eb142dfcb64f83e39150e5ad3915 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 22 Oct 2024 23:10:30 +0200
Subject: [PATCH 095/232] draw character minor speedup

Only use palette math when text with color gradient is needed
---
 wled00/FX_2Dfcn.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 850444b8..751eb054 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -913,7 +913,7 @@ void Segment::drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w,
   const int font = w*h;
 
   CRGB col = CRGB(color);
-  CRGBPalette16 grad = CRGBPalette16(col, col2 ? CRGB(col2) : col);
+  CRGBPalette16 grad = CRGBPalette16(col, (col2 != BLACK) ? CRGB(col2) : col);
   uint32_t bgCol = SEGCOLOR(1);
 
   //if (w<5 || w>6 || h!=8) return;
@@ -941,7 +941,7 @@ void Segment::drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w,
         break; // 5x12 font
       default: return;
     }
-    col = ColorFromPalette(grad, (i+1)*255/h, 255, NOBLEND);
+    if (col2 != BLACK) col = ColorFromPalette(grad, (i+1)*255/h, 255, NOBLEND);
     for (int j = 0; j<w; j++) { // character width
       int16_t x0 = x + (w-1) - j;
       if ((x0 >= 0) || (x0 < cols)) {

From 4aa9c2607d38aa3ef426076b12583a0d2f241bb9 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 23 Oct 2024 14:22:57 +0200
Subject: [PATCH 096/232] prevent overflow in color_blend

---
 wled00/colors.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/colors.cpp b/wled00/colors.cpp
index 23cf2f13..fd8febfd 100644
--- a/wled00/colors.cpp
+++ b/wled00/colors.cpp
@@ -11,7 +11,7 @@ IRAM_ATTR_YN __attribute__((hot)) uint32_t color_blend(uint32_t color1, uint32_t
   if(blend == 0)   return color1;
   if (color1 == color2) return color1;  // WLEDMM shortcut
   const uint_fast16_t blendmax = b16 ? 0xFFFF : 0xFF;
-  if(blend == blendmax) return color2;
+  if(blend >= blendmax) return color2;
   const uint_fast8_t shift = b16 ? 16 : 8;
   const uint_fast16_t blend2 = blendmax - blend; // WLEDMM pre-calculate value
 

From 922c5e74df4ba0f8660e22c9d5df30103c717afe Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 23 Oct 2024 14:23:54 +0200
Subject: [PATCH 097/232] drawCharacter minor speedup

---
 wled00/FX_2Dfcn.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 751eb054..2dd0d08a 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -942,11 +942,13 @@ void Segment::drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w,
       default: return;
     }
     if (col2 != BLACK) col = ColorFromPalette(grad, (i+1)*255/h, 255, NOBLEND);
+    uint32_t fgCol = uint32_t(col) & 0x00FFFFFF; // WLEDMM cache color value
+
     for (int j = 0; j<w; j++) { // character width
       int16_t x0 = x + (w-1) - j;
       if ((x0 >= 0) || (x0 < cols)) {
         if ((bits>>(j+(8-w))) & 0x01) { // bit set & drawing on-screen
-        setPixelColorXY(x0, y0, col);
+        setPixelColorXY(x0, y0, fgCol);
         } else {
           if (drawShadow) {
 			// WLEDMM

From dbd8bef669532a0fcbdc611e3f828bcdbfc8e639 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 23 Oct 2024 14:26:05 +0200
Subject: [PATCH 098/232] scrolling text: prevent flickering

always redraw background for each frame
---
 wled00/FX.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 4822b984..71ec4041 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -6594,14 +6594,20 @@ uint16_t mode_2Dscrollingtext(void) {
   if (SEGENV.step < strip.now) {
     if ((numberOfLetters * letterWidth) > cols) ++SEGENV.aux0 %= (numberOfLetters * letterWidth) + cols;      // offset
     else                                          SEGENV.aux0  = (cols + (numberOfLetters * letterWidth))/2;
-    ++SEGENV.aux1 &= 0xFF; // color shift
-    SEGENV.step = strip.now + map(SEGMENT.speed, 0, 255, 10*FRAMETIME_FIXED, 2*FRAMETIME_FIXED);
+    SEGENV.aux1 = (SEGENV.aux1 + 1) & 0xFF; // color shift // WLEDMM changed to prevent overflow
+    SEGENV.step = strip.now + map2(SEGMENT.speed, 0, 255, 10*FRAMETIME_FIXED, 2*FRAMETIME_FIXED);
     if (!SEGMENT.check2) {
       for (int y = 0; y < rows; y++) for (int x = 0; x < cols; x++ )
         SEGMENT.blendPixelColorXY(x, y, SEGCOLOR(1), 255 - (SEGMENT.custom1>>1));
     }
+  } else { // WLEDMM "repaint" segment to prevent flickering
+    if (!SEGMENT.check2) {
+      for (int y = 0; y < rows; y++) for (int x = 0; x < cols; x++)
+        SEGMENT.blendPixelColorXY(x, y, SEGCOLOR(1), 255 - SEGMENT.custom1);  // slightly reduced "blending" to keep trails visible
+    }
   }
-  bool drawShadow = (SEGMENT.check2) && (SEGMENT.custom1 == 0);
+
+  bool drawShadow = (SEGMENT.check2);
   for (int i = 0; i < numberOfLetters; i++) {
     if (int(cols) - int(SEGENV.aux0) + letterWidth*(i+1) < 0) continue; // don't draw characters off-screen
     uint32_t col1 = SEGMENT.color_from_palette(SEGENV.aux1, false, PALETTE_SOLID_WRAP, 0);

From fe5eaed99c80f5cddc8f0bf509ce9535cfdbbd69 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 24 Oct 2024 17:24:17 +0200
Subject: [PATCH 099/232] minor FX enhancements

scrolling text - FPS with 3 digitis
colored bursts - apply gamma correction  when fading
---
 wled00/FX.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 71ec4041..751eeaa2 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5031,7 +5031,7 @@ uint16_t mode_2DColoredBursts() {              // By: ldirko   https://editor.so
       byte dy = lerp8by8(x2, y2, rate);
       //SEGMENT.setPixelColorXY(dx, dy, grad ? color.nscale8_video(255-rate) : color); // use addPixelColorXY for different look
       SEGMENT.addPixelColorXY(dx, dy, color); // use setPixelColorXY for different look
-      if (grad) SEGMENT.fadePixelColorXY(dx, dy, rate);
+      if (grad) SEGMENT.fadePixelColorXY(dx, dy, gamma8(rate));
     }
 
     if (dot) { //add white point at the ends of line
@@ -6585,7 +6585,7 @@ uint16_t mode_2Dscrollingtext(void) {
     else if (!strncmp_P(text,PSTR("#HHMM"),5)) sprintf_P(text, zero?PSTR("%02d:%02d")     :PSTR("%d:%02d"),    AmPmHour,         minute(localTime));
     else if (!strncmp_P(text,PSTR("#HH"),3))   sprintf_P(text, zero?PSTR("%02d")          :PSTR("%d"),         AmPmHour);
     else if (!strncmp_P(text,PSTR("#MM"),3))   sprintf_P(text, zero?PSTR("%02d")          :PSTR("%d"),        minute(localTime));
-    else if (!strncmp_P(text,PSTR("#FPS"),4)) sprintf_P(text, PSTR("%2d"), (int) strip.getFps());                     // WLEDMM
+    else if (!strncmp_P(text,PSTR("#FPS"),4)) sprintf_P(text, PSTR("%3d"), (int) strip.getFps());                     // WLEDMM
     else if ((!strncmp_P(text,PSTR("#AMP"),4)) || (!strncmp_P(text,PSTR("#POW"),4))) sprintf_P(text, PSTR("%3.2fA"), float(strip.currentMilliamps)/1000.0f); // WLEDMM
     else sprintf_P(text, PSTR("%s %d, %d %d:%02d%s"), monthShortStr(month(localTime)), day(localTime), year(localTime), AmPmHour, minute(localTime), sec);
   }

From 05adb7dfae5e6fb09c48eee3c8284b3871cb056b Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 24 Oct 2024 18:16:43 +0200
Subject: [PATCH 100/232] prevent drawLine from drawing out of  bounds

the "smooth" variant was sometimes producing XY positions outside the canvas.
---
 wled00/FX_2Dfcn.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 2dd0d08a..fcf1a57b 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -806,8 +806,13 @@ void Segment::drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint3
       int y = int(intersectY);
       if (steep) std::swap(x,y);  // temporarily swap if steep
       // pixel coverage is determined by fractional part of y co-ordinate
-      setPixelColorXY(x, y, color_blend(c, getPixelColorXY(x, y), keep, true));
-      setPixelColorXY(x+int(steep), y+int(!steep), color_blend(c, getPixelColorXY(x+int(steep), y+int(!steep)), seep, true));
+
+      // WLEDMM added out-of-bounds check: "unsigned(x) < cols" catches negative numbers _and_ too large values
+      if ((unsigned(x) < unsigned(cols)) && (unsigned(y) < unsigned(rows)))   setPixelColorXY(x, y, color_blend(c, getPixelColorXY(x, y), keep, true));
+      int xx = x+int(steep);
+      int yy = y+int(!steep);
+      if ((unsigned(xx) < unsigned(cols)) && (unsigned(yy) < unsigned(rows))) setPixelColorXY(xx, yy, color_blend(c, getPixelColorXY(xx, yy), seep, true));
+
       intersectY += gradient;
       if (steep) std::swap(x,y);  // restore if steep
     }

From b13b44a1fa634dfe8c35f47423f0cc1c2399ecc6 Mon Sep 17 00:00:00 2001
From: Svennte <105973347+Svennte@users.noreply.github.com>
Date: Fri, 25 Oct 2024 09:33:05 +0200
Subject: [PATCH 101/232] Fix alexa devices invisible/uncontrollable (#4214)

Fix for LED and Scenes uncontrollable using Alexa.
Weird behavior regarding to the device names and shared scenes fixed with this.

Seen in issue Aircoookie/Espalexa#228 and fixed from @ams-hh
Tested by myself and works just fine. Created second pull request here because the library seems to be a bit different from the official Espalexa repo.

---------
Co-authored-by: Frank <91616163+softhack007@users.noreply.github.com>
Co-authored-by: Blaz Kristan <blaz@kristan-sp.si>
---
 wled00/src/dependencies/espalexa/Espalexa.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/wled00/src/dependencies/espalexa/Espalexa.h b/wled00/src/dependencies/espalexa/Espalexa.h
index 5c780e24..ae761e9f 100644
--- a/wled00/src/dependencies/espalexa/Espalexa.h
+++ b/wled00/src/dependencies/espalexa/Espalexa.h
@@ -120,10 +120,8 @@ private:
   
   void encodeLightId(uint8_t idx, char* out)
   {
-    uint8_t mac[6];
-    WiFi.macAddress(mac);
-
-    sprintf_P(out, PSTR("%02X:%02X:%02X:%02X:%02X:%02X:00:11-%02X"), mac[0],mac[1],mac[2],mac[3],mac[4],mac[5], idx);
+    String mymac = WiFi.macAddress();
+	sprintf_P(out, PSTR("%02X:%s:AB-%02X"), idx, mymac.c_str(), idx);
   }
 
   // construct 'globally unique' Json dict key fitting into signed int

From 73b7fa7d3562a9a98a492aa9b38a07bf33bcdaa8 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 27 Oct 2024 16:38:05 +0100
Subject: [PATCH 102/232] bugfix: some effects stop progressing after
 brightness 0

alternative fix for https://github.com/Aircoookie/WLED/issues/4228
---
 wled00/FX.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 751eeaa2..6212af1e 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5276,7 +5276,11 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
   if (SEGENV.call == 0) {
     SEGMENT.setUpLeds();
     SEGMENT.fill(BLACK); // to make sure that segment buffer and physical leds are aligned initially
+    SEGENV.step = 0;
   }
+  // fix SEGENV.step in case that timebase jumps
+  if (abs(long(strip.now) - long(SEGENV.step)) > 2000) SEGENV.step = 0;
+
   // Setup New Game of Life
   if ((SEGENV.call == 0 || generation == 0) && SEGENV.step < strip.now) {
     SEGENV.step = strip.now + 1250; // show initial state for 1.25 seconds
@@ -5458,6 +5462,9 @@ uint16_t mode_2DSnowFall(void) { // By: Brandon Butler
     }
   }
    
+  // fix SEGENV.step in case that timebase jumps
+  if (abs(long(strip.now) - long(SEGENV.step)) > 2000) SEGENV.step = 0;
+
   uint8_t speed = map(SEGMENT.speed, 0, 255, 0, 60);                      // Updates per second
   if (!speed || strip.now - SEGENV.step < 1000 / speed) return FRAMETIME; // Not enough time passed
 
@@ -6441,6 +6448,9 @@ uint16_t mode_2Dfloatingblobs(void) {
   if (!SEGENV.allocateData(sizeof(blob_t))) return mode_static(); //allocation failed
   blob_t *blob = reinterpret_cast<blob_t*>(SEGENV.data);
 
+  // WLEDMM fix SEGENV.step in case that timebase jumps
+  if (abs(long(strip.now) - long(SEGENV.step)) > 2000) SEGENV.step = 0;
+
   if (SEGENV.call == 0)  {SEGENV.setUpLeds(); SEGMENT.fill(BLACK);}
   if (SEGENV.aux0 != cols || SEGENV.aux1 != rows) {
     SEGENV.aux0 = cols; // re-initialise if virtual size changes
@@ -6591,7 +6601,8 @@ uint16_t mode_2Dscrollingtext(void) {
   }
   const int numberOfLetters = strlen(text);
 
-  if (SEGENV.step < strip.now) {
+  long delayTime = long(strip.now) - long(SEGENV.step);
+  if ((delayTime >= 0) || (abs(delayTime) > 1500)) {   // WLEDMM keep on scrolling if timebase jumps (supersync, or brightness off, or wifi delay)
     if ((numberOfLetters * letterWidth) > cols) ++SEGENV.aux0 %= (numberOfLetters * letterWidth) + cols;      // offset
     else                                          SEGENV.aux0  = (cols + (numberOfLetters * letterWidth))/2;
     SEGENV.aux1 = (SEGENV.aux1 + 1) & 0xFF; // color shift // WLEDMM changed to prevent overflow

From cff17861a417681d7cdc6fc6847f55fd676b0b9b Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 27 Oct 2024 16:43:21 +0100
Subject: [PATCH 103/232] bugfix: rest segments when leds are switched off/on

based on an idea from @blazoncek in https://github.com/Aircoookie/WLED/commit/4cc2cc4ad40b4611124587f7496f1554abd9ef07#diff-749825f808f7ce1ce1108fffc7ed037085160a63cad32397135dfc0063494373R56
---
 wled00/FX_fcn.cpp | 2 +-
 wled00/button.cpp | 1 +
 wled00/json.cpp   | 4 ++--
 wled00/led.cpp    | 1 +
 wled00/wled.h     | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index c010e365..8a0beead 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -2282,7 +2282,7 @@ void WS2812FX::setSegment(uint8_t n, uint16_t i1, uint16_t i2, uint8_t grouping,
 }
 
 void WS2812FX::restartRuntime() {
-  for (segment &seg : _segments) seg.markForReset();
+  for (segment &seg : _segments) {seg.markForReset(); seg.resetIfRequired();}
 }
 
 void WS2812FX::resetSegments(bool boundsOnly) { //WLEDMM add boundsonly
diff --git a/wled00/button.cpp b/wled00/button.cpp
index c1d03376..5b4176bb 100644
--- a/wled00/button.cpp
+++ b/wled00/button.cpp
@@ -189,6 +189,7 @@ void handleAnalog(uint8_t b)
         briLast = bri;
         bri = 0;
       } else {
+        if (bri == 0) strip.restartRuntime();
         bri = aRead;
       }
     } else if (macroDoublePress[b] == 249) {
diff --git a/wled00/json.cpp b/wled00/json.cpp
index ac4d1ca5..7608503d 100644
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@@ -430,7 +430,7 @@ bool deserializeState(JsonObject root, byte callMode, byte presetId)
     }
   }
 
-  int tr = -1;
+  long tr = -1;
   if (!presetId || currentPlaylist < 0) { //do not apply transition time from preset if playlist active, as it would override playlist transition times
     tr = root[F("transition")] | -1;
     if (tr >= 0)
@@ -463,7 +463,7 @@ bool deserializeState(JsonObject root, byte callMode, byte presetId)
   strip.setTransition(transitionDelayTemp); // required here for color transitions to have correct duration
 
   tr = root[F("tb")] | -1;
-  if (tr >= 0) strip.timebase = ((uint32_t)tr) - millis();
+  if (tr >= 0) strip.timebase = ((unsigned long)tr) - millis();
 
   JsonObject nl       = root["nl"];
   nightlightActive    = nl["on"]      | nightlightActive;
diff --git a/wled00/led.cpp b/wled00/led.cpp
index 74520147..6dac8d83 100644
--- a/wled00/led.cpp
+++ b/wled00/led.cpp
@@ -58,6 +58,7 @@ void toggleOnOff()
   if (bri == 0)
   {
     bri = briLast;
+    strip.restartRuntime();
   } else
   {
     briLast = bri;
diff --git a/wled00/wled.h b/wled00/wled.h
index 095905fe..b58584c5 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2410200
+#define VERSION 2410270
 
 // WLEDMM  - you can check for this define in usermods, to only enabled WLEDMM specific code in the "right" fork. Its not defined in AC WLED.
 #define _MoonModules_WLED_

From e652bd7064eb9266a9e2680369e8b05a14ae6c40 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 27 Oct 2024 17:26:04 +0100
Subject: [PATCH 104/232] do not restart effects after LEDs off/on

---
 wled00/FX.h       |  2 +-
 wled00/FX_fcn.cpp | 10 ++++++++--
 wled00/button.cpp |  2 +-
 wled00/led.cpp    |  2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/wled00/FX.h b/wled00/FX.h
index 62a0bad9..cec8e5d2 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -895,7 +895,7 @@ class WS2812FX {  // 96 bytes
       purgeSegments(bool force = false),
       setSegment(uint8_t n, uint16_t start, uint16_t stop, uint8_t grouping = 1, uint8_t spacing = 0, uint16_t offset = UINT16_MAX, uint16_t startY=0, uint16_t stopY=1),
       setMainSegmentId(uint8_t n),
-      restartRuntime(),
+      restartRuntime(bool doReset=true),
       resetSegments(bool boundsOnly = false), //WLEDMM add boundsOnly
       makeAutoSegments(bool forceReset = false),
       fixInvalidSegments(),
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 8a0beead..cd7ca18d 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -2281,8 +2281,14 @@ void WS2812FX::setSegment(uint8_t n, uint16_t i1, uint16_t i2, uint8_t grouping,
   _segments[n].setUp(i1, i2, grouping, spacing, offset, startY, stopY);
 }
 
-void WS2812FX::restartRuntime() {
-  for (segment &seg : _segments) {seg.markForReset(); seg.resetIfRequired();}
+void WS2812FX::restartRuntime(bool doReset) {
+  for (segment &seg : _segments) {
+    if (doReset) {   // WLEDMM we prefer not to perform a complete restart of all effects
+      seg.markForReset(); seg.resetIfRequired(); 
+    } else {
+      seg.next_time = 0; seg.step = 0;
+    }
+  }
 }
 
 void WS2812FX::resetSegments(bool boundsOnly) { //WLEDMM add boundsonly
diff --git a/wled00/button.cpp b/wled00/button.cpp
index 5b4176bb..fc8cf0f3 100644
--- a/wled00/button.cpp
+++ b/wled00/button.cpp
@@ -189,7 +189,7 @@ void handleAnalog(uint8_t b)
         briLast = bri;
         bri = 0;
       } else {
-        if (bri == 0) strip.restartRuntime();
+        if (bri == 0) strip.restartRuntime(false);
         bri = aRead;
       }
     } else if (macroDoublePress[b] == 249) {
diff --git a/wled00/led.cpp b/wled00/led.cpp
index 6dac8d83..7254184f 100644
--- a/wled00/led.cpp
+++ b/wled00/led.cpp
@@ -58,7 +58,7 @@ void toggleOnOff()
   if (bri == 0)
   {
     bri = briLast;
-    strip.restartRuntime();
+    strip.restartRuntime(false);
   } else
   {
     briLast = bri;

From 422fdb134aba662ec9c29b7227915cc0ae3956f8 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 27 Oct 2024 19:02:05 +0100
Subject: [PATCH 105/232] usre faster math for _S builds

similar to -ffast-math, but still supports NaN and infinites (needed for sunrise/sunset calculations)

10%-20% faster on -S3
---
 platformio.ini | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 367b85cb..9cc3b3d7 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1270,7 +1270,9 @@ build_flags =
 build_flags =
   -O2 ;; optimize for performance instead of size
   ;-ffast-math ;; gives a few  (2-5) percent speedup on ESP32-S3, but causes slight slowdown on classic ESP32
-  -mtarget-align -free -fipa-pta ;; these are very useful, too
+  -funsafe-math-optimizations -fsingle-precision-constant ;; less dangerous than -ffast-math; still allows the compiler to exploit FMA and reciprocals  (10% faster on -S3)
+  ;; -mtarget-align ;; this one is included in -O2, so its not necessary to explicitly add it
+  -free -fipa-pta ;; these are very useful, too
   -fno-jump-tables -fno-tree-switch-conversion                 ;; needed
   -freorder-blocks -Wwrite-strings -fstrict-volatile-bitfields ;; needed
 build_unflags =

From 71deee832508ff324f1ef300e5adb0b7770c0735 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 27 Oct 2024 19:20:34 +0100
Subject: [PATCH 106/232] fix build error in esp32_4MB_S

---
 platformio.ini | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 9cc3b3d7..20e64c4f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1270,11 +1270,12 @@ build_flags =
 build_flags =
   -O2 ;; optimize for performance instead of size
   ;-ffast-math ;; gives a few  (2-5) percent speedup on ESP32-S3, but causes slight slowdown on classic ESP32
-  -funsafe-math-optimizations -fsingle-precision-constant ;; less dangerous than -ffast-math; still allows the compiler to exploit FMA and reciprocals  (10% faster on -S3)
+  -funsafe-math-optimizations ;; less dangerous than -ffast-math; still allows the compiler to exploit FMA and reciprocals  (10% faster on -S3)
   ;; -mtarget-align ;; this one is included in -O2, so its not necessary to explicitly add it
   -free -fipa-pta ;; these are very useful, too
   -fno-jump-tables -fno-tree-switch-conversion                 ;; needed
   -freorder-blocks -Wwrite-strings -fstrict-volatile-bitfields ;; needed
+build_flags_V4 = ${Speed_Flags.build_flags} -fsingle-precision-constant ;; old framework does not like this flag
 build_unflags =
   -Os ;; to disable standard optimization for size
 
@@ -1659,7 +1660,7 @@ build_flags = ${esp32_4MB_V4_S_base.esp32_build_flags}
   ;; -Wall -Wextra 
   -Wno-unused-value -Wno-format -Wno-type-limits
   -D WLED_RELEASE_NAME=esp32_4MB_V4_HUB75
-  ${Speed_Flags.build_flags}  ;; -O2 -> optimize for speed instead of size
+  ${Speed_Flags.build_flags_V4}  ;; -O2 -> optimize for speed instead of size
   ;; -D 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
@@ -1731,7 +1732,7 @@ 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.esp32_build_flags}
-  ${Speed_Flags.build_flags}  ;; optimize for speed instead of size
+  ${Speed_Flags.build_flags_V4}  ;; 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
@@ -1834,7 +1835,7 @@ 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
-  ;;${Speed_Flags.build_flags}  ;; optimize for speed instead of size --> over 100% flash, but works with 256KB filesystem (alternative partitions file)
+  ;;${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
   ;;-D CONFIG_ESP32_REV_MIN=3  ;;  disables PSRAM bug workarounds in the core, reducing the code size and improving overall performance.
@@ -2020,7 +2021,7 @@ build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-inden
   -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
   ;;-D WLED_DISABLE_ADALIGHT     ;; disables serial protocols - recommended for Hardware-CDC USB (Serial RX will receive junk commands when RX pin is unconnected, unless its pulled down by resistor)
-  ${Speed_Flags.build_flags}  ;; optimize for speed instead of size
+  ${Speed_Flags.build_flags_V4}  ;; optimize for speed instead of size
   -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}
   -D WLED_WATCHDOG_TIMEOUT=0 -D CONFIG_ASYNC_TCP_USE_WDT=0
@@ -2068,7 +2069,7 @@ build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-inden
   -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
   ;;-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
   -D WLED_DISABLE_ADALIGHT    ;; disables serial protocols - recommended for Hardware-CDC USB (Serial RX will receive junk commands when RX pin is unconnected, unless its pulled down by resistor)
-  ${Speed_Flags.build_flags}  ;; optimize for speed instead of size
+  ${Speed_Flags.build_flags_V4}  ;; optimize for speed instead of size
   -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}
   -D WLED_WATCHDOG_TIMEOUT=0 -D CONFIG_ASYNC_TCP_USE_WDT=0

From 1767d07e80d3298515ea93d7c9c756edaa254e11 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 27 Oct 2024 19:32:57 +0100
Subject: [PATCH 107/232] matrixportal S3: optimize for speed

---
 platformio.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/platformio.ini b/platformio.ini
index 20e64c4f..5d5ca8d2 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -2660,8 +2660,10 @@ board_build.flash_mode = qio
 
 build_unflags = ${env:esp32S3_8MB_M.build_unflags}   ;; use the same as "normal" S3 buildenv
   -D ARDUINO_USB_CDC_ON_BOOT=1                       ;; fix warning: "ARDUINO_USB_CDC_ON_BOOT" redefined; comment out for Serial debug
+  ${Speed_Flags.build_unflags}  ;; to override -Os
 build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-indentation -Wno-format-truncation
   ${common_mm.build_flags_S}
+  ${Speed_Flags.build_flags_V4}  ;; -O2 -> optimize for speed instead of size
   -D WLED_RELEASE_NAME=matrixportal_esp32s3
   -D SERVERNAME='"WLED-MatrixPortalS3"'
   ; Serial debug enabled  -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

From 7af3e27f64fbdce901c83f44767a85a944bf3857 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 27 Oct 2024 20:55:57 +0100
Subject: [PATCH 108/232] reduce size of -C3 builds, by removing ARTI-FX

---
 platformio.ini | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 5d5ca8d2..1e4359c1 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -2267,6 +2267,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
+  -DUSERMOD_ARTIFX      ;; over the limit
   -DWLEDMM_FASTPATH ;; needs more testing on -C3
 
 build_flags = ${common.build_flags} ${esp32c3.build_flags} 
@@ -2297,9 +2298,8 @@ lib_ignore =
   ;IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
   OneWire         ; not needed as we don't include USERMOD_DALLASTEMPERATURE
   U8g2            ; not needed as we don't include USERMOD_FOUR_LINE_DISPLAY
-; RAM:   [===       ]  25.9% (used 84884 bytes from 327680 bytes)
-; Flash: [==========]  98.9% (used 1555608 bytes from 1572864 bytes)
-
+; RAM:   [==        ]  24.6% (used 80732 bytes from 327680 bytes)
+; Flash: [==========]  97.5% (used 1533360 bytes from 1572864 bytes)
 ;; MM environment for ESP32-C3 "mini" and "super mini" -> flash mode "dio" instead of "qio" (see #101)
 [env:esp32c3mini_dio_4MB_M]
 extends = env:esp32c3dev_4MB_M
@@ -2316,8 +2316,8 @@ build_flags = ${env:esp32c3dev_4MB_M.build_flags}
   -D WLED_DISABLE_BROWNOUT_DET    ;; the board only has a 500mA LDO, better to disable brownout detection
   -D WLED_DISABLE_ADALIGHT        ;; to disable serial protocols for boards with CDC USB (Serial RX will receive junk commands, unless its pulled down by resistor)
   -D HW_PIN_SDA=0 -D HW_PIN_SCL=1 ;; avoid pin conflicts
-; RAM:   [===       ]  25.8% (used 84700 bytes from 327680 bytes)
-; Flash: [==========]  98.7% (used 1552582 bytes from 1572864 bytes)
+; RAM:   [==        ]  24.6% (used 80556 bytes from 327680 bytes)
+; Flash: [==========]  97.3% (used 1530346 bytes from 1572864 bytes)
 
 [env:esp32c3dev_2MB_M]
 extends = env:esp32c3dev_4MB_M
@@ -2343,8 +2343,8 @@ build_flags = ${env:esp32c3dev_4MB_M.build_flags}
   -D WLED_DISABLE_ADALIGHT        ;; to disable serial protocols for boards with CDC USB (Serial RX will receive junk commands, unless its pulled down by resistor)
   -D HW_PIN_SDA=0 -D HW_PIN_SCL=1 ;; avoid pin conflicts
 
-; RAM:   [===       ]  25.3% (used 82828 bytes from 327680 bytes)
-; Flash: [==========]  97.9% (used 1540138 bytes from 1572864 bytes)
+; RAM:   [==        ]  24.0% (used 78676 bytes from 327680 bytes)
+; Flash: [==========]  96.4% (used 1516068 bytes from 1572864 bytes)
 
 ;; MM environment for "seeed xiao -C3" boards
 [env:seeed_esp32c3_4MB_S]
@@ -2378,9 +2378,8 @@ build_flags = ${common.build_flags} ${esp32c3.build_flags}
 lib_deps = ${esp32c3.lib_deps} ${common_mm.lib_deps_S}
 lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
 monitor_filters = esp32_exception_decoder
-; RAM:   [==        ]  23.6% (used 77460 bytes from 327680 bytes)
-; Flash: [========= ]  91.7% (used 1442092 bytes from 1572864 bytes)
-
+; RAM:   [==        ]  22.4% (used 73388 bytes from 327680 bytes)
+; Flash: [========= ]  92.7% (used 1458598 bytes from 1572864 bytes)
 # ------------------------------------------------------------------------------
 # custom board environments
 # ------------------------------------------------------------------------------

From 711c70990092368896cfd0265e9b8a10053a0e03 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 28 Oct 2024 10:30:01 +0100
Subject: [PATCH 109/232] allocate more PSRAM for JSON

---
 wled00/wled.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/wled00/wled.h b/wled00/wled.h
index b58584c5..781a55e6 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -814,7 +814,11 @@ WLED_GLOBAL int8_t spi_sclk  _INIT(HW_PIN_CLOCKSPI);
   #ifndef WLED_DEFINE_GLOBAL_VARS
   WLED_GLOBAL PSRAMDynamicJsonDocument doc;
   #else
-  WLED_GLOBAL PSRAMDynamicJsonDocument doc(JSON_BUFFER_SIZE);
+  #if defined(CONFIG_IDF_TARGET_ESP32S2) || !defined(BOARD_HAS_PSRAM)
+    WLED_GLOBAL PSRAMDynamicJsonDocument doc(JSON_BUFFER_SIZE);       // S2 has very small RAM - lets not push our luck too far
+  #else
+    WLED_GLOBAL PSRAMDynamicJsonDocument doc(JSON_BUFFER_SIZE * 2 );  // initially "doc" is allocated in RAM, and later pushed into PSRAM when the drivers is ready
+  #endif
   //#warning trying to always use dynamic JSON in PSRAM
   #endif
 #else

From f14c4cbe5b42974237a6b5c7de1f4afc255029fc Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 28 Oct 2024 13:09:29 +0100
Subject: [PATCH 110/232] make presets with images work with FASTPATH

seg.startFrame() is needed, otherwise nothing will be drawn.
---
 wled00/json.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/wled00/json.cpp b/wled00/json.cpp
index 7608503d..f1b75bed 100644
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@@ -328,6 +328,13 @@ bool deserializeSegment(JsonObject elem, byte it, byte presetId)
   if (!iarr.isNull()) {
     uint8_t oldMap1D2D = seg.map1D2D;
     seg.map1D2D = M12_Pixels; // no mapping
+    // WLEDMM begin - we need to init segment caches before putting any pixels
+    if (strip.isServicing()) {
+      USER_PRINTLN(F("deserializeSegment() image: strip is still drawing effects."));
+      strip.waitUntilIdle();
+    }
+    seg.startFrame();
+    // WLEDMM end
 
     // set brightness immediately and disable transition
     transitionDelayTemp = 0;

From 3cd733d5911e83a7e0a944835c4bd82f3769f959 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 28 Oct 2024 17:28:42 +0100
Subject: [PATCH 111/232] GEQ bugfix - bars one pixel too high when using
 drawLine

---
 wled00/FX.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 6212af1e..c06e6d3b 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8031,7 +8031,7 @@ uint16_t mode_2DGEQ(void) { // By Will Tatam. Code reduction by Ewoud Wijma.
       colorIndex = map(x, 0, cols-1, 0, 255); //WLEDMM
     }
     lastBandHeight = bandHeight; // remember BandHeight (left side) for next iteration
-    uint16_t barHeight = map(bandHeight, 0, 255, 0, rows); // Now we map bandHeight to barHeight. do not subtract -1 from rows here
+    uint16_t barHeight = map2(bandHeight, 0, 255, 0, rows); // Now we map bandHeight to barHeight. do not subtract -1 from rows here
     // WLEDMM end
 
     if (barHeight > rows) barHeight = rows;                      // WLEDMM map() can "overshoot" due to rounding errors
@@ -8040,7 +8040,7 @@ uint16_t mode_2DGEQ(void) { // By Will Tatam. Code reduction by Ewoud Wijma.
     uint32_t ledColor = BLACK;
     if ((! SEGMENT.check1) && (barHeight > 0)) {  // use faster drawLine when single-color bars are needed
       ledColor = SEGMENT.color_from_palette(colorIndex, false, PALETTE_SOLID_WRAP, 0);
-      SEGMENT.drawLine(int(x), max(0,int(rows)-barHeight-1), int(x), int(rows-1), ledColor, false); // max(0, ...) to prevent negative Y
+      SEGMENT.drawLine(int(x), max(0,int(rows)-barHeight), int(x), int(rows-1), ledColor, false); // max(0, ...) to prevent negative Y
     } else {
     for (int y=0; y < barHeight; y++) {
       if (SEGMENT.check1) //color_vertical / color bars toggle

From 91893295709b62af40a2f87971fc87cf1216078c Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 28 Oct 2024 21:26:04 +0100
Subject: [PATCH 112/232] scrolling text improvement

better readability
- only add "shadow" pixels when overlay text is actually scrolling, or displayed value changes very often
---
 wled00/FX.cpp       | 8 +++++---
 wled00/FX_2Dfcn.cpp | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index c06e6d3b..de32ecc9 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -6560,6 +6560,7 @@ uint16_t mode_2Dscrollingtext(void) {
   unsigned maxLen = (SEGMENT.name) ? min(32, (int)strlen(SEGMENT.name)) : 0;  // WLEDMM make it robust against too long segment names
   if (SEGMENT.name) for (size_t i=0,j=0; i<maxLen; i++) if (SEGMENT.name[i]>31 && SEGMENT.name[i]<128) text[j++] = SEGMENT.name[i];
   const bool zero = strchr(text, '0') != nullptr;
+  bool drawShadow = (SEGMENT.check2); // "shadow" is only needed for overlays to improve readability
 
   // #ERR = show last error code
   if ((strlen(text) > 3) && (strncmp_P(text,PSTR("#ERR"),4) == 0)) {
@@ -6579,6 +6580,7 @@ uint16_t mode_2Dscrollingtext(void) {
   }
 
   if (!strlen(text) || !strncmp_P(text,PSTR("#F"),2) || !strncmp_P(text,PSTR("#P"),2) || !strncmp_P(text,PSTR("#A"),2) || !strncmp_P(text,PSTR("#DATE"),5) || !strncmp_P(text,PSTR("#DDMM"),5) || !strncmp_P(text,PSTR("#MMDD"),5) || !strncmp_P(text,PSTR("#TIME"),5) || !strncmp_P(text,PSTR("#HH"),3) || !strncmp_P(text,PSTR("#MM"),3)) { // fallback if empty segment name: display date and time
+    if (!strncmp_P(text,PSTR("#D"),2) || !strncmp_P(text,PSTR("#MM"),3) || !strncmp_P(text,PSTR("#HH"),3)) drawShadow = false; // no seconds - no shadow needed
     char sec[5]= {'\0'};
     byte AmPmHour = hour(localTime);
     boolean isitAM = true;
@@ -6596,9 +6598,9 @@ uint16_t mode_2Dscrollingtext(void) {
     else if (!strncmp_P(text,PSTR("#HH"),3))   sprintf_P(text, zero?PSTR("%02d")          :PSTR("%d"),         AmPmHour);
     else if (!strncmp_P(text,PSTR("#MM"),3))   sprintf_P(text, zero?PSTR("%02d")          :PSTR("%d"),        minute(localTime));
     else if (!strncmp_P(text,PSTR("#FPS"),4)) sprintf_P(text, PSTR("%3d"), (int) strip.getFps());                     // WLEDMM
-    else if ((!strncmp_P(text,PSTR("#AMP"),4)) || (!strncmp_P(text,PSTR("#POW"),4))) sprintf_P(text, PSTR("%3.2fA"), float(strip.currentMilliamps)/1000.0f); // WLEDMM
+    else if ((!strncmp_P(text,PSTR("#AMP"),4)) || (!strncmp_P(text,PSTR("#POW"),4))) sprintf_P(text, PSTR("%3.1fA"), float(strip.currentMilliamps)/1000.0f); // WLEDMM
     else sprintf_P(text, PSTR("%s %d, %d %d:%02d%s"), monthShortStr(month(localTime)), day(localTime), year(localTime), AmPmHour, minute(localTime), sec);
-  }
+  } else drawShadow = false;  // static text does not require shadow
   const int numberOfLetters = strlen(text);
 
   long delayTime = long(strip.now) - long(SEGENV.step);
@@ -6618,7 +6620,7 @@ uint16_t mode_2Dscrollingtext(void) {
     }
   }
 
-  bool drawShadow = (SEGMENT.check2);
+  if (SEGENV.check2 && ((numberOfLetters * letterWidth) > cols)) drawShadow = true; // scrolling overlay is easier to read with shadow
   for (int i = 0; i < numberOfLetters; i++) {
     if (int(cols) - int(SEGENV.aux0) + letterWidth*(i+1) < 0) continue; // don't draw characters off-screen
     uint32_t col1 = SEGMENT.color_from_palette(SEGENV.aux1, false, PALETTE_SOLID_WRAP, 0);
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index fcf1a57b..e803b56d 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -922,6 +922,7 @@ void Segment::drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w,
   uint32_t bgCol = SEGCOLOR(1);
 
   //if (w<5 || w>6 || h!=8) return;
+  if (drawShadow) w++; // one more column for shadow on right side
   for (int i = 0; i<h; i++) { // character height
     int16_t y0 = y + i;
     if (y0 < 0) continue; // drawing off-screen

From f15bb83abbd30c4f5ca4ffb1d5df7c8ba1a74d96 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 29 Oct 2024 18:40:07 +0100
Subject: [PATCH 113/232] akemi small optimization

prevent that GEQ "bars" try to draw outside the panel area
---
 wled00/FX.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index de32ecc9..4927e92a 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8211,10 +8211,11 @@ uint16_t mode_2DAkemi(void) {
     int xMax = cols/8;
     for (int x=0; x < xMax; x++) {
       size_t band = map2(x, 0, max(xMax,4), 0, 15);  // map 0..cols/8 to 16 GEQ bands
-      CRGB color = SEGMENT.color_from_palette((band * 35), false, PALETTE_SOLID_WRAP, 0);
+      uint32_t color = SEGMENT.color_from_palette((band * 35), false, PALETTE_SOLID_WRAP, 0);
       band = constrain(band, 0, 15);
       uint16_t barHeight = map(fftResult[band], 0, 255, 0, 17*rows/32);
 
+      barHeight = constrain(barHeight, 0, (rows/2)+1); // map() may overshoot
       for (int y=0; y < barHeight; y++) {
         SEGMENT.setPixelColorXY(x, rows/2-y, color);
         SEGMENT.setPixelColorXY(cols-1-x, rows/2-y, color);

From 91ff04a79b9c9e2d2884a94a0d3a3b42177c672f Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 29 Oct 2024 18:45:54 +0100
Subject: [PATCH 114/232] HUB75 small optimization

use CRGB instead converging to uint32_t, then extracting bytes with shift & mask
---
 wled00/bus_manager.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 218e50d9..4fb5abaa 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -1056,13 +1056,18 @@ void __attribute__((hot)) BusHub75Matrix::show(void) {
     size_t pix = 0; // running pixel index
     for (int y=0; y<height; y++) for (int x=0; x<width; x++) {
       if (getBitFromArray(_ledsDirty, pix) == true) {        // only repaint the "dirty"  pixels
-        uint32_t c = uint32_t(_ledBuffer[pix]) & 0x00FFFFFF; // get RGB color, removing FastLED "alpha" component 
         #ifndef NO_CIE1931
+        uint32_t c = uint32_t(_ledBuffer[pix]) & 0x00FFFFFF; // get RGB color, removing FastLED "alpha" component 
         c = unGamma24(c); // to use the driver linear brightness feature, we first need to undo WLED gamma correction
-        #endif
         uint8_t r = R(c);
         uint8_t g = G(c);
         uint8_t b = B(c);
+        #else
+        const CRGB c = _ledBuffer[pix];  // we stay on CRGB, instead of packing/unpacking the color value to uint32_t
+        uint8_t r = c.r;
+        uint8_t g = c.g;
+        uint8_t b = c.b;
+        #endif
         if (isFourScan) fourScanPanel->drawPixelRGB888(int16_t(x), int16_t(y), r, g, b);
         else display->drawPixelRGB888(int16_t(x), int16_t(y), r, g, b);
       }

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 115/232] 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;

From a362b619fb19d8d499456e7a01936f6fa99ffcc2 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 30 Oct 2024 17:00:44 +0100
Subject: [PATCH 116/232] fix JSON buffer problem on classic esp32 with PSRAM

as it turns out, classic esp32 cannot allocate more than 64kb for json doc.
---
 wled00/wled.cpp | 13 +++++++++----
 wled00/wled.h   |  4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index e6b62c1a..9a1bca40 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -349,7 +349,7 @@ void WLED::loop()
       //DEBUG_PRINT(F("Total PSRAM: "));    DEBUG_PRINT(ESP.getPsramSize()/1024); DEBUG_PRINTLN("kB");
       DEBUG_PRINT(F("Free PSRAM : "));     DEBUG_PRINT(ESP.getFreePsram()/1024); DEBUG_PRINTLN("kB");
       DEBUG_PRINT(F("Avail PSRAM: "));     DEBUG_PRINT(ESP.getMaxAllocPsram()/1024); DEBUG_PRINTLN("kB");
-	  DEBUG_PRINT(F("PSRAM in use:")); DEBUG_PRINT(ESP.getPsramSize() - ESP.getFreePsram()); DEBUG_PRINTLN(F(" Bytes"));
+      DEBUG_PRINT(F("PSRAM in use:")); DEBUG_PRINT(int(ESP.getPsramSize() - ESP.getFreePsram())); DEBUG_PRINTLN(F(" Bytes"));
 
     } else {
       //DEBUG_PRINTLN(F("No PSRAM"));
@@ -640,9 +640,14 @@ void WLED::setup()
   pinManager.allocatePin(2, true, PinOwner::DMX);
 #endif
 
-#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
+#if defined(ALL_JSON_TO_PSRAM) && defined(BOARD_HAS_PSRAM) && (defined(WLED_USE_PSRAM_JSON) || defined(WLED_USE_PSRAM))
+  if (psramFound()) {
+    DEBUG_PRINT(F("\nfree heap ")); DEBUG_PRINTLN(ESP.getFreeHeap());
+    USER_PRINTLN(F("JSON gabage collection (initial)."));
+    doc.garbageCollect();   // WLEDMM experimental - this seems to move the complete doc[] into PSRAM
+	  USER_PRINT(F("PSRAM in use:")); USER_PRINT(int(ESP.getPsramSize() - ESP.getFreePsram())); USER_PRINTLN(F(" Bytes."));
+    DEBUG_PRINT(F("free heap ")); DEBUG_PRINTLN(ESP.getFreeHeap());
+  }
 #endif
 
 // WLEDMM experimental: support for single neoPixel on Adafruit boards
diff --git a/wled00/wled.h b/wled00/wled.h
index b38c42e9..3e5f76e5 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2410270
+#define VERSION 2410300
 
 // WLEDMM  - you can check for this define in usermods, to only enabled WLEDMM specific code in the "right" fork. Its not defined in AC WLED.
 #define _MoonModules_WLED_
@@ -814,7 +814,7 @@ WLED_GLOBAL int8_t spi_sclk  _INIT(HW_PIN_CLOCKSPI);
   #ifndef WLED_DEFINE_GLOBAL_VARS
   WLED_GLOBAL PSRAMDynamicJsonDocument doc;
   #else
-  #if defined(CONFIG_IDF_TARGET_ESP32S2) || !defined(BOARD_HAS_PSRAM)
+  #if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32S2) || !defined(BOARD_HAS_PSRAM)
     WLED_GLOBAL PSRAMDynamicJsonDocument doc(JSON_BUFFER_SIZE);       // S2 has very small RAM - lets not push our luck too far
   #else
     WLED_GLOBAL PSRAMDynamicJsonDocument doc(JSON_BUFFER_SIZE * 2 );  // initially "doc" is allocated in RAM, and later pushed into PSRAM when the drivers is ready

From 93125062175c0513afce508145a5b1d88b657a97 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 30 Oct 2024 18:40:26 +0100
Subject: [PATCH 117/232] detection of "OPI" flash (esp32s3 WROOM-2)

---
 wled00/json.cpp        |  8 +++++++-
 wled00/pin_manager.cpp |  2 +-
 wled00/wled.cpp        | 10 ++++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/wled00/json.cpp b/wled00/json.cpp
index f1b75bed..7d355e79 100644
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@@ -1079,7 +1079,7 @@ void serializeInfo(JsonObject root)
     #if CONFIG_SPIRAM_MODE_OCT
       root[F("psrmode")]  = F("🚀 OPI");
     #elif CONFIG_SPIRAM_MODE_QUAD
-      root[F("psrmode")]  = F("qspi 🛻");
+      root[F("psrmode")]  = F("qspi");
     #endif
     #endif
   }
@@ -1115,6 +1115,12 @@ void serializeInfo(JsonObject root)
     case FM_QOUT: root[F("e32flashtext")] = F(" (QOUT)");break;
     case FM_DIO:  root[F("e32flashtext")] = F(" (DIO)"); break;
     case FM_DOUT: root[F("e32flashtext")] = F(" (DOUT or other)");break;
+    #if defined(CONFIG_IDF_TARGET_ESP32S3) && CONFIG_ESPTOOLPY_FLASHMODE_OPI
+      case FM_FAST_READ: root[F("e32flashtext")] = F(" (🚀OPI)");break;
+    #else
+      case FM_FAST_READ: root[F("e32flashtext")] = F(" (fast_read)");break;
+    #endif
+    case FM_SLOW_READ: root[F("e32flashtext")] = F(" (slow_read)");break;
     default: root[F("e32flashtext")] = F(" (other)"); break;
   }
 
diff --git a/wled00/pin_manager.cpp b/wled00/pin_manager.cpp
index b9d90a7d..86f0c88e 100644
--- a/wled00/pin_manager.cpp
+++ b/wled00/pin_manager.cpp
@@ -114,7 +114,7 @@ String PinManagerClass::getPinSpecialText(int gpio) {  // special purpose PIN in
     #if defined(CONFIG_IDF_TARGET_ESP32S3)
       // ESP32-S3
       if (gpio > 18 && gpio < 21) return (F("USB (CDC) or JTAG"));
-      #if CONFIG_SPIRAM_MODE_OCT && defined(BOARD_HAS_PSRAM)
+      #if CONFIG_ESPTOOLPY_FLASHMODE_OPI || (CONFIG_SPIRAM_MODE_OCT && defined(BOARD_HAS_PSRAM))
         if (gpio > 32 && gpio < 38)  return (F("(reserved) Octal PSRAM or Octal Flash"));
       #endif
       //if (gpio == 0 || gpio == 3 || gpio == 45 || gpio == 46) return (F("(strapping pin)"));
diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index 9a1bca40..08f5171d 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -546,6 +546,12 @@ void WLED::setup()
     case FM_QOUT: DEBUG_PRINT(F(" (QOUT)"));break;
     case FM_DIO:  DEBUG_PRINT(F(" (DIO)")); break;
     case FM_DOUT: DEBUG_PRINT(F(" (DOUT)"));break;
+    #if defined(CONFIG_IDF_TARGET_ESP32S3) && CONFIG_ESPTOOLPY_FLASHMODE_OPI
+      case FM_FAST_READ: DEBUG_PRINT(F(" (OPI)"));break;
+    #else
+      case FM_FAST_READ: DEBUG_PRINT(F(" (fast_read)"));break;
+    #endif
+    case FM_SLOW_READ: DEBUG_PRINT(F(" (slow_read)"));break;
     default: break;
   }
   #endif
@@ -592,10 +598,10 @@ void WLED::setup()
   DEBUG_PRINTF("%s min free stack %d\n", pcTaskGetTaskName(NULL), uxTaskGetStackHighWaterMark(NULL)); //WLEDMM
 #endif
 
-#if defined(ARDUINO_ARCH_ESP32) && defined(BOARD_HAS_PSRAM)
+#if defined(ARDUINO_ARCH_ESP32) && (defined(BOARD_HAS_PSRAM) || defined(CONFIG_ESPTOOLPY_FLASHMODE_OPI))
   //psramInit(); //WLEDMM?? softhack007: not sure if explicit init is really needed ... lets disable it here and see if that works
   #if defined(CONFIG_IDF_TARGET_ESP32S3)
-    #if CONFIG_SPIRAM_MODE_OCT && defined(BOARD_HAS_PSRAM)
+    #if CONFIG_ESPTOOLPY_FLASHMODE_OPI || (CONFIG_SPIRAM_MODE_OCT && defined(BOARD_HAS_PSRAM))
       // S3: reserve GPIO 33-37 for "octal" PSRAM
       managed_pin_type pins[] = { {33, true}, {34, true}, {35, true}, {36, true}, {37, true} };
       pinManager.allocateMultiplePins(pins, sizeof(pins)/sizeof(managed_pin_type), PinOwner::SPI_RAM);

From ac71664af5fd3df750136e908eb7f55931ee385e Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:22:01 +0100
Subject: [PATCH 118/232] Presets UI bugfix

"edit" and "open" button were overlapping too much.
---
 wled00/data/index.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/wled00/data/index.css b/wled00/data/index.css
index d8338d93..c6ffc3e9 100644
--- a/wled00/data/index.css
+++ b/wled00/data/index.css
@@ -1041,7 +1041,7 @@ textarea {
 
 .segname .flr, .pname .flr {
 	transform: rotate(0deg);
-	right: -6px;
+	right: 4px;
 }
 
 /* segment power wrapper */
@@ -1331,6 +1331,11 @@ TD .checkmark, TD .radiomark {
 	box-shadow: 0px 0px 10px 4px var(--c-1);
 }
 
+.lstI .flr:hover {
+    background: var(--c-6);
+    border-radius: 100%;
+}
+
 #pcont .selected:not([class*="expanded"]) {
 	bottom: 52px;
 	top: 42px;

From 8eb23d137d1dfc426bc51527fecbd53ab2a477b0 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 31 Oct 2024 11:51:27 +0100
Subject: [PATCH 119/232] UI "new segment" layout fix

---
 wled00/data/index.css | 2 +-
 wled00/data/index.js  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wled00/data/index.css b/wled00/data/index.css
index c6ffc3e9..617f971b 100644
--- a/wled00/data/index.css
+++ b/wled00/data/index.css
@@ -352,7 +352,7 @@ button {
 
 #putil, #segutil, #segutil2 {
 	min-height: 42px;
-	margin: 13px auto 0;
+	margin: 0 auto;
 }
 
 #segutil .segin {
diff --git a/wled00/data/index.js b/wled00/data/index.js
index 247ab222..86e6465b 100644
--- a/wled00/data/index.js
+++ b/wled00/data/index.js
@@ -2369,7 +2369,7 @@ function makeSeg()
 	});
 	var cn = `<div class="seg lstI expanded">`+
 		`<div class="segin">`+
-			`<input type="text" id="seg${lu}t" autocomplete="off" maxlength=32 value="" placeholder="New segment ${lu}"/>`+
+			`<input class="ptxt show" type="text" id="seg${lu}t" autocomplete="off" maxlength=32 value="" placeholder="New segment ${lu}"/>`+
 			`<table class="segt">`+
 				`<tr>`+
 					`<td width="38%">${isM?'Start X':'Start LED'}</td>`+
@@ -2395,7 +2395,7 @@ function makeSeg()
 
 function resetUtil(off=false)
 {
-	gId('segutil').innerHTML = `<div class="seg btn btn-s${off?' off':''}" style="padding:0;">`
+	gId('segutil').innerHTML = `<div class="seg btn btn-s${off?' off':''}" style="padding:0;margin-bottom:12px;">`
 	+ '<label class="check schkl"><input type="checkbox" id="selall" onchange="selSegAll(this)"><span class="checkmark"></span></label>'
 	+ `<div class="segname" ${off?'':'onclick="makeSeg()"'}><i class="icons btn-icon">&#xe18a;</i>Add segment</div>`
 	+ '<div class="pop hide" onclick="event.stopPropagation();">'

From 6092705cc45c59cf724c70040a883ce2188bb3c5 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 1 Nov 2024 13:30:49 +0100
Subject: [PATCH 120/232] HUB75: reduced panel size limits for HD-WF2

---
 wled00/bus_manager.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 4fb5abaa..68066a36 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -546,11 +546,16 @@ uint8_t BusHub75Matrix::instanceCount = 0;
     #define MAX_PIXELS_6BIT (192 * 64)
     #define MAX_PIXELS_4BIT (256 * 64)
   #endif
-#elif defined(CONFIG_IDF_TARGET_ESP32S3)
-  // standard esp32-S3
+#elif defined(CONFIG_IDF_TARGET_ESP32S3) && defined(BOARD_HAS_PSRAM)
+  // standard esp32-S3 with quad PSRAM
   #define MAX_PIXELS_8BIT ( 96 * 64)
   #define MAX_PIXELS_6BIT (128 * 64)
   #define MAX_PIXELS_4BIT (160 * 64)
+#elif defined(CONFIG_IDF_TARGET_ESP32S3)
+  // HD-WF2 is an esp32-S3 without PSRAM - use same limits as classic esp32
+  #define MAX_PIXELS_8BIT ( 64 * 64)
+  #define MAX_PIXELS_6BIT ( 96 * 64)
+  #define MAX_PIXELS_4BIT (128 * 64)
 #elif defined(CONFIG_IDF_TARGET_ESP32S2)
   // esp32-S2 only has 320KB RAM
   #define MAX_PIXELS_8BIT ( 48 * 48)

From 85035e54e852cb837f19451c6a469c45f0ea8a8a Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 1 Nov 2024 13:32:50 +0100
Subject: [PATCH 121/232] bugfix for random crash when changing effects

---
 wled00/FX_fcn.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index cd7ca18d..54c21b63 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -2284,7 +2284,7 @@ void WS2812FX::setSegment(uint8_t n, uint16_t i1, uint16_t i2, uint8_t grouping,
 void WS2812FX::restartRuntime(bool doReset) {
   for (segment &seg : _segments) {
     if (doReset) {   // WLEDMM we prefer not to perform a complete restart of all effects
-      seg.markForReset(); seg.resetIfRequired(); 
+      seg.markForReset(); // seg.resetIfRequired(); // WLEDMM calling this function from webserver context will cause troubles
     } else {
       seg.next_time = 0; seg.step = 0;
     }

From b39120407f497414af215dde936905296964f5c7 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 1 Nov 2024 14:04:46 +0100
Subject: [PATCH 122/232] pio: save some flash on 4MB firmware builds

---
 platformio.ini | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 33907262..3f2e3f48 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1089,7 +1089,7 @@ build_flags_S =
   -Wno-attributes -Wno-unused-variable -Wno-unused-function -Wno-deprecated-declarations ;disables some stupid warnings
   ;-D WLED_DISABLE_BROWNOUT_DET ; enable if you get "brownout detected" errors at startup 
   -D WLED_USE_MY_CONFIG
-  ; -D WLED_DISABLE_2D ;; un-comment to build a firmware without 2D matrix support
+  ; -D WLED_DISABLE_2D ;; un-commennt to build a firmware without 2D matrix support
   ; -D WLED_USE_CIE_BRIGHTNESS_TABLE ;; experimental: use different color / brightness lookup table
   ${common_mm.AR_build_flags} ; use latest (upstream) FFTLib, instead of older library modified by blazoncek. Slightly faster, more accurate, needs 2KB RAM extra   
   -D USERMOD_AUTO_PLAYLIST
@@ -1627,6 +1627,7 @@ 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.
+  -D WLEDMM_SAVE_FLASH
   -D WLED_DISABLE_LOXONE
   -D WLED_DISABLE_ALEXA
   -D WLED_DISABLE_HUESYNC
@@ -1804,6 +1805,7 @@ 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.
+  -D WLEDMM_SAVE_FLASH
   -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
@@ -1840,6 +1842,7 @@ 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.
+  -D WLEDMM_SAVE_FLASH
   -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.
@@ -1871,6 +1874,7 @@ 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
+  -D WLEDMM_SAVE_FLASH
   -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
@@ -1912,6 +1916,7 @@ build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-inden
   -D WLED_WATCHDOG_TIMEOUT=0 -D CONFIG_ASYNC_TCP_USE_WDT=0
   ${common_mm.build_disable_sync_interfaces}
   -D WLEDMM_FASTPATH ; WLEDMM experimental option. Reduces audio lag (latency), and allows for faster LED framerates. May break compatibility with previous versions.
+  -D WLEDMM_SAVE_FLASH
   ; -D WLED_DEBUG
   ; -D SR_DEBUG
 lib_deps = ${esp32s3.lib_deps} ${common_mm.lib_deps_S}
@@ -2079,6 +2084,7 @@ build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-inden
   -D WLED_DISABLE_ADALIGHT    ;; disables serial protocols - recommended for Hardware-CDC USB (Serial RX will receive junk commands when RX pin is unconnected, unless its pulled down by resistor)
   ${Speed_Flags.build_flags_V4}  ;; optimize for speed instead of size
   -D WLEDMM_FASTPATH          ;; WLEDMM experimental option. Reduces audio lag (latency), and allows for faster LED framerates. May break compatibility with previous versions.
+  -D WLEDMM_SAVE_FLASH
   ${common_mm.animartrix_build_flags}
   -D WLED_WATCHDOG_TIMEOUT=0 -D CONFIG_ASYNC_TCP_USE_WDT=0
   -D WLED_DISABLE_LOXONE ; FLASH 1272 bytes

From 5fa7d06fe064bd13cbcc879fce70cefe4c7ebaff Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 1 Nov 2024 14:08:25 +0100
Subject: [PATCH 123/232] typo in comment

---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 3f2e3f48..b0fbc533 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1089,7 +1089,7 @@ build_flags_S =
   -Wno-attributes -Wno-unused-variable -Wno-unused-function -Wno-deprecated-declarations ;disables some stupid warnings
   ;-D WLED_DISABLE_BROWNOUT_DET ; enable if you get "brownout detected" errors at startup 
   -D WLED_USE_MY_CONFIG
-  ; -D WLED_DISABLE_2D ;; un-commennt to build a firmware without 2D matrix support
+  ; -D WLED_DISABLE_2D ;; un-comment to build a firmware without 2D matrix support
   ; -D WLED_USE_CIE_BRIGHTNESS_TABLE ;; experimental: use different color / brightness lookup table
   ${common_mm.AR_build_flags} ; use latest (upstream) FFTLib, instead of older library modified by blazoncek. Slightly faster, more accurate, needs 2KB RAM extra   
   -D USERMOD_AUTO_PLAYLIST

From 7c0ecdf7c44a115eeca7cd6624af7139368f0b06 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 1 Nov 2024 14:51:12 +0100
Subject: [PATCH 124/232] make "target FPS" work

---
 wled00/FX.h       |  8 +++++---
 wled00/FX_fcn.cpp | 37 ++++++++++++++++++++++++++-----------
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/wled00/FX.h b/wled00/FX.h
index cec8e5d2..c8a9d539 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -43,13 +43,14 @@ bool strip_uses_global_leds(void) __attribute__((pure));  // WLEDMM implemented
 #endif
 
 /* Not used in all effects yet */
+#define FPS_UNLIMITED    249
 #if defined(ARDUINO_ARCH_ESP32) && defined(WLEDMM_FASTPATH)   // WLEDMM go faster on ESP32
 #define WLED_FPS         120
 #define FRAMETIME_FIXED  (strip.getFrameTime() < 10 ? 12 : 24)
 #define WLED_FPS_SLOW         60
 #define FRAMETIME_FIXED_SLOW  (15)    // = 66 FPS => 1000/66
-//#define FRAMETIME        _frametime
 #define FRAMETIME        strip.getFrameTime()
+#define MIN_SHOW_DELAY   (max(2, (_frametime*5)/8))    // WLEDMM support higher framerates (up to 250fps) -- 5/8 = 62%
 #else
 #define WLED_FPS         42
 #define FRAMETIME_FIXED  (1000/WLED_FPS)
@@ -57,6 +58,7 @@ bool strip_uses_global_leds(void) __attribute__((pure));  // WLEDMM implemented
 #define FRAMETIME_FIXED_SLOW  (1000/WLED_FPS_SLOW)
 //#define FRAMETIME        _frametime
 #define FRAMETIME        strip.getFrameTime()
+#define MIN_SHOW_DELAY   (_frametime < 16 ? 8 : 15)
 #endif
 
 /* each segment uses 52 bytes of SRAM memory, so if you're application fails because of
@@ -82,8 +84,6 @@ bool strip_uses_global_leds(void) __attribute__((pure));  // WLEDMM implemented
   assuming each segment uses the same amount of data. 256 for ESP8266, 640 for ESP32. */
 #define FAIR_DATA_PER_SEG (MAX_SEGMENT_DATA / strip.getMaxSegments())
 
-#define MIN_SHOW_DELAY   (_frametime < 16 ? (_frametime <8? (_frametime <7? (_frametime <6 ? 2 :3) :4) : 8) : 15)    // WLEDMM support higher framerates (up to 250fps)
-
 #define NUM_COLORS       3 /* number of colors per segment */
 #define SEGMENT          strip._segments[strip.getCurrSegmentId()]
 #define SEGENV           strip._segments[strip.getCurrSegmentId()]
@@ -852,6 +852,7 @@ class WS2812FX {  // 96 bytes
       customMappingTableSize(0), //WLEDMM
       customMappingSize(0),
       _lastShow(0),
+      _lastServiceShow(0),
       _segment_index(0),
       _mainSegment(0)
     {
@@ -1097,6 +1098,7 @@ class WS2812FX {  // 96 bytes
     uint16_t  customMappingSize;
 
     /*uint32_t*/ unsigned long _lastShow; // WLEDMM avoid losing precision
+    unsigned long _lastServiceShow;       // WLEDMM last call of strip.show (timestamp)
 
     uint8_t _segment_index;
     uint8_t _mainSegment;
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 54c21b63..6760c2c2 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -1873,13 +1873,19 @@ void WS2812FX::service() {
   if (OTAisRunning) return; // WLEDMM avoid flickering during OTA
 
   now = nowUp + timebase;
-  #if defined(ARDUINO_ARCH_ESP32) && defined(WLEDMM_FASTPATH)
-    if ((_frametime > 2) && (_frametime < 32) && (nowUp - _lastShow) < (_frametime/2)) return;  // WLEDMM experimental - stabilizes frametimes but increases CPU load
-    else if (nowUp - _lastShow < MIN_SHOW_DELAY) return;                                        // WLEDMM fallback
-  #else
-    if (nowUp - _lastShow < MIN_SHOW_DELAY) return;
+  unsigned long elapsed = nowUp - _lastServiceShow;
+  #if defined(ARDUINO_ARCH_ESP32) && defined(WLEDMM_FASTPATH)   // WLEDMM go faster on ESP32
+  //if (_suspend) return;
+  if (elapsed < 2) return;                                                       // keep wifi alive
+  if ( !_triggered && (_targetFps < FPS_UNLIMITED) && (_targetFps > 0)) {
+    if (elapsed < MIN_SHOW_DELAY) return;                                        // WLEDMM too early for service
+  }
+  #else  // legacy
+  if (elapsed < MIN_SHOW_DELAY) return;
   #endif
+
   bool doShow = false;
+  unsigned speedLimit = (_targetFps < FPS_UNLIMITED) ? (0.85f * FRAMETIME) : 1;      // WLEDMM lower limit for effect frametime
 
   _isServicing = true;
   _segment_index = 0;
@@ -1914,6 +1920,8 @@ void WS2812FX::service() {
         // actual code may be a bit more involved as effects have runtime data including allocated memory
         //if (seg.transitional && seg._modeP) (*_mode[seg._modeP])(progress());
         frameDelay = (*_mode[seg.currentMode(seg.mode)])();
+
+        if (frameDelay < speedLimit) frameDelay = FRAMETIME;                    // WLEDMM limit effects that want to go faster than target FPS
         if (seg.mode != FX_MODE_HALLOWEEN_EYES) seg.call++;
         if (seg.transitional && frameDelay > FRAMETIME) frameDelay = FRAMETIME; // force faster updates during transition
 
@@ -1929,6 +1937,7 @@ void WS2812FX::service() {
   if(doShow) {
     yield();
     show();
+    _lastServiceShow = nowUp; // WLEDMM use correct timestamp
   }
   _triggered = false;
   _isServicing = false;
@@ -2053,25 +2062,30 @@ void WS2812FX::show(void) {
   estimateCurrentAndLimitBri();
 
   #if defined(ARDUINO_ARCH_ESP32) && defined(WLEDMM_FASTPATH)
-  unsigned long b4show = millis(); // WLEDMM the time before calling "show"
+  unsigned long now = millis();
+  #ifdef ARDUINO_ARCH_ESP32                      // WLEDMM more accurate FPS measurement for ESP32
+  uint64_t now500 = esp_timer_get_time() / 2;  // native timer; micros /2 -> millis * 500
   #endif
+  #endif
+
   // some buses send asynchronously and this method will return before
   // all of the data has been sent.
   // See https://github.com/Makuna/NeoPixelBus/wiki/ESP32-NeoMethods#neoesp32rmt-methods
   busses.show();
   unsigned long now = millis();
+  #ifdef ARDUINO_ARCH_ESP32                      // WLEDMM more accurate FPS measurement for ESP32
+  uint64_t now500 = esp_timer_get_time() / 2;  // native timer; micros /2 -> millis * 500
+  #endif
+  #endif
+
   unsigned long diff = now - _lastShow;
   uint16_t fpsCurr = 200;
   if (diff > 0) fpsCurr = 1000 / diff;
   _cumulativeFps = (3 * _cumulativeFps + fpsCurr +2) >> 2;   // "+2" for proper rounding (2/4 = 0.5)
-  #if defined(ARDUINO_ARCH_ESP32) && defined(WLEDMM_FASTPATH)
-  _lastShow = b4show;  // WLEDMM this is more accurate, however it also increases CPU load - strip.service will run more frequently
-  #else
   _lastShow = now;
-  #endif
+  _lastServiceShow = now;
 
 #ifdef ARDUINO_ARCH_ESP32                      // WLEDMM more accurate FPS measurement for ESP32
-  uint64_t now500 = esp_timer_get_time() / 2;  // native timer; micros /2 -> millis * 500
   int64_t diff500 = now500 - _lastShow500;
   if ((diff500 > 300) && (diff500 < 800000)) { // exclude stupid values (timer rollover, major hickups)
     float fpcCurr500 = 500000.0f / float(diff500);
@@ -2107,6 +2121,7 @@ void WS2812FX::setTargetFps(uint8_t fps) {
   if (fps > 0 && fps <= 251) _targetFps = fps;  // WLEDMM allow higher framerates
   _frametime = 1000 / _targetFps;
   if (_frametime < 1) _frametime = 1;           // WLEDMM better safe than sorry
+  if (fps >= FPS_UNLIMITED) _frametime = 3;     // WLEDMM unlimited mode
 }
 
 void WS2812FX::setMode(uint8_t segid, uint8_t m) {

From 1c782aa3690b61bca553e2cbf4969b6e8f37f7a7 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 1 Nov 2024 14:58:12 +0100
Subject: [PATCH 125/232] improvement for non-fastpath

---
 wled00/FX.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wled00/FX.h b/wled00/FX.h
index c8a9d539..af79c514 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -58,7 +58,8 @@ bool strip_uses_global_leds(void) __attribute__((pure));  // WLEDMM implemented
 #define FRAMETIME_FIXED_SLOW  (1000/WLED_FPS_SLOW)
 //#define FRAMETIME        _frametime
 #define FRAMETIME        strip.getFrameTime()
-#define MIN_SHOW_DELAY   (_frametime < 16 ? 8 : 15)
+//#define MIN_SHOW_DELAY   (_frametime < 16 ? 8 : 15)  // Upstream legacy
+#define MIN_SHOW_DELAY   (_frametime < 16 ? (_frametime <8? (_frametime <7? (_frametime <6 ? 2 :3) :4) : 8) : 15)    // WLEDMM support higher framerates (up to 250fps)
 #endif
 
 /* each segment uses 52 bytes of SRAM memory, so if you're application fails because of

From bf5fb9ccaa735ca8bce2e1224974ae0b224cb38e Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 1 Nov 2024 15:12:07 +0100
Subject: [PATCH 126/232] fix compile errors

---
 wled00/FX_fcn.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 6760c2c2..c23bb183 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -2062,7 +2062,7 @@ void WS2812FX::show(void) {
   estimateCurrentAndLimitBri();
 
   #if defined(ARDUINO_ARCH_ESP32) && defined(WLEDMM_FASTPATH)
-  unsigned long now = millis();
+  unsigned long nowUp = millis();
   #ifdef ARDUINO_ARCH_ESP32                      // WLEDMM more accurate FPS measurement for ESP32
   uint64_t now500 = esp_timer_get_time() / 2;  // native timer; micros /2 -> millis * 500
   #endif
@@ -2072,18 +2072,20 @@ void WS2812FX::show(void) {
   // all of the data has been sent.
   // See https://github.com/Makuna/NeoPixelBus/wiki/ESP32-NeoMethods#neoesp32rmt-methods
   busses.show();
-  unsigned long now = millis();
+
+  #if !defined(ARDUINO_ARCH_ESP32) || !defined(WLEDMM_FASTPATH)  // upstream legacy
+  unsigned long nowUp = millis();
   #ifdef ARDUINO_ARCH_ESP32                      // WLEDMM more accurate FPS measurement for ESP32
   uint64_t now500 = esp_timer_get_time() / 2;  // native timer; micros /2 -> millis * 500
   #endif
   #endif
 
-  unsigned long diff = now - _lastShow;
+  unsigned long diff = nowUp - _lastShow;
   uint16_t fpsCurr = 200;
   if (diff > 0) fpsCurr = 1000 / diff;
   _cumulativeFps = (3 * _cumulativeFps + fpsCurr +2) >> 2;   // "+2" for proper rounding (2/4 = 0.5)
-  _lastShow = now;
-  _lastServiceShow = now;
+  _lastShow = nowUp;
+  _lastServiceShow = nowUp;
 
 #ifdef ARDUINO_ARCH_ESP32                      // WLEDMM more accurate FPS measurement for ESP32
   int64_t diff500 = now500 - _lastShow500;

From 6bae3567890be082e692b51537a913bc03c8f72a Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 1 Nov 2024 17:17:54 +0100
Subject: [PATCH 127/232] renaming

upstream has renamed "now" to "showNow" - so we follow
---
 wled00/FX_fcn.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index c23bb183..44642689 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -2062,7 +2062,7 @@ void WS2812FX::show(void) {
   estimateCurrentAndLimitBri();
 
   #if defined(ARDUINO_ARCH_ESP32) && defined(WLEDMM_FASTPATH)
-  unsigned long nowUp = millis();
+  unsigned long showNow = millis();
   #ifdef ARDUINO_ARCH_ESP32                      // WLEDMM more accurate FPS measurement for ESP32
   uint64_t now500 = esp_timer_get_time() / 2;  // native timer; micros /2 -> millis * 500
   #endif
@@ -2074,18 +2074,18 @@ void WS2812FX::show(void) {
   busses.show();
 
   #if !defined(ARDUINO_ARCH_ESP32) || !defined(WLEDMM_FASTPATH)  // upstream legacy
-  unsigned long nowUp = millis();
+  unsigned long showNow = millis();
   #ifdef ARDUINO_ARCH_ESP32                      // WLEDMM more accurate FPS measurement for ESP32
   uint64_t now500 = esp_timer_get_time() / 2;  // native timer; micros /2 -> millis * 500
   #endif
   #endif
 
-  unsigned long diff = nowUp - _lastShow;
+  unsigned long diff = showNow - _lastShow;
   uint16_t fpsCurr = 200;
   if (diff > 0) fpsCurr = 1000 / diff;
   _cumulativeFps = (3 * _cumulativeFps + fpsCurr +2) >> 2;   // "+2" for proper rounding (2/4 = 0.5)
-  _lastShow = nowUp;
-  _lastServiceShow = nowUp;
+  _lastShow = showNow;
+  _lastServiceShow = showNow;
 
 #ifdef ARDUINO_ARCH_ESP32                      // WLEDMM more accurate FPS measurement for ESP32
   int64_t diff500 = now500 - _lastShow500;

From 1a44a80830ce48cc6b1b5ae9582d09993d1e2ea1 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 1 Nov 2024 20:08:05 +0100
Subject: [PATCH 128/232] MM buildenv for S3 WROOM-2 (32MB flash, 8MB PSRAM)

this board requires memory_type = opi_opi
---
 platformio.ini | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/platformio.ini b/platformio.ini
index b0fbc533..6762dc2e 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -78,6 +78,7 @@ default_envs =
   esp32S3_4MB_PSRAM_S      ;; for lolin s3 mini, S3 zero, S3 super mini - optimized for speed
   esp32S3_4MB_PSRAM_M      ;; for lolin s3 mini, S3 zero, S3 super mini
   esp32S3_8MB_PSRAM_M   ;; experiemental
+  esp32S3_WROOM-2_M        ;; for S3 WROOM-2
   ;; esp32s2_tinyUF2_PSRAM_S  ;; experimental - only for adafruit -S2 boards with tinyUF2 bootloader !!!
   esp32s2_PSRAM_M          ;; experimental
   esp32c3dev_4MB_M         ;; experimental
@@ -2066,6 +2067,42 @@ board_build.partitions = tools/WLED_ESP32_8MB.csv
 ; RAM:   [===       ]  25.8% (used 84544 bytes from 327680 bytes)
 ; Flash: [========  ]  78.1% (used 1638737 bytes from 2097152 bytes)
 
+;; MM for ESP32-S3 WROOM-2, a.k.a. ESP32-S3 DevKitC-1 v1.1
+;; with >= 16MB FLASH and >= 8MB PSRAM (memory_type: opi_opi)
+;; includes HUB75 and AnimArtix
+[env:esp32S3_WROOM-2_M]
+extends = env:esp32S3_8MB_PSRAM_M
+board_build.flash_mode = dout ;; dummy value - bootloader will switch to "opi"
+board_build.arduino.memory_type = opi_opi
+board = esp32s3camlcd ;; this is the only standard board with "opi_opi"
+board_upload.flash_size = 16MB
+board_upload.maximum_size =16777216
+board_build.partitions = ${esp32.extreme_partitions}
+build_unflags = ${env:esp32S3_8MB_PSRAM_M.build_unflags}
+  -D WLED_RELEASE_NAME=esp32S3_8MB_M
+  -D LEDPIN=21
+  ${Speed_Flags.build_unflags}  ;; to override -Os
+build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-indentation -Wno-format-truncation
+  ${common_mm.build_flags_S} ${common_mm.build_flags_M}
+  ${Speed_Flags.build_flags_V4}  ;; optimize for speed
+  ${common_mm.HUB75_build_flags}
+  ${common_mm.animartrix_build_flags}
+  -D WLED_RELEASE_NAME=esp32S3_WROOM-2_M
+  -D WLEDMM_FASTPATH
+  -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
+  -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
+  -D WLED_WATCHDOG_TIMEOUT=0 -D CONFIG_ASYNC_TCP_USE_WDT=0
+  ;; -D LEDPIN=38 ;; buildin LED
+  ;; -D BTNPIN=0 -D RLYPIN=-1 -D IRPIN=-1 -D AUDIOPIN=-1
+  -D LEDPIN=12 ;; to avoid pin conflict with HUB75
+  -D BTNPIN=0 -D RLYPIN=16 -D IRPIN=17 -D AUDIOPIN=-1
+  -D SR_DMTYPE=1 -D I2S_SDPIN=13 -D I2S_CKPIN=14 -D I2S_WSPIN=15 -D MCLK_PIN=4  ;; I2S mic
+lib_deps = ${esp32s3.lib_deps} ${common_mm.lib_deps_S}  ${common_mm.lib_deps_V4_M}
+    ${common_mm.HUB75_lib_deps}
+    ${common_mm.animartrix_lib_deps}
+
 ;; MM for esp32-s3 zero/supermini and lolin S3 mini boards - fastpath, optimize for speed
 [env:esp32S3_4MB_PSRAM_S]
 extends = env:esp32S3_8MB_S

From ffa5445aec9a14b39fd13f8c00d6fc9489ac92bb Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 1 Nov 2024 20:13:11 +0100
Subject: [PATCH 129/232] minor pio update

avoid pin conflicts with HUB75
---
 platformio.ini | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 6762dc2e..856caac5 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -2095,9 +2095,8 @@ build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-inden
   ;;-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
   -D WLED_WATCHDOG_TIMEOUT=0 -D CONFIG_ASYNC_TCP_USE_WDT=0
   ;; -D LEDPIN=38 ;; buildin LED
-  ;; -D BTNPIN=0 -D RLYPIN=-1 -D IRPIN=-1 -D AUDIOPIN=-1
-  -D LEDPIN=12 ;; to avoid pin conflict with HUB75
-  -D BTNPIN=0 -D RLYPIN=16 -D IRPIN=17 -D AUDIOPIN=-1
+  ;; -D BTNPIN=0 -D RLYPIN=16 -D IRPIN=17 -D AUDIOPIN=-1
+  -D LEDPIN=12 -D BTNPIN=0 -D RLYPIN=-1 -D IRPIN=-1 -D AUDIOPIN=-1 ;; to avoid pin conflict with HUB75
   -D SR_DMTYPE=1 -D I2S_SDPIN=13 -D I2S_CKPIN=14 -D I2S_WSPIN=15 -D MCLK_PIN=4  ;; I2S mic
 lib_deps = ${esp32s3.lib_deps} ${common_mm.lib_deps_S}  ${common_mm.lib_deps_V4_M}
     ${common_mm.HUB75_lib_deps}

From 39bf245d1ed0479d70260f03ab37faa2ff9c8815 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 3 Nov 2024 21:54:41 +0100
Subject: [PATCH 130/232] HUB75 driver optimization

gains up to 3 fps in some effects.
---
 wled00/bus_manager.cpp | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 68066a36..fc07909f 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -11,14 +11,14 @@
 
 // WLEDMM functions to get/set bits in an array - based on functions created by Brandon for GOL
 //  toDo : make this a class that's completely defined in a header file
-bool getBitFromArray(const uint8_t* byteArray, size_t position) { // get bit value
+inline bool getBitFromArray(const uint8_t* byteArray, size_t position) { // get bit value
     size_t byteIndex = position / 8;
     unsigned bitIndex = position % 8;
     uint8_t byteValue = byteArray[byteIndex];
     return (byteValue >> bitIndex) & 1;
 }
 
-void setBitInArray(uint8_t* byteArray, size_t position, bool value) {  // set bit - with error handling for nullptr
+inline void setBitInArray(uint8_t* byteArray, size_t position, bool value) {  // set bit - with error handling for nullptr
     //if (byteArray == nullptr) return;
     size_t byteIndex = position / 8;
     unsigned bitIndex = position % 8;
@@ -1018,19 +1018,13 @@ void __attribute__((hot)) BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c
 }
 
 uint32_t BusHub75Matrix::getPixelColor(uint16_t pix) const {
-  if (!_valid || pix >= _len) return BLACK;
-  if (_ledBuffer)
-    return uint32_t(_ledBuffer[pix].scale8(_bri)) & 0x00FFFFFF;  // scale8() is needed to mimic NeoPixelBus, which returns scaled-down colours
-  else
-    return BLACK;   // we don't know anything about the pixel
+  if (!_valid || pix >= _len || !_ledBuffer) return BLACK;
+  return uint32_t(_ledBuffer[pix].scale8(_bri)) & 0x00FFFFFF;  // scale8() is needed to mimic NeoPixelBus, which returns scaled-down colours
 }
 
 uint32_t __attribute__((hot)) BusHub75Matrix::getPixelColorRestored(uint16_t pix) const {
-  if (!_valid || pix >= _len) return BLACK;
-  if (_ledBuffer)
-    return uint32_t(_ledBuffer[pix]) & 0x00FFFFFF;
-  else
-    return BLACK;   // we don't know anything about the pixel
+  if (!_valid || pix >= _len || !_ledBuffer) return BLACK;
+  return uint32_t(_ledBuffer[pix]) & 0x00FFFFFF;
 }
 
 void BusHub75Matrix::setBrightness(uint8_t b, bool immediate) {
@@ -1056,19 +1050,23 @@ void __attribute__((hot)) BusHub75Matrix::show(void) {
     unsigned height = isFourScan ? fourScanPanel->height() : display->height();
     unsigned width = _panelWidth;
 
+    // Cache pointers to LED array and bitmask array, to avoid repeated accesses
+    const byte* ledsDirty = _ledsDirty;
+    const CRGB* ledBuffer = _ledBuffer;
+
     //while(!previousBufferFree) delay(1);   // experimental - Wait before we allow any writing to the buffer. Stop flicker.
 
     size_t pix = 0; // running pixel index
     for (int y=0; y<height; y++) for (int x=0; x<width; x++) {
-      if (getBitFromArray(_ledsDirty, pix) == true) {        // only repaint the "dirty"  pixels
+      if (getBitFromArray(ledsDirty, pix) == true) {        // only repaint the "dirty"  pixels
         #ifndef NO_CIE1931
-        uint32_t c = uint32_t(_ledBuffer[pix]) & 0x00FFFFFF; // get RGB color, removing FastLED "alpha" component 
+        uint32_t c = uint32_t(ledBuffer[pix]) & 0x00FFFFFF; // get RGB color, removing FastLED "alpha" component 
         c = unGamma24(c); // to use the driver linear brightness feature, we first need to undo WLED gamma correction
         uint8_t r = R(c);
         uint8_t g = G(c);
         uint8_t b = B(c);
         #else
-        const CRGB c = _ledBuffer[pix];  // we stay on CRGB, instead of packing/unpacking the color value to uint32_t
+        const CRGB c = ledBuffer[pix];  // we stay on CRGB, instead of packing/unpacking the color value to uint32_t
         uint8_t r = c.r;
         uint8_t g = c.g;
         uint8_t b = c.b;

From dc4964a491bbdec3985bbb044965d4b7985e77b9 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 4 Nov 2024 13:47:05 +0100
Subject: [PATCH 131/232] small update

based on feedback from the PR to upstream
* support "0 FPS" meaning "unlimited"
* keep FRAMETIME_FIXED fixed
---
 wled00/FX.h                   | 15 ++++++++-------
 wled00/FX_fcn.cpp             | 14 +++++++-------
 wled00/data/settings_leds.htm |  6 ++++--
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/wled00/FX.h b/wled00/FX.h
index af79c514..f20b1caf 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -43,20 +43,21 @@ bool strip_uses_global_leds(void) __attribute__((pure));  // WLEDMM implemented
 #endif
 
 /* Not used in all effects yet */
-#define FPS_UNLIMITED    249
+#define FPS_UNLIMITED    250
+#define FPS_UNLIMITED_AC 0   // WLEDMM upstream uses "0 fps" for unlimited. We support both ways
 #if defined(ARDUINO_ARCH_ESP32) && defined(WLEDMM_FASTPATH)   // WLEDMM go faster on ESP32
-#define WLED_FPS         120
-#define FRAMETIME_FIXED  (strip.getFrameTime() < 10 ? 12 : 24)
-#define WLED_FPS_SLOW         60
-#define FRAMETIME_FIXED_SLOW  (15)    // = 66 FPS => 1000/66
 #define FRAMETIME        strip.getFrameTime()
 #define MIN_SHOW_DELAY   (max(2, (_frametime*5)/8))    // WLEDMM support higher framerates (up to 250fps) -- 5/8 = 62%
+#define WLED_FPS         120
+#define WLED_FPS_SLOW    60
+#define FRAMETIME_FIXED  24                                // used in Blurz, Freqmap, Scrolling text 
+//#define FRAMETIME_FIXED  (strip.getFrameTime() < 10 ? 12 : 24)
+#define FRAMETIME_FIXED_SLOW  (15)    // = 66 FPS => 1000/66 // used in Solid, Colortwinkles, Candle
 #else
 #define WLED_FPS         42
 #define FRAMETIME_FIXED  (1000/WLED_FPS)
-#define WLED_FPS_SLOW         42
+#define WLED_FPS_SLOW    42
 #define FRAMETIME_FIXED_SLOW  (1000/WLED_FPS_SLOW)
-//#define FRAMETIME        _frametime
 #define FRAMETIME        strip.getFrameTime()
 //#define MIN_SHOW_DELAY   (_frametime < 16 ? 8 : 15)  // Upstream legacy
 #define MIN_SHOW_DELAY   (_frametime < 16 ? (_frametime <8? (_frametime <7? (_frametime <6 ? 2 :3) :4) : 8) : 15)    // WLEDMM support higher framerates (up to 250fps)
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 44642689..5ad6583c 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -1877,15 +1877,15 @@ void WS2812FX::service() {
   #if defined(ARDUINO_ARCH_ESP32) && defined(WLEDMM_FASTPATH)   // WLEDMM go faster on ESP32
   //if (_suspend) return;
   if (elapsed < 2) return;                                                       // keep wifi alive
-  if ( !_triggered && (_targetFps < FPS_UNLIMITED) && (_targetFps > 0)) {
+  if ( !_triggered && (_targetFps != FPS_UNLIMITED) && (_targetFps != FPS_UNLIMITED_AC)) {
     if (elapsed < MIN_SHOW_DELAY) return;                                        // WLEDMM too early for service
   }
   #else  // legacy
-  if (elapsed < MIN_SHOW_DELAY) return;
+  if (nowUp - _lastShow < MIN_SHOW_DELAY) return;
   #endif
 
   bool doShow = false;
-  unsigned speedLimit = (_targetFps < FPS_UNLIMITED) ? (0.85f * FRAMETIME) : 1;      // WLEDMM lower limit for effect frametime
+  unsigned speedLimit = (_targetFps != FPS_UNLIMITED) && (_targetFps != FPS_UNLIMITED_AC) ? (0.85f * FRAMETIME) : 1;      // WLEDMM minimum for effect frametime
 
   _isServicing = true;
   _segment_index = 0;
@@ -2120,10 +2120,10 @@ uint16_t WS2812FX::getFps() const {
 }
 
 void WS2812FX::setTargetFps(uint8_t fps) {
-  if (fps > 0 && fps <= 251) _targetFps = fps;  // WLEDMM allow higher framerates
-  _frametime = 1000 / _targetFps;
-  if (_frametime < 1) _frametime = 1;           // WLEDMM better safe than sorry
-  if (fps >= FPS_UNLIMITED) _frametime = 3;     // WLEDMM unlimited mode
+  if (fps <= 251) _targetFps = fps;  // WLEDMM allow higher framerates
+  if (fps > 0) _frametime = 1000 / _targetFps;
+  else _frametime = 2;                          // AC WLED compatibility
+  if (fps >= FPS_UNLIMITED) _frametime = 2;     // WLEDMM unlimited mode
 }
 
 void WS2812FX::setMode(uint8_t segid, uint8_t m) {
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 35d32321..7deff3a4 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -166,7 +166,8 @@
 
 			gId('ampwarning').style.display = (d.Sf.MA.value > 7200) ? 'inline':'none';
 
-			gId('fpswarning').style.display = (d.Sf.FR.value > 69) ? 'block':'none'; // WLEDMM
+			gId('fpsNone').style.display = ((d.Sf.FR.value == 0) || (d.Sf.FR.value > 249))? 'block':'none'; // WLEDMM
+			gId('fpswarning').style.display = (d.Sf.FR.value > 69) || (d.Sf.FR.value == 0) ? 'block':'none'; // WLEDMM
 			gId('fpshelp1').style.display = ((d.Sf.FR.value > 80) && (d.Sf.FR.value < 132)) ? 'block':'none'; // WLEDMM
 			gId('fpshelp2').style.display = ((d.Sf.FR.value > 132) && (d.Sf.FR.value < 196)) ? 'block':'none'; // WLEDMM
 			gId('fpshelp3').style.display = (d.Sf.FR.value > 196) ? 'block':'none'; // WLEDMM
@@ -732,7 +733,8 @@ Length: <input type="number" name="XC${i}" id="xc${i}" class="l" min="1" max="65
 			<option value="2">Linear (never wrap)</option>
 			<option value="3">None (not recommended)</option>
 		</select><br>
-		Target refresh rate: <input type="number" class="s" min="1" max="250" name="FR" oninput="UI()" required> FPS
+		Target refresh rate: <input type="number" class="s" min="0" max="250" name="FR" oninput="UI()" required> FPS
+		<div id="fpsNone" style="color:green; display: none;"><b>unlimited FPS mode.</b><br></div>
 		<div id="fpswarning" style="color:GoldenRod; display: none;">
 			&#9888; WLED may become unstable above 70 fps.<br>
 			To protect your setup,

From 68c4b830a66f735ba5064fa9eeacf1437edb1754 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 4 Nov 2024 14:17:59 +0100
Subject: [PATCH 132/232] legacy code cleanup

---
 wled00/FX_fcn.cpp | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 5ad6583c..913ec677 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -2061,25 +2061,16 @@ void WS2812FX::show(void) {
 
   estimateCurrentAndLimitBri();
 
-  #if defined(ARDUINO_ARCH_ESP32) && defined(WLEDMM_FASTPATH)
-  unsigned long showNow = millis();
-  #ifdef ARDUINO_ARCH_ESP32                      // WLEDMM more accurate FPS measurement for ESP32
+  unsigned long showNow = millis();            // include time needed for busses.show()
+  #ifdef ARDUINO_ARCH_ESP32                    // WLEDMM more accurate FPS measurement for ESP32
   uint64_t now500 = esp_timer_get_time() / 2;  // native timer; micros /2 -> millis * 500
   #endif
-  #endif
 
   // some buses send asynchronously and this method will return before
   // all of the data has been sent.
   // See https://github.com/Makuna/NeoPixelBus/wiki/ESP32-NeoMethods#neoesp32rmt-methods
   busses.show();
 
-  #if !defined(ARDUINO_ARCH_ESP32) || !defined(WLEDMM_FASTPATH)  // upstream legacy
-  unsigned long showNow = millis();
-  #ifdef ARDUINO_ARCH_ESP32                      // WLEDMM more accurate FPS measurement for ESP32
-  uint64_t now500 = esp_timer_get_time() / 2;  // native timer; micros /2 -> millis * 500
-  #endif
-  #endif
-
   unsigned long diff = showNow - _lastShow;
   uint16_t fpsCurr = 200;
   if (diff > 0) fpsCurr = 1000 / diff;

From 0d6e2c9485b2a9ff69541f060aaa8667102fda08 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 4 Nov 2024 16:01:48 +0100
Subject: [PATCH 133/232] UI improvement (target FPS settings)

---
 wled00/data/settings_leds.htm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 7deff3a4..cf225444 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -167,6 +167,7 @@
 			gId('ampwarning').style.display = (d.Sf.MA.value > 7200) ? 'inline':'none';
 
 			gId('fpsNone').style.display = ((d.Sf.FR.value == 0) || (d.Sf.FR.value > 249))? 'block':'none'; // WLEDMM
+			gId('fpsNoHelp').style.display = ((d.Sf.FR.value == 0) || (d.Sf.FR.value > 249))? 'none':'block'; // WLEDMM
 			gId('fpswarning').style.display = (d.Sf.FR.value > 69) || (d.Sf.FR.value == 0) ? 'block':'none'; // WLEDMM
 			gId('fpshelp1').style.display = ((d.Sf.FR.value > 80) && (d.Sf.FR.value < 132)) ? 'block':'none'; // WLEDMM
 			gId('fpshelp2').style.display = ((d.Sf.FR.value > 132) && (d.Sf.FR.value < 196)) ? 'block':'none'; // WLEDMM
@@ -732,9 +733,10 @@ Length: <input type="number" name="XC${i}" id="xc${i}" class="l" min="1" max="65
 			<option value="1">Linear (always wrap)</option>
 			<option value="2">Linear (never wrap)</option>
 			<option value="3">None (not recommended)</option>
-		</select><br>
+		</select><br><br>
 		Target refresh rate: <input type="number" class="s" min="0" max="250" name="FR" oninput="UI()" required> FPS
-		<div id="fpsNone" style="color:green; display: none;"><b>unlimited FPS mode.</b><br></div>
+		<div id="fpsNoHelp" style="display: block;"><i>use 0 for unlimited</i><br></div>
+		<div id="fpsNone" style="color:green; display: none;"><b>Unlimited refresh rate mode.</b><br></div>
 		<div id="fpswarning" style="color:GoldenRod; display: none;">
 			&#9888; WLED may become unstable above 70 fps.<br>
 			To protect your setup,

From d0f90d0dd29e86af8ff89e2ba110845914492b92 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 4 Nov 2024 16:28:13 +0100
Subject: [PATCH 134/232] effect FPS tinkering

---
 wled00/FX.cpp | 4 ++--
 wled00/FX.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 4927e92a..0bface88 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -2387,7 +2387,7 @@ uint16_t mode_colortwinkle() {
       }
     }
   }
-  return FRAMETIME_FIXED_SLOW;
+  return FRAMETIME_FIXED;
 }
 static const char _data_FX_MODE_COLORTWINKLE[] PROGMEM = "Colortwinkles@Fade speed,Spawn speed;;!;;m12=0"; //pixels
 
@@ -3396,7 +3396,7 @@ uint16_t candle(bool multi)
     }
   }
 
-  return FRAMETIME_FIXED_SLOW;
+  return FRAMETIME_FIXED;
 }
 
 
diff --git a/wled00/FX.h b/wled00/FX.h
index f20b1caf..fbdfe7c0 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -50,9 +50,9 @@ bool strip_uses_global_leds(void) __attribute__((pure));  // WLEDMM implemented
 #define MIN_SHOW_DELAY   (max(2, (_frametime*5)/8))    // WLEDMM support higher framerates (up to 250fps) -- 5/8 = 62%
 #define WLED_FPS         120
 #define WLED_FPS_SLOW    60
-#define FRAMETIME_FIXED  24                                // used in Blurz, Freqmap, Scrolling text 
+#define FRAMETIME_FIXED  24                                // used in Blurz, Freqmap, Scrolling text, Colortwinkles, Candle
 //#define FRAMETIME_FIXED  (strip.getFrameTime() < 10 ? 12 : 24)
-#define FRAMETIME_FIXED_SLOW  (15)    // = 66 FPS => 1000/66 // used in Solid, Colortwinkles, Candle
+#define FRAMETIME_FIXED_SLOW  (15)    // = 66 FPS => 1000/66 // used in Solid
 #else
 #define WLED_FPS         42
 #define FRAMETIME_FIXED  (1000/WLED_FPS)

From 0ec5d3394f80777f288176815176e95141acb375 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 4 Nov 2024 22:54:30 +0100
Subject: [PATCH 135/232] T7-S3 (LILYGO / TTGO) with MOONHUB

build env and HUB75 pinout for S3 and MOONHUB HUB75 adapter board
---
 platformio.ini         | 49 ++++++++++++++++++++++++++++++++++++++++++
 wled00/bus_manager.cpp | 12 +++++++++--
 wled00/wled.h          |  2 +-
 3 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 856caac5..1c2fc688 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -78,6 +78,7 @@ default_envs =
   esp32S3_4MB_PSRAM_S      ;; for lolin s3 mini, S3 zero, S3 super mini - optimized for speed
   esp32S3_4MB_PSRAM_M      ;; for lolin s3 mini, S3 zero, S3 super mini
   esp32S3_8MB_PSRAM_M   ;; experiemental
+  esp32S3_16MB_PSRAM_M_HUB75   ;; for S3 with 16MB flash, and MOONHUB HUB75 adapter board
   esp32S3_WROOM-2_M        ;; for S3 WROOM-2
   ;; esp32s2_tinyUF2_PSRAM_S  ;; experimental - only for adafruit -S2 boards with tinyUF2 bootloader !!!
   esp32s2_PSRAM_M          ;; experimental
@@ -2067,6 +2068,54 @@ board_build.partitions = tools/WLED_ESP32_8MB.csv
 ; RAM:   [===       ]  25.8% (used 84544 bytes from 327680 bytes)
 ; Flash: [========  ]  78.1% (used 1638737 bytes from 2097152 bytes)
 
+
+;; for S3 with 16MB flash, octal PSRAM, 
+;; MOONHUB HUB75 adapter board
+[env:esp32S3_16MB_PSRAM_M_HUB75]
+extends = env:esp32S3_8MB_PSRAM_M
+board = lilygo-t7-s3
+board_build.arduino.memory_type = qio_opi
+board_build.flash_mode = qio
+
+build_unflags = ${env:esp32S3_8MB_PSRAM_M.build_unflags}
+  -D WLED_RELEASE_NAME=esp32S3_8MB_M
+  -D LEDPIN=21
+  ${Speed_Flags.build_unflags}  ;; to override -Os
+
+build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-indentation -Wno-format-truncation
+  ${common_mm.build_flags_S} ${common_mm.build_flags_M}
+  ${Speed_Flags.build_flags_V4}  ;; optimize for speed
+  ${common_mm.HUB75_build_flags}
+  -D MOONHUB_S3_PINOUT ;; HUB75 pinout
+  ${common_mm.animartrix_build_flags}
+  -D WLED_RELEASE_NAME=esp32S3_16MB_PSRAM_M_HUB75
+  -D WLEDMM_FASTPATH
+  -D WLED_DISABLE_BROWNOUT_DET
+  ;; -D JSON_BUFFER_SIZE=18432 ;; default 54000
+  -D MIN_HEAP_SIZE=6144      ;; default 8192
+  -D MAX_SEGMENT_DATA=40960  ;; default 32767
+  -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
+  -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
+  -D WLED_WATCHDOG_TIMEOUT=0 -D CONFIG_ASYNC_TCP_USE_WDT=0
+  ;; -DUSERMOD_BATTERY_MEASUREMENT_PIN=2  ;; battery voltage pin
+  ;; -D STATUSLED=17 ;; onboard LED
+  -D LEDPIN=14 -D BTNPIN=0 -D RLYPIN=15 -D IRPIN=-1 -D AUDIOPIN=-1 ;; defaults that avoid pin conflicts with HUB75
+  -D SR_DMTYPE=1 -D I2S_SDPIN=10 -D I2S_CKPIN=11 -D I2S_WSPIN=12 -D MCLK_PIN=-1  ;; I2S mic
+
+lib_deps = ${esp32s3.lib_deps} ${common_mm.lib_deps_S}  ${common_mm.lib_deps_V4_M}
+    ${common_mm.HUB75_lib_deps}
+    ${common_mm.animartrix_lib_deps}
+;lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
+
+board_build.partitions = ${esp32.extreme_partitions}
+board_upload.flash_size = 16MB
+board_upload.maximum_size =16777216
+; RAM:   [==        ]  19.0% (used 62332 bytes from 327680 bytes)
+; Flash: [======    ]  57.7% (used 1813585 bytes from 3145728 bytes)
+
+
 ;; MM for ESP32-S3 WROOM-2, a.k.a. ESP32-S3 DevKitC-1 v1.1
 ;; with >= 16MB FLASH and >= 8MB PSRAM (memory_type: opi_opi)
 ;; includes HUB75 and AnimArtix
diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index fc07909f..2bc6929a 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -677,8 +677,15 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   mxconfig.gpio.d = 35;
   mxconfig.gpio.e = 21;
 
-#elif defined(CONFIG_IDF_TARGET_ESP32S3) && defined(BOARD_HAS_PSRAM)// ESP32-S3
+#elif defined(CONFIG_IDF_TARGET_ESP32S3) && defined(BOARD_HAS_PSRAM)// ESP32-S3 with PSRAM
 
+  #if defined(MOONHUB_S3_PINOUT)
+  USER_PRINTLN("MatrixPanel_I2S_DMA - T7 S3 with PSRAM, MOONHUB pinout");
+
+  // HUB75_I2S_CFG::i2s_pins _pins={R1_PIN, G1_PIN, B1_PIN, R2_PIN, G2_PIN, B2_PIN, A_PIN, B_PIN, C_PIN, D_PIN, E_PIN, LAT_PIN, OE_PIN, CLK_PIN};
+  mxconfig.gpio = { 1, 5, 6, 7, 13, 9, 16, 48, 47, 21, 38, 8, 4, 18 };
+
+  #else
   USER_PRINTLN("MatrixPanel_I2S_DMA - S3 with PSRAM");
 
   mxconfig.gpio.r1 =  1;
@@ -697,8 +704,9 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   mxconfig.gpio.lat = 8;
   mxconfig.gpio.oe  = 3;
   // 16th pin is GND
+  #endif
 
-#elif defined(CONFIG_IDF_TARGET_ESP32S3) // ESP32-S3
+#elif defined(CONFIG_IDF_TARGET_ESP32S3) // ESP32-S3 HD-WF2
 
   // Huidu HD-WF2 ESP32-S3
   // https://www.aliexpress.com/item/1005002258734810.html
diff --git a/wled00/wled.h b/wled00/wled.h
index 3e5f76e5..9ee74490 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2410300
+#define VERSION 2411040
 
 // WLEDMM  - you can check for this define in usermods, to only enabled WLEDMM specific code in the "right" fork. Its not defined in AC WLED.
 #define _MoonModules_WLED_

From 9d84fa6bea7acaf68c9875709a84d3b08d33e292 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 5 Nov 2024 12:06:48 +0100
Subject: [PATCH 136/232] Minor UI improvement: link FPS warning to
 Backup&Restore page

---
 wled00/data/settings_leds.htm | 8 ++++----
 wled00/data/settings_sec.htm  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index cf225444..a9067c28 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -168,8 +168,8 @@
 
 			gId('fpsNone').style.display = ((d.Sf.FR.value == 0) || (d.Sf.FR.value > 249))? 'block':'none'; // WLEDMM
 			gId('fpsNoHelp').style.display = ((d.Sf.FR.value == 0) || (d.Sf.FR.value > 249))? 'none':'block'; // WLEDMM
-			gId('fpswarning').style.display = (d.Sf.FR.value > 69) || (d.Sf.FR.value == 0) ? 'block':'none'; // WLEDMM
-			gId('fpshelp1').style.display = ((d.Sf.FR.value > 80) && (d.Sf.FR.value < 132)) ? 'block':'none'; // WLEDMM
+			gId('fpswarning').style.display = (d.Sf.FR.value > 79) || (d.Sf.FR.value == 0) ? 'block':'none'; // WLEDMM
+			gId('fpshelp1').style.display = ((d.Sf.FR.value > 90) && (d.Sf.FR.value < 132)) ? 'block':'none'; // WLEDMM
 			gId('fpshelp2').style.display = ((d.Sf.FR.value > 132) && (d.Sf.FR.value < 196)) ? 'block':'none'; // WLEDMM
 			gId('fpshelp3').style.display = (d.Sf.FR.value > 196) ? 'block':'none'; // WLEDMM
 
@@ -738,9 +738,9 @@ Length: <input type="number" name="XC${i}" id="xc${i}" class="l" min="1" max="65
 		<div id="fpsNoHelp" style="display: block;"><i>use 0 for unlimited</i><br></div>
 		<div id="fpsNone" style="color:green; display: none;"><b>Unlimited refresh rate mode.</b><br></div>
 		<div id="fpswarning" style="color:GoldenRod; display: none;">
-			&#9888; WLED may become unstable above 70 fps.<br>
+			&#9888; WLED may become unstable above 80 fps.<br>
 			To protect your setup,
-			please make sure to backup WLED configuration and presets before raising target FPS above 70!<br>
+			please make sure to <a class="lnk" href="sec#backup">backup</a> WLED configuration and presets before raising target FPS above 80!<br>
 		</div>
 		<div id="fpshelp1" style="color: orange; display: none;">For a very smooth experience, use less than 300 LEDs per output!<br>      </div><!-- up to 120 fps on ws281x -->
 		<div id="fpshelp2" style="color: orange; display: none;">For an extremely smooth experience, use less than 180 LEDs per output!<br></div><!-- up to 180 fps on WS281x -->
diff --git a/wled00/data/settings_sec.htm b/wled00/data/settings_sec.htm
index 031a7440..8ae229f7 100644
--- a/wled00/data/settings_sec.htm
+++ b/wled00/data/settings_sec.htm
@@ -104,7 +104,7 @@
 		<button type="button" onclick="U()">Manual OTA Update</button><br>
 		Enable ArduinoOTA: <input type="checkbox" name="AO">
 		<hr>
-		<h3>Backup & Restore</h3>
+		<h3 id="backup">Backup &amp; Restore</h3>
 		<a class="btn lnk" id="bckcfg" href="/presets.json" download="presets">Backup presets</a><br>
 		<div>Restore presets<br><input type="file" name="data" accept=".json"> <button type="button" onclick="uploadFile(d.Sf.data,'/presets.json');">Upload</button><br></div><br>
 		<a class="btn lnk" id="bckpresets" href="/cfg.json" download="cfg">Backup configuration</a><br>

From b793c7cb9c2e012996f3cab7c0e71d91fc2f9231 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 5 Nov 2024 17:44:57 +0100
Subject: [PATCH 137/232] trying to stabilze FPS for Art-Net

---
 wled00/FX_fcn.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 913ec677..592ebb5b 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -1878,7 +1878,11 @@ void WS2812FX::service() {
   //if (_suspend) return;
   if (elapsed < 2) return;                                                       // keep wifi alive
   if ( !_triggered && (_targetFps != FPS_UNLIMITED) && (_targetFps != FPS_UNLIMITED_AC)) {
+#if 0
     if (elapsed < MIN_SHOW_DELAY) return;                                        // WLEDMM too early for service
+#else
+    if (elapsed < _frametime) return;                                            // code from upstream - stricter on FPS
+#endif
   }
   #else  // legacy
   if (nowUp - _lastShow < MIN_SHOW_DELAY) return;
@@ -1914,7 +1918,9 @@ void WS2812FX::service() {
 
         if (!cctFromRgb || correctWB) busses.setSegmentCCT(seg.currentBri(seg.cct, true), correctWB);
         for (uint8_t c = 0; c < NUM_COLORS; c++) _colors_t[c] = gamma32(_colors_t[c]);
-
+#if 0  // WARNING this would kill _supersync_
+        now = millis() + timebase;
+#endif
         seg.startFrame();   // WLEDMM
         // effect blending (execute previous effect)
         // actual code may be a bit more involved as effects have runtime data including allocated memory

From a2e9e77ca71d99366c7c3dd574cd1f7e9ef034f9 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 5 Nov 2024 18:07:17 +0100
Subject: [PATCH 138/232] setTargetFps with rounding

---
 wled00/FX_fcn.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 592ebb5b..5df577a2 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -2118,7 +2118,7 @@ uint16_t WS2812FX::getFps() const {
 
 void WS2812FX::setTargetFps(uint8_t fps) {
   if (fps <= 251) _targetFps = fps;  // WLEDMM allow higher framerates
-  if (fps > 0) _frametime = 1000 / _targetFps;
+  if (fps > 0) _frametime = ((2000 / _targetFps) +1) /2;   // with rounding
   else _frametime = 2;                          // AC WLED compatibility
   if (fps >= FPS_UNLIMITED) _frametime = 2;     // WLEDMM unlimited mode
 }

From 7f3d43bc57ea4ccb00980dc5ca9ba564fe422004 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 5 Nov 2024 18:50:22 +0100
Subject: [PATCH 139/232] WS2812FX::service() fix for non-fastpath builds

---
 wled00/FX_fcn.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 5df577a2..66c787a6 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -1885,7 +1885,7 @@ void WS2812FX::service() {
 #endif
   }
   #else  // legacy
-  if (nowUp - _lastShow < MIN_SHOW_DELAY) return;
+  if (elapsed < _frametime) return;
   #endif
 
   bool doShow = false;

From d53c0a31e96d63f66d4805b14d29608d4350ed79 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 6 Nov 2024 13:18:33 +0100
Subject: [PATCH 140/232] FPS calculation minor improvement

seems to work better without rounding
---
 wled00/FX_fcn.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 66c787a6..4ac95069 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -2086,7 +2086,7 @@ void WS2812FX::show(void) {
 
 #ifdef ARDUINO_ARCH_ESP32                      // WLEDMM more accurate FPS measurement for ESP32
   int64_t diff500 = now500 - _lastShow500;
-  if ((diff500 > 300) && (diff500 < 800000)) { // exclude stupid values (timer rollover, major hickups)
+  if ((diff500 > 1) && (diff500 < 800000)) {   // exclude stupid values (timer rollover, major hickups)
     float fpcCurr500 = 500000.0f / float(diff500);
     if (fpcCurr500 > 2)
       _cumulativeFps500 = (3 * _cumulativeFps500 + (500.0 * fpcCurr500)) / 4;  // average for some smoothing
@@ -2118,7 +2118,8 @@ uint16_t WS2812FX::getFps() const {
 
 void WS2812FX::setTargetFps(uint8_t fps) {
   if (fps <= 251) _targetFps = fps;  // WLEDMM allow higher framerates
-  if (fps > 0) _frametime = ((2000 / _targetFps) +1) /2;   // with rounding
+  //if (fps > 0) _frametime = ((2000 / _targetFps) +1) /2;   // with rounding
+  if (fps > 0) _frametime = 1000 / _targetFps;
   else _frametime = 2;                          // AC WLED compatibility
   if (fps >= FPS_UNLIMITED) _frametime = 2;     // WLEDMM unlimited mode
 }

From 7fb3fe65b29e9dbb8ab24518ea1024699c8eb8c7 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 6 Nov 2024 13:19:54 +0100
Subject: [PATCH 141/232] experimental: strict framerate limit for strip.show()

---
 wled00/FX_fcn.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 4ac95069..4a194d5c 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -1879,9 +1879,9 @@ void WS2812FX::service() {
   if (elapsed < 2) return;                                                       // keep wifi alive
   if ( !_triggered && (_targetFps != FPS_UNLIMITED) && (_targetFps != FPS_UNLIMITED_AC)) {
 #if 0
-    if (elapsed < MIN_SHOW_DELAY) return;                                        // WLEDMM too early for service
+    if (elapsed < MIN_SHOW_DELAY) return;                                        // WLEDMM too early for service - delivers higher fps
 #else
-    if (elapsed < _frametime) return;                                            // code from upstream - stricter on FPS
+    if ((elapsed+1) < _frametime) return;                                            // code from upstream - stricter on FPS
 #endif
   }
   #else  // legacy
@@ -1941,7 +1941,15 @@ void WS2812FX::service() {
   _virtualSegmentLength = 0;
   busses.setSegmentCCT(-1);
   if(doShow) {
+#if 0 && defined(ARDUINO_ARCH_ESP32)      // EXPERIMENTAL - enabled this to enforce stricter frametime limits
+    static unsigned long lastTimeShow = 0;
+    long tdelta = millis() - lastTimeShow;
+    if ((lastTimeShow > 0) && (tdelta > 1) && (tdelta < _frametime))  // too early - release CPU to slow down
+      vTaskDelay((tdelta-1) / portTICK_PERIOD_MS);                    // "-1" because vTaskDelay() may actually delay longer than requested
+    lastTimeShow = millis();
+#else
     yield();
+#endif
     show();
     _lastServiceShow = nowUp; // WLEDMM use correct timestamp
   }

From cbd1ce470527645f853fe0afc14986296f39ec48 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 7 Nov 2024 00:06:46 +0100
Subject: [PATCH 142/232] HUB75 hack-the-DOM

* Reversed -> mxconfig.clkphase ; "Inverted clock phase"
* Off Refresh -> mxconfig.latch_blanking = 1; "Single-cycle latch blanking"
---
 wled00/bus_manager.cpp        | 9 +++++++--
 wled00/data/settings_leds.htm | 8 +++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 2bc6929a..f2557b27 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -593,8 +593,13 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   // mxconfig.latch_blanking = 3;                // use in case you see gost images
   // mxconfig.i2sspeed = HUB75_I2S_CFG::HZ_10M;  // experimental - 5MHZ should be enugh, but colours looks slightly better at 10MHz
   // mxconfig.min_refresh_rate = 90;
-  mxconfig.clkphase = false; // can help in case that the leftmost column is invisible, or pixels on the right side "bleeds out" to the left.
- 
+
+  mxconfig.clkphase = bc.reversed;
+  if (bc.refreshReq) mxconfig.latch_blanking = 1;                // needed for some ICS panels (default = 2)
+  // fake bus flags
+  _needsRefresh = mxconfig.latch_blanking == 1;
+  reversed = mxconfig.clkphase;
+
   // How many panels we have connected, cap at sane value
   mxconfig.chain_length = max((uint8_t) 1, min(bc.pins[0], (uint8_t) 4)); // prevent bad data preventing boot due to low memory
 
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index a9067c28..d2201b39 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -221,12 +221,14 @@
 					gId("dig"+n+"w").style.display = (t > 28 && t < 32) ? "inline":"none";  // show swap channels dropdown
 					if (!(t > 28 && t < 32)) d.getElementsByName("WO"+n)[0].value = 0; // reset swapping
 					gId("dig"+n+"c").style.display = ((t >= 40 && t < 48)||(t >= 100 && t < 110)) ? "none":"inline";  // hide count for analog and HUB75
-					gId("dig"+n+"r").style.display = (t >= 80) ? "none":"inline";  // hide reversed for virtual
+					gId("dig"+n+"r").style.display = (t >= 80) && (t < 100) ? "none":"inline";  // hide reversed for virtual, except for HUB75
 					gId("dig"+n+"s").style.display = ((t >= 80) || (t >= 40 && t < 48)) ? "none":"inline";  // hide skip 1st for virtual & analog
-					gId("dig"+n+"f").style.display = ((t >= 16 && t < 32) || (t >= 50 && t < 64)) ? "inline":"none";  // hide refresh
+					gId("dig"+n+"f").style.display = ((t >= 16 && t < 32) || (t >= 50 && t < 64)||(t >= 100 && t < 110)) ? "inline":"none";  // hide refresh, except for HUB75
 					gId("dig"+n+"a").style.display = (isRGBW && t != 40) ? "inline":"none";  // auto calculate white
 					gId("dig"+n+"l").style.display = ((t > 48 && t < 64) && !(t >= 100 && t < 110)) ? "inline":"none";  // bus clock speed
 					gId("rev"+n).innerHTML = (t >= 40 && t < 48) ? "Inverted output":"Reversed (rotated 180°)";  // change reverse text for analog
+					if (t >= 100 && t < 110) gId("rev"+n).innerHTML = "Inverted clock phase";  // change "reverse" text for HUB75
+					if (t >= 100 && t < 110) gId("ref"+n).innerHTML = "Single-cycle latch blanking";  // change "off refresh" text for HUB75
 					gId("psd"+n).innerHTML = (t >= 40 && t < 48) ? "Index:":"Start:";    // change analog start description
 				}
 			}
@@ -413,7 +415,7 @@ ${i+1}:
 <span id="p4d${i}"></span><input type="number" name="L4${i}" class="s" onchange="UI()"/>
 <div id="dig${i}r" style="display:inline"><br><span id="rev${i}">Reversed</span>: <input type="checkbox" name="CV${i}"></div>
 <div id="dig${i}s" style="display:inline"><br>Skip first LEDs: <input type="number" name="SL${i}" min="0" max="255" value="0" oninput="UI()"></div>
-<div id="dig${i}f" style="display:inline"><br>Off Refresh: <input id="rf${i}" type="checkbox" name="RF${i}"></div>
+<div id="dig${i}f" style="display:inline"><br><span id="ref${i}">Off Refresh</span>: <input id="rf${i}" type="checkbox" name="RF${i}"></div>
 <div id="dig${i}a" style="display:inline"><br>Auto-calculate white channel from RGB:<br><select name="AW${i}"><option value=0>None</option><option value=1>Brighter</option><option value=2>Accurate</option><option value=3>Dual</option><option value=4>Max</option></select>&nbsp;</div>
 </div>`;
 				f.insertAdjacentHTML("beforeend", cn);

From c5ebf259cfb8431c6edddf31ab2070ecb8ab2ee6 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 7 Nov 2024 00:25:35 +0100
Subject: [PATCH 143/232] HUB75: allow up to 6 panels on -S3

---
 wled00/bus_manager.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index f2557b27..aea8051a 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -600,8 +600,14 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   _needsRefresh = mxconfig.latch_blanking == 1;
   reversed = mxconfig.clkphase;
 
-  // How many panels we have connected, cap at sane value
-  mxconfig.chain_length = max((uint8_t) 1, min(bc.pins[0], (uint8_t) 4)); // prevent bad data preventing boot due to low memory
+  // How many panels we have connected, cap at sane value, prevent bad data preventing boot due to low memory
+  #if defined(CONFIG_IDF_TARGET_ESP32S3) && defined(BOARD_HAS_PSRAM)        // ESP32-S3: allow up to 6 panels
+  mxconfig.chain_length = max((uint8_t) 1, min(bc.pins[0], (uint8_t) 6));
+  #elif defined(CONFIG_IDF_TARGET_ESP32S2)                                  // ESP32-S2: only 2 panels due to small RAM
+  mxconfig.chain_length = max((uint8_t) 1, min(bc.pins[0], (uint8_t) 2));
+  #else                                                                     // others: up to 4 panels
+  mxconfig.chain_length = max((uint8_t) 1, min(bc.pins[0], (uint8_t) 4));
+  #endif
 
   #if defined(CONFIG_IDF_TARGET_ESP32S3) && defined(BOARD_HAS_PSRAM)
   if(bc.pins[0] > 4) {

From bab415156bf4ae738a095ebadfa67bb201736145 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 7 Nov 2024 12:25:18 +0100
Subject: [PATCH 144/232] HUB75 input validation (return of hack-the-DOM)

---
 wled00/data/settings_leds.htm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index d2201b39..b50e8ecb 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -244,6 +244,13 @@
 			for (i=0; i<LCs.length; i++) {
 				var nm = LCs[i].name.substring(0,2);  // field name
 				var n  = LCs[i].name.substring(2);    // bus number
+				// correct HUB75 chain length stored as LED pin 0
+				if (nm=="L0" && (t >= 100 && t < 110) && LCs[i].value!="") {
+					const clen = parseInt(LCs[i].value,10);
+					if ((clen < 1) || ((clen > 6))) LCs[i].value = "1";
+					LCs[i].min = 1;
+					LCs[i].max = 6;
+				}
 				// do we have a led count field
 				if (nm=="LC") {
 					var c=parseInt(LCs[i].value,10); //get LED count

From d1541b520f92cc1b351fd85a3d46ae85e173fe54 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 7 Nov 2024 14:36:39 +0100
Subject: [PATCH 145/232] Bugfix: remove ghost pixels when changing segment
 options

... transpose, mirror, reverse, grouping, spacing, size

* unlike AC WLED, when calling seg.fill(BLACK) from webserver context this usually has no effect --> added  markForBlank() that shedules segment blanking at the next drawing cycle
* fill previous segment with black when size, grouping or spacing changes
---
 wled00/FX.h       |  3 +++
 wled00/FX_fcn.cpp | 12 +++++++++++-
 wled00/json.cpp   | 11 +++++++++--
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/wled00/FX.h b/wled00/FX.h
index fbdfe7c0..d52bcc2b 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -380,6 +380,7 @@ typedef struct Segment {
     };
     uint8_t  grouping, spacing;
     uint8_t  opacity;
+    bool needsBlank;              // WLEDMM indicates that Segment needs to be blanked (due to change of mirror / reverse / transpose / spacing)
     uint32_t colors[NUM_COLORS];
     uint8_t  cct;                 //0==1900K, 255==10091K
     uint8_t  custom1, custom2;    // custom FX parameters/sliders
@@ -489,6 +490,7 @@ typedef struct Segment {
       grouping(1),
       spacing(0),
       opacity(255),
+      needsBlank(false),
       colors{DEFAULT_COLOR,BLACK,BLACK},
       cct(127),
       custom1(DEFAULT_C1),
@@ -598,6 +600,7 @@ typedef struct Segment {
       * Safe to call from interrupts and network requests.
       */
     inline void markForReset(void) { reset = true; }  // setOption(SEG_OPTION_RESET, true)
+    inline void markForBlank(void) { needsBlank = true; } // WLEDMM serialize "blank" requests, avoid parallel drawing from different task
     void setUpLeds(void);   // set up leds[] array for loseless getPixelColor()
 
     // transition functions
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 4a194d5c..e94e6e6a 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -277,7 +277,16 @@ void Segment::resetIfRequired() {
     next_time = 0; step = 0; call = 0; aux0 = 0; aux1 = 0;
     reset = false; // setOption(SEG_OPTION_RESET, false);
     startFrame();   // WLEDMM update cached propoerties
+    if (isActive()) fill(BLACK); // WLEDMM start clean
+    DEBUG_PRINTLN("Segment reset");
+  } else if (needsBlank) {
+    startFrame();   // WLEDMM update cached propoerties
+    if (isActive()) {
+      fill(BLACK); // WLEDMM start clean
+      DEBUG_PRINTLN("Segment blanked");
+    }
   }
+  needsBlank = false;
 }
 
 void Segment::setUpLeds() {
@@ -510,7 +519,7 @@ void Segment::setUp(uint16_t i1, uint16_t i2, uint8_t grp, uint8_t spc, uint16_t
 
   stateChanged = true; // send UDP/WS broadcast
 
-  if (stop>start) fill(BLACK); //turn old segment range off // WLEDMM stop > start
+  if (stop>start) markForBlank(); //turn old segment range off // WLEDMM stop > start
   if (i2 <= i1) { //disable segment
     stop = 0;
     markForReset();
@@ -2310,6 +2319,7 @@ void WS2812FX::restartRuntime(bool doReset) {
       seg.markForReset(); // seg.resetIfRequired(); // WLEDMM calling this function from webserver context will cause troubles
     } else {
       seg.next_time = 0; seg.step = 0;
+      seg.markForBlank();
     }
   }
 }
diff --git a/wled00/json.cpp b/wled00/json.cpp
index 7d355e79..28467a17 100644
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@@ -172,7 +172,7 @@ bool deserializeSegment(JsonObject elem, byte it, byte presetId)
   if (map1D2D != M12_jMap && seg.jMap)
     seg.deletejMap();
 
-  if ((spc>0 && spc!=seg.spacing) || seg.map1D2D!=map1D2D) seg.fill(BLACK); // clear spacing gaps // WLEDMM softhack007: this line sometimes crashes with "Stack canary watchpoint triggered (async_tcp)"
+  if ((spc>0 && spc!=seg.spacing) || seg.map1D2D!=map1D2D) seg.markForBlank(); // clear spacing gaps // WLEDMM softhack007: this line sometimes crashes with "Stack canary watchpoint triggered (async_tcp)"
 
   seg.map1D2D  = constrain(map1D2D, 0, 7);
   seg.soundSim = constrain(soundSim, 0, 1);
@@ -289,7 +289,7 @@ bool deserializeSegment(JsonObject elem, byte it, byte presetId)
   seg.reverse_y  = elem["rY"]  | seg.reverse_y;
   seg.mirror_y   = elem["mY"]  | seg.mirror_y;
   seg.transpose  = elem[F("tp")] | seg.transpose;
-  if (seg.is2D() && (seg.map1D2D == M12_pArc || seg.map1D2D == M12_sCircle) && (reverse != seg.reverse || reverse_y != seg.reverse_y || mirror != seg.mirror || mirror_y != seg.mirror_y)) seg.fill(BLACK); // clear entire segment (in case of Arc 1D to 2D expansion) WLEDMM: also Circle
+  if (seg.is2D() && (seg.map1D2D == M12_pArc || seg.map1D2D == M12_sCircle) && (reverse != seg.reverse || reverse_y != seg.reverse_y || mirror != seg.mirror || mirror_y != seg.mirror_y)) seg.markForBlank(); // clear entire segment (in case of Arc 1D to 2D expansion) WLEDMM: also Circle
   #endif
 
   byte fx = seg.mode;
@@ -386,6 +386,13 @@ bool deserializeSegment(JsonObject elem, byte it, byte presetId)
   if (seg.differs(prev) & 0x7F) {
     stateChanged = true;
     if ((seg.on == false) && (prev.on == true) && (prev.freeze == false)) prev.fill(BLACK); // WLEDMM: force BLACK if segment was turned off
+    else if (prev.isActive()) prev.fill(BLACK);   // WLEDMM fingers crossed
+    seg.markForBlank();    // WLEDMM
+  }
+  else if ((seg.grouping != prev.grouping) || (seg.spacing != prev.spacing) || (seg.transpose != prev.transpose)) {
+    // WLEDMM blank if grouping / spacing changed
+    seg.markForBlank();    
+    if (prev.isActive()) prev.fill(BLACK);   // WLEDMM fingers crossed
   }
 
   if (iAmGroot) suspendStripService = false; // WLEDMM release lock

From 53ecf16ab17aefe237e975bffbef991623f7a9c2 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 7 Nov 2024 16:43:20 +0100
Subject: [PATCH 146/232] bugfix: make freeze work again

the last commit had a side-effect that cause "freeze" to first blank the screen, then freeze.
---
 wled00/FX_fcn.cpp | 6 +++---
 wled00/json.cpp   | 8 ++++----
 wled00/wled.h     | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index e94e6e6a..8f28daf7 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -277,16 +277,16 @@ void Segment::resetIfRequired() {
     next_time = 0; step = 0; call = 0; aux0 = 0; aux1 = 0;
     reset = false; // setOption(SEG_OPTION_RESET, false);
     startFrame();   // WLEDMM update cached propoerties
-    if (isActive()) fill(BLACK); // WLEDMM start clean
+    if (isActive() && !freeze) fill(BLACK); // WLEDMM start clean
     DEBUG_PRINTLN("Segment reset");
   } else if (needsBlank) {
     startFrame();   // WLEDMM update cached propoerties
-    if (isActive()) {
+    if (isActive() && !freeze) {
       fill(BLACK); // WLEDMM start clean
       DEBUG_PRINTLN("Segment blanked");
+      needsBlank = false;
     }
   }
-  needsBlank = false;
 }
 
 void Segment::setUpLeds() {
diff --git a/wled00/json.cpp b/wled00/json.cpp
index 28467a17..81a78ea0 100644
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@@ -386,13 +386,13 @@ bool deserializeSegment(JsonObject elem, byte it, byte presetId)
   if (seg.differs(prev) & 0x7F) {
     stateChanged = true;
     if ((seg.on == false) && (prev.on == true) && (prev.freeze == false)) prev.fill(BLACK); // WLEDMM: force BLACK if segment was turned off
-    else if (prev.isActive()) prev.fill(BLACK);   // WLEDMM fingers crossed
-    seg.markForBlank();    // WLEDMM
+    else if (prev.isActive() && !prev.freeze && !seg.freeze) prev.fill(BLACK);   // WLEDMM fingers crossed
+    if (!seg.freeze) seg.markForBlank();    // WLEDMM
   }
   else if ((seg.grouping != prev.grouping) || (seg.spacing != prev.spacing) || (seg.transpose != prev.transpose)) {
     // WLEDMM blank if grouping / spacing changed
-    seg.markForBlank();    
-    if (prev.isActive()) prev.fill(BLACK);   // WLEDMM fingers crossed
+    if (!seg.freeze) seg.markForBlank();    
+    if (prev.isActive() && !prev.freeze) prev.fill(BLACK);   // WLEDMM fingers crossed
   }
 
   if (iAmGroot) suspendStripService = false; // WLEDMM release lock
diff --git a/wled00/wled.h b/wled00/wled.h
index 9ee74490..9036cde7 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2411040
+#define VERSION 2411070
 
 // WLEDMM  - you can check for this define in usermods, to only enabled WLEDMM specific code in the "right" fork. Its not defined in AC WLED.
 #define _MoonModules_WLED_

From 44c6a0d73bd0fbf4c6f9ab4e49cbb50d3b5460d7 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Thu, 7 Nov 2024 09:32:23 -0500
Subject: [PATCH 147/232] Proper Art-Net Settings

---
 wled00/bus_manager.cpp        |   7 +-
 wled00/bus_manager.h          |  48 ++++++--
 wled00/cfg.cpp                |  10 +-
 wled00/data/settings_leds.htm |  29 +++++
 wled00/fcn_declare.h          |   2 +-
 wled00/set.cpp                |  13 ++-
 wled00/udp.cpp                | 199 +++++++++++++++++++++++++++-------
 wled00/xml.cpp                |   7 ++
 8 files changed, 258 insertions(+), 57 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index aea8051a..72b135e9 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -476,7 +476,10 @@ BusNetwork::BusNetwork(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWhite) {
   _client = IPAddress(bc.pins[0],bc.pins[1],bc.pins[2],bc.pins[3]);
   _broadcastLock = false;
   _valid = true;
-  USER_PRINTF(" %u.%u.%u.%u] \n", bc.pins[0],bc.pins[1],bc.pins[2],bc.pins[3]);
+  _artnet_outputs = bc.artnet_outputs;
+  _artnet_leds_per_output = bc.artnet_leds_per_output;
+  _artnet_fps_limit = bc.artnet_fps_limit;
+  USER_PRINTF(" %u.%u.%u.%u]\n", bc.pins[0],bc.pins[1],bc.pins[2],bc.pins[3]);
 }
 
 void BusNetwork::setPixelColor(uint16_t pix, uint32_t c) {
@@ -499,7 +502,7 @@ uint32_t BusNetwork::getPixelColor(uint16_t pix) const {
 void BusNetwork::show() {
   if (!_valid || !canShow()) return;
   _broadcastLock = true;
-  realtimeBroadcast(_UDPtype, _client, _len, _data, _bri, _rgbw);
+  realtimeBroadcast(_UDPtype, _client, _len, _data, _bri, _rgbw, _artnet_outputs, _artnet_leds_per_output, _artnet_fps_limit);
   _broadcastLock = false;
 }
 
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 9259bd1f..ff166d2a 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -54,12 +54,16 @@ struct BusConfig {
   uint8_t skipAmount;
   bool refreshReq;
   uint8_t autoWhite;
+  uint8_t artnet_outputs, artnet_fps_limit;
+  uint16_t artnet_leds_per_output;
+
   uint8_t pins[5] = {LEDPIN, 255, 255, 255, 255}; // WLEDMM warning: this means that BusConfig cannot handle nore than 5 pins per bus!
   uint16_t frequency;
-  BusConfig(uint8_t busType, uint8_t* ppins, uint16_t pstart, uint16_t len = 1, uint8_t pcolorOrder = COL_ORDER_GRB, bool rev = false, uint8_t skip = 0, byte aw=RGBW_MODE_MANUAL_ONLY, uint16_t clock_kHz=0U) {
+  BusConfig(uint8_t busType, uint8_t* ppins, uint16_t pstart, uint16_t len = 1, uint8_t pcolorOrder = COL_ORDER_GRB, bool rev = false, uint8_t skip = 0, byte aw=RGBW_MODE_MANUAL_ONLY, uint16_t clock_kHz=0U, uint8_t art_o=1, uint16_t art_l=1, uint8_t art_f=30) {
     refreshReq = (bool) GET_BIT(busType,7);
     type = busType & 0x7F;  // bit 7 may be/is hacked to include refresh info (1=refresh in off state, 0=no refresh)
     count = len; start = pstart; colorOrder = pcolorOrder; reversed = rev; skipAmount = skip; autoWhite = aw; frequency = clock_kHz;
+    artnet_outputs = art_o; artnet_leds_per_output = art_l; artnet_fps_limit = art_f;
     uint8_t nPins = 1;                                                                 // default = only one pin (clockless LEDs like WS281x)
     if ((type >= TYPE_NET_DDP_RGB) && (type < (TYPE_NET_DDP_RGB + 16))) nPins = 4;     // virtual network bus. 4 "pins" store IP address
     else if ((type > 47) && (type < 63)) nPins = 2;                                    // (data + clock / SPI) busses - two pins
@@ -144,6 +148,9 @@ class Bus {
     virtual uint8_t  getColorOrder() const { return COL_ORDER_RGB; }
     virtual uint8_t  skippedLeds() const { return 0; }
     virtual uint16_t getFrequency() const { return 0U; }
+    virtual uint8_t  get_artnet_fps_limit() const { return 0; }
+    virtual uint8_t  get_artnet_outputs() const { return 0; }
+    virtual uint16_t get_artnet_leds_per_output() const { return 0; }
     inline  uint16_t getStart() const { return _start; }
     inline  void     setStart(uint16_t start) { _start = start; }
     inline  uint8_t  getType() const { return _type; }
@@ -348,12 +355,30 @@ class BusNetwork : public Bus {
       return !_broadcastLock;
     }
 
-    uint8_t getPins(uint8_t* pinArray)  const;
+    uint8_t getPins(uint8_t* pinArray) const;
 
-    uint16_t getLength()  const override {
+    uint16_t getLength() const override {
       return _len;
     }
 
+    uint8_t get_artnet_fps_limit() const override {
+      return _artnet_fps_limit;
+    }
+
+    uint8_t get_artnet_outputs() const override {
+      return _artnet_outputs;
+    }
+
+    uint16_t get_artnet_leds_per_output() const override {
+      return _artnet_leds_per_output;
+    }
+
+    void setColorOrder(uint8_t colorOrder);
+
+    uint8_t getColorOrder() const {
+      return _colorOrder;
+    }
+
     void cleanup();
 
     ~BusNetwork() {
@@ -361,12 +386,17 @@ class BusNetwork : public Bus {
     }
 
   private:
-    IPAddress _client;
-    uint8_t   _UDPtype;
-    uint8_t   _UDPchannels;
-    bool      _rgbw;
-    bool      _broadcastLock;
-    byte     *_data;
+    IPAddress           _client;
+    uint8_t             _UDPtype;
+    uint8_t             _UDPchannels;
+    bool                _rgbw;
+    bool                _broadcastLock;
+    byte                *_data;
+    uint8_t             _colorOrder = COL_ORDER_RGB;
+    uint8_t             _artnet_fps_limit;
+    uint8_t             _artnet_outputs;
+    uint16_t            _artnet_leds_per_output;
+    const ColorOrderMap &_colorOrderMap;
 };
 
 #ifdef WLED_ENABLE_HUB75MATRIX
diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp
index 4de49f99..74ef889b 100644
--- a/wled00/cfg.cpp
+++ b/wled00/cfg.cpp
@@ -194,13 +194,16 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
       uint16_t freqkHz = elm[F("freq")] | 0;  // will be in kHz for DotStar and Hz for PWM (not yet implemented fully)
       ledType |= refresh << 7; // hack bit 7 to indicate strip requires off refresh
       uint8_t AWmode = elm[F("rgbwm")] | RGBW_MODE_MANUAL_ONLY;
+      uint8_t artnet_outputs = elm["artnet_outputs"] | 0;
+      uint16_t artnet_leds_per_output = elm["artnet_leds_per_output"] | 0;
+      uint8_t artnet_fps_limit = elm["artnet_fps_limit"] | 0;
       if (fromFS) {
-        BusConfig bc = BusConfig(ledType, pins, start, length, colorOrder, reversed, skipFirst, AWmode, freqkHz);
+        BusConfig bc = BusConfig(ledType, pins, start, length, colorOrder, reversed, skipFirst, AWmode, freqkHz, artnet_outputs, artnet_leds_per_output, artnet_fps_limit);
         mem += BusManager::memUsage(bc);
         if (mem <= MAX_LED_MEMORY) if (busses.add(bc) == -1) break;  // finalization will be done in WLED::beginStrip()
       } else {
         if (busConfigs[s] != nullptr) delete busConfigs[s];
-        busConfigs[s] = new BusConfig(ledType, pins, start, length, colorOrder, reversed, skipFirst, AWmode);
+        busConfigs[s] = new BusConfig(ledType, pins, start, length, colorOrder, reversed, skipFirst, AWmode, freqkHz, artnet_outputs, artnet_leds_per_output, artnet_fps_limit);
         busesChanged = true;
       }
       s++;
@@ -829,6 +832,9 @@ void serializeConfig() {
     ins["ref"] = bus->isOffRefreshRequired();
     ins[F("rgbwm")] = bus->getAutoWhiteMode();
     ins[F("freq")] = bus->getFrequency();
+    ins["artnet_outputs"] = bus->get_artnet_outputs();
+    ins["artnet_fps_limit"] = bus->get_artnet_fps_limit();
+    ins["artnet_leds_per_output"] = bus->get_artnet_leds_per_output();
   }
 
   JsonArray hw_com = hw.createNestedArray(F("com"));
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index b50e8ecb..0da47e63 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -219,6 +219,30 @@
 					gRGBW |= isRGBW = ((t > 17 && t < 22) || (t > 28 && t < 32) || (t > 40 && t < 46 && t != 43) || t == 88); // RGBW checkbox, TYPE_xxxx values from const.h
 					gId("co"+n).style.display = ((t >= 80 && t < 96) || (t >= 40 && t < 48)||(t >= 100 && t < 110)) ? "none":"inline";  // hide color order for PWM
 					gId("dig"+n+"w").style.display = (t > 28 && t < 32) ? "inline":"none";  // show swap channels dropdown
+					gId("dig"+n+"O").style.display = (t == 82 || t == 83) ? "inline":"none";  // show Art-Net output number
+					gId("dig"+n+"L").style.display = (t == 82 || t == 83) ? "inline":"none";  // show Art-Net LEDs per output
+					gId("dig"+n+"F").style.display = (t == 82 || t == 83) ? "inline":"none";  // show Art-Net FPS limiter
+					if (gId("dig"+n+"F").style.display == "inline") {
+						total_leds = d.getElementsByName("LC"+n)[0].value;
+						outputs = d.getElementsByName("AO"+n)[0].value;
+						leds_per_output = d.getElementsByName("AL"+n)[0].value;
+						fps_limit = d.getElementsByName("AF"+n)[0].value;
+						last_octet = d.getElementsByName("L3"+n)[0].value;
+						if (outputs > 1) {
+							if (t == 82) gId("dig"+n+"W").innerHTML = "<br />Set your Art-Net Hardware to "+Math.ceil(leds_per_output/170)+" universes per output.";
+							if (t == 83) gId("dig"+n+"W").innerHTML = "<br />Set your Art-Net Hardware to "+Math.ceil(leds_per_output/128)+" universes per output.";
+						} else if (outputs == 1) {
+							gId("dig"+n+"W").innerHTML = "<br />WLED-style Art-Net output enabled.";
+						} else {
+							gId("dig"+n+"W").innerHTML = "<br />You need at least 1 output!";
+						}
+						if (outputs > 1 && fps_limit > 33333/leds_per_output) gId("dig"+n+"W").innerHTML += "<br />FPS limit may be too high for WS281x pixels.";
+						if (outputs*leds_per_output != total_leds) gId("dig"+n+"W").innerHTML += "<br />Total LEDs doesn't match outputs * LEDs per output.";
+						if (last_octet == 255) {
+							if (total_leds <= 1024) gId("dig"+n+"W").innerHTML += "<br />Art-Net is in broadcast mode.";
+							if (total_leds  > 1024) gId("dig"+n+"W").innerHTML += "<br />You are sending a lot of broadcast data. Be cautious.";
+						}
+					}
 					if (!(t > 28 && t < 32)) d.getElementsByName("WO"+n)[0].value = 0; // reset swapping
 					gId("dig"+n+"c").style.display = ((t >= 40 && t < 48)||(t >= 100 && t < 110)) ? "none":"inline";  // hide count for analog and HUB75
 					gId("dig"+n+"r").style.display = (t >= 80) && (t < 100) ? "none":"inline";  // hide reversed for virtual, except for HUB75
@@ -314,6 +338,7 @@
 			gId("lc").textContent = sLC;
 			gId("pc").textContent = (sLC == sPC) ? "":"(" + sPC + " physical)";
 
+			
 			// memory usage and warnings
 			gId('m0').innerHTML = memu;
 			bquot = memu / maxM * 100;
@@ -420,6 +445,10 @@ ${i+1}:
 <span id="p2d${i}"></span><input type="number" name="L2${i}" class="s" onchange="UI()"/>
 <span id="p3d${i}"></span><input type="number" name="L3${i}" class="s" onchange="UI()"/>
 <span id="p4d${i}"></span><input type="number" name="L4${i}" class="s" onchange="UI()"/>
+<div id="dig${i}O" style="display:inline"><br>Number of Outputs: <input type="number" name="AO${i}" min="1" max="255" value="1" oninput="UI()"></div>
+<div id="dig${i}L" style="display:inline"><br>LEDs Per Output: <input type="number" name="AL${i}" min="1" max="65535" value="1" oninput="UI()"></div>
+<div id="dig${i}F" style="display:inline"><br>FPS Limit: <input type="number" name="AF${i}" min="1" max="255" value="30" oninput="UI()"></div>
+<div id="dig${i}W" style="display:inline"><br>Art-Net Warnings Go Here.</div>
 <div id="dig${i}r" style="display:inline"><br><span id="rev${i}">Reversed</span>: <input type="checkbox" name="CV${i}"></div>
 <div id="dig${i}s" style="display:inline"><br>Skip first LEDs: <input type="number" name="SL${i}" min="0" max="255" value="0" oninput="UI()"></div>
 <div id="dig${i}f" style="display:inline"><br><span id="ref${i}">Off Refresh</span>: <input id="rf${i}" type="checkbox" name="RF${i}"></div>
diff --git a/wled00/fcn_declare.h b/wled00/fcn_declare.h
index 694e9c9f..a2f1bf29 100644
--- a/wled00/fcn_declare.h
+++ b/wled00/fcn_declare.h
@@ -241,7 +241,7 @@ bool handleSet(AsyncWebServerRequest *request, const String& req, bool apply=tru
 
 //udp.cpp
 void notify(byte callMode, bool followUp=false);
-uint8_t realtimeBroadcast(uint8_t type, IPAddress client, uint16_t length, uint8_t *buffer, uint8_t bri=255, bool isRGBW=false);
+uint8_t realtimeBroadcast(uint8_t type, IPAddress client, uint16_t length, uint8_t *buffer, uint8_t bri=255, bool isRGBW=false, uint8_t artnet_outouts=1, uint16_t artnet_leds_per_output=1, uint8_t artnet_fps_limit=1);
 void realtimeLock(uint32_t timeoutMs, byte md = REALTIME_MODE_GENERIC);
 void exitRealtime();
 void handleNotifications();
diff --git a/wled00/set.cpp b/wled00/set.cpp
index 6c9b57c2..449155e2 100644
--- a/wled00/set.cpp
+++ b/wled00/set.cpp
@@ -95,8 +95,8 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
       }
     }
 
-    uint8_t colorOrder, type, skip, awmode, channelSwap;
-    uint16_t length, start;
+    uint8_t colorOrder, type, skip, awmode, channelSwap, artnet_outputs, artnet_fps_limit;
+    uint16_t length, start, artnet_leds_per_output;
     uint8_t pins[5] = {255, 255, 255, 255, 255};
 
     autoSegments = request->hasArg(F("MS"));
@@ -110,6 +110,7 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
 
     bool busesChanged = false;
     for (uint8_t s = 0; s < WLED_MAX_BUSSES+WLED_MIN_VIRTUAL_BUSSES; s++) {
+      // "48+s" means the ASCII character "0", so 48+1 = ASCII for "1", etc - and "[3]=0" means null-terminate the string.
       char lp[4] = "L0"; lp[2] = 48+s; lp[3] = 0; //ascii 0-9 //strip data pin
       char lc[4] = "LC"; lc[2] = 48+s; lc[3] = 0; //strip length
       char co[4] = "CO"; co[2] = 48+s; co[3] = 0; //strip color order
@@ -121,6 +122,9 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
       char aw[4] = "AW"; aw[2] = 48+s; aw[3] = 0; //auto white mode
       char wo[4] = "WO"; wo[2] = 48+s; wo[3] = 0; //channel swap
       char sp[4] = "SP"; sp[2] = 48+s; sp[3] = 0; //bus clock speed (DotStar & PWM)
+      char ao[4] = "AO"; ao[2] = 48+s; ao[3] = 0; //Art-Net outputs
+      char al[4] = "AL"; al[2] = 48+s; al[3] = 0; //Art-Net LEDs per output
+      char af[4] = "AF"; af[2] = 48+s; af[3] = 0; //Art-Net FPS limit
       if (!request->hasArg(lp)) {
         DEBUG_PRINT(F("No data for "));
         DEBUG_PRINTLN(s);
@@ -167,10 +171,13 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
       }
       channelSwap = Bus::hasWhite(type) ? request->arg(wo).toInt() : 0;
       type |= request->hasArg(rf) << 7; // off refresh override
+      artnet_outputs         = (request->hasArg(ao)) ? request->arg(ao).toInt() : 1;
+      artnet_leds_per_output = (request->hasArg(al)) ? request->arg(al).toInt() : length;
+      artnet_fps_limit       = (request->hasArg(af)) ? request->arg(af).toInt() : 33333/length;
       // actual finalization is done in WLED::loop() (removing old busses and adding new)
       // this may happen even before this loop is finished so we do "doInitBusses" after the loop
       if (busConfigs[s] != nullptr) delete busConfigs[s];
-      busConfigs[s] = new BusConfig(type, pins, start, length, colorOrder | (channelSwap<<4), request->hasArg(cv), skip, awmode, freqHz);
+      busConfigs[s] = new BusConfig(type, pins, start, length, colorOrder | (channelSwap<<4), request->hasArg(cv), skip, awmode, freqHz, artnet_outputs, artnet_leds_per_output, artnet_fps_limit);
       busesChanged = true;
     }
     //doInitBusses = busesChanged; // we will do that below to ensure all input data is processed
diff --git a/wled00/udp.cpp b/wled00/udp.cpp
index 0a2d5332..d6c279df 100644
--- a/wled00/udp.cpp
+++ b/wled00/udp.cpp
@@ -759,10 +759,17 @@ void sendSysInfoUDP()
 // isRGBW - true if the buffer contains 4 components per pixel
 
 static       size_t sequenceNumber = 0; // this needs to be shared across all outputs
-static const size_t ART_NET_HEADER_SIZE = 12;
-static const byte   ART_NET_HEADER[] PROGMEM = {0x41,0x72,0x74,0x2d,0x4e,0x65,0x74,0x00,0x00,0x50,0x00,0x0e};
+static const byte   ART_NET_HEADER[12] PROGMEM = {0x41,0x72,0x74,0x2d,0x4e,0x65,0x74,0x00,0x00,0x50,0x00,0x0e};
+static uint_fast16_t framenumber = 0;
+
+#if defined(ARDUINO_ARCH_ESP32P4)
+extern "C" {
+  int p4_mul16x16(uint8_t* outpacket, uint8_t* brightness, uint16_t num_loops, uint8_t* pixelbuffer);
+}
+#endif
+
+uint8_t IRAM_ATTR realtimeBroadcast(uint8_t type, IPAddress client, uint16_t length, uint8_t *buffer, uint8_t bri, bool isRGBW, uint8_t outputs, uint16_t leds_per_output, uint8_t fps_limit)  {
 
-uint8_t realtimeBroadcast(uint8_t type, IPAddress client, uint16_t length, uint8_t *buffer, uint8_t bri, bool isRGBW)  {
   if (!(apActive || interfacesInited) || !client[0] || !length) return 1;  // network not initialised or dummy/unset IP address  031522 ajn added check for ap
 
   WiFiUDP ddpUdp;
@@ -838,58 +845,170 @@ uint8_t realtimeBroadcast(uint8_t type, IPAddress client, uint16_t length, uint8
 
     case 2: //ArtNet
     {
-      // calculate the number of UDP packets we need to send
-      const size_t channelCount = length * (isRGBW?4:3); // 1 channel for every R,G,B,(W?) value
-      const size_t ARTNET_CHANNELS_PER_PACKET = isRGBW?512:510; // 512/4=128 RGBW LEDs, 510/3=170 RGB LEDs
-      const size_t packetCount = ((channelCount-1)/ARTNET_CHANNELS_PER_PACKET)+1;
+      static uint_fast16_t artnetlimiter = millis()+(1000/fps_limit);
+      while (artnetlimiter > micros()) {
+        if (ArtNetSkipFrame) {
+          return 0; // Let WLED keep generating effect frames and we output an Art-Net frame when fps_limit is reached.
+        } else {
+          delayMicroseconds(10); // Make WLED obey fps_limit and just delay here until we're ready to send a frame.
+        }
+      }
 
-      uint32_t channel = 0; 
-      size_t bufferOffset = 0;
+      /*
+      WLED rendering Art-Net data considers itself to be 1 hardware output with many universes - but
+      many Art-Net controllers like the H807SA can be manually set to "X universes per output" or in 
+      some cases "X channels per port" - which is the same thing, just expressed differently.
 
+      We need to know the LEDs per output so we can break the pixel data across physically attached universes.
+
+      The H807SA obeys the "510 channels for RGB" rule like WLED and xLights - some other controllers do not care,
+      but we're not supporting those here. If you run into one of these, override ARTNET_CHANNELS_PER_PACKET to 512.
+      */
+
+      #ifdef ARTNET_TIMER
+      uint_fast16_t datatotal = 0;
+      uint_fast16_t packetstotal = 0;
+      #endif
+      uint_fast16_t timer = micros();
+
+      AsyncUDP artnetudp;// AsyncUDP so we can just blast packets.
+
+      const uint_fast16_t ARTNET_CHANNELS_PER_PACKET = isRGBW?512:510; // 512/4=128 RGBW LEDs, 510/3=170 RGB LEDs
+      
+      uint_fast16_t bufferOffset = 0;
+      uint_fast16_t hardware_output_universe = 0;
+      
       sequenceNumber++;
 
-      for (size_t currentPacket = 0; currentPacket < packetCount; currentPacket++) {
+      if (sequenceNumber == 0 || sequenceNumber > 255) sequenceNumber = 1;
 
-        if (sequenceNumber > 255) sequenceNumber = 0;
-
-        if (!ddpUdp.beginPacket(client, ARTNET_DEFAULT_PORT)) {
-          DEBUG_PRINTLN(F("Art-Net WiFiUDP.beginPacket returned an error"));
-          return 1; // borked
+      for (uint_fast16_t hardware_output = 0; hardware_output < outputs; hardware_output++) {
+        
+        if (bufferOffset > length * (isRGBW?4:3)) {
+          // This stop is reached if we don't have enough pixels for the defined Art-Net output.
+          return 1; // stop when we hit end of LEDs
         }
 
-        size_t packetSize = ARTNET_CHANNELS_PER_PACKET;
+        // hardware_output_universe = hardware_outputs_universe_start[hardware_output];
 
-        if (currentPacket == (packetCount - 1U)) {
-          // last packet
-          if (channelCount % ARTNET_CHANNELS_PER_PACKET) {
-            packetSize = channelCount % ARTNET_CHANNELS_PER_PACKET;
+        uint_fast16_t channels_remaining = leds_per_output * (isRGBW?4:3);
+
+        while (channels_remaining > 0) {
+          
+          uint_fast16_t packetSize = ARTNET_CHANNELS_PER_PACKET;
+
+          if (channels_remaining < ARTNET_CHANNELS_PER_PACKET) {
+            packetSize = channels_remaining;
+            channels_remaining = 0;
+          } else {
+            channels_remaining -= packetSize;
           }
+
+          #ifdef ARTNET_TIMER
+          packetstotal++;
+          datatotal += packetSize + 18;
+          #endif
+          
+          // set the parts of the Art-Net packet header that change:
+          packet_buffer[12] = sequenceNumber;
+          // packet_buffer[13] = 0; // "The physical input port from which DMX512 data was input. This field is used by the receiving device to discriminate between packets with identical Port-Address that have been generated by different input ports and so need to be merged."
+          packet_buffer[14] = hardware_output_universe;
+          packet_buffer[15] = hardware_output_universe >> 8; // needed for universes > 255
+          packet_buffer[16] = packetSize >> 8;
+          packet_buffer[17] = packetSize;
+
+          #ifdef ARTNET_TESTING_ZEROS
+          bri = 0; // Set all brightness to 0 but keep all calculations the same and keep sending packets.
+          #endif
+
+          #if defined(ARDUINO_ARCH_ESP32P4)
+          p4_mul16x16(packet_buffer+18, &bri, (packetSize >> 4)+1, buffer+bufferOffset);
+          #else
+          if (bri == 255) { // speed hack - don't adjust brightness if full brightness
+            memcpy(packet_buffer+18, buffer+bufferOffset, packetSize);
+          } else {
+            for (uint_fast16_t i = 0; i < packetSize; i+=(isRGBW?4:3)) {
+              // set brightness values in the packet - seems slightly faster than scale8()?
+              // for some reason, doing 3 (or 4) at a time is 200 micros faster than 1 at a time.
+              packet_buffer[i+18] = (buffer[bufferOffset+i] * bri) >> 8;
+              packet_buffer[i+19] = (buffer[bufferOffset+i+1] * bri) >> 8;
+              packet_buffer[i+20] = (buffer[bufferOffset+i+2] * bri) >> 8; 
+              if (isRGBW) packet_buffer[i+21] = (buffer[bufferOffset+i+3] * bri) >> 8; 
+            }
+          }
+          #endif
+
+          bufferOffset += packetSize;
+          
+          if (!artnetudp.writeTo(packet_buffer,packetSize+18, client, ARTNET_DEFAULT_PORT)) {
+            DEBUG_PRINTLN(F("Art-Net artnetudp.writeTo() returned an error"));
+            return 1; // borked
+          }
+          hardware_output_universe++;
         }
+      }
 
-        byte header_buffer[ART_NET_HEADER_SIZE];
-        memcpy_P(header_buffer, ART_NET_HEADER, ART_NET_HEADER_SIZE);
-        ddpUdp.write(header_buffer, ART_NET_HEADER_SIZE); // This doesn't change. Hard coded ID, OpCode, and protocol version.
-        ddpUdp.write(sequenceNumber & 0xFF); // sequence number. 1..255
-        ddpUdp.write(0x00); // physical - more an FYI, not really used for anything. 0..3
-        ddpUdp.write((currentPacket) & 0xFF); // Universe LSB. 1 full packet == 1 full universe, so just use current packet number.
-        ddpUdp.write(0x00); // Universe MSB, unused.
-        ddpUdp.write(0xFF & (packetSize >> 8)); // 16-bit length of channel data, MSB
-        ddpUdp.write(0xFF & (packetSize     )); // 16-bit length of channel data, LSB
+      // Send Art-Net sync. Just reuse the packet and adjust.
+      // This should get re-written on the next run.
+      // After the first sync packet, and assuming 1 sync packet every 4 
+      // seconds at least, should keep Art-Net nodes in synchronous mode.
 
-        for (size_t i = 0; i < packetSize; i += (isRGBW?4:3)) {
-          ddpUdp.write(scale8(buffer[bufferOffset++], bri)); // R
-          ddpUdp.write(scale8(buffer[bufferOffset++], bri)); // G
-          ddpUdp.write(scale8(buffer[bufferOffset++], bri)); // B
-          if (isRGBW) ddpUdp.write(scale8(buffer[bufferOffset++], bri)); // W
-        }
+      // This is very much untested and generally not needed unless you 
+      // have several Art-Net devices being broadcast to, and should only
+      // be called in that situation. 
+      
+      // Art-Net broadcast mode (setting Art-Net to 255.255.255.255) should ONLY
+      // be used if you know what you're doing, as that is a lot of pixels being 
+      // sent to EVERYTHING on your network, including WiFi devices - and can 
+      // overwhelm them if you have a lot of Art-Net data being broadcast.
 
-        if (!ddpUdp.endPacket()) {
-          DEBUG_PRINTLN(F("Art-Net WiFiUDP.endPacket returned an error"));
+      #ifdef ARTNET_SYNC_ENABLED
+        
+        // This block sends Art-Net "ArtSync" packets. Can't do this with AsyncUDP because it doesn't support source port binding.
+        // Tested on Art-Net qualifier software but not on real hardware with known support for ArtSync.
+        // Doesn't seem to do anything on my gear, so it's disabled. 
+
+        // packet_buffer[8]  = 0x00; // ArtSync opcode low byte (low byte is same as ArtDmx, 0x00)
+        packet_buffer[9]  = 0x52; // ArtSync opcode high byte
+        packet_buffer[12] = 0x00; // Aux1 - Transmit as 0. This is normally the sequence number in ArtDMX packets.
+        // packet_buffer[13] = 0x00; // Aux2 - Transmit as 0 - this should be 0 anyway in the packet already
+        
+        #ifdef ARTNET_SYNC_STRICT
+        WiFiUDP artnetsync;
+        artnetsync.begin(ETH.localIP(), ARTNET_DEFAULT_PORT);
+        artnetsync.beginPacket(IPADDR_BROADCAST,ARTNET_DEFAULT_PORT);
+        artnetsync.write(packet_buffer,14);
+
+        if (!artnetsync.endPacket()) {
+          DEBUG_PRINTLN(F("Art-Net Sync Broadcast Strict returned an error"));
           return 1; // borked
         }
-        channel += packetSize;
-      }
-    } break;
+        #else
+        if (!artnetudp.broadcastTo(packet_buffer,14,ARTNET_DEFAULT_PORT)) {
+          DEBUG_PRINTLN(F("Art-Net Sync Broadcast returned an error"));
+          return 1; // borked
+        }
+        #endif
+
+        #ifdef ARTNET_TIMER
+        packetstotal++;
+        datatotal += 14;
+        #endif
+      
+      #endif
+
+      artnetlimiter = micros()+(1000000/fps_limit)-(micros()-timer);
+
+      // This is the proper stop if pixels = Art-Net output.
+      
+      #ifdef ARTNET_TIMER
+      float mbps = (datatotal*8)/((micros()-timer)*0.95367431640625f);
+      // the "micros()" calc is just to limit the print to a more random debug output so it doesn't overwhelm the terminal
+      if (micros() % 100 < 3) USER_PRINTF("UDP for %u pixels took %lu micros. %u data in %u total packets. %2.2f mbit/sec at %u FPS.\n",length, micros()-timer, datatotal, packetstotal, mbps, strip.getFps());
+      #endif
+    
+      break;
+    }
   }
   return 0;
 }
diff --git a/wled00/xml.cpp b/wled00/xml.cpp
index b90b7bb7..b7bd1005 100644
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -424,6 +424,7 @@ void getSettingsJS(AsyncWebServerRequest* request, byte subPage, char* dest) //W
     for (uint8_t s=0; s < busses.getNumBusses(); s++) {
       Bus* bus = busses.getBus(s);
       if (bus == nullptr) continue;
+      // "48+s" means the ASCII character "0", so 48+1 = ASCII for "1", etc - and "[3]=0" means null-terminate the string.
       char lp[4] = "L0"; lp[2] = 48+s; lp[3] = 0; //ascii 0-9 //strip data pin
       char lc[4] = "LC"; lc[2] = 48+s; lc[3] = 0; //strip length
       char co[4] = "CO"; co[2] = 48+s; co[3] = 0; //strip color order
@@ -435,6 +436,9 @@ void getSettingsJS(AsyncWebServerRequest* request, byte subPage, char* dest) //W
       char aw[4] = "AW"; aw[2] = 48+s; aw[3] = 0; //auto white mode
       char wo[4] = "WO"; wo[2] = 48+s; wo[3] = 0; //swap channels
       char sp[4] = "SP"; sp[2] = 48+s; sp[3] = 0; //bus clock speed
+      char ao[4] = "AO"; ao[2] = 48+s; ao[3] = 0; //Art-Net outputs
+      char al[4] = "AL"; al[2] = 48+s; al[3] = 0; //Art-Net LEDs per output
+      char af[4] = "AF"; af[2] = 48+s; af[3] = 0; //Art-Net FPS limit
       oappend(SET_F("addLEDs(1);"));
       uint8_t pins[5];
       uint8_t nPins = bus->getPins(pins);
@@ -451,6 +455,9 @@ void getSettingsJS(AsyncWebServerRequest* request, byte subPage, char* dest) //W
       sappend('c',rf,bus->isOffRefreshRequired());
       sappend('v',aw,bus->getAutoWhiteMode());
       sappend('v',wo,bus->getColorOrder() >> 4);
+      sappend('v',ao,bus->get_artnet_outputs());
+      sappend('v',al,bus->get_artnet_leds_per_output());
+      sappend('v',af,bus->get_artnet_fps_limit());
       uint16_t speed = bus->getFrequency();
       if (bus->getType() > TYPE_ONOFF && bus->getType() < 48) {
         switch (speed) {

From 732ae38005f3abea69007e692b9c6574c64639db Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Thu, 7 Nov 2024 12:54:32 -0500
Subject: [PATCH 148/232] Art-Net P4 Tidy

---
 wled00/udp.cpp | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/wled00/udp.cpp b/wled00/udp.cpp
index d6c279df..d6d1bbfe 100644
--- a/wled00/udp.cpp
+++ b/wled00/udp.cpp
@@ -772,7 +772,22 @@ uint8_t IRAM_ATTR realtimeBroadcast(uint8_t type, IPAddress client, uint16_t len
 
   if (!(apActive || interfacesInited) || !client[0] || !length) return 1;  // network not initialised or dummy/unset IP address  031522 ajn added check for ap
 
-  WiFiUDP ddpUdp;
+  // For some reason, this is faster outside of the case block...
+  //
+  static byte *packet_buffer = (byte *) heap_caps_calloc_prefer(530, sizeof(byte), 3, MALLOC_CAP_IRAM_8BIT, MALLOC_CAP_DEFAULT, MALLOC_CAP_SPIRAM); // MALLOC_CAP_TCM seems to have alignment issues.
+  if (packet_buffer[0] != 0x41) memcpy(packet_buffer, ART_NET_HEADER, 12); // copy in the Art-Net header if it isn't there already
+
+  // Volumetric test code
+  // static byte *buffer = (byte *) heap_caps_calloc_prefer(length*3*72, sizeof(byte), 3, MALLOC_CAP_IRAM_8BIT, MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT); // MALLOC_CAP_TCM seems to have alignment issues.
+  // memmove(buffer+(length*3),buffer,length*3*7);
+  // memcpy(buffer,buffer_in,length*3);
+  // framenumber++;
+  // if (framenumber >= 8) {
+  //   framenumber = 0;
+  // } else {
+  //   // return 0;
+  // }
+  // length *= 8;
 
   switch (type) {
     case 0: // DDP

From 3012272ed32760330d0dfd2d7d510bfd0ca24c80 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Thu, 7 Nov 2024 11:37:36 -0500
Subject: [PATCH 149/232] Art-Net sane defaults if using an old config without
 the new values

---
 wled00/cfg.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp
index 74ef889b..069b303a 100644
--- a/wled00/cfg.cpp
+++ b/wled00/cfg.cpp
@@ -194,9 +194,9 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
       uint16_t freqkHz = elm[F("freq")] | 0;  // will be in kHz for DotStar and Hz for PWM (not yet implemented fully)
       ledType |= refresh << 7; // hack bit 7 to indicate strip requires off refresh
       uint8_t AWmode = elm[F("rgbwm")] | RGBW_MODE_MANUAL_ONLY;
-      uint8_t artnet_outputs = elm["artnet_outputs"] | 0;
-      uint16_t artnet_leds_per_output = elm["artnet_leds_per_output"] | 0;
-      uint8_t artnet_fps_limit = elm["artnet_fps_limit"] | 0;
+      uint8_t artnet_outputs = elm["artnet_outputs"] | 1; // sanity check
+      uint16_t artnet_leds_per_output = elm["artnet_leds_per_output"] | length; // sanity check
+      uint8_t artnet_fps_limit = elm["artnet_fps_limit"] | 24; // sanity check
       if (fromFS) {
         BusConfig bc = BusConfig(ledType, pins, start, length, colorOrder, reversed, skipFirst, AWmode, freqkHz, artnet_outputs, artnet_leds_per_output, artnet_fps_limit);
         mem += BusManager::memUsage(bc);

From 3f02ba73df6ccd183c1854c811a8bcdae0fcc225 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Thu, 7 Nov 2024 13:26:14 -0500
Subject: [PATCH 150/232] Art-Net Color Order Maps, RGBW

---
 wled00/bus_manager.cpp | 84 ++++++++++++++++++++++++++++++++----------
 wled00/bus_manager.h   |  2 +-
 wled00/const.h         |  3 +-
 wled00/udp.cpp         | 16 +++-----
 4 files changed, 74 insertions(+), 31 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 72b135e9..5399ccc2 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -448,7 +448,7 @@ uint8_t BusOnOff::getPins(uint8_t* pinArray) const {
 }
 
 
-BusNetwork::BusNetwork(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWhite) {
+BusNetwork::BusNetwork(BusConfig &bc, const ColorOrderMap &com) : Bus(bc.type, bc.start, bc.autoWhite), _colorOrderMap(com) {
   _valid = false;
   USER_PRINT("[");
   switch (bc.type) {
@@ -457,6 +457,11 @@ BusNetwork::BusNetwork(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWhite) {
       _UDPtype = 2;
       USER_PRINT("NET_ARTNET_RGB");
       break;
+    case TYPE_NET_ARTNET_RGBW:
+      _rgbw = true;
+      _UDPtype = 2;
+      USER_PRINT("NET_ARTNET_RGBW");
+      break;
     case TYPE_NET_E131_RGB:
       _rgbw = false;
       _UDPtype = 1;
@@ -469,10 +474,11 @@ BusNetwork::BusNetwork(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWhite) {
       break;
   }
   _UDPchannels = _rgbw ? 4 : 3;
-  _data = (byte *)malloc(bc.count * _UDPchannels);
+  _data = (byte*) heap_caps_calloc_prefer((bc.count * _UDPchannels)+15, sizeof(byte), 3, MALLOC_CAP_DEFAULT, MALLOC_CAP_SPIRAM);
+
   if (_data == nullptr) return;
-  memset(_data, 0, bc.count * _UDPchannels);
   _len = bc.count;
+  _colorOrder = bc.colorOrder;
   _client = IPAddress(bc.pins[0],bc.pins[1],bc.pins[2],bc.pins[3]);
   _broadcastLock = false;
   _valid = true;
@@ -482,21 +488,61 @@ BusNetwork::BusNetwork(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWhite) {
   USER_PRINTF(" %u.%u.%u.%u]\n", bc.pins[0],bc.pins[1],bc.pins[2],bc.pins[3]);
 }
 
-void BusNetwork::setPixelColor(uint16_t pix, uint32_t c) {
-  if (!_valid || pix >= _len) return;
-  if (hasWhite()) c = autoWhiteCalc(c);
-  if (_cct >= 1900) c = colorBalanceFromKelvin(_cct, c); //color correction from CCT
-  uint16_t offset = pix * _UDPchannels;
-  _data[offset]   = R(c);
-  _data[offset+1] = G(c);
-  _data[offset+2] = B(c);
-  if (_rgbw) _data[offset+3] = W(c);
+void IRAM_ATTR BusNetwork::setPixelColor(uint16_t pix, uint32_t c) {
+    if (!_valid || pix >= _len) return;
+    if (_rgbw) c = autoWhiteCalc(c);
+    if (_cct >= 1900) c = colorBalanceFromKelvin(_cct, c); // color correction from CCT
+
+    uint16_t offset = pix * _UDPchannels;
+    uint8_t co = _colorOrderMap.getPixelColorOrder(pix + _start, _colorOrder);
+
+    if (_colorOrder != co || _colorOrder != COL_ORDER_RGB) {
+        switch (co) {
+            case COL_ORDER_GRB:
+                _data[offset] = G(c); _data[offset+1] = R(c); _data[offset+2] = B(c);
+                break;
+            case COL_ORDER_RGB:
+                _data[offset] = R(c); _data[offset+1] = G(c); _data[offset+2] = B(c);
+                break;
+            case COL_ORDER_BRG:
+                _data[offset] = B(c); _data[offset+1] = R(c); _data[offset+2] = G(c);
+                break;
+            case COL_ORDER_RBG:
+                _data[offset] = R(c); _data[offset+1] = B(c); _data[offset+2] = G(c);
+                break;
+            case COL_ORDER_GBR:
+                _data[offset] = G(c); _data[offset+1] = B(c); _data[offset+2] = R(c);
+                break;
+            case COL_ORDER_BGR:
+                _data[offset] = B(c); _data[offset+1] = G(c); _data[offset+2] = R(c);
+                break;
+        }
+        if (_rgbw) _data[offset+3] = W(c);
+    } else {
+        _data[offset] = R(c); _data[offset+1] = G(c); _data[offset+2] = B(c);
+        if (_rgbw) _data[offset+3] = W(c);
+    }
 }
 
-uint32_t BusNetwork::getPixelColor(uint16_t pix) const {
-  if (!_valid || pix >= _len) return 0;
-  uint16_t offset = pix * _UDPchannels;
-  return RGBW32(_data[offset], _data[offset+1], _data[offset+2], _rgbw ? (_data[offset+3] << 24) : 0);
+uint32_t IRAM_ATTR BusNetwork::getPixelColor(uint16_t pix) const {
+    if (!_valid || pix >= _len) return 0;
+    uint16_t offset = pix * _UDPchannels;
+    uint8_t co = _colorOrderMap.getPixelColorOrder(pix + _start, _colorOrder);
+
+    uint8_t r = _data[offset + 0];
+    uint8_t g = _data[offset + 1];
+    uint8_t b = _data[offset + 2];
+    uint8_t w = _rgbw ? _data[offset + 3] : 0;
+
+    switch (co) {
+        case COL_ORDER_GRB: return RGBW32(g, r, b, w);
+        case COL_ORDER_RGB: return RGBW32(r, g, b, w);
+        case COL_ORDER_BRG: return RGBW32(b, r, g, w);
+        case COL_ORDER_RBG: return RGBW32(r, b, g, w);
+        case COL_ORDER_GBR: return RGBW32(g, b, r, w);
+        case COL_ORDER_BGR: return RGBW32(b, g, r, w);
+        default: return RGBW32(r, g, b, w); // default to RGB order
+    }
 }
 
 void BusNetwork::show() {
@@ -516,8 +562,8 @@ uint8_t BusNetwork::getPins(uint8_t* pinArray) const {
 void BusNetwork::cleanup() {
   _type = I_NONE;
   _valid = false;
-  if (_data != nullptr) free(_data);
-  _data = nullptr;
+  // if (_data != nullptr) free(_data);
+  // _data = nullptr;
 }
 
 // ***************************************************************************
@@ -1181,7 +1227,7 @@ int BusManager::add(BusConfig &bc) {
   if (getNumBusses() - getNumVirtualBusses() >= WLED_MAX_BUSSES) return -1;
   DEBUG_PRINTF("BusManager::add(bc.type=%u)\n", bc.type);
   if (bc.type >= TYPE_NET_DDP_RGB && bc.type < 96) {
-    busses[numBusses] = new BusNetwork(bc);
+    busses[numBusses] = new BusNetwork(bc, colorOrderMap);
   } else if (bc.type >= TYPE_HUB75MATRIX && bc.type <= (TYPE_HUB75MATRIX + 10)) {
 #ifdef WLED_ENABLE_HUB75MATRIX
     DEBUG_PRINTLN("BusManager::add - Adding BusHub75Matrix");
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index ff166d2a..1e1da367 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -337,7 +337,7 @@ class BusOnOff : public Bus {
 
 class BusNetwork : public Bus {
   public:
-    BusNetwork(BusConfig &bc);
+    BusNetwork(BusConfig &bc, const ColorOrderMap &com);
 
     uint16_t getMaxPixels() const override { return 4096; };
     bool hasRGB()  const { return true; }
diff --git a/wled00/const.h b/wled00/const.h
index 62fbfb62..2c6ac1a7 100644
--- a/wled00/const.h
+++ b/wled00/const.h
@@ -252,7 +252,8 @@
 //Network types (master broadcast) (80-95)
 #define TYPE_NET_DDP_RGB         80            //network DDP RGB bus (master broadcast bus)
 #define TYPE_NET_E131_RGB        81            //network E131 RGB bus (master broadcast bus, unused)
-#define TYPE_NET_ARTNET_RGB      82            //network ArtNet RGB bus (master broadcast bus, unused)
+#define TYPE_NET_ARTNET_RGB      82            //network ArtNet RGB bus (master broadcast bus)
+#define TYPE_NET_ARTNET_RGBW     83            //network ArtNet RGB bus (master broadcast bus)
 #define TYPE_NET_DDP_RGBW        88            //network DDP RGBW bus (master broadcast bus)
 
 #define IS_DIGITAL(t) (((t) & 0x10) || ((t)==TYPE_HUB75MATRIX)) //digital are 16-31 and 48-63 // WLEDMM added HUB75
diff --git a/wled00/udp.cpp b/wled00/udp.cpp
index d6d1bbfe..447a490a 100644
--- a/wled00/udp.cpp
+++ b/wled00/udp.cpp
@@ -774,7 +774,7 @@ uint8_t IRAM_ATTR realtimeBroadcast(uint8_t type, IPAddress client, uint16_t len
 
   // For some reason, this is faster outside of the case block...
   //
-  static byte *packet_buffer = (byte *) heap_caps_calloc_prefer(530, sizeof(byte), 3, MALLOC_CAP_IRAM_8BIT, MALLOC_CAP_DEFAULT, MALLOC_CAP_SPIRAM); // MALLOC_CAP_TCM seems to have alignment issues.
+  static byte *packet_buffer = (byte *) heap_caps_calloc_prefer(530, sizeof(byte), 2, MALLOC_CAP_DEFAULT, MALLOC_CAP_SPIRAM); // MALLOC_CAP_TCM seems to have alignment issues.
   if (packet_buffer[0] != 0x41) memcpy(packet_buffer, ART_NET_HEADER, 12); // copy in the Art-Net header if it isn't there already
 
   // Volumetric test code
@@ -792,6 +792,8 @@ uint8_t IRAM_ATTR realtimeBroadcast(uint8_t type, IPAddress client, uint16_t len
   switch (type) {
     case 0: // DDP
     {
+      WiFiUDP ddpUdp; 
+
       // calculate the number of UDP packets we need to send
       size_t channelCount = length * (isRGBW? 4:3); // 1 channel for every R,G,B value
       size_t packetCount = ((channelCount-1) / DDP_CHANNELS_PER_PACKET) +1;
@@ -857,16 +859,11 @@ uint8_t IRAM_ATTR realtimeBroadcast(uint8_t type, IPAddress client, uint16_t len
     case 1: //E1.31
     {
     } break;
-
-    case 2: //ArtNet
+    case 2: //Art-Net
     {
       static uint_fast16_t artnetlimiter = millis()+(1000/fps_limit);
       while (artnetlimiter > micros()) {
-        if (ArtNetSkipFrame) {
-          return 0; // Let WLED keep generating effect frames and we output an Art-Net frame when fps_limit is reached.
-        } else {
-          delayMicroseconds(10); // Make WLED obey fps_limit and just delay here until we're ready to send a frame.
-        }
+        delayMicroseconds(10); // Make WLED obey fps_limit and just delay here until we're ready to send a frame.
       }
 
       /*
@@ -904,8 +901,6 @@ uint8_t IRAM_ATTR realtimeBroadcast(uint8_t type, IPAddress client, uint16_t len
           return 1; // stop when we hit end of LEDs
         }
 
-        // hardware_output_universe = hardware_outputs_universe_start[hardware_output];
-
         uint_fast16_t channels_remaining = leds_per_output * (isRGBW?4:3);
 
         while (channels_remaining > 0) {
@@ -1004,6 +999,7 @@ uint8_t IRAM_ATTR realtimeBroadcast(uint8_t type, IPAddress client, uint16_t len
           return 1; // borked
         }
         #endif
+        packet_buffer[9]  = ART_NET_HEADER[9];  // reset ArtSync opcode high byte
 
         #ifdef ARTNET_TIMER
         packetstotal++;

From e9ce495d8368e22f2d393aa96097c435022f7685 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Thu, 7 Nov 2024 13:32:45 -0500
Subject: [PATCH 151/232] P4 Assembly for Art-Net

---
 wled00/p4_mul16x16.S | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 wled00/p4_mul16x16.S

diff --git a/wled00/p4_mul16x16.S b/wled00/p4_mul16x16.S
new file mode 100644
index 00000000..ea91165a
--- /dev/null
+++ b/wled00/p4_mul16x16.S
@@ -0,0 +1,31 @@
+#if defined(ARDUINO_ARCH_ESP32P4)
+.text
+.align 4
+.global p4_mul16x16
+.type   p4_mul16x16,@function
+# ESP32-P4 needs -march rv32imafc_zicsr_zifencei_xesppie -mabi ilp32f
+# a0 = out_packet, a1 = brightness, a2 = num_loops, a3 = pixelbuffer
+p4_mul16x16:
+  esp.movx.r.cfg    t6              # Enable aligned data access
+  or                t6, t6, 2       # Enable aligned data access
+  esp.movx.w.cfg    t6              # Enable aligned data access
+  li                t6, 8           # put 8 (eventually for vmul bitshift) in temp register 6
+  esp.movx.w.sar    t6              # set the numbers of bits to right-shift from t6
+  li                t5, 255         # load 255 into t5 for a comparison
+  esp.vldbc.8.ip    q1, a1, 0       # load the "B" value into q1 from a1, broadcasting the same value to all 16 values of q1
+  li                t1, 0           # start our loop_num counter t1 at 0
+  loop:                             # "loop" label
+    beq             t1, a2, exit    # branch to "exit" if loop_num == num_loops 
+    esp.vld.128.ip  q0, a3, 16      # load 16 "A" values into q0 from a3, then move the pointer by 16 to get a new batch
+    beq             a1, t5, skip    # If brightness (a1) == 255, jump to "skip"
+    esp.vmul.u8     q2, q0, q1      # C = A*B (q2 = q0 * q1) then >> by esp.movx.w.sar which we set to 8
+    esp.vst.128.ip  q2, a0, 16      # store the 16 "C" values into a0, then move the pointer by 16
+    j               end_skip        # jump to "end_skip"
+  skip:                             # "skip" label
+    esp.vst.128.ip  q0, a0, 16      # just store brightness (q0 from a3) to packet (a0)
+  end_skip:                         # "end_skip" label
+    addi            t1, t1, 1       # increment loop_num counter t1
+    j               loop            # jump to "loop"
+  exit:                             # "exit" label
+    ret                             # return
+#endif

From aafebf7aad824872658a81694cd8392c719a43f3 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 7 Nov 2024 19:34:19 +0100
Subject: [PATCH 152/232] bugfix: make pseudo-1D segments (width=1, height=x)
 work again

---
 wled00/FX.h         |  4 ++--
 wled00/FX_2Dfcn.cpp | 15 ++++++++-------
 wled00/FX_fcn.cpp   |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/wled00/FX.h b/wled00/FX.h
index d52bcc2b..413b87cd 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -565,9 +565,9 @@ typedef struct Segment {
     inline bool     hasRGB(void)         const { return _isRGB; }
     inline bool     hasWhite(void)       const { return _hasW; }
     inline bool     isCCT(void)          const { return _isCCT; }
-    inline uint16_t width(void)          const { return isActive() ? (stop - start) : 0; }         // segment width in physical pixels (length if 1D)
+    inline uint16_t width(void)          const { return (stop  > start)  ?  (stop - start)  : 0; } // segment width in physical pixels (length if 1D)
     inline uint16_t height(void)         const { return (stopY > startY) ? (stopY - startY) : 0; } // segment height (if 2D) in physical pixels // WLEDMM make sure its always > 0
-    inline uint16_t length(void)         const { return width() * height(); }     // segment length (count) in physical pixels
+    inline uint16_t length(void)         const { return width() * height(); }     // segment length (count) in physical pixels // WLEDMM fishy ... need to double-check if this is correct
     inline uint16_t groupLength(void)    const { return max(1, grouping + spacing); } // WLEDMM length = 0 could lead to div/0 in virtualWidth() and virtualHeight()
     inline uint8_t  getLightCapabilities(void) const { return _capabilities; }
 
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index e803b56d..57612247 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -252,11 +252,12 @@ void Segment::startFrame(void) {
   _isSuperSimpleSegment = !mirror && !mirror_y && (grouping == 1) && (spacing == 0); // fastest - we only draw one pixel per call
 
 #ifdef WLEDMM_FASTPATH
-  _isValid2D  = isActive() && is2D();
+  //_isValid2D  = isActive() && is2D();
+  _isValid2D  = isActive() && strip.isMatrix && length() > 1;
   _brightness = currentBri(on ? opacity : 0);
   // if (reverse_y) _isSimpleSegment = false; // for A/B testing
-  _2dWidth    = is2D() ? calc_virtualWidth() : calc_virtualLength();
   _2dHeight   = calc_virtualHeight();
+  _2dWidth    = _isValid2D ? calc_virtualWidth() : calc_virtualLength();
   _virtuallength = calc_virtualLength();
   #if 0 && defined(WLED_ENABLE_HUB75MATRIX)
     _firstFill = true; // dirty HACK
@@ -300,9 +301,9 @@ void IRAM_ATTR __attribute__((hot)) Segment::setPixelColorXY_fast(int x, int y,
   #endif
   if (simpleSegment) return;   // WLEDMM shortcut when no mirroring needed
 
-  // handle mirroring
-  const int_fast16_t wid_ = stop - start;
-  const int_fast16_t hei_ = stopY - startY;
+  // handle mirroring - minimum width/height is 1 !!!
+  const int_fast16_t wid_ = max(1,stop - start);
+  const int_fast16_t hei_ = max(1, stopY - startY);
   if (mirror) { //set the corresponding horizontally mirrored pixel
     if (transpose) strip.setPixelColorXY_fast(start + x, startY + hei_ - y - 1, scaled_col);
     else           strip.setPixelColorXY_fast(start + wid_ - x - 1, startY + y, scaled_col);
@@ -364,8 +365,8 @@ void IRAM_ATTR_YN Segment::setPixelColorXY(int x, int y, uint32_t col) //WLEDMM:
   }
 
   const uint_fast16_t glen_ = groupLength(); // WLEDMM optimization
-  const uint_fast16_t wid_ =  width();
-  const uint_fast16_t hei_ = height();
+  const uint_fast16_t wid_ = max(uint16_t(1), width());
+  const uint_fast16_t hei_ = max(uint16_t(1), height());
 
   x *= glen_; // expand to physical pixels
   y *= glen_; // expand to physical pixels
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 8f28daf7..a735bdc4 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -899,7 +899,7 @@ uint16_t Segment::calc_virtualLength() const {
 #endif
   uint16_t groupLen = groupLength();
   uint16_t vLength = (length() + groupLen - 1) / groupLen;
-  if (mirror) vLength = (vLength + 1) /2;  // divide by 2 if mirror, leave at least a single LED
+  if (mirror && width() > 1) vLength = (vLength + 1) /2;  // divide by 2 if mirror, leave at least a single LED // WLEDMM bugfix for pseudo 2d strips
   return vLength;
 }
 
@@ -1115,7 +1115,7 @@ void IRAM_ATTR_YN __attribute__((hot)) Segment::setPixelColor(int i, uint32_t co
       // we have a vertical or horizontal 1D segment (WARNING: virtual...() may be transposed)
       int x = 0, y = 0;
       if (virtualHeight()>1) y = i;
-      if (virtualWidth() >1) x = i;
+      else if (virtualWidth() >1) x = i;
       setPixelColorXY(x, y, col);
       return;
     }

From 7bf3f4aee07e99e3b098250524b3319f6628eed5 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Thu, 7 Nov 2024 13:48:17 -0500
Subject: [PATCH 153/232] Fixes for ESP8266

---
 wled00/bus_manager.cpp | 5 ++++-
 wled00/udp.cpp         | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 5399ccc2..aa0c1f4c 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -474,8 +474,11 @@ BusNetwork::BusNetwork(BusConfig &bc, const ColorOrderMap &com) : Bus(bc.type, b
       break;
   }
   _UDPchannels = _rgbw ? 4 : 3;
+  #ifdef ESP32
   _data = (byte*) heap_caps_calloc_prefer((bc.count * _UDPchannels)+15, sizeof(byte), 3, MALLOC_CAP_DEFAULT, MALLOC_CAP_SPIRAM);
-
+  #else
+  _data = (byte*) calloc((bc.count * _UDPchannels)+15, sizeof(byte));
+  #endif
   if (_data == nullptr) return;
   _len = bc.count;
   _colorOrder = bc.colorOrder;
diff --git a/wled00/udp.cpp b/wled00/udp.cpp
index 447a490a..f6749a65 100644
--- a/wled00/udp.cpp
+++ b/wled00/udp.cpp
@@ -774,7 +774,11 @@ uint8_t IRAM_ATTR realtimeBroadcast(uint8_t type, IPAddress client, uint16_t len
 
   // For some reason, this is faster outside of the case block...
   //
-  static byte *packet_buffer = (byte *) heap_caps_calloc_prefer(530, sizeof(byte), 2, MALLOC_CAP_DEFAULT, MALLOC_CAP_SPIRAM); // MALLOC_CAP_TCM seems to have alignment issues.
+  #ifdef ESP32
+  static byte *packet_buffer = (byte *) heap_caps_calloc_prefer(530, sizeof(byte), 2, MALLOC_CAP_DEFAULT, MALLOC_CAP_SPIRAM);
+  #else
+  static byte *packet_buffer = (byte *) calloc(530, sizeof(byte));
+  #endif
   if (packet_buffer[0] != 0x41) memcpy(packet_buffer, ART_NET_HEADER, 12); // copy in the Art-Net header if it isn't there already
 
   // Volumetric test code

From 0b25c2757d8c5a42ddff79277a28fa5bfa0cdf15 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 7 Nov 2024 19:54:41 +0100
Subject: [PATCH 154/232] remove ESP-NOW from esp01_1MB_S

over 100% flash usage.
---
 platformio.ini | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 1c2fc688..248d27fe 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1610,9 +1610,10 @@ build_flags = ${common.build_flags_esp8266} -D WLED_DISABLE_OTA
   -D WLED_RELEASE_NAME=esp01_1MB_S
   -D WLED_DISABLE_ALEXA
   -D WLED_DISABLE_HUESYNC
+  -D WLED_DISABLE_ESPNOW  ;; exceeds flash size limits
 lib_deps = ${esp8266.lib_deps}
-; RAM:   [======    ]  59.5% (used 48748 bytes from 81920 bytes)
-; Flash: [========= ]  90.7% (used 809992 bytes from 892912 bytes)
+; RAM:   [======    ]  60.6% (used 49616 bytes from 81920 bytes)
+; Flash: [==========]  99.8% (used 890835 bytes from 892912 bytes)
 
 
 # ------------------------------------------------------------------------------

From 426805f6744aaf48739a09675cf9a3b7343fd04b Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 7 Nov 2024 21:03:56 +0100
Subject: [PATCH 155/232] bugfix: effect sliders cause screen balnking

@Brandon502 it works now with the matrix effect, can you retest please?
---
 wled00/json.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/wled00/json.cpp b/wled00/json.cpp
index 81a78ea0..6429bd2e 100644
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@@ -383,16 +383,14 @@ bool deserializeSegment(JsonObject elem, byte it, byte presetId)
     strip.trigger(); // force segment update
   }
   // send UDP/WS if segment options changed (except selection; will also deselect current preset)
-  if (seg.differs(prev) & 0x7F) {
+  uint8_t diffresult = seg.differs(prev)  & 0x7F;
+  if (diffresult > 0) {
     stateChanged = true;
     if ((seg.on == false) && (prev.on == true) && (prev.freeze == false)) prev.fill(BLACK); // WLEDMM: force BLACK if segment was turned off
-    else if (prev.isActive() && !prev.freeze && !seg.freeze) prev.fill(BLACK);   // WLEDMM fingers crossed
-    if (!seg.freeze) seg.markForBlank();    // WLEDMM
-  }
-  else if ((seg.grouping != prev.grouping) || (seg.spacing != prev.spacing) || (seg.transpose != prev.transpose)) {
-    // WLEDMM blank if grouping / spacing changed
-    if (!seg.freeze) seg.markForBlank();    
-    if (prev.isActive() && !prev.freeze) prev.fill(BLACK);   // WLEDMM fingers crossed
+    if (diffresult & (SEG_DIFFERS_BOUNDS | SEG_DIFFERS_GSO | SEG_DIFFERS_OPT)) {   // WLEDMM bouds, grouping, or options changed (mirror, reverse, transpose, mapping)
+      if (!seg.freeze) seg.markForBlank();
+      if (prev.isActive() && (diffresult & (SEG_DIFFERS_BOUNDS | SEG_DIFFERS_GSO)) && !prev.freeze && !seg.freeze) prev.fill(BLACK);   // WLEDMM fingers crossed
+    }
   }
 
   if (iAmGroot) suspendStripService = false; // WLEDMM release lock

From e7fb8f57487626b889cbb6145e123e296e908609 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Thu, 7 Nov 2024 17:03:24 -0500
Subject: [PATCH 156/232] IRAM_ATTR_YN for ES8266

---
 wled00/bus_manager.cpp | 4 ++--
 wled00/udp.cpp         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index aa0c1f4c..eb103c17 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -491,7 +491,7 @@ BusNetwork::BusNetwork(BusConfig &bc, const ColorOrderMap &com) : Bus(bc.type, b
   USER_PRINTF(" %u.%u.%u.%u]\n", bc.pins[0],bc.pins[1],bc.pins[2],bc.pins[3]);
 }
 
-void IRAM_ATTR BusNetwork::setPixelColor(uint16_t pix, uint32_t c) {
+void IRAM_ATTR_YN BusNetwork::setPixelColor(uint16_t pix, uint32_t c) {
     if (!_valid || pix >= _len) return;
     if (_rgbw) c = autoWhiteCalc(c);
     if (_cct >= 1900) c = colorBalanceFromKelvin(_cct, c); // color correction from CCT
@@ -527,7 +527,7 @@ void IRAM_ATTR BusNetwork::setPixelColor(uint16_t pix, uint32_t c) {
     }
 }
 
-uint32_t IRAM_ATTR BusNetwork::getPixelColor(uint16_t pix) const {
+uint32_t IRAM_ATTR_YN BusNetwork::getPixelColor(uint16_t pix) const {
     if (!_valid || pix >= _len) return 0;
     uint16_t offset = pix * _UDPchannels;
     uint8_t co = _colorOrderMap.getPixelColorOrder(pix + _start, _colorOrder);
diff --git a/wled00/udp.cpp b/wled00/udp.cpp
index f6749a65..75d788a5 100644
--- a/wled00/udp.cpp
+++ b/wled00/udp.cpp
@@ -768,7 +768,7 @@ extern "C" {
 }
 #endif
 
-uint8_t IRAM_ATTR realtimeBroadcast(uint8_t type, IPAddress client, uint16_t length, uint8_t *buffer, uint8_t bri, bool isRGBW, uint8_t outputs, uint16_t leds_per_output, uint8_t fps_limit)  {
+uint8_t IRAM_ATTR_YN realtimeBroadcast(uint8_t type, IPAddress client, uint16_t length, uint8_t *buffer, uint8_t bri, bool isRGBW, uint8_t outputs, uint16_t leds_per_output, uint8_t fps_limit)  {
 
   if (!(apActive || interfacesInited) || !client[0] || !length) return 1;  // network not initialised or dummy/unset IP address  031522 ajn added check for ap
 

From b1194f597c4111fe967ded1bb2a228c098c55bda Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 8 Nov 2024 12:12:22 +0100
Subject: [PATCH 157/232] fix for a potential endless loop in palette blending

this bug is hard to trigger - when a palette transition is in progress and the main loop gets delayed (wifi connect, saving large preset files) then a calculation in setCurrentPalette() could overflow leading to an infinite loop.
---
 wled00/FX_fcn.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index a735bdc4..d2602218 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -487,7 +487,7 @@ void Segment::setCurrentPalette() {
     // there are about 255 blend passes of 48 "blends" to completely blend two palettes (in _dur time)
     // minimum blend time is 100ms maximum is 65535ms
     unsigned long timeMS = millis() - _t->_start;
-    uint16_t noOfBlends = (255U * timeMS / _t->_dur) - _t->_prevPaletteBlends;
+    uint16_t noOfBlends = min(64UL, (255U * timeMS / _t->_dur) - _t->_prevPaletteBlends);  // WLEDMM limit to 64 blends at once, prevent rollover
     for (unsigned i = 0; i < noOfBlends; i++, _t->_prevPaletteBlends++) nblendPaletteTowardPalette(_t->_palT, _currentPalette, 48);
     _currentPalette = _t->_palT; // copy transitioning/temporary palette
   }

From 2e80d96400cbebfc0612b5e2a210baa3e10a6e02 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 8 Nov 2024 12:24:34 +0100
Subject: [PATCH 158/232] HUB75 - comment out dead code

---
 wled00/bus_manager.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index aea8051a..4cd339a4 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -1011,6 +1011,10 @@ void __attribute__((hot)) BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c
       setBitInArray(_ledsDirty, pix, true);  // flag pixel as "dirty"
     }
   }
+  #if 0
+  // !! this code is not used any more !!
+  //   BusHub75Matrix::BusHub75Matrix will fail if allocating _ledBuffer fails.
+  //   The fallback code below created lots of flickering so it does not make sense to keep it enabled.
   else {
     // no double buffer allocated --> directly draw pixel
     MatrixPanel_I2S_DMA* display = BusHub75Matrix::activeDisplay;
@@ -1034,6 +1038,7 @@ void __attribute__((hot)) BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c
       display->drawPixelRGB888(int16_t(x), int16_t(y), r, g, b);
     }
   }
+  #endif
 }
 
 uint32_t BusHub75Matrix::getPixelColor(uint16_t pix) const {

From 537638e5a2bf2e74fe4b000afe58de795cb73e68 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 8 Nov 2024 14:30:19 +0100
Subject: [PATCH 159/232] Bugfix: saving LED settings not possible when
 brightness limiter disabled

--- and the "Maximum Current" field is empty or has a value below 250.
---
 wled00/data/settings_leds.htm | 7 ++++++-
 wled00/set.cpp                | 4 ++--
 wled00/wled.h                 | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index b50e8ecb..b01920cf 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -110,8 +110,10 @@
 		}
 		function enABL()
 		{
-			var en = gId('able').checked;
+			const en = gId('able').checked;
 			d.Sf.LA.value = (en) ? laprev:0;
+			d.Sf.MA.min = (en) ? 250 : 0;   // WLEDMM no minimum if invisble
+			if ((!en) && (!d.Sf.MA.value || d.Sf.MA.value<0)) d.Sf.MA.value = 0; // WLEDMM workaround when field is invisible with invalid value
 			gId('abl').style.display = (en) ? 'inline':'none';
 			gId('psu2').style.display = (en) ? 'inline':'none';
 			if (d.Sf.LA.value > 0) setABL();
@@ -173,6 +175,9 @@
 			gId('fpshelp2').style.display = ((d.Sf.FR.value > 132) && (d.Sf.FR.value < 196)) ? 'block':'none'; // WLEDMM
 			gId('fpshelp3').style.display = (d.Sf.FR.value > 196) ? 'block':'none'; // WLEDMM
 
+			const ablEnabled = gId('able').checked;
+			d.Sf.MA.min = ablEnabled ? 250 : 0;          // WLEDMM no minimum if invisble
+			if ((!ablEnabled) && !d.Sf.MA.value) d.Sf.MA.value = 0; // WLEDMM workaround when field is blank but invisible 
 			if (d.Sf.LA.value == 255) laprev = 12;
 			else if (d.Sf.LA.value > 0) laprev = d.Sf.LA.value;
 
diff --git a/wled00/set.cpp b/wled00/set.cpp
index 6c9b57c2..91dcf700 100644
--- a/wled00/set.cpp
+++ b/wled00/set.cpp
@@ -244,8 +244,8 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
     }
     touchThreshold = request->arg(F("TT")).toInt();
 
-    strip.ablMilliampsMax = request->arg(F("MA")).toInt();
-    strip.milliampsPerLed = request->arg(F("LA")).toInt();
+    strip.ablMilliampsMax = max(0L, request->arg(F("MA")).toInt());
+    strip.milliampsPerLed = max(0L, request->arg(F("LA")).toInt());
 
     briS = request->arg(F("CA")).toInt();
 
diff --git a/wled00/wled.h b/wled00/wled.h
index 9036cde7..6a44ad3c 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2411070
+#define VERSION 2411080
 
 // WLEDMM  - you can check for this define in usermods, to only enabled WLEDMM specific code in the "right" fork. Its not defined in AC WLED.
 #define _MoonModules_WLED_

From 549380a2bfb85dfa7aeaefa343b81b389b936629 Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Sat, 9 Nov 2024 15:23:08 -0500
Subject: [PATCH 160/232] Game of Life Optimizations

Uses more memory to achieve much higher framerates on large setups. Neighbor counts are stored instead of constantly recalculated. CRC is no longer used for repeat detection so false positives are no longer possible.
---
 wled00/FX.cpp | 463 +++++++++++++++++++++++++++++---------------------
 1 file changed, 270 insertions(+), 193 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 0bface88..26b795ef 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5228,8 +5228,276 @@ static const char _data_FX_MODE_2DFRIZZLES[] PROGMEM = "Frizzles@X frequency,Y f
 
 
 ///////////////////////////////////////////
-//   2D Cellular Automata Game of life   //
+//   2D Cellular Automata Game of Life   //
 ///////////////////////////////////////////
+typedef struct Cell {
+    uint8_t currentStatus : 1, currentNeighborCount : 4, oscillatorCheck : 1, spaceshipCheck : 1,    unused : 1; // current data + repeated detection
+    uint8_t  futureStatus : 1,  futureNeighborCount : 4,        edgeCell : 1,      superDead : 1,  hasColor : 1; // future data  + opimizations
+} Cell;
+
+class GameOfLifeGrid {
+  private:
+    Cell* cells;
+    const int cols, rows, maxIndex;
+    const int nOffsets[8] = {-cols-1, -cols, -cols+1, -1, 1, cols-1, cols, cols+1}; // Neighbor offsets
+    const int offsetX[8] = {-1,  0,  1, -1, 1, -1, 0, 1};
+    const int offsetY[8] = {-1, -1, -1,  0, 0,  1, 1, 1};
+  public:
+    GameOfLifeGrid(Cell* data, int c, int r) : cells(data), cols(c), rows(r), maxIndex(r * c) {}
+    void getNeighborIndexes(unsigned neighbors[9], unsigned cIndex, unsigned x, unsigned y, bool wrap) {
+      bool edgeCell = cells[cIndex].edgeCell;
+      unsigned neighborCount = 0;
+      for (unsigned i = 0; i < 8; ++i) {
+        unsigned nIndex = cIndex + nOffsets[i];
+        if (edgeCell) {
+          int nX = x + offsetX[i], nY = y + offsetY[i];
+          if      (nX < 0)     {if (!wrap) continue; nIndex += cols;}
+          else if (nX >= cols) {if (!wrap) continue; nIndex -= cols;}
+          if      (nY < 0)     {if (!wrap) continue; nIndex += maxIndex;}
+          else if (nY >= rows) {if (!wrap) continue; nIndex -= maxIndex;}
+        }
+        neighbors[++neighborCount] = nIndex;
+      }
+      neighbors[0] = neighborCount;
+    }
+    void setCell(unsigned cIndex, unsigned x, unsigned y, bool alive, bool wrap) {
+      Cell* cell = &cells[cIndex];
+      cell->futureStatus = alive;
+      if (alive == cell->currentStatus) return; // No change
+      unsigned neighbors[9];
+      getNeighborIndexes(neighbors, cIndex, x, y, wrap);
+      int val = alive ? 1 : -1;
+      for (unsigned i = 1; i <= neighbors[0]; ++i) cells[neighbors[i]].futureNeighborCount += val;
+    }
+    void recalculateEdgeNeighbors(bool wrap) {
+      unsigned cIndex = 0;
+      for (unsigned y = 0; y < rows; ++y) for (unsigned x = 0; x < cols; ++x, ++cIndex) {
+        Cell* cell = &cells[cIndex];
+        if (cell->edgeCell) {
+          cell->futureNeighborCount  = 0;
+          cell->currentNeighborCount = 0;
+          cell->superDead = 0;
+
+          unsigned neighbors[9];
+          getNeighborIndexes(neighbors, cIndex, x, y, wrap);
+
+          for (unsigned i = 1; i <= neighbors[0]; ++i) {
+            if (cells[neighbors[i]].currentStatus) { ++cell->futureNeighborCount; ++cell->currentNeighborCount; }
+          }
+        }
+      }
+    }
+    void shiftFutureToCurrent() {
+      for (unsigned i = 0; i < maxIndex; ++i) {
+        cells[i].currentStatus        = cells[i].futureStatus;
+        cells[i].currentNeighborCount = cells[i].futureNeighborCount;
+      }
+    }
+};
+
+uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https://natureofcode.com/book/chapter-7-cellular-automata/ 
+                                   // and https://github.com/DougHaber/nlife-color , Modified By: Brandon Butler
+  if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+  const uint16_t cols = SEGMENT.virtualWidth();
+  const uint16_t rows = SEGMENT.virtualHeight();
+  const size_t dataSize  = SEGMENT.length() * sizeof(Cell); // Cell = 2 bytes
+  const size_t totalSize = dataSize + 5; // 5 bytes for prevRows, prevCols, prevPalette, prevWrap, soloGlider
+
+  if (!SEGENV.allocateData(totalSize)) return mode_static(); //allocation failed
+  uint8_t  *prevRows    = reinterpret_cast<uint8_t*>(SEGENV.data);
+  uint8_t  *prevCols    = reinterpret_cast<uint8_t*>(SEGENV.data + 1);
+  uint8_t  *prevPalette = reinterpret_cast<uint8_t*>(SEGENV.data + 2);
+  bool     *prevWrap    = reinterpret_cast<bool*>   (SEGENV.data + 3);
+  bool     *soloGlider  = reinterpret_cast<bool*>   (SEGENV.data + 4);
+  Cell     *cells       = reinterpret_cast<Cell*>   (SEGENV.data + 5);
+
+  uint16_t& generation   = SEGENV.aux0; //Rename SEGENV/SEGMENT variables for readability
+  uint16_t& gliderLength = SEGENV.aux1;
+  bool allColors   = SEGMENT.check1;
+  bool overlayBG   = SEGMENT.check2;
+  bool wrap        = SEGMENT.check3;
+  bool bgBlendMode = SEGMENT.custom1 > 220 && !overlayBG; // if blur is high and not overlaying, use bg blend mode
+  byte blur        = overlayBG ? 255 : bgBlendMode ? map2(SEGMENT.custom1 - 220, 0, 35, 255, 128) : map2(SEGMENT.custom1, 0, 220, 255, 10);
+  uint32_t bgColor = SEGCOLOR(1);
+
+  GameOfLifeGrid grid(cells, cols, rows);
+
+  // If rows or cols change due to mirror/transpose, edges and neighbor counts need to be recalculated. Just reset the game.
+  bool setup = SEGENV.call == 0 || rows != *prevRows || cols != *prevCols;
+
+  if (setup) {
+    SEGMENT.setUpLeds();
+    SEGMENT.fill(bgColor); // to make sure that segment buffer and physical leds are aligned initially
+    SEGENV.step = 0;
+    *prevRows = rows;
+    *prevCols = cols;
+
+    // Calculate glider length LCM(rows,cols)*4 once
+    uint8_t a = rows;
+    uint8_t b = cols;
+    while (b) {
+      uint8_t t = b;
+      b = a % b;
+      a = t;
+    }
+    gliderLength = cols * rows / a * 4;
+  }
+
+  if (abs(long(strip.now) - long(SEGENV.step)) > 2000) SEGENV.step = 0; // Timebase jump fix
+  bool paused = SEGENV.step > strip.now;
+
+  // Setup New Game of Life
+  if ((!paused && generation == 0) || setup) {
+    SEGENV.step = strip.now + 1250; // show initial state for 1.25 seconds
+    paused = true;
+    generation = 1;
+    *prevWrap = wrap;
+    *prevPalette = SEGMENT.palette;
+
+    //Setup Grid
+    memset(cells, 0, dataSize);
+    #if !ESP32
+      random16_set_seed(strip.now>>2); //seed the random generator
+    #else
+      const uint32_t chance = UINT32_MAX * 0.32;
+    #endif
+    unsigned cIndex = 0;
+    for (unsigned y = 0; y < rows; ++y) for (unsigned x = 0; x < cols; ++x, ++cIndex) {
+      if (x == 0 || x == cols - 1 || y == 0 || y == rows - 1) cells[cIndex].edgeCell = 1;
+      #if ESP32
+        if (esp_random() < chance) grid.setCell(cIndex, x, y, true, wrap); // ~32% chance of being alive
+      #else
+        if (random16(100) < 32) grid.setCell(cIndex, x, y, true, wrap);
+      #endif
+      else { cells[cIndex].hasColor = 1; cells[cIndex].superDead = 1; }
+    }
+    grid.shiftFutureToCurrent(); // Shift future states to current states
+  }
+
+  bool palChanged = SEGMENT.palette != *prevPalette && !allColors;
+  if (palChanged) *prevPalette = SEGMENT.palette;
+
+  // Enter redraw loop if not updating or palette changed.
+  if (palChanged || paused || (SEGMENT.speed != 255 && strip.now - SEGENV.step < 1000 / map2(SEGMENT.speed,0,254,1,60))) { //(1 - 60) updates/sec 255 is uncapped
+    // Redraw if paused (remove blur), palette changed, overlaying background if not max speed (avoid flicker) 
+    // Generation 1 draws alive cells randomly and fades dead cells
+    bool newGame  = generation == 1;
+    if (paused || palChanged || overlayBG) {
+      unsigned cIndex = 0;
+      for (unsigned y = 0; y < rows; ++y) for (unsigned x = 0; x < cols; ++x, ++cIndex) {
+        Cell& cell = cells[cIndex];
+        if (!newGame && cell.superDead) continue; // Skip super dead cells unless new game
+        bool alive = cell.currentStatus;
+        uint32_t cellColor = SEGMENT.getPixelColorXY(x,y);
+        if (alive) {
+          if ((!cell.hasColor && !random(10)) || palChanged) {
+            uint32_t randomColor = allColors ? random16() * random16() : SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0);
+            SEGMENT.setPixelColorXY(x,y, randomColor);                                          // Palette changed or needs initial color
+            cells[cIndex].hasColor = 1;
+          }
+          else if (overlayBG && cell.hasColor) SEGMENT.setPixelColorXY(x,y, cellColor);         // Redraw alive cells for overlayBG
+        } // Dead
+        else if (paused && !overlayBG) {
+          uint32_t blended = color_blend(cellColor, bgColor, bgBlendMode ? 16 : blur);
+          if (blended == cellColor) blended = bgColor; // color_blend fix
+          if ((bgBlendMode && newGame) || !bgBlendMode) SEGMENT.setPixelColorXY(x, y, blended); // Blur dead cells when paused
+        }
+      }
+    }
+    return FRAMETIME;
+  }
+
+  uint32_t color = allColors ? random16() * random16() : SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0); // Backup color
+  if (generation <= 8) blur = 255 - (((generation-1) * (255 - blur)) >> 3); // Ramp up blur for first 8 generations
+
+  //Update Game of Life
+  bool disableWrap = !wrap || generation % 1500 == 0 || *soloGlider; // Disable wrap every 1500 generations to prevent undetected repeats
+  if (*prevWrap != !disableWrap) { grid.recalculateEdgeNeighbors(!disableWrap); *prevWrap = !disableWrap; }
+  // Repeat detection
+  unsigned aliveCount = 0; // Detects empty grids and solo gliders (for smaller grids)
+  bool updateOscillator = generation % 16 == 0;
+  bool updateSpaceship  = gliderLength && generation % gliderLength == 0;
+  bool repeatingOscillator = true, repeatingSpaceship = true;
+
+  //Loop through all cells. Apply rules, setPixel
+  unsigned cIndex = 0;
+  for (unsigned y = 0; y < rows; ++y) for (unsigned x = 0; x < cols; ++x, ++cIndex) {
+    Cell& cell = cells[cIndex];
+    if (repeatingOscillator && cell.oscillatorCheck != cell.currentStatus) repeatingOscillator = false;
+    if (repeatingSpaceship  && cell.spaceshipCheck  != cell.currentStatus) repeatingSpaceship  = false;
+    if (updateOscillator) cell.oscillatorCheck = cell.currentStatus;
+    if (updateSpaceship)  cell.spaceshipCheck  = cell.currentStatus;
+
+    unsigned neighbors = cell.currentNeighborCount;
+    if (cell.superDead && neighbors != 3) continue; // Skip super dead cells (bgColor dead cells)
+
+    bool     cellValue = cell.currentStatus;
+    uint32_t cellColor = SEGMENT.getPixelColorXY(x, y);
+    
+    if (cellValue) {
+      ++aliveCount;
+      if (cellColor != bgColor) color = cellColor; // Update last seen color
+      if (neighbors < 2 || neighbors > 3) {
+        // Loneliness or Overpopulation
+        grid.setCell(cIndex, x, y, false, !disableWrap);
+        if (!overlayBG) SEGMENT.setPixelColorXY(x,y, blur == 255 ? bgColor : color_blend(cellColor, bgColor, blur));
+        if (blur == 255) cell.superDead = 1;
+      }
+      else SEGMENT.setPixelColorXY(x, y, cellColor == bgColor ? color : cellColor); // Redraw alive
+    }
+    else if (neighbors == 3 && !cellValue) {
+      // Reproduction
+      grid.setCell(cIndex, x, y, true, !disableWrap);
+      cell.superDead = 0;
+      uint32_t birthColor = color;
+      if (random8() < SEGMENT.intensity) birthColor = allColors ? random16() * random16() : SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0);
+      else {
+        // Get Colors
+        uint32_t nColors[8];
+        unsigned colorCount = 0;
+        unsigned neighbors[9];
+        grid.getNeighborIndexes(neighbors, cIndex, x, y, !disableWrap);
+
+        for (unsigned i = 1; i <= neighbors[0]; ++i) {
+          unsigned nIndex = neighbors[i];
+          if (cells[nIndex].futureStatus) {
+            uint32_t nColor = SEGMENT.getPixelColorXY(nIndex % cols, nIndex / cols);
+            if (nColor == bgColor) continue;
+            nColors[colorCount++] = nColor;
+          }
+        }    
+        if (colorCount) { birthColor = nColors[random8(colorCount)]; color = birthColor; }
+      }
+      SEGMENT.setPixelColorXY(x,y, birthColor);
+    }
+    else { // Already dead
+      if (blur != 255 && !overlayBG && !bgBlendMode) {
+        uint32_t blended = color_blend(cellColor, bgColor, blur); // color_blend doesn't always converge to bgColor (this fix needed for fast fps with custom bgColor)
+        if (blended == cellColor) { blended = bgColor; cell.superDead = 1; }
+        SEGMENT.setPixelColorXY(x, y, blended);
+      }
+    }
+  }
+
+  grid.shiftFutureToCurrent();
+
+  if (aliveCount == 5) *soloGlider = true; else *soloGlider = false;
+  if (repeatingOscillator || repeatingSpaceship || !aliveCount) {
+    generation = 0;      // reset on next call
+    SEGENV.step += 1000; // pause final generation for 1 second
+    return FRAMETIME;
+  }
+
+  ++generation;
+  SEGENV.step = strip.now;
+  return FRAMETIME;
+} // mode_2Dgameoflife()
+static const char _data_FX_MODE_2DGAMEOFLIFE[] PROGMEM = "Game Of Life@!,Color Mutation ☾,Blur ☾,,,All Colors ☾,Overlay BG ☾,Wrap ☾;!,!;!;2;sx=56,ix=2,c1=128,o1=0,o2=0,o3=1"; 
+
+/////////////////////////
+//     2D SnowFall     //
+/////////////////////////
 static bool getBitValue(const uint8_t* byteArray, size_t n) {
     size_t byteIndex = n / 8;
     size_t bitIndex = n % 8;
@@ -5244,199 +5512,8 @@ static void setBitValue(uint8_t* byteArray, size_t n, bool value) {
     else
         byteArray[byteIndex] &= ~(1 << bitIndex);
 }
-
-uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https://natureofcode.com/book/chapter-7-cellular-automata/ 
-                                   // and https://github.com/DougHaber/nlife-color , Modified By: Brandon Butler
-  if (!strip.isMatrix) return mode_static(); // not a 2D set-up
-
-  const uint16_t cols = SEGMENT.virtualWidth();
-  const uint16_t rows = SEGMENT.virtualHeight();
-  const size_t dataSize = ((SEGMENT.length() + 7) / 8); // round up to nearest byte
-  const size_t detectionSize =  sizeof(uint16_t) * 3 + 1; // 2 CRCs, gliderLength, soloGlider boolean
-  const size_t totalSize = dataSize * 2 + detectionSize + sizeof(uint8_t); // detectionSize + prevPalette
-
-  if (!SEGENV.allocateData(totalSize)) return mode_static(); //allocation failed
-  byte     *cells         = reinterpret_cast<byte*>(SEGENV.data);
-  byte     *futureCells   = reinterpret_cast<byte*>(SEGENV.data + dataSize);
-  uint16_t *gliderLength  = reinterpret_cast<uint16_t*>(SEGENV.data + dataSize * 2);
-  uint16_t *oscillatorCRC = reinterpret_cast<uint16_t*>(SEGENV.data + dataSize * 2 + sizeof(uint16_t));
-  uint16_t *spaceshipCRC  = reinterpret_cast<uint16_t*>(SEGENV.data + dataSize * 2 + sizeof(uint16_t) * 2);
-  bool     *soloGlider    = reinterpret_cast<bool*>(SEGENV.data + dataSize * 2 + sizeof(uint16_t) * 3);
-  uint8_t  *prevPalette   = reinterpret_cast<uint8_t*>(SEGENV.data + dataSize * 2 + detectionSize);
-
-  uint16_t &generation   = SEGENV.aux0; //Rename SEGENV/SEGMENT variables for readability
-  bool allColors   = SEGMENT.check1;
-  bool overlayBG   = SEGMENT.check2;
-  bool wrap        = SEGMENT.check3;
-  bool bgBlendMode = SEGMENT.custom1 > 220 && !overlayBG; // if blur is high and not overlaying, use bg blend mode
-  byte blur        = bgBlendMode ? map2(SEGMENT.custom1 - 220, 0, 35, 255, 128) : map2(SEGMENT.custom1, 0, 255, 255, 0);
-  uint32_t bgColor = SEGCOLOR(1);
-  uint32_t color   = allColors ? random16() * random16() : SEGMENT.color_from_palette(0, false, PALETTE_SOLID_WRAP, 0);
-
-  if (SEGENV.call == 0) {
-    SEGMENT.setUpLeds();
-    SEGMENT.fill(BLACK); // to make sure that segment buffer and physical leds are aligned initially
-    SEGENV.step = 0;
-  }
-  // fix SEGENV.step in case that timebase jumps
-  if (abs(long(strip.now) - long(SEGENV.step)) > 2000) SEGENV.step = 0;
-
-  // Setup New Game of Life
-  if ((SEGENV.call == 0 || generation == 0) && SEGENV.step < strip.now) {
-    SEGENV.step = strip.now + 1250; // show initial state for 1.25 seconds
-    generation = 1;
-    *prevPalette = SEGMENT.palette;
-    random16_set_seed(strip.now>>2); //seed the random generator
-    //Setup Grid
-    memset(cells, 0, dataSize);
-    for (unsigned x = 0; x < cols; x++) for (unsigned y = 0; y < rows; y++) {
-      if (random8(100) < 32) { // ~32% chance of being alive
-        setBitValue(cells, y * cols + x, true);
-        if (overlayBG) SEGMENT.setPixelColorXY(x,y, allColors ? random16() * random16() : SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0));
-        else           SEGMENT.setPixelColorXY(x,y, bgColor); // Initial color set in redraw loop
-      }
-    }
-    memcpy(futureCells, cells, dataSize); 
-
-    //Set CRCs
-    uint16_t crc = crc16((const unsigned char*)cells, dataSize);
-    *oscillatorCRC = crc;
-    *spaceshipCRC  = crc;
-
-    //Calculate glider length LCM(rows,cols)*4
-    uint8_t a = rows;
-    uint8_t b = cols;
-    while (b) {
-      uint8_t t = b;
-      b = a % b;
-      a = t;
-    }
-    *gliderLength = cols * rows / a * 4;
-  }
-
-  bool blurDead   = SEGENV.step > strip.now && blur !=255 && !bgBlendMode && !overlayBG;
-  bool palChanged = SEGMENT.palette != *prevPalette && !allColors;
-  bool newGame    = generation == 1;
-  if (palChanged) *prevPalette = SEGMENT.palette;
-
-  // Redraw Loop
-  // Redraw if paused (remove blur), palette changed, overlaying background (avoid flicker) 
-  // Generation 1 draws alive cells randomly and fades dead cells
-  if (blurDead || newGame || palChanged || overlayBG) {
-    for (unsigned x = 0; x < cols; x++) for (unsigned y = 0; y < rows; y++) {
-      unsigned cIndex = y * cols + x;
-      uint32_t cellColor = SEGMENT.getPixelColorXY(x,y);
-      bool     alive = getBitValue(cells, cIndex);
-      bool     aliveBgColor = (!overlayBG && alive && newGame && cellColor == bgColor );
-
-      if      ( alive && (palChanged || (aliveBgColor && !random(12)))) { // Palette change or spawn initial colors randomly
-        uint32_t randomColor = allColors ? random16() * random16() : SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0);
-        SEGMENT.setPixelColorXY(x,y, randomColor); // Recolor alive cells
-      }
-      else if ( alive && overlayBG  && !aliveBgColor)   SEGMENT.setPixelColorXY(x,y, cellColor);                            // Redraw alive cells for overlayBG
-      if      (!alive && palChanged && !overlayBG)      SEGMENT.setPixelColorXY(x,y, bgColor);                              // Remove blurred cells from previous palette
-      else if (!alive && blurDead)                      SEGMENT.setPixelColorXY(x,y, color_blend(cellColor, bgColor, blur));// Blur dead cells (paused)
-      else if (!alive && !overlayBG && generation == 1) SEGMENT.setPixelColorXY(x,y, color_blend(cellColor, bgColor, 16));  // Fade dead cells on generation 1
-    }
-  }
-  
-  if (!SEGMENT.speed || SEGENV.step > strip.now || (SEGMENT.speed != 255 && strip.now - SEGENV.step < 1000 / map2(SEGMENT.speed,0,254,0,60))) return FRAMETIME; //(0 - 60) updates/sec 255 is uncapped
-  
-  //Update Game of Life
-  unsigned aliveCount = 0; // Detects dead grids and solo gliders
-  bool disableWrap = !wrap || (generation % 1500 == 0 || *soloGlider); // Disable wrap every 1500 generations to prevent undetected repeats
-  //Loop through all cells. Count neighbors, apply rules, setPixel
-  for (unsigned x = 0; x < cols; x++) for (unsigned y = 0; y < rows; y++) {
-    unsigned cIndex = y * cols + x;
-    bool     cellValue = getBitValue(cells, cIndex);
-    uint32_t cellColor = SEGMENT.getPixelColorXY(x, y);
-    if (cellValue) aliveCount++;
-
-    unsigned neighbors = 0, colorCount = 0;
-    unsigned neighborIndexes[3];
-
-    // Count neighbors and store indexes, get neighbor colors later if needed
-    for (int i = -1; i <= 1; i++) for (int j = -1; j <= 1; j++) { // Iterate through all neighbors
-      if (i == 0 && j == 0) continue;                             // Ignore self
-      if (i == 1 && j == 0 && !cellValue && !neighbors) break;    // Cell can't be born with no neighbors and 2 remaining checks
-      int nX = x + i;
-      int nY = y + j;
-      if      (nX < 0)     {if (disableWrap) continue; nX = cols - 1;} 
-      else if (nX >= cols) {if (disableWrap) continue; nX = 0;}
-      if      (nY < 0)     {if (disableWrap) continue; nY = rows - 1;} 
-      else if (nY >= rows) {if (disableWrap) continue; nY = 0;}
-
-      unsigned nIndex = nY * cols + nX; // Neighbor cell index
-      if (getBitValue(cells, nIndex)) {
-        ++neighbors;
-        if (neighbors > 3) break;                // Cell dies, stop neighbor loop
-        neighborIndexes[neighbors - 1] = nIndex; // Store alive neighbor index
-      }
-    }
-
-    if (!cellValue && neighbors != 3 && cellColor == bgColor) continue; // Skip dead cells with no neighbors and no color
-
-    // Rules of Life
-    if (cellValue && (neighbors < 2 || neighbors > 3)) {
-      // Loneliness or Overpopulation
-      setBitValue(futureCells, cIndex, false);
-      if (!overlayBG) SEGMENT.setPixelColorXY(x,y, color_blend(cellColor, bgColor, blur));
-    } 
-    else if (neighbors == 3 && !cellValue) { 
-      // Reproduction
-      // Get Colors
-      uint32_t nColors[3];
-      for (int i = 0; i < 3; i++) {
-        unsigned nIndex = neighborIndexes[i];
-        if (!getBitValue(futureCells, nIndex)) continue; // Parent just died, color lost or blended
-        uint32_t nColor = SEGMENT.getPixelColorXY(nIndex % cols, nIndex / cols);
-        if (nColor == bgColor) continue;
-        color = nColor; // Update last seen color
-        nColors[colorCount++] = nColor;
-        
-      }
-      setBitValue(futureCells, cIndex, true);
-      uint32_t birthColor = colorCount ? nColors[random8(colorCount)] : color; // Uses last seen color if no surviving neighbors
-      // Mutate color chance
-      if (random8() < SEGMENT.intensity) birthColor = allColors ? random16() * random16() : SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0);
-      SEGMENT.setPixelColorXY(x,y, birthColor);
-    }
-    else { // Blur dead cells and redraw alive cells
-      if      (cellValue) SEGMENT.setPixelColorXY(x, y, cellColor == bgColor ? color : cellColor); // Redraw alive, fixes fading cells
-      else if (blur != 255 && !overlayBG && !bgBlendMode) SEGMENT.setPixelColorXY(x, y, color_blend(cellColor, bgColor, blur));
-    }
-    
-  }
-  //update cell values
-  memcpy(cells, futureCells, dataSize);
-
-  // Get current crc value
-  uint16_t crc = crc16((const unsigned char*)cells, dataSize);
-
-  bool repetition = false;
-  if (!aliveCount || crc == *oscillatorCRC || crc == *spaceshipCRC) repetition = true; //check if cell changed this gen and compare previous stored crc values
-  if (repetition) {
-    generation = 0;      // reset on next call
-    SEGENV.step += 1000; // pause final generation for 1 second
-    return FRAMETIME;
-  }
-  // Update CRC values
-  if (generation % 16 == 0) *oscillatorCRC = crc;
-  if (*gliderLength && generation % *gliderLength == 0) *spaceshipCRC = crc;
-  if (aliveCount == 5) *soloGlider = true; else *soloGlider = false;
-
-  generation++;
-  SEGENV.step = strip.now;
-  return FRAMETIME;
-} // mode_2Dgameoflife()
-static const char _data_FX_MODE_2DGAMEOFLIFE[] PROGMEM = "Game Of Life@!,Color Mutation ☾,Blur ☾,,,All Colors ☾,Overlay BG ☾,Wrap ☾;!,!;!;2;sx=56,ix=2,c1=128,o1=0,o2=0,o3=1"; 
-
-/////////////////////////
-//     2D SnowFall     //
-/////////////////////////
-
 uint16_t mode_2DSnowFall(void) { // By: Brandon Butler
-  // Uses Game of Life style bit array to track snow/particles
+  // Uses bit array to track snow/particles
   if (!strip.isMatrix) return mode_static(); // Not a 2D set-up
   const uint16_t cols = SEGMENT.virtualWidth();
   const uint16_t rows = SEGMENT.virtualHeight();

From 05d441db618ae2597182b83683138d72a9046e18 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Sun, 10 Nov 2024 07:15:27 -0500
Subject: [PATCH 161/232] Review Fixes

---
 wled00/bus_manager.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 1e1da367..75c43caf 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -355,7 +355,7 @@ class BusNetwork : public Bus {
       return !_broadcastLock;
     }
 
-    uint8_t getPins(uint8_t* pinArray) const;
+    uint8_t getPins(uint8_t* pinArray) const override;
 
     uint16_t getLength() const override {
       return _len;
@@ -375,7 +375,7 @@ class BusNetwork : public Bus {
 
     void setColorOrder(uint8_t colorOrder);
 
-    uint8_t getColorOrder() const {
+    uint8_t getColorOrder() const override {
       return _colorOrder;
     }
 
@@ -503,4 +503,4 @@ class BusManager {
       return j;
     }
 };
-#endif
\ No newline at end of file
+#endif

From f096da3c8b930e1d9ceecc3b02d60fefc76ccc79 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Sun, 10 Nov 2024 07:18:39 -0500
Subject: [PATCH 162/232] Review Fixes

---
 wled00/bus_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index eb103c17..b59610e0 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -487,7 +487,7 @@ BusNetwork::BusNetwork(BusConfig &bc, const ColorOrderMap &com) : Bus(bc.type, b
   _valid = true;
   _artnet_outputs = bc.artnet_outputs;
   _artnet_leds_per_output = bc.artnet_leds_per_output;
-  _artnet_fps_limit = bc.artnet_fps_limit;
+   _artnet_fps_limit = max(uint8_t(1), bc.artnet_fps_limit);
   USER_PRINTF(" %u.%u.%u.%u]\n", bc.pins[0],bc.pins[1],bc.pins[2],bc.pins[3]);
 }
 

From 6b2c4aec2fd9f00680ad85a1252bc8dc2036e167 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Sun, 10 Nov 2024 08:58:01 -0500
Subject: [PATCH 163/232] Code Review Fixes

---
 wled00/udp.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wled00/udp.cpp b/wled00/udp.cpp
index 75d788a5..ecd751e9 100644
--- a/wled00/udp.cpp
+++ b/wled00/udp.cpp
@@ -865,7 +865,7 @@ uint8_t IRAM_ATTR_YN realtimeBroadcast(uint8_t type, IPAddress client, uint16_t
     } break;
     case 2: //Art-Net
     {
-      static uint_fast16_t artnetlimiter = millis()+(1000/fps_limit);
+      static unsigned long artnetlimiter = micros()+(1000000/fps_limit);
       while (artnetlimiter > micros()) {
         delayMicroseconds(10); // Make WLED obey fps_limit and just delay here until we're ready to send a frame.
       }
@@ -885,7 +885,7 @@ uint8_t IRAM_ATTR_YN realtimeBroadcast(uint8_t type, IPAddress client, uint16_t
       uint_fast16_t datatotal = 0;
       uint_fast16_t packetstotal = 0;
       #endif
-      uint_fast16_t timer = micros();
+      unsigned long timer = micros();
 
       AsyncUDP artnetudp;// AsyncUDP so we can just blast packets.
 
@@ -1012,7 +1012,7 @@ uint8_t IRAM_ATTR_YN realtimeBroadcast(uint8_t type, IPAddress client, uint16_t
       
       #endif
 
-      artnetlimiter = micros()+(1000000/fps_limit)-(micros()-timer);
+      artnetlimiter = timer + (1000000/fps_limit);
 
       // This is the proper stop if pixels = Art-Net output.
       

From 9223b3c6cd95e6accf6fafe6c02fb66908a2fe33 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Sun, 10 Nov 2024 13:34:30 -0500
Subject: [PATCH 164/232] Free BusNetwork _data on cleanup

---
 wled00/bus_manager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index b59610e0..1da74815 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -565,8 +565,8 @@ uint8_t BusNetwork::getPins(uint8_t* pinArray) const {
 void BusNetwork::cleanup() {
   _type = I_NONE;
   _valid = false;
-  // if (_data != nullptr) free(_data);
-  // _data = nullptr;
+  if (_data != nullptr) free(_data);
+  _data = nullptr;
 }
 
 // ***************************************************************************

From 3828d959e6039e2e7b53740f016cee8b7a303c3f Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Sun, 10 Nov 2024 13:39:24 -0500
Subject: [PATCH 165/232] Minor indent fix

---
 wled00/bus_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 1da74815..053d5957 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -487,7 +487,7 @@ BusNetwork::BusNetwork(BusConfig &bc, const ColorOrderMap &com) : Bus(bc.type, b
   _valid = true;
   _artnet_outputs = bc.artnet_outputs;
   _artnet_leds_per_output = bc.artnet_leds_per_output;
-   _artnet_fps_limit = max(uint8_t(1), bc.artnet_fps_limit);
+  _artnet_fps_limit = max(uint8_t(1), bc.artnet_fps_limit);
   USER_PRINTF(" %u.%u.%u.%u]\n", bc.pins[0],bc.pins[1],bc.pins[2],bc.pins[3]);
 }
 

From 8f4b6d01d426cac2c951c18eaf5eedccf5fd9ada Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 10 Nov 2024 20:51:30 +0100
Subject: [PATCH 166/232] add [env:esp32s2_PSRAM_S]

with reduced functionality, to be OTA compatible to upstream WLED
---
 platformio.ini | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 248d27fe..49f9da49 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -81,7 +81,8 @@ default_envs =
   esp32S3_16MB_PSRAM_M_HUB75   ;; for S3 with 16MB flash, and MOONHUB HUB75 adapter board
   esp32S3_WROOM-2_M        ;; for S3 WROOM-2
   ;; esp32s2_tinyUF2_PSRAM_S  ;; experimental - only for adafruit -S2 boards with tinyUF2 bootloader !!!
-  esp32s2_PSRAM_M          ;; experimental
+  esp32s2_PSRAM_S          ;; OTA-compatible with upstream
+  esp32s2_PSRAM_M          ;; for lolin S2 mini
   esp32c3dev_4MB_M         ;; experimental
   esp32c3dev_2MB_M         ;; experimental - 2MB Flash, no OTA
   esp32c3mini_dio_4MB_M    ;; for boards that need "dio" flash mode (instead of qio)
@@ -2299,7 +2300,7 @@ platform = ${esp32s2.platform}                           ;; using 5.2.0, due to
 platform_packages = ${esp32s2.platform_packages}
 
 board = lolin_s2_mini
-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)
+board_build.partitions = ${esp32.extended_partitions}   ;; 1.65MB firmware, 700KB filesystem (esptool erase_flash needed when changing from "standard WLED" partitions)
 board_build.flash_mode = dio
 upload_speed = 256000 ;; 921600
 build_unflags = ${common.build_unflags}
@@ -2308,7 +2309,6 @@ 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
   -D WLED_ENABLE_HUB75MATRIX
 build_flags = ${common.build_flags} ${esp32s2.build_flags} 
   ;; ${Debug_Flags.build_flags}
@@ -2340,9 +2340,32 @@ lib_deps = ${esp32s2.lib_deps} ${common_mm.lib_deps_S} ${common_mm.lib_deps_V4_M
 lib_ignore = 
   IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
   OneWire         ; not needed as we don't include USERMOD_DALLASTEMPERATURE
+  ${common_mm.HUB75_lib_ignore}
+  ${common_mm.DMXin_lib_ignore}
 monitor_filters = esp32_exception_decoder
-; RAM:   [==        ]  21.8% (used 71304 bytes from 327680 bytes)
-; Flash: [========  ]  84.0% (used 1596970 bytes from 1900544 bytes)
+; RAM:   [==        ]  20.5% (used 67256 bytes from 327680 bytes)
+; Flash: [========= ]  93.3% (used 1590266 bytes from 1703936 bytes)
+
+[env:esp32s2_PSRAM_S]
+extends = env:esp32s2_PSRAM_M
+board_build.partitions = ${esp32.default_partitions}   ;; 1.55MB firmware, 1MB filesystem
+build_unflags = ${env:esp32s2_PSRAM_M.build_unflags}
+  -DWLED_DISABLE_ADALIGHT
+  -D WLED_RELEASE_NAME=esp32s2_4MB_M
+  -DUSE_ALT_DISPLAY
+  -DUSERMOD_FOUR_LINE_DISPLAY
+  -DUSERMOD_ROTARY_ENCODER_UI
+  -DUSERMOD_ANIMARTRIX
+  ;; -DUSERMOD_ARTIFX  ;; uncomment to reduce flash size
+build_flags = ${env:esp32s2_PSRAM_M.build_flags}
+  -D WLED_RELEASE_NAME=esp32s2_4MB_S
+lib_deps = ${env:esp32s2_PSRAM_M.lib_deps}
+lib_ignore =  ${env:esp32s2_PSRAM_M.lib_ignore}
+  U8g2
+  ${common_mm.animartrix_lib_ignore}
+; RAM:   [==        ]  20.4% (used 66792 bytes from 327680 bytes)
+; Flash: [========= ]  94.8% (used 1490390 bytes from 1572864 bytes)
+
 
 # ------------------------------------------------------------------------------
 # esp32-C3 environments

From 7a3a1ce177c49a5cb495122b2ee03016dc91bf33 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 10 Nov 2024 21:37:10 +0100
Subject: [PATCH 167/232] add some CLion internal files to .gitignore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index cdfd81d0..574299fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,10 @@ esp01-update.sh
 platformio_override.ini
 replace_fs.py
 wled-update.sh
+Qodana.yaml
+compile_commands.json
 
+/build/
 /build_output/
 /node_modules/
 

From df9b1a41a9e3d36bb0973e467f6fef9c801dd868 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 11 Nov 2024 11:55:58 +0100
Subject: [PATCH 168/232] Update .gitignore

lowercase
---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 574299fb..5a928325 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,7 @@ esp01-update.sh
 platformio_override.ini
 replace_fs.py
 wled-update.sh
-Qodana.yaml
+qodana.yaml
 compile_commands.json
 
 /build/

From 202255849fceaf29703e5f1eafb98d0fc5546f97 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 13 Nov 2024 23:06:27 +0100
Subject: [PATCH 169/232] fix errors when width>255 or height>255

some effects still don't work when x y dimensions do not fit into 8bit
---
 wled00/FX.cpp               |  6 +++---
 wled00/FX.h                 | 12 ++++++------
 wled00/FX_2Dfcn.cpp         |  6 +++---
 wled00/data/settings_2D.htm |  8 ++++----
 wled00/wled.h               |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 0bface88..79614d22 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8421,7 +8421,7 @@ uint16_t mode_2Doctopus() {
 
   const uint16_t cols = SEGMENT.virtualWidth();
   const uint16_t rows = SEGMENT.virtualHeight();
-  const uint8_t mapp = 180 / MAX(cols,rows);
+  const uint16_t mapp = max(1, 180 / MAX(cols,rows)); // WLEDMM make sure this value is not 0
 
   typedef struct {
     uint8_t angle;
@@ -8458,8 +8458,8 @@ uint16_t mode_2Doctopus() {
     SEGENV.aux1 = rows;
     *offsX = SEGMENT.custom1;
     *offsY = SEGMENT.custom2;
-    const uint8_t C_X = cols / 2 + (SEGMENT.custom1 - 128)*cols/255;
-    const uint8_t C_Y = rows / 2 + (SEGMENT.custom2 - 128)*rows/255;
+    const uint16_t C_X = cols / 2 + (SEGMENT.custom1 - 128)*cols/255;
+    const uint16_t C_Y = rows / 2 + (SEGMENT.custom2 - 128)*rows/255;
     for (int x = xStart; x < xEnd; x++) {
       for (int y = yStart; y < yEnd; y++) {
         rMap[XY(x, y)].angle  = int(40.7436f * atan2f((y - C_Y), (x - C_X)));  // avoid 128*atan2()/PI
diff --git a/wled00/FX.h b/wled00/FX.h
index 413b87cd..c0693462 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -390,8 +390,8 @@ typedef struct Segment {
       bool    check2  : 1;        // checkmark 2
       bool    check3  : 1;        // checkmark 3
     };
-    uint8_t startY;  // start Y coodrinate 2D (top); there should be no more than 255 rows
-    uint8_t stopY;   // stop Y coordinate 2D (bottom); there should be no more than 255 rows
+    uint16_t startY;  // start Y coodrinate 2D (top); there should be no more than 255 rows, but we cannot be sure.
+    uint16_t stopY;   // stop Y coordinate 2D (bottom); there should be no more than 255 rows, but we cannot be sure.
     char *name = nullptr; // WLEDMM initialize to nullptr
 
     // runtime data
@@ -1017,10 +1017,10 @@ class WS2812FX {  // 96 bytes
     } panelO; //panelOrientation
 
     typedef struct panel_t {
-      uint8_t xOffset; // x offset relative to the top left of matrix in LEDs. WLEDMM 8 bits/256 is enough
-      uint8_t yOffset; // y offset relative to the top left of matrix in LEDs. WLEDMM 8 bits/256 is enough
-      uint8_t  width;   // width of the panel
-      uint8_t  height;  // height of the panel
+      uint16_t xOffset; // x offset relative to the top left of matrix in LEDs.
+      uint16_t yOffset; // y offset relative to the top left of matrix in LEDs.
+      uint16_t  width;   // width of the panel
+      uint16_t  height;  // height of the panel
       union {
         uint8_t options;
         struct {
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 57612247..f6d2bc0b 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -129,11 +129,11 @@ void WS2812FX::setUpMatrix() {
       }
 
       if (needLedMap && customMappingTable != nullptr) {  // softhack007
-      uint16_t x, y, pix=0; //pixel
+      uint_fast16_t x, y, pix=0; //pixel
       for (size_t pan = 0; pan < panel.size(); pan++) {
         Panel &p = panel[pan];
-        uint16_t h = p.vertical ? p.height : p.width;
-        uint16_t v = p.vertical ? p.width  : p.height;
+        uint_fast16_t h = p.vertical ? p.height : p.width;
+        uint_fast16_t v = p.vertical ? p.width  : p.height;
         for (size_t j = 0; j < v; j++){
           for(size_t i = 0; i < h; i++) {
             y = (p.vertical?p.rightStart:p.bottomStart) ? v-j-1 : j;
diff --git a/wled00/data/settings_2D.htm b/wled00/data/settings_2D.htm
index c602b98c..c57bf3d9 100644
--- a/wled00/data/settings_2D.htm
+++ b/wled00/data/settings_2D.htm
@@ -111,9 +111,9 @@ Orientation: <select id="P${i}V" name="P${i}V" oninput="draw()">
 	<option value="1">Vertical</option>
 </select><br>
 Serpentine: <input id="P${i}S" name="P${i}S" type="checkbox" onclick="draw()"><br>
-Dimensions (WxH): <input id="P${i}W" name="P${i}W" type="number" min="1" max="255" value="${pw}" oninput="draw()"> x <input id="P${i}H" name="P${i}H" type="number" min="1" max="255" value="${ph}" oninput="draw()"><br>
-Offset X:<input id="P${i}X" name="P${i}X" type="number" min="0" max="255" value="0" oninput="draw()">
-Y:<input id="P${i}Y" name="P${i}Y" type="number" min="0" max="255" value="0" oninput="draw()"><br><i>(offset from top-left corner in # LEDs)</i>
+Dimensions (WxH): <input id="P${i}W" name="P${i}W" type="number" min="1" max="1023" value="${pw}" oninput="draw()"> x <input id="P${i}H" name="P${i}H" type="number" min="1" max="1023" value="${ph}" oninput="draw()"><br>
+Offset X:<input id="P${i}X" name="P${i}X" type="number" min="0" max="1023" value="0" oninput="draw()">
+Y:<input id="P${i}Y" name="P${i}Y" type="number" min="0" max="1023" value="0" oninput="draw()"><br><i>(offset from top-left corner in # LEDs)</i>
 </div>`;
 		p.insertAdjacentHTML("beforeend", b);
 	}
@@ -401,7 +401,7 @@ Y:<input id="P${i}Y" name="P${i}Y" type="number" min="0" max="255" value="0" oni
 			<h3 id="title">Matrix Generator <button type="button" id="expGen" onclick="expand(this,gId('mxGen'));">&gt;</button></h3>
 		</div>
 		<div id="mxGen" style="display:none;">
-			Panel dimensions (WxH): <input name="PW" type="number" min="1" max="255" value="8" oninput="fieldChange()"> x <input name="PH" type="number" min="1" max="255" value="8" oninput="fieldChange()"><br>
+			Panel dimensions (WxH): <input name="PW" type="number" min="1" max="1023" value="8" oninput="fieldChange()"> x <input name="PH" type="number" min="1" max="1023" value="8" oninput="fieldChange()"><br>
 			Horizontal panels: <input name="MPH" type="number" min="1" max="8" value="1" oninput="fieldChange()">
 			Vertical panels: <input name="MPV" type="number" min="1" max="8" value="1" oninput="fieldChange()"><br>
 			<div id="blockPanelOrientation">
diff --git a/wled00/wled.h b/wled00/wled.h
index 6a44ad3c..ce0cc151 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2411080
+#define VERSION 2411130
 
 // WLEDMM  - you can check for this define in usermods, to only enabled WLEDMM specific code in the "right" fork. Its not defined in AC WLED.
 #define _MoonModules_WLED_

From c73ed486e9a5d5b5ea2d296f7ae09ee1f2621f4e Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 13 Nov 2024 23:57:53 +0100
Subject: [PATCH 170/232] effect bugfixes for width>255

* band-aid for ripple, matrix, crazy bee
* arc mapping fix for diameter > 255
* small speedup for "block" mapping
---
 wled00/FX.cpp     | 12 ++++++------
 wled00/FX_fcn.cpp | 21 ++++++++++++---------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 79614d22..08699dc3 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -2589,7 +2589,7 @@ uint16_t ripple_base()
     } else {//randomly create new wave
       if (random16(IBN + 10000) <= (SEGMENT.intensity >> (SEGMENT.is2D()*3))) {
         ripples[i].state = 1;
-        ripples[i].pos = SEGMENT.is2D() ? ((random8(SEGENV.virtualWidth())<<8) | (random8(SEGENV.virtualHeight()))) : random16(SEGLEN);
+        ripples[i].pos = SEGMENT.is2D() ? ((random16(SEGENV.virtualWidth())<<8) | (random16(SEGENV.virtualHeight()))) : random16(SEGLEN);
         ripples[i].color = random8(); //color
       }
     }
@@ -5803,7 +5803,7 @@ uint16_t mode_2Dmatrix(void) {                  // Matrix2D. By Jeremy Williams.
 
     // spawn new falling code
     if (random8() <= SEGMENT.intensity || emptyScreen) {
-      uint8_t spawnX = random8(cols);
+      uint16_t spawnX = random16(cols);
       SEGMENT.setPixelColorXY(spawnX, 0, spawnColor);
       // update hint for next run
       SEGENV.aux0 = spawnX;
@@ -6276,8 +6276,8 @@ uint16_t mode_2Dcrazybees(void) {
     void aimed(uint_fast16_t w, uint_fast16_t h) {
       if (!true) //WLEDMM SuperSync
         random16_set_seed(strip.now);
-      aimX = random8(0, w);
-      aimY = random8(0, h);
+      aimX = random8(0, min(UINT8_MAX, int(w)));
+      aimY = random8(0, min(UINT8_MAX, int(h)));
       hue = random8();
       deltaX = abs(aimX - posX);
       deltaY = abs(aimY - posY);
@@ -6296,8 +6296,8 @@ uint16_t mode_2Dcrazybees(void) {
     SEGMENT.setUpLeds();
     SEGMENT.fill(BLACK);
     for (size_t i = 0; i < n; i++) {
-      bee[i].posX = random8(0, cols);
-      bee[i].posY = random8(0, rows);
+      bee[i].posX = random8(0, min(UINT8_MAX, int(cols)));
+      bee[i].posY = random8(0, min(UINT8_MAX, int(rows)));
       bee[i].aimed(cols, rows);
     }
   }
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index d2602218..df690568 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -873,8 +873,11 @@ uint16_t Segment::calc_virtualLength() const {
         vLen = max(vW,vH); // get the longest dimension
         break;
       case M12_pArc:
-        vLen = sqrt16(vW * vW + vH * vH);
-        if (vW != vH) vLen++; // round up
+        { unsigned vLen2 = vW * vW + vH * vH;            // length ^2
+          if (vLen2 < UINT16_MAX) vLen = sqrt16(vLen2);  // use faster function for 16bit values
+          else vLen = sqrtf(vLen2);                      // fall-back to float if bigger
+          if (vW != vH) vLen++; // round up
+        }
         break;
       case M12_jMap: //WLEDMM jMap
         if (jMap)
@@ -888,7 +891,7 @@ uint16_t Segment::calc_virtualLength() const {
         if (nrOfVStrips()>1)
           vLen = max(vW,vH) * 4;//0.5; // get the longest dimension
         else 
-          vLen = max(vW,vH) * 0.5; // get the longest dimension
+          vLen = max(vW,vH) * 0.5f; // get the longest dimension
         break;
       case M12_sPinwheel:
         vLen = getPinwheelLength(vW, vH);
@@ -906,23 +909,23 @@ uint16_t Segment::calc_virtualLength() const {
 //WLEDMM used for M12_sBlock
 static void xyFromBlock(uint16_t &x,uint16_t &y, uint16_t i, uint16_t vW, uint16_t vH, uint16_t vStrip) {
   float i2;
-  if (i<=SEGLEN*0.25) { //top, left to right
-    i2 = i/(SEGLEN*0.25);
+  if (i<=SEGLEN*0.25f) { //top, left to right
+    i2 = i/(SEGLEN*0.25f);
     x = vW / 2 - vStrip - 1 + i2 * vStrip * 2;
     y = vH / 2 - vStrip - 1;
   }
-  else if (i <= SEGLEN * 0.5) { //right, top to bottom
-    i2 = (i-SEGLEN*0.25)/(SEGLEN*0.25);
+  else if (i <= SEGLEN * 0.5f) { //right, top to bottom
+    i2 = (i-SEGLEN*0.25f)/(SEGLEN*0.25f);
     x = vW / 2 + vStrip;
     y = vH / 2 - vStrip - 1 + i2 * vStrip * 2;
   }
   else if (i <= SEGLEN * 0.75) { //bottom, right to left
-    i2 = (i-SEGLEN*0.5)/(SEGLEN*0.25);
+    i2 = (i-SEGLEN*0.5f)/(SEGLEN*0.25f);
     x = vW / 2 + vStrip - i2 * vStrip * 2;
     y = vH / 2 + vStrip;
   }
   else if (i <= SEGLEN) { //left, bottom to top
-    i2 = (i-SEGLEN*0.75)/(SEGLEN*0.25);
+    i2 = (i-SEGLEN*0.75f)/(SEGLEN*0.25f);
     x = vW / 2 - vStrip - 1;
     y = vH / 2 + vStrip - i2 * vStrip * 2;
   }

From 5ea3aa9ce5d65a1df905e6823f835d36f157b171 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 14 Nov 2024 00:00:58 +0100
Subject: [PATCH 171/232] misses one

---
 wled00/FX_fcn.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index df690568..f98f5dcb 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -919,7 +919,7 @@ static void xyFromBlock(uint16_t &x,uint16_t &y, uint16_t i, uint16_t vW, uint16
     x = vW / 2 + vStrip;
     y = vH / 2 - vStrip - 1 + i2 * vStrip * 2;
   }
-  else if (i <= SEGLEN * 0.75) { //bottom, right to left
+  else if (i <= SEGLEN * 0.75f) { //bottom, right to left
     i2 = (i-SEGLEN*0.5f)/(SEGLEN*0.25f);
     x = vW / 2 + vStrip - i2 * vStrip * 2;
     y = vH / 2 + vStrip;

From 5d27e8f340e87cf2debc06c5991e32781d97d3a4 Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Wed, 13 Nov 2024 22:05:13 -0500
Subject: [PATCH 172/232] GoL - Minor Changes

Use defined(ARDUINO_ARCH_ESP32)
getNeighborIndexes loop changes
offsets use int8_t
change prevRows/Cols to uint16
---
 wled00/FX.cpp | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 26b795ef..c34c2af7 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5240,8 +5240,8 @@ class GameOfLifeGrid {
     Cell* cells;
     const int cols, rows, maxIndex;
     const int nOffsets[8] = {-cols-1, -cols, -cols+1, -1, 1, cols-1, cols, cols+1}; // Neighbor offsets
-    const int offsetX[8] = {-1,  0,  1, -1, 1, -1, 0, 1};
-    const int offsetY[8] = {-1, -1, -1,  0, 0,  1, 1, 1};
+    const int8_t offsetX[8] = {-1,  0,  1, -1, 1, -1, 0, 1};
+    const int8_t offsetY[8] = {-1, -1, -1,  0, 0,  1, 1, 1};
   public:
     GameOfLifeGrid(Cell* data, int c, int r) : cells(data), cols(c), rows(r), maxIndex(r * c) {}
     void getNeighborIndexes(unsigned neighbors[9], unsigned cIndex, unsigned x, unsigned y, bool wrap) {
@@ -5251,10 +5251,15 @@ class GameOfLifeGrid {
         unsigned nIndex = cIndex + nOffsets[i];
         if (edgeCell) {
           int nX = x + offsetX[i], nY = y + offsetY[i];
-          if      (nX < 0)     {if (!wrap) continue; nIndex += cols;}
-          else if (nX >= cols) {if (!wrap) continue; nIndex -= cols;}
-          if      (nY < 0)     {if (!wrap) continue; nIndex += maxIndex;}
-          else if (nY >= rows) {if (!wrap) continue; nIndex -= maxIndex;}
+          if (wrap) {
+            if      (nX < 0)     nIndex += cols;
+            else if (nX >= cols) nIndex -= cols;
+            if      (nY < 0)     nIndex += maxIndex;
+            else if (nY >= rows) nIndex -= maxIndex;
+          } 
+          else { // Wrap disabled, skip out of bound neighbors
+            if (nX < 0 || nX >= cols || nY < 0 || nY >= rows) continue; 
+          }
         }
         neighbors[++neighborCount] = nIndex;
       }
@@ -5302,15 +5307,15 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
   const uint16_t cols = SEGMENT.virtualWidth();
   const uint16_t rows = SEGMENT.virtualHeight();
   const size_t dataSize  = SEGMENT.length() * sizeof(Cell); // Cell = 2 bytes
-  const size_t totalSize = dataSize + 5; // 5 bytes for prevRows, prevCols, prevPalette, prevWrap, soloGlider
+  const size_t totalSize = dataSize + 7; // 7 bytes for prevRows(2), prevCols(2), prevPalette, prevWrap, soloGlider
 
   if (!SEGENV.allocateData(totalSize)) return mode_static(); //allocation failed
-  uint8_t  *prevRows    = reinterpret_cast<uint8_t*>(SEGENV.data);
-  uint8_t  *prevCols    = reinterpret_cast<uint8_t*>(SEGENV.data + 1);
-  uint8_t  *prevPalette = reinterpret_cast<uint8_t*>(SEGENV.data + 2);
-  bool     *prevWrap    = reinterpret_cast<bool*>   (SEGENV.data + 3);
-  bool     *soloGlider  = reinterpret_cast<bool*>   (SEGENV.data + 4);
-  Cell     *cells       = reinterpret_cast<Cell*>   (SEGENV.data + 5);
+  uint16_t *prevRows    = reinterpret_cast<uint16_t*>(SEGENV.data);
+  uint16_t *prevCols    = reinterpret_cast<uint16_t*>(SEGENV.data + 2);
+  uint8_t  *prevPalette = reinterpret_cast<uint8_t*> (SEGENV.data + 4);
+  bool     *prevWrap    = reinterpret_cast<bool*>    (SEGENV.data + 5);
+  bool     *soloGlider  = reinterpret_cast<bool*>    (SEGENV.data + 6);
+  Cell     *cells       = reinterpret_cast<Cell*>    (SEGENV.data + 7);
 
   uint16_t& generation   = SEGENV.aux0; //Rename SEGENV/SEGMENT variables for readability
   uint16_t& gliderLength = SEGENV.aux1;
@@ -5357,15 +5362,14 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
 
     //Setup Grid
     memset(cells, 0, dataSize);
-    #if !ESP32
-      random16_set_seed(strip.now>>2); //seed the random generator
-    #else
+    random16_set_seed(strip.now>>2); //seed the random generator
+    #if defined(ARDUINO_ARCH_ESP32)
       const uint32_t chance = UINT32_MAX * 0.32;
     #endif
     unsigned cIndex = 0;
     for (unsigned y = 0; y < rows; ++y) for (unsigned x = 0; x < cols; ++x, ++cIndex) {
       if (x == 0 || x == cols - 1 || y == 0 || y == rows - 1) cells[cIndex].edgeCell = 1;
-      #if ESP32
+      #if defined(ARDUINO_ARCH_ESP32)
         if (esp_random() < chance) grid.setCell(cIndex, x, y, true, wrap); // ~32% chance of being alive
       #else
         if (random16(100) < 32) grid.setCell(cIndex, x, y, true, wrap);
@@ -5382,7 +5386,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
   if (palChanged || paused || (SEGMENT.speed != 255 && strip.now - SEGENV.step < 1000 / map2(SEGMENT.speed,0,254,1,60))) { //(1 - 60) updates/sec 255 is uncapped
     // Redraw if paused (remove blur), palette changed, overlaying background if not max speed (avoid flicker) 
     // Generation 1 draws alive cells randomly and fades dead cells
-    bool newGame  = generation == 1;
+    bool newGame = generation == 1;
     if (paused || palChanged || overlayBG) {
       unsigned cIndex = 0;
       for (unsigned y = 0; y < rows; ++y) for (unsigned x = 0; x < cols; ++x, ++cIndex) {

From 81facea82f11c27e0d748793e555267da94d34f2 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 14 Nov 2024 14:14:36 +0100
Subject: [PATCH 173/232] color_fade small improvement

avoids over-blending, and gives a tiny speedup.
---
 wled00/colors.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wled00/colors.cpp b/wled00/colors.cpp
index fd8febfd..4aa7afbb 100644
--- a/wled00/colors.cpp
+++ b/wled00/colors.cpp
@@ -8,8 +8,7 @@
  * color blend function
  */
 IRAM_ATTR_YN __attribute__((hot)) uint32_t color_blend(uint32_t color1, uint32_t color2, uint_fast16_t blend, bool b16) {
-  if(blend == 0)   return color1;
-  if (color1 == color2) return color1;  // WLEDMM shortcut
+  if ((color1 == color2) || (blend == 0)) return color1; // WLEDMM
   const uint_fast16_t blendmax = b16 ? 0xFFFF : 0xFF;
   if(blend >= blendmax) return color2;
   const uint_fast8_t shift = b16 ? 16 : 8;
@@ -73,6 +72,7 @@ IRAM_ATTR_YN uint32_t color_add(uint32_t c1, uint32_t c2, bool fast)   // WLEDMM
 
 IRAM_ATTR_YN __attribute__((hot)) uint32_t color_fade(uint32_t c1, uint8_t amount, bool video)
 {
+  if (amount == 255) return c1; // WLEDMM small optimization - plus it avoids over-fading in "video" mode
   if (amount == 0) return 0; // WLEDMM shortcut
 
   uint32_t scaledcolor; // color order is: W R G B from MSB to LSB

From 776718b73454f3a084be4c31efb44911a793260d Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 14 Nov 2024 18:30:43 +0100
Subject: [PATCH 174/232] 2D drift improvements for large panel sizes

speedup, accuracy improvements and enhancements:
* separated calculations in float from integer
* improved time resolution
* slow down effect on for dimensions >32
* added original "twin" option
* added customizable blur (thanks dedehai)
---
 wled00/FX.cpp | 43 +++++++++++++++++++++++++++++++------------
 wled00/wled.h |  2 +-
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 08699dc3..fa66eda5 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5137,6 +5137,7 @@ static const char _data_FX_MODE_2DDNASPIRAL[] PROGMEM = "DNA Spiral@Scroll speed
 //     2D Drift        //
 /////////////////////////
 uint16_t mode_2DDrift() {              // By: Stepko   https://editor.soulmatelights.com/gallery/884-drift , Modified by: Andrew Tuline
+                                       // optimized for large panels by @softhack007
   if (!strip.isMatrix) return mode_static(); // not a 2D set-up
 
   const uint16_t cols = SEGMENT.virtualWidth();
@@ -5147,22 +5148,40 @@ uint16_t mode_2DDrift() {              // By: Stepko   https://editor.soulmateli
     SEGMENT.fill(BLACK);
   }
 
-  SEGMENT.fadeToBlackBy(128);
+  if (SEGMENT.intensity > 1) SEGMENT.fadeToBlackBy(128);
+  else SEGMENT.fill(BLACK);  // WLEDMM fill is faster than fade
+  const float maxDim = max(cols, rows)/2.0f;
 
-  const uint16_t maxDim = MAX(cols, rows)/2;
-  unsigned long t = strip.now / (32 - (SEGMENT.speed>>3));
-  unsigned long t_20 = t/20; // softhack007: pre-calculating this gives about 10% speedup
-  for (float i = 1; i < maxDim; i += 0.25) {
-    float angle = radians(t * (maxDim - i));
-    uint16_t myX = (cols>>1) + (uint16_t)(sinf(angle) * i) + (cols%2);
-    uint16_t myY = (rows>>1) + (uint16_t)(cosf(angle) * i) + (rows%2);
-    SEGMENT.setPixelColorXY(myX, myY, ColorFromPalette(SEGPALETTE, (i * 20) + t_20, 255, LINEARBLEND));
+  // WLEDMM calculate timebase in float, so we don't need to worry about rounding
+  const float strip_now = strip.now & 0x003FFFFF; // float can exactly represent numbers up to 22bit
+  float t;
+  if (maxDim < 6.0f)        t = strip_now / float(16U - (SEGMENT.speed>>4));  // up to 12 (faster)
+  else if (maxDim <= 16.0f) t = strip_now / float(32U - (SEGMENT.speed>>3));  // 12..32 (standard)
+  else if (maxDim <= 32.0f) t = strip_now / float(64U - (SEGMENT.speed>>2));  // 32..64  (slower)
+  else                      t = strip_now / float(256U -  SEGMENT.speed);     // above 64 (slowest)
+
+  // WLEDMM pre-calculate some values to speed up the main loop
+  const int colsCenter = (cols >> 1) + (cols % 2);
+  const int rowsCenter = (rows >> 1) + (rows % 2);
+  unsigned t_20 = t/20.0f; // softhack007: pre-calculating this gives about 10% speedup
+  const float step = (maxDim < 6.0f) ? 0.52f : (maxDim > 24.0f) ? 0.16666666f : 0.25f;  // WLEDMM more detail on larger panels
+
+  for (float i = 1.0f; i <= maxDim; i += step) {
+    unsigned i_20 = i * 20.0f;
+    float t_maxdim = t * (maxDim - i);
+    float angle = float(DEG_TO_RAD) * t_maxdim;
+    int mySin = sinf(angle) * i;
+    int myCos = cosf(angle) * i;
+
+    if ((unsigned(colsCenter+mySin) < cols) && (unsigned(rowsCenter+myCos) < rows)) // don't draw invisible pixels
+      SEGMENT.setPixelColorXY(colsCenter+mySin, rowsCenter+myCos, ColorFromPalette(SEGPALETTE, i_20 + t_20, 255, LINEARBLEND));
+    if ((SEGMENT.check1) && (unsigned(colsCenter+myCos) < cols) && (unsigned(rowsCenter+mySin) < rows))   
+      SEGMENT.setPixelColorXY(colsCenter+myCos, rowsCenter+mySin, ColorFromPalette(SEGPALETTE, i_20 + t_20, 255, LINEARBLEND)); // twin mode
   }
-  SEGMENT.blur(SEGMENT.intensity>>3);
-
+  SEGMENT.blur(SEGMENT.intensity>>((!SEGMENT.check2) * 3), SEGMENT.check2); // user-defined blur - thanks @dedehai
   return FRAMETIME;
 } // mode_2DDrift()
-static const char _data_FX_MODE_2DDRIFT[] PROGMEM = "Drift@Rotation speed,Blur amount;;!;2";
+static const char _data_FX_MODE_2DDRIFT[] PROGMEM = "Drift@Rotation speed,Blur,,,,Twin,Smear;;!;2;ix=0";
 
 
 //////////////////////////
diff --git a/wled00/wled.h b/wled00/wled.h
index ce0cc151..0993f8c0 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2411130
+#define VERSION 2411140
 
 // WLEDMM  - you can check for this define in usermods, to only enabled WLEDMM specific code in the "right" fork. Its not defined in AC WLED.
 #define _MoonModules_WLED_

From 6ef057861362442ed5f991e4d3a69d4dcda93fe3 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 15 Nov 2024 15:14:44 +0100
Subject: [PATCH 175/232] color_blend accuracy improvements

For 8bit blends, we adopt the new blend8() logic from FastLED.

The WLED color_clend function is based on very old FastLED code, that was replaced 3 years ago due to serious rounding problems.
---
 wled00/colors.cpp | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/wled00/colors.cpp b/wled00/colors.cpp
index 4aa7afbb..701f2f1d 100644
--- a/wled00/colors.cpp
+++ b/wled00/colors.cpp
@@ -12,24 +12,33 @@ IRAM_ATTR_YN __attribute__((hot)) uint32_t color_blend(uint32_t color1, uint32_t
   const uint_fast16_t blendmax = b16 ? 0xFFFF : 0xFF;
   if(blend >= blendmax) return color2;
   const uint_fast8_t shift = b16 ? 16 : 8;
-  const uint_fast16_t blend2 = blendmax - blend; // WLEDMM pre-calculate value
 
-  uint32_t w1 = W(color1);
-  uint32_t r1 = R(color1);
-  uint32_t g1 = G(color1);
-  uint32_t b1 = B(color1);
+  uint16_t w1 = W(color1); // WLEDMM 16bit to make sure the compiler uses 32bit (not 64bit) for the math
+  uint16_t r1 = R(color1);
+  uint16_t g1 = G(color1);
+  uint16_t b1 = B(color1);
 
-  uint32_t w2 = W(color2);
-  uint32_t r2 = R(color2);
-  uint32_t g2 = G(color2);
-  uint32_t b2 = B(color2);
+  uint16_t w2 = W(color2);
+  uint16_t r2 = R(color2);
+  uint16_t g2 = G(color2);
+  uint16_t b2 = B(color2);
 
-  uint32_t w3 = ((w2 * blend) + (w1 * blend2)) >> shift;
-  uint32_t r3 = ((r2 * blend) + (r1 * blend2)) >> shift;
-  uint32_t g3 = ((g2 * blend) + (g1 * blend2)) >> shift;
-  uint32_t b3 = ((b2 * blend) + (b1 * blend2)) >> shift;
-
-  return RGBW32(r3, g3, b3, w3);
+  if (b16 == false) {
+    // WLEDMM based on fastled blend8() - better accuracy for 8bit
+    uint8_t w3 = (w1+w2 == 0) ? 0 : (((w1 << 8)|w2) + (w2 * blend) - (w1*blend) ) >> 8;
+    uint8_t r3 = (((r1 << 8)|r2) + (r2 * blend) - (r1*blend) ) >> 8;
+    uint8_t g3 = (((g1 << 8)|g2) + (g2 * blend) - (g1*blend) ) >> 8;
+    uint8_t b3 = (((b1 << 8)|b2) + (b2 * blend) - (b1*blend) ) >> 8;
+    return RGBW32(r3, g3, b3, w3);
+  } else {
+    // old code has lots of "jumps" due to roundding errors
+    const uint_fast16_t blend2 = blendmax - blend; // WLEDMM pre-calculate value
+    uint32_t w3 = ((w2 * blend) + (w1 * blend2)) >> shift;
+    uint32_t r3 = ((r2 * blend) + (r1 * blend2)) >> shift;
+    uint32_t g3 = ((g2 * blend) + (g1 * blend2)) >> shift;
+    uint32_t b3 = ((b2 * blend) + (b1 * blend2)) >> shift;
+    return RGBW32(r3, g3, b3, w3);
+  }
 }
 
 /*

From e756216eca339e4bc425b31cf39a37108d3062e8 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 15 Nov 2024 20:08:36 +0100
Subject: [PATCH 176/232] drift rose optimizations

* pre-calculate some repeated values
* added option "full expand" that zooms in on non-square panels
---
 wled00/FX.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index fa66eda5..9e62e00a 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -6668,7 +6668,13 @@ uint16_t mode_2Ddriftrose(void) {
 
   const float CX = (cols-cols%2)/2.f - .5f;
   const float CY = (rows-rows%2)/2.f - .5f;
-  const float L = min(cols, rows) / 2.f;
+
+  unsigned L2 = SEGENV.check3 ? max(cols, rows) : min(cols, rows);  // WLEDMM we use "max" to use the complete segment
+  if (SEGENV.check3 && (abs(int(cols) - int(rows)) < 4)) L2 = L2 * 1.4142f;    // WLEDMM make "expand" look a bit bigger on square panels
+  const float L = L2 / 2.f;
+  // WLEDMM pre-calculate some values
+  const uint32_t wu_cols = SEGMENT.virtualWidth()  * 256;
+  const uint32_t wu_rows = SEGMENT.virtualHeight() * 256;
 
   if (SEGENV.call == 0) {
     SEGMENT.setUpLeds();
@@ -6677,15 +6683,16 @@ uint16_t mode_2Ddriftrose(void) {
 
   SEGMENT.fadeToBlackBy(32+(SEGMENT.speed>>3));
   for (size_t i = 1; i < 37; i++) {
-    uint32_t x = (CX + (sinf(radians(i * 10)) * (beatsin8(i, 0, L*2)-L))) * 255.f;
-    uint32_t y = (CY + (cosf(radians(i * 10)) * (beatsin8(i, 0, L*2)-L))) * 255.f;
-    SEGMENT.wu_pixel(x, y, CHSV(i * 10, 255, 255));
+    float angle = float(DEG_TO_RAD) * i * 10;
+    uint32_t x = int((CX + (sinf(angle) * (beatsin8(i, 0, L2)-L))) * 255.f);
+    uint32_t y = int((CY + (cosf(angle) * (beatsin8(i, 0, L2)-L))) * 255.f);
+    if ((x < wu_cols) && (y < wu_rows)) SEGMENT.wu_pixel(x, y, CHSV(i * 10, 255, 255));
   }
   SEGMENT.blur((SEGMENT.intensity>>4)+1);
 
   return FRAMETIME;
 }
-static const char _data_FX_MODE_2DDRIFTROSE[] PROGMEM = "Drift Rose@Fade,Blur;;;2";
+static const char _data_FX_MODE_2DDRIFTROSE[] PROGMEM = "Drift Rose@Fade,Blur,,,,,,Full Expand ☾;;;2";
 
 #endif // WLED_DISABLE_2D
 

From d6dedd025d88e089f94ad7f9f7d127cfa7f526d6 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 15 Nov 2024 20:12:01 +0100
Subject: [PATCH 177/232] color_fade optimizations

* removed unnecessary conditions
* optimized bit-shifting logic
* use uint16_t for colors, to prevent the compiler from using 64bit integer
---
 wled00/colors.cpp | 30 ++++++++++++++++--------------
 wled00/wled.h     |  2 +-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/wled00/colors.cpp b/wled00/colors.cpp
index 701f2f1d..bb12b66a 100644
--- a/wled00/colors.cpp
+++ b/wled00/colors.cpp
@@ -84,25 +84,27 @@ IRAM_ATTR_YN __attribute__((hot)) uint32_t color_fade(uint32_t c1, uint8_t amoun
   if (amount == 255) return c1; // WLEDMM small optimization - plus it avoids over-fading in "video" mode
   if (amount == 0) return 0; // WLEDMM shortcut
 
-  uint32_t scaledcolor; // color order is: W R G B from MSB to LSB
-  uint32_t r = R(c1);
-  uint32_t g = G(c1);
-  uint32_t b = B(c1);
-  uint32_t w = W(c1);
+  uint32_t scaledcolor = 0; // color order is: W R G B from MSB to LSB
+  uint16_t w = W(c1);    // WLEDMM 16bit to make sure the compiler uses 32bit (not 64bit) for the math
+  uint16_t r = R(c1);
+  uint16_t g = G(c1);
+  uint16_t b = B(c1);
   if (video)  {
-    uint32_t scale = amount; // 32bit for faster calculation
-    scaledcolor = (((r * scale) >> 8) << 16) + ((r && scale) ? 1 : 0);
-    scaledcolor |= (((g * scale) >> 8) << 8) + ((g && scale) ? 1 : 0);
-    scaledcolor |= ((b * scale) >> 8) + ((b && scale) ? 1 : 0);
-    if (w>0) scaledcolor |= (((w * scale) >> 8) << 24) + ((scale) ? 1 : 0);  // WLEDMM small speedup when no white channel
+    uint16_t scale = amount; // 32bit for faster calculation
+    // bugfix: doing "+1" after shifting is obviously wrong
+    // optimization: ((r && scale) ? 1 : 0) can be simplified to "if (r > 0) +1" ; if we arive here, then scale != 0 and scale < 255
+    if (w>0) scaledcolor |= (((w * scale) >> 8) +1) << 24;  // WLEDMM small speedup when no white channel
+    if (r>0) scaledcolor |= (((r * scale) >> 8) +1) << 16;
+    if (g>0) scaledcolor |= (((g * scale) >> 8) +1) << 8;
+    if (b>0) scaledcolor |=  ((b * scale) >> 8) +1;
     return scaledcolor;
   }
   else  {
-    uint32_t scale = 1 + amount;
-    scaledcolor = ((r * scale) >> 8) << 16;
-    scaledcolor |= ((g * scale) >> 8) << 8;
-    scaledcolor |= (b * scale) >> 8;
+    uint16_t scale = 1 + amount;
     if (w>0) scaledcolor |= ((w * scale) >> 8) << 24;                              // WLEDMM small speedup when no white channel
+    scaledcolor |= ((r * scale) >> 8) << 16;
+    scaledcolor |= (g * scale) & 0x0000FF00;                                       // WLEDMM faster than right-left shift "" >>8 ) <<8"
+    scaledcolor |= (b * scale) >> 8;
     return scaledcolor;
   }
 }
diff --git a/wled00/wled.h b/wled00/wled.h
index 0993f8c0..85a9fe84 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2411140
+#define VERSION 2411150
 
 // WLEDMM  - you can check for this define in usermods, to only enabled WLEDMM specific code in the "right" fork. Its not defined in AC WLED.
 #define _MoonModules_WLED_

From 06fc1eb5b8775dbc1e530a41eb3f8ade01e940fa Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 15 Nov 2024 22:33:29 +0100
Subject: [PATCH 178/232] HUB75: use last brightness on re-init

avoids brightness flash when saving LED preferences
---
 wled00/bus_manager.cpp |  5 ++++-
 wled00/bus_manager.h   |  1 +
 wled00/wled00.ino      | 16 +++++++++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 4cd339a4..34c39f86 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -528,6 +528,7 @@ VirtualMatrixPanel*  BusHub75Matrix::activeFourScanPanel = nullptr;
 HUB75_I2S_CFG BusHub75Matrix::activeMXconfig = HUB75_I2S_CFG();
 uint8_t BusHub75Matrix::activeType = 0;
 uint8_t BusHub75Matrix::instanceCount = 0;
+uint8_t BusHub75Matrix::last_bri = 0;
 
 
 // --------------------------
@@ -899,7 +900,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   USER_PRINTLN("MatrixPanel_I2S_DMA created");
   // let's adjust default brightness
   //display->setBrightness8(25);    // range is 0-255, 0 - 0%, 255 - 100% //  [setBrightness()] Tried to set output brightness before begin()
-  _bri = 25;
+  _bri = (last_bri > 0) ? last_bri : 25;  // try to restore persistent brightness value
 
   delay(24); // experimental
   DEBUG_PRINT(F("heap usage: ")); DEBUG_PRINTLN(int(lastHeap - ESP.getFreeHeap()));
@@ -917,6 +918,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
     USER_PRINT(F("heap usage: ")); USER_PRINTLN(int(lastHeap - ESP.getFreeHeap()));
     delay(18);   // experiment - give the driver a moment (~ one full frame @ 60hz) to settle
     _valid = true;
+    display->setBrightness8(_bri);    // range is 0-255, 0 - 0%, 255 - 100% //  [setBrightness()] Tried to set output brightness before begin()
     display->clearScreen();   // initially clear the screen buffer
     USER_PRINTLN("MatrixPanel_I2S_DMA clear ok");
 
@@ -1057,6 +1059,7 @@ void BusHub75Matrix::setBrightness(uint8_t b, bool immediate) {
   MatrixPanel_I2S_DMA* display = BusHub75Matrix::activeDisplay;
   // if (_bri > 238) _bri=238; // not strictly needed. Enable this line if you see glitches at highest brightness.
   if ((_bri > 253) && (activeMXconfig.latch_blanking < 2)) _bri=253; // prevent glitches at highest brightness.
+  last_bri = _bri;
   if (display) display->setBrightness(_bri);
 }
 
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 9259bd1f..339b1ef8 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -411,6 +411,7 @@ class BusHub75Matrix : public Bus {
     static HUB75_I2S_CFG activeMXconfig;               // last used mxconfig
     static uint8_t activeType;                         // last used type
     static uint8_t instanceCount;                      // active instances - 0 or 1
+    static uint8_t last_bri;                           // last used brightness value (persists on driver delete)
 };
 #endif
 
diff --git a/wled00/wled00.ino b/wled00/wled00.ino
index 6f1f22d5..ff80af21 100644
--- a/wled00/wled00.ino
+++ b/wled00/wled00.ino
@@ -61,6 +61,11 @@ void esp_heap_trace_free_hook(void* ptr)
 unsigned long lastMillis = 0; //WLEDMM
 unsigned long loopCounter = 0; //WLEDMM
 
+unsigned long lps = 0; // loops per second
+unsigned long lps2 = 0; // lps without "show"
+
+unsigned long long showtime = 0; // time spent in "show" (micros)
+
 void setup() __attribute__((used)); // needed for -flto
 void setup() {
   #ifdef WLED_DEBUG_HEAP
@@ -73,13 +78,22 @@ void loop() __attribute__((used)); // needed for -flto
 void loop() {
   //WLEDMM show loops per second
   loopCounter++;
-  if (millis() - lastMillis >= 10000) {
+  //if (millis() - lastMillis >= 10000) {
+  if (millis() - lastMillis >= 8000) {
     long delta = millis() - lastMillis;
     if (delta > 0) {
+      lps = (loopCounter*1000U) / delta;
       //USER_PRINTF("%lu lps\n",(loopCounter*1000U) / delta);
+      if (delta > (showtime / 1000)) lps2 = (loopCounter*1000U) / (delta - (showtime / 1000));
+      USER_PRINTF("%lu lps\t", lps);
+      USER_PRINTF("%u fps\t", strip.getFps());
+      USER_PRINTF("%lu lps without show\t\t", lps2);
+      USER_PRINTF("frametime %d\t", int(strip.getFrameTime()));
+      USER_PRINTF("targetFPS %d\n", int(strip.getTargetFps()));
     }
     lastMillis = millis();
     loopCounter = 0;
+    showtime = 0;
   }
 
   WLED::instance().loop();

From db1db330afa0b19a69596b3a2517ab03672008be Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 15 Nov 2024 23:33:57 +0100
Subject: [PATCH 179/232] HUB75: bugfix for 4-scan (virtual) panels chain

module cols parameter must be chain_length
---
 wled00/bus_manager.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 34c39f86..57670b26 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -636,7 +636,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
       mxconfig.mx_width = 64;
       mxconfig.mx_height = 64;
       break;
-    case 104: // untested
+    case 104:
       mxconfig.mx_width = 128;
       mxconfig.mx_height = 64;
       break;
@@ -952,25 +952,25 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   switch(bc.type) {
     case 105:
       USER_PRINTLN("MatrixPanel_I2S_DMA FOUR_SCAN_32PX_HIGH - 32x32");
-      if (!fourScanPanel) fourScanPanel = new VirtualMatrixPanel((*display), 1, 1, 32, 32);
+      if (!fourScanPanel) fourScanPanel = new VirtualMatrixPanel((*display), 1, mxconfig.chain_length, 32, 32);
       fourScanPanel->setPhysicalPanelScanRate(FOUR_SCAN_32PX_HIGH);
       fourScanPanel->setRotation(0);
       break;
     case 106:
       USER_PRINTLN("MatrixPanel_I2S_DMA FOUR_SCAN_32PX_HIGH - 64x32");
-      if (!fourScanPanel) fourScanPanel = new VirtualMatrixPanel((*display), 1, 1, 64, 32);
+      if (!fourScanPanel) fourScanPanel = new VirtualMatrixPanel((*display), 1, mxconfig.chain_length, 64, 32);
       fourScanPanel->setPhysicalPanelScanRate(FOUR_SCAN_32PX_HIGH);
       fourScanPanel->setRotation(0);
       break;
     case 107:
       USER_PRINTLN("MatrixPanel_I2S_DMA FOUR_SCAN_64PX_HIGH");
-      if (!fourScanPanel) fourScanPanel = new VirtualMatrixPanel((*display), 1, 1, 64, 64);
+      if (!fourScanPanel) fourScanPanel = new VirtualMatrixPanel((*display), 1, mxconfig.chain_length, 64, 64);
       fourScanPanel->setPhysicalPanelScanRate(FOUR_SCAN_64PX_HIGH);
       fourScanPanel->setRotation(0);
       break;
     case 108: // untested
       USER_PRINTLN("MatrixPanel_I2S_DMA 128x64 FOUR_SCAN_64PX_HIGH");
-      if (!fourScanPanel) fourScanPanel = new VirtualMatrixPanel((*display), 1, 1, 128, 64);
+      if (!fourScanPanel) fourScanPanel = new VirtualMatrixPanel((*display), 1, mxconfig.chain_length, 128, 64);
       fourScanPanel->setPhysicalPanelScanRate(FOUR_SCAN_64PX_HIGH);
       fourScanPanel->setRotation(0);
       break;

From 7167db4a22b94510bc372444d82a3de558a8d34b Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 16 Nov 2024 01:43:18 +0100
Subject: [PATCH 180/232] Polar Lights upgrade

* stop flickering when rows > 56
* blur option added
* allow to use palettes
---
 wled00/FX.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 9e62e00a..bdb350b1 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5972,9 +5972,11 @@ uint16_t mode_2DPolarLights(void) {        // By: Kostyantyn Matviyevskyy  https
   const uint16_t cols = SEGMENT.virtualWidth();
   const uint16_t rows = SEGMENT.virtualHeight();
   const float maxRows  = (rows <= 32) ? 32.0f : (rows <= 64) ? 64.0f : 128.0f;  // WLEDMM safe up to 128x128
-  const float minScale = (rows <= 32) ? 12.0f : (rows <= 64) ? 4.6f : 2.1f;     // WLEDMM
+  const float minScale = (rows <= 32) ? 12.0f : (rows <= 64) ? 7.2f : 4.6f;     // WLEDMM
+  const float maxCols  = (cols <= 32) ? 32.0f : (cols <= 64) ? 64.0f : 128.0f;  // WLEDMM safe up to 128x128
 
   const CRGBPalette16 auroraPalette  = {0x000000, 0x003300, 0x006600, 0x009900, 0x00cc00, 0x00ff00, 0x33ff00, 0x66ff00, 0x99ff00, 0xccff00, 0xffff00, 0xffcc00, 0xff9900, 0xff6600, 0xff3300, 0xff0000};
+  const CRGBPalette16 &effectPalette = SEGENV.check1 ? SEGPALETTE : auroraPalette;
 
   if (SEGENV.call == 0) {
     SEGMENT.setUpLeds();
@@ -5982,7 +5984,7 @@ uint16_t mode_2DPolarLights(void) {        // By: Kostyantyn Matviyevskyy  https
   }
 
   float adjustHeight = mapf(rows, 8, maxRows, 28, minScale); // maybe use mapf() ??? // WLEDMM yes!  
-  uint16_t adjScale = map2(cols, 8, 64, 310, 63);
+  uint16_t adjScale = map2(cols, 8, maxCols, 310, 63);       // WLEDMM
 
   adjustHeight = max(min(adjustHeight, 28.0f), minScale);     // WLEDMM bugfix for larger fixtures
   adjScale = max(min(adjScale, uint16_t(310)), uint16_t(63)); // WLEDMM
@@ -6002,11 +6004,11 @@ uint16_t mode_2DPolarLights(void) {        // By: Kostyantyn Matviyevskyy  https
   }
 */
   uint16_t _scale = map2(SEGMENT.intensity, 0, 255, 30, adjScale);
-  byte _speed = map2(SEGMENT.speed, 0, 255, 128, 16);
+  byte _speed = map2(SEGMENT.speed, 0, 255, 136, 20);
 
   //WLEDMM add SuperSync control
   uint16_t xStart, xEnd, yStart, yEnd;
-  if (SEGMENT.check1) { //Master (sync on needs to show the whole effect, children only their first panel)
+  if (SEGMENT.check2) { //Master (sync on needs to show the whole effect, children only their first panel)
     xStart = strip.panel[0].xOffset;
     xEnd = strip.panel[0].xOffset + strip.panel[0].width;
     yStart = strip.panel[0].yOffset;
@@ -6024,16 +6026,17 @@ uint16_t mode_2DPolarLights(void) {        // By: Kostyantyn Matviyevskyy  https
   for (int x = xStart; x < xEnd; x++) {
     for (int y = yStart; y < yEnd; y++) {
     SEGENV.step++;
-    SEGMENT.setPixelColorXY(x, y, ColorFromPalette(auroraPalette,
+    SEGMENT.setPixelColorXY(x, y, ColorFromPalette(effectPalette,
                                     qsub8(
                                       inoise8((SEGENV.step%2) + x * _scale, y * 16 + SEGENV.step % 16, SEGENV.step / _speed),
                                       fabsf(rows_2 - (float)y) * adjustHeight)));  // WLEDMM
     }
   }
 
+  if (SEGENV.check3) SEGMENT.blurRows(192);
   return FRAMETIME;
 } // mode_2DPolarLights()
-static const char _data_FX_MODE_2DPOLARLIGHTS[] PROGMEM = "Polar Lights@!,Scale,,,,SuperSync;;;2";
+static const char _data_FX_MODE_2DPOLARLIGHTS[] PROGMEM = "Polar Lights@!,Scale,,,,Use Palette,SuperSync, Blur;;!;2";
 
 
 /////////////////////////

From 52509bab0f0a05defd27f7e2dba3b6ca33c886d0 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 16 Nov 2024 18:13:15 +0100
Subject: [PATCH 181/232] OTA update improved error  messages

The OTA update class can deliver an error message.

old: "Please check your file and retry"
new: "Could Not Activate The Firmware. (wrong board type?). Please check your file and retry!"
---
 wled00/wled_server.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/wled00/wled_server.cpp b/wled00/wled_server.cpp
index f3fe1c08..6bd577d7 100644
--- a/wled00/wled_server.cpp
+++ b/wled00/wled_server.cpp
@@ -329,7 +329,15 @@ void initServer()
       return;
     }
     if (Update.hasError() || otaLock) {
+#ifdef ARDUINO_ARCH_ESP32
+      if (Update.hasError()) {
+        String updErr = Update.getError() == UPDATE_ERROR_ACTIVATE ? String("Could Not Activate The Firmware. (wrong board type?)") : String(Update.errorString());
+        serveMessage(request, 500, F("Update failed!"), updErr + String("<br>Please check your file and retry!"), 254);
+      } else
+        serveMessage(request, 500, F("Update failed!"), F("Please check your file and retry! (OTA may be locked)"), 254);
+#else
       serveMessage(request, 500, F("Update failed!"), F("Please check your file and retry!"), 254);
+#endif
     } else {
       serveMessage(request, 200, F("Update successful!"), F("Rebooting..."), 131);
       doReboot = true;

From 8a0660c130c9a2d570647c82e0d49a370abe4ebb Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Sat, 16 Nov 2024 12:59:39 -0500
Subject: [PATCH 182/232] GoL - 1 Byte version

Removed future status/neighbors. Uses 2 loops to set cells. Shifting from future to current no longer needed.
---
 wled00/FX.cpp | 183 +++++++++++++++++++++++++-------------------------
 1 file changed, 91 insertions(+), 92 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index cb0f7b25..644b56d6 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5250,8 +5250,7 @@ static const char _data_FX_MODE_2DFRIZZLES[] PROGMEM = "Frizzles@X frequency,Y f
 //   2D Cellular Automata Game of Life   //
 ///////////////////////////////////////////
 typedef struct Cell {
-    uint8_t currentStatus : 1, currentNeighborCount : 4, oscillatorCheck : 1, spaceshipCheck : 1,    unused : 1; // current data + repeated detection
-    uint8_t  futureStatus : 1,  futureNeighborCount : 4,        edgeCell : 1,      superDead : 1,  hasColor : 1; // future data  + opimizations
+    uint8_t alive : 1, neighbors : 3, toggleStatus : 1, superDead : 1, oscillatorCheck : 1, spaceshipCheck : 1;
 } Cell;
 
 class GameOfLifeGrid {
@@ -5264,8 +5263,8 @@ class GameOfLifeGrid {
   public:
     GameOfLifeGrid(Cell* data, int c, int r) : cells(data), cols(c), rows(r), maxIndex(r * c) {}
     void getNeighborIndexes(unsigned neighbors[9], unsigned cIndex, unsigned x, unsigned y, bool wrap) {
-      bool edgeCell = cells[cIndex].edgeCell;
       unsigned neighborCount = 0;
+      bool edgeCell = x == 0 || x == cols-1 || y == 0 || y == rows-1;
       for (unsigned i = 0; i < 8; ++i) {
         unsigned nIndex = cIndex + nOffsets[i];
         if (edgeCell) {
@@ -5286,37 +5285,30 @@ class GameOfLifeGrid {
     }
     void setCell(unsigned cIndex, unsigned x, unsigned y, bool alive, bool wrap) {
       Cell* cell = &cells[cIndex];
-      cell->futureStatus = alive;
-      if (alive == cell->currentStatus) return; // No change
+      if (alive == cell->alive) return; // No change
+      cell->alive = alive;
       unsigned neighbors[9];
       getNeighborIndexes(neighbors, cIndex, x, y, wrap);
       int val = alive ? 1 : -1;
-      for (unsigned i = 1; i <= neighbors[0]; ++i) cells[neighbors[i]].futureNeighborCount += val;
+      for (unsigned i = 1; i <= neighbors[0]; ++i) cells[neighbors[i]].neighbors += val;
     }
     void recalculateEdgeNeighbors(bool wrap) {
       unsigned cIndex = 0;
       for (unsigned y = 0; y < rows; ++y) for (unsigned x = 0; x < cols; ++x, ++cIndex) {
         Cell* cell = &cells[cIndex];
-        if (cell->edgeCell) {
-          cell->futureNeighborCount  = 0;
-          cell->currentNeighborCount = 0;
+        if (x == 0 || x == cols - 1 || y == 0 || y == rows - 1) {
+          cell->neighbors = 0;
           cell->superDead = 0;
 
           unsigned neighbors[9];
           getNeighborIndexes(neighbors, cIndex, x, y, wrap);
 
           for (unsigned i = 1; i <= neighbors[0]; ++i) {
-            if (cells[neighbors[i]].currentStatus) { ++cell->futureNeighborCount; ++cell->currentNeighborCount; }
+            if (cells[neighbors[i]].alive) ++cell->neighbors;
           }
         }
       }
     }
-    void shiftFutureToCurrent() {
-      for (unsigned i = 0; i < maxIndex; ++i) {
-        cells[i].currentStatus        = cells[i].futureStatus;
-        cells[i].currentNeighborCount = cells[i].futureNeighborCount;
-      }
-    }
 };
 
 uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https://natureofcode.com/book/chapter-7-cellular-automata/ 
@@ -5326,15 +5318,14 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
   const uint16_t cols = SEGMENT.virtualWidth();
   const uint16_t rows = SEGMENT.virtualHeight();
   const size_t dataSize  = SEGMENT.length() * sizeof(Cell); // Cell = 2 bytes
-  const size_t totalSize = dataSize + 7; // 7 bytes for prevRows(2), prevCols(2), prevPalette, prevWrap, soloGlider
+  const size_t totalSize = dataSize + 6; // 6 bytes for prevRows(2), prevCols(2), prevPalette, prevWrap
 
   if (!SEGENV.allocateData(totalSize)) return mode_static(); //allocation failed
-  uint16_t *prevRows    = reinterpret_cast<uint16_t*>(SEGENV.data);
-  uint16_t *prevCols    = reinterpret_cast<uint16_t*>(SEGENV.data + 2);
-  uint8_t  *prevPalette = reinterpret_cast<uint8_t*> (SEGENV.data + 4);
-  bool     *prevWrap    = reinterpret_cast<bool*>    (SEGENV.data + 5);
-  bool     *soloGlider  = reinterpret_cast<bool*>    (SEGENV.data + 6);
-  Cell     *cells       = reinterpret_cast<Cell*>    (SEGENV.data + 7);
+  uint16_t *prevRows   = reinterpret_cast<uint16_t*>(SEGENV.data);
+  uint16_t *prevCols   = reinterpret_cast<uint16_t*>(SEGENV.data + 2);
+  uint8_t *prevPalette = reinterpret_cast<uint8_t*> (SEGENV.data + 4);
+  bool    *prevWrap    = reinterpret_cast<bool*>    (SEGENV.data + 5);
+  Cell    *cells       = reinterpret_cast<Cell*>    (SEGENV.data + 6);
 
   uint16_t& generation   = SEGENV.aux0; //Rename SEGENV/SEGMENT variables for readability
   uint16_t& gliderLength = SEGENV.aux1;
@@ -5382,20 +5373,20 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
     //Setup Grid
     memset(cells, 0, dataSize);
     random16_set_seed(strip.now>>2); //seed the random generator
-    #if defined(ARDUINO_ARCH_ESP32)
-      const uint32_t chance = UINT32_MAX * 0.32;
-    #endif
     unsigned cIndex = 0;
     for (unsigned y = 0; y < rows; ++y) for (unsigned x = 0; x < cols; ++x, ++cIndex) {
-      if (x == 0 || x == cols - 1 || y == 0 || y == rows - 1) cells[cIndex].edgeCell = 1;
       #if defined(ARDUINO_ARCH_ESP32)
-        if (esp_random() < chance) grid.setCell(cIndex, x, y, true, wrap); // ~32% chance of being alive
+        bool setAlive = esp_random() < 1374389534; // ~32%
       #else
-        if (random16(100) < 32) grid.setCell(cIndex, x, y, true, wrap);
+        bool setAlive = random16(100) < 32;
       #endif
-      else { cells[cIndex].hasColor = 1; cells[cIndex].superDead = 1; }
+      if (setAlive) {
+        grid.setCell(cIndex, x, y, true, wrap);
+        cells[cIndex].toggleStatus = 1; // Used to set initial color
+      }
+      else cells[cIndex].superDead = 1;
+      
     }
-    grid.shiftFutureToCurrent(); // Shift future states to current states
   }
 
   bool palChanged = SEGMENT.palette != *prevPalette && !allColors;
@@ -5411,101 +5402,109 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
       for (unsigned y = 0; y < rows; ++y) for (unsigned x = 0; x < cols; ++x, ++cIndex) {
         Cell& cell = cells[cIndex];
         if (!newGame && cell.superDead) continue; // Skip super dead cells unless new game
-        bool alive = cell.currentStatus;
-        uint32_t cellColor = SEGMENT.getPixelColorXY(x,y);
-        if (alive) {
-          if ((!cell.hasColor && !random(10)) || palChanged) {
+        bool needsColor = (newGame && cell.toggleStatus);
+        if (cell.alive) {
+          if ((needsColor && !random(10)) || palChanged) {
+            cell.toggleStatus = 0;
             uint32_t randomColor = allColors ? random16() * random16() : SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0);
-            SEGMENT.setPixelColorXY(x,y, randomColor);                                          // Palette changed or needs initial color
-            cells[cIndex].hasColor = 1;
+            SEGMENT.setPixelColorXY(x,y, randomColor);                                                   // Palette changed or needs initial color
           }
-          else if (overlayBG && cell.hasColor) SEGMENT.setPixelColorXY(x,y, cellColor);         // Redraw alive cells for overlayBG
+          else if (overlayBG && !needsColor) SEGMENT.setPixelColorXY(x,y, SEGMENT.getPixelColorXY(x,y)); // Redraw alive cells for overlayBG
         } // Dead
         else if (paused && !overlayBG) {
+          uint32_t cellColor = SEGMENT.getPixelColorXY(x,y);
           uint32_t blended = color_blend(cellColor, bgColor, bgBlendMode ? 16 : blur);
           if (blended == cellColor) blended = bgColor; // color_blend fix
-          if ((bgBlendMode && newGame) || !bgBlendMode) SEGMENT.setPixelColorXY(x, y, blended); // Blur dead cells when paused
+          if ((bgBlendMode && newGame) || !bgBlendMode) SEGMENT.setPixelColorXY(x, y, blended);          // Blur dead cells when paused
         }
       }
     }
     return FRAMETIME;
   }
 
-  uint32_t color = allColors ? random16() * random16() : SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0); // Backup color
-  if (generation <= 8) blur = 255 - (((generation-1) * (255 - blur)) >> 3); // Ramp up blur for first 8 generations
-
-  //Update Game of Life
-  bool disableWrap = !wrap || generation % 1500 == 0 || *soloGlider; // Disable wrap every 1500 generations to prevent undetected repeats
-  if (*prevWrap != !disableWrap) { grid.recalculateEdgeNeighbors(!disableWrap); *prevWrap = !disableWrap; }
   // Repeat detection
   unsigned aliveCount = 0; // Detects empty grids and solo gliders (for smaller grids)
   bool updateOscillator = generation % 16 == 0;
   bool updateSpaceship  = gliderLength && generation % gliderLength == 0;
   bool repeatingOscillator = true, repeatingSpaceship = true;
 
-  //Loop through all cells. Apply rules, setPixel
+  // First Loop: Applies rules, sets toggleStatus, detects repeating patterns
+  // Does not update cells yet to prevent neighbor counts from changing mid-loop
+  int maxIndex = rows * cols;
+  for (unsigned i = 0; i < maxIndex; ++i) {
+    Cell& cell = cells[i];
+
+    if (cell.alive) ++aliveCount;
+    if (repeatingOscillator && cell.oscillatorCheck != cell.alive) repeatingOscillator = false;
+    if (repeatingSpaceship  && cell.spaceshipCheck  != cell.alive) repeatingSpaceship  = false;
+    if (updateOscillator) cell.oscillatorCheck = cell.alive;
+    if (updateSpaceship)  cell.spaceshipCheck  = cell.alive;
+    
+    if       (cell.alive && (cell.neighbors < 2 || cell.neighbors > 3)) cell.toggleStatus = 1;  // Loneliness or Overpopulation
+    else if (!cell.alive && cell.neighbors == 3) { cell.toggleStatus = 1; cell.superDead = 0; } // Reproduction
+    else      cell.toggleStatus = 0;                                                            // No change
+  }
+
+  uint32_t color = allColors ? random16() * random16() : SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0); // Backup color
+  if (generation <= 8) blur = 255 - (((generation-1) * (255 - blur)) >> 3); // Ramp up blur for first 8 generations
+
+  bool disableWrap = !wrap || generation % 1500 == 0 || aliveCount == 5; // Disable wrap every 1500 generations to prevent undetected repeats
+  if (*prevWrap != !disableWrap) { grid.recalculateEdgeNeighbors(!disableWrap); *prevWrap = !disableWrap; }
+
+  // Second Loop: Updates cells, sets colors, and detects super dead cells
   unsigned cIndex = 0;
   for (unsigned y = 0; y < rows; ++y) for (unsigned x = 0; x < cols; ++x, ++cIndex) {
     Cell& cell = cells[cIndex];
-    if (repeatingOscillator && cell.oscillatorCheck != cell.currentStatus) repeatingOscillator = false;
-    if (repeatingSpaceship  && cell.spaceshipCheck  != cell.currentStatus) repeatingSpaceship  = false;
-    if (updateOscillator) cell.oscillatorCheck = cell.currentStatus;
-    if (updateSpaceship)  cell.spaceshipCheck  = cell.currentStatus;
+    if (cell.superDead) continue; // Skip super dead cells (bgColor dead cells)
 
-    unsigned neighbors = cell.currentNeighborCount;
-    if (cell.superDead && neighbors != 3) continue; // Skip super dead cells (bgColor dead cells)
-
-    bool     cellValue = cell.currentStatus;
     uint32_t cellColor = SEGMENT.getPixelColorXY(x, y);
-    
-    if (cellValue) {
-      ++aliveCount;
-      if (cellColor != bgColor) color = cellColor; // Update last seen color
-      if (neighbors < 2 || neighbors > 3) {
-        // Loneliness or Overpopulation
+
+    if (cell.toggleStatus) {
+      if (cell.alive) { // Dies
         grid.setCell(cIndex, x, y, false, !disableWrap);
+        if (cellColor != bgColor) color = cellColor;
         if (!overlayBG) SEGMENT.setPixelColorXY(x,y, blur == 255 ? bgColor : color_blend(cellColor, bgColor, blur));
         if (blur == 255) cell.superDead = 1;
       }
-      else SEGMENT.setPixelColorXY(x, y, cellColor == bgColor ? color : cellColor); // Redraw alive
-    }
-    else if (neighbors == 3 && !cellValue) {
-      // Reproduction
-      grid.setCell(cIndex, x, y, true, !disableWrap);
-      cell.superDead = 0;
-      uint32_t birthColor = color;
-      if (random8() < SEGMENT.intensity) birthColor = allColors ? random16() * random16() : SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0);
-      else {
-        // Get Colors
-        uint32_t nColors[8];
-        unsigned colorCount = 0;
-        unsigned neighbors[9];
-        grid.getNeighborIndexes(neighbors, cIndex, x, y, !disableWrap);
+      else { // Reproduction
+        grid.setCell(cIndex, x, y, true, !disableWrap);
+        uint32_t birthColor = color;
+        if (random8() < SEGMENT.intensity) birthColor = allColors ? random16() * random16() : SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0);
+        else {
+          // Get Colors
+          uint32_t nColors[8];
+          unsigned colorCount = 0;
+          unsigned neighbors[9];
+          grid.getNeighborIndexes(neighbors, cIndex, x, y, !disableWrap);
 
-        for (unsigned i = 1; i <= neighbors[0]; ++i) {
-          unsigned nIndex = neighbors[i];
-          if (cells[nIndex].futureStatus) {
-            uint32_t nColor = SEGMENT.getPixelColorXY(nIndex % cols, nIndex / cols);
-            if (nColor == bgColor) continue;
-            nColors[colorCount++] = nColor;
-          }
-        }    
-        if (colorCount) { birthColor = nColors[random8(colorCount)]; color = birthColor; }
+          for (unsigned i = 1; i <= neighbors[0]; ++i) {
+            unsigned nIndex = neighbors[i];
+            if (cells[nIndex].alive) {
+              uint32_t nColor = SEGMENT.getPixelColorXY(nIndex % cols, nIndex / cols);
+              if (nColor == bgColor) continue;
+              nColors[colorCount++] = nColor;
+            }
+          }    
+          if (colorCount) { birthColor = nColors[random8(colorCount)]; color = birthColor; }
+        }
+        SEGMENT.setPixelColorXY(x,y, birthColor);
       }
-      SEGMENT.setPixelColorXY(x,y, birthColor);
     }
-    else { // Already dead
-      if (blur != 255 && !overlayBG && !bgBlendMode) {
-        uint32_t blended = color_blend(cellColor, bgColor, blur); // color_blend doesn't always converge to bgColor (this fix needed for fast fps with custom bgColor)
-        if (blended == cellColor) { blended = bgColor; cell.superDead = 1; }
-        SEGMENT.setPixelColorXY(x, y, blended);
+    else { // No change in status
+      if (cell.alive) {
+        if (cellColor == bgColor) cellColor = color; else color = cellColor;
+        SEGMENT.setPixelColorXY(x, y, cellColor); // Redraw alive cells
+      }
+      else { // Blur dead
+        if (blur != 255 && !overlayBG && !bgBlendMode) {
+          uint32_t blended = color_blend(cellColor, bgColor, blur); // color_blend doesn't always converge to bgColor (this fix needed for fast fps with custom bgColor)
+          if (blended == cellColor) { blended = bgColor; cell.superDead = 1; }
+          SEGMENT.setPixelColorXY(x, y, blended);
+        }
       }
     }
   }
 
-  grid.shiftFutureToCurrent();
-
-  if (aliveCount == 5) *soloGlider = true; else *soloGlider = false;
   if (repeatingOscillator || repeatingSpaceship || !aliveCount) {
     generation = 0;      // reset on next call
     SEGENV.step += 1000; // pause final generation for 1 second

From 3c4d71369b7e8d5fe41a5f6159a1db0efa6184f7 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 16 Nov 2024 19:13:10 +0100
Subject: [PATCH 183/232] OTA error code for WLEDMM_SAVE_FLASH

reduces program size by ~200 bytes
---
 wled00/wled_server.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/wled00/wled_server.cpp b/wled00/wled_server.cpp
index 6bd577d7..b6e786e6 100644
--- a/wled00/wled_server.cpp
+++ b/wled00/wled_server.cpp
@@ -331,7 +331,12 @@ void initServer()
     if (Update.hasError() || otaLock) {
 #ifdef ARDUINO_ARCH_ESP32
       if (Update.hasError()) {
-        String updErr = Update.getError() == UPDATE_ERROR_ACTIVATE ? String("Could Not Activate The Firmware. (wrong board type?)") : String(Update.errorString());
+        #if defined(WLEDMM_SAVE_FLASH) 
+          // not requesting the error string reduces flash size by 200 bytes
+          String updErr = Update.getError() == UPDATE_ERROR_ACTIVATE ? String("Could Not Activate The Firmware. (wrong board type?)") : String("Error ") + String(Update.getError());
+        #else
+          String updErr = Update.getError() == UPDATE_ERROR_ACTIVATE ? String("Could Not Activate The Firmware. (wrong board type?)") : String(Update.errorString());
+        #endif
         serveMessage(request, 500, F("Update failed!"), updErr + String("<br>Please check your file and retry!"), 254);
       } else
         serveMessage(request, 500, F("Update failed!"), F("Please check your file and retry! (OTA may be locked)"), 254);

From 5b3d85fe3ec2aa2a278e56efd69e32384e467304 Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Sat, 16 Nov 2024 15:09:33 -0500
Subject: [PATCH 184/232] GoL - bgBlendMode fix

Use superDead correctly with bgBlendMode
---
 wled00/FX.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 644b56d6..7c6433d7 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5338,7 +5338,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
 
   GameOfLifeGrid grid(cells, cols, rows);
 
-  // If rows or cols change due to mirror/transpose, edges and neighbor counts need to be recalculated. Just reset the game.
+  // If rows or cols change due to mirror/transpose, neighbor counts need to be recalculated. Just reset the game.
   bool setup = SEGENV.call == 0 || rows != *prevRows || cols != *prevCols;
 
   if (setup) {
@@ -5446,7 +5446,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
   }
 
   uint32_t color = allColors ? random16() * random16() : SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0); // Backup color
-  if (generation <= 8) blur = 255 - (((generation-1) * (255 - blur)) >> 3); // Ramp up blur for first 8 generations
+  if (generation <= 8 && !bgBlendMode) blur = 255 - (((generation-1) * (255 - blur)) >> 3); // Ramp up blur for first 8 generations
 
   bool disableWrap = !wrap || generation % 1500 == 0 || aliveCount == 5; // Disable wrap every 1500 generations to prevent undetected repeats
   if (*prevWrap != !disableWrap) { grid.recalculateEdgeNeighbors(!disableWrap); *prevWrap = !disableWrap; }
@@ -5464,7 +5464,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
         grid.setCell(cIndex, x, y, false, !disableWrap);
         if (cellColor != bgColor) color = cellColor;
         if (!overlayBG) SEGMENT.setPixelColorXY(x,y, blur == 255 ? bgColor : color_blend(cellColor, bgColor, blur));
-        if (blur == 255) cell.superDead = 1;
+        if (blur == 255 || bgBlendMode) cell.superDead = 1;
       }
       else { // Reproduction
         grid.setCell(cIndex, x, y, true, !disableWrap);

From b8f1d057db04ac5f59381d93ba685ec54e3309e2 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 16 Nov 2024 23:51:11 +0100
Subject: [PATCH 185/232] Update settings_leds.htm

bugfix: input field was not renamed back to "Off Refresh"
---
 wled00/data/settings_leds.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index b01920cf..cf634b4d 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -233,7 +233,7 @@
 					gId("dig"+n+"l").style.display = ((t > 48 && t < 64) && !(t >= 100 && t < 110)) ? "inline":"none";  // bus clock speed
 					gId("rev"+n).innerHTML = (t >= 40 && t < 48) ? "Inverted output":"Reversed (rotated 180°)";  // change reverse text for analog
 					if (t >= 100 && t < 110) gId("rev"+n).innerHTML = "Inverted clock phase";  // change "reverse" text for HUB75
-					if (t >= 100 && t < 110) gId("ref"+n).innerHTML = "Single-cycle latch blanking";  // change "off refresh" text for HUB75
+					gId("ref"+n).innerHTML = (t >= 100 && t < 110) ? "Single-cycle latch blanking":"Off Refresh";  // change "off refresh" text for HUB75
 					gId("psd"+n).innerHTML = (t >= 40 && t < 48) ? "Index:":"Start:";    // change analog start description
 				}
 			}

From 3e44b7852ee4092d689afa1fbb891a63c2f10f63 Mon Sep 17 00:00:00 2001
From: Will Miles <will@willmiles.net>
Date: Sat, 16 Nov 2024 17:10:08 -0500
Subject: [PATCH 186/232] Fix array overflow in exploding_fireworks

Attempt to allocate enough room for the "minimum" sparks; and ensure
that we never overrun the allocated array size.

Fixes #4120
---
 wled00/FX.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 7c6433d7..23d6fca9 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -3600,8 +3600,8 @@ uint16_t mode_exploding_fireworks(void)
   if (segs <= (strip.getMaxSegments() /4)) maxData *= 2; //ESP8266: 1024 if <= 4 segs ESP32: 2560 if <= 8 segs
   int maxSparks = maxData / sizeof(spark); //ESP8266: max. 21/42/85 sparks/seg, ESP32: max. 53/106/213 sparks/seg
 
-  uint16_t numSparks = min(2 + ((rows*cols) >> 1), maxSparks);
-  uint16_t dataSize = sizeof(spark) * numSparks;
+  unsigned numSparks = min(5 + ((rows*cols) >> 1), maxSparks);
+  unsigned dataSize = sizeof(spark) * numSparks;
   if (!SEGENV.allocateData(dataSize + sizeof(float))) return mode_static(); //allocation failed
   float *dying_gravity = reinterpret_cast<float*>(SEGENV.data + dataSize);
 
@@ -3652,8 +3652,9 @@ uint16_t mode_exploding_fireworks(void)
      * Explosion happens where the flare ended.
      * Size is proportional to the height.
      */
-    int nSparks = flare->pos + random8(4);
-    nSparks = constrain(nSparks, 4, numSparks);
+    unsigned nSparks = flare->pos + random8(4);
+    nSparks = std::max(nSparks, 4U);  // This is not a standard constrain; numSparks is not guaranteed to be at least 4
+    nSparks = std::min(nSparks, numSparks);
 
     // initialize sparks
     if (SEGENV.aux0 == 2) {

From b62a22e4e644a3efb3a4dbb233a6ae9c5c08f970 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Sun, 17 Nov 2024 18:26:04 -0500
Subject: [PATCH 187/232] Remove unused variable

---
 wled00/udp.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/wled00/udp.cpp b/wled00/udp.cpp
index ecd751e9..6dd01a3b 100644
--- a/wled00/udp.cpp
+++ b/wled00/udp.cpp
@@ -760,7 +760,6 @@ void sendSysInfoUDP()
 
 static       size_t sequenceNumber = 0; // this needs to be shared across all outputs
 static const byte   ART_NET_HEADER[12] PROGMEM = {0x41,0x72,0x74,0x2d,0x4e,0x65,0x74,0x00,0x00,0x50,0x00,0x0e};
-static uint_fast16_t framenumber = 0;
 
 #if defined(ARDUINO_ARCH_ESP32P4)
 extern "C" {

From db3be8580fd0202e65d527a78a9839d5d4151310 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Sun, 17 Nov 2024 18:37:03 -0500
Subject: [PATCH 188/232] Art-Net v2 code review changes

---
 wled00/data/settings_leds.htm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 0da47e63..a39629b5 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -222,6 +222,10 @@
 					gId("dig"+n+"O").style.display = (t == 82 || t == 83) ? "inline":"none";  // show Art-Net output number
 					gId("dig"+n+"L").style.display = (t == 82 || t == 83) ? "inline":"none";  // show Art-Net LEDs per output
 					gId("dig"+n+"F").style.display = (t == 82 || t == 83) ? "inline":"none";  // show Art-Net FPS limiter
+					gId("dig"+n+"W").style.display = (t == 82 || t == 83) ? "inline":"none";  // show Art-Net warnings/info box
+					d.getElementsByName("AO"+n)[0].min = (t == 82 || t == 83) ? 1 : -1; // make sure these fields do not block saving when hidden 
+					d.getElementsByName("AL"+n)[0].min = (t == 82 || t == 83) ? 1 : -1; 
+					d.getElementsByName("AF"+n)[0].min = (t == 82 || t == 83) ? 1 : -1;
 					if (gId("dig"+n+"F").style.display == "inline") {
 						total_leds = d.getElementsByName("LC"+n)[0].value;
 						outputs = d.getElementsByName("AO"+n)[0].value;
@@ -337,8 +341,6 @@
 			// update total led count
 			gId("lc").textContent = sLC;
 			gId("pc").textContent = (sLC == sPC) ? "":"(" + sPC + " physical)";
-
-			
 			// memory usage and warnings
 			gId('m0').innerHTML = memu;
 			bquot = memu / maxM * 100;

From e8d8a1c7c384f519c9f6c0651b7b0fa843e92c41 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 18 Nov 2024 11:37:01 +0100
Subject: [PATCH 189/232] esp01_1MB_S has (again) exceeded flash size limits

remove IR support, to get it back to 98% program size.
---
 platformio.ini | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 49f9da49..0b8b92ed 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1611,8 +1611,10 @@ build_flags = ${common.build_flags_esp8266} -D WLED_DISABLE_OTA
   -D WLED_RELEASE_NAME=esp01_1MB_S
   -D WLED_DISABLE_ALEXA
   -D WLED_DISABLE_HUESYNC
-  -D WLED_DISABLE_ESPNOW  ;; exceeds flash size limits
+  -D WLED_DISABLE_ESPNOW   ;; exceeds flash size limits
+  -D WLED_DISABLE_INFRARED ;; exceeds flash size limits
 lib_deps = ${esp8266.lib_deps}
+lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
 ; RAM:   [======    ]  60.6% (used 49616 bytes from 81920 bytes)
 ; Flash: [==========]  99.8% (used 890835 bytes from 892912 bytes)
 

From b1064e1cfea72cd95c42fef4f9f78cba8e142df5 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 18 Nov 2024 23:58:43 +0100
Subject: [PATCH 190/232] HUB75: use FM6124 driver for outdoor

It seems that the FM6124 driver makes some "outdoor" panels work, that previously only showed random color flicker. FM6124 is largely compatible with panels that did work with the standard driver, too.
---
 wled00/bus_manager.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index bfa198e4..e414bf61 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -653,6 +653,8 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   _needsRefresh = mxconfig.latch_blanking == 1;
   reversed = mxconfig.clkphase;
 
+  if (bc.type > 104) mxconfig.driver = HUB75_I2S_CFG::FM6124;  // use FM6124 for "outdoor" panels - workaround until we can make the driver user-configurable
+
   // How many panels we have connected, cap at sane value, prevent bad data preventing boot due to low memory
   #if defined(CONFIG_IDF_TARGET_ESP32S3) && defined(BOARD_HAS_PSRAM)        // ESP32-S3: allow up to 6 panels
   mxconfig.chain_length = max((uint8_t) 1, min(bc.pins[0], (uint8_t) 6));

From d4e95b13605da04228dfcdee9afccd23d3ce2240 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Tue, 19 Nov 2024 18:37:37 -0500
Subject: [PATCH 191/232] GoL faster random during setup

---
 wled00/FX.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 23d6fca9..093335da 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5375,18 +5375,17 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
     memset(cells, 0, dataSize);
     random16_set_seed(strip.now>>2); //seed the random generator
     unsigned cIndex = 0;
-    for (unsigned y = 0; y < rows; ++y) for (unsigned x = 0; x < cols; ++x, ++cIndex) {
+    for (unsigned y = 0; y < rows; ++y) {
       #if defined(ARDUINO_ARCH_ESP32)
-        bool setAlive = esp_random() < 1374389534; // ~32%
-      #else
-        bool setAlive = random16(100) < 32;
+        random16_add_entropy(esp_random() & 0xFFFF);
       #endif
-      if (setAlive) {
-        grid.setCell(cIndex, x, y, true, wrap);
-        cells[cIndex].toggleStatus = 1; // Used to set initial color
+      for (unsigned x = 0; x < cols; ++x, ++cIndex) {
+        if ((random16() & 0xFF) < 82) { // ~32%
+          grid.setCell(cIndex, x, y, true, wrap);
+          cells[cIndex].toggleStatus = 1; // Used to set initial color
+        }
+        else cells[cIndex].superDead = 1;
       }
-      else cells[cIndex].superDead = 1;
-      
     }
   }
 

From cfce1c3062ed557610cfa9e735cd3582312548e3 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 21 Nov 2024 18:17:06 +0100
Subject: [PATCH 192/232] 2D Drift speedup

pre-calculating the reduced angle (i.e. `angle % 360deg` ) is several times faster than letting sin and cos do the job.
---
 wled00/FX.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 093335da..ebddde41 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5171,6 +5171,10 @@ uint16_t mode_2DDrift() {              // By: Stepko   https://editor.soulmateli
     unsigned i_20 = i * 20.0f;
     float t_maxdim = t * (maxDim - i);
     float angle = float(DEG_TO_RAD) * t_maxdim;
+    // WLEDMM reduce angle to [0 ... 2*PI] - several times faster than letting sinf() do the job
+    float baseAngle = max(0.0f, floorf(angle * float(1.0 / M_TWOPI)) * float(M_TWOPI));     // multiple of 2_PI (360 deg) that's included in angle
+    angle -= baseAngle;
+
     int mySin = sinf(angle) * i;
     int myCos = cosf(angle) * i;
 

From 677e3de2e7940f112937a319ff59ed5418b2b203 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 21 Nov 2024 18:17:41 +0100
Subject: [PATCH 193/232] tiny unrelated fix

---
 wled00/FX.cpp    |   2 +-
 wled00/FX_math.h | 162 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 163 insertions(+), 1 deletion(-)
 create mode 100644 wled00/FX_math.h

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index ebddde41..2b45d37a 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -2012,7 +2012,7 @@ uint16_t mode_partyjerk() {
     speed = SEGMENT.speed * map2(SEGMENT.custom2, 0, 255, 0, 100);
   } else {
     speed = SEGMENT.speed;
-  };
+  }
 
   SEGENV.step += speed;
   counter = SEGENV.step >> 8;
diff --git a/wled00/FX_math.h b/wled00/FX_math.h
new file mode 100644
index 00000000..8fdb0611
--- /dev/null
+++ b/wled00/FX_math.h
@@ -0,0 +1,162 @@
+#if !defined(WLEDFX_MATH_H)
+
+#include <Arduino.h> //PI constant
+#include <math.h>
+
+//#define WLED_DEBUG_MATH
+#undef modd
+#define modd(x, y) ((x) - (int)((x) / (y)) * (y))
+
+// 16-bit, integer based Bhaskara I's sine approximation: 16*x*(pi - x) / (5*pi^2 - 4*x*(pi - x))
+// input is 16bit unsigned (0-65535), output is 16bit signed (-32767 to +32767)
+// optimized integer implementation by @dedehai
+inline static int16_t sin16_t(uint16_t theta) {
+  int scale = 1;
+  if (theta > 0x7FFF) {
+    theta = 0xFFFF - theta;
+    scale = -1; // second half of the sine function is negative (pi - 2*pi)
+  }
+  uint32_t precal = theta * (0x7FFF - theta);
+  uint64_t numerator = (uint64_t)precal * (4 * 0x7FFF); // 64bit required
+  int32_t denominator = 1342095361 - precal; // 1342095361 is 5 * 0x7FFF^2 / 4
+  int16_t result = numerator / denominator;
+  return result * scale;
+}
+
+inline static int16_t cos16_t(uint16_t theta) {
+  return sin16_t(theta + 16384); //cos(x) = sin(x+pi/2)
+}
+
+#if 0
+inline static uint8_t sin8_t(uint8_t theta) {
+  int32_t sin16 = sin16_t((uint16_t)theta * 257); // 255 * 257 = 0xFFFF
+  sin16 += 0x7FFF; //shift result to range 0-0xFFFF
+  //return sin16 >> 8;
+  uint32_t usin16 = sin16; // re-interpret as unsigned
+  //if (usin16 < 65408) 
+    usin16 += 127; // perform rounding (avoid overflow)
+  return min(usin16,uint32_t(0xFFFF)) >> 8; // min performs saturation, and prevents overflow
+}
+#else
+inline static uint8_t sin8_t(uint8_t theta) {
+  int32_t sin16 = sin16_t((uint16_t)theta * 257); // 255 * 257 = 0xFFFF
+  sin16 += 0x7FFF + 128; //shift result to range 0-0xFFFF, +128 for rounding
+  return min(sin16, int32_t(0xFFFF)) >> 8; // min performs saturation, and prevents overflow
+}
+#endif
+
+inline static uint8_t cos8_t(uint8_t theta) {
+  return sin8_t(theta + 64); //cos(x) = sin(x+pi/2) // note may roll over - this is no problem here
+}
+
+inline static float sin_approx(float theta)
+{
+  theta = modd(theta, float(TWO_PI)); // modulo: bring to -2pi to 2pi range
+  if(theta < 0) theta += float(M_TWOPI); // 0-2pi range
+  uint16_t scaled_theta = (uint16_t)(theta * (0xFFFF / float(M_TWOPI)));
+  int32_t result = sin16_t(scaled_theta);
+  float sin = float(result) / 0x7FFF;
+  return sin;
+}
+
+inline static float cos_approx(float theta)
+{
+  return sin_approx(theta + float(M_PI_2));
+}
+
+inline static float tan_approx(float x) {
+  float c = cos_approx(x);
+  if (c==0.0f) return 0;
+  float res = sin_approx(x) / c;
+  return res;
+}
+
+#define ATAN2_CONST_A 0.1963f
+#define ATAN2_CONST_B 0.9817f
+// atan2_t approximation, with the idea from https://gist.github.com/volkansalma/2972237?permalink_comment_id=3872525#gistcomment-3872525
+inline static float atan2_t(float y, float x) {
+  float abs_y = fabs(y);
+  float abs_x = fabs(x);
+  float r = (abs_x - abs_y) / (abs_y + abs_x + 1e-10f); // avoid division by zero by adding a small nubmer
+  float angle;
+  if(x < 0) {
+    r = -r;
+    angle = float(M_PI)/2.0f + float(M_PI)/4.f;
+  }
+  else
+    angle = float(M_PI)/2.0f - float(M_PI)/4.f;
+
+  float add = (ATAN2_CONST_A * (r * r) - ATAN2_CONST_B) * r;
+	angle += add;
+  angle = y < 0 ? -angle : angle;
+	return angle;
+}
+
+
+// fastled beatsin: 1:1 replacements to remove the use of fastled sin16()
+// Generates a 16-bit sine wave at a given BPM that oscillates within a given range. see fastled for details.
+inline static uint16_t beatsin88_t(accum88 beats_per_minute_88, uint16_t lowest = 0, uint16_t highest = 65535, uint32_t timebase = 0, uint16_t phase_offset = 0)
+{
+    uint16_t beat = beat88( beats_per_minute_88, timebase);
+    uint16_t beatsin (sin16_t( beat + phase_offset) + 32768);
+    uint16_t rangewidth = highest - lowest;
+    uint16_t scaledbeat = scale16( beatsin, rangewidth);
+    uint16_t result = lowest + scaledbeat;
+    return result;
+}
+
+// Generates a 16-bit sine wave at a given BPM that oscillates within a given range. see fastled for details.
+inline static uint16_t beatsin16_t(accum88 beats_per_minute, uint16_t lowest = 0, uint16_t highest = 65535, uint32_t timebase = 0, uint16_t phase_offset = 0)
+{
+    uint16_t beat = beat16( beats_per_minute, timebase);
+    uint16_t beatsin = (sin16_t( beat + phase_offset) + 32768);
+    uint16_t rangewidth = highest - lowest;
+    uint16_t scaledbeat = scale16( beatsin, rangewidth);
+    uint16_t result = lowest + scaledbeat;
+    return result;
+}
+
+// Generates an 8-bit sine wave at a given BPM that oscillates within a given range. see fastled for details.
+inline static uint8_t beatsin8_t(accum88 beats_per_minute, uint8_t lowest = 0, uint8_t highest = 255, uint32_t timebase = 0, uint8_t phase_offset = 0)
+{
+    uint8_t beat = beat8( beats_per_minute, timebase);
+    uint8_t beatsin = sin8_t( beat + phase_offset);
+    uint8_t rangewidth = highest - lowest;
+    uint8_t scaledbeat = scale8( beatsin, rangewidth);
+    uint8_t result = lowest + scaledbeat;
+    return result;
+}
+
+#if !defined(ColorFromPalette) // don't overwrite our own overwrite
+// 1:1 replacement of fastled function optimized for ESP, slightly faster, more accurate and uses less flash (~ -200bytes)
+static inline CRGB ColorFromPaletteWLED(const CRGBPalette16& pal, unsigned index, uint8_t brightness=255, TBlendType blendType=LINEARBLEND)
+{
+   if (blendType == LINEARBLEND_NOWRAP) {
+     index = (index*240) >> 8; // Blend range is affected by lo4 blend of values, remap to avoid wrapping
+  }
+    unsigned hi4 = byte(index) >> 4;
+    const CRGB* entry = (CRGB*)( (uint8_t*)(&(pal[0])) + (hi4 * sizeof(CRGB)));
+    unsigned red1   = entry->r;
+    unsigned green1 = entry->g;
+    unsigned blue1  = entry->b;
+    if (blendType != NOBLEND) {
+      if (hi4 == 15) entry = &(pal[0]);
+      else ++entry;
+      unsigned f2 = ((index & 0x0F) << 4) + 1; // +1 so we scale by 256 as a max value, then result can just be shifted by 8
+      unsigned f1 = (257 - f2); // f2 is 1 minimum, so this is 256 max
+      red1   = (red1 * f1 + (unsigned)entry->r * f2) >> 8;
+      green1 = (green1 * f1 + (unsigned)entry->g * f2) >> 8;
+      blue1  = (blue1 * f1 + (unsigned)entry->b * f2) >> 8;
+    }
+    if (brightness < 255) { // note: zero checking could be done to return black but that is hardly ever used so it is omitted
+      uint32_t scale = brightness + 1; // adjust for rounding (bitshift)
+      red1   = (red1 * scale) >> 8;
+      green1 = (green1 * scale) >> 8;
+      blue1  = (blue1 * scale) >> 8;
+  }
+    return CRGB(red1,green1,blue1);
+}
+#endif
+
+#define WLEDFX_MATH_H
+#endif
\ No newline at end of file

From 00b338c12aa4c9d61ff8f2a8af703b52dca9f80c Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 21 Nov 2024 18:20:23 +0100
Subject: [PATCH 194/232] Revert "tiny unrelated fix"

This reverts commit 677e3de2e7940f112937a319ff59ed5418b2b203.
---
 wled00/FX.cpp    |   2 +-
 wled00/FX_math.h | 162 -----------------------------------------------
 2 files changed, 1 insertion(+), 163 deletions(-)
 delete mode 100644 wled00/FX_math.h

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 2b45d37a..ebddde41 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -2012,7 +2012,7 @@ uint16_t mode_partyjerk() {
     speed = SEGMENT.speed * map2(SEGMENT.custom2, 0, 255, 0, 100);
   } else {
     speed = SEGMENT.speed;
-  }
+  };
 
   SEGENV.step += speed;
   counter = SEGENV.step >> 8;
diff --git a/wled00/FX_math.h b/wled00/FX_math.h
deleted file mode 100644
index 8fdb0611..00000000
--- a/wled00/FX_math.h
+++ /dev/null
@@ -1,162 +0,0 @@
-#if !defined(WLEDFX_MATH_H)
-
-#include <Arduino.h> //PI constant
-#include <math.h>
-
-//#define WLED_DEBUG_MATH
-#undef modd
-#define modd(x, y) ((x) - (int)((x) / (y)) * (y))
-
-// 16-bit, integer based Bhaskara I's sine approximation: 16*x*(pi - x) / (5*pi^2 - 4*x*(pi - x))
-// input is 16bit unsigned (0-65535), output is 16bit signed (-32767 to +32767)
-// optimized integer implementation by @dedehai
-inline static int16_t sin16_t(uint16_t theta) {
-  int scale = 1;
-  if (theta > 0x7FFF) {
-    theta = 0xFFFF - theta;
-    scale = -1; // second half of the sine function is negative (pi - 2*pi)
-  }
-  uint32_t precal = theta * (0x7FFF - theta);
-  uint64_t numerator = (uint64_t)precal * (4 * 0x7FFF); // 64bit required
-  int32_t denominator = 1342095361 - precal; // 1342095361 is 5 * 0x7FFF^2 / 4
-  int16_t result = numerator / denominator;
-  return result * scale;
-}
-
-inline static int16_t cos16_t(uint16_t theta) {
-  return sin16_t(theta + 16384); //cos(x) = sin(x+pi/2)
-}
-
-#if 0
-inline static uint8_t sin8_t(uint8_t theta) {
-  int32_t sin16 = sin16_t((uint16_t)theta * 257); // 255 * 257 = 0xFFFF
-  sin16 += 0x7FFF; //shift result to range 0-0xFFFF
-  //return sin16 >> 8;
-  uint32_t usin16 = sin16; // re-interpret as unsigned
-  //if (usin16 < 65408) 
-    usin16 += 127; // perform rounding (avoid overflow)
-  return min(usin16,uint32_t(0xFFFF)) >> 8; // min performs saturation, and prevents overflow
-}
-#else
-inline static uint8_t sin8_t(uint8_t theta) {
-  int32_t sin16 = sin16_t((uint16_t)theta * 257); // 255 * 257 = 0xFFFF
-  sin16 += 0x7FFF + 128; //shift result to range 0-0xFFFF, +128 for rounding
-  return min(sin16, int32_t(0xFFFF)) >> 8; // min performs saturation, and prevents overflow
-}
-#endif
-
-inline static uint8_t cos8_t(uint8_t theta) {
-  return sin8_t(theta + 64); //cos(x) = sin(x+pi/2) // note may roll over - this is no problem here
-}
-
-inline static float sin_approx(float theta)
-{
-  theta = modd(theta, float(TWO_PI)); // modulo: bring to -2pi to 2pi range
-  if(theta < 0) theta += float(M_TWOPI); // 0-2pi range
-  uint16_t scaled_theta = (uint16_t)(theta * (0xFFFF / float(M_TWOPI)));
-  int32_t result = sin16_t(scaled_theta);
-  float sin = float(result) / 0x7FFF;
-  return sin;
-}
-
-inline static float cos_approx(float theta)
-{
-  return sin_approx(theta + float(M_PI_2));
-}
-
-inline static float tan_approx(float x) {
-  float c = cos_approx(x);
-  if (c==0.0f) return 0;
-  float res = sin_approx(x) / c;
-  return res;
-}
-
-#define ATAN2_CONST_A 0.1963f
-#define ATAN2_CONST_B 0.9817f
-// atan2_t approximation, with the idea from https://gist.github.com/volkansalma/2972237?permalink_comment_id=3872525#gistcomment-3872525
-inline static float atan2_t(float y, float x) {
-  float abs_y = fabs(y);
-  float abs_x = fabs(x);
-  float r = (abs_x - abs_y) / (abs_y + abs_x + 1e-10f); // avoid division by zero by adding a small nubmer
-  float angle;
-  if(x < 0) {
-    r = -r;
-    angle = float(M_PI)/2.0f + float(M_PI)/4.f;
-  }
-  else
-    angle = float(M_PI)/2.0f - float(M_PI)/4.f;
-
-  float add = (ATAN2_CONST_A * (r * r) - ATAN2_CONST_B) * r;
-	angle += add;
-  angle = y < 0 ? -angle : angle;
-	return angle;
-}
-
-
-// fastled beatsin: 1:1 replacements to remove the use of fastled sin16()
-// Generates a 16-bit sine wave at a given BPM that oscillates within a given range. see fastled for details.
-inline static uint16_t beatsin88_t(accum88 beats_per_minute_88, uint16_t lowest = 0, uint16_t highest = 65535, uint32_t timebase = 0, uint16_t phase_offset = 0)
-{
-    uint16_t beat = beat88( beats_per_minute_88, timebase);
-    uint16_t beatsin (sin16_t( beat + phase_offset) + 32768);
-    uint16_t rangewidth = highest - lowest;
-    uint16_t scaledbeat = scale16( beatsin, rangewidth);
-    uint16_t result = lowest + scaledbeat;
-    return result;
-}
-
-// Generates a 16-bit sine wave at a given BPM that oscillates within a given range. see fastled for details.
-inline static uint16_t beatsin16_t(accum88 beats_per_minute, uint16_t lowest = 0, uint16_t highest = 65535, uint32_t timebase = 0, uint16_t phase_offset = 0)
-{
-    uint16_t beat = beat16( beats_per_minute, timebase);
-    uint16_t beatsin = (sin16_t( beat + phase_offset) + 32768);
-    uint16_t rangewidth = highest - lowest;
-    uint16_t scaledbeat = scale16( beatsin, rangewidth);
-    uint16_t result = lowest + scaledbeat;
-    return result;
-}
-
-// Generates an 8-bit sine wave at a given BPM that oscillates within a given range. see fastled for details.
-inline static uint8_t beatsin8_t(accum88 beats_per_minute, uint8_t lowest = 0, uint8_t highest = 255, uint32_t timebase = 0, uint8_t phase_offset = 0)
-{
-    uint8_t beat = beat8( beats_per_minute, timebase);
-    uint8_t beatsin = sin8_t( beat + phase_offset);
-    uint8_t rangewidth = highest - lowest;
-    uint8_t scaledbeat = scale8( beatsin, rangewidth);
-    uint8_t result = lowest + scaledbeat;
-    return result;
-}
-
-#if !defined(ColorFromPalette) // don't overwrite our own overwrite
-// 1:1 replacement of fastled function optimized for ESP, slightly faster, more accurate and uses less flash (~ -200bytes)
-static inline CRGB ColorFromPaletteWLED(const CRGBPalette16& pal, unsigned index, uint8_t brightness=255, TBlendType blendType=LINEARBLEND)
-{
-   if (blendType == LINEARBLEND_NOWRAP) {
-     index = (index*240) >> 8; // Blend range is affected by lo4 blend of values, remap to avoid wrapping
-  }
-    unsigned hi4 = byte(index) >> 4;
-    const CRGB* entry = (CRGB*)( (uint8_t*)(&(pal[0])) + (hi4 * sizeof(CRGB)));
-    unsigned red1   = entry->r;
-    unsigned green1 = entry->g;
-    unsigned blue1  = entry->b;
-    if (blendType != NOBLEND) {
-      if (hi4 == 15) entry = &(pal[0]);
-      else ++entry;
-      unsigned f2 = ((index & 0x0F) << 4) + 1; // +1 so we scale by 256 as a max value, then result can just be shifted by 8
-      unsigned f1 = (257 - f2); // f2 is 1 minimum, so this is 256 max
-      red1   = (red1 * f1 + (unsigned)entry->r * f2) >> 8;
-      green1 = (green1 * f1 + (unsigned)entry->g * f2) >> 8;
-      blue1  = (blue1 * f1 + (unsigned)entry->b * f2) >> 8;
-    }
-    if (brightness < 255) { // note: zero checking could be done to return black but that is hardly ever used so it is omitted
-      uint32_t scale = brightness + 1; // adjust for rounding (bitshift)
-      red1   = (red1 * scale) >> 8;
-      green1 = (green1 * scale) >> 8;
-      blue1  = (blue1 * scale) >> 8;
-  }
-    return CRGB(red1,green1,blue1);
-}
-#endif
-
-#define WLEDFX_MATH_H
-#endif
\ No newline at end of file

From d2a7b9e4507c579510430fdbc75bc1230c1f3a77 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 21 Nov 2024 18:22:21 +0100
Subject: [PATCH 195/232] 2nd try for a tiny unrelated fix

---
 wled00/FX.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index ebddde41..2b45d37a 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -2012,7 +2012,7 @@ uint16_t mode_partyjerk() {
     speed = SEGMENT.speed * map2(SEGMENT.custom2, 0, 255, 0, 100);
   } else {
     speed = SEGMENT.speed;
-  };
+  }
 
   SEGENV.step += speed;
   counter = SEGENV.step >> 8;

From 3b46af1101212c2106cd04081edb5a8789ae3c38 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Sat, 23 Nov 2024 11:27:32 -0500
Subject: [PATCH 196/232] Make IP clickable via serial monitor

---
 wled00/wled.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index 08f5171d..17efdceb 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -1352,9 +1352,19 @@ void WLED::handleConnection()
       initAP();
     }
   } else if (!interfacesInited) { //newly connected
-    DEBUG_PRINTLN("");
-    USER_PRINT(F("Connected! IP address: "));
+    USER_PRINTLN("");
+    USER_PRINT(F("Connected! IP address: http://"));
     USER_PRINTLN(Network.localIP());
+    //if (Network.isEthernet()) {
+    //  #if ESP32
+    //  USER_PRINT(ETH.localIP());
+    //  USER_PRINTLN(" via Ethernet");
+    //  #endif
+    //} else {
+    //  USER_PRINT(Network.localIP());
+    //  USER_PRINTLN(" via WiFi");
+    //}
+
     if (improvActive) {
       if (improvError == 3) sendImprovStateResponse(0x00, true);
       sendImprovStateResponse(0x04);

From 37c7bb11b366e07cd9f63c660789c71512361115 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sat, 23 Nov 2024 18:34:53 +0000
Subject: [PATCH 197/232] Update animartrix for bugfixes for corrupt state for
 master_speed, speed issues with SM8, Scaledemo1 and Hot_Blob

---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 0b8b92ed..c47ddbd3 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1062,7 +1062,7 @@ AR_build_flags = -D USERMOD_AUDIOREACTIVE -D UM_AUDIOREACTIVE_USE_NEW_FFT ;; WLE
 AR_lib_deps = https://github.com/softhack007/arduinoFFT.git#develop @ 1.9.2      ;; used for USERMOD_AUDIOREACTIVE - optimized version, 10% faster on -S2/-C3
 
 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#18bf17389e57c69f11bc8d04ebe1d215422c7fb7
+animartrix_lib_deps = https://github.com/netmindz/animartrix.git#ccb11dd9a4ec4ff6e7bdf617f6651cced4ed9826 ;; Speed fixes
 animartrix_lib_ignore = animartrix ;; to remove the animartrix lib dependancy (saves a few bytes)
 
 DMXin_build_flags = -D WLED_ENABLE_DMX_INPUT  ;; WLEDMM DMX physical input - requires ESP-IDF v4.4.x

From 61c2ba98b7dbed99554cf5d138b23fd9eeabc64c Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 24 Nov 2024 17:32:59 +0100
Subject: [PATCH 198/232] HUB75 small speedup

gave me 1-3 extra FPS on -S3 with 128x64
---
 wled00/bus_manager.cpp | 12 ++++++------
 wled00/bus_manager.h   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index e414bf61..5dd51d0a 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -1056,7 +1056,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   USER_PRINT(F("heap usage: ")); USER_PRINTLN(int(lastHeap - ESP.getFreeHeap()));
 }
 
-void __attribute__((hot)) BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c) {
+void __attribute__((hot)) IRAM_ATTR BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c) {
   if (!_valid || pix >= _len) return;
   // if (_cct >= 1900) c = colorBalanceFromKelvin(_cct, c); //color correction from CCT
 
@@ -1097,12 +1097,12 @@ void __attribute__((hot)) BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c
   #endif
 }
 
-uint32_t BusHub75Matrix::getPixelColor(uint16_t pix) const {
+uint32_t IRAM_ATTR BusHub75Matrix::getPixelColor(uint16_t pix) const {
   if (!_valid || pix >= _len || !_ledBuffer) return BLACK;
   return uint32_t(_ledBuffer[pix].scale8(_bri)) & 0x00FFFFFF;  // scale8() is needed to mimic NeoPixelBus, which returns scaled-down colours
 }
 
-uint32_t __attribute__((hot)) BusHub75Matrix::getPixelColorRestored(uint16_t pix) const {
+uint32_t __attribute__((hot)) IRAM_ATTR BusHub75Matrix::getPixelColorRestored(uint16_t pix) const {
   if (!_valid || pix >= _len || !_ledBuffer) return BLACK;
   return uint32_t(_ledBuffer[pix]) & 0x00FFFFFF;
 }
@@ -1117,7 +1117,7 @@ void BusHub75Matrix::setBrightness(uint8_t b, bool immediate) {
   if (display) display->setBrightness(_bri);
 }
 
-void __attribute__((hot)) BusHub75Matrix::show(void) {
+void __attribute__((hot)) IRAM_ATTR BusHub75Matrix::show(void) {
   if (!_valid) return;
   MatrixPanel_I2S_DMA* display = BusHub75Matrix::activeDisplay;
   if (!display) return;
@@ -1277,8 +1277,8 @@ void BusManager::removeAll() {
   lastend = 0;
 }
 
-void BusManager::show() {
-  for (uint8_t i = 0; i < numBusses; i++) {
+void __attribute__((hot)) BusManager::show() {
+  for (unsigned i = 0; i < numBusses; i++) {
     busses[i]->show();
   }
 }
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index cef0286d..69f3aa2d 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -191,7 +191,7 @@ class Bus {
     inline static void    setGlobalAWMode(uint8_t m)  { if (m < 5) _gAWM = m; else _gAWM = AW_GLOBAL_DISABLED; }
     inline static uint8_t getGlobalAWMode()           { return _gAWM; }
 
-    inline uint32_t restore_Color_Lossy(uint32_t c, uint8_t restoreBri) const { // shamelessly grabbed from upstream, who grabbed from NPB, who ..
+    inline static uint32_t restore_Color_Lossy(uint32_t c, uint8_t restoreBri) { // shamelessly grabbed from upstream, who grabbed from NPB, who ..
       if (restoreBri < 255) {
         uint8_t* chan = (uint8_t*) &c;
         for (uint_fast8_t i=0; i<4; i++) {

From ce8fc8930e3d5547592f0103097eda6ed76d8c3e Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 24 Nov 2024 17:45:25 +0100
Subject: [PATCH 199/232] const const const

small speedup by declaring some functions "const"
---
 wled00/FX.cpp       | 4 ++--
 wled00/FX.h         | 6 +++---
 wled00/FX_2Dfcn.cpp | 2 +-
 wled00/FX_fcn.cpp   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 2b45d37a..ce5bdc73 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -4763,7 +4763,7 @@ class AuroraWave {
       alive = true;
     }
 
-    CRGB getColorForLED(int ledIndex) {
+    CRGB getColorForLED(int ledIndex) const {
       if(ledIndex < center - width || ledIndex > center + width) return 0; //Position out of range of this wave
 
       CRGB rgb;
@@ -4818,7 +4818,7 @@ class AuroraWave {
       }
     };
 
-    bool stillAlive() {
+    bool stillAlive() const {
       return alive;
     };
 };
diff --git a/wled00/FX.h b/wled00/FX.h
index c0693462..7f53202d 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -420,7 +420,7 @@ typedef struct Segment {
     };
     size_t _dataLen;                   // WLEDMM uint16_t is too small
     static size_t _usedSegmentData;    // WLEDMM uint16_t is too small
-    void setPixelColorXY_fast(int x, int y,uint32_t c, uint32_t scaled_col, int cols, int rows); // set relative pixel within segment with color - faster, but no error checking!!!
+    void setPixelColorXY_fast(int x, int y,uint32_t c, uint32_t scaled_col, int cols, int rows) const; // set relative pixel within segment with color - faster, but no error checking!!!
 
     bool _isSimpleSegment = false;      // simple = no grouping or spacing - mirror, transpose or reverse allowed
     bool _isSuperSimpleSegment = false; // superSimple = no grouping or spacing, no mirror - only transpose or reverse allowed
@@ -606,7 +606,7 @@ typedef struct Segment {
     // transition functions
     void     startTransition(uint16_t dur); // transition has to start before actual segment values change
     void     handleTransition(void);
-    uint16_t progress(void); //transition progression between 0-65535
+    uint16_t progress(void) const; //transition progression between 0-65535
 
     // WLEDMM method inlined for speed (its called at each setPixelColor)
     inline uint8_t  currentBri(uint8_t briNew, bool useCct = false) {
@@ -621,7 +621,7 @@ typedef struct Segment {
 
     uint8_t  currentMode(uint8_t modeNew);
     uint32_t currentColor(uint8_t slot, uint32_t colorNew);
-    CRGBPalette16 &loadPalette(CRGBPalette16 &tgt, uint8_t pal);
+    CRGBPalette16 &loadPalette(CRGBPalette16 &tgt, uint8_t pal) const;
     void     setCurrentPalette(void);
 
     // 1D strip
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index f6d2bc0b..6f7f97b2 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -272,7 +272,7 @@ void Segment::startFrame(void) {
 
 // Simplified version of Segment::setPixelColorXY - without error checking. Does not support grouping or spacing
 // * expects scaled color (final brightness) as additional input parameter, plus segment  virtualWidth() and virtualHeight()
-void IRAM_ATTR __attribute__((hot)) Segment::setPixelColorXY_fast(int x, int y, uint32_t col, uint32_t scaled_col, int cols, int rows) //WLEDMM
+void IRAM_ATTR __attribute__((hot)) Segment::setPixelColorXY_fast(int x, int y, uint32_t col, uint32_t scaled_col, int cols, int rows) const //WLEDMM
 {
   unsigned i = UINT_MAX;
   bool sameColor = false;
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index f98f5dcb..1c577946 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -311,7 +311,7 @@ void Segment::setUpLeds() {
   }
 }
 
-CRGBPalette16 &Segment::loadPalette(CRGBPalette16 &targetPalette, uint8_t pal) {
+CRGBPalette16 &Segment::loadPalette(CRGBPalette16 &targetPalette, uint8_t pal) const {
   static unsigned long _lastPaletteChange = millis() - 990000; // perhaps it should be per segment //WLEDMM changed init value to avoid pure orange after startup
   static CRGBPalette16 randomPalette = CRGBPalette16(DEFAULT_COLOR);
   static CRGBPalette16 prevRandomPalette = CRGBPalette16(CRGB(BLACK));
@@ -452,7 +452,7 @@ void Segment::startTransition(uint16_t dur) {
 }
 
 // transition progression between 0-65535
-uint16_t IRAM_ATTR_YN Segment::progress() {
+uint16_t IRAM_ATTR_YN Segment::progress() const {
   if (!transitional || !_t) return 0xFFFFU;
   unsigned long timeNow = millis();
   if (timeNow - _t->_start > _t->_dur || _t->_dur == 0) return 0xFFFFU;

From eb56a7638d827f456b713a217431a1b779117559 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sun, 24 Nov 2024 17:37:11 +0000
Subject: [PATCH 200/232] Update animartrix version with no dirty state

---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index c47ddbd3..13b45feb 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1062,7 +1062,7 @@ AR_build_flags = -D USERMOD_AUDIOREACTIVE -D UM_AUDIOREACTIVE_USE_NEW_FFT ;; WLE
 AR_lib_deps = https://github.com/softhack007/arduinoFFT.git#develop @ 1.9.2      ;; used for USERMOD_AUDIOREACTIVE - optimized version, 10% faster on -S2/-C3
 
 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#ccb11dd9a4ec4ff6e7bdf617f6651cced4ed9826 ;; Speed fixes
+animartrix_lib_deps = https://github.com/netmindz/animartrix.git#657f754783268b648e1d56b3cd31c810379d0c89 ;; Dirty state fix
 animartrix_lib_ignore = animartrix ;; to remove the animartrix lib dependancy (saves a few bytes)
 
 DMXin_build_flags = -D WLED_ENABLE_DMX_INPUT  ;; WLEDMM DMX physical input - requires ESP-IDF v4.4.x

From 5a2096ab2133e2b0c56fefa5a448ff954abeca4a Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 24 Nov 2024 19:09:35 +0100
Subject: [PATCH 201/232] partly inline getPixelColorXY

allows the compiler to inline access to ledsrgb[] , while still keeping the "no buffer" case in a separate function so program size does not blow up.

--> up to 10% faster
---
 wled00/FX.h         | 18 +++++++++++++++---
 wled00/FX_2Dfcn.cpp | 14 ++++++++++++--
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/wled00/FX.h b/wled00/FX.h
index 7f53202d..beba0517 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -721,10 +721,21 @@ typedef struct Segment {
 
         uint32_t scaled_col = (_brightness == 255) ? col : color_fade(col, _brightness);  // calculate final color
         setPixelColorXY_fast(x, y, col, scaled_col, int(_2dWidth), int(_2dHeight));       // call "fast" function
-  }
-}
+      }
+    }
+    inline uint32_t getPixelColorXY(int x, int y) const {
+      // minimal sanity checks
+      if (!_isValid2D) return 0;                                                // not active
+      if ((unsigned(x) >= _2dWidth) || (unsigned(y) >= _2dHeight)) return 0 ;   // check if (x,y) are out-of-range - due to 2's complement, this also catches negative values
+      if (ledsrgb) {
+        int i = x + y*_2dWidth; // avoid error checking done by XY() - be optimistic about ranges of x and y
+        return RGBW32(ledsrgb[i].r, ledsrgb[i].g, ledsrgb[i].b, 0);
+      }
+      else return getPixelColorXY_part2(x, y, int(_2dWidth), int(_2dHeight));    // call "no ledsrgb" function to retrieve pixel from bus driver
+    }
 #else
     void setPixelColorXY(int x, int y, uint32_t c); // set relative pixel within segment with color
+    uint32_t __attribute__((pure)) getPixelColorXY(int x, int y)  const { return getPixelColorXY_slow(x,y);}
 #endif
     inline void setPixelColorXY(unsigned x, unsigned y, uint32_t c)               { setPixelColorXY(int(x), int(y), c); }
     inline void setPixelColorXY(int x, int y, byte r, byte g, byte b, byte w = 0) { setPixelColorXY(x, y, RGBW32(r,g,b,w)); }
@@ -735,7 +746,8 @@ typedef struct Segment {
     inline void setPixelColorXY(float x, float y, byte r, byte g, byte b, byte w = 0, bool aa = true) { setPixelColorXY(x, y, RGBW32(r,g,b,w), aa); }
     inline void setPixelColorXY(float x, float y, CRGB c, bool aa = true)                             { setPixelColorXY(x, y, RGBW32(c.r,c.g,c.b,0), aa); }
     //#endif
-    uint32_t __attribute__((pure)) getPixelColorXY(int x, int y)  const;
+    uint32_t __attribute__((pure)) getPixelColorXY_part2(int x, int y, int cols, int rows)  const;
+    uint32_t __attribute__((pure)) getPixelColorXY_slow(int x, int y)  const;
     // 2D support functions
     void blendPixelColorXY(uint16_t x, uint16_t y, uint32_t color, uint8_t blend);
     inline void blendPixelColorXY(uint16_t x, uint16_t y, CRGB c, uint8_t blend)  { blendPixelColorXY(x, y, RGBW32(c.r,c.g,c.b,0), blend); }
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 6f7f97b2..4d58143b 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -454,8 +454,18 @@ void Segment::setPixelColorXY(float x, float y, uint32_t col, bool aa, bool fast
 #endif
 }
 
-// returns RGBW values of pixel
-uint32_t IRAM_ATTR_YN Segment::getPixelColorXY(int x, int y) const {
+// WLEDMM this function is only called by getPixelColorXY, in case we don't have the ledsrgb buffer!
+uint32_t IRAM_ATTR_YN Segment::getPixelColorXY_part2(int x, int y, int cols, int rows) const {
+  if (reverse  ) x = cols - x - 1;
+  if (reverse_y) y = rows - y - 1;
+  if (transpose) std::swap(x,y); // swap X & Y if segment transposed
+  const uint_fast16_t groupLength_ = groupLength(); // WLEDMM small optimization
+  x *= groupLength_; // expand to physical pixels
+  y *= groupLength_; // expand to physical pixels
+  return strip.getPixelColorXYRestored(start + x, startY + y);
+}
+
+uint32_t IRAM_ATTR_YN Segment::getPixelColorXY_slow(int x, int y) const { // WLEDMM fallback for non-fastpath builds
   if (x<0 || y<0 || !isActive()) return 0; // not active or out-of range
   if (ledsrgb) {
     int i = XY(x,y);

From 7ad67b5f64ae28f8eb43a0224bc86a89c04e7b70 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 25 Nov 2024 13:35:16 +0100
Subject: [PATCH 202/232] blurz effect upgrade

* avoid black spots
* better randomness on esp32
* new mode "FreqMap" (checkbox) - blob location follows major frequency
* new mode "GEQ scanner" (checkbox) - blob location based on GEQ band

--> looks cool with Pinwheel or Bar or Arc mapping
--> will be even better with the new Waterfall mapping mode
---
 wled00/FX.cpp | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index ce5bdc73..b7b61daf 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -7589,6 +7589,8 @@ uint16_t mode_blurz(void) {                    // Blurz. By Andrew Tuline.
   um_data_t *um_data = getAudioData();
   uint8_t *fftResult = (uint8_t*)um_data->u_data[2];
   float volumeSmth   = *(float*)um_data->u_data[0];
+  float FFT_MajorPeak = *(float*)um_data->u_data[4];
+  if (FFT_MajorPeak < 1) FFT_MajorPeak = 1;
 
   if (SEGENV.call == 0) {
     SEGMENT.setUpLeds(); // not sure if necessary
@@ -7598,6 +7600,10 @@ uint16_t mode_blurz(void) {                    // Blurz. By Andrew Tuline.
     SEGENV.step = 0;  // last pixel color
   }
 
+  #if defined(ARDUINO_ARCH_ESP32)
+    random16_add_entropy(esp_random() & 0xFFFF); // improves randonmess
+  #endif
+
   int fadeoutDelay = (256 - SEGMENT.speed) / 24;
   if ((fadeoutDelay <= 1 ) || ((SEGENV.call % fadeoutDelay) == 0))
        SEGMENT.fadeToBlackBy(max(SEGMENT.speed, (uint8_t)1));
@@ -7606,10 +7612,25 @@ uint16_t mode_blurz(void) {                    // Blurz. By Andrew Tuline.
   }
   if ((SEGENV.aux1 < SEGLEN) && (volumeSmth > 1.0f)) SEGMENT.setPixelColor(SEGENV.aux1,SEGENV.step); // "repaint" last pixel after blur
 
+  unsigned freqBand = SEGENV.aux0 % 16;
   uint16_t segLoc = random16(SEGLEN);
+
+  if (SEGENV.check1) {                                                                                   // FreqMap mode : blob location by major frequency
+    int freqLocn;
+    unsigned maxLen = (SEGENV.check2) ? max(1, SEGLEN-16): SEGLEN;                                       // usable segment length - leave 16 pixels when embedding "GEQ scan"
+    freqLocn = roundf((log10f((float)FFT_MajorPeak) - 1.78f) * float(maxLen)/(MAX_FREQ_LOG10 - 1.78f));  // log10 frequency range is from 1.78 to 3.71. Let's scale to SEGLEN. // WLEDMM proper rounding
+    if (freqLocn < 1) freqLocn = 0; // avoid underflow
+    segLoc =  (SEGENV.check2) ? freqLocn + freqBand : freqLocn;
+  } else if (SEGENV.check2) {                                                                            // GEQ Scanner mode: blob location is defined by frequency band + random offset
+    float bandWidth = float(SEGLEN)  / 16.0f;
+    int bandStart = roundf(bandWidth * freqBand);
+    segLoc = bandStart + random16(max(1, int(bandWidth)));
+  }
+  segLoc = max(uint16_t(0), min(uint16_t(SEGLEN-1), segLoc));  // fix overflows
+
   if (SEGLEN < 2) segLoc = 0; // WLEDMM just to be sure
-  unsigned pixColor = (2*fftResult[SEGENV.aux0%16]*240)/max(1, SEGLEN-1);                  // WLEDMM avoid uint8 overflow, and preserve pixel parameters for redraw
-  unsigned pixIntensity = min((unsigned)(2.0f*fftResult[SEGENV.aux0%16]), 255U);
+  unsigned pixColor = (2*fftResult[freqBand]*240)/max(1, SEGLEN-1);                  // WLEDMM avoid uint8 overflow, and preserve pixel parameters for redraw
+  unsigned pixIntensity = min((unsigned)(2.0f*fftResult[freqBand]), 255U);
 
   if (volumeSmth > 1.0f) {
     SEGMENT.setPixelColor(segLoc, color_blend(SEGCOLOR(1), SEGMENT.color_from_palette((uint16_t)pixColor, false, PALETTE_SOLID_WRAP, 0),(uint8_t)pixIntensity));
@@ -7619,12 +7640,12 @@ uint16_t mode_blurz(void) {                    // Blurz. By Andrew Tuline.
     SEGMENT.blur(max(SEGMENT.intensity, (uint8_t)1));
     SEGENV.aux0 ++;
     SEGENV.aux0 %= 16; // make sure it doesn't cross 16
-    SEGMENT.setPixelColor(segLoc, color_blend(SEGCOLOR(1), SEGMENT.color_from_palette((uint16_t)pixColor, false, PALETTE_SOLID_WRAP, 0),(uint8_t)pixIntensity)); // repaint center pixel after blur
+    SEGMENT.addPixelColor(segLoc, color_blend(SEGCOLOR(1), SEGMENT.color_from_palette((uint16_t)pixColor, false, PALETTE_SOLID_WRAP, 0),(uint8_t)pixIntensity/2)); // repaint center pixel after blur
   } else SEGMENT.blur(max(SEGMENT.intensity, (uint8_t)1));  // silence - just blur it again
 
-  return FRAMETIME_FIXED;
+  return SEGENV.check2 ? FRAMETIME : (3*FRAMETIME_FIXED/4);          // faster updates in GEQ Scanner mode
 } // mode_blurz()
-static const char _data_FX_MODE_BLURZ[] PROGMEM = "Blurz ☾@Fade rate,Blur;!,Color mix;!;01f;sx=48,ix=127,m12=0,si=0"; // Pixels, Beatsin
+static const char _data_FX_MODE_BLURZ[] PROGMEM = "Blurz Plus ☾@Fade rate,Blur,,,,FreqMap ☾,GEQ Scanner ☾,;!,Color mix;!;01f;sx=48,ix=127,m12=7,si=0"; // Pinwheel, Beatsin
 #endif
 
 /////////////////////////

From 7d10bd0cd99982b4e2332d687c9f19f4e8dc566b Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 25 Nov 2024 15:27:53 +0100
Subject: [PATCH 203/232] Allow TV Simulator on single LED segments

I've checked the code - nothing preventing the effect to run with SEGLEN=1
---
 wled00/FX.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index b7b61daf..26bb99e2 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -4720,7 +4720,7 @@ uint16_t mode_tv_simulator(void) {
 
   return FRAMETIME;
 }
-static const char _data_FX_MODE_TV_SIMULATOR[] PROGMEM = "TV Simulator@!,!;;";
+static const char _data_FX_MODE_TV_SIMULATOR[] PROGMEM = "TV Simulator@!,!;;!;01";
 
 
 /*

From 12ef7cb2855c6e2d955ff33fc860fd4948b0076d Mon Sep 17 00:00:00 2001
From: Will Miles <will@willmiles.net>
Date: Wed, 23 Oct 2024 19:47:44 -0400
Subject: [PATCH 204/232] Enable NON32XFER_HANDLER on ESP8266

This is a platform feature that asks forgiveness for PROGMEM misuse:
it adds a handler such that incorrectly used PROGMEM will work without
crashing, just really, *really* inefficiently.

Given that most of our real-world use cases for PROGMEM strings are
relatively infrequent text calls, we can err on the side of developer
convenience and address performance problems if and when they arise.
---
 platformio.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platformio.ini b/platformio.ini
index 13b45feb..e49c32da 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -291,6 +291,7 @@ build_flags =
   ; -D PIO_FRAMEWORK_ARDUINO_MMU_CACHE16_IRAM48 ;; in case of linker errors like "section `.text1' will not fit in region `iram1_0_seg'"
   ; -D PIO_FRAMEWORK_ARDUINO_MMU_CACHE16_IRAM48_SECHEAP_SHARED ;; (experimental) adds some extra heap, but may cause slowdown
   -D USERMOD_AUDIOREACTIVE
+  -D NON32XFER_HANDLER ;; ask forgiveness for PROGMEM misuse
 
 lib_deps =
   #https://github.com/lorol/LITTLEFS.git

From 827cf8786045eb2853ff640efd9407925d8db683 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 13 Oct 2024 11:01:05 +0200
Subject: [PATCH 205/232] Merge pull request #4188 from
 LuisFadini/0_15_brt_timezone

Added BRT timezone
---
 wled00/data/settings_time.htm | 1 +
 wled00/ntp.cpp                | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/wled00/data/settings_time.htm b/wled00/data/settings_time.htm
index 52f3385e..0c6e68a7 100644
--- a/wled00/data/settings_time.htm
+++ b/wled00/data/settings_time.htm
@@ -182,6 +182,7 @@
 			<option value="20">AKST/AKDT (Anchorage)</option>
 			<option value="21">MX-CST</option>
 			<option value="22">PKT (Pakistan)</option>
+			<option value="23">BRT (Brasília)</option>
 		</select><br>
 		UTC offset: <input name="UO" type="number" min="-65500" max="65500" required> seconds (max. 18 hours)<br>
 		Current local time is <span class="times">unknown</span>.<br>
diff --git a/wled00/ntp.cpp b/wled00/ntp.cpp
index fb5e85b3..ddebd949 100644
--- a/wled00/ntp.cpp
+++ b/wled00/ntp.cpp
@@ -48,6 +48,7 @@ Timezone* tz = nullptr;
 #define TZ_ANCHORAGE           20
 #define TZ_MX_CENTRAL          21
 #define TZ_PAKISTAN            22
+#define TZ_BRASILIA            23
 #define TZ_INIT               255
 
 byte tzCurrent = TZ_INIT; //uninitialized
@@ -168,6 +169,11 @@ void updateTimezone() {
       tcrStandard = tcrDaylight;
       break;
     }
+    case TZ_BRASILIA : {
+      tcrDaylight = {Last, Sun, Mar, 1, -180};    //Brasília Standard Time = UTC - 3 hours
+      tcrStandard = tcrDaylight;
+      break;
+    }
   }
 
   tzCurrent = currentTimezone;

From ae076727104040c5419b6b681f5f6d889643f46b Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 26 Nov 2024 14:20:07 +0100
Subject: [PATCH 206/232] swirl effect bugfix

avoid drawing outside of visible area
---
 wled00/FX.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 26bb99e2..62edcfe7 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -6214,9 +6214,9 @@ uint16_t mode_2Dsquaredswirl(void) {            // By: Mark Kriegsman. https://g
 
   uint16_t ms = strip.now;
 
-  SEGMENT.addPixelColorXY(i, m, ColorFromPalette(SEGPALETTE, ms/29, 255, LINEARBLEND));
-  SEGMENT.addPixelColorXY(j, n, ColorFromPalette(SEGPALETTE, ms/41, 255, LINEARBLEND));
-  SEGMENT.addPixelColorXY(k, p, ColorFromPalette(SEGPALETTE, ms/73, 255, LINEARBLEND));
+  if (i<cols && m<rows) SEGMENT.addPixelColorXY(i, m, ColorFromPalette(SEGPALETTE, ms/29, 255, LINEARBLEND));
+  if (j<cols && n<rows) SEGMENT.addPixelColorXY(j, n, ColorFromPalette(SEGPALETTE, ms/41, 255, LINEARBLEND));
+  if (k<cols && p<rows) SEGMENT.addPixelColorXY(k, p, ColorFromPalette(SEGPALETTE, ms/73, 255, LINEARBLEND));
 
   return FRAMETIME;
 } // mode_2Dsquaredswirl()
@@ -6943,10 +6943,10 @@ uint16_t mode_2DSwirl(void) {
 
   SEGMENT.blur(SEGMENT.custom1);
 
-  uint8_t  i = beatsin8( 27*SEGMENT.speed/255, borderWidth, cols - borderWidth);
-  uint8_t  j = beatsin8( 41*SEGMENT.speed/255, borderWidth, rows - borderWidth);
-  uint8_t ni = (cols - 1) - i;
-  uint8_t nj = (cols - 1) - j;
+  unsigned  i = beatsin8( 27*SEGMENT.speed/255, borderWidth, cols - borderWidth);
+  unsigned  j = beatsin8( 41*SEGMENT.speed/255, borderWidth, rows - borderWidth);
+  unsigned ni = (cols - 1) - i;
+  unsigned nj = (cols - 1) - j;
   uint16_t ms = strip.now;
 
   um_data_t *um_data = getAudioData();
@@ -6955,12 +6955,12 @@ uint16_t mode_2DSwirl(void) {
 
   // printUmData();
 
-  SEGMENT.addPixelColorXY( i, j, ColorFromPalette(SEGPALETTE, (ms / 11 + volumeSmth*4), volumeRaw * SEGMENT.intensity / 64, LINEARBLEND)); //CHSV( ms / 11, 200, 255);
-  SEGMENT.addPixelColorXY( j, i, ColorFromPalette(SEGPALETTE, (ms / 13 + volumeSmth*4), volumeRaw * SEGMENT.intensity / 64, LINEARBLEND)); //CHSV( ms / 13, 200, 255);
-  SEGMENT.addPixelColorXY(ni,nj, ColorFromPalette(SEGPALETTE, (ms / 17 + volumeSmth*4), volumeRaw * SEGMENT.intensity / 64, LINEARBLEND)); //CHSV( ms / 17, 200, 255);
-  SEGMENT.addPixelColorXY(nj,ni, ColorFromPalette(SEGPALETTE, (ms / 29 + volumeSmth*4), volumeRaw * SEGMENT.intensity / 64, LINEARBLEND)); //CHSV( ms / 29, 200, 255);
-  SEGMENT.addPixelColorXY( i,nj, ColorFromPalette(SEGPALETTE, (ms / 37 + volumeSmth*4), volumeRaw * SEGMENT.intensity / 64, LINEARBLEND)); //CHSV( ms / 37, 200, 255);
-  SEGMENT.addPixelColorXY(ni, j, ColorFromPalette(SEGPALETTE, (ms / 41 + volumeSmth*4), volumeRaw * SEGMENT.intensity / 64, LINEARBLEND)); //CHSV( ms / 41, 200, 255);
+  if (i<cols && j<rows)   SEGMENT.addPixelColorXY( i, j, ColorFromPalette(SEGPALETTE, (ms / 11 + volumeSmth*4), volumeRaw * SEGMENT.intensity / 64, LINEARBLEND)); //CHSV( ms / 11, 200, 255);
+  if (j<cols && i<rows)   SEGMENT.addPixelColorXY( j, i, ColorFromPalette(SEGPALETTE, (ms / 13 + volumeSmth*4), volumeRaw * SEGMENT.intensity / 64, LINEARBLEND)); //CHSV( ms / 13, 200, 255);
+  if (ni<cols && nj<rows) SEGMENT.addPixelColorXY(ni,nj, ColorFromPalette(SEGPALETTE, (ms / 17 + volumeSmth*4), volumeRaw * SEGMENT.intensity / 64, LINEARBLEND)); //CHSV( ms / 17, 200, 255);
+  if (nj<cols && ni<rows) SEGMENT.addPixelColorXY(nj,ni, ColorFromPalette(SEGPALETTE, (ms / 29 + volumeSmth*4), volumeRaw * SEGMENT.intensity / 64, LINEARBLEND)); //CHSV( ms / 29, 200, 255);
+  if (i<cols && nj<rows)  SEGMENT.addPixelColorXY( i,nj, ColorFromPalette(SEGPALETTE, (ms / 37 + volumeSmth*4), volumeRaw * SEGMENT.intensity / 64, LINEARBLEND)); //CHSV( ms / 37, 200, 255);
+  if (ni<cols && j<rows)  SEGMENT.addPixelColorXY(ni, j, ColorFromPalette(SEGPALETTE, (ms / 41 + volumeSmth*4), volumeRaw * SEGMENT.intensity / 64, LINEARBLEND)); //CHSV( ms / 41, 200, 255);
 
   return FRAMETIME;
 } // mode_2DSwirl()

From ccf1b044ceda35eb7dbd28fdadc13c183006fd60 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 26 Nov 2024 15:33:56 +0100
Subject: [PATCH 207/232] allow tri fade effect on 0D (single pixel)

---
 wled00/FX.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 62edcfe7..a9853862 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -1743,7 +1743,7 @@ uint16_t mode_tricolor_fade(void) {
 
   return FRAMETIME;
 }
-static const char _data_FX_MODE_TRICOLOR_FADE[] PROGMEM = "Tri Fade@!;1,2,3;!";
+static const char _data_FX_MODE_TRICOLOR_FADE[] PROGMEM = "Tri Fade@!;1,2,3;!;01";
 
 
 /*

From c44784071ef79d8e431d84a7e876a64add930394 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 27 Nov 2024 11:07:56 +0100
Subject: [PATCH 208/232] small tails for rolling balls

---
 wled00/FX.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index a9853862..9612070e 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -3048,7 +3048,8 @@ static uint16_t rolling_balls(void) {
   float cfac = float(scale8(8, 255-SEGMENT.speed) +1)*20000.0f; // this uses the Aircoookie conversion factor for scaling time using speed slider
 
   bool hasCol2 = SEGCOLOR(2);
-  if (!SEGMENT.check2) SEGMENT.fill(hasCol2 ? BLACK : SEGCOLOR(1));
+  //if (!SEGMENT.check2) SEGMENT.fill(hasCol2 ? BLACK : SEGCOLOR(1));
+  if (!SEGMENT.check2) SEGMENT.fade_out(253); // WLEDMM adding a bit of trail
 
   for (int i = 0; i < numBalls; i++) {
     float timeSinceLastUpdate = float((strip.now - balls[i].lastBounceUpdate))/cfac;

From 402786c14e15799b2d4910f8298c69ab5395cbd0 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 27 Nov 2024 11:11:07 +0100
Subject: [PATCH 209/232] GEQ FLat mode (1D)

---
 wled00/FX.cpp | 45 ++++++++++++++++++++++++++++++++++-----------
 wled00/wled.h |  2 +-
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 9612070e..37c0b8e8 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8101,15 +8101,36 @@ static const char _data_FX_MODE_WATERFALL[] PROGMEM = "Waterfall@!,Adjust color,
 
 #ifndef WLED_DISABLE_2D
 /////////////////////////
-//     ** 2D GEQ       //
+//    1D / 2D GEQ      //
 /////////////////////////
-uint16_t mode_2DGEQ(void) { // By Will Tatam. Code reduction by Ewoud Wijma.
-  if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+// GEQ helper: either draws 2D, or flattens pixels to 1D
+static void setFlatPixelXY(bool flatMode, int x, int y, uint32_t color, unsigned cols, unsigned rows, unsigned offset) {
+  if ((unsigned(x) >= cols) || (unsigned(y) >= rows)) return; // skip invisible
+
+  if (!flatMode) SEGMENT.setPixelColorXY(x, y, color); // normal 2D
+  else {
+    y = rows - y -1 ;                     // reverse y
+    if (y & 0x01) y = (rows + y) / 2;     // center bars: odd pixels to the right
+    else y = (rows - 1 - y) / 2;          //              even pixels to the left
+
+    int pix = x*rows + y + offset;        // flatten -> transpose x y so that bars stay bars
+    if (unsigned(pix) >= SEGLEN) return;  // skip invisible
+    SEGMENT.setPixelColor(pix, color);
+  }
+}
+
+uint16_t mode_2DGEQ(void) { // By Will Tatam. Code reduction by Ewoud Wijma. Flat Mode added by softhack007
+  //if (!strip.isMatrix) return mode_static(); // not a 2D set-up, not a problem
+  bool flatMode = !SEGMENT.is2D();
 
   const int NUM_BANDS = map2(SEGMENT.custom1, 0, 255, 1, 16);
-  const uint16_t cols = SEGMENT.virtualWidth();
-  const uint16_t rows = SEGMENT.virtualHeight();
-  if ((cols <=1) || (rows <=1)) return mode_static(); // not really a 2D set-up
+  const int vLength = SEGLEN;                                                               // for flat mode
+  const uint16_t cols = flatMode ? min(max(2, NUM_BANDS), (vLength+1)/2) : SEGMENT.virtualWidth();
+  const uint16_t rows = flatMode ? vLength / cols : SEGMENT.virtualHeight();
+  const unsigned offset = flatMode ? max(0, (vLength - rows*cols +1) / 2) : 0;              // flatmode: always center effect
+
+  if ((cols <=1) || (rows <=1)) return mode_static(); // too small
 
   if (!SEGENV.allocateData(cols*sizeof(uint16_t))) return mode_static(); //allocation failed
   uint16_t *previousBarHeight = reinterpret_cast<uint16_t*>(SEGENV.data); //array of previous bar heights per frequency band
@@ -8175,7 +8196,7 @@ uint16_t mode_2DGEQ(void) { // By Will Tatam. Code reduction by Ewoud Wijma.
     if (barHeight > previousBarHeight[x]) previousBarHeight[x] = barHeight; //drive the peak up
 
     uint32_t ledColor = BLACK;
-    if ((! SEGMENT.check1) && (barHeight > 0)) {  // use faster drawLine when single-color bars are needed
+    if ((! SEGMENT.check1) && !flatMode && (barHeight > 0)) {  // use faster drawLine when single-color bars are needed
       ledColor = SEGMENT.color_from_palette(colorIndex, false, PALETTE_SOLID_WRAP, 0);
       SEGMENT.drawLine(int(x), max(0,int(rows)-barHeight), int(x), int(rows-1), ledColor, false); // max(0, ...) to prevent negative Y
     } else {
@@ -8184,23 +8205,25 @@ uint16_t mode_2DGEQ(void) { // By Will Tatam. Code reduction by Ewoud Wijma.
         colorIndex = map(y, 0, rows-1, 0, 255);
 
       ledColor = SEGMENT.color_from_palette(colorIndex, false, PALETTE_SOLID_WRAP, 0);
-      SEGMENT.setPixelColorXY(x, rows-1 - y, ledColor);
+      setFlatPixelXY(flatMode, x, rows-1 - y, ledColor, cols, rows, offset);
     } }
-    if ((SEGMENT.intensity < 255) && (previousBarHeight[x] > 0) && (previousBarHeight[x] < rows))  // WLEDMM avoid "overshooting" into other segments
-      SEGMENT.setPixelColorXY(x, rows - previousBarHeight[x], (SEGCOLOR(2) != BLACK) ? SEGCOLOR(2) : ledColor);
+    if (!flatMode && (SEGMENT.intensity < 255) && (previousBarHeight[x] > 0) && (previousBarHeight[x] < rows))  // WLEDMM avoid "overshooting" into other segments - disable ripple pixels in 1D mode 
+      setFlatPixelXY(flatMode, x, rows - previousBarHeight[x], (SEGCOLOR(2) != BLACK) ? SEGCOLOR(2) : ledColor, cols, rows, offset);
 
     if (rippleTime && previousBarHeight[x]>0) previousBarHeight[x]--;    //delay/ripple effect
   }
 
 #ifdef SR_DEBUG
+  if (!flatMode) {
   // WLEDMM: abuse top left/right pixels for peak detection debugging
   SEGMENT.setPixelColorXY(cols-1, 0, (samplePeak > 0) ? GREEN : BLACK);
   if (samplePeak > 0) SEGMENT.setPixelColorXY(0, 0, GREEN);
   // WLEDMM end
+  }
 #endif
   return FRAMETIME;
 } // mode_2DGEQ()
-static const char _data_FX_MODE_2DGEQ[] PROGMEM = "GEQ ☾@Fade speed,Ripple decay,# of bands,,,Color bars,Smooth bars ☾;!,,Peaks;!;2f;c1=255,c2=64,pal=11,si=0"; // Beatsin
+static const char _data_FX_MODE_2DGEQ[] PROGMEM = "GEQ ☾@Fade speed,Ripple decay,# of bands,,,Color bars,Smooth bars ☾;!,,Peaks;!;12f;c1=255,c2=64,pal=11,si=0"; // Beatsin
 
 
 /////////////////////////
diff --git a/wled00/wled.h b/wled00/wled.h
index 85a9fe84..f2c0ac6e 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2411150
+#define VERSION 2411270
 
 // WLEDMM  - you can check for this define in usermods, to only enabled WLEDMM specific code in the "right" fork. Its not defined in AC WLED.
 #define _MoonModules_WLED_

From 8ff0223520edf4cc934a734ce7e9880b61c32fa2 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 27 Nov 2024 11:59:13 +0100
Subject: [PATCH 210/232] GEQ flat mode for 2D
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

you still have to use a trick -> the "expand 1D" drop-down is hidden once you select a 2D-capable effect

* Create your segment with 2 colums or 2 rows (might also need "transpose"
* Select a 1D effect like chunchun
* set expand to "Pixels" or "Bar"
* now select the GEQ effect

--> Flat GEQ runs in the previously set expand mode.
---
 wled00/FX.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 37c0b8e8..838f763c 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8122,7 +8122,7 @@ static void setFlatPixelXY(bool flatMode, int x, int y, uint32_t color, unsigned
 
 uint16_t mode_2DGEQ(void) { // By Will Tatam. Code reduction by Ewoud Wijma. Flat Mode added by softhack007
   //if (!strip.isMatrix) return mode_static(); // not a 2D set-up, not a problem
-  bool flatMode = !SEGMENT.is2D();
+  bool flatMode = !SEGMENT.is2D() || (SEGMENT.width() < 3) || (SEGMENT.height() < 3); // also use flat mode when less than 3 colums or rows
 
   const int NUM_BANDS = map2(SEGMENT.custom1, 0, 255, 1, 16);
   const int vLength = SEGLEN;                                                               // for flat mode

From 59d5ff02c551d82abeccae6b61f68468ad10395a Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 27 Nov 2024 13:18:43 +0100
Subject: [PATCH 211/232] Flat GEQ improvement for shorter stips

only center bars if we more than 4 pixels per bar.
---
 wled00/FX.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 838f763c..694239d7 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8110,10 +8110,11 @@ static void setFlatPixelXY(bool flatMode, int x, int y, uint32_t color, unsigned
 
   if (!flatMode) SEGMENT.setPixelColorXY(x, y, color); // normal 2D
   else {
-    y = rows - y -1 ;                     // reverse y
-    if (y & 0x01) y = (rows + y) / 2;     // center bars: odd pixels to the right
-    else y = (rows - 1 - y) / 2;          //              even pixels to the left
-
+    y = rows - y - 1;                     // reverse y
+    if (rows > 4) {                       // center y if we have more than 4 pixels per bar
+      if (y & 0x01) y = (rows + y) / 2;      // center bars: odd pixels to the right
+      else y = (rows - 1 - y) / 2;           //              even pixels to the left
+    }
     int pix = x*rows + y + offset;        // flatten -> transpose x y so that bars stay bars
     if (unsigned(pix) >= SEGLEN) return;  // skip invisible
     SEGMENT.setPixelColor(pix, color);

From f21b2949f1c470459f9d67656f10b0979b6e0af1 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 27 Nov 2024 21:13:46 +0100
Subject: [PATCH 212/232] fix for effect double restart problem when cross-fade
 is enabled

we only use palette and brightness transitions, so effect restart at the transition end is not required.
---
 wled00/FX_fcn.cpp | 6 +++---
 wled00/wled.h     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 1c577946..0f750b0f 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -494,12 +494,12 @@ void Segment::setCurrentPalette() {
 }
 
 void Segment::handleTransition() {
-  if (!transitional) return;
+  if (!transitional || !_t) return;  // Early exit if no transition active
   unsigned long maxWait = millis() + 20;
   if (mode == FX_MODE_STATIC && next_time > maxWait) next_time = maxWait;
   if (progress() == 0xFFFFU) {
     if (_t) {
-      if (_t->_modeP != mode) markForReset();
+      //if (_t->_modeP != mode) markForReset();  // WLEDMM effect transition disabled as it does not work (flashes due to double effect restart)
       delete _t;
       _t = nullptr;
     }
@@ -618,7 +618,7 @@ void Segment::setMode(uint8_t fx, bool loadDefaults, bool sliderDefaultsOnly) {
           sOpt = extractModeDefaults(fx, "pal");  if (sOpt >= 0) {if (oldPalette==-1) oldPalette = palette; setPalette(sOpt);} else {if (oldPalette!=-1) setPalette(oldPalette); oldPalette = -1;}
         }
       }
-      if (!fadeTransition) markForReset(); // WLEDMM quickfix for effect "double startup" bug. -> only works when "Crossfade" is disabled (led settings)
+      /*if (!fadeTransition)*/ markForReset(); // WLEDMM quickfix for effect "double startup" bug.
       stateChanged = true; // send UDP/WS broadcast
     }
   }
diff --git a/wled00/wled.h b/wled00/wled.h
index f2c0ac6e..fe1761a2 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2411270
+#define VERSION 2411271
 
 // WLEDMM  - you can check for this define in usermods, to only enabled WLEDMM specific code in the "right" fork. Its not defined in AC WLED.
 #define _MoonModules_WLED_
@@ -393,7 +393,7 @@ WLED_GLOBAL byte briS     _INIT(128);                     // default brightness
 WLED_GLOBAL byte nightlightTargetBri _INIT(0);      // brightness after nightlight is over
 WLED_GLOBAL byte nightlightDelayMins _INIT(60);
 WLED_GLOBAL byte nightlightMode      _INIT(NL_MODE_FADE); // See const.h for available modes. Was nightlightFade
-WLED_GLOBAL bool fadeTransition      _INIT(false);  // enable crossfading color transition // WLEDMM disabled - has bugs that will be solved in upstream beta4
+WLED_GLOBAL bool fadeTransition      _INIT(true);   // enable crossfading color transition // WLEDMM only do color x-fade -- effect x-fade has bugs that will be solved in upstream beta4
 WLED_GLOBAL uint16_t transitionDelay _INIT(750);    // default crossfade duration in ms
 
 WLED_GLOBAL uint_fast16_t briMultiplier _INIT(100);          // % of brightness to set (to limit power, if you set it to 50 and set bri to 255, actual brightness will be 127)

From 1670330b1b00a812d522e8bbbdc8773e97bb12f3 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 28 Nov 2024 17:51:39 +0100
Subject: [PATCH 213/232] Octopus Radial Wave mode

---
 wled00/FX.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 694239d7..e77e72f1 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8575,6 +8575,7 @@ static const char _data_FX_MODE_2DSOAP[] PROGMEM = "Soap@!,Smoothness;;!;2";
 //Octopus (https://editor.soulmatelights.com/gallery/671-octopus)
 //Stepko and Sutaburosu
 // adapted for WLED by @blazoncek
+// RadialWave mode added by @softhack007, based on https://editor.soulmatelights.com/gallery/1090-radialwave
 uint16_t mode_2Doctopus() {
   if (!strip.isMatrix) return mode_static(); // not a 2D set-up
 
@@ -8632,12 +8633,19 @@ uint16_t mode_2Doctopus() {
   else
     SEGENV.step += SEGMENT.speed / 32 + 1;  // 1-4 range
 
+  uint32_t octopusStep = SEGENV.step/2;     // 1/2 for Octopus mode
+  uint32_t radialStep  = 7*SEGENV.step/6;   // 7/6 = 1.16 for RadialWave mode
+
   for (int x = xStart; x < xEnd; x++) {
     for (int y = yStart; y < yEnd; y++) {
       byte angle = rMap[XY(x,y)].angle;
       byte radius = rMap[XY(x,y)].radius;
       //CRGB c = CHSV(SEGENV.step / 2 - radius, 255, sin8(sin8((angle * 4 - radius) / 4 + SEGENV.step) + radius - SEGENV.step * 2 + angle * (SEGMENT.custom3/3+1)));
-      uint16_t intensity = sin8(sin8((angle * 4 - radius) / 4 + SEGENV.step/2) + radius - SEGENV.step + angle * (SEGMENT.custom3/4+1));
+      uint16_t intensity;
+      if (SEGMENT.check3)
+        intensity = sin8(radialStep + sin8(radialStep - radius) + angle * (SEGMENT.custom3/4+1));                               // RadialWave
+      else
+        intensity = sin8(sin8((angle * 4 - radius) / 4 + octopusStep) + radius - SEGENV.step + angle * (SEGMENT.custom3/4+1));  // Octopus
       intensity = map(intensity*intensity, 0, 65535, 0, 255); // add a bit of non-linearity for cleaner display
       CRGB c = ColorFromPalette(SEGPALETTE, SEGENV.step / 2 - radius, intensity);
       SEGMENT.setPixelColorXY(x, y, c);
@@ -8645,8 +8653,7 @@ uint16_t mode_2Doctopus() {
   }
   return FRAMETIME;
 }
-static const char _data_FX_MODE_2DOCTOPUS[] PROGMEM = "Octopus@!,,Offset X,Offset Y,Legs, SuperSync;;!;2;";
-
+static const char _data_FX_MODE_2DOCTOPUS[] PROGMEM = "Octopus@!,,Offset X,Offset Y,Legs, SuperSync,,RadialWave ☾;;!;2;";
 
 //Waving Cell
 //@Stepko (https://editor.soulmatelights.com/gallery/1704-wavingcells)

From 9046ec4bde10322911eba36ec81197ce6fbc32e5 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 28 Nov 2024 18:15:17 +0100
Subject: [PATCH 214/232] Octopus minor optimization

replacing "map" with direct computation
---
 wled00/FX.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index e77e72f1..1b07127c 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8646,7 +8646,8 @@ uint16_t mode_2Doctopus() {
         intensity = sin8(radialStep + sin8(radialStep - radius) + angle * (SEGMENT.custom3/4+1));                               // RadialWave
       else
         intensity = sin8(sin8((angle * 4 - radius) / 4 + octopusStep) + radius - SEGENV.step + angle * (SEGMENT.custom3/4+1));  // Octopus
-      intensity = map(intensity*intensity, 0, 65535, 0, 255); // add a bit of non-linearity for cleaner display
+      //intensity = map(intensity*intensity, 0, 65535, 0, 255); // add a bit of non-linearity for cleaner display
+      intensity = (intensity * intensity) / 255;                // WLEDMM same as above, but faster and a bit more accurate
       CRGB c = ColorFromPalette(SEGPALETTE, SEGENV.step / 2 - radius, intensity);
       SEGMENT.setPixelColorXY(x, y, c);
     }

From 5ea9cb1907bfd8f6c0fc54b4b4658932c774ad9f Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 28 Nov 2024 22:21:47 +0100
Subject: [PATCH 215/232] Octopus code improvements

* removed dead code
* merge octopusStep and radialStep --> octoSpeed
* improve speed slider resolution by first multiplying, then dividing

Thanks @ewoudwijma
---
 wled00/FX.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 1b07127c..9656d15e 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8628,13 +8628,14 @@ uint16_t mode_2Doctopus() {
     }
   }
 
-  if (true) // WLEDMM SuperSync
-    SEGENV.step = strip.now * (SEGMENT.speed / 32 + 1) / 25;  // WLEDMM 40fps
-  else
-    SEGENV.step += SEGMENT.speed / 32 + 1;  // 1-4 range
+  // WLEDMM SuperSync
+  SEGENV.step = (strip.now * (SEGMENT.speed+15)) / 33 / 25;  // WLEDMM 40fps; speed range 0.4 ... 8
 
-  uint32_t octopusStep = SEGENV.step/2;     // 1/2 for Octopus mode
-  uint32_t radialStep  = 7*SEGENV.step/6;   // 7/6 = 1.16 for RadialWave mode
+  // speed of motion and color change
+  uint32_t colorSpeed = SEGENV.step / 2;
+  uint32_t octoSpeed;
+  if (SEGMENT.check3) octoSpeed = 4*SEGENV.step/5;   // 4/5 = 0.8 for RadialWave mode
+  else octoSpeed = SEGENV.step/2;                    // 1/2 = 0.5 for Octopus mode
 
   for (int x = xStart; x < xEnd; x++) {
     for (int y = yStart; y < yEnd; y++) {
@@ -8643,12 +8644,12 @@ uint16_t mode_2Doctopus() {
       //CRGB c = CHSV(SEGENV.step / 2 - radius, 255, sin8(sin8((angle * 4 - radius) / 4 + SEGENV.step) + radius - SEGENV.step * 2 + angle * (SEGMENT.custom3/3+1)));
       uint16_t intensity;
       if (SEGMENT.check3)
-        intensity = sin8(radialStep + sin8(radialStep - radius) + angle * (SEGMENT.custom3/4+1));                               // RadialWave
+        intensity = sin8(octoSpeed + sin8(octoSpeed - radius) + angle * (SEGMENT.custom3/4+1));                               // RadialWave
       else
-        intensity = sin8(sin8((angle * 4 - radius) / 4 + octopusStep) + radius - SEGENV.step + angle * (SEGMENT.custom3/4+1));  // Octopus
+        intensity = sin8(sin8((angle * 4 - radius) / 4 + octoSpeed) + radius - SEGENV.step + angle * (SEGMENT.custom3/4+1));   // Octopus
       //intensity = map(intensity*intensity, 0, 65535, 0, 255); // add a bit of non-linearity for cleaner display
       intensity = (intensity * intensity) / 255;                // WLEDMM same as above, but faster and a bit more accurate
-      CRGB c = ColorFromPalette(SEGPALETTE, SEGENV.step / 2 - radius, intensity);
+      CRGB c = ColorFromPalette(SEGPALETTE, colorSpeed - radius, intensity);
       SEGMENT.setPixelColorXY(x, y, c);
     }
   }

From e914417c7418e0688ba72d3c7b64e92a3d387473 Mon Sep 17 00:00:00 2001
From: Damian Schneider <daedae@gmx.ch>
Date: Wed, 27 Nov 2024 22:27:56 +0100
Subject: [PATCH 216/232] Merge pull request #4181 from DedeHai/0_15_trig_math

Added integer based `sin()/cos()` functions, changed all trig functions to wled_math
---
 usermods/Analog_Clock/Analog_Clock.h |   4 +-
 wled00/FX.cpp                        | 288 ++++++++++++++-------------
 wled00/fcn_declare.h                 |  59 ++++--
 wled00/util.cpp                      |  41 +++-
 wled00/wled_math.cpp                 | 106 +++++++++-
 5 files changed, 319 insertions(+), 179 deletions(-)

diff --git a/usermods/Analog_Clock/Analog_Clock.h b/usermods/Analog_Clock/Analog_Clock.h
index 596f0acb..9d82f767 100644
--- a/usermods/Analog_Clock/Analog_Clock.h
+++ b/usermods/Analog_Clock/Analog_Clock.h
@@ -102,9 +102,9 @@ private:
 
     void secondsEffectSineFade(int16_t secondLed, Toki::Time const& time) {
         uint32_t ms = time.ms % 1000;
-        uint8_t b0 = (cos8(ms * 64 / 1000) - 128) * 2;
+        uint8_t b0 = (cos8_t(ms * 64 / 1000) - 128) * 2;
         setPixelColor(secondLed, gamma32(scale32(secondColor, b0)));
-        uint8_t b1 = (sin8(ms * 64 / 1000) - 128) * 2;
+        uint8_t b1 = (sin8_t(ms * 64 / 1000) - 128) * 2;
         setPixelColor(inc(secondLed, 1, secondsSegment), gamma32(scale32(secondColor, b1)));
     }
 
diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 9656d15e..d89108ed 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -31,7 +31,7 @@
 // effect utility functions
 static uint8_t sin_gap(uint16_t in) {
   if (in & 0x100) return 0;
-  return sin8(in + 192); // correct phase shift of sine so that it starts and stops at 0
+  return sin8_t(in + 192); // correct phase shift of sine so that it starts and stops at 0
 }
 
 static uint16_t triwave16(uint16_t in) {
@@ -364,7 +364,7 @@ uint16_t mode_breath(void) {
   counter = (counter >> 2) + (counter >> 4); //0-16384 + 0-2048
   if (counter < 16384) {
     if (counter > 8192) counter = 8192 - (counter - 8192);
-    var = sin16(counter) / 103; //close to parabolic in range 0-8192, max val. 23170
+    var = sin16_t(counter) / 103; //close to parabolic in range 0-8192, max val. 23170
   }
 
   uint8_t lum = 30 + var;
@@ -546,7 +546,7 @@ uint16_t running_base(bool saw, bool dual=false) {
       }
       a = 255 - a;
     }
-    uint8_t s = dual ? sin_gap(a) : sin8(a);
+    uint8_t s = dual ? sin_gap(a) : sin8_t(a);
     uint32_t ca = color_blend(SEGCOLOR(1), SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 0), s);
     if (dual) {
       uint16_t b = (SEGLEN-1-i)*x_scale - counter;
@@ -1934,13 +1934,13 @@ uint16_t mode_pride_2015(void) {
   uint16_t sPseudotime = SEGENV.step;
   uint16_t sHue16 = SEGENV.aux0;
 
-  uint8_t sat8 = beatsin88( 87, 220, 250);
-  uint8_t brightdepth = beatsin88( 341, 96, 224);
-  uint16_t brightnessthetainc16 = beatsin88( 203, (25 * 256), (40 * 256));
-  uint8_t msmultiplier = beatsin88(147, 23, 60);
+  uint8_t sat8 = beatsin88_t( 87, 220, 250);
+  uint8_t brightdepth = beatsin88_t( 341, 96, 224);
+  uint16_t brightnessthetainc16 = beatsin88_t( 203, (25 * 256), (40 * 256));
+  uint8_t msmultiplier = beatsin88_t(147, 23, 60);
 
   uint16_t hue16 = sHue16;//gHue * 256;
-  uint16_t hueinc16 = beatsin88(113, 1, 3000);
+  uint16_t hueinc16 = beatsin88_t(113, 1, 3000);
 
   if(SEGENV.call == 0) {
     SEGMENT.setUpLeds();  // WLEDMM use lossless getPixelColor()
@@ -1948,15 +1948,14 @@ uint16_t mode_pride_2015(void) {
   }
 
   sPseudotime += duration * msmultiplier;
-  sHue16 += duration * beatsin88( 400, 5,9);
+  sHue16 += duration * beatsin88_t( 400, 5,9);
   uint16_t brightnesstheta16 = sPseudotime;
-
   for (int i = 0 ; i < SEGLEN; i++) {
     hue16 += hueinc16;
     uint8_t hue8 = hue16 >> 8;
 
     brightnesstheta16  += brightnessthetainc16;
-    uint16_t b16 = sin16( brightnesstheta16  ) + 32768;
+    uint16_t b16 = sin16_t( brightnesstheta16  ) + 32768;
 
     uint16_t bri16 = (uint32_t)((uint32_t)b16 * (uint32_t)b16) / 65536;
     uint8_t bri8 = (uint32_t)(((uint32_t)bri16) * brightdepth) / 65536;
@@ -2047,7 +2046,7 @@ uint16_t mode_juggle(void) {
   CRGB fastled_col;
   byte dothue = 0;
   for (int i = 0; i < 8; i++) {
-    uint16_t index = 0 + beatsin88((16 + SEGMENT.speed)*(i + 7), 0, SEGLEN -1);
+    uint16_t index = 0 + beatsin88_t((16 + SEGMENT.speed)*(i + 7), 0, SEGLEN -1);
     fastled_col = CRGB(SEGMENT.getPixelColor(index));
     fastled_col |= (SEGMENT.palette==0)?CHSV(dothue, 220, 255):ColorFromPalette(SEGPALETTE, dothue, 255);
     SEGMENT.setPixelColor(index, fastled_col);
@@ -2174,15 +2173,15 @@ uint16_t mode_colorwaves() {
   uint16_t sPseudotime = SEGENV.step;
   uint16_t sHue16 = SEGENV.aux0;
 
-  uint8_t brightdepth = beatsin88(341, 96, 224);
-  uint16_t brightnessthetainc16 = beatsin88( 203, (25 * 256), (40 * 256));
-  uint8_t msmultiplier = beatsin88(147, 23, 60);
+  uint8_t brightdepth = beatsin88_t(341, 96, 224);
+  uint16_t brightnessthetainc16 = beatsin88_t( 203, (25 * 256), (40 * 256));
+  uint8_t msmultiplier = beatsin88_t(147, 23, 60);
 
   uint16_t hue16 = sHue16;//gHue * 256;
-  uint16_t hueinc16 = beatsin88(113, 60, 300)*SEGMENT.intensity*10/255;  // Use the Intensity Slider for the hues
+  uint16_t hueinc16 = beatsin88_t(113, 60, 300)*SEGMENT.intensity*10/255;  // Use the Intensity Slider for the hues
 
   sPseudotime += duration * msmultiplier;
-  sHue16 += duration * beatsin88(400, 5, 9);
+  sHue16 += duration * beatsin88_t(400, 5, 9);
   uint16_t brightnesstheta16 = sPseudotime;
 
   if(SEGENV.call == 0) {
@@ -2201,7 +2200,7 @@ uint16_t mode_colorwaves() {
     }
 
     brightnesstheta16  += brightnessthetainc16;
-    uint16_t b16 = sin16(brightnesstheta16) + 32768;
+    uint16_t b16 = sin16_t(brightnesstheta16) + 32768;
 
     uint16_t bri16 = (uint32_t)((uint32_t)b16 * (uint32_t)b16) / 65536;
     uint8_t bri8 = (uint32_t)(((uint32_t)bri16) * brightdepth) / 65536;
@@ -2221,7 +2220,7 @@ static const char _data_FX_MODE_COLORWAVES[] PROGMEM = "Colorwaves@!,Hue;!;!";
 uint16_t mode_bpm() {
   //CRGB fastled_col;
   uint32_t stp = (strip.now / 20) & 0xFF;
-  uint8_t beat = beatsin8(SEGMENT.speed, 64, 255);
+  uint8_t beat = beatsin8_t(SEGMENT.speed, 64, 255);
   for (int i = 0; i < SEGLEN; i++) {
     //fastled_col = ColorFromPalette(SEGPALETTE, stp + (i * 2), beat - stp + (i * 10));
     //SEGMENT.setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
@@ -2242,7 +2241,7 @@ uint16_t mode_fillnoise8() {
     //SEGMENT.setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
     SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(index, false, PALETTE_SOLID_WRAP, 0));
   }
-  SEGENV.step += beatsin8(SEGMENT.speed, 1, 6); //10,1,4
+  SEGENV.step += beatsin8_t(SEGMENT.speed, 1, 6); //10,1,4
 
   return FRAMETIME;
 }
@@ -2255,13 +2254,13 @@ uint16_t mode_noise16_1() {
   SEGENV.step += (1 + SEGMENT.speed/16);
 
   for (int i = 0; i < SEGLEN; i++) {
-    uint16_t shift_x = beatsin8(11);                          // the x position of the noise field swings @ 17 bpm
+    uint16_t shift_x = beatsin8_t(11);                          // the x position of the noise field swings @ 17 bpm
     uint16_t shift_y = SEGENV.step/42;                        // the y position becomes slowly incremented
     uint16_t real_x = (i + shift_x) * scale;                  // the x position of the noise field swings @ 17 bpm
     uint16_t real_y = (i + shift_y) * scale;                  // the y position becomes slowly incremented
     uint32_t real_z = SEGENV.step;                            // the z position becomes quickly incremented
     uint8_t noise = inoise16(real_x, real_y, real_z) >> 8;    // get the noise data and scale it down
-    uint8_t index = sin8(noise * 3);                          // map LED color based on noise data
+    uint8_t index = sin8_t(noise * 3);                          // map LED color based on noise data
 
     //fastled_col = ColorFromPalette(SEGPALETTE, index, 255, LINEARBLEND);   // With that value, look up the 8 bit colour palette value and assign it to the current LED.
     //SEGMENT.setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
@@ -2282,7 +2281,7 @@ uint16_t mode_noise16_2() {
     uint16_t shift_x = SEGENV.step >> 6;                        // x as a function of time
     uint32_t real_x = (i + shift_x) * scale;                    // calculate the coordinates within the noise field
     uint8_t noise = inoise16(real_x, 0, 4223) >> 8;             // get the noise data and scale it down
-    uint8_t index = sin8(noise * 3);                            // map led color based on noise data
+    uint8_t index = sin8_t(noise * 3);                          // map led color based on noise data
 
     //fastled_col = ColorFromPalette(SEGPALETTE, index, noise, LINEARBLEND);   // With that value, look up the 8 bit colour palette value and assign it to the current LED.
     //SEGMENT.setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
@@ -2306,7 +2305,7 @@ uint16_t mode_noise16_3() {
     uint32_t real_y = (i + shift_y) * scale;                  // based on the precalculated positions
     uint32_t real_z = SEGENV.step*8;
     uint8_t noise = inoise16(real_x, real_y, real_z) >> 8;    // get the noise data and scale it down
-    uint8_t index = sin8(noise * 3);                          // map led color based on noise data
+    uint8_t index = sin8_t(noise * 3);                        // map led color based on noise data
 
     //fastled_col = ColorFromPalette(SEGPALETTE, index, noise, LINEARBLEND);   // With that value, look up the 8 bit colour palette value and assign it to the current LED.
     //SEGMENT.setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
@@ -2395,14 +2394,14 @@ static const char _data_FX_MODE_COLORTWINKLE[] PROGMEM = "Colortwinkles@Fade spe
 //Calm effect, like a lake at night
 uint16_t mode_lake() {
   uint8_t sp = SEGMENT.speed/10;
-  int wave1 = beatsin8(sp +2, -64,64);
-  int wave2 = beatsin8(sp +1, -64,64);
-  uint8_t wave3 = beatsin8(sp +2,   0,80);
+  int wave1 = beatsin8_t(sp +2, -64,64);
+  int wave2 = beatsin8_t(sp +1, -64,64);
+  uint8_t wave3 = beatsin8_t(sp +2,   0,80);
   //CRGB fastled_col;
 
   for (int i = 0; i < SEGLEN; i++)
   {
-    int index = cos8((i*15)+ wave1)/2 + cubicwave8((i*23)+ wave2)/2;
+    int index = cos8_t((i*15)+ wave1)/2 + cubicwave8((i*23)+ wave2)/2;
     uint8_t lum = (index > wave3) ? index - wave3 : 0;
     //fastled_col = ColorFromPalette(SEGPALETTE, map(index,0,255,0,240), lum, LINEARBLEND);
     //SEGMENT.setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
@@ -2569,7 +2568,7 @@ uint16_t ripple_base()
         propI /= 2;
         uint16_t cx = rippleorigin >> 8;
         uint16_t cy = rippleorigin & 0xFF;
-        uint8_t mag = scale8(sin8((propF>>2)), amp);
+        uint8_t mag = scale8(sin8_t((propF>>2)), amp);
         if (propI > 0) SEGMENT.drawCircle(cx, cy, propI, color_blend(SEGMENT.getPixelColorXY(cx + propI, cy), col, mag), true);
       } else
       #endif
@@ -2644,7 +2643,7 @@ CRGB twinklefox_one_twinkle(uint32_t ms, uint8_t salt, bool cat)
   uint16_t ticks = ms / SEGENV.aux0;
   uint8_t fastcycle8 = ticks;
   uint16_t slowcycle16 = (ticks >> 8) + salt;
-  slowcycle16 += sin8(slowcycle16);
+  slowcycle16 += sin8_t(slowcycle16);
   slowcycle16 = (slowcycle16 * 2053) + 1384;
   uint8_t slowcycle8 = (slowcycle16 & 0xFF) + (slowcycle16 >> 8);
 
@@ -3115,7 +3114,7 @@ uint16_t sinelon_base(bool dual, bool rainbow=false) {
   if (SEGLEN == 1) return mode_static();
   if (SEGENV.call == 0) { SEGENV.setUpLeds(); SEGMENT.fill(BLACK); }  // WLEDMM use lossless getPixelColor()
   SEGMENT.fade_out(SEGMENT.intensity);
-  uint16_t pos = beatsin16(SEGMENT.speed/10,0,SEGLEN-1);
+  uint16_t pos = beatsin16_t(SEGMENT.speed/10,0,SEGLEN-1);
   if (SEGENV.call == 0) SEGENV.aux0 = pos;
   uint32_t color1 = SEGMENT.color_from_palette(pos, true, false, 0);
   uint32_t color2 = SEGCOLOR(2);
@@ -3941,13 +3940,13 @@ uint16_t mode_plasma(void) {
   if (SEGENV.call == 0) {
     SEGENV.aux0 = random8(0,2);  // add a bit of randomness
   }
-  uint8_t thisPhase = beatsin8(6+SEGENV.aux0,-64,64);
-  uint8_t thatPhase = beatsin8(7+SEGENV.aux0,-64,64);
+  uint8_t thisPhase = beatsin8_t(6+SEGENV.aux0,-64,64);
+  uint8_t thatPhase = beatsin8_t(7+SEGENV.aux0,-64,64);
 
   for (int i = 0; i < SEGLEN; i++) {   // For each of the LED's in the strand, set color &  brightness based on a wave as follows:
     uint8_t colorIndex = cubicwave8((i*(2+ 3*(SEGMENT.speed >> 5))+thisPhase) & 0xFF)/2   // factor=23 // Create a wave and add a phase change and add another wave with its own phase change.
-                             + cos8((i*(1+ 2*(SEGMENT.speed >> 5))+thatPhase) & 0xFF)/2;  // factor=15 // Hey, you can even change the frequencies if you wish.
-    uint8_t thisBright = qsub8(colorIndex, beatsin8(7,0, (128 - (SEGMENT.intensity>>1))));
+                             + cos8_t((i*(1+ 2*(SEGMENT.speed >> 5))+thatPhase) & 0xFF)/2;  // factor=15 // Hey, you can even change the frequencies if you wish.
+    uint8_t thisBright = qsub8(colorIndex, beatsin8_t(7,0, (128 - (SEGMENT.intensity>>1))));
     //CRGB color = ColorFromPalette(SEGPALETTE, colorIndex, thisBright, LINEARBLEND);
     //SEGMENT.setPixelColor(i, color.red, color.green, color.blue);
     SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(colorIndex, false, PALETTE_SOLID_WRAP, 0, thisBright));
@@ -4076,10 +4075,10 @@ CRGB pacifica_one_layer(uint16_t i, CRGBPalette16& p, uint16_t cistart, uint16_t
   uint16_t wavescale_half = (wavescale >> 1) + 20;
 
   waveangle += ((120 + SEGMENT.intensity) * i); //original 250 * i
-  uint16_t s16 = sin16(waveangle) + 32768;
+  uint16_t s16 = sin16_t(waveangle) + 32768;
   uint16_t cs = scale16(s16, wavescale_half) + wavescale_half;
   ci += (cs * i);
-  uint16_t sindex16 = sin16(ci) + 32768;
+  uint16_t sindex16 = sin16_t(ci) + 32768;
   uint8_t sindex8 = scale16(sindex16, 240);
   return ColorFromPalette(p, sindex8, bri, LINEARBLEND);
 }
@@ -4111,34 +4110,34 @@ uint16_t mode_pacifica()
   uint64_t deltat = (strip.now >> 2) + ((strip.now * SEGMENT.speed) >> 7);
   strip.now = deltat;
 
-  uint16_t speedfactor1 = beatsin16(3, 179, 269);
-  uint16_t speedfactor2 = beatsin16(4, 179, 269);
+  uint16_t speedfactor1 = beatsin16_t(3, 179, 269);
+  uint16_t speedfactor2 = beatsin16_t(4, 179, 269);
   uint32_t deltams1 = (deltams * speedfactor1) / 256;
   uint32_t deltams2 = (deltams * speedfactor2) / 256;
   uint32_t deltams21 = (deltams1 + deltams2) / 2;
-  sCIStart1 += (deltams1 * beatsin88(1011,10,13));
-  sCIStart2 -= (deltams21 * beatsin88(777,8,11));
-  sCIStart3 -= (deltams1 * beatsin88(501,5,7));
-  sCIStart4 -= (deltams2 * beatsin88(257,4,6));
+  sCIStart1 += (deltams1 * beatsin88_t(1011,10,13));
+  sCIStart2 -= (deltams21 * beatsin88_t(777,8,11));
+  sCIStart3 -= (deltams1 * beatsin88_t(501,5,7));
+  sCIStart4 -= (deltams2 * beatsin88_t(257,4,6));
   SEGENV.aux0 = sCIStart1; SEGENV.aux1 = sCIStart2;
   SEGENV.step = sCIStart4; SEGENV.step = (SEGENV.step << 16) + sCIStart3;
 
   // Clear out the LED array to a dim background blue-green
   //SEGMENT.fill(132618);
 
-  uint8_t basethreshold = beatsin8( 9, 55, 65);
+  uint8_t basethreshold = beatsin8_t( 9, 55, 65);
   uint8_t wave = beat8( 7 );
 
   for (int i = 0; i < SEGLEN; i++) {
     CRGB c = CRGB(2, 6, 10);
     // Render each of four layers, with different scales and speeds, that vary over time
-    c += pacifica_one_layer(i, pacifica_palette_1, sCIStart1, beatsin16(3, 11 * 256, 14 * 256), beatsin8(10, 70, 130), 0-beat16(301));
-    c += pacifica_one_layer(i, pacifica_palette_2, sCIStart2, beatsin16(4,  6 * 256,  9 * 256), beatsin8(17, 40,  80),   beat16(401));
-    c += pacifica_one_layer(i, pacifica_palette_3, sCIStart3,                         6 * 256 , beatsin8(9, 10,38)   , 0-beat16(503));
-    c += pacifica_one_layer(i, pacifica_palette_3, sCIStart4,                         5 * 256 , beatsin8(8, 10,28)   ,   beat16(601));
+    c += pacifica_one_layer(i, pacifica_palette_1, sCIStart1, beatsin16_t(3, 11 * 256, 14 * 256), beatsin8_t(10, 70, 130), 0-beat16(301));
+    c += pacifica_one_layer(i, pacifica_palette_2, sCIStart2, beatsin16_t(4,  6 * 256,  9 * 256), beatsin8_t(17, 40,  80),   beat16(401));
+    c += pacifica_one_layer(i, pacifica_palette_3, sCIStart3,                         6 * 256 , beatsin8_t(9, 10,38)   , 0-beat16(503));
+    c += pacifica_one_layer(i, pacifica_palette_3, sCIStart4,                         5 * 256 , beatsin8_t(8, 10,28)   ,   beat16(601));
 
     // Add extra 'white' to areas where the four layers of light have lined up brightly
-    uint8_t threshold = scale8( sin8( wave), 20) + basethreshold;
+    uint8_t threshold = scale8( sin8_t( wave), 20) + basethreshold;
     wave += 7;
     uint8_t l = c.getAverageLight();
     if (l > threshold) {
@@ -4262,7 +4261,7 @@ uint16_t mode_twinkleup(void) {                 // A very short twinkle routine
 
   for (int i = 0; i < SEGLEN; i++) {
     uint8_t ranstart = random8();               // The starting value (aka brightness) for each pixel. Must be consistent each time through the loop for this to work.
-    uint8_t pixBri = sin8(ranstart + 16 * strip.now/(256-SEGMENT.speed));
+    uint8_t pixBri = sin8_t(ranstart + 16 * strip.now/(256-SEGMENT.speed));
     if (random8() > SEGMENT.intensity) pixBri = 0;
     SEGMENT.setPixelColor(i, color_blend(SEGCOLOR(1), SEGMENT.color_from_palette(random8()+strip.now/100, false, PALETTE_SOLID_WRAP, 0), pixBri));
   }
@@ -4305,7 +4304,7 @@ uint16_t mode_noisepal(void) {                                    // Slow noise
     SEGMENT.setPixelColor(i, color.red, color.green, color.blue);
   }
 
-  SEGENV.aux0 += beatsin8(10,1,4);                                        // Moving along the distance. Vary it a bit with a sine wave.
+  SEGENV.aux0 += beatsin8_t(10,1,4);                                        // Moving along the distance. Vary it a bit with a sine wave.
 
   return FRAMETIME;
 }
@@ -4388,7 +4387,7 @@ uint16_t mode_chunchun(void)
   for (int i = 0; i < numBirds; i++)
   {
     counter -= span;
-    uint16_t megumin = sin16(counter) + 0x8000;
+    uint16_t megumin = sin16_t(counter) + 0x8000;
     uint16_t bird = uint32_t(megumin * SEGLEN) >> 16;
     uint32_t c = SEGMENT.color_from_palette((i * 255)/ numBirds, false, false, 0);  // no palette wrapping
     bird = constrain(bird, 0, SEGLEN-1);
@@ -4558,7 +4557,7 @@ uint16_t mode_washing_machine(void) {
   SEGENV.step += (speed * 2048) / (512 - SEGMENT.speed);
 
   for (int i = 0; i < SEGLEN; i++) {
-    uint8_t col = sin8(((SEGMENT.intensity / 25 + 1) * 255 * i / SEGLEN) + (SEGENV.step >> 7));
+    uint8_t col = sin8_t(((SEGMENT.intensity / 25 + 1) * 255 * i / SEGLEN) + (SEGENV.step >> 7));
     SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(col, false, PALETTE_SOLID_WRAP, 3));
   }
 
@@ -4911,12 +4910,12 @@ static const char _data_FX_MODE_PERLINMOVE[] PROGMEM = "Perlin Move@!,# of pixel
 /////////////////////////
 //     Waveins         //
 /////////////////////////
-// Uses beatsin8() + phase shifting. By: Andrew Tuline
+// Uses beatsin8_t() + phase shifting. By: Andrew Tuline
 uint16_t mode_wavesins(void) {
 
   for (int i = 0; i < SEGLEN; i++) {
-    uint8_t bri = sin8(strip.now/4 + i * SEGMENT.intensity);
-    uint8_t index = beatsin8(SEGMENT.speed, SEGMENT.custom1, SEGMENT.custom1+SEGMENT.custom2, 0, i * (SEGMENT.custom3<<3));
+    uint8_t bri = sin8_t(strip.now/4 + i * SEGMENT.intensity);
+    uint8_t index = beatsin8_t(SEGMENT.speed, SEGMENT.custom1, SEGMENT.custom1+SEGMENT.custom2, 0, i * (SEGMENT.custom3<<3)); // custom3 is reduced resolution slider
     //SEGMENT.setPixelColor(i, ColorFromPalette(SEGPALETTE, index, bri, LINEARBLEND));
     SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(index, false, PALETTE_SOLID_WRAP, 0, bri));
   }
@@ -4938,9 +4937,9 @@ uint16_t mode_FlowStripe(void) {
 
   for (int i = 0; i < SEGLEN; i++) {
     int c = (abs(i - hl) / hl) * 127;
-    c = sin8(c);
-    c = sin8(c / 2 + t);
-    byte b = sin8(c + t/8);
+    c = sin8_t(c);
+    c = sin8_t(c / 2 + t);
+    byte b = sin8_t(c + t/8);
     SEGMENT.setPixelColor(i, CHSV(b + hue, 255, 255));
   }
 
@@ -4974,14 +4973,14 @@ uint16_t mode_2DBlackHole(void) {            // By: Stepko https://editor.soulma
   unsigned long t = strip.now;                    // timebase
   // outer stars
   for (unsigned i = 0; i < 8; i++) {
-    x = beatsin8(SEGMENT.custom1>>3,   0, cols - 1, 0, ((i % 2) ? 128 : 0) + (t * i)/ratio);
-    y = beatsin8(SEGMENT.intensity>>3, 0, rows - 1, 0, ((i % 2) ? 192 : 64) + (t * i)/ratio);
+    x = beatsin8_t(SEGMENT.custom1>>3,   0, cols - 1, 0, ((i % 2) ? 128 : 0) + (t * i)/ratio);
+    y = beatsin8_t(SEGMENT.intensity>>3, 0, rows - 1, 0, ((i % 2) ? 192 : 64) + (t * i)/ratio);
     SEGMENT.addPixelColorXY(x, y, CHSV(i*32, 255, 255));
   }
   // inner stars
   for (size_t i = 0; i < 4; i++) {
-    x = beatsin8(SEGMENT.custom2>>3, cols/4, cols - 1 - cols/4, 0, ((i % 2) ? 128 : 0) + (t * i)/ratio);
-    y = beatsin8(SEGMENT.custom3   , rows/4, rows - 1 - rows/4, 0, ((i % 2) ? 192 : 64) + (t * i)/ratio);
+    x = beatsin8_t(SEGMENT.custom2>>3, cols/4, cols - 1 - cols/4, 0, ((i % 2) ? 128 : 0) + (t * i)/ratio);
+    y = beatsin8_t(SEGMENT.custom3   , rows/4, rows - 1 - rows/4, 0, ((i % 2) ? 192 : 64) + (t * i)/ratio);
     SEGMENT.addPixelColorXY(x, y, CHSV(i*32, 255, 255));
   }
   // central white dot
@@ -5017,10 +5016,10 @@ uint16_t mode_2DColoredBursts() {              // By: ldirko   https://editor.so
   SEGENV.aux0++;  // hue
   SEGMENT.fadeToBlackBy(40);
   for (size_t i = 0; i < numLines; i++) {
-    byte x1 = beatsin8(2 + SEGMENT.speed/16, 0, (cols - 1));
-    byte x2 = beatsin8(1 + SEGMENT.speed/16, 0, (rows - 1));
-    byte y1 = beatsin8(5 + SEGMENT.speed/16, 0, (cols - 1), 0, i * 24);
-    byte y2 = beatsin8(3 + SEGMENT.speed/16, 0, (rows - 1), 0, i * 48 + 64);
+    byte x1 = beatsin8_t(2 + SEGMENT.speed/16, 0, (cols - 1));
+    byte x2 = beatsin8_t(1 + SEGMENT.speed/16, 0, (rows - 1));
+    byte y1 = beatsin8_t(5 + SEGMENT.speed/16, 0, (cols - 1), 0, i * 24);
+    byte y2 = beatsin8_t(3 + SEGMENT.speed/16, 0, (rows - 1), 0, i * 48 + 64);
     CRGB color = ColorFromPalette(SEGPALETTE, i * 255 / numLines + (SEGENV.aux0&0xFF), 255, LINEARBLEND);
 
     byte xsteps = abs8(x1 - y1) + 1;
@@ -5068,14 +5067,14 @@ uint16_t mode_2Ddna(void) {         // dna originally by by ldirko at https://pa
   int lastY1 = -1;
   int lastY2 = -1;
   for (int i = 0; i < cols; i++) {
-    int posY1 = beatsin8(SEGMENT.speed/8, 0, rows-1, 0, i*4    );
-    int posY2 = beatsin8(SEGMENT.speed/8, 0, rows-1, 0, i*4+128);
+    int posY1 = beatsin8_t(SEGMENT.speed/8, 0, rows-1, 0, i*4    );
+    int posY2 = beatsin8_t(SEGMENT.speed/8, 0, rows-1, 0, i*4+128);
     if ((i==0) || ((abs(lastY1 - posY1) < 2) && (abs(lastY2 - posY2) < 2))) {   // use original code when no holes
-      SEGMENT.setPixelColorXY(i, posY1, ColorFromPalette(SEGPALETTE, i*5+strip.now/17, beatsin8(5, 55, 255, 0, i*10), LINEARBLEND));
-      SEGMENT.setPixelColorXY(i, posY2, ColorFromPalette(SEGPALETTE, i*5+128+strip.now/17, beatsin8(5, 55, 255, 0, i*10+128), LINEARBLEND));
+      SEGMENT.setPixelColorXY(i, posY1, ColorFromPalette(SEGPALETTE, i*5+strip.now/17, beatsin8_t(5, 55, 255, 0, i*10), LINEARBLEND));
+      SEGMENT.setPixelColorXY(i, posY2, ColorFromPalette(SEGPALETTE, i*5+128+strip.now/17, beatsin8_t(5, 55, 255, 0, i*10+128), LINEARBLEND));
     } else {                                                                    // draw line to prevent holes
-      SEGMENT.drawLine(i-1, lastY1, i, posY1, ColorFromPalette(SEGPALETTE, i*5+strip.now/17, beatsin8(5, 55, 255, 0, i*10), LINEARBLEND));
-      SEGMENT.drawLine(i-1, lastY2, i, posY2, ColorFromPalette(SEGPALETTE, i*5+128+strip.now/17, beatsin8(5, 55, 255, 0, i*10+128), LINEARBLEND));
+      SEGMENT.drawLine(i-1, lastY1, i, posY1, ColorFromPalette(SEGPALETTE, i*5+strip.now/17, beatsin8_t(5, 55, 255, 0, i*10), LINEARBLEND));
+      SEGMENT.drawLine(i-1, lastY2, i, posY2, ColorFromPalette(SEGPALETTE, i*5+128+strip.now/17, beatsin8_t(5, 55, 255, 0, i*10+128), LINEARBLEND));
     }
     lastY1 = posY1;
     lastY2 = posY2;
@@ -5108,8 +5107,8 @@ uint16_t mode_2DDNASpiral() {               // By: ldirko  https://editor.soulma
   SEGMENT.fadeToBlackBy(135);
 
   for (int i = 0; i < rows; i++) {
-    uint16_t x  = beatsin8(speeds, 0, cols - 1, 0, i * freq) + beatsin8(speeds - 7, 0, cols - 1, 0, i * freq + 128);
-    uint16_t x1 = beatsin8(speeds, 0, cols - 1, 0, 128 + i * freq) + beatsin8(speeds - 7, 0, cols - 1, 0, 128 + 64 + i * freq);
+    uint16_t x  = beatsin8_t(speeds, 0, cols - 1, 0, i * freq) + beatsin8_t(speeds - 7, 0, cols - 1, 0, i * freq + 128);
+    uint16_t x1 = beatsin8_t(speeds, 0, cols - 1, 0, 128 + i * freq) + beatsin8_t(speeds - 7, 0, cols - 1, 0, 128 + 64 + i * freq);
     uint8_t hue = (i * 128 / rows) + ms;
     // skip every 4th row every now and then (fade it more)
     if ((i + ms / 8) & 3) {
@@ -5241,9 +5240,9 @@ uint16_t mode_2DFrizzles(void) {                 // By: Stepko https://editor.so
 
   SEGMENT.fadeToBlackBy(16);
   for (size_t i = 8; i > 0; i--) {
-    SEGMENT.addPixelColorXY(beatsin8(SEGMENT.speed/8 + i, 0, cols - 1),
-                            beatsin8(SEGMENT.intensity/8 - i, 0, rows - 1),
-                            ColorFromPalette(SEGPALETTE, beatsin8(12, 0, 255), 255, LINEARBLEND));
+    SEGMENT.addPixelColorXY(beatsin8_t(SEGMENT.speed/8 + i, 0, cols - 1),
+                            beatsin8_t(SEGMENT.intensity/8 - i, 0, rows - 1),
+                            ColorFromPalette(SEGPALETTE, beatsin8_t(12, 0, 255), 255, LINEARBLEND));
   }
   SEGMENT.blur(SEGMENT.custom1>>3);
 
@@ -5661,7 +5660,7 @@ uint16_t mode_2DHiphotic() {                        //  By: ldirko  https://edit
 
   for (int x = 0; x < cols; x++) {
     for (int y = 0; y < rows; y++) {
-      SEGMENT.setPixelColorXY(x, y, SEGMENT.color_from_palette(sin8(cos8(x * SEGMENT.speed/16 + a / 3) + sin8(y * SEGMENT.intensity/16 + a / 4) + a), false, PALETTE_SOLID_WRAP, 0));
+      SEGMENT.setPixelColorXY(x, y, SEGMENT.color_from_palette(sin8_t(cos8_t(x * SEGMENT.speed/16 + a / 3) + sin8_t(y * SEGMENT.intensity/16 + a / 4) + a), false, PALETTE_SOLID_WRAP, 0));
     }
   }
 
@@ -5740,8 +5739,10 @@ uint16_t mode_2DJulia(void) {                           // An animated Julia set
   reAl = -0.94299f;               // PixelBlaze example
   imAg = 0.3162f;
 
-  reAl += sinf((float)strip.now/305.f)/20.f;
-  imAg += sinf((float)strip.now/405.f)/20.f;
+  //reAl += sinf((float)strip.now/305.f)/20.f;
+  //imAg += sinf((float)strip.now/405.f)/20.f;
+  reAl += (float)sin16_t(strip.now * 34) / 655340.f;
+  imAg += (float)sin16_t(strip.now * 26) / 655340.f;
 
   dx = (xmax - xmin) / (cols);     // Scale the delta x and y values to our matrix size.
   dy = (ymax - ymin) / (rows);
@@ -5820,8 +5821,8 @@ uint16_t mode_2DLissajous(void) {            // By: Andrew Tuline
       int maxLoops = max(192, 4*(cols+rows));
       maxLoops = ((maxLoops / 128) +1) * 128; // make sure whe have half or full turns => multiples of 128
       for (int i=0; i < maxLoops; i ++) {
-        float xlocn = float(sin8(phase/2 + (i* SEGMENT.speed)/64)) / 255.0f;  // WLEDMM align speed with original effect
-        float ylocn = float(cos8(phase/2 + i*2)) / 255.0f;
+        float xlocn = float(sin8_t(phase/2 + (i* SEGMENT.speed)/64)) / 255.0f;  // WLEDMM align speed with original effect
+        float ylocn = float(cos8_t(phase/2 + i*2)) / 255.0f;
         //SEGMENT.setPixelColorXY(xlocn, ylocn, SEGMENT.color_from_palette(strip.now/100+i, false, PALETTE_SOLID_WRAP, 0)); // draw pixel with anti-aliasing
         unsigned palIndex = (256*ylocn) + phase/2 + (i* SEGMENT.speed)/64;
         //SEGMENT.setPixelColorXY(xlocn, ylocn, SEGMENT.color_from_palette(palIndex, false, PALETTE_SOLID_WRAP, 0)); // draw pixel with anti-aliasing - color follows rotation
@@ -5832,8 +5833,8 @@ uint16_t mode_2DLissajous(void) {            // By: Andrew Tuline
   } else
   for (int i=0; i < 256; i ++) {
     //WLEDMM: stick to the original calculations of xlocn and ylocn
-    uint_fast8_t xlocn = sin8(phase/2 + (i*SEGMENT.speed)/64);
-    uint_fast8_t ylocn = cos8(phase/2 + i*2);
+    uint_fast8_t xlocn = sin8_t(phase/2 + (i*SEGMENT.speed)/64);
+    uint_fast8_t ylocn = cos8_t(phase/2 + i*2);
     xlocn = (cols < 2) ? 1 : (map(2*xlocn, 0,511, 0,2*(cols-1)) +1) /2;    // softhack007: "*2 +1" for proper rounding
     ylocn = (rows < 2) ? 1 : (map(2*ylocn, 0,511, 0,2*(rows-1)) +1) /2;    // "rows > 2" is needed to avoid div/0 in map()
     SEGMENT.setPixelColorXY((uint8_t)xlocn, (uint8_t)ylocn, SEGMENT.color_from_palette(strip.now/100+i, false, PALETTE_SOLID_WRAP, 0));
@@ -5939,8 +5940,8 @@ uint16_t mode_2Dmetaballs(void) {   // Metaballs by Stefan Petrick. Cannot have
   uint8_t y3 = map(inoise8(strip.now * speed, 25355, 22685), 0, 255, 0, rows-1);
 
   // and one Lissajou function
-  uint8_t x1 = beatsin8(23 * speed, 0, cols-1);
-  uint8_t y1 = beatsin8(28 * speed, 0, rows-1);
+  uint8_t x1 = beatsin8_t(23 * speed, 0, cols-1);
+  uint8_t y1 = beatsin8_t(28 * speed, 0, rows-1);
 
   for (int y = 0; y < rows; y++) {
     for (int x = 0; x < cols; x++) {
@@ -6142,7 +6143,7 @@ uint16_t mode_2DPulser(void) {                       // By: ldirko   https://edi
 
   uint32_t a = strip.now / (18 - SEGMENT.speed / 16);
   uint16_t x = (a / 14) % cols;
-  uint16_t y = map((sin8(a * 5) + sin8(a * 4) + sin8(a * 2)), 0, 765, rows-1, 0);
+  uint16_t y = map((sin8_t(a * 5) + sin8_t(a * 4) + sin8_t(a * 2)), 0, 765, rows-1, 0);
   SEGMENT.setPixelColorXY(x, y, ColorFromPalette(SEGPALETTE, map(y, 0, rows-1, 0, 255), 255, LINEARBLEND));
 
   SEGMENT.blur(1 + (SEGMENT.intensity>>4));
@@ -6169,10 +6170,10 @@ uint16_t mode_2DSindots(void) {                             // By: ldirko   http
   SEGMENT.fadeToBlackBy(SEGMENT.custom1>>3);
 
   byte t1 = strip.now / (257 - SEGMENT.speed); // 20;
-  byte t2 = sin8(t1) / 4 * 2;
+  byte t2 = sin8_t(t1) / 4 * 2;
   for (int i = 0; i < 13; i++) {
-    byte x = sin8(t1 + i * SEGMENT.intensity/8)*(cols-1)/255;  // max index now 255x15/255=15!
-    byte y = sin8(t2 + i * SEGMENT.intensity/8)*(rows-1)/255;  // max index now 255x15/255=15!
+    byte x = sin8_t(t1 + i * SEGMENT.intensity/8)*(cols-1)/255;  // max index now 255x15/255=15!
+    byte y = sin8_t(t2 + i * SEGMENT.intensity/8)*(rows-1)/255;  // max index now 255x15/255=15!
     SEGMENT.setPixelColorXY(x, y, ColorFromPalette(SEGPALETTE, i * 255 / 13, 255, LINEARBLEND));
   }
   SEGMENT.blur(SEGMENT.custom2>>3);
@@ -6206,12 +6207,12 @@ uint16_t mode_2Dsquaredswirl(void) {            // By: Mark Kriegsman. https://g
   SEGMENT.blur(blurAmount);
 
   // Use two out-of-sync sine waves
-  uint8_t i = beatsin8(19, kBorderWidth, cols-kBorderWidth);
-  uint8_t j = beatsin8(22, kBorderWidth, cols-kBorderWidth);
-  uint8_t k = beatsin8(17, kBorderWidth, cols-kBorderWidth);
-  uint8_t m = beatsin8(18, kBorderWidth, rows-kBorderWidth);
-  uint8_t n = beatsin8(15, kBorderWidth, rows-kBorderWidth);
-  uint8_t p = beatsin8(20, kBorderWidth, rows-kBorderWidth);
+  uint8_t i = beatsin8_t(19, kBorderWidth, cols-kBorderWidth);
+  uint8_t j = beatsin8_t(22, kBorderWidth, cols-kBorderWidth);
+  uint8_t k = beatsin8_t(17, kBorderWidth, cols-kBorderWidth);
+  uint8_t m = beatsin8_t(18, kBorderWidth, rows-kBorderWidth);
+  uint8_t n = beatsin8_t(15, kBorderWidth, rows-kBorderWidth);
+  uint8_t p = beatsin8_t(20, kBorderWidth, rows-kBorderWidth);
 
   uint16_t ms = strip.now;
 
@@ -6293,19 +6294,19 @@ uint16_t mode_2Dtartan(void) {          // By: Elliott Kember  https://editor.so
 
   uint8_t hue, bri;
   size_t intensity;
-  int offsetX = beatsin16(3, -360, 360);
-  int offsetY = beatsin16(2, -360, 360);
+  int offsetX = beatsin16_t(3, -360, 360);
+  int offsetY = beatsin16_t(2, -360, 360);
   int sharpness = SEGMENT.custom3 / 8; // 0-3
 
   for (int x = 0; x < cols; x++) {
     for (int y = 0; y < rows; y++) {
-      hue = x * beatsin16(10, 1, 10) + offsetY;
-      intensity = bri = sin8(x * SEGMENT.speed/2 + offsetX);
+      hue = x * beatsin16_t(10, 1, 10) + offsetY;
+      intensity = bri = sin8_t(x * SEGMENT.speed/2 + offsetX);
       for (int i=0; i<sharpness; i++) intensity *= bri;
       intensity >>= 8*sharpness;
       SEGMENT.setPixelColorXY(x, y, ColorFromPalette(SEGPALETTE, hue, intensity, LINEARBLEND));
       hue = y * 3 + offsetX;
-      intensity = bri = sin8(y * SEGMENT.intensity/2 + offsetY);
+      intensity = bri = sin8_t(y * SEGMENT.intensity/2 + offsetY);
       for (int i=0; i<sharpness; i++) intensity *= bri;
       intensity >>= 8*sharpness;
       SEGMENT.addPixelColorXY(x, y, ColorFromPalette(SEGPALETTE, hue, intensity, LINEARBLEND));
@@ -6345,9 +6346,9 @@ uint16_t mode_2Dspaceships(void) {    //// Space ships by stepko (c)05.02.21 [ht
   SEGMENT.move(SEGENV.aux0, 1);
 
   for (size_t i = 0; i < 8; i++) {
-    byte x = beatsin8(12 + i, 2, cols - 3);
-    byte y = beatsin8(15 + i, 2, rows - 3);
-    CRGB color = ColorFromPalette(SEGPALETTE, beatsin8(12 + i, 0, 255), 255);
+    byte x = beatsin8_t(12 + i, 2, cols - 3);
+    byte y = beatsin8_t(15 + i, 2, rows - 3);
+    CRGB color = ColorFromPalette(SEGPALETTE, beatsin8_t(12 + i, 0, 255), 255);
     SEGMENT.addPixelColorXY(x, y, color);
     if (cols > 24 || rows > 24) {
       SEGMENT.addPixelColorXY(x+1, y, color);
@@ -6772,8 +6773,8 @@ uint16_t mode_2Ddriftrose(void) {
   SEGMENT.fadeToBlackBy(32+(SEGMENT.speed>>3));
   for (size_t i = 1; i < 37; i++) {
     float angle = float(DEG_TO_RAD) * i * 10;
-    uint32_t x = int((CX + (sinf(angle) * (beatsin8(i, 0, L2)-L))) * 255.f);
-    uint32_t y = int((CY + (cosf(angle) * (beatsin8(i, 0, L2)-L))) * 255.f);
+    uint32_t x = int((CX + (sinf(angle) * (beatsin8_t(i, 0, L2)-L))) * 255.f);
+    uint32_t y = int((CY + (cosf(angle) * (beatsin8_t(i, 0, L2)-L))) * 255.f);
     if ((x < wu_cols) && (y < wu_rows)) SEGMENT.wu_pixel(x, y, CHSV(i * 10, 255, 255));
   }
   SEGMENT.blur((SEGMENT.intensity>>4)+1);
@@ -6944,10 +6945,10 @@ uint16_t mode_2DSwirl(void) {
 
   SEGMENT.blur(SEGMENT.custom1);
 
-  unsigned  i = beatsin8( 27*SEGMENT.speed/255, borderWidth, cols - borderWidth);
-  unsigned  j = beatsin8( 41*SEGMENT.speed/255, borderWidth, rows - borderWidth);
-  unsigned ni = (cols - 1) - i;
-  unsigned nj = (cols - 1) - j;
+  int  i = beatsin8_t( 27*SEGMENT.speed/255, borderWidth, cols - borderWidth);
+  int  j = beatsin8_t( 41*SEGMENT.speed/255, borderWidth, rows - borderWidth);
+  int ni = (cols - 1) - i;
+  int nj = (cols - 1) - j;
   uint16_t ms = strip.now;
 
   um_data_t *um_data = getAudioData();
@@ -7214,7 +7215,7 @@ uint16_t mode_juggles(void) {                   // Juggles. By Andrew Tuline.
 
   for (size_t i=0; i<SEGMENT.intensity/32+1U; i++) {
     // if SEGLEN equals 1, we will always set color to the first and only pixel, but the effect is still good looking
-    SEGMENT.setPixelColor(beatsin16(SEGMENT.speed/4+i*2,0,SEGLEN-1), color_blend(SEGCOLOR(1), SEGMENT.color_from_palette(strip.now/4+i*2, false, PALETTE_SOLID_WRAP, 0), my_sampleAgc));
+    SEGMENT.setPixelColor(beatsin16_t(SEGMENT.speed/4+i*2,0,SEGLEN-1), color_blend(SEGCOLOR(1), SEGMENT.color_from_palette(strip.now/4+i*2, false, PALETTE_SOLID_WRAP, 0), my_sampleAgc));
   }
 
   return FRAMETIME;
@@ -7301,8 +7302,8 @@ uint16_t mode_midnoise(void) {                  // Midnoise. By Andrew Tuline.
     SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(index, false, PALETTE_SOLID_WRAP, 0));
   }
 
-  SEGENV.aux0=SEGENV.aux0+beatsin8(5,0,10);
-  SEGENV.aux1=SEGENV.aux1+beatsin8(4,0,10);
+  SEGENV.aux0=SEGENV.aux0+beatsin8_t(5,0,10);
+  SEGENV.aux1=SEGENV.aux1+beatsin8_t(4,0,10);
 
   return FRAMETIME;
 } // mode_midnoise()
@@ -7362,8 +7363,8 @@ uint16_t mode_noisemeter(void) {                // Noisemeter. By Andrew Tuline.
     SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(index, false, PALETTE_SOLID_WRAP, 0));
   }
 
-  SEGENV.aux0+=beatsin8(5,0,10);
-  SEGENV.aux1+=beatsin8(4,0,10);
+  SEGENV.aux0+=beatsin8_t(5,0,10);
+  SEGENV.aux1+=beatsin8_t(4,0,10);
 
   return FRAMETIME;
 } // mode_noisemeter()
@@ -7425,13 +7426,13 @@ uint16_t mode_plasmoid(void) {                  // Plasmoid. By Andrew Tuline.
   //SEGMENT.fadeToBlackBy(32);
   SEGMENT.fadeToBlackBy(48);
   
-  plasmoip->thisphase += beatsin8(6,-4,4);                          // You can change direction and speed individually.
-  plasmoip->thatphase += beatsin8(7,-4,4);                          // Two phase values to make a complex pattern. By Andrew Tuline.
+  plasmoip->thisphase += beatsin8_t(6,-4,4);                          // You can change direction and speed individually.
+  plasmoip->thatphase += beatsin8_t(7,-4,4);                          // Two phase values to make a complex pattern. By Andrew Tuline.
 
   for (int i = 0; i < SEGLEN; i++) {                          // For each of the LED's in the strand, set a brightness based on a wave as follows.
     // updated, similar to "plasma" effect - softhack007
     uint8_t thisbright = cubicwave8(((i*(1 + (3*SEGMENT.speed/32)))+plasmoip->thisphase) & 0xFF)/2;
-    thisbright += cos8(((i*(97 +(5*SEGMENT.speed/32)))+plasmoip->thatphase) & 0xFF)/2; // Let's munge the brightness a bit and animate it all with the phases.
+    thisbright += cos8_t(((i*(97 +(5*SEGMENT.speed/32)))+plasmoip->thatphase) & 0xFF)/2; // Let's munge the brightness a bit and animate it all with the phases.
 
     uint8_t colorIndex=thisbright;
     if (volumeSmth * SEGMENT.intensity / 64 < thisbright) {thisbright = 0;}
@@ -8035,7 +8036,7 @@ uint16_t mode_rocktaves(void) {                 // Rocktaves. Same note from eac
   frTemp -=132;                                           // This should give us a base musical note of C3
   frTemp = fabsf(frTemp * 2.1f);                            // Fudge factors to compress octave range starting at 0 and going to 255;
 
-  uint16_t i = map(beatsin8(8+octCount*4, 0, 255, 0, octCount*8), 0, 255, 0, SEGLEN-1);
+  uint16_t i = map(beatsin8_t(8+octCount*4, 0, 255, 0, octCount*8), 0, 255, 0, SEGLEN-1);
   // i will be always constrained between 0 and 0 if SEGLEN equals 1
   i = constrain(i, 0, SEGLEN-1);
   SEGMENT.addPixelColor(i, color_blend(SEGCOLOR(1), SEGMENT.color_from_palette((uint8_t)frTemp, false, PALETTE_SOLID_WRAP, 0), volTemp));
@@ -8405,12 +8406,12 @@ uint16_t mode_2Ddistortionwaves() {
   uint16_t a2 = a/2;
   uint16_t a3 = a/3;
 
-  uint16_t cx =  beatsin8(10-speed,0,cols-1)*scale;
-  uint16_t cy =  beatsin8(12-speed,0,rows-1)*scale;
-  uint16_t cx1 = beatsin8(13-speed,0,cols-1)*scale;
-  uint16_t cy1 = beatsin8(15-speed,0,rows-1)*scale;
-  uint16_t cx2 = beatsin8(17-speed,0,cols-1)*scale;
-  uint16_t cy2 = beatsin8(14-speed,0,rows-1)*scale;
+  uint16_t cx =  beatsin8_t(10-speed,0,cols-1)*scale;
+  uint16_t cy =  beatsin8_t(12-speed,0,rows-1)*scale;
+  uint16_t cx1 = beatsin8_t(13-speed,0,cols-1)*scale;
+  uint16_t cy1 = beatsin8_t(15-speed,0,rows-1)*scale;
+  uint16_t cx2 = beatsin8_t(17-speed,0,cols-1)*scale;
+  uint16_t cy2 = beatsin8_t(14-speed,0,rows-1)*scale;
   
   uint16_t xoffs = 0;
   for (int x = 0; x < cols; x++) {
@@ -8420,17 +8421,17 @@ uint16_t mode_2Ddistortionwaves() {
     for (int y = 0; y < rows; y++) {
        yoffs += scale;
 
-      byte rdistort = cos8((cos8(((x<<3)+a )&255)+cos8(((y<<3)-a2)&255)+a3   )&255)>>1; 
-      byte gdistort = cos8((cos8(((x<<3)-a2)&255)+cos8(((y<<3)+a3)&255)+a+32 )&255)>>1; 
-      byte bdistort = cos8((cos8(((x<<3)+a3)&255)+cos8(((y<<3)-a) &255)+a2+64)&255)>>1; 
+      byte rdistort = cos8_t((cos8_t(((x<<3)+a )&255)+cos8_t(((y<<3)-a2)&255)+a3   )&255)>>1; 
+      byte gdistort = cos8_t((cos8_t(((x<<3)-a2)&255)+cos8_t(((y<<3)+a3)&255)+a+32 )&255)>>1; 
+      byte bdistort = cos8_t((cos8_t(((x<<3)+a3)&255)+cos8_t(((y<<3)-a) &255)+a2+64)&255)>>1; 
 
       byte valueR = rdistort+ w*  (a- ( ((xoffs - cx)  * (xoffs - cx)  + (yoffs - cy)  * (yoffs - cy))>>7  ));
       byte valueG = gdistort+ w*  (a2-( ((xoffs - cx1) * (xoffs - cx1) + (yoffs - cy1) * (yoffs - cy1))>>7 ));
       byte valueB = bdistort+ w*  (a3-( ((xoffs - cx2) * (xoffs - cx2) + (yoffs - cy2) * (yoffs - cy2))>>7 ));
 
-      valueR = gamma8(cos8(valueR));
-      valueG = gamma8(cos8(valueG));
-      valueB = gamma8(cos8(valueB));
+      valueR = gamma8(cos8_t(valueR));
+      valueG = gamma8(cos8_t(valueG));
+      valueB = gamma8(cos8_t(valueB));
 
       SEGMENT.setPixelColorXY(x, y, RGBW32(valueR, valueG, valueB, 0)); 
     }
@@ -8622,8 +8623,11 @@ uint16_t mode_2Doctopus() {
     const uint16_t C_Y = rows / 2 + (SEGMENT.custom2 - 128)*rows/255;
     for (int x = xStart; x < xEnd; x++) {
       for (int y = yStart; y < yEnd; y++) {
-        rMap[XY(x, y)].angle  = int(40.7436f * atan2f((y - C_Y), (x - C_X)));  // avoid 128*atan2()/PI
-        rMap[XY(x, y)].radius = hypotf(x - C_X, y - C_Y) * mapp; //thanks Sutaburosu
+        int dx = (x - C_X);
+        int dy = (y - C_Y);
+        rMap[XY(x, y)].angle  = int(40.7436f * atan2f(dy, dx));  // avoid 128*atan2()/PI
+        //rMap[XY(x, y)].radius = hypotf(x - C_X, y - C_Y) * mapp; //thanks Sutaburosu
+        rMap[XY(x, y)].radius = sqrtf(dx * dx + dy * dy) * mapp; //thanks Sutaburosu
       }
     }
   }
@@ -8641,12 +8645,12 @@ uint16_t mode_2Doctopus() {
     for (int y = yStart; y < yEnd; y++) {
       byte angle = rMap[XY(x,y)].angle;
       byte radius = rMap[XY(x,y)].radius;
-      //CRGB c = CHSV(SEGENV.step / 2 - radius, 255, sin8(sin8((angle * 4 - radius) / 4 + SEGENV.step) + radius - SEGENV.step * 2 + angle * (SEGMENT.custom3/3+1)));
+      //CRGB c = CHSV(SEGENV.step / 2 - radius, 255, sin8_t(sin8_t((angle * 4 - radius) / 4 + SEGENV.step) + radius - SEGENV.step * 2 + angle * (SEGMENT.custom3/3+1)));
       uint16_t intensity;
       if (SEGMENT.check3)
-        intensity = sin8(octoSpeed + sin8(octoSpeed - radius) + angle * (SEGMENT.custom3/4+1));                               // RadialWave
+        intensity = sin8_t(octoSpeed + sin8_t(octoSpeed - radius) + angle * (SEGMENT.custom3/4+1));                               // RadialWave
       else
-        intensity = sin8(sin8((angle * 4 - radius) / 4 + octoSpeed) + radius - SEGENV.step + angle * (SEGMENT.custom3/4+1));   // Octopus
+        intensity = sin8_t(sin8_t((angle * 4 - radius) / 4 + octoSpeed) + radius - SEGENV.step + angle * (SEGMENT.custom3/4+1));   // Octopus
       //intensity = map(intensity*intensity, 0, 65535, 0, 255); // add a bit of non-linearity for cleaner display
       intensity = (intensity * intensity) / 255;                // WLEDMM same as above, but faster and a bit more accurate
       CRGB c = ColorFromPalette(SEGPALETTE, colorSpeed - radius, intensity);
@@ -8671,7 +8675,7 @@ uint16_t mode_2Dwavingcell() {
   uint8_t aY = SEGMENT.custom2/16 + 1;
   uint8_t aZ = SEGMENT.custom3 + 1;
   for (int x = 0; x < cols; x++) for (int y = 0; y <rows; y++)
-    SEGMENT.setPixelColorXY(x, y, ColorFromPalette(SEGPALETTE, ((sin8((x*aX)+sin8((y+t)*aY))+cos8(y*aZ))+1)+t));
+    SEGMENT.setPixelColorXY(x, y, ColorFromPalette(SEGPALETTE, ((sin8_t((x*aX)+sin8_t((y+t)*aY))+cos8_t(y*aZ))+1)+t));
 
   return FRAMETIME;
 }
@@ -8883,10 +8887,10 @@ uint16_t mode_2DPaintbrush() {
   for (size_t i = 0; i < numLines; i++) {
     byte bin = map(i,0,numLines,0,15);
     
-    byte x1 = beatsin8(max(16,int(SEGMENT.speed))/16*1 + fftResult[0]/16, 0, (cols-1), fftResult[bin], SEGENV.aux1);
-    byte x2 = beatsin8(max(16,int(SEGMENT.speed))/16*2 + fftResult[0]/16, 0, (cols-1), fftResult[bin], SEGENV.aux1);
-    byte y1 = beatsin8(max(16,int(SEGMENT.speed))/16*3 + fftResult[0]/16, 0, (rows-1), fftResult[bin], SEGENV.aux1);
-    byte y2 = beatsin8(max(16,int(SEGMENT.speed))/16*4 + fftResult[0]/16, 0, (rows-1), fftResult[bin], SEGENV.aux1);
+    byte x1 = beatsin8_t(max(16,int(SEGMENT.speed))/16*1 + fftResult[0]/16, 0, (cols-1), fftResult[bin], SEGENV.aux1);
+    byte x2 = beatsin8_t(max(16,int(SEGMENT.speed))/16*2 + fftResult[0]/16, 0, (cols-1), fftResult[bin], SEGENV.aux1);
+    byte y1 = beatsin8_t(max(16,int(SEGMENT.speed))/16*3 + fftResult[0]/16, 0, (rows-1), fftResult[bin], SEGENV.aux1);
+    byte y2 = beatsin8_t(max(16,int(SEGMENT.speed))/16*4 + fftResult[0]/16, 0, (rows-1), fftResult[bin], SEGENV.aux1);
 
     int length = sqrt((x2-x1)*(x2-x1) + (y2-y1)*(y2-y1));
     length = map8(fftResult[bin],0,length);
diff --git a/wled00/fcn_declare.h b/wled00/fcn_declare.h
index a2f1bf29..508c93f9 100644
--- a/wled00/fcn_declare.h
+++ b/wled00/fcn_declare.h
@@ -379,6 +379,11 @@ uint8_t extractModeSlider(uint8_t mode, uint8_t slider, char *dest, uint8_t maxL
 int16_t extractModeDefaults(uint8_t mode, const char *segVar);
 void checkSettingsPIN(const char *pin);
 uint16_t  __attribute__((pure)) crc16(const unsigned char* data_p, size_t length);   // WLEDMM: added attribute pure
+
+uint16_t beatsin88_t(accum88 beats_per_minute_88, uint16_t lowest = 0, uint16_t highest = 65535, uint32_t timebase = 0, uint16_t phase_offset = 0);
+uint16_t beatsin16_t(accum88 beats_per_minute, uint16_t lowest = 0, uint16_t highest = 65535, uint32_t timebase = 0, uint16_t phase_offset = 0);
+uint8_t beatsin8_t(accum88 beats_per_minute, uint8_t lowest = 0, uint8_t highest = 255, uint32_t timebase = 0, uint8_t phase_offset = 0);
+
 um_data_t* simulateSound(uint8_t simulationId);
 // WLEDMM enumerateLedmaps(); moved to FX.h
 uint8_t get_random_wheel_index(uint8_t pos);
@@ -410,27 +415,39 @@ void clearEEPROM();
 #endif
 
 //wled_math.cpp
-#ifndef WLED_USE_REAL_MATH
-  template <typename T> T atan_t(T x);
-  float cos_t(float phi)  __attribute__((const));
-  float sin_t(float x)    __attribute__((const));
-  float tan_t(float x)    __attribute__((const));
-  float acos_t(float x);
-  float asin_t(float x);
-  float atan_t(float x)   __attribute__((const));
-  float floor_t(float x)  __attribute__((const));
-  float fmod_t(float num, float denom)   __attribute__((const));
-#else
-  #include <math.h>   // WLEDMM use "float" variants
-  #define sin_t sinf
-  #define cos_t cosf
-  #define tan_t tanf
-  #define asin_t asinf
-  #define acos_t acosf
-  #define atan_t atanf
-  #define fmod_t fmodf
-  #define floor_t floorf
-#endif
+//float cos_t(float phi); // use float math
+//float sin_t(float phi);
+//float tan_t(float x);
+int16_t sin16_t(uint16_t theta);
+int16_t cos16_t(uint16_t theta);
+uint8_t sin8_t(uint8_t theta);
+uint8_t cos8_t(uint8_t theta);
+
+float sin_approx(float theta); // uses integer math (converted to float), accuracy +/-0.0015 (compared to sinf())
+float cos_approx(float theta);
+float tan_approx(float x);
+//float atan2_t(float y, float x);
+//float acos_t(float x);
+//float asin_t(float x);
+//template <typename T> T atan_t(T x);
+//float floor_t(float x);
+//float fmod_t(float num, float denom);
+#define sin_t sin_approx
+#define cos_t cos_approx
+#define tan_t tan_approx
+
+#include <math.h>  // standard math functions. use a lot of flash
+#define atan2_t atan2f
+#define asin_t asinf
+#define acos_t acosf
+#define atan_t atanf
+#define fmod_t fmodf
+#define floor_t floorf
+/*
+#define sin_t sinf
+#define cos_t cosf
+#define tan_t tanf
+*/
 
 //wled_serial.cpp
 void handleSerial();
diff --git a/wled00/util.cpp b/wled00/util.cpp
index 87e14c2c..3b380ce8 100644
--- a/wled00/util.cpp
+++ b/wled00/util.cpp
@@ -423,6 +423,39 @@ uint16_t crc16(const unsigned char* data_p, size_t length) {
   return crc;
 }
 
+// fastled beatsin: 1:1 replacements to remove the use of fastled sin16()
+// Generates a 16-bit sine wave at a given BPM that oscillates within a given range. see fastled for details.
+uint16_t beatsin88_t(accum88 beats_per_minute_88, uint16_t lowest, uint16_t highest, uint32_t timebase, uint16_t phase_offset)
+{
+    uint16_t beat = beat88( beats_per_minute_88, timebase);
+    uint16_t beatsin (sin16_t( beat + phase_offset) + 32768);
+    uint16_t rangewidth = highest - lowest;
+    uint16_t scaledbeat = scale16( beatsin, rangewidth);
+    uint16_t result = lowest + scaledbeat;
+    return result;
+}
+
+// Generates a 16-bit sine wave at a given BPM that oscillates within a given range. see fastled for details.
+uint16_t beatsin16_t(accum88 beats_per_minute, uint16_t lowest, uint16_t highest, uint32_t timebase, uint16_t phase_offset)
+{
+    uint16_t beat = beat16( beats_per_minute, timebase);
+    uint16_t beatsin = (sin16_t( beat + phase_offset) + 32768);
+    uint16_t rangewidth = highest - lowest;
+    uint16_t scaledbeat = scale16( beatsin, rangewidth);
+    uint16_t result = lowest + scaledbeat;
+    return result;
+}
+
+// Generates an 8-bit sine wave at a given BPM that oscillates within a given range. see fastled for details.
+uint8_t beatsin8_t(accum88 beats_per_minute, uint8_t lowest, uint8_t highest, uint32_t timebase, uint8_t phase_offset)
+{
+    uint8_t beat = beat8( beats_per_minute, timebase);
+    uint8_t beatsin = sin8_t( beat + phase_offset);
+    uint8_t rangewidth = highest - lowest;
+    uint8_t scaledbeat = scale8( beatsin, rangewidth);
+    uint8_t result = lowest + scaledbeat;
+    return result;
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // Begin simulateSound (to enable audio enhanced effects to display something)
@@ -487,8 +520,8 @@ um_data_t* simulateSound(uint8_t simulationId)
     default:
     case UMS_BeatSin:
       for (int i = 0; i<16; i++)
-        fftResult[i] = beatsin8(120 / (i+1), 0, 255);
-        // fftResult[i] = (beatsin8(120, 0, 255) + (256/16 * i)) % 256;
+        fftResult[i] = beatsin8_t(120 / (i+1), 0, 255);
+        // fftResult[i] = (beatsin8_t(120, 0, 255) + (256/16 * i)) % 256;
         volumeSmth = fftResult[8];
       break;
     case UMS_WeWillRockYou:
@@ -525,12 +558,12 @@ um_data_t* simulateSound(uint8_t simulationId)
       break;
     case UMS_10_13:
       for (int i = 0; i<16; i++)
-        fftResult[i] = inoise8(beatsin8(90 / (i+1), 0, 200)*15 + (ms>>10), ms>>3);
+        fftResult[i] = inoise8(beatsin8_t(90 / (i+1), 0, 200)*15 + (ms>>10), ms>>3);
         volumeSmth = fftResult[8];
       break;
     case UMS_14_3:
       for (int i = 0; i<16; i++)
-        fftResult[i] = inoise8(beatsin8(120 / (i+1), 10, 30)*10 + (ms>>14), ms>>3);
+        fftResult[i] = inoise8(beatsin8_t(120 / (i+1), 10, 30)*10 + (ms>>14), ms>>3);
       volumeSmth = fftResult[8];
       break;
   }
diff --git a/wled00/wled_math.cpp b/wled00/wled_math.cpp
index a4c9fc12..bd542338 100644
--- a/wled00/wled_math.cpp
+++ b/wled00/wled_math.cpp
@@ -10,16 +10,25 @@
 
 //#define WLED_DEBUG_MATH
 
+// Note: cos_t, sin_t and tan_t are very accurate but slow
+// the math.h functions use several kB of flash and are to be avoided if possible
+// sin16_t / cos16_t are faster and much more accurate than the fastled variants
+// sin_approx and cos_approx are float wrappers for sin16_t/cos16_t and have an accuracy better than +/-0.0015 compared to sinf()
+// sin8_t / cos8_t are fastled replacements and use sin16_t / cos16_t. Slightly slower than fastled version but very accurate
+
+
+// Taylor series approximations, replaced with Bhaskara I's approximation
+/*
 #define modd(x, y) ((x) - (int)((x) / (y)) * (y))
 
 float cos_t(float phi)
 {
-  float x = modd(phi, TWO_PI);
+  float x = modd(phi, M_TWOPI);
   if (x < 0) x = -1 * x;
   int8_t sign = 1;
-  if (x > PI)
+  if (x > M_PI)
   {
-      x -= PI;
+      x -= M_PI;
       sign = -1;
   }
   float xx = x * x;
@@ -31,8 +40,8 @@ float cos_t(float phi)
   return res;
 }
 
-float sin_t(float x) {
-  float res =  cos_t(HALF_PI - x);
+float sin_t(float phi) {
+  float res =  cos_t(M_PI_2 - phi);
   #ifdef WLED_DEBUG_MATH
   Serial.printf("sin: %f,%f,%f,(%f)\n",x,res,sin(x),res-sin(x));
   #endif
@@ -48,6 +57,81 @@ float tan_t(float x) {
   #endif
   return res;
 }
+*/
+
+// 16-bit, integer based Bhaskara I's sine approximation: 16*x*(pi - x) / (5*pi^2 - 4*x*(pi - x))
+// input is 16bit unsigned (0-65535), output is 16bit signed (-32767 to +32767)
+// optimized integer implementation by @dedehai
+int16_t sin16_t(uint16_t theta) {
+  int scale = 1;
+  if (theta > 0x7FFF) {
+    theta = 0xFFFF - theta;
+    scale = -1; // second half of the sine function is negative (pi - 2*pi)
+  }
+  uint32_t precal = theta * (0x7FFF - theta);
+  uint64_t numerator = (uint64_t)precal * (4 * 0x7FFF); // 64bit required
+  int32_t denominator = 1342095361 - precal; // 1342095361 is 5 * 0x7FFF^2 / 4
+  int16_t result = numerator / denominator;
+  return result * scale;
+}
+
+int16_t cos16_t(uint16_t theta) {
+  return sin16_t(theta + 0x4000); //cos(x) = sin(x+pi/2)
+}
+
+uint8_t sin8_t(uint8_t theta) {
+  int32_t sin16 = sin16_t((uint16_t)theta * 257); // 255 * 257 = 0xFFFF
+  sin16 += 0x7FFF + 128; //shift result to range 0-0xFFFF, +128 for rounding
+  return min(sin16, int32_t(0xFFFF)) >> 8; // min performs saturation, and prevents overflow
+}
+
+uint8_t cos8_t(uint8_t theta) {
+  return sin8_t(theta + 64); //cos(x) = sin(x+pi/2)
+}
+
+float sin_approx(float theta) {
+  uint16_t scaled_theta = (int)(theta * (float)(0xFFFF / M_TWOPI)); // note: do not cast negative float to uint! cast to int first (undefined on C3)
+  int32_t result = sin16_t(scaled_theta);
+  float sin = float(result) / 0x7FFF;
+  return sin;
+}
+
+float cos_approx(float theta) {
+  uint16_t scaled_theta = (int)(theta * (float)(0xFFFF / M_TWOPI)); // note: do not cast negative float to uint! cast to int first (undefined on C3)
+  int32_t result = sin16_t(scaled_theta + 0x4000);
+  float cos = float(result) / 0x7FFF;
+  return cos;
+}
+
+float tan_approx(float x) {
+  float c = cos_approx(x);
+  if (c==0.0f) return 0;
+  float res = sin_approx(x) / c;
+  return res;
+}
+
+#if 0  // WLEDMM we prefer libm functions that are accurate and fast.
+#define ATAN2_CONST_A 0.1963f
+#define ATAN2_CONST_B 0.9817f
+
+// atan2_t approximation, with the idea from https://gist.github.com/volkansalma/2972237?permalink_comment_id=3872525#gistcomment-3872525
+float atan2_t(float y, float x) {
+	float abs_y = fabs(y);
+  float abs_x = fabs(x);
+  float r = (abs_x - abs_y) / (abs_y + abs_x + 1e-10f); // avoid division by zero by adding a small nubmer
+  float angle;
+  if(x < 0) {
+    r = -r;
+    angle = M_PI_2 + M_PI_4;
+  }
+  else
+    angle = M_PI_2 - M_PI_4;
+
+  float add = (ATAN2_CONST_A * (r * r) - ATAN2_CONST_B) * r;
+	angle += add;
+  angle = y < 0 ? -angle : angle;
+	return angle;
+}
 
 //https://stackoverflow.com/questions/3380628
 // Absolute error <= 6.7e-5
@@ -60,10 +144,10 @@ float acos_t(float x) {
   ret = ret * xabs;
   ret = ret - 0.2121144f;
   ret = ret * xabs;
-  ret = ret + HALF_PI;
+  ret = ret + M_PI_2;
   ret = ret * sqrt(1.0f-xabs);
   ret = ret - 2 * negate * ret;
-  float res = negate * PI + ret;
+  float res = negate * M_PI + ret;
   #ifdef WLED_DEBUG_MATH
   Serial.printf("acos: %f,%f,%f,(%f)\n",x,res,acos(x),res-acos(x));
   #endif
@@ -71,7 +155,7 @@ float acos_t(float x) {
 }
 
 float asin_t(float x) {
-  float res = HALF_PI - acos_t(x);
+  float res = M_PI_2 - acos_t(x);
   #ifdef WLED_DEBUG_MATH
   Serial.printf("asin: %f,%f,%f,(%f)\n",x,res,asin(x),res-asin(x));
   #endif
@@ -87,7 +171,7 @@ float atan_t(float x) {
   //For A/B/C, see https://stackoverflow.com/a/42542593
   static const double A { 0.0776509570923569 };
   static const double B { -0.287434475393028 };
-  static const double C { ((HALF_PI/2) - A - B) };
+  static const double C { ((M_PI_4) - A - B) };
   // polynominal factors for approximation between 1 and 5
   static const float C0 {  0.089494f };
   static const float C1 {  0.974207f };
@@ -102,7 +186,7 @@ float atan_t(float x) {
   x = std::abs(x);
   float res;
   if (x > 5.0f) { // atan(x) converges to pi/2 - (1/x) for large values
-    res = HALF_PI - (1.0f/x);
+    res = M_PI_2 - (1.0f/x);
   } else if (x > 1.0f) { //1 < x < 5
     float xx = x * x;
     res = (C4*xx*xx)+(C3*xx*x)+(C2*xx)+(C1*x)+C0;
@@ -137,3 +221,5 @@ float fmod_t(float num, float denom) {
   #endif
   return res;
 }
+
+#endif  // WLEDMM
\ No newline at end of file

From 6c87799ce5cf66bd33ebc03861f55233e8bc2e04 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 29 Nov 2024 00:48:27 +0100
Subject: [PATCH 217/232] post merge

---
 wled00/FX.cpp | 8 ++++----
 wled00/wled.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index d89108ed..9186866f 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -6945,10 +6945,10 @@ uint16_t mode_2DSwirl(void) {
 
   SEGMENT.blur(SEGMENT.custom1);
 
-  int  i = beatsin8_t( 27*SEGMENT.speed/255, borderWidth, cols - borderWidth);
-  int  j = beatsin8_t( 41*SEGMENT.speed/255, borderWidth, rows - borderWidth);
-  int ni = (cols - 1) - i;
-  int nj = (cols - 1) - j;
+  unsigned  i = beatsin8_t( 27*SEGMENT.speed/255, borderWidth, cols - borderWidth);
+  unsigned  j = beatsin8_t( 41*SEGMENT.speed/255, borderWidth, rows - borderWidth);
+  unsigned ni = (cols - 1) - i;
+  unsigned nj = (cols - 1) - j;
   uint16_t ms = strip.now;
 
   um_data_t *um_data = getAudioData();
diff --git a/wled00/wled.h b/wled00/wled.h
index fe1761a2..28110365 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2411271
+#define VERSION 2411290
 
 // WLEDMM  - you can check for this define in usermods, to only enabled WLEDMM specific code in the "right" fork. Its not defined in AC WLED.
 #define _MoonModules_WLED_

From b2364bf4a5b3310720f26300470ec8dc74d1acb8 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 29 Nov 2024 11:56:35 +0100
Subject: [PATCH 218/232] chunchun effect bugfixes (for strips >256 pixels)

* avoid 16bit overflows
* improve time resolution
* limit to 32 birds (=max for 256 pixels)
* fix fade_out
---
 wled00/FX.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 9186866f..238ce0ac 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -4377,20 +4377,20 @@ static const char _data_FX_MODE_FLOW[] PROGMEM = "Flow@!,Zones;;!;;m12=1"; //ver
  */
 uint16_t mode_chunchun(void)
 {
-  if (SEGLEN == 1) return mode_static();
+  if (SEGLEN <= 1) return mode_static();
   if (SEGENV.call == 0) {SEGENV.setUpLeds(); SEGMENT.fill(BLACK);}   // WLEDMM use lossless getPixelColor()
-  SEGMENT.fade_out(254); // add a bit of trail
-  uint16_t counter = strip.now * (6 + (SEGMENT.speed >> 4));
-  uint16_t numBirds = 2 + (SEGLEN >> 3);  // 2 + 1/8 of a segment
-  uint16_t span = (SEGMENT.intensity << 8) / numBirds;
+  SEGMENT.fade_out(253); // add a bit of trail                       // WLEDMM fade rate above 253 has no effect
+  uint32_t counter = ((strip.now * (96 + SEGMENT.speed)) >> 4);      // WLEDMM same result, better resolution
+  uint16_t numBirds = min(32, 2 + (SEGLEN >> 3));  // 2 + 1/8 of a segment - WLEDMM max 32
+  uint32_t span = (SEGMENT.intensity << 8) / numBirds;
 
-  for (int i = 0; i < numBirds; i++)
+  for (unsigned i = 0; i < numBirds; i++)
   {
     counter -= span;
     uint16_t megumin = sin16_t(counter) + 0x8000;
     uint16_t bird = uint32_t(megumin * SEGLEN) >> 16;
     uint32_t c = SEGMENT.color_from_palette((i * 255)/ numBirds, false, false, 0);  // no palette wrapping
-    bird = constrain(bird, 0, SEGLEN-1);
+    bird = min(bird, uint16_t(SEGLEN-1)); // WLEDMM unsigned is always >= 0
     SEGMENT.setPixelColor(bird, c);
   }
   return FRAMETIME;

From b0b6ec37fd795e1288dd6924cd0f548e744db63a Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 29 Nov 2024 15:05:47 +0100
Subject: [PATCH 219/232] support for benchmarking FastLed vs. WLED
 triginometry

---
 wled00/FX.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 238ce0ac..01314346 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -25,6 +25,16 @@
 
 #define indexToVStrip(index, stripNr) ((index) | (int((stripNr)+1)<<16))
 
+#if 0 // for benchmarking - change to "#if 1" to use less accurate, but 30% faster FastLed sin8 and cos8 functions
+#define sin8_t sin8
+#define cos8_t cos8
+#define sin16_t sin16
+#define cos16_t cos16
+#define beatsin8_t beatsin8
+#define beatsin88_t beatsin88
+#define beatsin16_t beatsin16
+#endif
+
 // WLEDMM replace abs8 by abs, as abs8 does not work for numbers >127
 #define abs8(x) abs(x)
 

From 9ff235e1538cd1fbd984a3fe5112e9356fe10bd1 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 29 Nov 2024 18:29:28 +0100
Subject: [PATCH 220/232] Show "NO PSRAM" on info page

... to help diagnose problems that come from wrong PSRAM settings
---
 wled00/data/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/data/index.js b/wled00/data/index.js
index 86e6465b..7dced6a4 100644
--- a/wled00/data/index.js
+++ b/wled00/data/index.js
@@ -717,7 +717,7 @@ ${i.psram?inforow("PSRAM ☾",((i.tpram-i.psram)/1024).toFixed(0)+"/"+(i.tpram/1
 ${i.psusedram?inforow("Max used PSRAM ☾",((i.tpram-i.psusedram)/1024).toFixed(0)+" kB",", "+((i.tpram-i.psusedram)*100.0/i.tpram).toFixed(1)+"%"):""} 
 ${i.freestack?inforow("Free stack ☾",(i.freestack/1000).toFixed(3)," kB"):""} <!--WLEDMM-->
 <tr><td colspan=2><hr style="height:1px;border-width:0;color:SeaGreen;background-color:SeaGreen"></td></tr>
-${i.tpram?inforow("PSRAM " + (i.psrmode?"("+i.psrmode+" mode) ":"") + " ☾",(i.tpram/1024/1024).toFixed(0)," MB"):""}
+${i.tpram?inforow("PSRAM " + (i.psrmode?"("+i.psrmode+" mode) ":"") + " ☾",(i.tpram/1024/1024).toFixed(0)," MB"):inforow("NO PSRAM found.", "")}
 ${i.e32flash?inforow("Flash mode "+i.e32flashmode+i.e32flashtext + " ☾",i.e32flash+" MB, "+i.e32flashspeed," Mhz"):""}
 ${i.e32model?inforow(i.e32model + " ☾",i.e32cores +" core(s),"," "+i.e32speed+" Mhz"):""}
 ${inforow("Environment",i.arch + " " + i.core + " (" + i.lwip + ")")}

From a0e03766ef7cc12c42d3116ed3ad98a008f20fe0 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 1 Dec 2024 20:02:44 +0100
Subject: [PATCH 221/232] blends effect bugfix

quick fix for "missing pixel 256" problem
---
 wled00/FX.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 01314346..f44db9da 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -4596,7 +4596,7 @@ uint16_t mode_blends(void) {
   uint16_t offset = 0;
   for (int i = 0; i < SEGLEN; i++) {
     SEGMENT.setPixelColor(i, pixels[offset++]);
-    if (offset > pixelLen) offset = 0;
+    if (offset >= pixelLen) offset = 0;
   }
 
   return FRAMETIME;

From 994a9e7212189c6b8cb37224ddd708434325e114 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Mon, 2 Dec 2024 09:15:21 -0500
Subject: [PATCH 222/232] Fix Color Order GUI for Art-Net

---
 wled00/data/settings_leds.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 62af94b7..375cfa39 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -222,7 +222,7 @@
 					}
 					gId("rf"+n).onclick = (t == 31) ? (()=>{return false}) : (()=>{});  // prevent change for TM1814
 					gRGBW |= isRGBW = ((t > 17 && t < 22) || (t > 28 && t < 32) || (t > 40 && t < 46 && t != 43) || t == 88); // RGBW checkbox, TYPE_xxxx values from const.h
-					gId("co"+n).style.display = ((t >= 80 && t < 96) || (t >= 40 && t < 48)||(t >= 100 && t < 110)) ? "none":"inline";  // hide color order for PWM
+					gId("co"+n).style.display = ((t >= 83 && t < 96) || (t >= 40 && t < 48)||(t >= 100 && t < 110)) ? "none":"inline";  // hide color order for PWM
 					gId("dig"+n+"w").style.display = (t > 28 && t < 32) ? "inline":"none";  // show swap channels dropdown
 					gId("dig"+n+"O").style.display = (t == 82 || t == 83) ? "inline":"none";  // show Art-Net output number
 					gId("dig"+n+"L").style.display = (t == 82 || t == 83) ? "inline":"none";  // show Art-Net LEDs per output

From f2f621befcc493cad6e7058a3e6d8d8ee9b9f7df Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 3 Dec 2024 12:48:11 +0100
Subject: [PATCH 223/232] minor FX improvements

Fire2012: better randomness
Julia: avoid darkening when using "blur"
---
 wled00/FX.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index f44db9da..c3a5c595 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -2128,12 +2128,16 @@ uint16_t mode_fire_2012() {
 
       const uint8_t ignition = max(3,SEGLEN/10);  // ignition area: 10% of segment length or minimum 3 pixels
 
+      #if defined(ARDUINO_ARCH_ESP32)
+        random16_add_entropy(esp_random() & 0xFFFF); // improves randonmess
+      #endif
+
       // Step 1.  Cool down every cell a little
       for (int i = 0; i < SEGLEN; i++) {
         uint8_t cool = (it != SEGENV.step) ? random8((((20 + SEGMENT.speed/3) * 16) / SEGLEN)+2) : random8(4);
         uint8_t minTemp = (i<ignition) ? (ignition-i)/4 + 16 : 0;  // should not become black in ignition area
         uint8_t temp = qsub8(heat[i], cool);
-        heat[i] = temp<minTemp ? minTemp : temp;
+        heat[i] = max(minTemp, temp);
       }
 
       if (it != SEGENV.step) {
@@ -5706,6 +5710,7 @@ uint16_t mode_2DJulia(void) {                           // An animated Julia set
   float imAg;
 
   if (SEGENV.call == 0) {           // Reset the center if we've just re-started this animation.
+    SEGMENT.setUpLeds(); SEGMENT.fill(BLACK); // WLEDMM avoids dimming when blur option is selected
     julias->xcen = 0.;
     julias->ycen = 0.;
     julias->xymag = 1.0;

From 0dbde5a257999e85925d08aa46fc3c01e2cbb809 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 3 Dec 2024 13:06:47 +0100
Subject: [PATCH 224/232] audioreactive multi-comet (backported from WELD-SR
 0.13.4)

---
 wled00/FX.cpp | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++
 wled00/FX.h   |  2 +-
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index c3a5c595..0f7c7526 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -1794,6 +1794,61 @@ uint16_t mode_multi_comet(void) {
 }
 static const char _data_FX_MODE_MULTI_COMET[] PROGMEM = "Multi Comet";
 
+// audioreactive multi-comet by @softhack007
+uint16_t mode_multi_comet_ar(void) {
+  constexpr unsigned MAX_COMETS = 16; // was 8
+  uint32_t cycleTime = max(1, int((255 - SEGMENT.speed)/4));
+  uint32_t it = strip.now / cycleTime;
+  if (SEGENV.step == it) return FRAMETIME; // too early
+
+  if (!SEGENV.allocateData(sizeof(uint16_t) * MAX_COMETS)) return mode_static(); //allocation failed
+  uint16_t* comets = reinterpret_cast<uint16_t*>(SEGENV.data);
+  if (SEGENV.call == 0) { // do some initializations
+    SEGMENT.setUpLeds(); SEGMENT.fill(BLACK);
+    for(uint8_t i=0; i < MAX_COMETS; i++) comets[i] = SEGLEN;  // WLEDMM make sure comments are started individually
+    SEGENV.aux0 = 0;
+  }
+  SEGMENT.fade_out(254 - SEGMENT.intensity/2);
+
+  um_data_t *um_data;
+  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) um_data = simulateSound(SEGMENT.soundSim);
+  float   volumeSmth  = *(float*)   um_data->u_data[0];
+  int16_t volumeRaw   = *(int16_t*) um_data->u_data[1];
+  uint8_t samplePeak  = *(uint8_t*) um_data->u_data[3];
+
+  uint16_t armed = SEGENV.aux0;   // allows to delay comet launch
+
+  #if defined(ARDUINO_ARCH_ESP32)
+  random16_add_entropy(esp_random() & 0xFFFF); // improve randomness (esp32)
+  #endif
+  bool shotOne = false;           // avoids starting several coments at the same time (invisible due to overlap)
+  for(unsigned i=0; i < MAX_COMETS; i++) {
+    if(comets[i] < SEGLEN) {
+      // draw comet
+      uint16_t index = comets[i];
+      if (SEGCOLOR(2) != 0)
+        SEGMENT.setPixelColor(index, i % 2 ? SEGMENT.color_from_palette(index, true, PALETTE_SOLID_WRAP, 0) : SEGCOLOR(2));
+      else
+        SEGMENT.setPixelColor(index, SEGMENT.color_from_palette(index, true, PALETTE_SOLID_WRAP, 0));
+      comets[i]++;  // move
+    } else {
+      // randomly launch a new comet
+      if (random16(min(uint16_t(256), SEGLEN)) < 3) armed++;                             // new comet loaded and ready
+      if (armed > 2) armed = 2;                                                          // max three armed at once (avoid overlap)
+      // delay comet "launch" during silence, and wait until next beat
+      if (    (armed > 0) && (shotOne == false) 
+           && (volumeSmth > 1.0f) && ((samplePeak > 0) || (volumeRaw > 104)) ) {         // delayed lauch - wait until peak, don't launch in silence 
+        comets[i] = 0; // start a new comet!
+        armed--;       // un-arm one
+        shotOne = true;
+      }
+    }
+  }
+  SEGENV.aux0 = armed;
+  SEGENV.step = it;
+  return FRAMETIME;
+}
+static const char _data_FX_MODE_MULTI_COMET_AR[] PROGMEM = "Multi Comet audio ☾@Speed,Tail Length;!,!;!;1v;sx=160,ix=32,m12=7,si=1"; // Pinwheel, WeWillRockU
 
 /*
  * Running random pixels ("Stream 2")
@@ -9017,6 +9072,7 @@ void WS2812FX::setupEffectData() {
   addEffect(FX_MODE_LIGHTNING, &mode_lightning, _data_FX_MODE_LIGHTNING);
   addEffect(FX_MODE_ICU, &mode_icu, _data_FX_MODE_ICU);
   addEffect(FX_MODE_MULTI_COMET, &mode_multi_comet, _data_FX_MODE_MULTI_COMET);
+  addEffect(FX_MODE_MULTI_COMET_AR, &mode_multi_comet_ar, _data_FX_MODE_MULTI_COMET_AR);
   addEffect(FX_MODE_DUAL_LARSON_SCANNER, &mode_dual_larson_scanner, _data_FX_MODE_DUAL_LARSON_SCANNER);
   addEffect(FX_MODE_RANDOM_CHASE, &mode_random_chase, _data_FX_MODE_RANDOM_CHASE);
   addEffect(FX_MODE_OSCILLATE, &mode_oscillate, _data_FX_MODE_OSCILLATE);
diff --git a/wled00/FX.h b/wled00/FX.h
index beba0517..670c321a 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -330,7 +330,7 @@ bool strip_uses_global_leds(void) __attribute__((pure));  // WLEDMM implemented
 // Experimental Audioresponsive modes from WLED-SR
 // #define FX_MODE_3DSphereMove           189 // experimental WLED-SR "cube" mode
 #define FX_MODE_POPCORN_AR             190 // WLED-SR audioreactive popcorn
-// #define FX_MODE_MULTI_COMET_AR         191 // WLED-SR audioreactive multi-comet
+#define FX_MODE_MULTI_COMET_AR         191 // WLED-SR audioreactive multi-comet
 #define FX_MODE_STARBURST_AR           192 // WLED-SR audioreactive fireworks starburst
 // #define FX_MODE_PALETTE_AR             193 // WLED-SR audioreactive palette
 #define FX_MODE_FIREWORKS_AR           194 // WLED-SR audioreactive fireworks

From 9922d2aa8d01373a64b96a8685a0be14d264c4f2 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 3 Dec 2024 14:44:46 +0100
Subject: [PATCH 225/232] bugfix: don't render segments that are "off"

---
 wled00/FX_fcn.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 0f750b0f..a450dca7 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -1913,6 +1913,7 @@ void WS2812FX::service() {
     seg.resetIfRequired();
 
     if (!seg.isActive()) continue;
+    if (!seg.on && !seg.transitional) continue;    // WLEDMM skip disabled segments, unless a crossfade is ongoing
 
     // last condition ensures all solid segments are updated at the same time
     if(nowUp >= seg.next_time || _triggered || (doShow && seg.mode == FX_MODE_STATIC))  // WLEDMM ">=" instead of ">"

From 23d41e66c94e5f111e6dec44e3ed731171c964d2 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 3 Dec 2024 16:04:21 +0100
Subject: [PATCH 226/232] bugfix #2 for switched-off segments

segments that are "off" were still rendered during transitions.
---
 wled00/FX.h       | 2 ++
 wled00/FX_fcn.cpp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/wled00/FX.h b/wled00/FX.h
index 670c321a..c35c54fb 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -380,6 +380,7 @@ typedef struct Segment {
     };
     uint8_t  grouping, spacing;
     uint8_t  opacity;
+    uint8_t  lastBri;             // WLEDMM optimization for black-to-black "transitions"
     bool needsBlank;              // WLEDMM indicates that Segment needs to be blanked (due to change of mirror / reverse / transpose / spacing)
     uint32_t colors[NUM_COLORS];
     uint8_t  cct;                 //0==1900K, 255==10091K
@@ -490,6 +491,7 @@ typedef struct Segment {
       grouping(1),
       spacing(0),
       opacity(255),
+      lastBri(255),
       needsBlank(false),
       colors{DEFAULT_COLOR,BLACK,BLACK},
       cct(127),
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index a450dca7..b2d7162f 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -1935,6 +1935,7 @@ void WS2812FX::service() {
         now = millis() + timebase;
 #endif
         seg.startFrame();   // WLEDMM
+        if (!_triggered && (seg.currentBri(seg.opacity) == 0) && (seg.lastBri == 0)) continue; // WLEDMM skip totally black segments
         // effect blending (execute previous effect)
         // actual code may be a bit more involved as effects have runtime data including allocated memory
         //if (seg.transitional && seg._modeP) (*_mode[seg._modeP])(progress());
@@ -1944,6 +1945,7 @@ void WS2812FX::service() {
         if (seg.mode != FX_MODE_HALLOWEEN_EYES) seg.call++;
         if (seg.transitional && frameDelay > FRAMETIME) frameDelay = FRAMETIME; // force faster updates during transition
 
+        seg.lastBri = seg.currentBri(seg.on ? seg.opacity:0);                   // WLEDMM remember for next time
         seg.handleTransition();
       }
 

From 86ed5a82e3d03df1e2a40af3110cb6935428c880 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 3 Dec 2024 16:31:52 +0100
Subject: [PATCH 227/232] DNA effect: additional parameter "phases" (thanks
 @ewoudwijma )

controls the number of phases shown by the effect

breaking - the old code was using a fixed width per wave,  while the new one always fits the same number waves into the panel width.
---
 wled00/FX.cpp | 12 +++++++++---
 wled00/wled.h |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 0f7c7526..f255fa5a 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5124,6 +5124,7 @@ uint16_t mode_2Ddna(void) {         // dna originally by by ldirko at https://pa
 
   const uint16_t cols = SEGMENT.virtualWidth();
   const uint16_t rows = SEGMENT.virtualHeight();
+  uint8_t phases = SEGMENT.custom1;
 
   if (SEGENV.call == 0) {
     SEGMENT.setUpLeds();
@@ -5136,8 +5137,13 @@ uint16_t mode_2Ddna(void) {         // dna originally by by ldirko at https://pa
   int lastY1 = -1;
   int lastY2 = -1;
   for (int i = 0; i < cols; i++) {
-    int posY1 = beatsin8_t(SEGMENT.speed/8, 0, rows-1, 0, i*4    );
-    int posY2 = beatsin8_t(SEGMENT.speed/8, 0, rows-1, 0, i*4+128);
+    // int posY1 = beatsin8_t(SEGMENT.speed/8, 0, rows-1, 0, i*4    );
+    ///int posY2 = beatsin8_t(SEGMENT.speed/8, 0, rows-1, 0, i*4+128);
+    unsigned phase = cols * i / 8;                      // 256 is a complete phase; half a phase is dna is 128
+    phase = i * 4 * phases / cols;                      // cols ==0 cannot happen due to the for loop
+    int posY1 = beatsin8_t(SEGMENT.speed/8, 0, rows-1, 0, phase    );
+    int posY2 = beatsin8_t(SEGMENT.speed/8, 0, rows-1, 0, phase+128);
+
     if ((i==0) || ((abs(lastY1 - posY1) < 2) && (abs(lastY2 - posY2) < 2))) {   // use original code when no holes
       SEGMENT.setPixelColorXY(i, posY1, ColorFromPalette(SEGPALETTE, i*5+strip.now/17, beatsin8_t(5, 55, 255, 0, i*10), LINEARBLEND));
       SEGMENT.setPixelColorXY(i, posY2, ColorFromPalette(SEGPALETTE, i*5+128+strip.now/17, beatsin8_t(5, 55, 255, 0, i*10+128), LINEARBLEND));
@@ -5152,7 +5158,7 @@ uint16_t mode_2Ddna(void) {         // dna originally by by ldirko at https://pa
 
   return FRAMETIME;
 } // mode_2Ddna()
-static const char _data_FX_MODE_2DDNA[] PROGMEM = "DNA@Scroll speed,Blur;;!;2";
+static const char _data_FX_MODE_2DDNA[] PROGMEM = "DNA@Scroll speed,Blur,Phases;;!;2";
 
 
 /////////////////////////
diff --git a/wled00/wled.h b/wled00/wled.h
index 28110365..7af6b43c 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2411290
+#define VERSION 2412030
 
 // WLEDMM  - you can check for this define in usermods, to only enabled WLEDMM specific code in the "right" fork. Its not defined in AC WLED.
 #define _MoonModules_WLED_

From 9ea2303ecbfc8a0bd5ebe3c8ada6b6c903756846 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 3 Dec 2024 20:00:26 +0100
Subject: [PATCH 228/232] DNA effect optimization (phases)

* non-breaking - reproduces the old behavior at phases = 127
* minor math optimizations
* phase boost for large values (good for small panels)
---
 wled00/FX.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index f255fa5a..53d99886 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5119,12 +5119,13 @@ static const char _data_FX_MODE_2DCOLOREDBURSTS[] PROGMEM = "Colored Bursts@Spee
 /////////////////////
 //      2D DNA     //
 /////////////////////
-uint16_t mode_2Ddna(void) {         // dna originally by by ldirko at https://pastebin.com/pCkkkzcs. Updated by Preyy. WLED conversion by Andrew Tuline.
+uint16_t mode_2Ddna(void) {         // dna originally by by ldirko at https://pastebin.com/pCkkkzcs. Updated by Preyy. WLED conversion by Andrew Tuline. Phases added by @ewoudwijma
   if (!strip.isMatrix) return mode_static(); // not a 2D set-up
 
   const uint16_t cols = SEGMENT.virtualWidth();
   const uint16_t rows = SEGMENT.virtualHeight();
-  uint8_t phases = SEGMENT.custom1;
+  unsigned phases = SEGMENT.custom1;
+  if (phases > 179) phases = 179 + 2.5f * (phases - 179); // boost for values > 179
 
   if (SEGENV.call == 0) {
     SEGMENT.setUpLeds();
@@ -5137,10 +5138,9 @@ uint16_t mode_2Ddna(void) {         // dna originally by by ldirko at https://pa
   int lastY1 = -1;
   int lastY2 = -1;
   for (int i = 0; i < cols; i++) {
-    // int posY1 = beatsin8_t(SEGMENT.speed/8, 0, rows-1, 0, i*4    );
-    ///int posY2 = beatsin8_t(SEGMENT.speed/8, 0, rows-1, 0, i*4+128);
-    unsigned phase = cols * i / 8;                      // 256 is a complete phase; half a phase is dna is 128
-    phase = i * 4 * phases / cols;                      // cols ==0 cannot happen due to the for loop
+    // 256 is a complete phase; half a phase of dna is 128
+    // unsigned phase = i * 4 * phases / cols;      // original formula; cols ==0 cannot happen due to the for loop
+    unsigned phase = i * 4 * phases / 128;          // WLEDMM this reproduces the previous behaviour at phases=127
     int posY1 = beatsin8_t(SEGMENT.speed/8, 0, rows-1, 0, phase    );
     int posY2 = beatsin8_t(SEGMENT.speed/8, 0, rows-1, 0, phase+128);
 

From f4ac04b9f981659fc539e522d49b03e80b4554c4 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 3 Dec 2024 22:48:35 +0100
Subject: [PATCH 229/232] Update platformio.ini - fix for duplicate
 WLED_RELEASE_NAMEs

esp32S3_4MB_S and esp32s3_8MB_M were used by two different buildenvs.
---
 platformio.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index e49c32da..b1ce10e2 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -2164,7 +2164,7 @@ board_build.partitions = tools/WLED_ESP32_4MB_256KB_FS.csv   ;; 1.8MB firmware,
 ;; board_build.partitions = tools/WLED_ESP32_4MB_512KB_FS.csv    ;; 1.7MB firmware, 500KB filesystem (esptool erase_flash needed when changing from "standard WLED" partitions)
 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
+  -D WLED_RELEASE_NAME=esp32S3_4MB_PSRAM_S
   -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
@@ -2202,7 +2202,7 @@ board = lolin_s3_mini ;; -S3 mini: 4MB flash 2MB PSRAM
 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
+  -D WLED_RELEASE_NAME=esp32S3_4MB_PSRAM_M
   -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

From e5b22bc8d190c7f0806d3d3e3c4ec70f012bdd80 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Wed, 4 Dec 2024 10:53:01 -0500
Subject: [PATCH 230/232] Cosmetic 2D Setup change: Start at Panel 1 instead of
 0

---
 wled00/data/settings_2D.htm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wled00/data/settings_2D.htm b/wled00/data/settings_2D.htm
index c57bf3d9..85f9dddb 100644
--- a/wled00/data/settings_2D.htm
+++ b/wled00/data/settings_2D.htm
@@ -98,7 +98,7 @@
 		var pw = parseInt(d.Sf.PW.value);
 		var ph = parseInt(d.Sf.PH.value);
 		//WLEDMM: change name to id
-		let b = `<div id="pnl${i}"><hr class="sml">Panel ${i}<br>
+		let b = `<div id="pnl${i}"><hr class="sml">Panel ${i+1}<br>
 1<sup>st</sup> LED: <select id="P${i}B" name="P${i}B" oninput="draw()">
 	<option value="0">Top</option>
 	<option value="1">Bottom</option>
@@ -334,7 +334,7 @@ Y:<input id="P${i}Y" name="P${i}Y" type="number" min="0" max="1023" value="0" on
 
 			ctx.font = '40px Arial'; 
 			ctx.fillStyle = "orange";
-			ctx.fillText(p, topLeftX + pw/2*ppL - 10, topLeftY + ph/2*ppL + 10);
+			ctx.fillText(p+1, topLeftX + pw/2*ppL - 10, topLeftY + ph/2*ppL + 10);
 		}
 		gId("MD").innerHTML = "Matrix Dimensions (W*H=LC): " + maxWidth + " x " + maxHeight + " = " + maxWidth * maxHeight;
 	}

From 102d098e28dc762c426630a28420930f0de2d59d Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 4 Dec 2024 18:05:37 +0100
Subject: [PATCH 231/232] bugfix #3 for ghostly appearing switched-off segments

---
 wled00/FX_fcn.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index b2d7162f..a62ee39b 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -551,7 +551,7 @@ bool Segment::setColor(uint8_t slot, uint32_t c) { //returns true if changed
     if (slot == 0 && c == BLACK) return false; // on/off segment cannot have primary color black
     if (slot == 1 && c != BLACK) return false; // on/off segment cannot have secondary color non black
   }
-  if (fadeTransition) startTransition(strip.getTransition()); // start transition prior to change
+  if (fadeTransition && on) startTransition(strip.getTransition()); // start transition prior to change // WLEDMM only on real change
   colors[slot] = c;
   stateChanged = true; // send UDP/WS broadcast
   return true;
@@ -564,7 +564,7 @@ void Segment::setCCT(uint16_t k) {
     k = (k - 1900) >> 5;
   }
   if (cct == k) return;
-  if (fadeTransition) startTransition(strip.getTransition()); // start transition prior to change
+  if (fadeTransition && on) startTransition(strip.getTransition()); // start transition prior to change
   cct = k;
   stateChanged = true; // send UDP/WS broadcast
 }
@@ -628,7 +628,7 @@ void Segment::setPalette(uint8_t pal) {
   if (pal < 245 && pal > GRADIENT_PALETTE_COUNT+13) pal = 0; // built in palettes
   if (pal > 245 && (strip.customPalettes.size() == 0 || 255U-pal > strip.customPalettes.size()-1)) pal = 0; // custom palettes
   if (pal != palette) {
-    if (strip.paletteFade) startTransition(strip.getTransition());
+    if (strip.paletteFade && on) startTransition(strip.getTransition());
     palette = pal;
     stateChanged = true; // send UDP/WS broadcast
   }

From 972257a7ee8cf800b9ec3d445039727b30003eb4 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 4 Dec 2024 22:18:39 +0100
Subject: [PATCH 232/232] minor code cleanup

* removed dead code
* prevent promotion to double
* made constants constexpr
* made some methods const
* fixed a few typo's
---
 wled00/FX.cpp       | 105 +++++++++++++++++++-------------------------
 wled00/FX.h         |   1 -
 wled00/FX_2Dfcn.cpp |   5 +--
 wled00/FX_fcn.cpp   |  11 -----
 4 files changed, 46 insertions(+), 76 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 53d99886..4e6d7023 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -75,7 +75,7 @@ static int8_t tristate_square8(uint8_t x, uint8_t pulsewidth, uint8_t attdec) {
   return 0;
 }
 
-// float version of map()  // WLEDMM moved here so its available for all effects
+// float version of map()  // WLEDMM moved here so it is available for all effects
 static float mapf(float x, float in_min, float in_max, float out_min, float out_max){
   if (in_max == in_min) return (out_min);  // WLEDMM avoid div/0
   return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
@@ -795,7 +795,7 @@ static const char _data_FX_MODE_MULTI_STROBE[] PROGMEM = "Strobe Mega@!,!;!,!;!;
  * Android loading circle
  */
 uint16_t mode_android(void) {
-
+  if (SEGLEN <= 1) return mode_static(); // WLEDMM to prevent division by zero
   for (int i = 0; i < SEGLEN; i++) {
     SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 1));
   }
@@ -1043,7 +1043,7 @@ static const char _data_FX_MODE_TRAFFIC_LIGHT[] PROGMEM = "Traffic Light@!,US st
  */
 #define FLASH_COUNT 4
 uint16_t mode_chase_flash(void) {
-  if (SEGLEN == 1) return mode_static();
+  if (SEGLEN <= 1) return mode_static();
   uint8_t flash_step = SEGENV.call % ((FLASH_COUNT * 2) + 1);
 
   for (int i = 0; i < SEGLEN; i++) {
@@ -2091,7 +2091,7 @@ uint16_t mode_partyjerk() {
 
     CRGB rgb(CHSV(SEGENV.aux1, 255, activeColor));
     SEGMENT.setPixelColor((uint16_t)i, rgb.r, rgb.g, rgb.b);
-  };
+  }
 
   return FRAMETIME;
 } // mode_partyjerk()
@@ -3012,7 +3012,7 @@ uint16_t mode_bouncing_balls(void) {
   if (SEGLEN == 1) return mode_static();
   //allocate segment data
   const uint16_t strips = SEGMENT.nrOfVStrips(); // adapt for 2D
-  const size_t maxNumBalls = 16;
+  constexpr size_t maxNumBalls = 16;
   uint16_t dataSize = sizeof(ball) * maxNumBalls;
   if (!SEGENV.allocateData(dataSize * strips)) return mode_static(); //allocation failed
 
@@ -3165,7 +3165,7 @@ static uint16_t rolling_balls(void) {
 
     if (thisHeight < 0.0f) thisHeight = 0.0f;
     if (thisHeight > 1.0f) thisHeight = 1.0f;
-    uint16_t pos = round(thisHeight * (SEGLEN - 1));
+    uint16_t pos = roundf(thisHeight * (SEGLEN - 1));
     SEGMENT.setPixelColor(pos, color);
     balls[i].lastBounceUpdate = strip.now;
     balls[i].height = thisHeight;
@@ -3808,7 +3808,7 @@ uint16_t mode_drip(void)
   if (SEGLEN == 1) return mode_static();
   //allocate segment data
   uint16_t strips = SEGMENT.nrOfVStrips();
-  const int maxNumDrops = 4;
+  constexpr int maxNumDrops = 4;
   uint16_t dataSize = sizeof(sparkdrop) * maxNumDrops;
   if (!SEGENV.allocateData(dataSize * strips)) return mode_static(); //allocation failed
   SparkDrop* drops = reinterpret_cast<SparkDrop*>(SEGENV.data);
@@ -4034,8 +4034,8 @@ uint16_t mode_percent(void) {
 
   uint8_t percent = SEGMENT.intensity;
   percent = constrain(percent, 0, 200);
-  uint16_t active_leds = (percent < 100) ? SEGLEN * percent / 100.0
-                                         : SEGLEN * (200 - percent) / 100.0;
+  uint16_t active_leds = (percent < 100) ? SEGLEN * percent / 100.0f
+                                         : SEGLEN * (200 - percent) / 100.0f;
 
   uint8_t size = (1 + ((SEGMENT.speed * SEGLEN) >> 11));
   if (SEGMENT.speed == 255) size = 255;
@@ -4137,7 +4137,7 @@ static const char _data_FX_MODE_HEARTBEAT[] PROGMEM = "Heartbeat@!,!;!,!;!;01;m1
 // Modified for WLED, based on https://github.com/FastLED/FastLED/blob/master/examples/Pacifica/Pacifica.ino
 //
 // Add one layer of waves into the led array
-CRGB pacifica_one_layer(uint16_t i, CRGBPalette16& p, uint16_t cistart, uint16_t wavescale, uint8_t bri, uint16_t ioff)
+CRGB pacifica_one_layer(uint16_t i, const CRGBPalette16& p, uint16_t cistart, uint16_t wavescale, uint8_t bri, uint16_t ioff)
 {
   uint16_t ci = cistart;
   uint16_t waveangle = ioff;
@@ -4294,7 +4294,7 @@ uint16_t phased_base(uint8_t moder) {                  // We're making sine wave
   uint8_t modVal = 5;//SEGMENT.fft1/8+1;                         // You can change the modulus. AKA FFT1 (was 5).
 
   uint8_t index = strip.now/64;                                  // Set color rotation speed
-  *phase += SEGMENT.speed/32.0;                                  // You can change the speed of the wave. AKA SPEED (was .4)
+  *phase += SEGMENT.speed/32.0f;                                 // You can change the speed of the wave. AKA SPEED (was .4)
 
   for (int i = 0; i < SEGLEN; i++) {
     if (moder == 1) modVal = (inoise8(i*10 + i*10) /16);         // Let's randomize our mod length with some Perlin noise.
@@ -4518,7 +4518,7 @@ uint16_t mode_dancing_shadows(void)
     if (!initialize) {
       // advance the position of the spotlight
       int16_t delta = (float)(time - spotlights[i].lastUpdateTime) *
-                  (spotlights[i].speed * ((1.0 + SEGMENT.speed)/100.0));
+                  (spotlights[i].speed * ((1.0f + SEGMENT.speed)/100.0f));
 
       if (abs(delta) >= 1) {
         spotlights[i].position += delta;
@@ -4533,15 +4533,15 @@ uint16_t mode_dancing_shadows(void)
       spotlights[i].colorIdx = random8();
       spotlights[i].width = random8(1, 10);
 
-      spotlights[i].speed = 1.0/random8(4, 50);
+      spotlights[i].speed = 1.0f/random8(4, 50);
 
       if (initialize) {
         spotlights[i].position = random16(SEGLEN);
-        spotlights[i].speed *= random8(2) ? 1.0 : -1.0;
+        spotlights[i].speed *= random8(2) > 0 ? 1.0 : -1.0;
       } else {
         if (random8(2)) {
           spotlights[i].position = SEGLEN + spotlights[i].width;
-          spotlights[i].speed *= -1.0;
+          spotlights[i].speed *= -1.0f;
         }else {
           spotlights[i].position = -spotlights[i].width;
         }
@@ -5038,7 +5038,7 @@ uint16_t mode_2DBlackHole(void) {            // By: Stepko https://editor.soulma
   }
 
   SEGMENT.fadeToBlackBy(16 + (SEGMENT.speed>>3)); // create fading trails
-  const unsigned long ratio = 128;                // rotation speed
+  constexpr unsigned long ratio = 128;                // rotation speed
   unsigned long t = strip.now;                    // timebase
   // outer stars
   for (unsigned i = 0; i < 8; i++) {
@@ -5342,7 +5342,7 @@ class GameOfLifeGrid {
     const int8_t offsetY[8] = {-1, -1, -1,  0, 0,  1, 1, 1};
   public:
     GameOfLifeGrid(Cell* data, int c, int r) : cells(data), cols(c), rows(r), maxIndex(r * c) {}
-    void getNeighborIndexes(unsigned neighbors[9], unsigned cIndex, unsigned x, unsigned y, bool wrap) {
+    void getNeighborIndexes(unsigned neighbors[9], unsigned cIndex, unsigned x, unsigned y, bool wrap) const {
       unsigned neighborCount = 0;
       bool edgeCell = x == 0 || x == cols-1 || y == 0 || y == rows-1;
       for (unsigned i = 0; i < 8; ++i) {
@@ -5363,7 +5363,7 @@ class GameOfLifeGrid {
       }
       neighbors[0] = neighborCount;
     }
-    void setCell(unsigned cIndex, unsigned x, unsigned y, bool alive, bool wrap) {
+    void setCell(unsigned cIndex, unsigned x, unsigned y, bool alive, bool wrap) const {
       Cell* cell = &cells[cIndex];
       if (alive == cell->alive) return; // No change
       cell->alive = alive;
@@ -5372,7 +5372,7 @@ class GameOfLifeGrid {
       int val = alive ? 1 : -1;
       for (unsigned i = 1; i <= neighbors[0]; ++i) cells[neighbors[i]].neighbors += val;
     }
-    void recalculateEdgeNeighbors(bool wrap) {
+    void recalculateEdgeNeighbors(bool wrap) const {
       unsigned cIndex = 0;
       for (unsigned y = 0; y < rows; ++y) for (unsigned x = 0; x < cols; ++x, ++cIndex) {
         Cell* cell = &cells[cIndex];
@@ -5811,7 +5811,7 @@ uint16_t mode_2DJulia(void) {                           // An animated Julia set
   maxIterations = SEGMENT.intensity/2;
 
 
-  // Resize section on the fly for some animaton.
+  // Resize section on the fly for some animation.
   reAl = -0.94299f;               // PixelBlaze example
   imAg = 0.3162f;
 
@@ -5820,8 +5820,8 @@ uint16_t mode_2DJulia(void) {                           // An animated Julia set
   reAl += (float)sin16_t(strip.now * 34) / 655340.f;
   imAg += (float)sin16_t(strip.now * 26) / 655340.f;
 
-  dx = (xmax - xmin) / (cols);     // Scale the delta x and y values to our matrix size.
-  dy = (ymax - ymin) / (rows);
+  dx = (xmax - xmin) / cols;     // Scale the delta x and y values to our matrix size.
+  dy = (ymax - ymin) / rows;
 
   // Start y
   float y = ymin;
@@ -5867,8 +5867,8 @@ uint16_t mode_2DJulia(void) {                           // An animated Julia set
   if(SEGMENT.check2)
     SEGMENT.blur(64, true);      // strong blurr
   if(SEGMENT.check3) {           // draw crosshair
-    int screenX = lround((0.5f / maxCenter) * (julias->xcen + maxCenter) * float(cols));
-    int screenY = lround((0.5f / maxCenter) * (julias->ycen + maxCenter) * float(rows));
+    int screenX = lroundf((0.5f / maxCenter) * (julias->xcen + maxCenter) * float(cols));
+    int screenY = lroundf((0.5f / maxCenter) * (julias->ycen + maxCenter) * float(rows));
     int hair = min(min(cols-1, rows-1)/2, 3);
     SEGMENT.drawLine(screenX, screenY-hair, screenX, screenY+hair, GREEN, true);
     SEGMENT.drawLine(screenX-hair, screenY, screenX+hair, screenY, GREEN, true);
@@ -6039,7 +6039,7 @@ uint16_t mode_2Dmetaballs(void) {   // Metaballs by Stefan Petrick. Cannot have
       byte color = dist ? 1000 / dist : 255;
 
       // map color between thresholds
-      if (color > 0 and color < 60) {
+      if (color > 0 && color < 60) {
         SEGMENT.setPixelColorXY(x, y, SEGMENT.color_from_palette(map(color * 9, 9, 531, 0, 255), false, PALETTE_SOLID_WRAP, 0));
       } else {
         SEGMENT.setPixelColorXY(x, y, SEGMENT.color_from_palette(0, false, PALETTE_SOLID_WRAP, 0));
@@ -6458,8 +6458,6 @@ uint16_t mode_2Dcrazybees(void) {
     int8_t signX, signY;
     int16_t deltaX, deltaY, error;
     void aimed(uint_fast16_t w, uint_fast16_t h) {
-      if (!true) //WLEDMM SuperSync
-        random16_set_seed(strip.now);
       aimX = random8(0, min(UINT8_MAX, int(w)));
       aimY = random8(0, min(UINT8_MAX, int(h)));
       hue = random8();
@@ -6475,8 +6473,7 @@ uint16_t mode_2Dcrazybees(void) {
   bee_t *bee = reinterpret_cast<bee_t*>(SEGENV.data);
 
   if (SEGENV.call == 0) {
-    if (true) //WLEDMM SuperSync
-      random16_set_seed(strip.now);
+    random16_set_seed(strip.now); //WLEDMM SuperSync
     SEGMENT.setUpLeds();
     SEGMENT.fill(BLACK);
     for (size_t i = 0; i < n; i++) {
@@ -7017,7 +7014,7 @@ uint16_t mode_2DSwirl(void) {
     SEGMENT.fill(BLACK);
   }
 
-  const uint8_t borderWidth = 2;
+  constexpr uint8_t borderWidth = 2;
 
   SEGMENT.blur(SEGMENT.custom1);
 
@@ -7106,7 +7103,7 @@ typedef struct Gravity {
 ///////////////////////
 uint16_t mode_gravcenter(void) {                // Gravcenter. By Andrew Tuline.
 
-  const uint16_t dataSize = sizeof(gravity);
+  constexpr uint16_t dataSize = sizeof(gravity);
   if (!SEGENV.allocateData(dataSize)) return mode_static(); //allocation failed
   Gravity* gravcen = reinterpret_cast<Gravity*>(SEGENV.data);
   if (SEGENV.call == 0) {
@@ -7123,7 +7120,7 @@ uint16_t mode_gravcenter(void) {                // Gravcenter. By Andrew Tuline.
   float segmentSampleAvg = volumeSmth * (float)SEGMENT.intensity / 255.0f;
   segmentSampleAvg *= 0.125; // divide by 8, to compensate for later "sensitivity" upscaling
 
-  float mySampleAvg = mapf(segmentSampleAvg*2.0, 0, 32, 0, (float)SEGLEN/2.0); // map to pixels available in current segment
+  float mySampleAvg = mapf(segmentSampleAvg*2.0f, 0, 32, 0, (float)SEGLEN/2.0f); // map to pixels available in current segment
   uint16_t tempsamp = constrain(mySampleAvg, 0, SEGLEN/2);     // Keep the sample from overflowing.
   uint8_t gravity = 8 - SEGMENT.speed/32;
 
@@ -7171,10 +7168,10 @@ uint16_t mode_gravcentric(void) {                     // Gravcentric. By Andrew
   //SEGMENT.fade_out(240); // twice? really?
   SEGMENT.fade_out(253);  // 50%
 
-  float segmentSampleAvg = volumeSmth * (float)SEGMENT.intensity / 255.0;
+  float segmentSampleAvg = volumeSmth * (float)SEGMENT.intensity / 255.0f;
   segmentSampleAvg *= 0.125f; // divide by 8, to compensate for later "sensitivity" upscaling
 
-  float mySampleAvg = mapf(segmentSampleAvg*2.0, 0.0f, 32.0f, 0.0f, (float)SEGLEN/2.0); // map to pixels availeable in current segment
+  float mySampleAvg = mapf(segmentSampleAvg*2.0f, 0.0f, 32.0f, 0.0f, (float)SEGLEN/2.0f); // map to pixels availeable in current segment
   int tempsamp = constrain(mySampleAvg, 0, SEGLEN/2);     // Keep the sample from overflowing.
   uint8_t gravity = 8 - SEGMENT.speed/32;
 
@@ -7226,7 +7223,7 @@ uint16_t mode_gravimeter(void) {                // Gravmeter. By Andrew Tuline.
   float realVolume = volumeSmth;
   if (SEGENV.check3 && SEGENV.check2) SEGENV.check2 = false;  // only one option
   if (SEGENV.check2) volumeSmth = soundPressure;
-  if (SEGENV.check3) volumeSmth = 255.0 - agcSensitivity; 
+  if (SEGENV.check3) volumeSmth = 255.0f - agcSensitivity;
 
   SEGMENT.fade_out(253);
   float sensGain = (float)(SEGMENT.intensity+2) / 257.0f; // min gain = 1/128
@@ -7287,7 +7284,7 @@ uint16_t mode_juggles(void) {                   // Juggles. By Andrew Tuline.
   if (SEGENV.call == 0) {SEGENV.setUpLeds(); SEGMENT.fill(BLACK);}   // WLEDMM use lossless getPixelColor()
 
   SEGMENT.fade_out(224); // 6.25%
-  uint16_t my_sampleAgc = fmax(fmin(volumeSmth, 255.0), 0);
+  uint16_t my_sampleAgc = max(min(volumeSmth, 255.0f), 0.0f);
 
   for (size_t i=0; i<SEGMENT.intensity/32+1U; i++) {
     // if SEGLEN equals 1, we will always set color to the first and only pixel, but the effect is still good looking
@@ -7367,8 +7364,8 @@ uint16_t mode_midnoise(void) {                  // Midnoise. By Andrew Tuline.
   SEGMENT.fadeToBlackBy(SEGMENT.speed/2);
   //SEGMENT.fade_out(SEGMENT.speed);
 
-  float tmpSound2 = volumeSmth * (float)SEGMENT.intensity / 256.0;  // Too sensitive.
-  tmpSound2 *= (float)SEGMENT.intensity / 128.0;              // Reduce sensitivity/length.
+  float tmpSound2 = volumeSmth * (float)SEGMENT.intensity / 256.0f;  // Too sensitive.
+  tmpSound2 *= (float)SEGMENT.intensity / 128.0f;              // Reduce sensitivity/length.
 
   int maxLen = mapf(tmpSound2, 0, 127, 0, SEGLEN/2);
   if (maxLen >SEGLEN/2) maxLen = SEGLEN/2;
@@ -7429,7 +7426,7 @@ uint16_t mode_noisemeter(void) {                // Noisemeter. By Andrew Tuline.
   uint8_t fadeRate = map2(SEGMENT.speed,0,255,200,254);
   SEGMENT.fade_out(fadeRate);
 
-  float tmpSound2 = volumeRaw * 2.0 * (float)SEGMENT.intensity / 255.0;
+  float tmpSound2 = volumeRaw * 2.0f * (float)SEGMENT.intensity / 255.0f;
   int maxLen = mapf(tmpSound2, 0, 255, 0, SEGLEN); // map to pixels availeable in current segment              // Still a bit too sensitive.
   if (maxLen <0) maxLen = 0;
   if (maxLen >SEGLEN) maxLen = SEGLEN;
@@ -7974,14 +7971,14 @@ uint16_t mode_freqwave(void) {                  // Freqwave. By Andreas Pleschun
         int lowerLimit = 80 + 3 * SEGMENT.custom1;  // min 80hz-850hz
         i = lowerLimit!=upperLimit ? mapf(FFT_MajorPeak, lowerLimit, upperLimit, 0, 255) : FFT_MajorPeak; // may under/overflow - so we enforce uint8_t
       } else {
-        // Musical Scale (logarythmic scaling)
+        // Musical Scale (logarithmic scaling)
         float upperLimit = logf(80 + 42 * SEGMENT.custom2); // max 80hz-10Khz
         float lowerLimit = logf(80 + 3 * SEGMENT.custom1);  // min 80hz-850hz
         float peakMapped = fabsf(lowerLimit - upperLimit)>0.05f ? mapf(logf(FFT_MajorPeak), lowerLimit, upperLimit, 0, 255) : FFT_MajorPeak; // may under/overflow
         if (peakMapped > 255) intensity = constrain((320-peakMapped), 0, intensity*100) / 100.0f; // too high: fade away
         i = constrain(peakMapped, 0, 255);  // fix over / underflow
       }
-      uint16_t b = 255.0 * intensity;
+      uint16_t b = 255.0f * intensity;
       if (b > 255) b=255;
       color = CHSV(i, 176+(uint8_t)b/4, (uint8_t)b); // implicit conversion to RGB supplied by FastLED
     }
@@ -8023,7 +8020,7 @@ uint16_t mode_gravfreq(void) {                  // Gravfreq. By Andrew Tuline.
   float segmentSampleAvg = volumeSmth * (float)SEGMENT.intensity / 255.0f;
   segmentSampleAvg *= 0.125f; // divide by 8,  to compensate for later "sensitivity" upscaling
 
-  float mySampleAvg = mapf(segmentSampleAvg*2.0f, 0,32, 0, (float)SEGLEN/2.0); // map to pixels availeable in current segment
+  float mySampleAvg = mapf(segmentSampleAvg*2.0f, 0,32, 0, (float)SEGLEN/2.0f); // map to pixels available in current segment
   int tempsamp = constrain(mySampleAvg,0,SEGLEN/2);     // Keep the sample from overflowing.
   uint8_t gravity = 8 - SEGMENT.speed/32;
 
@@ -8542,21 +8539,12 @@ uint16_t mode_2Dsoap() {
 
   // init
   if (SEGENV.call == 0) {
-    if (true) {//WLEDMM SuperSync
-      random16_set_seed(535);
-      USER_PRINTF("SuperSync\n");
-    }
+    random16_set_seed(535); //WLEDMM SuperSync
     SEGENV.setUpLeds();
     SEGMENT.fill(BLACK);
     *noise32_x = random16();
     *noise32_y = random16();
     *noise32_z = random16();
-  } else {
-    if (!true) { //WLEDMM SuperSync
-      *noise32_x += mov;
-      *noise32_y += mov;
-      *noise32_z += mov;
-    }
   }
 
   //WLEDMM: changing noise calculation for SuperSync to make it deterministic using strip.now
@@ -8564,11 +8552,10 @@ uint16_t mode_2Dsoap() {
   uint32_t noise32_y_MM = *noise32_y;
   uint32_t noise32_z_MM = *noise32_z;
 
-  if (true) { //WLEDMM SuperSync
-    noise32_x_MM = *noise32_x + mov * strip.now / 100; //10 fps (original 20-40 fps, depending on realized fps)
-    noise32_y_MM = *noise32_y + mov * strip.now / 100;
-    noise32_z_MM = *noise32_z + mov * strip.now / 100;
-  }
+  //WLEDMM SuperSync
+  noise32_x_MM = *noise32_x + mov * strip.now / 100; //10 fps (original 20-40 fps, depending on realized fps)
+  noise32_y_MM = *noise32_y + mov * strip.now / 100;
+  noise32_z_MM = *noise32_z + mov * strip.now / 100;
 
   for (int i = 0; i < cols; i++) {
     int32_t ioffset = scale32_x * (i - cols / 2);
@@ -8689,8 +8676,6 @@ uint16_t mode_2Doctopus() {
 
   // re-init if SEGMENT dimensions or offset changed
   if (SEGENV.call == 0 || SEGENV.aux0 != cols || SEGENV.aux1 != rows || SEGMENT.custom1 != *offsX || SEGMENT.custom2 != *offsY) {
-    if (!true) //WLEDMM SuperSync
-      SEGENV.step = 0; // t
     SEGENV.aux0 = cols;
     SEGENV.aux1 = rows;
     *offsX = SEGMENT.custom1;
@@ -8968,7 +8953,7 @@ uint16_t mode_2DPaintbrush() {
     byte y1 = beatsin8_t(max(16,int(SEGMENT.speed))/16*3 + fftResult[0]/16, 0, (rows-1), fftResult[bin], SEGENV.aux1);
     byte y2 = beatsin8_t(max(16,int(SEGMENT.speed))/16*4 + fftResult[0]/16, 0, (rows-1), fftResult[bin], SEGENV.aux1);
 
-    int length = sqrt((x2-x1)*(x2-x1) + (y2-y1)*(y2-y1));
+    int length = sqrtf((x2-x1)*(x2-x1) + (y2-y1)*(y2-y1));
     length = map8(fftResult[bin],0,length);
 
     if (length > max(1,int(SEGMENT.custom3))) {
diff --git a/wled00/FX.h b/wled00/FX.h
index c35c54fb..5e8ae60a 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -429,7 +429,6 @@ typedef struct Segment {
     // WLEDMM cache some values that won't change while drawing a frame
     bool _isValid2D = false;
     uint8_t _brightness = 255; // final pixel brightness - including transitions and segment opacity
-    bool _firstFill = true;  // dirty HACK support
     uint16_t _2dWidth = 0;  // virtualWidth
     uint16_t _2dHeight = 0; // virtualHeight
     uint16_t _virtuallength = 0; // virtualLength
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 4d58143b..2c7d0fc8 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -259,9 +259,6 @@ void Segment::startFrame(void) {
   _2dHeight   = calc_virtualHeight();
   _2dWidth    = _isValid2D ? calc_virtualWidth() : calc_virtualLength();
   _virtuallength = calc_virtualLength();
-  #if 0 && defined(WLED_ENABLE_HUB75MATRIX)
-    _firstFill = true; // dirty HACK
-  #endif
 #endif
 }
 // WLEDMM end
@@ -402,7 +399,7 @@ void Segment::setPixelColorXY(float x, float y, uint32_t col, bool aa, bool fast
   if (Segment::maxHeight==1) return; // not a matrix set-up
   if (x<0.0f || x>1.0f || y<0.0f || y>1.0f) return; // not normalized
 
-#if 0 // depricated
+#if 0 // deprecated
   const uint_fast16_t cols = virtualWidth();
   const uint_fast16_t rows = virtualHeight();
 
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index a62ee39b..462bb7e7 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -1399,17 +1399,6 @@ void Segment::refreshLightCapabilities() {
  */
 void __attribute__((hot)) Segment::fill(uint32_t c) {
   if (!isActive()) return; // not active
-  
-  #if 0 && defined(WLED_ENABLE_HUB75MATRIX) && defined(WLEDMM_FASTPATH)
-  // DIRTY HACK - this ignores the first fill(black) in each frame, knowing that HUB75 has already blanked out the display.
-  if (_firstFill) {
-    _firstFill = false;
-    if (c == BLACK) {
-      if (ledsrgb && ledsrgbSize > 0) memset(ledsrgb, 0, ledsrgbSize);
-      return;
-    }
-  }
-  #endif
 
   const uint_fast16_t cols = is2D() ? virtualWidth() : virtualLength();             // WLEDMM use fast int types
   const uint_fast16_t rows = virtualHeight(); // will be 1 for 1D