From eb3406e20043dda4e9b3d684eeca0407ead20268 Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Fri, 24 May 2024 11:35:34 -0400
Subject: [PATCH 001/200] GoL Memory Leak fix

Removed gameoflife struct.
---
 wled00/FX.cpp | 58 ++++++++++++++++++++++-----------------------------
 1 file changed, 25 insertions(+), 33 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index dce51a4a..de7c9a86 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5161,30 +5161,22 @@ static void setBitValue(uint8_t* byteArray, size_t n, bool value) {
     else
         byteArray[byteIndex] &= ~(1 << bitIndex);
 }
-// create game of life struct to hold cells and future cells
-struct gameOfLife {
-  uint8_t* cells;
-  uint8_t* futureCells;
-  uint8_t gliderLength;
-  uint16_t oscillatorCRC;
-  uint16_t spaceshipCRC;
-};
+
 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() / 8) + (((SEGMENT.length() % 8) != 0) ? 1 : 0); // add one byte when extra bits needed (length not a multiple of 8)
-  const size_t totalSize = dataSize*2 + sizeof(gameOfLife);
+  const size_t dataSize = ((SEGMENT.length() + 7) / 8); // round up to nearest byte
+  const size_t totalSize = dataSize*2 + sizeof(uint8_t) + sizeof(uint16_t)*2; // 2 byte arrays, 1 uint8_t, 2 uint16_t
 
   if (!SEGENV.allocateData(totalSize)) return mode_static(); //allocation failed
-  gameOfLife* gol = reinterpret_cast<gameOfLife*>(SEGENV.data);
-
-  if (gol->cells == nullptr) {
-    gol->cells = new uint8_t[dataSize];
-    gol->futureCells = new uint8_t[dataSize];
-  }
+  byte *cells = reinterpret_cast<byte*>(SEGENV.data);
+  byte *futureCells = reinterpret_cast<byte*>(SEGENV.data + dataSize);
+  uint8_t *gliderLength = reinterpret_cast<uint8_t*>(SEGENV.data + dataSize*2);
+  uint16_t *oscillatorCRC = reinterpret_cast<uint16_t*>(SEGENV.data + dataSize*2 + sizeof(uint8_t));
+  uint16_t *spaceshipCRC = reinterpret_cast<uint16_t*>(SEGENV.data + dataSize*2 + sizeof(uint8_t) + sizeof(uint16_t));
 
   uint16_t &generation = SEGENV.aux0; //rename aux0 and aux1 for readability (not needed)
   uint16_t &pauseFrames = SEGENV.aux1;
@@ -5205,22 +5197,22 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
     for (int x = 0; x < cols; x++) for (int y = 0; y < rows; y++) {
       uint8_t state = (random8() < 82) ? 1 : 0; // ~32% chance of being alive
       if (state == 0) {
-        setBitValue(gol->cells, y * cols + x, false);
-        setBitValue(gol->futureCells, y * cols + x, false);
+        setBitValue(cells, y * cols + x, false);
+        setBitValue(futureCells, y * cols + x, false);
         if (SEGMENT.check2) continue;
         SEGMENT.setPixelColorXY(x,y, !SEGMENT.check1?backgroundColor : RGBW32(backgroundColor.r, backgroundColor.g, backgroundColor.b, 0));
       }
       else {
-        setBitValue(gol->cells, y * cols + x, true);
-        setBitValue(gol->futureCells, y * cols + x, true);
+        setBitValue(cells, y * cols + x, true);
+        setBitValue(futureCells, y * cols + x, true);
         color = SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0);
         SEGMENT.setPixelColorXY(x,y,!SEGMENT.check1?color : RGBW32(color.r, color.g, color.b, 0));
       }
     }
 
     //Clear CRCs
-    gol->oscillatorCRC = 0;
-    gol->spaceshipCRC = 0;
+    *oscillatorCRC = 0;
+    *spaceshipCRC = 0;
 
     //Calculate glider length LCM(rows,cols)*4
     uint8_t a = rows;
@@ -5230,14 +5222,14 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
       b = a % b;
       a = t;
     }
-    gol->gliderLength = cols * rows / a * 4;
+    *gliderLength = cols * rows / a * 4;
     return FRAMETIME;
   }
   //Redraw immediately if overlay to avoid flicker
   if (SEGMENT.check2) {
     for (int x = 0; x < cols; x++) for (int y = 0; y < rows; y++) {
       //redraw foreground/alive
-      if (getBitValue(gol->cells, y * cols + x)) {
+      if (getBitValue(cells, y * cols + x)) {
         color = SEGMENT.getPixelColorXY(x,y);
         SEGMENT.setPixelColorXY(x,y, !SEGMENT.check1?color : RGBW32(color.r, color.g, color.b, 0));
       }
@@ -5271,7 +5263,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
       }
       cIndex = cY * cols + cX;
       // count neighbors and store upto 3 neighbor colors
-      if (getBitValue(gol->cells, cIndex)) { //if alive
+      if (getBitValue(cells, cIndex)) { //if alive
         neighbors++;
         color = SEGMENT.getPixelColorXY(cX, cY);
         if (color == backgroundColor) continue; //parent just died, color lost
@@ -5281,16 +5273,16 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
     }
 
     // Rules of Life
-    bool cellValue = getBitValue(gol->cells, y * cols + x);
+    bool cellValue = getBitValue(cells, y * cols + x);
     if ((cellValue) && (neighbors < 2 || neighbors > 3)) {
       // Loneliness or overpopulation
       cellChanged = true;
-      setBitValue(gol->futureCells, y * cols + x, false);
+      setBitValue(futureCells, y * cols + x, false);
       if (!SEGMENT.check2) SEGMENT.setPixelColorXY(x,y, !SEGMENT.check1?backgroundColor : RGBW32(backgroundColor.r, backgroundColor.g, backgroundColor.b, 0));
     } 
     else if (!(cellValue) && (neighbors == 3)) { 
       // Reproduction
-      setBitValue(gol->futureCells, y * cols + x, true);
+      setBitValue(futureCells, y * cols + x, true);
       cellChanged = true;
       // find dominant color and assign it to a cell
       // no longer storing colors, if parent dies the color is lost
@@ -5311,21 +5303,21 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
     } 
   }
   //update cell values
-  memcpy(gol->cells, gol->futureCells, dataSize);
+  memcpy(cells, futureCells, dataSize);
 
   // Get current crc value
-  uint16_t crc = crc16((const unsigned char*)gol->cells, dataSize);
+  uint16_t crc = crc16((const unsigned char*)cells, dataSize);
 
   bool repetition = false;
-  if (!cellChanged || crc == gol->oscillatorCRC || crc == gol->spaceshipCRC) repetition = true; //check if cell changed this gen and compare previous stored crc values
+  if (!cellChanged || 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
     pauseFrames = 50;
     return FRAMETIME;
   }
   // Update CRC values
-  if (generation % 16 == 0) gol->oscillatorCRC = crc;
-  if (generation % gol->gliderLength == 0) gol->spaceshipCRC = crc;
+  if (generation % 16 == 0) *oscillatorCRC = crc;
+  if (generation % *gliderLength == 0) *spaceshipCRC = crc;
 
   generation++;
   SEGENV.step = strip.now;

From 09dad1d79658b8d3454a611c72878ef35ee31d5a Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Fri, 24 May 2024 12:45:13 -0400
Subject: [PATCH 002/200] GoL - Added blur slider

Blurs dead cells instead of immediately turning off depending on slider value. Blur is disabled when using overlay.
---
 wled00/FX.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index de7c9a86..75d1d896 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5180,7 +5180,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
 
   uint16_t &generation = SEGENV.aux0; //rename aux0 and aux1 for readability (not needed)
   uint16_t &pauseFrames = SEGENV.aux1;
-  CRGB backgroundColor = SEGCOLOR(1);
+  CRGB bgColor = SEGCOLOR(1);
   CRGB color;
 
   if (SEGENV.call == 0) {
@@ -5200,7 +5200,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
         setBitValue(cells, y * cols + x, false);
         setBitValue(futureCells, y * cols + x, false);
         if (SEGMENT.check2) continue;
-        SEGMENT.setPixelColorXY(x,y, !SEGMENT.check1?backgroundColor : RGBW32(backgroundColor.r, backgroundColor.g, backgroundColor.b, 0));
+        SEGMENT.setPixelColorXY(x,y, !SEGMENT.check1?bgColor : RGBW32(bgColor.r, bgColor.g, bgColor.b, 0));
       }
       else {
         setBitValue(cells, y * cols + x, true);
@@ -5265,8 +5265,9 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
       // count neighbors and store upto 3 neighbor colors
       if (getBitValue(cells, cIndex)) { //if alive
         neighbors++;
+        if (!getBitValue(futureCells, cIndex)) continue; //parent just died, color lost
         color = SEGMENT.getPixelColorXY(cX, cY);
-        if (color == backgroundColor) continue; //parent just died, color lost
+        if (color == bgColor) continue;
         nColors[colorCount%3] = color;
         colorCount++;
       }
@@ -5278,7 +5279,8 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
       // Loneliness or overpopulation
       cellChanged = true;
       setBitValue(futureCells, y * cols + x, false);
-      if (!SEGMENT.check2) SEGMENT.setPixelColorXY(x,y, !SEGMENT.check1?backgroundColor : RGBW32(backgroundColor.r, backgroundColor.g, backgroundColor.b, 0));
+      // blur/turn off dying cells
+      if (!SEGMENT.check2) SEGMENT.setPixelColorXY(x,y, blend(SEGMENT.getPixelColorXY(x,y), bgColor, map(SEGMENT.custom1, 0, 255, 255, 0)));
     } 
     else if (!(cellValue) && (neighbors == 3)) { 
       // Reproduction
@@ -5296,11 +5298,13 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
       else if (colorCount == 1) dominantColor = nColors[0]; // 2 leading parents died
       else dominantColor = color; // all parents died last used color
       // mutate color chance
-      if (random8() < SEGMENT.intensity) dominantColor = !SEGMENT.check1?SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0): random16()*random16();
-
+      if (random8() < SEGMENT.intensity || dominantColor == bgColor) dominantColor = !SEGMENT.check1?SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0): random16()*random16();
       if (SEGMENT.check1) dominantColor = RGBW32(dominantColor.r, dominantColor.g, dominantColor.b, 0); //WLEDMM support all colors
       SEGMENT.setPixelColorXY(x,y, dominantColor);
-    } 
+    }
+    else { // blur dead cells 
+      if (!cellValue && !SEGMENT.check2) SEGMENT.setPixelColorXY(x,y, blend(SEGMENT.getPixelColorXY(x,y), bgColor, map(SEGMENT.custom1, 0, 255, 255, 0))); 
+    }
   }
   //update cell values
   memcpy(cells, futureCells, dataSize);
@@ -5323,7 +5327,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 ☾,,,,All Colors ☾,Overlay ☾,Wrap ☾,;!,!;!;2;sx=200,ix=12,c1=0,o3=1"; 
+static const char _data_FX_MODE_2DGAMEOFLIFE[] PROGMEM = "Game Of Life@!,Color Mutation ☾,Blur ☾,,,All Colors ☾,Overlay ☾,Wrap ☾,;!,!;!;2;sx=200,ix=12,c1=0,o3=1"; 
 
 /////////////////////////
 //     2D Hiphotic     //

From 8491cf18f7b6f8d532e9e6641b0e45d965a8b6dd Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Fri, 24 May 2024 13:00:10 -0400
Subject: [PATCH 003/200] GoL - Removed pauseFrames

Uses .step now to pause.
---
 wled00/FX.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 75d1d896..56c6c259 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5178,8 +5178,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
   uint16_t *oscillatorCRC = reinterpret_cast<uint16_t*>(SEGENV.data + dataSize*2 + sizeof(uint8_t));
   uint16_t *spaceshipCRC = reinterpret_cast<uint16_t*>(SEGENV.data + dataSize*2 + sizeof(uint8_t) + sizeof(uint16_t));
 
-  uint16_t &generation = SEGENV.aux0; //rename aux0 and aux1 for readability (not needed)
-  uint16_t &pauseFrames = SEGENV.aux1;
+  uint16_t &generation = SEGENV.aux0; //rename aux0 readability (not needed)
   CRGB bgColor = SEGCOLOR(1);
   CRGB color;
 
@@ -5188,10 +5187,9 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
     SEGMENT.fill(BLACK); // to make sure that segment buffer and physical leds are aligned initially
   }
   //start new game of life
-  if ((SEGENV.call == 0 || generation == 0) && pauseFrames == 0) {
-    SEGENV.step = strip.now; // .step = previous call time
+  if ((SEGENV.call == 0 || generation == 0) && SEGENV.step < strip.now) {
+    SEGENV.step = strip.now + 1500; // show initial state for 1.5 seconds
     generation = 1;
-    pauseFrames = 75; // show initial state for longer
     random16_set_seed(strip.now>>2); //seed the random generator
     //Setup Grid
     for (int x = 0; x < cols; x++) for (int y = 0; y < rows; y++) {
@@ -5235,8 +5233,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
       }
     }
   }
-  if (pauseFrames || strip.now - SEGENV.step < FRAMETIME_FIXED * (uint32_t)map(SEGMENT.speed,0,255,64,2)) {
-    if(pauseFrames) pauseFrames--;
+  if (SEGENV.step > strip.now || strip.now - SEGENV.step < FRAMETIME_FIXED * (uint32_t)map(SEGMENT.speed,0,255,64,2)) {
     return FRAMETIME; //skip if not enough time has passed
   }
   //Update Game of Life
@@ -5316,7 +5313,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
   if (!cellChanged || 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
-    pauseFrames = 50;
+    SEGENV.step += 1000; // pause final generation for 1 second
     return FRAMETIME;
   }
   // Update CRC values

From 631aa35718078eeb95cfb7c0de677361c0c70fd4 Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Fri, 24 May 2024 13:20:29 -0400
Subject: [PATCH 004/200] GoL - Change default values.

General cleanup.
---
 wled00/FX.cpp | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 56c6c259..5f454fca 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5188,24 +5188,23 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
   }
   //start new game of life
   if ((SEGENV.call == 0 || generation == 0) && SEGENV.step < strip.now) {
-    SEGENV.step = strip.now + 1500; // show initial state for 1.5 seconds
+    SEGENV.step = strip.now + 1250; // show initial state for 1.25 seconds
     generation = 1;
     random16_set_seed(strip.now>>2); //seed the random generator
     //Setup Grid
     for (int x = 0; x < cols; x++) for (int y = 0; y < rows; y++) {
-      uint8_t state = (random8() < 82) ? 1 : 0; // ~32% chance of being alive
-      if (state == 0) {
-        setBitValue(cells, y * cols + x, false);
-        setBitValue(futureCells, y * cols + x, false);
-        if (SEGMENT.check2) continue;
-        SEGMENT.setPixelColorXY(x,y, !SEGMENT.check1?bgColor : RGBW32(bgColor.r, bgColor.g, bgColor.b, 0));
-      }
-      else {
+      if (random8() < 82) { // ~32% chance of being alive
         setBitValue(cells, y * cols + x, true);
         setBitValue(futureCells, y * cols + x, true);
         color = SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0);
         SEGMENT.setPixelColorXY(x,y,!SEGMENT.check1?color : RGBW32(color.r, color.g, color.b, 0));
       }
+      else {
+        setBitValue(cells, y * cols + x, false);
+        setBitValue(futureCells, y * cols + x, false);
+        if (SEGMENT.check2) continue; //overlay
+        SEGMENT.setPixelColorXY(x,y, !SEGMENT.check1?bgColor : RGBW32(bgColor.r, bgColor.g, bgColor.b, 0));
+      }
     }
 
     //Clear CRCs
@@ -5250,7 +5249,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
 
     for (int i = -1; i <= 1; i++) for (int j = -1; j <= 1; j++) { // iterate through 3*3 matrix
       if (i==0 && j==0) continue; // ignore itself
-      if (!SEGMENT.check3 || generation % 1500 == 0) { //no wrap disable wrap every 1500 generations to prevent undetected repeats
+      if (!SEGMENT.check3 || generation % 1500 == 0) { //no wrap, disable wrap every 1500 generations to prevent undetected repeats
         cX = x+i;
         cY = y+j;
         if (cX < 0 || cY < 0 || cX >= cols || cY >= rows) continue; //skip if out of bounds
@@ -5265,7 +5264,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
         if (!getBitValue(futureCells, cIndex)) continue; //parent just died, color lost
         color = SEGMENT.getPixelColorXY(cX, cY);
         if (color == bgColor) continue;
-        nColors[colorCount%3] = color;
+        nColors[colorCount % 3] = color;
         colorCount++;
       }
     }
@@ -5292,8 +5291,8 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
         else dominantColor = nColors[random8()%3];
       }
       else if (colorCount == 2) dominantColor = nColors[random8()%2]; // 1 leading parent died
-      else if (colorCount == 1) dominantColor = nColors[0]; // 2 leading parents died
-      else dominantColor = color; // all parents died last used color
+      else if (colorCount == 1) dominantColor = nColors[0];           // 2 leading parents died
+      else dominantColor = color;                                     // all parents died last used color
       // mutate color chance
       if (random8() < SEGMENT.intensity || dominantColor == bgColor) dominantColor = !SEGMENT.check1?SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0): random16()*random16();
       if (SEGMENT.check1) dominantColor = RGBW32(dominantColor.r, dominantColor.g, dominantColor.b, 0); //WLEDMM support all colors
@@ -5312,7 +5311,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
   bool repetition = false;
   if (!cellChanged || 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
+    generation = 0;      // reset on next call
     SEGENV.step += 1000; // pause final generation for 1 second
     return FRAMETIME;
   }
@@ -5324,7 +5323,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 ☾,Wrap ☾,;!,!;!;2;sx=200,ix=12,c1=0,o3=1"; 
+static const char _data_FX_MODE_2DGAMEOFLIFE[] PROGMEM = "Game Of Life@!,Color Mutation ☾,Blur ☾,,,All Colors ☾,Overlay ☾,Wrap ☾,;!,!;!;2;sx=200,ix=12,c1=8,o3=1"; 
 
 /////////////////////////
 //     2D Hiphotic     //

From 886ea5f88cc3b3b8d21f84ec4f3b4802dc0ff633 Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Fri, 24 May 2024 13:41:49 -0400
Subject: [PATCH 005/200] GoL - Palette Switching

Recolors all live cells on palette/color change. Before you needed a game restart or mutation over time.
---
 wled00/FX.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 5f454fca..1f06850e 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5169,7 +5169,8 @@ 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() + 7) / 8); // round up to nearest byte
-  const size_t totalSize = dataSize*2 + sizeof(uint8_t) + sizeof(uint16_t)*2; // 2 byte arrays, 1 uint8_t, 2 uint16_t
+  const size_t detectionSize =  sizeof(uint8_t) + sizeof(uint16_t)*2; // 1 uint8_t (gliderLen), 2 uint16_t (2 CRCs)
+  const size_t totalSize = dataSize * 2 + detectionSize + sizeof(CRGB); //CRGB prevColor
 
   if (!SEGENV.allocateData(totalSize)) return mode_static(); //allocation failed
   byte *cells = reinterpret_cast<byte*>(SEGENV.data);
@@ -5177,6 +5178,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
   uint8_t *gliderLength = reinterpret_cast<uint8_t*>(SEGENV.data + dataSize*2);
   uint16_t *oscillatorCRC = reinterpret_cast<uint16_t*>(SEGENV.data + dataSize*2 + sizeof(uint8_t));
   uint16_t *spaceshipCRC = reinterpret_cast<uint16_t*>(SEGENV.data + dataSize*2 + sizeof(uint8_t) + sizeof(uint16_t));
+  CRGB *prevColor = reinterpret_cast<CRGB*>(SEGENV.data + dataSize*2 + detectionSize);
 
   uint16_t &generation = SEGENV.aux0; //rename aux0 readability (not needed)
   CRGB bgColor = SEGCOLOR(1);
@@ -5235,6 +5237,17 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
   if (SEGENV.step > strip.now || strip.now - SEGENV.step < FRAMETIME_FIXED * (uint32_t)map(SEGMENT.speed,0,255,64,2)) {
     return FRAMETIME; //skip if not enough time has passed
   }
+
+  //Recolor live cells if palette/color changed
+  if (SEGMENT.color_from_palette(0, false, PALETTE_SOLID_WRAP, 0) != *prevColor){
+    for (int x = 0; x < cols; x++) for (int y = 0; y < rows; y++) {
+      if (getBitValue(cells, y * cols + x)) {
+        SEGMENT.setPixelColorXY(x,y, SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0));
+      }
+    }
+    *prevColor = SEGMENT.color_from_palette(0, false, PALETTE_SOLID_WRAP, 0);
+  }
+
   //Update Game of Life
   bool cellChanged = false; // Detect still live and dead grids
   //cell index and coordinates

From 84128eef8b6717c1f6f7eab21b5a14fb5ce266c1 Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Fri, 24 May 2024 14:10:16 -0400
Subject: [PATCH 006/200] GoL - Changed speed slider to updates/sec

Every 4 ticks of speed adds 1 update per second. 1 - 64.
---
 wled00/FX.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 1f06850e..17027406 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5234,7 +5234,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
       }
     }
   }
-  if (SEGENV.step > strip.now || strip.now - SEGENV.step < FRAMETIME_FIXED * (uint32_t)map(SEGMENT.speed,0,255,64,2)) {
+  if (SEGENV.step > strip.now || strip.now - SEGENV.step < 1000 / (uint32_t)map(SEGMENT.speed,0,255,1,64)) { // 1 - 64 updates per second
     return FRAMETIME; //skip if not enough time has passed
   }
 
@@ -5336,7 +5336,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 ☾,Wrap ☾,;!,!;!;2;sx=200,ix=12,c1=8,o3=1"; 
+static const char _data_FX_MODE_2DGAMEOFLIFE[] PROGMEM = "Game Of Life@!,Color Mutation ☾,Blur ☾,,,All Colors ☾,Overlay ☾,Wrap ☾,;!,!;!;2;sx=82,ix=12,c1=8,o3=1"; 
 
 /////////////////////////
 //     2D Hiphotic     //

From 7657c90c75e9218860b21054c589dd26d911edee Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Fri, 24 May 2024 14:38:35 -0400
Subject: [PATCH 007/200] GoL - Uses cIndex more consistently

---
 wled00/FX.cpp | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 4ae889fc..186edf72 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5186,6 +5186,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
   uint16_t &generation = SEGENV.aux0; //rename aux0 readability (not needed)
   CRGB bgColor = SEGCOLOR(1);
   CRGB color;
+  uint16_t cIndex; 
 
   if (SEGENV.call == 0) {
     SEGMENT.setUpLeds();
@@ -5198,15 +5199,16 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
     random16_set_seed(strip.now>>2); //seed the random generator
     //Setup Grid
     for (int x = 0; x < cols; x++) for (int y = 0; y < rows; y++) {
+      cIndex = y * cols + x;
       if (random8() < 82) { // ~32% chance of being alive
-        setBitValue(cells, y * cols + x, true);
-        setBitValue(futureCells, y * cols + x, true);
+        setBitValue(cells, cIndex, true);
+        setBitValue(futureCells, cIndex, true);
         color = SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0);
         SEGMENT.setPixelColorXY(x,y,!SEGMENT.check1?color : RGBW32(color.r, color.g, color.b, 0));
       }
       else {
-        setBitValue(cells, y * cols + x, false);
-        setBitValue(futureCells, y * cols + x, false);
+        setBitValue(cells, cIndex, false);
+        setBitValue(futureCells, cIndex, false);
         if (SEGMENT.check2) continue; //overlay
         SEGMENT.setPixelColorXY(x,y, !SEGMENT.check1?bgColor : RGBW32(bgColor.r, bgColor.g, bgColor.b, 0));
       }
@@ -5231,7 +5233,8 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
   if (SEGMENT.check2) {
     for (int x = 0; x < cols; x++) for (int y = 0; y < rows; y++) {
       //redraw foreground/alive
-      if (getBitValue(cells, y * cols + x)) {
+      cIndex = y * cols + x;
+      if (getBitValue(cells, cIndex)) {
         color = SEGMENT.getPixelColorXY(x,y);
         SEGMENT.setPixelColorXY(x,y, !SEGMENT.check1?color : RGBW32(color.r, color.g, color.b, 0));
       }
@@ -5244,7 +5247,8 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
   //Recolor live cells if palette/color changed
   if (SEGMENT.color_from_palette(0, false, PALETTE_SOLID_WRAP, 0) != *prevColor){
     for (int x = 0; x < cols; x++) for (int y = 0; y < rows; y++) {
-      if (getBitValue(cells, y * cols + x)) {
+      cIndex = y * cols + x;
+      if (getBitValue(cells, cIndex)) {
         SEGMENT.setPixelColorXY(x,y, SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0));
       }
     }
@@ -5253,8 +5257,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
 
   //Update Game of Life
   bool cellChanged = false; // Detect still live and dead grids
-  //cell index and coordinates
-  uint16_t cIndex;
+  //cell coordinates
   uint16_t cX;
   uint16_t cY;
   //Loop through all cells. Count neighbors, apply rules, setPixel
@@ -5273,7 +5276,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
         cX = (x+i+cols) % cols;
         cY = (y+j+rows) % rows;
       }
-      cIndex = cY * cols + cX;
+      cIndex = cY * cols + cX; //neighbor cell index
       // count neighbors and store upto 3 neighbor colors
       if (getBitValue(cells, cIndex)) { //if alive
         neighbors++;
@@ -5286,17 +5289,18 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
     }
 
     // Rules of Life
-    bool cellValue = getBitValue(cells, y * cols + x);
+    cIndex = y * cols + x; //current cell index
+    bool cellValue = getBitValue(cells, cIndex);
     if ((cellValue) && (neighbors < 2 || neighbors > 3)) {
       // Loneliness or overpopulation
       cellChanged = true;
-      setBitValue(futureCells, y * cols + x, false);
+      setBitValue(futureCells, cIndex, false);
       // blur/turn off dying cells
       if (!SEGMENT.check2) SEGMENT.setPixelColorXY(x,y, blend(SEGMENT.getPixelColorXY(x,y), bgColor, map(SEGMENT.custom1, 0, 255, 255, 0)));
     } 
     else if (!(cellValue) && (neighbors == 3)) { 
       // Reproduction
-      setBitValue(futureCells, y * cols + x, true);
+      setBitValue(futureCells, cIndex, true);
       cellChanged = true;
       // find dominant color and assign it to a cell
       // no longer storing colors, if parent dies the color is lost

From 8c3e2cefab07fb1e56a5cb0d55e55c6c7974d705 Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Tue, 4 Jun 2024 16:18:54 -0400
Subject: [PATCH 008/200] GoL - Rework

Blur now fades while game is paused.
New blur mode when blur slider is >220
Added variables to make code easier to follow instead of check1 custom1 etc. (not needed)
Removed % with random8 calls.
Misc changes
---
 wled00/FX.cpp | 110 +++++++++++++++++++++++++-------------------------
 1 file changed, 54 insertions(+), 56 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 186edf72..ecc4af14 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5173,50 +5173,54 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
   const uint16_t rows = SEGMENT.virtualHeight();
   const size_t dataSize = ((SEGMENT.length() + 7) / 8); // round up to nearest byte
   const size_t detectionSize =  sizeof(uint8_t) + sizeof(uint16_t)*2; // 1 uint8_t (gliderLen), 2 uint16_t (2 CRCs)
-  const size_t totalSize = dataSize * 2 + detectionSize + sizeof(CRGB); //CRGB prevColor
+  const size_t totalSize = dataSize * 2 + detectionSize + sizeof(uint8_t);
 
   if (!SEGENV.allocateData(totalSize)) return mode_static(); //allocation failed
-  byte *cells = reinterpret_cast<byte*>(SEGENV.data);
+  byte *cells       = reinterpret_cast<byte*>(SEGENV.data);
   byte *futureCells = reinterpret_cast<byte*>(SEGENV.data + dataSize);
-  uint8_t *gliderLength = reinterpret_cast<uint8_t*>(SEGENV.data + dataSize*2);
+  uint8_t *gliderLength   = reinterpret_cast<uint8_t*>(SEGENV.data + dataSize*2);
   uint16_t *oscillatorCRC = reinterpret_cast<uint16_t*>(SEGENV.data + dataSize*2 + sizeof(uint8_t));
-  uint16_t *spaceshipCRC = reinterpret_cast<uint16_t*>(SEGENV.data + dataSize*2 + sizeof(uint8_t) + sizeof(uint16_t));
-  CRGB *prevColor = reinterpret_cast<CRGB*>(SEGENV.data + dataSize*2 + detectionSize);
+  uint16_t *spaceshipCRC  = reinterpret_cast<uint16_t*>(SEGENV.data + dataSize*2 + sizeof(uint8_t) + sizeof(uint16_t));
+  uint8_t *prevPalette = reinterpret_cast<uint8_t*>(SEGENV.data + dataSize*2 + detectionSize);
 
-  uint16_t &generation = SEGENV.aux0; //rename aux0 readability (not needed)
-  CRGB bgColor = SEGCOLOR(1);
-  CRGB color;
+  uint16_t &generation = SEGENV.aux0; //Rename SEGENV/SEGMENT variables for readability
+  bool allColors   = SEGMENT.check1;
+  bool overlayBG   = SEGMENT.check2;
+  bool wrap        = SEGMENT.check3;
+  byte blur        = map(SEGMENT.custom1, 0, 255, 255, 0);
+  bool bgBlendMode = SEGMENT.custom1 > 220 && !overlayBG; // if blur is high and not overlaying, use bg blend mode
+  byte bgBlur      = map(SEGMENT.custom1 - 220, 0, 35, 255, 128);
+  CRGB bgColor     = SEGCOLOR(1);
+  CRGB color       = allColors ? random16() * random16() : SEGMENT.color_from_palette(0, false, PALETTE_SOLID_WRAP, 0);
   uint16_t cIndex; 
 
   if (SEGENV.call == 0) {
     SEGMENT.setUpLeds();
     SEGMENT.fill(BLACK); // to make sure that segment buffer and physical leds are aligned initially
   }
-  //start new game of life
+  // 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 (int x = 0; x < cols; x++) for (int y = 0; y < rows; y++) {
       cIndex = y * cols + x;
-      if (random8() < 82) { // ~32% chance of being alive
+      if (random8(100) < 32) { // ~32% chance of being alive
         setBitValue(cells, cIndex, true);
-        setBitValue(futureCells, cIndex, true);
         color = SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0);
-        SEGMENT.setPixelColorXY(x,y,!SEGMENT.check1?color : RGBW32(color.r, color.g, color.b, 0));
-      }
-      else {
-        setBitValue(cells, cIndex, false);
-        setBitValue(futureCells, cIndex, false);
-        if (SEGMENT.check2) continue; //overlay
-        SEGMENT.setPixelColorXY(x,y, !SEGMENT.check1?bgColor : RGBW32(bgColor.r, bgColor.g, bgColor.b, 0));
+        SEGMENT.setPixelColorXY(x,y, allColors ? random16() * random16() : color);
       }
+      else if (!overlayBG) SEGMENT.setPixelColorXY(x,y, allColors ? RGBW32(bgColor.r, bgColor.g, bgColor.b, 0) : bgColor); // set background color if not overlaying
     }
-
-    //Clear CRCs
-    *oscillatorCRC = 0;
-    *spaceshipCRC = 0;
+    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;
@@ -5229,32 +5233,27 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
     *gliderLength = cols * rows / a * 4;
     return FRAMETIME;
   }
-  //Redraw immediately if overlay to avoid flicker
-  if (SEGMENT.check2) {
+
+  // Redraw if paused (remove blur), palette changed, or overlaying background (avoid flicker)
+  bool palChanged = SEGMENT.palette != *prevPalette && !allColors;
+  bool blurDead = SEGENV.step > strip.now && !bgBlendMode && !overlayBG;
+  if (palChanged || blurDead || overlayBG) {
     for (int x = 0; x < cols; x++) for (int y = 0; y < rows; y++) {
-      //redraw foreground/alive
       cIndex = y * cols + x;
-      if (getBitValue(cells, cIndex)) {
+      bool alive = getBitValue(cells, cIndex);
+      if (palChanged && alive) SEGMENT.setPixelColorXY(x,y, SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0));
+      else if (overlayBG & alive) {
         color = SEGMENT.getPixelColorXY(x,y);
-        SEGMENT.setPixelColorXY(x,y, !SEGMENT.check1?color : RGBW32(color.r, color.g, color.b, 0));
+        SEGMENT.setPixelColorXY(x,y, allColors ? RGBW32(color.r, color.g, color.b, 0) : color);
       }
+      if (palChanged && !alive && !overlayBG) SEGMENT.setPixelColorXY(x,y, bgColor); // remove blurred cells from previous palette
+      else if (blurDead && !alive) SEGMENT.setPixelColorXY(x,y, blend(SEGMENT.getPixelColorXY(x,y), bgColor, blur));
     }
-  }
-  if (SEGENV.step > strip.now || strip.now - SEGENV.step < 1000 / (uint32_t)map(SEGMENT.speed,0,255,1,64)) { // 1 - 64 updates per second
-    return FRAMETIME; //skip if not enough time has passed
-  }
-
-  //Recolor live cells if palette/color changed
-  if (SEGMENT.color_from_palette(0, false, PALETTE_SOLID_WRAP, 0) != *prevColor){
-    for (int x = 0; x < cols; x++) for (int y = 0; y < rows; y++) {
-      cIndex = y * cols + x;
-      if (getBitValue(cells, cIndex)) {
-        SEGMENT.setPixelColorXY(x,y, SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0));
-      }
-    }
-    *prevColor = SEGMENT.color_from_palette(0, false, PALETTE_SOLID_WRAP, 0);
+    if (palChanged) *prevPalette = SEGMENT.palette;
   }
 
+  if (SEGENV.step > strip.now || strip.now - SEGENV.step < 1000 / (uint32_t)map(SEGMENT.speed,0,255,1,64)) return FRAMETIME; //skip if not enough time has passed (1-64 updates/sec)
+  
   //Update Game of Life
   bool cellChanged = false; // Detect still live and dead grids
   //cell coordinates
@@ -5268,7 +5267,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
 
     for (int i = -1; i <= 1; i++) for (int j = -1; j <= 1; j++) { // iterate through 3*3 matrix
       if (i==0 && j==0) continue; // ignore itself
-      if (!SEGMENT.check3 || generation % 1500 == 0) { //no wrap, disable wrap every 1500 generations to prevent undetected repeats
+      if (!wrap || generation % 1500 == 0) { //no wrap, disable wrap every 1500 generations to prevent undetected repeats
         cX = x+i;
         cY = y+j;
         if (cX < 0 || cY < 0 || cX >= cols || cY >= rows) continue; //skip if out of bounds
@@ -5292,34 +5291,33 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
     cIndex = y * cols + x; //current cell index
     bool cellValue = getBitValue(cells, cIndex);
     if ((cellValue) && (neighbors < 2 || neighbors > 3)) {
-      // Loneliness or overpopulation
+      // Loneliness or Overpopulation
       cellChanged = true;
       setBitValue(futureCells, cIndex, false);
-      // blur/turn off dying cells
-      if (!SEGMENT.check2) SEGMENT.setPixelColorXY(x,y, blend(SEGMENT.getPixelColorXY(x,y), bgColor, map(SEGMENT.custom1, 0, 255, 255, 0)));
+      // Blur/turn off dying cells
+      if (!overlayBG) SEGMENT.setPixelColorXY(x,y, blend(SEGMENT.getPixelColorXY(x,y), bgColor, bgBlendMode ? bgBlur : blur));
     } 
     else if (!(cellValue) && (neighbors == 3)) { 
       // Reproduction
       setBitValue(futureCells, cIndex, true);
       cellChanged = true;
-      // find dominant color and assign it to a cell
-      // no longer storing colors, if parent dies the color is lost
-      CRGB dominantColor;
+      // find dominant color and assign it to a new born cell no longer storing colors, if parent dies the color is lost
+      CRGB dominantColor; 
       if (colorCount == 3) { //All parents survived
         if ((nColors[0] == nColors[1]) || (nColors[0] == nColors[2])) dominantColor = nColors[0];
         else if (nColors[1] == nColors[2]) dominantColor = nColors[1];
-        else dominantColor = nColors[random8()%3];
+        else dominantColor = nColors[random8(3)];
       }
-      else if (colorCount == 2) dominantColor = nColors[random8()%2]; // 1 leading parent died
-      else if (colorCount == 1) dominantColor = nColors[0];           // 2 leading parents died
-      else dominantColor = color;                                     // all parents died last used color
+      else if (colorCount == 2) dominantColor = nColors[random8(2)]; // 1 leading parent died
+      else if (colorCount == 1) dominantColor = nColors[0];          // 2 leading parents died
+      else dominantColor = color;                                    // all parents died last used color
       // mutate color chance
-      if (random8() < SEGMENT.intensity || dominantColor == bgColor) dominantColor = !SEGMENT.check1?SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0): random16()*random16();
-      if (SEGMENT.check1) dominantColor = RGBW32(dominantColor.r, dominantColor.g, dominantColor.b, 0); //WLEDMM support all colors
+      if (allColors) dominantColor = RGBW32(dominantColor.r, dominantColor.g, dominantColor.b, 0); //WLEDMM support all colors
+      if (random8() < SEGMENT.intensity || dominantColor == bgColor) dominantColor = allColors ? random16() * random16() : SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0);
       SEGMENT.setPixelColorXY(x,y, dominantColor);
     }
     else { // blur dead cells 
-      if (!cellValue && !SEGMENT.check2) SEGMENT.setPixelColorXY(x,y, blend(SEGMENT.getPixelColorXY(x,y), bgColor, map(SEGMENT.custom1, 0, 255, 255, 0))); 
+      if (!cellValue && !overlayBG && !bgBlendMode) SEGMENT.setPixelColorXY(x,y, blend(SEGMENT.getPixelColorXY(x,y), bgColor, bgBlendMode ? bgBlur : blur)); 
     }
   }
   //update cell values
@@ -5343,7 +5341,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 ☾,Wrap ☾,;!,!;!;2;sx=82,ix=12,c1=8,o3=1"; 
+static const char _data_FX_MODE_2DGAMEOFLIFE[] PROGMEM = "Game Of Life@!,Color Mutation ☾,Blur ☾,,,All Colors ☾,Overlay BG ☾,Wrap ☾,;!,!;!;2;sx=82,ix=4,c1=48,o1=0,o2=0,o3=1"; 
 
 /////////////////////////
 //     2D Hiphotic     //

From f528aef6ba02ce52bb1c015417e8ce646451ed00 Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Wed, 5 Jun 2024 01:07:27 -0400
Subject: [PATCH 009/200] GoL - Allows default overlay mode.

Flicker fixed by always redrawing dead cells if overlay unchecked. Can swap between overlay types by checking/unchecking overlayBG.
---
 wled00/FX.cpp | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index ecc4af14..597ae1fd 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5234,24 +5234,23 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
     return FRAMETIME;
   }
 
-  // Redraw if paused (remove blur), palette changed, or overlaying background (avoid flicker)
+  bool blurDead = SEGENV.step > strip.now && blur && !bgBlendMode && !overlayBG;
   bool palChanged = SEGMENT.palette != *prevPalette && !allColors;
-  bool blurDead = SEGENV.step > strip.now && !bgBlendMode && !overlayBG;
-  if (palChanged || blurDead || overlayBG) {
-    for (int x = 0; x < cols; x++) for (int y = 0; y < rows; y++) {
-      cIndex = y * cols + x;
-      bool alive = getBitValue(cells, cIndex);
-      if (palChanged && alive) SEGMENT.setPixelColorXY(x,y, SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0));
-      else if (overlayBG & alive) {
-        color = SEGMENT.getPixelColorXY(x,y);
-        SEGMENT.setPixelColorXY(x,y, allColors ? RGBW32(color.r, color.g, color.b, 0) : color);
-      }
-      if (palChanged && !alive && !overlayBG) SEGMENT.setPixelColorXY(x,y, bgColor); // remove blurred cells from previous palette
-      else if (blurDead && !alive) SEGMENT.setPixelColorXY(x,y, blend(SEGMENT.getPixelColorXY(x,y), bgColor, blur));
-    }
-    if (palChanged) *prevPalette = SEGMENT.palette;
-  }
+  if (palChanged) *prevPalette = SEGMENT.palette;
 
+  // Redraw if paused (remove blur), palette changed, overlaying background (avoid flicker), 
+  // always redraw dead cells if not overlaying background. Allows overlayFG by default.
+  for (int x = 0; x < cols; x++) for (int y = 0; y < rows; y++) {
+    cIndex = y * cols + x;
+    bool alive = getBitValue(cells, cIndex);
+    CRGB color = SEGMENT.getPixelColorXY(x,y);
+    if (palChanged && alive) SEGMENT.setPixelColorXY(x,y, SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0)); // Recolor alive cells
+    else if (overlayBG & alive) SEGMENT.setPixelColorXY(x,y, allColors ? RGBW32(color.r, color.g, color.b, 0) : color);         // Redraw alive cells for overlayBG
+    if (palChanged && !alive && !overlayBG) SEGMENT.setPixelColorXY(x,y, bgColor);                                              // Remove blurred cells from previous palette
+    else if (blurDead && !alive) SEGMENT.setPixelColorXY(x,y, blend(color, bgColor, blur));                                     // Blur dead cells (paused)
+    else if (!overlayBG && !alive) SEGMENT.setPixelColorXY(x,y, color);                                                         // Redraw dead cells for default overlayFG
+  }
+  
   if (SEGENV.step > strip.now || strip.now - SEGENV.step < 1000 / (uint32_t)map(SEGMENT.speed,0,255,1,64)) return FRAMETIME; //skip if not enough time has passed (1-64 updates/sec)
   
   //Update Game of Life
@@ -5266,14 +5265,14 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
     CRGB nColors[3]; // track 3 colors, dying cells may overwrite but this wont be used
 
     for (int i = -1; i <= 1; i++) for (int j = -1; j <= 1; j++) { // iterate through 3*3 matrix
-      if (i==0 && j==0) continue; // ignore itself
+      if (i == 0 && j == 0) continue; // ignore itself
       if (!wrap || generation % 1500 == 0) { //no wrap, disable wrap every 1500 generations to prevent undetected repeats
-        cX = x+i;
-        cY = y+j;
+        cX = x + i;
+        cY = y + j;
         if (cX < 0 || cY < 0 || cX >= cols || cY >= rows) continue; //skip if out of bounds
       } else { //wrap around
-        cX = (x+i+cols) % cols;
-        cY = (y+j+rows) % rows;
+        cX = (x + i + cols) % cols;
+        cY = (y + j + rows) % rows;
       }
       cIndex = cY * cols + cX; //neighbor cell index
       // count neighbors and store upto 3 neighbor colors
@@ -5341,7 +5340,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=82,ix=4,c1=48,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 c655db38640e8694289c085ab53d340b0913b9b5 Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Wed, 5 Jun 2024 11:46:23 -0400
Subject: [PATCH 010/200] GoL - gliderLength switched to uint16_t

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

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 597ae1fd..9c2f77da 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5172,16 +5172,16 @@ 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() + 7) / 8); // round up to nearest byte
-  const size_t detectionSize =  sizeof(uint8_t) + sizeof(uint16_t)*2; // 1 uint8_t (gliderLen), 2 uint16_t (2 CRCs)
-  const size_t totalSize = dataSize * 2 + detectionSize + sizeof(uint8_t);
+  const size_t detectionSize =  sizeof(uint16_t) * 3; // 2 CRCs, gliderLength
+  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);
-  uint8_t *gliderLength   = reinterpret_cast<uint8_t*>(SEGENV.data + dataSize*2);
-  uint16_t *oscillatorCRC = reinterpret_cast<uint16_t*>(SEGENV.data + dataSize*2 + sizeof(uint8_t));
-  uint16_t *spaceshipCRC  = reinterpret_cast<uint16_t*>(SEGENV.data + dataSize*2 + sizeof(uint8_t) + sizeof(uint16_t));
-  uint8_t *prevPalette = reinterpret_cast<uint8_t*>(SEGENV.data + dataSize*2 + detectionSize);
+  uint16_t *gliderLength  = reinterpret_cast<uint16_t*>(SEGENV.data + dataSize * 2);
+  uint16_t *oscillatorCRC = reinterpret_cast<uint16_t*>(SEGENV.data + dataSize * 2 + sizeof(uint8_t));
+  uint16_t *spaceshipCRC  = reinterpret_cast<uint16_t*>(SEGENV.data + dataSize * 2 + sizeof(uint8_t) + sizeof(uint16_t));
+  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;
@@ -5234,7 +5234,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
     return FRAMETIME;
   }
 
-  bool blurDead = SEGENV.step > strip.now && blur && !bgBlendMode && !overlayBG;
+  bool blurDead   = SEGENV.step > strip.now && blur && !bgBlendMode && !overlayBG;
   bool palChanged = SEGMENT.palette != *prevPalette && !allColors;
   if (palChanged) *prevPalette = SEGMENT.palette;
 

From 5a6d80f30b265fc235b6070b65e24a1aff1aa2bc Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Wed, 5 Jun 2024 12:41:36 -0400
Subject: [PATCH 011/200] GoL - Correct data allocation

Fixed overlooked data allocation after switching gliderLength to uint16.
---
 wled00/FX.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 9c2f77da..cb117339 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5179,8 +5179,8 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
   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(uint8_t));
-  uint16_t *spaceshipCRC  = reinterpret_cast<uint16_t*>(SEGENV.data + dataSize * 2 + sizeof(uint8_t) + sizeof(uint16_t));
+  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);
   uint8_t  *prevPalette   = reinterpret_cast<uint8_t*>(SEGENV.data + dataSize * 2 + detectionSize);
 
   uint16_t &generation = SEGENV.aux0; //Rename SEGENV/SEGMENT variables for readability
@@ -5216,7 +5216,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
       else if (!overlayBG) SEGMENT.setPixelColorXY(x,y, allColors ? RGBW32(bgColor.r, bgColor.g, bgColor.b, 0) : bgColor); // set background color if not overlaying
     }
     memcpy(futureCells, cells, dataSize); 
-    
+
     //Set CRCs
     uint16_t crc = crc16((const unsigned char*)cells, dataSize);
     *oscillatorCRC = crc;
@@ -5334,7 +5334,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
   }
   // Update CRC values
   if (generation % 16 == 0) *oscillatorCRC = crc;
-  if (generation % *gliderLength == 0) *spaceshipCRC = crc;
+  if (*gliderLength && generation % *gliderLength == 0) *spaceshipCRC = crc;
 
   generation++;
   SEGENV.step = strip.now;

From 015260c5addca44ce8582efa3ff6a901bc21146a Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Sun, 9 Jun 2024 15:50:07 -0400
Subject: [PATCH 012/200] GoL - Small color fix and glider detection change.

Wrap is disabled if only 5 remaining alive cells (Glider).
---
 wled00/FX.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index cb117339..506f408e 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5234,6 +5234,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
     return FRAMETIME;
   }
 
+  int aliveCount = 0; // Solo glider detection
   bool blurDead   = SEGENV.step > strip.now && blur && !bgBlendMode && !overlayBG;
   bool palChanged = SEGMENT.palette != *prevPalette && !allColors;
   if (palChanged) *prevPalette = SEGMENT.palette;
@@ -5243,6 +5244,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
   for (int x = 0; x < cols; x++) for (int y = 0; y < rows; y++) {
     cIndex = y * cols + x;
     bool alive = getBitValue(cells, cIndex);
+    if (alive) aliveCount++;
     CRGB color = SEGMENT.getPixelColorXY(x,y);
     if (palChanged && alive) SEGMENT.setPixelColorXY(x,y, SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0)); // Recolor alive cells
     else if (overlayBG & alive) SEGMENT.setPixelColorXY(x,y, allColors ? RGBW32(color.r, color.g, color.b, 0) : color);         // Redraw alive cells for overlayBG
@@ -5266,7 +5268,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
 
     for (int i = -1; i <= 1; i++) for (int j = -1; j <= 1; j++) { // iterate through 3*3 matrix
       if (i == 0 && j == 0) continue; // ignore itself
-      if (!wrap || generation % 1500 == 0) { //no wrap, disable wrap every 1500 generations to prevent undetected repeats
+      if (!wrap || generation % 1500 == 0 || aliveCount == 5) { //no wrap, disable wrap every 1500 generations to prevent undetected repeats
         cX = x + i;
         cY = y + j;
         if (cX < 0 || cY < 0 || cX >= cols || cY >= rows) continue; //skip if out of bounds
@@ -5278,9 +5280,8 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
       // count neighbors and store upto 3 neighbor colors
       if (getBitValue(cells, cIndex)) { //if alive
         neighbors++;
-        if (!getBitValue(futureCells, cIndex)) continue; //parent just died, color lost
+        if (!getBitValue(futureCells, cIndex) || SEGMENT.getPixelColorXY(cX,cY) == bgColor) continue; //parent just died, color lost
         color = SEGMENT.getPixelColorXY(cX, cY);
-        if (color == bgColor) continue;
         nColors[colorCount % 3] = color;
         colorCount++;
       }

From e8e784ddcd035fa0d06dbc6126f89eacd0f3f08e Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Wed, 19 Jun 2024 15:25:51 -0400
Subject: [PATCH 013/200] GoL CRGB changed to uint32 & color_blend()

Other small changes.
---
 wled00/FX.cpp | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 506f408e..7d7b1eac 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5190,8 +5190,8 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
   byte blur        = map(SEGMENT.custom1, 0, 255, 255, 0);
   bool bgBlendMode = SEGMENT.custom1 > 220 && !overlayBG; // if blur is high and not overlaying, use bg blend mode
   byte bgBlur      = map(SEGMENT.custom1 - 220, 0, 35, 255, 128);
-  CRGB bgColor     = SEGCOLOR(1);
-  CRGB color       = allColors ? random16() * random16() : SEGMENT.color_from_palette(0, false, PALETTE_SOLID_WRAP, 0);
+  uint32_t bgColor = SEGCOLOR(1);
+  uint32_t color   = allColors ? random16() * random16() : SEGMENT.color_from_palette(0, false, PALETTE_SOLID_WRAP, 0);
   uint16_t cIndex; 
 
   if (SEGENV.call == 0) {
@@ -5213,7 +5213,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
         color = SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0);
         SEGMENT.setPixelColorXY(x,y, allColors ? random16() * random16() : color);
       }
-      else if (!overlayBG) SEGMENT.setPixelColorXY(x,y, allColors ? RGBW32(bgColor.r, bgColor.g, bgColor.b, 0) : bgColor); // set background color if not overlaying
+      else if (!overlayBG) SEGMENT.setPixelColorXY(x,y, bgColor); // set background color if not overlaying
     }
     memcpy(futureCells, cells, dataSize); 
 
@@ -5234,7 +5234,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
     return FRAMETIME;
   }
 
-  int aliveCount = 0; // Solo glider detection
+  int aliveCount  = 0; // Solo glider detection
   bool blurDead   = SEGENV.step > strip.now && blur && !bgBlendMode && !overlayBG;
   bool palChanged = SEGMENT.palette != *prevPalette && !allColors;
   if (palChanged) *prevPalette = SEGMENT.palette;
@@ -5245,12 +5245,12 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
     cIndex = y * cols + x;
     bool alive = getBitValue(cells, cIndex);
     if (alive) aliveCount++;
-    CRGB color = SEGMENT.getPixelColorXY(x,y);
-    if (palChanged && alive) SEGMENT.setPixelColorXY(x,y, SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0)); // Recolor alive cells
-    else if (overlayBG & alive) SEGMENT.setPixelColorXY(x,y, allColors ? RGBW32(color.r, color.g, color.b, 0) : color);         // Redraw alive cells for overlayBG
-    if (palChanged && !alive && !overlayBG) SEGMENT.setPixelColorXY(x,y, bgColor);                                              // Remove blurred cells from previous palette
-    else if (blurDead && !alive) SEGMENT.setPixelColorXY(x,y, blend(color, bgColor, blur));                                     // Blur dead cells (paused)
-    else if (!overlayBG && !alive) SEGMENT.setPixelColorXY(x,y, color);                                                         // Redraw dead cells for default overlayFG
+    uint32_t cellColor = SEGMENT.getPixelColorXY(x,y);
+    if      ( alive && palChanged) SEGMENT.setPixelColorXY(x,y, SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0)); // Recolor alive cells
+    else if ( alive && overlayBG)  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) SEGMENT.setPixelColorXY(x,y, cellColor);                               // Redraw dead cells for default overlayFG
   }
   
   if (SEGENV.step > strip.now || strip.now - SEGENV.step < 1000 / (uint32_t)map(SEGMENT.speed,0,255,1,64)) return FRAMETIME; //skip if not enough time has passed (1-64 updates/sec)
@@ -5264,7 +5264,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
   for (int x = 0; x < cols; x++) for (int y = 0; y < rows; y++) {
     byte neighbors = 0;
     byte colorCount = 0; //track number of valid colors
-    CRGB nColors[3]; // track 3 colors, dying cells may overwrite but this wont be used
+    uint32_t nColors[3]; // track 3 colors, dying cells may overwrite but this wont be used
 
     for (int i = -1; i <= 1; i++) for (int j = -1; j <= 1; j++) { // iterate through 3*3 matrix
       if (i == 0 && j == 0) continue; // ignore itself
@@ -5295,14 +5295,14 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
       cellChanged = true;
       setBitValue(futureCells, cIndex, false);
       // Blur/turn off dying cells
-      if (!overlayBG) SEGMENT.setPixelColorXY(x,y, blend(SEGMENT.getPixelColorXY(x,y), bgColor, bgBlendMode ? bgBlur : blur));
+      if (!overlayBG) SEGMENT.setPixelColorXY(x,y, color_blend(SEGMENT.getPixelColorXY(x,y), bgColor, bgBlendMode ? bgBlur : blur));
     } 
     else if (!(cellValue) && (neighbors == 3)) { 
       // Reproduction
       setBitValue(futureCells, cIndex, true);
       cellChanged = true;
       // find dominant color and assign it to a new born cell no longer storing colors, if parent dies the color is lost
-      CRGB dominantColor; 
+      uint32_t dominantColor; 
       if (colorCount == 3) { //All parents survived
         if ((nColors[0] == nColors[1]) || (nColors[0] == nColors[2])) dominantColor = nColors[0];
         else if (nColors[1] == nColors[2]) dominantColor = nColors[1];
@@ -5310,14 +5310,13 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
       }
       else if (colorCount == 2) dominantColor = nColors[random8(2)]; // 1 leading parent died
       else if (colorCount == 1) dominantColor = nColors[0];          // 2 leading parents died
-      else dominantColor = color;                                    // all parents died last used color
+      else dominantColor = color;                                    // all parents died use last seen color
       // mutate color chance
-      if (allColors) dominantColor = RGBW32(dominantColor.r, dominantColor.g, dominantColor.b, 0); //WLEDMM support all colors
       if (random8() < SEGMENT.intensity || dominantColor == bgColor) dominantColor = allColors ? random16() * random16() : SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0);
       SEGMENT.setPixelColorXY(x,y, dominantColor);
     }
     else { // blur dead cells 
-      if (!cellValue && !overlayBG && !bgBlendMode) SEGMENT.setPixelColorXY(x,y, blend(SEGMENT.getPixelColorXY(x,y), bgColor, bgBlendMode ? bgBlur : blur)); 
+      if (!cellValue && !overlayBG && !bgBlendMode) SEGMENT.setPixelColorXY(x,y, color_blend(SEGMENT.getPixelColorXY(x,y), bgColor, bgBlendMode ? bgBlur : blur)); 
     }
   }
   //update cell values

From 4aee7eb6c6810f5f4d4fbb522433442e1b1a01f9 Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Wed, 19 Jun 2024 19:00:14 -0400
Subject: [PATCH 014/200] GoL - Small fix

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

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 7d7b1eac..72642a6a 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5316,7 +5316,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
       SEGMENT.setPixelColorXY(x,y, dominantColor);
     }
     else { // blur dead cells 
-      if (!cellValue && !overlayBG && !bgBlendMode) SEGMENT.setPixelColorXY(x,y, color_blend(SEGMENT.getPixelColorXY(x,y), bgColor, bgBlendMode ? bgBlur : blur)); 
+      if (!cellValue && !overlayBG && !bgBlendMode) SEGMENT.setPixelColorXY(x,y, color_blend(SEGMENT.getPixelColorXY(x,y), bgColor, blur)); 
     }
   }
   //update cell values

From 086b0e3e0e4bb455fa91865c8539e83680b3e25b Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Wed, 19 Jun 2024 23:09:31 -0400
Subject: [PATCH 015/200] GoL - Game start transition

Starting alive cells are randomly colored in and bg fades on game start.
---
 wled00/FX.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 72642a6a..c19362be 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5210,10 +5210,8 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
       cIndex = y * cols + x;
       if (random8(100) < 32) { // ~32% chance of being alive
         setBitValue(cells, cIndex, true);
-        color = SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0);
-        SEGMENT.setPixelColorXY(x,y, allColors ? random16() * random16() : color);
+        SEGMENT.setPixelColorXY(x,y, bgColor); // Initial color set in redraw loop
       }
-      else if (!overlayBG) SEGMENT.setPixelColorXY(x,y, bgColor); // set background color if not overlaying
     }
     memcpy(futureCells, cells, dataSize); 
 
@@ -5231,7 +5229,6 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
       a = t;
     }
     *gliderLength = cols * rows / a * 4;
-    return FRAMETIME;
   }
 
   int aliveCount  = 0; // Solo glider detection
@@ -5246,6 +5243,15 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
     bool alive = getBitValue(cells, cIndex);
     if (alive) aliveCount++;
     uint32_t cellColor = SEGMENT.getPixelColorXY(x,y);
+    if (generation == 1) {// Spawn initial colors randomly
+      bool aliveBgColor = (alive && cellColor == bgColor);
+      if (aliveBgColor && !random(12)) SEGMENT.setPixelColorXY(x,y, allColors ? random16() * random16() : SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0)); // Color alive cell
+      else if (alive && !aliveBgColor) SEGMENT.setPixelColorXY(x,y, cellColor); // Redraw alive cells
+      else if (!alive && !overlayBG && !bgBlendMode) SEGMENT.setPixelColorXY(x,y, bgColor); // Redraw dead cells for default overlayFG
+      else if (!alive && !overlayBG) SEGMENT.setPixelColorXY(x,y, color_blend(cellColor, bgColor, 16)); // Fade dead cells (bgBlendMode)
+      continue;
+    }
+
     if      ( alive && palChanged) SEGMENT.setPixelColorXY(x,y, SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0)); // Recolor alive cells
     else if ( alive && overlayBG)  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

From 9ef8ff6a162398e05454ebff095605cfd00211f4 Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Thu, 20 Jun 2024 01:07:52 -0400
Subject: [PATCH 016/200] GoL - Redraw loop changes

Merged generation == 1 checks into standard checks.
---
 wled00/FX.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index c19362be..d9047e7d 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5210,7 +5210,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
       cIndex = y * cols + x;
       if (random8(100) < 32) { // ~32% chance of being alive
         setBitValue(cells, cIndex, true);
-        SEGMENT.setPixelColorXY(x,y, bgColor); // Initial color set in redraw loop
+        if (!overlayBG) SEGMENT.setPixelColorXY(x,y, bgColor); // Initial color set in redraw loop
       }
     }
     memcpy(futureCells, cells, dataSize); 
@@ -5236,27 +5236,27 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
   bool palChanged = SEGMENT.palette != *prevPalette && !allColors;
   if (palChanged) *prevPalette = SEGMENT.palette;
 
-  // Redraw if paused (remove blur), palette changed, overlaying background (avoid flicker), 
-  // always redraw dead cells if not overlaying background. Allows overlayFG by default.
+  // Redraw Loop
+  // Redraw if paused (remove blur), palette changed, overlaying background (avoid flicker) 
+  // Always redraw dead cells if not overlaying background. Allows overlayFG by default.
+  // Generation 1 draws alive cells randomly and fades dead cells
   for (int x = 0; x < cols; x++) for (int y = 0; y < rows; y++) {
     cIndex = y * cols + x;
     bool alive = getBitValue(cells, cIndex);
     if (alive) aliveCount++;
     uint32_t cellColor = SEGMENT.getPixelColorXY(x,y);
-    if (generation == 1) {// Spawn initial colors randomly
-      bool aliveBgColor = (alive && cellColor == bgColor);
-      if (aliveBgColor && !random(12)) SEGMENT.setPixelColorXY(x,y, allColors ? random16() * random16() : SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0)); // Color alive cell
-      else if (alive && !aliveBgColor) SEGMENT.setPixelColorXY(x,y, cellColor); // Redraw alive cells
-      else if (!alive && !overlayBG && !bgBlendMode) SEGMENT.setPixelColorXY(x,y, bgColor); // Redraw dead cells for default overlayFG
-      else if (!alive && !overlayBG) SEGMENT.setPixelColorXY(x,y, color_blend(cellColor, bgColor, 16)); // Fade dead cells (bgBlendMode)
-      continue;
-    }
+    bool aliveBgColor = (alive && !overlayBG && generation == 1 && cellColor == bgColor);
 
-    if      ( alive && palChanged) SEGMENT.setPixelColorXY(x,y, SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0)); // Recolor alive cells
-    else if ( alive && overlayBG)  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) SEGMENT.setPixelColorXY(x,y, cellColor);                               // Redraw dead cells for default overlayFG
+    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
+      aliveBgColor = false;
+    }
+    else if ( alive && overlayBG)                     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 || aliveBgColor) && !overlayBG && !bgBlendMode) SEGMENT.setPixelColorXY(x,y, cellColor);             // Redraw dead cells/alive off cells for default overlayFG
+    else if (!alive && !overlayBG && generation == 1) SEGMENT.setPixelColorXY(x,y, color_blend(cellColor, bgColor, 16));  // Fade dead cells (bgBlendMode) on generation 1
   }
   
   if (SEGENV.step > strip.now || strip.now - SEGENV.step < 1000 / (uint32_t)map(SEGMENT.speed,0,255,1,64)) return FRAMETIME; //skip if not enough time has passed (1-64 updates/sec)

From 2edfcb33437386d32d8327a3c91b1c54c8df68e1 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 20 Jun 2024 12:26:43 +0200
Subject: [PATCH 017/200] small optimization for color_blend

* Early exit when color1 == color2 (nothing to blend)
* pre-calculate `blendmax - blend` (repeated 4 times)
---
 wled00/colors.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/wled00/colors.cpp b/wled00/colors.cpp
index 6546043b..465fefbb 100644
--- a/wled00/colors.cpp
+++ b/wled00/colors.cpp
@@ -9,9 +9,11 @@
  */
 IRAM_ATTR_YN uint32_t color_blend(uint32_t color1, uint32_t color2, uint_fast16_t blend, bool b16) {
   if(blend == 0)   return color1;
-  uint_fast16_t blendmax = b16 ? 0xFFFF : 0xFF;
+  if (color1 == color2) return color1;  // WLEDMM shortcut
+  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);
@@ -23,10 +25,10 @@ IRAM_ATTR_YN uint32_t color_blend(uint32_t color1, uint32_t color2, uint_fast16_
   uint32_t g2 = G(color2);
   uint32_t b2 = B(color2);
 
-  uint32_t w3 = ((w2 * blend) + (w1 * (blendmax - blend))) >> shift;
-  uint32_t r3 = ((r2 * blend) + (r1 * (blendmax - blend))) >> shift;
-  uint32_t g3 = ((g2 * blend) + (g1 * (blendmax - blend))) >> shift;
-  uint32_t b3 = ((b2 * blend) + (b1 * (blendmax - blend))) >> shift;
+  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 e28fa67bf0af9a55645958bf9b1412a4737bc257 Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Sun, 23 Jun 2024 00:38:27 +0200
Subject: [PATCH 018/200] version bump -b32.40

---
 .github/ISSUE_TEMPLATE/bug.yml | 2 +-
 package-lock.json              | 4 ++--
 package.json                   | 2 +-
 wled00/improv.cpp              | 2 +-
 wled00/wled.h                  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 2cb69644..34b5904d 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -48,7 +48,7 @@ body:
     attributes:
       label: What version/release of MM WLED?
       description: You can find this in by going to Config -> Security & Updates -> Scroll to Bottom. Copy and paste the entire line after "Server message"
-      placeholder: "e.g. build 2401290, WLEDMM_0.14.1-b31.38_esp32_4MB_M.bin"
+      placeholder: "e.g. build 2401290, WLEDMM_0.14.1-b32.40_esp32_4MB_M.bin"
     validations:
       required: true
   - type: dropdown
diff --git a/package-lock.json b/package-lock.json
index b4bcd63e..80dcf5ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "wled",
-  "version": "0.14.1-b31.38",
+  "version": "0.14.1-b32.40",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "wled",
-      "version": "0.14.1-b31.38",
+      "version": "0.14.1-b32.40",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "clean-css": "^4.2.3",
diff --git a/package.json b/package.json
index 347fec25..0536796c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wled",
-  "version": "0.14.1-b31.38",
+  "version": "0.14.1-b32.40",
   "description": "Tools for WLED project",
   "main": "tools/cdata.js",
   "directories": {
diff --git a/wled00/improv.cpp b/wled00/improv.cpp
index eef8ad82..d0b97182 100644
--- a/wled00/improv.cpp
+++ b/wled00/improv.cpp
@@ -211,7 +211,7 @@ void sendImprovInfoResponse() {
   //Use serverDescription if it has been changed from the default "WLED", else mDNS name
   bool useMdnsName = (strcmp(serverDescription, "WLED") == 0 && strlen(cmDNS) > 0);
   char vString[32];
-  snprintf_P(vString, sizeof(vString)-1, PSTR("0.14.1-b31.38/%i"),VERSION);
+  snprintf_P(vString, sizeof(vString)-1, PSTR("0.14.1-b32.40/%i"),VERSION);
   const char *str[4] = {"WLED", vString, bString, useMdnsName ? cmDNS : serverDescription};
 
   sendImprovRPCResult(ImprovRPCType::Request_Info, 4, str);
diff --git a/wled00/wled.h b/wled00/wled.h
index 96530ac2..2c7910a6 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2405241
+#define VERSION 2406230
 
 // 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 899899094f76d07528f525e83d5806c30f328c65 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 24 Jun 2024 17:01:43 +0200
Subject: [PATCH 019/200] sound sync: use last remaining gap to transmit
 soundPressure

* use last remaining two bytes in audioSyncPacket for transmitting soundPressure
* 0x0 is treated as "legacy value" --> soundPressure = volumeSmth;
* decodeAudioData: ensure receivedPacket struct members  are correctly aligned -
strictly speaking it is not safe to cast a uint8_t* as it does not offer any alignment guarantees.
* remove 8266 special handling in audioreactive::setup()
---
 usermods/audioreactive/audio_reactive.h | 88 +++++++++++++------------
 1 file changed, 47 insertions(+), 41 deletions(-)

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index b958184c..753f2b54 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -1050,7 +1050,7 @@ class AudioReactive : public Usermod {
     // new "V2" audiosync struct - 44 Bytes
     struct __attribute__ ((packed)) audioSyncPacket {  // WLEDMM "packed" ensures that there are no additional gaps
       char    header[6];      //  06 Bytes  offset 0
-      uint8_t gap1[2];        // gap added by compiler: 02 Bytes, offset 6
+      uint8_t pressure[2];    //  02 Bytes, offset 6  - sound pressure as fixed point (8bit integer,  8bit fraction) 
       float   sampleRaw;      //  04 Bytes  offset 8  - either "sampleRaw" or "rawSampleAgc" depending on soundAgc setting
       float   sampleSmth;     //  04 Bytes  offset 12 - either "sampleAvg" or "sampleAgc" depending on soundAgc setting
       uint8_t samplePeak;     //  01 Bytes  offset 16 - 0 no peak; >=1 peak detected. In future, this will also provide peak Magnitude
@@ -1065,8 +1065,8 @@ class AudioReactive : public Usermod {
     struct audioSyncPacket_v1 {
       char header[6];         //  06 Bytes
       uint8_t myVals[32];     //  32 Bytes
-      int sampleAgc;          //  04 Bytes
-      int sampleRaw;          //  04 Bytes
+      int32_t sampleAgc;          //  04 Bytes
+      int32_t sampleRaw;          //  04 Bytes
       float sampleAvg;        //  04 Bytes
       bool samplePeak;        //  01 Bytes
       uint8_t fftResult[16];  //  16 Bytes
@@ -1602,6 +1602,14 @@ class AudioReactive : public Usermod {
         transmitData.fftResult[i] = fftResult[i];
       }
 
+      // WLEDMM transmit soundPressure as 16 bit fixed point
+      uint32_t pressure16bit = max(0.0f, soundPressure) * 256.0f; // convert to fixed point, remove negative values
+      uint16_t pressInt   = pressure16bit / 256;          // integer part
+      uint16_t pressFract = pressure16bit % 256;          // faction part
+      if (pressInt > 255) pressInt = 255;                 // saturation at 255
+      transmitData.pressure[0] = (uint8_t)pressInt;
+      transmitData.pressure[1] = (uint8_t)pressFract;
+
       transmitData.FFT_Magnitude = my_magnitude;
       transmitData.FFT_MajorPeak = FFT_MajorPeak;
 
@@ -1622,30 +1630,33 @@ class AudioReactive : public Usermod {
 
     bool decodeAudioData(int packetSize, uint8_t *fftBuff) {
       if((0 == packetSize) || (nullptr == fftBuff)) return false; // sanity check
-      audioSyncPacket *receivedPacket = reinterpret_cast<audioSyncPacket*>(fftBuff);
+      //audioSyncPacket *receivedPacket = reinterpret_cast<audioSyncPacket*>(fftBuff);
+      audioSyncPacket receivedPacket;
+      memset(&receivedPacket, 0, sizeof(receivedPacket));                                  // start clean
+      memcpy(&receivedPacket, fftBuff, min((unsigned)packetSize, (unsigned)sizeof(receivedPacket))); // don't violate alignment - thanks @willmmiles
 
       // validate sequence, discard out-of-sequence packets
       static uint8_t lastFrameCounter = 0;
       // add info for UI
-      if ((receivedPacket->frameCounter > 0) && (lastFrameCounter > 0)) receivedFormat = 3; // v2+
+      if ((receivedPacket.frameCounter > 0) && (lastFrameCounter > 0)) receivedFormat = 3; // v2+
       else receivedFormat = 2; // v2
       // check sequence
       bool sequenceOK = false;
-      if(receivedPacket->frameCounter > lastFrameCounter) sequenceOK = true;                  // sequence OK
-      if((lastFrameCounter < 12) && (receivedPacket->frameCounter > 248)) sequenceOK = false; // prevent sequence "roll-back" due to late packets (1->254)
-      if((lastFrameCounter > 248) && (receivedPacket->frameCounter < 12)) sequenceOK = true;  // handle roll-over (255 -> 0)
+      if(receivedPacket.frameCounter > lastFrameCounter) sequenceOK = true;                  // sequence OK
+      if((lastFrameCounter < 12) && (receivedPacket.frameCounter > 248)) sequenceOK = false; // prevent sequence "roll-back" due to late packets (1->254)
+      if((lastFrameCounter > 248) && (receivedPacket.frameCounter < 12)) sequenceOK = true;  // handle roll-over (255 -> 0)
       if(audioSyncSequence == false) sequenceOK = true;                                       // sequence checking disabled by user
-      if((sequenceOK == false) && (receivedPacket->frameCounter != 0)) {                      // always accept "0" - its the legacy value
-        DEBUGSR_PRINTF("Skipping audio frame out of order or duplicated - %u vs %u\n", lastFrameCounter, receivedPacket->frameCounter);
+      if((sequenceOK == false) && (receivedPacket.frameCounter != 0)) {                      // always accept "0" - its the legacy value
+        DEBUGSR_PRINTF("Skipping audio frame out of order or duplicated - %u vs %u\n", lastFrameCounter, receivedPacket.frameCounter);
         return false;   // reject out-of sequence frame
       }
       else {
-        lastFrameCounter = receivedPacket->frameCounter;
+        lastFrameCounter = receivedPacket.frameCounter;
       }
 
       // update samples for effects
-      volumeSmth   = fmaxf(receivedPacket->sampleSmth, 0.0f);
-      volumeRaw    = fmaxf(receivedPacket->sampleRaw, 0.0f);
+      volumeSmth   = fmaxf(receivedPacket.sampleSmth, 0.0f);
+      volumeRaw    = fmaxf(receivedPacket.sampleRaw, 0.0f);
 #ifdef ARDUINO_ARCH_ESP32
       // update internal samples
       sampleRaw    = volumeRaw;
@@ -1658,18 +1669,26 @@ class AudioReactive : public Usermod {
       // If it's true already, then the animation still needs to respond.
       autoResetPeak();
       if (!samplePeak) {
-            samplePeak = receivedPacket->samplePeak >0 ? true:false;
+            samplePeak = receivedPacket.samplePeak >0 ? true:false;
             if (samplePeak) timeOfPeak = millis();
             //userVar1 = samplePeak;
       }
       //These values are only computed by ESP32
-      for (int i = 0; i < NUM_GEQ_CHANNELS; i++) fftResult[i] = receivedPacket->fftResult[i];
-      my_magnitude  = fmaxf(receivedPacket->FFT_Magnitude, 0.0f);
+      for (int i = 0; i < NUM_GEQ_CHANNELS; i++) fftResult[i] = receivedPacket.fftResult[i];
+      my_magnitude  = fmaxf(receivedPacket.FFT_Magnitude, 0.0f);
       FFT_Magnitude = my_magnitude;
-      FFT_MajorPeak = constrain(receivedPacket->FFT_MajorPeak, 1.0f, 11025.0f);  // restrict value to range expected by effects
-      soundPressure = volumeSmth; // substitute - V2 format does not (yet) include this value
-      agcSensitivity = 128.0f; // substitute - V2 format does not (yet) include this value
-      zeroCrossingCount = receivedPacket->zeroCrossingCount;
+      FFT_MajorPeak = constrain(receivedPacket.FFT_MajorPeak, 1.0f, 11025.0f);  // restrict value to range expected by effects
+      agcSensitivity = 128.0f; // substitute - V2 format does not include this value
+      zeroCrossingCount = receivedPacket.zeroCrossingCount;
+
+      // WLEDMM extract soundPressure
+      if ((receivedPacket.pressure[0] != 0) || (receivedPacket.pressure[1] != 0)) {
+        // found something in gap "reserved2"
+        soundPressure  = float(receivedPacket.pressure[1]) / 256.0f; // fractional part
+        soundPressure += float(receivedPacket.pressure[0]);          // integer part
+      } else {
+        soundPressure = volumeSmth; // fallback
+      }
 
       return true;
     }
@@ -1786,36 +1805,23 @@ class AudioReactive : public Usermod {
         um_data->u_type[4] = UMT_FLOAT;
         um_data->u_data[5] = &my_magnitude;    // used (New)
         um_data->u_type[5] = UMT_FLOAT;
-#ifdef ARDUINO_ARCH_ESP32
         um_data->u_data[6] = &maxVol;          // assigned in effect function from UI element!!! (Puddlepeak, Ripplepeak, Waterfall)
         um_data->u_type[6] = UMT_BYTE;
         um_data->u_data[7] = &binNum;          // assigned in effect function from UI element!!! (Puddlepeak, Ripplepeak, Waterfall)
         um_data->u_type[7] = UMT_BYTE;
+#ifdef ARDUINO_ARCH_ESP32
         um_data->u_data[8] = &FFT_MajPeakSmth; // new
         um_data->u_type[8] = UMT_FLOAT;
+#else
+        um_data->u_data[8] = &FFT_MajorPeak;   // substitute for 8266
+        um_data->u_type[8] = UMT_FLOAT;
+#endif
         um_data->u_data[9]  = &soundPressure;  // used (New)
         um_data->u_type[9]  = UMT_FLOAT;
-        um_data->u_data[10] = &agcSensitivity; // used (New)
+        um_data->u_data[10] = &agcSensitivity; // used (New) - dummy value on 8266
         um_data->u_type[10] = UMT_FLOAT;
-        um_data->u_data[11] = &zeroCrossingCount;
+        um_data->u_data[11] = &zeroCrossingCount; // for auto playlist usermod
         um_data->u_type[11] = UMT_UINT16;
-#else
-       // ESP8266 
-        // See https://github.com/MoonModules/WLED/pull/60#issuecomment-1666972133 for explanation of these alternative sources of data
-
-        um_data->u_data[6] = &maxVol;          // assigned in effect function from UI element!!! (Puddlepeak, Ripplepeak, Waterfall)
-        um_data->u_type[6] = UMT_BYTE;
-        um_data->u_data[7] = &binNum;          // assigned in effect function from UI element!!! (Puddlepeak, Ripplepeak, Waterfall)
-        um_data->u_type[7] = UMT_BYTE;
-        um_data->u_data[8] = &FFT_MajorPeak; // new - substitute for FFT_MajPeakSmth
-        um_data->u_type[8] = UMT_FLOAT;
-        um_data->u_data[9]  = &volumeSmth;  // used (New) - substitute for soundPressure
-        um_data->u_type[9]  = UMT_FLOAT;
-        um_data->u_data[10] = &agcSensitivity; // used (New) - dummy value (128 => 50%)
-        um_data->u_type[10] = UMT_FLOAT;
-        um_data->u_data[11] = &zeroCrossingCount;
-        um_data->u_type[11] = UMT_UINT16;
-#endif
       }
 
 #ifdef ARDUINO_ARCH_ESP32
@@ -2201,7 +2207,7 @@ class AudioReactive : public Usermod {
         volumeSmth =0.0f;
         volumeRaw =0;
         my_magnitude = 0.1; FFT_Magnitude = 0.01; FFT_MajorPeak = 2;
-	soundPressure = 1.0f;
+        soundPressure = 1.0f;
         agcSensitivity = 64.0f;
 #ifdef ARDUINO_ARCH_ESP32
         multAgc = 1;

From c876267c95b0dd2e29251d69e4c8f9c6f7423027 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 24 Jun 2024 17:14:09 +0200
Subject: [PATCH 020/200] Update audio_reactive.h - debug fix

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

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index 753f2b54..52f8e17f 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -1981,7 +1981,7 @@ class AudioReactive : public Usermod {
         USER_PRINTF("\naudioSyncPacket_v1 size = %d\n", sizeof(audioSyncPacket_v1));                                                         // size 88
         USER_PRINTF("audioSyncPacket size = %d\n", sizeof(audioSyncPacket));                                                               // size 44
         USER_PRINTF("|  char    header[6]     offset = %2d   size = %2d\n", offsetof(audioSyncPacket, header[0]), sizeof(data.header));           // offset  0 size 6
-        USER_PRINTF("|  uint8_t gap1[2]       offset = %2d   size = %2d\n", offsetof(audioSyncPacket, gap1[0]), sizeof(data.gap1));               // offset  6 size 2
+        USER_PRINTF("|  uint8_t pressure[2]   offset = %2d   size = %2d\n", offsetof(audioSyncPacket, pressure[0]), sizeof(data.pressure));       // offset  6 size 2
         USER_PRINTF("|  float   sampleRaw     offset = %2d   size = %2d\n", offsetof(audioSyncPacket, sampleRaw), sizeof(data.sampleRaw));        // offset  8 size 4
         USER_PRINTF("|  float   sampleSmth    offset = %2d   size = %2d\n", offsetof(audioSyncPacket, sampleSmth), sizeof(data.sampleSmth));      // offset 12 size 4
         USER_PRINTF("|  uint8_t samplePeak    offset = %2d   size = %2d\n", offsetof(audioSyncPacket, samplePeak), sizeof(data.samplePeak));      // offset 16 size 1

From 2510292d1a8eb099f95aa4307405ed1dad6f892c Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 24 Jun 2024 18:04:18 +0200
Subject: [PATCH 021/200] ws preview: better handling of RGBW

avoid over-saturation in preview
---
 wled00/ws.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/wled00/ws.cpp b/wled00/ws.cpp
index 32420fcc..5b8bda42 100644
--- a/wled00/ws.cpp
+++ b/wled00/ws.cpp
@@ -277,9 +277,10 @@ static bool sendLiveLedsWs(uint32_t wsClient)  // WLEDMM added "static"
     // 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
-      buffer[pos++] = qadd8(w, unGamma8(R(c))); //R, add white channel to RGB channels as a simple RGBW -> RGB map
-      buffer[pos++] = qadd8(w, unGamma8(G(c))); //G
-      buffer[pos++] = qadd8(w, unGamma8(B(c))); //B
+      if (w>0) c = color_add(c, RGBW32(w, w, w, 0), false); // add white channel to RGB channels - color_add() will prevent over-saturation
+      buffer[pos++] = unGamma8(R(c)); //R
+      buffer[pos++] = unGamma8(G(c)); //G
+      buffer[pos++] = unGamma8(B(c)); //B
     } else {
     // WLEDMM end
       uint8_t w = W(c);  // WLEDMM small optimization

From bc006268ae2209e9c5d24737bc3445b7d8593e7c Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Mon, 24 Jun 2024 21:50:49 +0200
Subject: [PATCH 022/200] new MM build for -C3 with 2MB flash (no OTA)

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

diff --git a/platformio.ini b/platformio.ini
index 5ada7d47..7d74b2a3 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -80,6 +80,7 @@ default_envs =
   ;; esp32s2_tinyUF2_PSRAM_S  ;; experimental - only for adafruit -S2 boards with tinyUF2 bootloader !!!
   esp32s2_PSRAM_M          ;; experimental
   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)
   seeed_esp32c3_4MB_S      ;; experimental
   esp32_4MB_V4_S           ;; experimental
@@ -2180,6 +2181,33 @@ build_flags = ${env:esp32c3dev_4MB_M.build_flags}
 ; RAM:   [===       ]  25.8% (used 84700 bytes from 327680 bytes)
 ; Flash: [==========]  98.7% (used 1552582 bytes from 1572864 bytes)
 
+[env:esp32c3dev_2MB_M]
+extends = env:esp32c3dev_4MB_M
+board = lolin_c3_mini
+;;; replace WLED_RELEASE_NAME, disable CDC_ON_BOOT
+build_unflags = ${env:esp32c3dev_4MB_M.build_unflags}
+  -DARDUINO_USB_CDC_ON_BOOT=1
+  -D WLED_RELEASE_NAME=esp32c3dev_4MB_M
+
+;;; 2MB Flash, no OTA
+board_build.partitions = tools/WLED_ESP32_2MB_noOTA.csv
+board_build.flash_mode = dio
+board_upload.flash_size = 2MB
+board_upload.maximum_size = 2097152
+
+build_flags = ${env:esp32c3dev_4MB_M.build_flags}
+  -D WLED_WATCHDOG_TIMEOUT=0
+  -D WLED_DISABLE_OTA
+  ; -DARDUINO_USB_CDC_ON_BOOT=1 ;; for virtual CDC USB
+  -DARDUINO_USB_CDC_ON_BOOT=0   ;; for serial-to-USB chip
+  -D WLED_RELEASE_NAME=esp32c3dev_2MB_M
+  -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.3% (used 82828 bytes from 327680 bytes)
+; Flash: [==========]  97.9% (used 1540138 bytes from 1572864 bytes)
+
 ;; MM environment for "seeed xiao -C3" boards
 [env:seeed_esp32c3_4MB_S]
 extends = env:esp32c3dev_4MB_M

From c67d5dbdc4df3f96d457bde54d61b78a1637ec38 Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Mon, 24 Jun 2024 21:51:34 +0200
Subject: [PATCH 023/200] build 2406240  - release v0.14.1-b32

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

diff --git a/wled00/wled.h b/wled00/wled.h
index 2c7910a6..8ff90dd5 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2406230
+#define VERSION 2406240
 
 // 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 2dd9a8232e614336537a9d3734dbb3222e8ef493 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 24 Jun 2024 22:32:33 +0200
Subject: [PATCH 024/200] kicking gh build re-run

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

diff --git a/platformio.ini b/platformio.ini
index 7d74b2a3..6ae4c790 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -84,7 +84,7 @@ default_envs =
   esp32c3mini_dio_4MB_M    ;; for boards that need "dio" flash mode (instead of qio)
   seeed_esp32c3_4MB_S      ;; experimental
   esp32_4MB_V4_S           ;; experimental
-  esp32_16MB_V4_S          ;; experimental, optimized for speed
+  esp32_16MB_V4_S          ;; experimental - optimized for speed
   esp32_16MB_V4_M          ;; experimental
   esp32_16MB_V4_M_debug    ;; experimental
   esp32_pico_4MB_V4_S      ;; experimental - may work better in case you experience wifi connectivity problems

From 93ec9b915116dd6d8efbe5185f9a849e98624b85 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Tue, 25 Jun 2024 23:28:33 -0400
Subject: [PATCH 025/200] Stop double first pixel on waterfall effect

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

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index d9047e7d..416884cf 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -7794,13 +7794,14 @@ uint16_t mode_waterfall(void) {                   // Waterfall. By: Andrew Tulin
     uint8_t pixCol = (log10f(FFT_MajorPeak) - 2.26f) * 150;           // 22Khz sampling - log10 frequency range is from 2.26 (182hz) to 3.967 (9260hz). Let's scale accordingly.
     if (FFT_MajorPeak < 182.0f) pixCol = 0;                           // handle underflow
 
+    // loop will not execute if SEGLEN equals 1
+    for (int i = 0; i < SEGLEN-1; i++) SEGMENT.setPixelColor(i, SEGMENT.getPixelColor(i+1)); // shift left
+    
     if (samplePeak) {
       SEGMENT.setPixelColor(SEGLEN-1, CHSV(92,92,92));
     } else {
       SEGMENT.setPixelColor(SEGLEN-1, color_blend(SEGCOLOR(1), SEGMENT.color_from_palette(pixCol+SEGMENT.intensity, false, PALETTE_SOLID_WRAP, 0), (int)my_magnitude));
     }
-    // loop will not execute if SEGLEN equals 1
-    for (int i = 0; i < SEGLEN-1; i++) SEGMENT.setPixelColor(i, SEGMENT.getPixelColor(i+1)); // shift left
   }
 
   return FRAMETIME;

From 9103f6a4dfe4ed7e93b18bd4736496f8e66b5230 Mon Sep 17 00:00:00 2001
From: Will Miles <will@willmiles.net>
Date: Sat, 16 Mar 2024 12:07:26 -0400
Subject: [PATCH 026/200] Update for new AsyncWebSocketBuffer

Eliminate the extra indirection and allocate shared buffers directly.
---
 wled00/ws.cpp | 65 ++++++++++++++-------------------------------------
 1 file changed, 18 insertions(+), 47 deletions(-)

diff --git a/wled00/ws.cpp b/wled00/ws.cpp
index 5b8bda42..22c5afd2 100644
--- a/wled00/ws.cpp
+++ b/wled00/ws.cpp
@@ -108,7 +108,6 @@ void sendDataWs(AsyncWebSocketClient * client)
 {
   DEBUG_PRINTF("sendDataWs\n");
   if (!ws.count()) return;
-  AsyncWebSocketMessageBuffer * buffer;
 
   if (!requestJSONBufferLock(12)) {
     if (client) {
@@ -138,17 +137,7 @@ void sendDataWs(AsyncWebSocketClient * client)
     // DEBUG_PRINTF("%s min free stack %d\n", pcTaskGetTaskName(NULL), uxTaskGetStackHighWaterMark(NULL)); //WLEDMM
   #endif
   if (len < 1) return; // WLEDMM do not allocate 0 size buffer
-  
-  // WLEDMM use exceptions to catch out-of-memory errors
-  #if __cpp_exceptions
-  try{
-    buffer = ws.makeBuffer(len); // will not allocate correct memory sometimes on ESP8266
-  } catch(...) {
-    buffer = nullptr;
-  }
-  #else
-  buffer = ws.makeBuffer(len); // will not allocate correct memory sometimes on ESP8266
-  #endif
+  AsyncWebSocketBuffer buffer(len);
   #ifdef ESP8266
   size_t heap2 = ESP.getFreeHeap();
   DEBUG_PRINT(F("heap ")); DEBUG_PRINTLN(ESP.getFreeHeap());
@@ -161,24 +150,19 @@ void sendDataWs(AsyncWebSocketClient * client)
     USER_PRINTLN(F("WS buffer allocation failed."));
     ws.closeAll(1013); //code 1013 = temporary overload, try again later
     ws.cleanupClients(0); //disconnect all clients to release memory
-    ws._cleanBuffers();
     errorFlag = ERR_LOW_WS_MEM;
     return; //out of memory
   }
-
-  buffer->lock();
-  serializeJson(doc, (char *)buffer->get(), len);
+  serializeJson(doc, (char *)buffer.data(), len);
 
   DEBUG_PRINT(F("Sending WS data "));
   if (client) {
-    client->text(buffer);
+    client->text(std::move(buffer));
     DEBUG_PRINTLN(F("to a single client."));
   } else {
-    ws.textAll(buffer);
+    ws.textAll(std::move(buffer));
     DEBUG_PRINTLN(F("to multiple clients."));
   }
-  buffer->unlock();
-  ws._cleanBuffers();
 
   releaseJSONBufferLock();
 }
@@ -227,32 +211,21 @@ static bool sendLiveLedsWs(uint32_t wsClient)  // WLEDMM added "static"
   #endif
   size_t pos = (strip.isMatrix ? 4 : 2);
   size_t bufSize = pos + (used/n)*3;
-
-  if ((bufSize < 1) || (used < 1)) return(false); // WLEDMM should not happen
-  //AsyncWebSocketMessageBuffer * wsBuf = ws.makeBuffer(bufSize);
-  // WLEDMM protect against exceptions due to low memory 
-  AsyncWebSocketMessageBuffer * wsBuf = nullptr;
-#if __cpp_exceptions
-  try{
-#endif
-    wsBuf = ws.makeBuffer(bufSize);
-#if __cpp_exceptions
-  } catch(...) {
-#else
-  if (wsBuf == nullptr) {    // 8266 does not support exceptions
-#endif
-    wsBuf = nullptr;
-    USER_PRINTLN(F("WS buffer allocation failed."));
-    //ws.closeAll(1013); //code 1013 = temporary overload, try again later
-    //ws.cleanupClients(0); //disconnect all clients to release memory
-    ws._cleanBuffers();
-  }
   
-  if (!wsBuf) return false; //out of memory
-  uint8_t* buffer = wsBuf->get();
-  if (!buffer) return false; //out of memory
+  if ((bufSize < 1) || (used < 1)) return(false); // WLEDMM should not happen
+  AsyncWebSocketBuffer wsBuf(bufSize);
+  if (!wsBuf) {
+	  USER_PRINTLN(F("WS buffer allocation failed."));
+	  errorFlag = ERR_LOW_WS_MEM;
+	  return false; //out of memory
+  }
+  uint8_t* buffer = reinterpret_cast<uint8_t*>(wsBuf.data());
+  if (!buffer) {
+	  USER_PRINTLN(F("WS buffer allocation failed."));
+	  errorFlag = ERR_LOW_WS_MEM;
+	  return false; //out of memory
+  }
 
-  wsBuf->lock();  // protect buffer from being cleaned by another WS instance
   buffer[0] = 'L';
   buffer[1] = 1; //version
   #ifndef WLED_DISABLE_2D
@@ -290,9 +263,7 @@ static bool sendLiveLedsWs(uint32_t wsClient)  // WLEDMM added "static"
     }
   }
 
-  wsc->binary(wsBuf);
-  wsBuf->unlock();     // un-protect buffer
-  ws._cleanBuffers();  // cleans up if the message is not added to any clients.
+  wsc->binary(std::move(wsBuf));
   return true;
 }
 

From 775e07c6d6e210754c83c9826b05dbc3c1850b23 Mon Sep 17 00:00:00 2001
From: Will Miles <will@willmiles.net>
Date: Thu, 14 Mar 2024 22:06:51 -0400
Subject: [PATCH 027/200] serveLiveLeds: Use dynamic buffer

There were three problems here:
- AsyncWebServer is going to copy to a heap buffer anyways, so we might
   as well just pass it one it can use
- The buffer size estimate was wrong -- we need 9 bytes per pixel
   ("RRGGBB",), so the buffer could overflow, and it was not
   considering the extra 2D requirements
- On ESP8266, the stack allocation was overflowing the stack, causing
  corruption and crashes.
---
 wled00/json.cpp | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/wled00/json.cpp b/wled00/json.cpp
index 5456b455..020c46c3 100644
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@@ -1554,10 +1554,20 @@ bool serveLiveLeds(AsyncWebServerRequest* request, uint32_t wsClient)
 
   uint16_t used = strip.getLengthTotal();
   uint16_t n = (used -1) /MAX_LIVE_LEDS +1; //only serve every n'th LED if count over MAX_LIVE_LEDS
-  char buffer[2000];
-  strcpy_P(buffer, PSTR("{\"leds\":["));
-  obuf = buffer;
-  olen = 9;
+#ifndef WLED_DISABLE_2D
+  if (strip.isMatrix) {
+    // ignore anything behid matrix (i.e. extra strip)
+    used = Segment::maxWidth*Segment::maxHeight; // always the size of matrix (more or less than strip.getLengthTotal())
+    n = 1;
+    if (used > MAX_LIVE_LEDS) n = 2;
+    if (used > MAX_LIVE_LEDS*4) n = 4;
+  }
+#endif
+
+  DynamicBuffer buffer(9 + (9*MAX_LIVE_LEDS) + 7 + 5 + 6 + 5 + 6 + 5 + 2);  
+  char* buf = buffer.data();      // assign buffer for oappnd() functions
+  strncpy_P(buffer.data(), PSTR("{\"leds\":["), buffer.size());
+  buf += 9; // sizeof(PSTR()) from last line
 
   for (size_t i= 0; i < used; i += n)
   {
@@ -1575,20 +1585,21 @@ bool serveLiveLeds(AsyncWebServerRequest* request, uint32_t wsClient)
       g = qadd8(w, G(c));
       b = qadd8(w, B(c));
     }
-    olen += sprintf(obuf + olen, "\"%06X\",", RGBW32(r,g,b,0));
+    buf += sprintf_P(buf, PSTR("\"%06X\","), RGBW32(r,g,b,0));
   }
-  olen -= 1;
-  oappend((const char*)F("],\"n\":"));
-  oappendi(n);
-  oappend("}");
+  buf--;  // remove last comma
+  buf += sprintf_P(buf, PSTR("],\"n\":%d"), n);
+  (*buf++) = '}';
+  (*buf++) = 0;
+  
   if (request) {
-    request->send(200, "application/json", buffer);
+    request->send(200, "application/json", toString(std::move(buffer)));
   }
   #ifdef WLED_ENABLE_WEBSOCKETS
   else {
-    wsc->text(obuf, olen);
+    wsc->text(toString(std::move(buffer)));
   }
-  #endif
+  #endif  
   return true;
 }
 #endif

From 543dfd206d59194e9ff14cabeda2ae4d3ad25c42 Mon Sep 17 00:00:00 2001
From: thatdonfc <thatdonfc+git@gmail.com>
Date: Tue, 19 Mar 2024 14:04:24 -0700
Subject: [PATCH 028/200] Fix palette names when palette ID > 58 and not custom

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

diff --git a/wled00/util.cpp b/wled00/util.cpp
index 896b57e3..bb8715d7 100644
--- a/wled00/util.cpp
+++ b/wled00/util.cpp
@@ -255,8 +255,8 @@ uint8_t extractModeName(uint8_t mode, const char *src, char *dest, uint8_t maxLe
     } else return 0;
   }
 
-  if (src == JSON_palette_names && mode > GRADIENT_PALETTE_COUNT) {
-    snprintf_P(dest, maxLen, PSTR("~ Custom %d~"), 255-mode);
+  if (src == JSON_palette_names && mode > (GRADIENT_PALETTE_COUNT + 13)) {
+    snprintf_P(dest, maxLen, PSTR("~ Custom %d ~"), 255-mode);
     dest[maxLen-1] = '\0';
     return strlen(dest);
   }

From 3df3b9acafe8487e215b0ebe529774dad7263c86 Mon Sep 17 00:00:00 2001
From: Blaz Kristan <blaz@kristan-sp.si>
Date: Wed, 17 Apr 2024 18:52:35 +0200
Subject: [PATCH 029/200] ArduinoFFT update shadow variables

---
 usermods/multi_relay/usermod_multi_relay.h | 2 +-
 wled00/json.cpp                            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/usermods/multi_relay/usermod_multi_relay.h b/usermods/multi_relay/usermod_multi_relay.h
index cf0aca22..dd47e767 100644
--- a/usermods/multi_relay/usermod_multi_relay.h
+++ b/usermods/multi_relay/usermod_multi_relay.h
@@ -626,7 +626,7 @@ void MultiRelay::addToJsonInfo(JsonObject &root) {
     for (int i=0; i<MULTI_RELAY_MAX_RELAYS; i++) {
       if ((_relay[i].pin<0 && !usePcf8574) || !_relay[i].external) continue;
       uiDomString = F("Relay "); uiDomString += i;
-      JsonArray infoArr = user.createNestedArray(uiDomString); // timer value
+      infoArr = user.createNestedArray(uiDomString); // timer value
 
       uiDomString = F("<button class=\"btn btn-xs\" onclick=\"requestJson({");
       uiDomString += FPSTR(_name);
diff --git a/wled00/json.cpp b/wled00/json.cpp
index 020c46c3..444f0e4d 100644
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@@ -340,8 +340,8 @@ bool deserializeSegment(JsonObject elem, byte it, byte presetId)
       seg.fill(BLACK);  // WLEDMM why now?
     }
 
-    uint16_t start = 0, stop = 0;
-    byte set = 0; //0 nothing set, 1 start set, 2 range set
+    start = 0, stop = 0;
+    set = 0; //0 nothing set, 1 start set, 2 range set
 
     for (size_t i = 0; i < iarr.size(); i++) {
       if(iarr[i].is<JsonInteger>()) {

From c5283da32aa23f5dbbb7d84618b28917a7377914 Mon Sep 17 00:00:00 2001
From: Blaz Kristan <blaz@kristan-sp.si>
Date: Wed, 24 Apr 2024 16:04:54 +0200
Subject: [PATCH 030/200] Fix for #3878

---
 usermods/BH1750_v2/usermod_bh1750.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usermods/BH1750_v2/usermod_bh1750.h b/usermods/BH1750_v2/usermod_bh1750.h
index 5b5fa25f..a6e7d653 100644
--- a/usermods/BH1750_v2/usermod_bh1750.h
+++ b/usermods/BH1750_v2/usermod_bh1750.h
@@ -76,7 +76,7 @@ private:
   bool sensorFound = false;
 
   // Home Assistant and MQTT  
-  String mqttLuminanceTopic = FPSTR("");
+  String mqttLuminanceTopic;
   bool mqttInitialized = false;
   bool HomeAssistantDiscovery = true; // Publish Home Assistant Discovery messages
 

From 74e999b1e5c5bcb3b8854821b102ae220ad80f96 Mon Sep 17 00:00:00 2001
From: Pasquale Pizzuti <paspiz85@users.noreply.github.com>
Date: Tue, 30 Apr 2024 14:09:12 +0200
Subject: [PATCH 031/200] using brightness in analog clock overlay

---
 wled00/overlay.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/wled00/overlay.cpp b/wled00/overlay.cpp
index cfee7e81..96b15053 100644
--- a/wled00/overlay.cpp
+++ b/wled00/overlay.cpp
@@ -11,6 +11,7 @@ void _overlayAnalogClock()
   {
     _overlayAnalogCountdown(); return;
   }
+  uint8_t brightness = strip.getBrightness();
   float hourP = ((float)(hour(localTime)%12))/12.0f;
   float minuteP = ((float)minute(localTime))/60.0f;
   hourP = hourP + minuteP/12.0f;
@@ -25,11 +26,11 @@ void _overlayAnalogClock()
   {
     if (secondPixel < analogClock12pixel)
     {
-      strip.setRange(analogClock12pixel, overlayMax, 0xFF0000);
-      strip.setRange(overlayMin, secondPixel, 0xFF0000);
+      strip.setRange(analogClock12pixel, overlayMax, (uint32_t)brightness<<16);
+      strip.setRange(overlayMin, secondPixel, (uint32_t)brightness<<16);
     } else
     {
-      strip.setRange(analogClock12pixel, secondPixel, 0xFF0000);
+      strip.setRange(analogClock12pixel, secondPixel, (uint32_t)brightness<<16);
     }
   }
   if (analogClock5MinuteMarks)
@@ -38,12 +39,12 @@ void _overlayAnalogClock()
     {
       int pix = analogClock12pixel + roundf((overlaySize / 12.0f) *i);
       if (pix > overlayMax) pix -= overlaySize;
-      strip.setPixelColor(pix, 0x00FFAA);
+      strip.setPixelColor(pix, ((uint32_t)brightness<<8)|((uint32_t)brightness*2/3));
     }
   }
-  if (!analogClockSecondsTrail) strip.setPixelColor(secondPixel, 0xFF0000);
-  strip.setPixelColor(minutePixel, 0x00FF00);
-  strip.setPixelColor(hourPixel, 0x0000FF);
+  if (!analogClockSecondsTrail) strip.setPixelColor(secondPixel, (uint32_t)brightness<<16);
+  strip.setPixelColor(minutePixel, (uint32_t)brightness<<8);
+  strip.setPixelColor(hourPixel, (uint32_t)brightness);
 }
 
 

From feac33653f72aea364d6f3b2e83042e492765f61 Mon Sep 17 00:00:00 2001
From: Woody <xaver@holzapfel.net>
Date: Tue, 30 Apr 2024 16:53:47 +0200
Subject: [PATCH 032/200] Fix resizing bug The bug was that when resizing the
 window, it always jumped to the Colors tab instead of staying on the
 currently selected tab.

---
 wled00/data/index.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/wled00/data/index.js b/wled00/data/index.js
index 1fcbfcaf..d193a730 100644
--- a/wled00/data/index.js
+++ b/wled00/data/index.js
@@ -279,7 +279,6 @@ function updateTablinks(tabI)
 {
 	var tablinks = gEBCN("tablinks");
 	for (var i of tablinks) i.classList.remove('active');
-	if (pcMode) return;
 	tablinks[tabI].classList.add('active');
 }
 
@@ -3615,12 +3614,11 @@ function togglePcMode(fromB = false)
 	if (fromB) {
 		pcModeA = !pcModeA;
 		localStorage.setItem('pcm', pcModeA);
+		openTab(0, true);
 	}
 	pcMode = (wW >= 1024) && pcModeA;
 	if (cpick) cpick.resize(pcMode && wW>1023 && wW<1250 ? 230 : 260); // for tablet in landscape
 	if (!fromB && ((wW < 1024 && lastw < 1024) || (wW >= 1024 && lastw >= 1024))) return; // no change in size and called from size()
-	openTab(0, true);
-	updateTablinks(0);
 	gId('buttonPcm').className = (pcMode) ? "active":"";
 	gId('bot').style.height = (pcMode && !cfg.comp.pcmbot) ? "0":"auto";
 	sCol('--bh', gId('bot').clientHeight + "px");

From b01f3118b441f4ca40e49c5de99021b7f45a8efe Mon Sep 17 00:00:00 2001
From: Pasquale Pizzuti <produzionepp@infotelsistemi.com>
Date: Tue, 30 Apr 2024 17:52:35 +0200
Subject: [PATCH 033/200] using color_fade

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

diff --git a/wled00/overlay.cpp b/wled00/overlay.cpp
index 96b15053..71f7e081 100644
--- a/wled00/overlay.cpp
+++ b/wled00/overlay.cpp
@@ -26,11 +26,11 @@ void _overlayAnalogClock()
   {
     if (secondPixel < analogClock12pixel)
     {
-      strip.setRange(analogClock12pixel, overlayMax, (uint32_t)brightness<<16);
-      strip.setRange(overlayMin, secondPixel, (uint32_t)brightness<<16);
+      strip.setRange(analogClock12pixel, overlayMax, color_fade(0xFF0000, brightness));
+      strip.setRange(overlayMin, secondPixel, color_fade(0xFF0000, brightness));
     } else
     {
-      strip.setRange(analogClock12pixel, secondPixel, (uint32_t)brightness<<16);
+      strip.setRange(analogClock12pixel, secondPixel, color_fade(0xFF0000, brightness));
     }
   }
   if (analogClock5MinuteMarks)
@@ -39,12 +39,12 @@ void _overlayAnalogClock()
     {
       int pix = analogClock12pixel + roundf((overlaySize / 12.0f) *i);
       if (pix > overlayMax) pix -= overlaySize;
-      strip.setPixelColor(pix, ((uint32_t)brightness<<8)|((uint32_t)brightness*2/3));
+      strip.setPixelColor(pix, color_fade(0x00FFAA, brightness));
     }
   }
-  if (!analogClockSecondsTrail) strip.setPixelColor(secondPixel, (uint32_t)brightness<<16);
-  strip.setPixelColor(minutePixel, (uint32_t)brightness<<8);
-  strip.setPixelColor(hourPixel, (uint32_t)brightness);
+  if (!analogClockSecondsTrail) strip.setPixelColor(secondPixel, color_fade(0xFF0000, brightness));
+  strip.setPixelColor(minutePixel, color_fade(0x00FF00, brightness));
+  strip.setPixelColor(hourPixel, color_fade(0x0000FF, brightness));
 }
 
 

From 383c7977468864a0209962559eec389025343a41 Mon Sep 17 00:00:00 2001
From: Woody <xaver@holzapfel.net>
Date: Tue, 30 Apr 2024 18:57:53 +0200
Subject: [PATCH 034/200] add Webpage shortcuts, resolves #2362

---
 wled00/data/index.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/wled00/data/index.js b/wled00/data/index.js
index d193a730..e89ad78e 100644
--- a/wled00/data/index.js
+++ b/wled00/data/index.js
@@ -247,6 +247,7 @@ function onLoad()
 
 	selectSlot(0);
 	updateTablinks(0);
+	handleLocationHash();
 	pmtLS = localStorage.getItem('wledPmt');
 
 	// Load initial data
@@ -289,6 +290,21 @@ function openTab(tabI, force = false)
 	_C.classList.toggle('smooth', false);
 	_C.style.setProperty('--i', iSlide);
 	updateTablinks(tabI);
+	switch (tabI) {
+		case 0: window.location.hash = "Colors"; break;
+		case 1: window.location.hash = "Effects"; break;
+		case 2: window.location.hash = "Segments"; break;
+		case 3: window.location.hash = "Presets"; break;
+	}
+}
+
+function handleLocationHash() {
+	switch (window.location.hash) {
+		case "#Colors": openTab(0); break;
+		case "#Effects": openTab(1); break;
+		case "#Segments": openTab(2); break;
+		case "#Presets": openTab(3); break;
+	}
 }
 
 var timeout;
@@ -3650,6 +3666,7 @@ size();
 _C.style.setProperty('--n', N);
 
 window.addEventListener('resize', size, true);
+window.addEventListener('hashchange', handleLocationHash);
 
 _C.addEventListener('mousedown', lock, false);
 _C.addEventListener('touchstart', lock, false);

From c22c5b75a092e30e77ac7f9c48449cf151175247 Mon Sep 17 00:00:00 2001
From: Pasquale Pizzuti <produzionepp@infotelsistemi.com>
Date: Thu, 2 May 2024 09:04:07 +0200
Subject: [PATCH 035/200] using global brightness

---
 wled00/overlay.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/wled00/overlay.cpp b/wled00/overlay.cpp
index 71f7e081..6ffc6c8e 100644
--- a/wled00/overlay.cpp
+++ b/wled00/overlay.cpp
@@ -11,7 +11,6 @@ void _overlayAnalogClock()
   {
     _overlayAnalogCountdown(); return;
   }
-  uint8_t brightness = strip.getBrightness();
   float hourP = ((float)(hour(localTime)%12))/12.0f;
   float minuteP = ((float)minute(localTime))/60.0f;
   hourP = hourP + minuteP/12.0f;
@@ -26,11 +25,11 @@ void _overlayAnalogClock()
   {
     if (secondPixel < analogClock12pixel)
     {
-      strip.setRange(analogClock12pixel, overlayMax, color_fade(0xFF0000, brightness));
-      strip.setRange(overlayMin, secondPixel, color_fade(0xFF0000, brightness));
+      strip.setRange(analogClock12pixel, overlayMax, color_fade(0xFF0000, bri));
+      strip.setRange(overlayMin, secondPixel, color_fade(0xFF0000, bri));
     } else
     {
-      strip.setRange(analogClock12pixel, secondPixel, color_fade(0xFF0000, brightness));
+      strip.setRange(analogClock12pixel, secondPixel, color_fade(0xFF0000, bri));
     }
   }
   if (analogClock5MinuteMarks)
@@ -39,12 +38,12 @@ void _overlayAnalogClock()
     {
       int pix = analogClock12pixel + roundf((overlaySize / 12.0f) *i);
       if (pix > overlayMax) pix -= overlaySize;
-      strip.setPixelColor(pix, color_fade(0x00FFAA, brightness));
+      strip.setPixelColor(pix, color_fade(0x00FFAA, bri));
     }
   }
-  if (!analogClockSecondsTrail) strip.setPixelColor(secondPixel, color_fade(0xFF0000, brightness));
-  strip.setPixelColor(minutePixel, color_fade(0x00FF00, brightness));
-  strip.setPixelColor(hourPixel, color_fade(0x0000FF, brightness));
+  if (!analogClockSecondsTrail) strip.setPixelColor(secondPixel, color_fade(0xFF0000, bri));
+  strip.setPixelColor(minutePixel, color_fade(0x00FF00, bri));
+  strip.setPixelColor(hourPixel, color_fade(0x0000FF, bri));
 }
 
 

From 87b5badd5b20f5db50ecd6a9a2840d0f77e6ae72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Kristan?= <blaz@kristan-sp.si>
Date: Fri, 3 May 2024 09:56:14 +0200
Subject: [PATCH 036/200] Merge pull request #3944 from paspiz85/pas4

Using brightness in analog clock overlay

From 2aad3f535618e5c58eda9728c88390e4932bf395 Mon Sep 17 00:00:00 2001
From: Blaz Kristan <blaz@kristan-sp.si>
Date: Fri, 10 May 2024 00:02:28 +0200
Subject: [PATCH 037/200] Antialiased line & circle

---
 wled00/FX.cpp       |   6 +-
 wled00/FX.h         |  23 +++--
 wled00/FX_2Dfcn.cpp | 217 +++++++++++++++++++++++++++-----------------
 3 files changed, 155 insertions(+), 91 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 416884cf..01fd923c 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -2551,7 +2551,7 @@ uint16_t ripple_base()
         uint16_t cx = rippleorigin >> 8;
         uint16_t cy = rippleorigin & 0xFF;
         uint8_t mag = scale8(sin8((propF>>2)), amp);
-        if (propI > 0) SEGMENT.draw_circle(cx, cy, propI, color_blend(SEGMENT.getPixelColorXY(cx + propI, cy), col, mag));
+        if (propI > 0) SEGMENT.drawCircle(cx, cy, propI, color_blend(SEGMENT.getPixelColorXY(cx + propI, cy), col, mag), true);
       } else
       #endif
       {
@@ -6271,8 +6271,8 @@ uint16_t mode_2Dfloatingblobs(void) {
       }
     }
     uint32_t c = SEGMENT.color_from_palette(blob->color[i], false, false, 0);
-    if (blob->r[i] > 1.f) SEGMENT.fill_circle(blob->x[i], blob->y[i], roundf(blob->r[i]), c);
-    else                  SEGMENT.setPixelColorXY(blob->x[i], blob->y[i], c);
+    if (blob->r[i] > 1.f) SEGMENT.fillCircle(roundf(blob->x[i]), roundf(blob->y[i]), roundf(blob->r[i]), c);
+    else                  SEGMENT.setPixelColorXY((int)roundf(blob->x[i]), (int)roundf(blob->y[i]), c);
     // move x
     if (blob->x[i] + blob->r[i] >= cols - 1) blob->x[i] += (blob->sX[i] * ((cols - 1 - blob->x[i]) / blob->r[i] + 0.005f));
     else if (blob->x[i] - blob->r[i] <= 0)   blob->x[i] += (blob->sX[i] * (blob->x[i] / blob->r[i] + 0.005f));
diff --git a/wled00/FX.h b/wled00/FX.h
index b8864db4..b53f3fce 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -122,6 +122,10 @@ bool strip_uses_global_leds(void);              // WLEDMM implemented in FX_fcn.
 #define PURPLE     (uint32_t)0x400080
 #define ORANGE     (uint32_t)0xFF3000
 #define PINK       (uint32_t)0xFF1493
+#define GREY       (uint32_t)0x808080
+#define GRAY       GREY
+#define DARKGREY   (uint32_t)0x333333
+#define DARKGRAY   DARKGREY
 #define ULTRAWHITE (uint32_t)0xFFFFFFFF
 #define DARKSLATEGRAY (uint32_t)0x2F4F4F
 #define DARKSLATEGREY (uint32_t)0x2F4F4F
@@ -665,6 +669,7 @@ typedef struct Segment {
     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)); }
     inline void setPixelColorXY(int x, int y, CRGB c)                             { setPixelColorXY(x, y, RGBW32(c.r,c.g,c.b,0)); }
+    inline void setPixelColorXY(unsigned x, unsigned y, CRGB c)                   { setPixelColorXY(int(x), int(y), RGBW32(c.r,c.g,c.b,0)); }
     //#ifdef WLED_USE_AA_PIXELS
     void setPixelColorXY(float x, float y, uint32_t c, bool aa = true, bool fast=true);
     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); }
@@ -684,8 +689,10 @@ typedef struct Segment {
     void moveX(int8_t delta, bool wrap = false);
     void moveY(int8_t delta, bool wrap = false);
     void move(uint8_t dir, uint8_t delta, bool wrap = false);
-    void draw_circle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c);
-    void fill_circle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c);
+    void drawCircle(uint16_t cx, uint16_t cy, uint8_t radius, uint32_t c, bool soft = false);
+    inline void drawCircle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c, bool soft = false) { drawCircle(cx, cy, radius, RGBW32(c.r,c.g,c.b,0), soft); }
+    void fillCircle(uint16_t cx, uint16_t cy, uint8_t radius, uint32_t c, bool soft = false);
+    inline void fillCircle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c, bool soft = false) { fillCircle(cx, cy, radius, RGBW32(c.r,c.g,c.b,0), soft); }
     void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c);
     void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, CRGB c) { drawLine(x0, y0, x1, y1, RGBW32(c.r,c.g,c.b,0)); } // automatic inline
     void drawArc(uint16_t x0, uint16_t y0, uint16_t radius, uint32_t color, uint32_t fillColor = 0);
@@ -693,7 +700,7 @@ typedef struct Segment {
     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, 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
+    //void blur1d(fract8 blur_amount); // blur all rows in 1 dimension
     void blur2d(fract8 blur_amount) { blur(blur_amount); }
     void fill_solid(CRGB c) { fill(RGBW32(c.r,c.g,c.b,0)); }
     void nscale8(uint8_t scale);
@@ -704,6 +711,7 @@ typedef struct Segment {
     inline void setPixelColorXY(unsigned x, unsigned y, uint32_t c)               { setPixelColor(int(x), c); }
     inline void setPixelColorXY(int x, int y, byte r, byte g, byte b, byte w = 0) { setPixelColor(x, RGBW32(r,g,b,w)); }
     inline void setPixelColorXY(int x, int y, CRGB c)                             { setPixelColor(x, RGBW32(c.r,c.g,c.b,0)); }
+    inline void setPixelColorXY(unsigned x, unsigned y, CRGB c)                   { setPixelColor(int(x), RGBW32(c.r,c.g,c.b,0)); }
     //#ifdef WLED_USE_AA_PIXELS
     inline void setPixelColorXY(float x, float y, uint32_t c, bool aa = true)     { setPixelColor(x, c, aa); }
     inline void setPixelColorXY(float x, float y, byte r, byte g, byte b, byte w = 0, bool aa = true) { setPixelColor(x, RGBW32(r,g,b,w), aa); }
@@ -722,9 +730,12 @@ typedef struct Segment {
     inline void moveX(int8_t delta, bool wrap = false) {}
     inline void moveY(int8_t delta, bool wrap = false) {}
     inline void move(uint8_t dir, uint8_t delta, bool wrap = false) {}
-    inline void fill_circle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c) {}
-    inline void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c) {}
-    inline void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, CRGB c) {}
+    inline void drawCircle(uint16_t cx, uint16_t cy, uint8_t radius, uint32_t c, bool soft = false) {}
+    inline void drawCircle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c, bool soft = false) {}
+    inline void fillCircle(uint16_t cx, uint16_t cy, uint8_t radius, uint32_t c, bool soft = false) {}
+    inline void fillCircle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c, bool soft = false) {}
+    inline void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c, bool soft = false) {}
+    inline void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, CRGB c, bool soft = false) {}
     inline void drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, uint32_t color, uint32_t = 0, int8_t = 0) {}
     inline void drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, CRGB color) {}
     inline void drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, CRGB c, CRGB c2, int8_t rotate = 0) {}
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 1d217ff0..320636d6 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -427,56 +427,38 @@ void Segment::blurCol(uint32_t col, fract8 blur_amount, bool smear) {
 }
 
 // 1D Box blur (with added weight - blur_amount: [0=no blur, 255=max blur])
-void Segment::box_blur(uint16_t i, bool vertical, fract8 blur_amount) {  //WLEDMM: use fast types
-  const uint_fast16_t cols = virtualWidth();
-  const uint_fast16_t rows = virtualHeight();
-  const uint_fast16_t dim1 = vertical ? rows : cols;
-  const uint_fast16_t dim2 = vertical ? cols : rows;
+void Segment::box_blur(uint16_t i, bool vertical, fract8 blur_amount) {
+  if (!isActive() || blur_amount == 0) return; // not active
+  const int cols = virtualWidth();
+  const int rows = virtualHeight();
+  const int dim1 = vertical ? rows : cols;
+  const int dim2 = vertical ? cols : rows;
   if (i >= dim2) return;
   const float seep = blur_amount/255.f;
   const float keep = 3.f - 2.f*seep;
   // 1D box blur
-  CRGB tmp[dim1];
-  for (uint_fast16_t j = 0; j < dim1; j++) {
-    uint_fast16_t x = vertical ? i : j;
-    uint_fast16_t y = vertical ? j : i;
-    int_fast16_t xp = vertical ? x : x-1;  // "signed" to prevent underflow
-    int_fast16_t yp = vertical ? y-1 : y;  // "signed" to prevent underflow
-    uint_fast16_t xn = vertical ? x : x+1;
-    uint_fast16_t yn = vertical ? y+1 : y;
-    CRGB curr = getPixelColorXY(x,y);
-    CRGB prev = (xp<0 || yp<0) ? CRGB::Black : getPixelColorXY(xp,yp);
-    CRGB next = ((vertical && yn>=dim1) || (!vertical && xn>=dim1)) ? CRGB::Black : getPixelColorXY(xn,yn);
-    uint16_t r, g, b;
-    r = (curr.r*keep + (prev.r + next.r)*seep) / 3;
-    g = (curr.g*keep + (prev.g + next.g)*seep) / 3;
-    b = (curr.b*keep + (prev.b + next.b)*seep) / 3;
-    tmp[j] = CRGB(r,g,b);
+  uint32_t out[dim1], in[dim1];
+  for (int j = 0; j < dim1; j++) {
+    int x = vertical ? i : j;
+    int y = vertical ? j : i;
+    in[j] = getPixelColorXY(x, y);
   }
-  for (uint_fast16_t j = 0; j < dim1; j++) {
-    uint_fast16_t x = vertical ? i : j;
-    uint_fast16_t y = vertical ? j : i;
-    setPixelColorXY((int)x, (int)y, tmp[j]);
+  for (int j = 0; j < dim1; j++) {
+    uint32_t curr = in[j];
+    uint32_t prev = j > 0      ? in[j-1] : BLACK;
+    uint32_t next = j < dim1-1 ? in[j+1] : BLACK;
+    uint8_t r, g, b, w;
+    r = (R(curr)*keep + (R(prev) + R(next))*seep) / 3;
+    g = (G(curr)*keep + (G(prev) + G(next))*seep) / 3;
+    b = (B(curr)*keep + (B(prev) + B(next))*seep) / 3;
+    w = (W(curr)*keep + (W(prev) + W(next))*seep) / 3;
+    out[j] = RGBW32(r,g,b,w);
+  }
+  for (int j = 0; j < dim1; j++) {
+    int x = vertical ? i : j;
+    int y = vertical ? j : i;
+    setPixelColorXY(x, y, out[j]);
   }
-}
-
-// blur1d: one-dimensional blur filter. Spreads light to 2 line neighbors.
-// blur2d: two-dimensional blur filter. Spreads light to 8 XY neighbors.
-//
-//           0 = no spread at all
-//          64 = moderate spreading
-//         172 = maximum smooth, even spreading
-//
-//         173..255 = wider spreading, but increasing flicker
-//
-//         Total light is NOT entirely conserved, so many repeated
-//         calls to 'blur' will also result in the light fading,
-//         eventually all the way to black; this is by design so that
-//         it can be used to (slowly) clear the LEDs to black.
-
-void Segment::blur1d(fract8 blur_amount) {   //WLEDMM: use fast types
-  const uint_fast16_t rows = virtualHeight();
-  for (uint_fast16_t y = 0; y < rows; y++) blurRow(y, blur_amount);
 }
 
 void Segment::moveX(int8_t delta, bool wrap) {
@@ -533,37 +515,71 @@ void Segment::move(uint8_t dir, uint8_t delta, bool wrap) {
   }
 }
 
-void Segment::draw_circle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB col) {
-  if (!isActive()) return; // not active
-  // Bresenham’s Algorithm
-  int d = 3 - (2*radius);
-  int y = radius, x = 0;
-  while (y >= x) {
-    setPixelColorXY(cx+x, cy+y, col);
-    setPixelColorXY(cx-x, cy+y, col);
-    setPixelColorXY(cx+x, cy-y, col);
-    setPixelColorXY(cx-x, cy-y, col);
-    setPixelColorXY(cx+y, cy+x, col);
-    setPixelColorXY(cx-y, cy+x, col);
-    setPixelColorXY(cx+y, cy-x, col);
-    setPixelColorXY(cx-y, cy-x, col);
-    x++;
-    if (d > 0) {
-      y--;
-      d += 4 * (x - y) + 10;
-    } else {
-      d += 4 * x + 6;
+void Segment::drawCircle(uint16_t cx, uint16_t cy, uint8_t radius, uint32_t col, bool soft) {
+  if (!isActive() || radius == 0) return; // not active
+  if (soft) {
+    // Xiaolin Wu’s algorithm
+    int rsq = radius*radius;
+    int x = 0;
+    int y = radius;
+    unsigned oldFade = 0;
+    while (x < y) {
+      float yf = sqrtf(float(rsq - x*x)); // needs to be floating point
+      unsigned fade = float(0xFFFF) * (ceilf(yf) - yf); // how much color to keep
+      if (oldFade > fade) y--;
+      oldFade = fade;
+      setPixelColorXY(cx+x, cy+y, color_blend(col, getPixelColorXY(cx+x, cy+y), fade, true));
+      setPixelColorXY(cx-x, cy+y, color_blend(col, getPixelColorXY(cx-x, cy+y), fade, true));
+      setPixelColorXY(cx+x, cy-y, color_blend(col, getPixelColorXY(cx+x, cy-y), fade, true));
+      setPixelColorXY(cx-x, cy-y, color_blend(col, getPixelColorXY(cx-x, cy-y), fade, true));
+      setPixelColorXY(cx+y, cy+x, color_blend(col, getPixelColorXY(cx+y, cy+x), fade, true));
+      setPixelColorXY(cx-y, cy+x, color_blend(col, getPixelColorXY(cx-y, cy+x), fade, true));
+      setPixelColorXY(cx+y, cy-x, color_blend(col, getPixelColorXY(cx+y, cy-x), fade, true));
+      setPixelColorXY(cx-y, cy-x, color_blend(col, getPixelColorXY(cx-y, cy-x), fade, true));
+      setPixelColorXY(cx+x, cy+y-1, color_blend(getPixelColorXY(cx+x, cy+y-1), col, fade, true));
+      setPixelColorXY(cx-x, cy+y-1, color_blend(getPixelColorXY(cx-x, cy+y-1), col, fade, true));
+      setPixelColorXY(cx+x, cy-y+1, color_blend(getPixelColorXY(cx+x, cy-y+1), col, fade, true));
+      setPixelColorXY(cx-x, cy-y+1, color_blend(getPixelColorXY(cx-x, cy-y+1), col, fade, true));
+      setPixelColorXY(cx+y-1, cy+x, color_blend(getPixelColorXY(cx+y-1, cy+x), col, fade, true));
+      setPixelColorXY(cx-y+1, cy+x, color_blend(getPixelColorXY(cx-y+1, cy+x), col, fade, true));
+      setPixelColorXY(cx+y-1, cy-x, color_blend(getPixelColorXY(cx+y-1, cy-x), col, fade, true));
+      setPixelColorXY(cx-y+1, cy-x, color_blend(getPixelColorXY(cx-y+1, cy-x), col, fade, true));
+      x++;
+    }
+  } else {
+    // Bresenham’s Algorithm
+    int d = 3 - (2*radius);
+    int y = radius, x = 0;
+    while (y >= x) {
+      setPixelColorXY(cx+x, cy+y, col);
+      setPixelColorXY(cx-x, cy+y, col);
+      setPixelColorXY(cx+x, cy-y, col);
+      setPixelColorXY(cx-x, cy-y, col);
+      setPixelColorXY(cx+y, cy+x, col);
+      setPixelColorXY(cx-y, cy+x, col);
+      setPixelColorXY(cx+y, cy-x, col);
+      setPixelColorXY(cx-y, cy-x, col);
+      x++;
+      if (d > 0) {
+        y--;
+        d += 4 * (x - y) + 10;
+      } else {
+        d += 4 * x + 6;
+      }
     }
   }
 }
 
 // by stepko, taken from https://editor.soulmatelights.com/gallery/573-blobs
-void Segment::fill_circle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB col) {
-  if (!isActive()) return; // not active
-  const uint16_t cols = virtualWidth();
-  const uint16_t rows = virtualHeight();
-  for (int16_t y = -radius; y <= radius; y++) {
-    for (int16_t x = -radius; x <= radius; x++) {
+void Segment::fillCircle(uint16_t cx, uint16_t cy, uint8_t radius, uint32_t col, bool soft) {
+  if (!isActive() || radius == 0) return; // not active
+  // draw soft bounding circle
+  if (soft) drawCircle(cx, cy, radius, col, soft);
+  // fill it
+  const int cols = virtualWidth();
+  const int rows = virtualHeight();
+  for (int y = -radius; y <= radius; y++) {
+    for (int x = -radius; x <= radius; x++) {
       if (x * x + y * y <= radius * radius &&
           int16_t(cx)+x>=0 && int16_t(cy)+y>=0 &&
           int16_t(cx)+x<cols && int16_t(cy)+y<rows)
@@ -582,20 +598,57 @@ void Segment::nscale8(uint8_t scale) {  //WLEDMM: use fast types
 }
 
 //line function
-void Segment::drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c) {
+void Segment::drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c, bool soft) {
   if (!isActive()) return; // not active
-  const uint16_t cols = virtualWidth();
-  const uint16_t rows = virtualHeight();
+  const int cols = virtualWidth();
+  const int rows = virtualHeight();
   if (x0 >= cols || x1 >= cols || y0 >= rows || y1 >= rows) return;
-  const int16_t dx = abs(x1-x0), sx = x0<x1 ? 1 : -1;
-  const int16_t dy = abs(y1-y0), sy = y0<y1 ? 1 : -1;
-  int16_t err = (dx>dy ? dx : -dy)/2, e2;
-  for (;;) {
-    setPixelColorXY(x0,y0,c);
-    if (x0==x1 && y0==y1) break;
-    e2 = err;
-    if (e2 >-dx) { err -= dy; x0 += sx; }
-    if (e2 < dy) { err += dx; y0 += sy; }
+
+  const int dx = abs(x1-x0), sx = x0<x1 ? 1 : -1; // x distance & step
+  const int dy = abs(y1-y0), sy = y0<y1 ? 1 : -1; // y distance & step
+
+  // single pixel (line length == 0)
+  if (dx+dy == 0) {
+    setPixelColorXY(x0, y0, c);
+    return;
+  }
+
+  if (soft) {
+    // Xiaolin Wu’s algorithm
+    const bool steep = dy > dx;
+    if (steep) {
+      // we need to go along longest dimension
+      std::swap(x0,y0);
+      std::swap(x1,y1);
+    }
+    if (x0 > x1) {
+      // we need to go in increasing fashion
+      std::swap(x0,x1);
+      std::swap(y0,y1);
+    }
+    float gradient = x1-x0 == 0 ? 1.0f : float(y1-y0) / float(x1-x0);
+    float intersectY = y0;
+    for (int x = x0; x <= x1; x++) {
+      unsigned keep = float(0xFFFF) * (intersectY-int(intersectY)); // how much color to keep
+      unsigned seep = 0xFFFF - keep; // how much background to keep
+      int y = int(intersectY);
+      if (steep) std::swap(x,y);  // temporaryly 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));
+      intersectY += gradient;
+      if (steep) std::swap(x,y);  // restore if steep
+    }
+  } else {
+    // Bresenham's algorithm
+    int err = (dx>dy ? dx : -dy)/2;   // error direction
+    for (;;) {
+      setPixelColorXY(x0, y0, c);
+      if (x0==x1 && y0==y1) break;
+      int e2 = err;
+      if (e2 >-dx) { err -= dy; x0 += sx; }
+      if (e2 < dy) { err += dx; y0 += sy; }
+    }
   }
 }
 

From c07658a7cbcf8adffb39b5b2543e2f91e0fb40e3 Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Wed, 26 Jun 2024 23:41:38 +0200
Subject: [PATCH 038/200] post-merge

* fix drawLine prototype
* a few more "inline"
* typo
---
 wled00/FX.h         | 30 +++++++++++++++---------------
 wled00/FX_2Dfcn.cpp |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/wled00/FX.h b/wled00/FX.h
index b53f3fce..4772dbe7 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -618,11 +618,11 @@ typedef struct Segment {
     // 1D strip
     uint16_t virtualLength(void) const;
     void setPixelColor(int n, uint32_t c); // set relative pixel within segment with color
-    void setPixelColor(int n, byte r, byte g, byte b, byte w = 0) { setPixelColor(n, RGBW32(r,g,b,w)); } // automatically inline
-    void setPixelColor(int n, CRGB c)                             { setPixelColor(n, RGBW32(c.r,c.g,c.b,0)); } // automatically inline
+    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
     void setPixelColor(float i, uint32_t c, bool aa = true);
-    void setPixelColor(float i, uint8_t r, uint8_t g, uint8_t b, uint8_t w = 0, bool aa = true) { setPixelColor(i, RGBW32(r,g,b,w), aa); }
-    void setPixelColor(float i, CRGB c, bool aa = true)                                         { setPixelColor(i, RGBW32(c.r,c.g,c.b,0), aa); }
+    inline void setPixelColor(float i, uint8_t r, uint8_t g, uint8_t b, uint8_t w = 0, bool aa = true) { setPixelColor(i, RGBW32(r,g,b,w), aa); }
+    inline void setPixelColor(float i, CRGB c, bool aa = true)                                         { setPixelColor(i, RGBW32(c.r,c.g,c.b,0), aa); }
     uint32_t __attribute__((pure)) getPixelColor(int i);  // WLEDMM attribute added
     // 1D support functions (some implement 2D as well)
     void blur(uint8_t, bool smear = false);
@@ -630,10 +630,10 @@ typedef struct Segment {
     void fade_out(uint8_t r);
     void fadeToBlackBy(uint8_t fadeBy);
     void blendPixelColor(int n, uint32_t color, uint8_t blend);
-    void blendPixelColor(int n, CRGB c, uint8_t blend)            { blendPixelColor(n, RGBW32(c.r,c.g,c.b,0), blend); }
+    inline void blendPixelColor(int n, CRGB c, uint8_t blend)            { blendPixelColor(n, RGBW32(c.r,c.g,c.b,0), blend); }
     void addPixelColor(int n, uint32_t color, bool fast = false);
-    void addPixelColor(int n, byte r, byte g, byte b, byte w = 0, bool fast = false) { addPixelColor(n, RGBW32(r,g,b,w), fast); } // automatically inline
-    void addPixelColor(int n, CRGB c, bool fast = false)          { addPixelColor(n, RGBW32(c.r,c.g,c.b,0), fast); } // automatically inline
+    inline void addPixelColor(int n, byte r, byte g, byte b, byte w = 0, bool fast = false) { addPixelColor(n, RGBW32(r,g,b,w), fast); } // automatically inline
+    inline void addPixelColor(int n, CRGB c, bool fast = false)          { addPixelColor(n, RGBW32(c.r,c.g,c.b,0), fast); } // automatically inline
     void fadePixelColor(uint16_t n, uint8_t fade);
     uint8_t get_random_wheel_index(uint8_t pos);
 	  uint32_t __attribute__((pure)) color_from_palette(uint_fast16_t, bool mapping, bool wrap, uint8_t mcol, uint8_t pbri = 255);
@@ -678,10 +678,10 @@ typedef struct Segment {
     uint32_t __attribute__((pure)) getPixelColorXY(int x, int y);
     // 2D support functions
     void blendPixelColorXY(uint16_t x, uint16_t y, uint32_t color, uint8_t blend);
-    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); }
+    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); }
     void addPixelColorXY(int x, int y, uint32_t color, bool fast = false);
-    void addPixelColorXY(int x, int y, byte r, byte g, byte b, byte w = 0, bool fast = false) { addPixelColorXY(x, y, RGBW32(r,g,b,w), fast); } // automatically inline
-    void addPixelColorXY(int x, int y, CRGB c, bool fast = false)                             { addPixelColorXY(x, y, RGBW32(c.r,c.g,c.b,0), fast); }
+    inline void addPixelColorXY(int x, int y, byte r, byte g, byte b, byte w = 0, bool fast = false) { addPixelColorXY(x, y, RGBW32(r,g,b,w), fast); } // automatically inline
+    inline void addPixelColorXY(int x, int y, CRGB c, bool fast = false)                             { addPixelColorXY(x, y, RGBW32(c.r,c.g,c.b,0), fast); }
     void fadePixelColorXY(uint16_t x, uint16_t y, uint8_t fade);
     void box_blur(uint16_t i, bool vertical, fract8 blur_amount); // 1D box blur (with weight)
     void blurRow(uint32_t row, fract8 blur_amount, bool smear = false);
@@ -693,16 +693,16 @@ typedef struct Segment {
     inline void drawCircle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c, bool soft = false) { drawCircle(cx, cy, radius, RGBW32(c.r,c.g,c.b,0), soft); }
     void fillCircle(uint16_t cx, uint16_t cy, uint8_t radius, uint32_t c, bool soft = false);
     inline void fillCircle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c, bool soft = false) { fillCircle(cx, cy, radius, RGBW32(c.r,c.g,c.b,0), soft); }
-    void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c);
-    void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, CRGB c) { drawLine(x0, y0, x1, y1, RGBW32(c.r,c.g,c.b,0)); } // automatic inline
+    void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c, bool soft = false);
+    inline void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, CRGB c, bool soft = false) { drawLine(x0, y0, x1, y1, RGBW32(c.r,c.g,c.b,0), soft); } // automatic inline
     void drawArc(uint16_t x0, uint16_t y0, uint16_t radius, uint32_t color, uint32_t fillColor = 0);
-    void drawArc(uint16_t x0, uint16_t y0, uint16_t 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
+    inline void drawArc(uint16_t x0, uint16_t y0, uint16_t 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, 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
+    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
     void blur2d(fract8 blur_amount) { blur(blur_amount); }
-    void fill_solid(CRGB c) { fill(RGBW32(c.r,c.g,c.b,0)); }
+    inline void fill_solid(CRGB c) { fill(RGBW32(c.r,c.g,c.b,0)); }
     void nscale8(uint8_t scale);
     bool jsonToPixels(char *name, uint8_t fileNr); //WLEDMM for artifx
   #else
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 320636d6..061d8c19 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -632,7 +632,7 @@ void Segment::drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint3
       unsigned keep = float(0xFFFF) * (intersectY-int(intersectY)); // how much color to keep
       unsigned seep = 0xFFFF - keep; // how much background to keep
       int y = int(intersectY);
-      if (steep) std::swap(x,y);  // temporaryly swap if steep
+      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));

From f432cb20dc2c3d0a38d6f12d850baac91ce26e3a Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Mon, 1 Jul 2024 02:14:00 +0200
Subject: [PATCH 039/200] remove experiments:freqRMS option

the default value seems to work well.
---
 usermods/audioreactive/audio_reactive.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index 52f8e17f..a0414165 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -237,9 +237,9 @@ static uint8_t useInputFilter = 0;                        // enables low-cut fil
 //WLEDMM add experimental settings
 static uint8_t micLevelMethod = 0;                        // 0=old "floating" miclev, 1=new  "freeze" mode, 2=fast freeze mode (mode 2 may not work for you)
 #if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C3)
-static uint8_t averageByRMS = false;                      // false: use mean value, true: use RMS (root mean squared). use simpler method on slower MCUs.
+static constexpr uint8_t averageByRMS = false;                      // false: use mean value, true: use RMS (root mean squared). use simpler method on slower MCUs.
 #else
-static uint8_t averageByRMS = true;                       // false: use mean value, true: use RMS (root mean squared). use better method on fast MCUs.
+static constexpr uint8_t averageByRMS = true;                       // false: use mean value, true: use RMS (root mean squared). use better method on fast MCUs.
 #endif
 static uint8_t freqDist = 0;                              // 0=old 1=rightshift mode
 
@@ -436,7 +436,7 @@ static float fftAddAvgRMS(int from, int to) {
 
 static float fftAddAvg(int from, int to) {
   if (from == to) return vReal[from];              // small optimization
-  if (averageByRMS) return fftAddAvgRMS(from, to); // use SMS
+  if (averageByRMS) return fftAddAvgRMS(from, to); // use RMS
   else return fftAddAvgLin(from, to);              // use linear average
 }
 
@@ -2657,7 +2657,7 @@ class AudioReactive : public Usermod {
       JsonObject poweruser = top.createNestedObject("experiments");
       poweruser[F("micLev")] = micLevelMethod;
       poweruser[F("freqDist")] = freqDist;
-      poweruser[F("freqRMS")] = averageByRMS;
+      //poweruser[F("freqRMS")] = averageByRMS;
 
       JsonObject freqScale = top.createNestedObject("frequency");
       freqScale[F("scale")] = FFTScalingMode;
@@ -2729,7 +2729,7 @@ class AudioReactive : public Usermod {
       //WLEDMM: experimental settings
       configComplete &= getJsonValue(top["experiments"][F("micLev")], micLevelMethod);
       configComplete &= getJsonValue(top["experiments"][F("freqDist")], freqDist);
-      configComplete &= getJsonValue(top["experiments"][F("freqRMS")],  averageByRMS);
+      //configComplete &= getJsonValue(top["experiments"][F("freqRMS")],  averageByRMS);
 
       configComplete &= getJsonValue(top["frequency"][F("scale")], FFTScalingMode);
       configComplete &= getJsonValue(top["frequency"][F("profile")], pinkIndex);  //WLEDMM
@@ -2833,10 +2833,10 @@ class AudioReactive : public Usermod {
       oappend(SET_F("addOption(dd,'RightShift',1);"));
       oappend(SET_F("addInfo('AudioReactive:experiments:freqDist',1,'☾');"));
 
-      oappend(SET_F("dd=addDropdown('AudioReactive','experiments:freqRMS');"));
-      oappend(SET_F("addOption(dd,'Off  (⎌)',0);"));
-      oappend(SET_F("addOption(dd,'On',1);"));
-      oappend(SET_F("addInfo('AudioReactive:experiments:freqRMS',1,'☾');"));
+      //oappend(SET_F("dd=addDropdown('AudioReactive','experiments:freqRMS');"));
+      //oappend(SET_F("addOption(dd,'Off  (⎌)',0);"));
+      //oappend(SET_F("addOption(dd,'On',1);"));
+      //oappend(SET_F("addInfo('AudioReactive:experiments:freqRMS',1,'☾');"));
 
       oappend(SET_F("dd=addDropdown('AudioReactive','dynamics:limiter');"));
       oappend(SET_F("addOption(dd,'Off',0);"));

From 4f9f250a1d467e3d64002639c85f225e3a09cc70 Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Mon, 1 Jul 2024 02:29:14 +0200
Subject: [PATCH 040/200] only run FFT.dcRemoval() when no filtering was
 applied

FFT.dcRemoval() may introduce unwanted artifacts into the FFT result.
---
 usermods/audioreactive/audio_reactive.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index a0414165..2543cf34 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -562,12 +562,14 @@ void FFTcode(void * parameter)
 
     // band pass filter - can reduce noise floor by a factor of 50
     // downside: frequencies below 100Hz will be ignored
+   bool doDCRemoval = false; // DCRemove is only necessary if we don't use any kind of low-cut filtering
    if ((useInputFilter > 0) && (useInputFilter < 99)) {
       switch(useInputFilter) {
         case 1: runMicFilter(samplesFFT, vReal); break;                   // PDM microphone bandpass
         case 2: runDCBlocker(samplesFFT, vReal); break;                   // generic Low-Cut + DC blocker (~40hz cut-off)
+        default: doDCRemoval = true; break;
       }
-    }
+    } else doDCRemoval = true;
 
     // set imaginary parts to 0
     memset(vImag, 0, sizeof(vImag));
@@ -617,7 +619,7 @@ void FFTcode(void * parameter)
       if ((skipSecondFFT == false) || (isFirstRun == true)) {
         // run FFT (takes 2-3ms on ESP32, ~12ms on ESP32-S2, ~30ms on -C3)
         #ifdef UM_AUDIOREACTIVE_USE_NEW_FFT
-        FFT.dcRemoval();                                            // remove DC offset
+        if (doDCRemoval) FFT.dcRemoval();                                            // remove DC offset
         #if !defined(FFT_PREFER_EXACT_PEAKS)
           FFT.windowing( FFTWindow::Flat_top, FFTDirection::Forward);        // Weigh data using "Flat Top" function - better amplitude accuracy
         #else

From f3cbe75506bf4ac022f352d80e78879ade2fea07 Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Mon, 1 Jul 2024 02:39:44 +0200
Subject: [PATCH 041/200] remove support for old ArduinoFFT library < 1.9.2

there is no reason any more to still use the old arduinoFFT library version.
---
 usermods/audioreactive/audio_reactive.h | 27 -------------------------
 usermods/audioreactive/readme.md        | 12 ++---------
 2 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index 2543cf34..c466cee5 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -381,7 +381,6 @@ constexpr float binWidth = SAMPLE_RATE / (float)samplesFFT; // frequency range o
 
 
 // Create FFT object
-#ifdef UM_AUDIOREACTIVE_USE_NEW_FFT
 // lib_deps += https://github.com/kosme/arduinoFFT#develop @ 1.9.2
 #if  !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3)
 // these options actually cause slow-down on -S2 (-S2 doesn't have floating point hardware)
@@ -390,13 +389,8 @@ constexpr float binWidth = SAMPLE_RATE / (float)samplesFFT; // frequency range o
 #endif
 #define sqrt(x) sqrtf(x)             // little hack that reduces FFT time by 10-50% on ESP32 (as alternative to FFT_SQRT_APPROXIMATION)
 #define sqrt_internal sqrtf          // see https://github.com/kosme/arduinoFFT/pull/83
-#else
-  // around 50% slower on -S2
-// lib_deps += https://github.com/blazoncek/arduinoFFT.git
-#endif
 #include <arduinoFFT.h>
 
-#ifdef UM_AUDIOREACTIVE_USE_NEW_FFT
 #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);
@@ -405,9 +399,6 @@ constexpr float binWidth = SAMPLE_RATE / (float)samplesFFT; // frequency range o
   static float windowWeighingFactors[samplesFFT] = {0.0f}; // cache for FFT windowing factors
   static ArduinoFFT<float> FFT = ArduinoFFT<float>( vReal, vImag, samplesFFT, SAMPLE_RATE, windowWeighingFactors);
 #endif
-#else
-static arduinoFFT FFT = arduinoFFT(vReal, vImag, samplesFFT, SAMPLE_RATE);
-#endif
 
 // Helper functions
 
@@ -618,7 +609,6 @@ void FFTcode(void * parameter)
     if (fabsf(volumeSmth) > 0.25f) { // noise gate open
       if ((skipSecondFFT == false) || (isFirstRun == true)) {
         // run FFT (takes 2-3ms on ESP32, ~12ms on ESP32-S2, ~30ms on -C3)
-        #ifdef UM_AUDIOREACTIVE_USE_NEW_FFT
         if (doDCRemoval) FFT.dcRemoval();                                            // remove DC offset
         #if !defined(FFT_PREFER_EXACT_PEAKS)
           FFT.windowing( FFTWindow::Flat_top, FFTDirection::Forward);        // Weigh data using "Flat Top" function - better amplitude accuracy
@@ -628,19 +618,6 @@ void FFTcode(void * parameter)
         FFT.compute( FFTDirection::Forward );                       // Compute FFT
         FFT.complexToMagnitude();                                   // Compute magnitudes
         vReal[0] = 0;   // The remaining DC offset on the signal produces a strong spike on position 0 that should be eliminated to avoid issues.
-        #else
-        FFT.DCRemoval(); // let FFT lib remove DC component, so we don't need to care about this in getSamples()
-
-        //FFT.Windowing( FFT_WIN_TYP_HAMMING, FFT_FORWARD );        // Weigh data - standard Hamming window
-        //FFT.Windowing( FFT_WIN_TYP_BLACKMAN, FFT_FORWARD );       // Blackman window - better side freq rejection
-        #if !defined(FFT_PREFER_EXACT_PEAKS)
-          FFT.Windowing( FFT_WIN_TYP_FLT_TOP, FFT_FORWARD );        // Flat Top Window - better amplitude accuracy
-        #else
-          FFT.Windowing( FFT_WIN_TYP_BLACKMAN_HARRIS, FFT_FORWARD );// Blackman-Harris - excellent sideband rejection
-        #endif
-        FFT.Compute( FFT_FORWARD );                             // Compute FFT
-        FFT.ComplexToMagnitude();                               // Compute magnitudes
-        #endif
 
         float last_majorpeak = FFT_MajorPeak;
         float last_magnitude = FFT_Magnitude;
@@ -651,16 +628,12 @@ void FFTcode(void * parameter)
           vReal[binInd] *= pinkFactors[binInd];
         #endif
 
-        #ifdef UM_AUDIOREACTIVE_USE_NEW_FFT
         #if defined(FFT_LIB_REV) && FFT_LIB_REV > 0x19
           // arduinoFFT 2.x has a slightly different API
           FFT.majorPeak(&FFT_MajorPeak, &FFT_Magnitude);
         #else
           FFT.majorPeak(FFT_MajorPeak, FFT_Magnitude);                // let the effects know which freq was most dominant
         #endif
-        #else
-          FFT.MajorPeak(&FFT_MajorPeak, &FFT_Magnitude);
-        #endif
 
         if (FFT_MajorPeak < (SAMPLE_RATE /  samplesFFT)) {FFT_MajorPeak = 1.0f; FFT_Magnitude = 0;}                  // too low - use zero
         if (FFT_MajorPeak > (0.42f * SAMPLE_RATE)) {FFT_MajorPeak = last_majorpeak; FFT_Magnitude = last_magnitude;} // too high - keep last peak
diff --git a/usermods/audioreactive/readme.md b/usermods/audioreactive/readme.md
index 47804b61..a80fa681 100644
--- a/usermods/audioreactive/readme.md
+++ b/usermods/audioreactive/readme.md
@@ -27,17 +27,9 @@ Currently ESP8266 is not supported, due to low speed and small RAM of this chip.
 There are however plans to create a lightweight audioreactive for the 8266, with reduced features.
 ## Installation 
 
-### using customised _arduinoFFT_ library for use with this usermod
-Add `-D USERMOD_AUDIOREACTIVE` to your PlatformIO environment `build_flags`, as well as `https://github.com/blazoncek/arduinoFFT.git` to your `lib_deps`.
-If you are not using PlatformIO (which you should) try adding `#define USERMOD_AUDIOREACTIVE` to *my_config.h* and make sure you have _arduinoFFT_ library downloaded and installed.
+### using latest _arduinoFFT_ library
 
-Customised _arduinoFFT_ library for use with this usermod can be found at https://github.com/blazoncek/arduinoFFT.git
-
-### using latest (develop) _arduinoFFT_ library
-Alternatively, you can use the latest arduinoFFT development version.
-ArduinoFFT `develop` library is slightly more accurate, and slightly faster than our customised library, however also needs additional 2kB RAM.
-
-* `build_flags` = `-D USERMOD_AUDIOREACTIVE` `-D UM_AUDIOREACTIVE_USE_NEW_FFT`
+* `build_flags` = `-D USERMOD_AUDIOREACTIVE`
 * `lib_deps`= `https://github.com/kosme/arduinoFFT#develop @ 1.9.2`
 
 ## Configuration

From 9803cecee2b8c3c1559f586f3cc6fcfa2a45a1ab Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Mon, 1 Jul 2024 02:46:14 +0200
Subject: [PATCH 042/200] new idea to reduce stack buffer usage

the JS string can be shortened, by putting the usermod into a variable `ux` that is used instead of repeating the string 'Aduioreactive'.

For now its just an experiment, to see if the idea works on several browsers.
---
 usermods/audioreactive/audio_reactive.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index c466cee5..1a73fd49 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -2723,7 +2723,8 @@ class AudioReactive : public Usermod {
 
     void appendConfigData()
     {
-      oappend(SET_F("addInfo('AudioReactive:help',0,'<button onclick=\"location.href=&quot;https://mm.kno.wled.ge/soundreactive/Sound-Settings&quot;\" type=\"button\">?</button>');"));
+      oappend(SET_F("ux='AudioReactive';")); // fingers crossed that "ux" isn't already used as JS var, html post parameter or css style
+      oappend(SET_F("addInfo(ux+':help',0,'<button onclick=\"location.href=&quot;https://mm.kno.wled.ge/soundreactive/Sound-Settings&quot;\" type=\"button\">?</button>');"));
 #ifdef ARDUINO_ARCH_ESP32      
       //WLEDMM: add defaults
       #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)  // -S3/-S2/-C3 don't support analog audio

From 2987f0d0459cd7961333fdc2ef57007b08bc0d52 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 1 Jul 2024 15:46:51 +0200
Subject: [PATCH 043/200] SR_STATS: filter time

adding "Filtering Time" to SR statistics (info page)
---
 usermods/audioreactive/audio_reactive.h | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index 1a73fd49..fdacaefc 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -330,6 +330,7 @@ static float FFT_MajPeakSmth = 1.0f;            // FFT: (peak) frequency, smooth
 static float fftTaskCycle = 0;      // avg cycle time for FFT task
 static float fftTime = 0;           // avg time for single FFT
 static float sampleTime = 0;        // avg (blocked) time for reading I2S samples
+static float filterTime = 0;        // avg time for filtering I2S samples
 #endif
 
 // FFT Task variables (filtering and post-processing)
@@ -525,7 +526,7 @@ void FFTcode(void * parameter)
       uint64_t sampleTimeInMillis = (esp_timer_get_time() - start +5ULL) / 10ULL; // "+5" to ensure proper rounding
       sampleTime = (sampleTimeInMillis*3 + sampleTime*7)/10.0; // smooth
     }
-    start = esp_timer_get_time(); // start measuring FFT time
+    start = esp_timer_get_time(); // start measuring filter time
 #endif
 
     xLastWakeTime = xTaskGetTickCount();       // update "last unblocked time" for vTaskDelay
@@ -562,6 +563,15 @@ void FFTcode(void * parameter)
       }
     } else doDCRemoval = true;
 
+#if defined(WLED_DEBUG) || defined(SR_DEBUG)|| defined(SR_STATS)
+    // timing measurement
+    if (start < esp_timer_get_time()) { // filter out overflows
+      uint64_t filterTimeInMillis = (esp_timer_get_time() - start +5ULL) / 10ULL; // "+5" to ensure proper rounding
+      filterTime = (filterTimeInMillis*3 + filterTime*7)/10.0; // smooth
+    }
+    start = esp_timer_get_time(); // start measuring FFT time
+#endif
+
     // set imaginary parts to 0
     memset(vImag, 0, sizeof(vImag));
 
@@ -2246,7 +2256,7 @@ class AudioReactive : public Usermod {
     void onUpdateBegin(bool init)
     {
 #ifdef WLED_DEBUG
-      fftTime = sampleTime = 0;
+      fftTime = sampleTime filterTime = 0;
 #endif
       // gracefully suspend FFT task (if running)
       disableSoundProcessing = true;
@@ -2507,17 +2517,22 @@ class AudioReactive : public Usermod {
         infoArr.add(roundf(sampleTime)/100.0f);
         infoArr.add(" ms");
 
+        infoArr = user.createNestedArray(F("Filtering time"));
+        infoArr.add(roundf(filterTime)/100.0f);
+        infoArr.add(" ms");
+
         infoArr = user.createNestedArray(F("FFT time"));
         infoArr.add(roundf(fftTime)/100.0f);
         if ((fftTime/100) >= FFT_MIN_CYCLE) // FFT time over budget -> I2S buffer will overflow 
           infoArr.add("<b style=\"color:red;\">! ms</b>");
-        else if ((fftTime/80 + sampleTime/80) >= FFT_MIN_CYCLE) // FFT time >75% of budget -> risk of instability
+        else if ((fftTime/85 + filterTime/85 + sampleTime/85) >= FFT_MIN_CYCLE) // FFT time >75% of budget -> risk of instability
           infoArr.add("<b style=\"color:orange;\"> ms!</b>");
         else
           infoArr.add(" ms");
 
         DEBUGSR_PRINTF("AR I2S cycle time: %5.2f ms\n", roundf(fftTaskCycle)/100.0f);
         DEBUGSR_PRINTF("AR Sampling time : %5.2f ms\n", roundf(sampleTime)/100.0f);
+        DEBUGSR_PRINTF("AR filter time   : %5.2f ms\n", roundf(filterTime)/100.0f);
         DEBUGSR_PRINTF("AR FFT time      : %5.2f ms\n", roundf(fftTime)/100.0f);
         #endif
         #endif

From 61afb26d21972488b68c5110853ca8d819dbe993 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 1 Jul 2024 15:53:20 +0200
Subject: [PATCH 044/200] Update audio_reactive.h - fix compile error

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

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index fdacaefc..d9247f37 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -2256,7 +2256,7 @@ class AudioReactive : public Usermod {
     void onUpdateBegin(bool init)
     {
 #ifdef WLED_DEBUG
-      fftTime = sampleTime filterTime = 0;
+      fftTime = sampleTime = filterTime = 0;
 #endif
       // gracefully suspend FFT task (if running)
       disableSoundProcessing = true;

From e98858c751a9e29d59f6a1f46bd94acb2f76749b Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 1 Jul 2024 16:29:09 +0200
Subject: [PATCH 045/200] audio FASTPATH, part 2

* introducing sliding window FFT, which effectively doubles the rate of samples - and FFT results - produced per second. As a side-effect, it also makes FFT a bit less noisy.

As sliding window FFT requires double the number of FFT runs, the feature is only enabled on esp32 and esp32-S3.
---
 usermods/audioreactive/audio_reactive.h | 107 ++++++++++++++++++++++--
 1 file changed, 98 insertions(+), 9 deletions(-)

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index d9247f37..99e80f04 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -41,6 +41,12 @@
  * ....
  */
 
+
+#if defined(WLEDMM_FASTPATH) && defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32)
+#define FFT_USE_SLIDING_WINDOW             // perform FFT with sliding window =  50% overlap
+#endif
+
+
 #define FFT_PREFER_EXACT_PEAKS  // use different FFT windowing -> results in "sharper" peaks and less "leaking" into other frequencies
 //#define SR_STATS
 
@@ -172,8 +178,13 @@ static bool limiterOn = false;                 // bool: enable / disable dynamic
 #else
 static bool limiterOn = true;
 #endif
+#ifdef FFT_USE_SLIDING_WINDOW
+static uint16_t attackTime = 14;              // int: attack time in milliseconds. Default 0.014sec
+static uint16_t decayTime = 250;              // int: decay time in milliseconds.  New default 250ms.
+#else
 static uint16_t attackTime = 50;              // int: attack time in milliseconds. Default 0.08sec
 static uint16_t decayTime = 300;              // int: decay time in milliseconds.  New default 300ms. Old default was 1.40sec
+#endif
 
 // peak detection
 #ifdef ARDUINO_ARCH_ESP32
@@ -242,7 +253,9 @@ static constexpr uint8_t averageByRMS = false;                      // false: us
 static constexpr uint8_t averageByRMS = true;                       // false: use mean value, true: use RMS (root mean squared). use better method on fast MCUs.
 #endif
 static uint8_t freqDist = 0;                              // 0=old 1=rightshift mode
-
+#ifdef FFT_USE_SLIDING_WINDOW
+static uint8_t doSlidingFFT = 1;                            // 1 = use sliding window FFT (faster & more accurate)
+#endif
 
 // variables used in effects
 //static int16_t  volumeRaw = 0;       // either sampleRaw or rawSampleAgc depending on soundAgc
@@ -345,7 +358,11 @@ constexpr SRate_t SAMPLE_RATE = 22050;        // Base sample rate in Hz - 22Khz
 #ifndef WLEDMM_FASTPATH
 #define FFT_MIN_CYCLE 21                      // minimum time before FFT task is repeated. Use with 22Khz sampling
 #else
-#define FFT_MIN_CYCLE 15                      // reduce min time, to allow faster catch-up when I2S is lagging 
+  #ifdef FFT_USE_SLIDING_WINDOW
+    #define FFT_MIN_CYCLE 8                      // we only have 12ms to take 1/2 batch of samples
+  #else
+    #define FFT_MIN_CYCLE 15                      // reduce min time, to allow faster catch-up when I2S is lagging 
+  #endif
 #endif
 //#define FFT_MIN_CYCLE 30                      // Use with 16Khz sampling
 //#define FFT_MIN_CYCLE 23                      // minimum time before FFT task is repeated. Use with 20Khz sampling
@@ -363,7 +380,7 @@ constexpr SRate_t SAMPLE_RATE = 18000;          // 18Khz; Physical sample time -
 
 // FFT Constants
 constexpr uint16_t samplesFFT = 512;            // Samples in an FFT batch - This value MUST ALWAYS be a power of 2
-constexpr uint16_t samplesFFT_2 = 256;          // meaningfull part of FFT results - only the "lower half" contains useful information.
+constexpr uint16_t samplesFFT_2 = 256;          // meaningful part of FFT results - only the "lower half" contains useful information.
 // the following are observed values, supported by a bit of "educated guessing"
 //#define FFT_DOWNSCALE 0.65f                             // 20kHz - downscaling factor for FFT results - "Flat-Top" window @20Khz, old freq channels 
 //#define FFT_DOWNSCALE 0.46f                             // downscaling factor for FFT results - for "Flat-Top" window @22Khz, new freq channels
@@ -473,6 +490,12 @@ void FFTcode(void * parameter)
   const TickType_t xFrequencyDouble = FFT_MIN_CYCLE * portTICK_PERIOD_MS * 2;  
   static bool isFirstRun = false;
 
+#ifdef FFT_USE_SLIDING_WINDOW
+  static float oldSamples[samplesFFT_2] = {0.0f}; // previous 50% of samples
+  static bool haveOldSamples = false; // for sliding window FFT
+  bool usingOldSamples = false;
+#endif
+
   #ifdef FFT_MAJORPEAK_HUMAN_EAR
   // pre-compute pink noise scaling table
   for(uint_fast16_t binInd = 0; binInd < samplesFFT; binInd++) {
@@ -492,6 +515,9 @@ void FFTcode(void * parameter)
     // Don't run FFT computing code if we're in Receive mode or in realtime mode
     if (disableSoundProcessing || (audioSyncEnabled == AUDIOSYNC_REC)) {
       isFirstRun = false;
+      #ifdef FFT_USE_SLIDING_WINDOW
+        haveOldSamples = false;
+      #endif
       vTaskDelayUntil( &xLastWakeTime, xFrequency);        // release CPU, and let I2S fill its buffers
       continue;
     }
@@ -511,7 +537,26 @@ void FFTcode(void * parameter)
 #endif
 
     // get a fresh batch of samples from I2S
+    memset(vReal, 0, sizeof(vReal)); // start clean
+#ifdef FFT_USE_SLIDING_WINDOW
+    uint16_t readOffset;
+    if (haveOldSamples && (doSlidingFFT > 0)) {
+      memcpy(vReal, oldSamples, sizeof(float) * samplesFFT_2);                     // copy first 50% from buffer
+      usingOldSamples = true;
+      readOffset = samplesFFT_2;
+    } else {
+      usingOldSamples = false;
+      readOffset = 0;
+    }
+    // read fresh samples, in chunks of 50%
+    do {
+      // this looks a bit cumbersome, but it onlyworks this way - any second instance of the getSamples() call delivers junk data.
+      if (audioSource) audioSource->getSamples(vReal+readOffset, samplesFFT_2);
+      readOffset += samplesFFT_2;
+    } while (readOffset < samplesFFT);
+#else
     if (audioSource) audioSource->getSamples(vReal, samplesFFT);
+#endif
 
 #if defined(WLED_DEBUG) || defined(SR_DEBUG)|| defined(SR_STATS)
     // debug info in case that stack usage changes
@@ -552,13 +597,23 @@ void FFTcode(void * parameter)
     if (strip.isServicing()) delay(2);
 #endif
 
+    // normal mode: filter everything
+    float *samplesStart = vReal;
+    uint16_t sampleCount = samplesFFT;
+    #ifdef FFT_USE_SLIDING_WINDOW
+    if (usingOldSamples) {
+      // sliding window mode: only latest 50% need filtering
+      samplesStart = vReal + samplesFFT_2;
+      sampleCount = samplesFFT_2;
+    }
+    #endif
     // band pass filter - can reduce noise floor by a factor of 50
     // downside: frequencies below 100Hz will be ignored
    bool doDCRemoval = false; // DCRemove is only necessary if we don't use any kind of low-cut filtering
    if ((useInputFilter > 0) && (useInputFilter < 99)) {
       switch(useInputFilter) {
-        case 1: runMicFilter(samplesFFT, vReal); break;                   // PDM microphone bandpass
-        case 2: runDCBlocker(samplesFFT, vReal); break;                   // generic Low-Cut + DC blocker (~40hz cut-off)
+        case 1: runMicFilter(sampleCount, samplesStart); break;                   // PDM microphone bandpass
+        case 2: runDCBlocker(sampleCount, samplesStart); break;                   // generic Low-Cut + DC blocker (~40hz cut-off)
         default: doDCRemoval = true; break;
       }
     } else doDCRemoval = true;
@@ -575,14 +630,24 @@ void FFTcode(void * parameter)
     // set imaginary parts to 0
     memset(vImag, 0, sizeof(vImag));
 
+    #ifdef FFT_USE_SLIDING_WINDOW
+    memcpy(oldSamples, vReal+samplesFFT_2, sizeof(float) * samplesFFT_2);  // copy last 50% to buffer (for sliding window FFT)
+    haveOldSamples = true;
+    #endif
+
     // find highest sample in the batch, and count zero crossings
     float maxSample = 0.0f;                         // max sample from FFT batch
     uint_fast16_t newZeroCrossingCount = 0;
     for (int i=0; i < samplesFFT; i++) {
 	    // pick our  our current mic sample - we take the max value from all samples that go into FFT
-	    if ((vReal[i] <= (INT16_MAX - 1024)) && (vReal[i] >= (INT16_MIN + 1024)))  //skip extreme values - normally these are artefacts
+	    if ((vReal[i] <= (INT16_MAX - 1024)) && (vReal[i] >= (INT16_MIN + 1024))) { //skip extreme values - normally these are artefacts
+      #ifdef FFT_USE_SLIDING_WINDOW
+        if (usingOldSamples) {
+          if ((i >= samplesFFT_2) && (fabsf(vReal[i]) > maxSample)) maxSample = fabsf(vReal[i]);  // only look at newest 50%
+        } else
+      #endif
         if (fabsf((float)vReal[i]) > maxSample) maxSample = fabsf((float)vReal[i]);
-
+      }
       // WLED-MM/TroyHacks: Calculate zero crossings
       //
       if (i < (samplesFFT-1)) {
@@ -812,6 +877,11 @@ void FFTcode(void * parameter)
     if ((audioSource == nullptr) || (audioSource->getType() != AudioSource::Type_I2SAdc))  // the "delay trick" does not help for analog ADC
     #endif
     {
+  #ifdef FFT_USE_SLIDING_WINDOW
+      if (!usingOldSamples) {
+        vTaskDelayUntil( &xLastWakeTime, xFrequencyDouble); // we need a double wait when no old data was used
+      } else
+  #endif
       if ((skipSecondFFT == false) || (fabsf(volumeSmth) < 0.25f)) {
         vTaskDelayUntil( &xLastWakeTime, xFrequency);        // release CPU, and let I2S fill its buffers
       } else if (isFirstRun == true) {
@@ -2523,9 +2593,15 @@ class AudioReactive : public Usermod {
 
         infoArr = user.createNestedArray(F("FFT time"));
         infoArr.add(roundf(fftTime)/100.0f);
-        if ((fftTime/100) >= FFT_MIN_CYCLE) // FFT time over budget -> I2S buffer will overflow 
+
+#ifdef FFT_USE_SLIDING_WINDOW
+        unsigned timeBudget = doSlidingFFT ? (FFT_MIN_CYCLE) : fftTaskCycle / 115;
+#else
+        unsigned timeBudget = (FFT_MIN_CYCLE);
+#endif
+        if ((fftTime/100) >= timeBudget) // FFT time over budget -> I2S buffer will overflow 
           infoArr.add("<b style=\"color:red;\">! ms</b>");
-        else if ((fftTime/85 + filterTime/85 + sampleTime/85) >= FFT_MIN_CYCLE) // FFT time >75% of budget -> risk of instability
+        else if ((fftTime/85 + filterTime/85 + sampleTime/85) >= timeBudget) // FFT time >75% of budget -> risk of instability
           infoArr.add("<b style=\"color:orange;\"> ms!</b>");
         else
           infoArr.add(" ms");
@@ -2649,6 +2725,9 @@ class AudioReactive : public Usermod {
       poweruser[F("freqDist")] = freqDist;
       //poweruser[F("freqRMS")] = averageByRMS;
 
+#ifdef FFT_USE_SLIDING_WINDOW
+      poweruser[F("I2S_FastPath")] = doSlidingFFT;
+#endif
       JsonObject freqScale = top.createNestedObject("frequency");
       freqScale[F("scale")] = FFTScalingMode;
       freqScale[F("profile")] = pinkIndex; //WLEDMM
@@ -2720,6 +2799,9 @@ class AudioReactive : public Usermod {
       configComplete &= getJsonValue(top["experiments"][F("micLev")], micLevelMethod);
       configComplete &= getJsonValue(top["experiments"][F("freqDist")], freqDist);
       //configComplete &= getJsonValue(top["experiments"][F("freqRMS")],  averageByRMS);
+#ifdef FFT_USE_SLIDING_WINDOW
+      configComplete &= getJsonValue(top["experiments"][F("I2S_FastPath")], doSlidingFFT);
+#endif
 
       configComplete &= getJsonValue(top["frequency"][F("scale")], FFTScalingMode);
       configComplete &= getJsonValue(top["frequency"][F("profile")], pinkIndex);  //WLEDMM
@@ -2829,6 +2911,13 @@ class AudioReactive : public Usermod {
       //oappend(SET_F("addOption(dd,'On',1);"));
       //oappend(SET_F("addInfo('AudioReactive:experiments:freqRMS',1,'☾');"));
 
+#ifdef FFT_USE_SLIDING_WINDOW
+      oappend(SET_F("dd=addDropdown(ux,'experiments:I2S_FastPath');"));
+      oappend(SET_F("addOption(dd,'Off',0);"));
+      oappend(SET_F("addOption(dd,'On  (⎌)',1);"));
+      oappend(SET_F("addInfo(ux+':experiments:I2S_FastPath',1,'☾');"));
+#endif
+
       oappend(SET_F("dd=addDropdown('AudioReactive','dynamics:limiter');"));
       oappend(SET_F("addOption(dd,'Off',0);"));
       oappend(SET_F("addOption(dd,'On',1);"));

From a317af42fc991348d47aafa173fd89f4d1e3ee33 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 1 Jul 2024 16:37:44 +0200
Subject: [PATCH 046/200] trying to make effects respond to changes quicker in
 fastpath mode

filter parameter tuning
---
 usermods/audioreactive/audio_reactive.h | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index 99e80f04..6f94415f 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -239,7 +239,11 @@ const double agcFollowFast[AGC_NUM_PRESETS]   = { 1/192.f, 1/128.f, 1/256.f}; //
 const double agcFollowSlow[AGC_NUM_PRESETS]   = {1/6144.f,1/4096.f,1/8192.f}; // slowly follow setpoint  - ~2-15 secs
 const double agcControlKp[AGC_NUM_PRESETS]    = {    0.6f,    1.5f,   0.65f}; // AGC - PI control, proportional gain parameter
 const double agcControlKi[AGC_NUM_PRESETS]    = {    1.7f,   1.85f,    1.2f}; // AGC - PI control, integral gain parameter
+#if defined(WLEDMM_FASTPATH)
+const float agcSampleSmooth[AGC_NUM_PRESETS]  = {  1/6.f,   1/5.f,  1/10.f}; // smoothing factor for sampleAgc (use rawSampleAgc if you want the non-smoothed value)
+#else
 const float agcSampleSmooth[AGC_NUM_PRESETS]  = {  1/12.f,   1/6.f,  1/16.f}; // smoothing factor for sampleAgc (use rawSampleAgc if you want the non-smoothed value)
+#endif
 // AGC presets end
 
 static AudioSource *audioSource = nullptr;
@@ -594,7 +598,9 @@ void FFTcode(void * parameter)
 
 #if defined(WLEDMM_FASTPATH) && !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && defined(ARDUINO_ARCH_ESP32)
     // experimental - be nice to LED update task (trying to avoid flickering) - dual core only
-    if (strip.isServicing()) delay(2);
+#if FFTTASK_PRIORITY > 1
+    if (strip.isServicing()) delay(1);
+#endif
 #endif
 
     // normal mode: filter everything
@@ -1364,7 +1370,11 @@ class AudioReactive : public Usermod {
 
       // update global vars ONCE - multAgc, sampleAGC, rawSampleAgc
       multAgc = multAgcTemp;
+#if defined(WLEDMM_FASTPATH)
+      rawSampleAgc = 0.65f * tmpAgc + 0.35f * (float)rawSampleAgc;
+#else
       rawSampleAgc = 0.8f * tmpAgc + 0.2f * (float)rawSampleAgc;
+#endif
       // update smoothed AGC sample
       if (fabsf(tmpAgc) < 1.0f) 
         sampleAgc =  0.5f * tmpAgc + 0.5f * sampleAgc;    // fast path to zero
@@ -1483,7 +1493,11 @@ class AudioReactive : public Usermod {
       }
       if (sampleMax < 0.5f) sampleMax = 0.0f;
 
+#if defined(WLEDMM_FASTPATH)
+      sampleAvg = ((sampleAvg * 7.0f) + sampleAdj) / 8.0f;   // make reactions a bit more "crisp" in fastpath mode 
+#else
       sampleAvg = ((sampleAvg * 15.0f) + sampleAdj) / 16.0f;   // Smooth it out over the last 16 samples.
+#endif
       sampleAvg = fabsf(sampleAvg);                            // make sure we have a positive value
     } // getSample()
 

From 31a12f5098f4fd80e7e7c2ed5c8db67e22017e89 Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Mon, 1 Jul 2024 21:10:45 +0200
Subject: [PATCH 047/200] AudioReactive -> ux

before: String buffer usage: 3530 of 4037 bytes
After:    String buffer usage: 3183 of 4037 bytes
---
 usermods/audioreactive/audio_reactive.h | 86 ++++++++++++-------------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index d9247f37..10748b57 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -2744,12 +2744,12 @@ class AudioReactive : public Usermod {
       //WLEDMM: add defaults
       #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)  // -S3/-S2/-C3 don't support analog audio
       #ifdef AUDIOPIN
-        oappend(SET_F("xOpt('AudioReactive:analogmic:pin',1,' ⎌',")); oappendi(AUDIOPIN); oappend(");"); 
+        oappend(SET_F("xOpt(ux+':analogmic:pin',1,' ⎌',")); oappendi(AUDIOPIN); oappend(");"); 
       #endif
-      oappend(SET_F("aOpt('AudioReactive:analogmic:pin',1);")); //only analog options
+      oappend(SET_F("aOpt(ux+':analogmic:pin',1);")); //only analog options
       #endif
 
-      oappend(SET_F("dd=addDropdown('AudioReactive','digitalmic:type');"));
+      oappend(SET_F("dd=addDropdown(ux,'digitalmic:type');"));
       #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);"));
@@ -2800,50 +2800,50 @@ class AudioReactive : public Usermod {
         oappend(SET_F("addOption(dd,'WM8978 ☾',7);"));
       #endif
       #ifdef SR_SQUELCH
-        oappend(SET_F("addInfo('AudioReactive:config:squelch',1,'<i>&#9100; ")); oappendi(SR_SQUELCH); oappend("</i>');");  // 0 is field type, 1 is actual field
+        oappend(SET_F("addInfo(ux+':config:squelch',1,'<i>&#9100; ")); oappendi(SR_SQUELCH); oappend("</i>');");  // 0 is field type, 1 is actual field
       #endif
       #ifdef SR_GAIN
-        oappend(SET_F("addInfo('AudioReactive:config:gain',1,'<i>&#9100; ")); oappendi(SR_GAIN); oappend("</i>');");  // 0 is field type, 1 is actual field
+        oappend(SET_F("addInfo(ux+':config:gain',1,'<i>&#9100; ")); oappendi(SR_GAIN); oappend("</i>');");  // 0 is field type, 1 is actual field
       #endif
 
-      oappend(SET_F("dd=addDropdown('AudioReactive','config:AGC');"));
+      oappend(SET_F("dd=addDropdown(ux,'config:AGC');"));
       oappend(SET_F("addOption(dd,'Off',0);"));
       oappend(SET_F("addOption(dd,'Normal',1);"));
       oappend(SET_F("addOption(dd,'Vivid',2);"));
       oappend(SET_F("addOption(dd,'Lazy',3);"));
 
       //WLEDMM: experimental settings
-      oappend(SET_F("dd=addDropdown('AudioReactive','experiments:micLev');"));
+      oappend(SET_F("dd=addDropdown(ux,'experiments:micLev');"));
       oappend(SET_F("addOption(dd,'Floating  (⎌)',0);"));
       oappend(SET_F("addOption(dd,'Freeze',1);"));
       oappend(SET_F("addOption(dd,'Fast Freeze',2);"));
-      oappend(SET_F("addInfo('AudioReactive:experiments:micLev',1,'☾');"));
+      oappend(SET_F("addInfo(ux+':experiments:micLev',1,'☾');"));
 
-      oappend(SET_F("dd=addDropdown('AudioReactive','experiments:freqDist');"));
+      oappend(SET_F("dd=addDropdown(ux,'experiments:freqDist');"));
       oappend(SET_F("addOption(dd,'Normal  (⎌)',0);"));
       oappend(SET_F("addOption(dd,'RightShift',1);"));
-      oappend(SET_F("addInfo('AudioReactive:experiments:freqDist',1,'☾');"));
+      oappend(SET_F("addInfo(ux+':experiments:freqDist',1,'☾');"));
 
-      //oappend(SET_F("dd=addDropdown('AudioReactive','experiments:freqRMS');"));
+      //oappend(SET_F("dd=addDropdown(ux,'experiments:freqRMS');"));
       //oappend(SET_F("addOption(dd,'Off  (⎌)',0);"));
       //oappend(SET_F("addOption(dd,'On',1);"));
-      //oappend(SET_F("addInfo('AudioReactive:experiments:freqRMS',1,'☾');"));
+      //oappend(SET_F("addInfo(ux+':experiments:freqRMS',1,'☾');"));
 
-      oappend(SET_F("dd=addDropdown('AudioReactive','dynamics:limiter');"));
+      oappend(SET_F("dd=addDropdown(ux,'dynamics:limiter');"));
       oappend(SET_F("addOption(dd,'Off',0);"));
       oappend(SET_F("addOption(dd,'On',1);"));
-      oappend(SET_F("addInfo('AudioReactive:dynamics:limiter',0,' On ');"));  // 0 is field type, 1 is actual field
-      oappend(SET_F("addInfo('AudioReactive:dynamics:rise',1,'ms <i>(&#x266A; effects only)</i>');"));
-      oappend(SET_F("addInfo('AudioReactive:dynamics:fall',1,'ms <i>(&#x266A; effects only)</i>');"));
+      oappend(SET_F("addInfo(ux+':dynamics:limiter',0,' On ');"));  // 0 is field type, 1 is actual field
+      oappend(SET_F("addInfo(ux+':dynamics:rise',1,'ms <i>(&#x266A; effects only)</i>');"));
+      oappend(SET_F("addInfo(ux+':dynamics:fall',1,'ms <i>(&#x266A; effects only)</i>');"));
 
-      oappend(SET_F("dd=addDropdown('AudioReactive','frequency:scale');"));
+      oappend(SET_F("dd=addDropdown(ux,'frequency:scale');"));
       oappend(SET_F("addOption(dd,'None',0);"));
       oappend(SET_F("addOption(dd,'Linear (Amplitude)',2);"));
       oappend(SET_F("addOption(dd,'Square Root (Energy)',3);"));
       oappend(SET_F("addOption(dd,'Logarithmic (Loudness)',1);"));
 
       //WLEDMM add defaults
-      oappend(SET_F("dd=addDropdown('AudioReactive','frequency:profile');"));
+      oappend(SET_F("dd=addDropdown(ux,'frequency:profile');"));
       #if SR_FREQ_PROF==0
         oappend(SET_F("addOption(dd,'Generic Microphone (⎌)',0);"));
       #else
@@ -2899,9 +2899,9 @@ class AudioReactive : public Usermod {
       #else
         oappend(SET_F("addOption(dd,'userdefined #2',9);"));
       #endif
-      oappend(SET_F("addInfo('AudioReactive:frequency:profile',1,'☾');"));
+      oappend(SET_F("addInfo(ux+':frequency:profile',1,'☾');"));
 #endif
-      oappend(SET_F("dd=addDropdown('AudioReactive','sync:mode');"));
+      oappend(SET_F("dd=addDropdown(ux,'sync:mode');"));
       oappend(SET_F("addOption(dd,'Off',0);"));               // AUDIOSYNC_NONE
 #ifdef ARDUINO_ARCH_ESP32
       oappend(SET_F("addOption(dd,'Send',1);"));              // AUDIOSYNC_SEND
@@ -2911,53 +2911,53 @@ class AudioReactive : public Usermod {
       oappend(SET_F("addOption(dd,'Receive or Local',6);"));  // AUDIOSYNC_REC_PLUS
 #endif
       // check_sequence: Receiver skips out-of-sequence packets when enabled
-      oappend(SET_F("dd=addDropdown('AudioReactive','sync:check_sequence');"));
+      oappend(SET_F("dd=addDropdown(ux,'sync:check_sequence');"));
       oappend(SET_F("addOption(dd,'Off',0);"));
       oappend(SET_F("addOption(dd,'On',1);"));
 
-      oappend(SET_F("addInfo('AudioReactive:sync:check_sequence',1,'<i>when receiving</i> ☾<br> Sync audio data with other WLEDs');"));  // must append this to the last field of 'sync'
+      oappend(SET_F("addInfo(ux+':sync:check_sequence',1,'<i>when receiving</i> ☾<br> Sync audio data with other WLEDs');"));  // must append this to the last field of 'sync'
 
-      oappend(SET_F("addInfo('AudioReactive:digitalmic:type',1,'<i>requires reboot!</i>');"));  // 0 is field type, 1 is actual field
+      oappend(SET_F("addInfo(ux+':digitalmic:type',1,'<i>requires reboot!</i>');"));  // 0 is field type, 1 is actual field
 #ifdef ARDUINO_ARCH_ESP32
-      oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',0,'<i>sd/data/dout</i>','I2S SD');"));
+      oappend(SET_F("addInfo(ux+':digitalmic:pin[]',0,'<i>sd/data/dout</i>','I2S SD');"));
       #ifdef I2S_SDPIN
-        oappend(SET_F("xOpt('AudioReactive:digitalmic:pin[]',0,' ⎌',")); oappendi(I2S_SDPIN); oappend(");"); 
+        oappend(SET_F("xOpt(ux+':digitalmic:pin[]',0,' ⎌',")); oappendi(I2S_SDPIN); oappend(");"); 
       #endif
 
-      oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',1,'<i>ws/clk/lrck</i>','I2S WS');"));
-      oappend(SET_F("dRO('AudioReactive:digitalmic:pin[]',1);")); // disable read only pins
+      oappend(SET_F("addInfo(ux+':digitalmic:pin[]',1,'<i>ws/clk/lrck</i>','I2S WS');"));
+      oappend(SET_F("dRO(ux+':digitalmic:pin[]',1);")); // disable read only pins
       #ifdef I2S_WSPIN
-        oappend(SET_F("xOpt('AudioReactive:digitalmic:pin[]',1,' ⎌',")); oappendi(I2S_WSPIN); oappend(");"); 
+        oappend(SET_F("xOpt(ux+':digitalmic:pin[]',1,' ⎌',")); oappendi(I2S_WSPIN); oappend(");"); 
       #endif
 
-      oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',2,'<i>sck/bclk</i>','I2S SCK');"));
-      oappend(SET_F("dRO('AudioReactive:digitalmic:pin[]',2);")); // disable read only pins
+      oappend(SET_F("addInfo(ux+':digitalmic:pin[]',2,'<i>sck/bclk</i>','I2S SCK');"));
+      oappend(SET_F("dRO(ux+':digitalmic:pin[]',2);")); // disable read only pins
       #ifdef I2S_CKPIN
-        oappend(SET_F("xOpt('AudioReactive:digitalmic:pin[]',2,' ⎌',")); oappendi(I2S_CKPIN); oappend(");"); 
+        oappend(SET_F("xOpt(ux+':digitalmic:pin[]',2,' ⎌',")); oappendi(I2S_CKPIN); oappend(");"); 
       #endif
 
-      oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',3,'<i>master clock</i>','I2S MCLK');"));
-      oappend(SET_F("dRO('AudioReactive:digitalmic:pin[]',3);")); // disable read only pins
+      oappend(SET_F("addInfo(ux+':digitalmic:pin[]',3,'<i>master clock</i>','I2S MCLK');"));
+      oappend(SET_F("dRO(ux+':digitalmic:pin[]',3);")); // disable read only pins
       #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)
-        oappend(SET_F("dOpt('AudioReactive:digitalmic:pin[]',3,2,2);")); //only use -1, 0, 1 or 3
-        oappend(SET_F("dOpt('AudioReactive:digitalmic:pin[]',3,4,39);")); //only use -1, 0, 1 or 3
+        oappend(SET_F("dOpt(ux+':digitalmic:pin[]',3,2,2);")); //only use -1, 0, 1 or 3
+        oappend(SET_F("dOpt(ux+':digitalmic:pin[]',3,4,39);")); //only use -1, 0, 1 or 3
       #endif
       #ifdef MCLK_PIN
-        oappend(SET_F("xOpt('AudioReactive:digitalmic:pin[]',3,' ⎌',")); oappendi(MCLK_PIN); oappend(");"); 
+        oappend(SET_F("xOpt(ux+':digitalmic:pin[]',3,' ⎌',")); oappendi(MCLK_PIN); oappend(");"); 
       #endif
 
-      oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',4,'','I2C SDA');"));
-      oappend(SET_F("rOpt('AudioReactive:digitalmic:pin[]',4,'use global (")); oappendi(i2c_sda); oappend(")',-1);"); 
+      oappend(SET_F("addInfo(ux+':digitalmic:pin[]',4,'','I2C SDA');"));
+      oappend(SET_F("rOpt(ux+':digitalmic:pin[]',4,'use global (")); oappendi(i2c_sda); oappend(")',-1);"); 
       #ifdef ES7243_SDAPIN
-        oappend(SET_F("xOpt('AudioReactive:digitalmic:pin[]',4,' ⎌',")); oappendi(ES7243_SDAPIN); oappend(");"); 
+        oappend(SET_F("xOpt(ux+':digitalmic:pin[]',4,' ⎌',")); oappendi(ES7243_SDAPIN); oappend(");"); 
       #endif
 
-      oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',5,'','I2C SCL');"));
-      oappend(SET_F("rOpt('AudioReactive:digitalmic:pin[]',5,'use global (")); oappendi(i2c_scl); oappend(")',-1);"); 
+      oappend(SET_F("addInfo(ux+':digitalmic:pin[]',5,'','I2C SCL');"));
+      oappend(SET_F("rOpt(ux+':digitalmic:pin[]',5,'use global (")); oappendi(i2c_scl); oappend(")',-1);"); 
       #ifdef ES7243_SCLPIN
-        oappend(SET_F("xOpt('AudioReactive:digitalmic:pin[]',5,' ⎌',")); oappendi(ES7243_SCLPIN); oappend(");"); 
+        oappend(SET_F("xOpt(ux+':digitalmic:pin[]',5,' ⎌',")); oappendi(ES7243_SCLPIN); oappend(");"); 
       #endif
-      oappend(SET_F("dRO('AudioReactive:digitalmic:pin[]',5);")); // disable read only pins
+      oappend(SET_F("dRO(ux+':digitalmic:pin[]',5);")); // disable read only pins
 #endif
     }
 

From 29013a3f839bf52f378bd50e0e3c3c8829648bf0 Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Mon, 1 Jul 2024 22:54:24 +0200
Subject: [PATCH 048/200] auto-replace long functions with short names

adI = addInfo
adD = addDropdown
adO = addOption
adF = addField

before: String buffer usage: 3183 of 4037 bytes
after:    String buffer usage: 2805 of 4037 bytes
---
 wled00/data/settings_um.htm | 12 ++++++++++++
 wled00/fcn_declare.h        |  1 +
 wled00/util.cpp             | 18 +++++++++++++++---
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/wled00/data/settings_um.htm b/wled00/data/settings_um.htm
index 759643e6..19a8590f 100644
--- a/wled00/data/settings_um.htm
+++ b/wled00/data/settings_um.htm
@@ -146,6 +146,9 @@
 			urows += `<br>`;
 		}
 	}
+	function adF(k,f,o,a=false) {  //shortcut for addField(key, field, (sub)object, isArray)
+		return addField(k,f,o,a);
+	}
 	// https://stackoverflow.com/questions/39729741/javascript-change-input-text-to-select-option
 	function addDropdown(um,fld) {
 		let sel = d.createElement('select');
@@ -170,6 +173,9 @@
 		}
 		return null;
 	}
+	function adD(um,fld) { // shortcut for addDropdown(um,fld)
+		return addDropdown(um,fld);
+	}
 	function addOption(sel,txt,val) {
 		if (sel===null) return; // select object missing
 		let opt = d.createElement("option");
@@ -181,6 +187,9 @@
 			if (c.value == sel.dataset.val) sel.selectedIndex = i;
 		}
 	}
+	function adO(sel,txt,val) { // shortcut for addOption(sel,txt,val)
+		return addOption(sel,txt,val);
+	}
 	//WLEDMM: replace Option to set globals
 	function rOpt(name,el,txt,val) {
 		let obj = d.getElementsByName(name);
@@ -285,6 +294,9 @@
 			if (txt2!="") obj[el].insertAdjacentHTML('beforebegin', txt2 + '&nbsp;');  //add pre texts
 		}
 	}
+	function adI(name,el,txt, txt2="") { // shortcut for addInfo(name,el,txt, txt2="")
+		return addInfo(name,el,txt, txt2);
+	}
 	// add Help Button
 	function addHB(um)
 	{
diff --git a/wled00/fcn_declare.h b/wled00/fcn_declare.h
index 38a18b09..aa0645d0 100644
--- a/wled00/fcn_declare.h
+++ b/wled00/fcn_declare.h
@@ -362,6 +362,7 @@ int getNumVal(const String* req, uint16_t pos);
 void parseNumber(const char* str, byte* val, byte minv=0, byte maxv=255);
 bool getVal(JsonVariant elem, byte* val, byte minv=0, byte maxv=255);
 bool updateVal(const char* req, const char* key, byte* val, byte minv=0, byte maxv=255);
+void oappendUseDeflate(bool OnOff); // enable / disable string squeezing
 bool oappend(const char* txt); // append new c string to temp buffer efficiently
 bool oappendi(int i);          // append new number to temp buffer efficiently
 void sappend(char stype, const char* key, int val);
diff --git a/wled00/util.cpp b/wled00/util.cpp
index 896b57e3..1bcf2ad0 100644
--- a/wled00/util.cpp
+++ b/wled00/util.cpp
@@ -144,22 +144,34 @@ bool oappendi(int i)
   return oappend(s);
 }
 
+static bool squeezeStrings = false;
+void oappendUseDeflate(bool OnOff) { squeezeStrings = OnOff; }
 
 bool oappend(const char* txt)
 {
-  uint16_t len = strlen(txt);
+  String str = squeezeStrings ? String(txt) : String("");
+  if (squeezeStrings) {
+    // simple fixed-dictionary deflate
+    str.replace(F("addField("),    F("adF("));
+    str.replace(F("addDropdown("), F("adD("));
+    str.replace(F("addOption("),   F("adO("));
+    str.replace(F("addInfo("),     F("adI("));
+  }
+  const char* finalTxt = squeezeStrings ? str.c_str() : txt;
+
+  size_t len = strlen(finalTxt);
   if ((obuf == nullptr) || (olen + len >= SETTINGS_STACK_BUF_SIZE)) { // sanity checks
 	  if (obuf == nullptr) { USER_PRINTLN(F("oappend() error: obuf == nullptr."));
 	  } else {
 	    USER_PRINT(F("oappend() error: buffer full. Increase SETTINGS_STACK_BUF_SIZE for "));
       USER_PRINTF("%2u bytes \t\"", len /*1 + olen + len - SETTINGS_STACK_BUF_SIZE*/);
-      USER_PRINT(txt);
+      USER_PRINT(finalTxt);
       USER_PRINTLN(F("\""));
       errorFlag = ERR_LOW_AJAX_MEM;
 	  }
     return false;        // buffer full
   }
-  strcpy(obuf + olen, txt);
+  strcpy(obuf + olen, finalTxt);
   olen += len;
   return true;
 }

From 8cfd0df71037d9a073a9a856edb4edd3ffdbffcb Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Mon, 1 Jul 2024 22:54:51 +0200
Subject: [PATCH 049/200] Update xml.cpp

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

diff --git a/wled00/xml.cpp b/wled00/xml.cpp
index 72fdf219..efc5840c 100644
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -792,6 +792,7 @@ void getSettingsJS(AsyncWebServerRequest* request, byte subPage, char* dest) //W
   if (subPage == 8) //usermods
   {
     appendGPIOinfo();
+    oappendUseDeflate(true); // allow replacing long functions with shorter equivalents - only works for usermods
     if (!request->hasParam("um") ) {
       // oappend(SET_F("numM="));
       // oappendi(usermods.getModCount());
@@ -834,6 +835,7 @@ void getSettingsJS(AsyncWebServerRequest* request, byte subPage, char* dest) //W
       Usermod *usermod = usermods.lookupName(request->getParam("um")->value().c_str());
       if (usermod) usermod->appendConfigData();
     }
+    oappendUseDeflate(false);
 
     // oappend(SET_F("console.log('getSettingsJS fix ro pins', d.max_gpio, d.ro_gpio);")); 
     oappend(SET_F("pinPost();")); 

From 27dd6bddac5d951637788aba52ac476f9806681c Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Mon, 1 Jul 2024 22:56:18 +0200
Subject: [PATCH 050/200] AudioReactive:digitalmic:pin[] --> uxp

before: String buffer usage: 2805 of 4037 bytes
after:    String buffer usage: 2566 of 4037 bytes
---
 usermods/audioreactive/audio_reactive.h | 43 +++++++++++++------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index 10748b57..10e95153 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -2738,7 +2738,8 @@ class AudioReactive : public Usermod {
 
     void appendConfigData()
     {
-      oappend(SET_F("ux='AudioReactive';")); // fingers crossed that "ux" isn't already used as JS var, html post parameter or css style
+      oappend(SET_F("ux='AudioReactive';"));        // ux = shortcut for Audioreactive - fingers crossed that "ux" isn't already used as JS var, html post parameter or css style
+      oappend(SET_F("uxp=ux+':digitalmic:pin[]';")); // uxp = shortcut for AudioReactive:digitalmic:pin[]
       oappend(SET_F("addInfo(ux+':help',0,'<button onclick=\"location.href=&quot;https://mm.kno.wled.ge/soundreactive/Sound-Settings&quot;\" type=\"button\">?</button>');"));
 #ifdef ARDUINO_ARCH_ESP32      
       //WLEDMM: add defaults
@@ -2919,45 +2920,45 @@ class AudioReactive : public Usermod {
 
       oappend(SET_F("addInfo(ux+':digitalmic:type',1,'<i>requires reboot!</i>');"));  // 0 is field type, 1 is actual field
 #ifdef ARDUINO_ARCH_ESP32
-      oappend(SET_F("addInfo(ux+':digitalmic:pin[]',0,'<i>sd/data/dout</i>','I2S SD');"));
+      oappend(SET_F("addInfo(uxp,0,'<i>sd/data/dout</i>','I2S SD');"));
       #ifdef I2S_SDPIN
-        oappend(SET_F("xOpt(ux+':digitalmic:pin[]',0,' ⎌',")); oappendi(I2S_SDPIN); oappend(");"); 
+        oappend(SET_F("xOpt(uxp,0,' ⎌',")); oappendi(I2S_SDPIN); oappend(");"); 
       #endif
 
-      oappend(SET_F("addInfo(ux+':digitalmic:pin[]',1,'<i>ws/clk/lrck</i>','I2S WS');"));
-      oappend(SET_F("dRO(ux+':digitalmic:pin[]',1);")); // disable read only pins
+      oappend(SET_F("addInfo(uxp,1,'<i>ws/clk/lrck</i>','I2S WS');"));
+      oappend(SET_F("dRO(uxp,1);")); // disable read only pins
       #ifdef I2S_WSPIN
-        oappend(SET_F("xOpt(ux+':digitalmic:pin[]',1,' ⎌',")); oappendi(I2S_WSPIN); oappend(");"); 
+        oappend(SET_F("xOpt(uxp,1,' ⎌',")); oappendi(I2S_WSPIN); oappend(");"); 
       #endif
 
-      oappend(SET_F("addInfo(ux+':digitalmic:pin[]',2,'<i>sck/bclk</i>','I2S SCK');"));
-      oappend(SET_F("dRO(ux+':digitalmic:pin[]',2);")); // disable read only pins
+      oappend(SET_F("addInfo(uxp,2,'<i>sck/bclk</i>','I2S SCK');"));
+      oappend(SET_F("dRO(uxp,2);")); // disable read only pins
       #ifdef I2S_CKPIN
-        oappend(SET_F("xOpt(ux+':digitalmic:pin[]',2,' ⎌',")); oappendi(I2S_CKPIN); oappend(");"); 
+        oappend(SET_F("xOpt(uxp,2,' ⎌',")); oappendi(I2S_CKPIN); oappend(");"); 
       #endif
 
-      oappend(SET_F("addInfo(ux+':digitalmic:pin[]',3,'<i>master clock</i>','I2S MCLK');"));
-      oappend(SET_F("dRO(ux+':digitalmic:pin[]',3);")); // disable read only pins
+      oappend(SET_F("addInfo(uxp,3,'<i>master clock</i>','I2S MCLK');"));
+      oappend(SET_F("dRO(uxp,3);")); // disable read only pins
       #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)
-        oappend(SET_F("dOpt(ux+':digitalmic:pin[]',3,2,2);")); //only use -1, 0, 1 or 3
-        oappend(SET_F("dOpt(ux+':digitalmic:pin[]',3,4,39);")); //only use -1, 0, 1 or 3
+        oappend(SET_F("dOpt(uxp,3,2,2);")); //only use -1, 0, 1 or 3
+        oappend(SET_F("dOpt(uxp,3,4,39);")); //only use -1, 0, 1 or 3
       #endif
       #ifdef MCLK_PIN
-        oappend(SET_F("xOpt(ux+':digitalmic:pin[]',3,' ⎌',")); oappendi(MCLK_PIN); oappend(");"); 
+        oappend(SET_F("xOpt(uxp,3,' ⎌',")); oappendi(MCLK_PIN); oappend(");"); 
       #endif
 
-      oappend(SET_F("addInfo(ux+':digitalmic:pin[]',4,'','I2C SDA');"));
-      oappend(SET_F("rOpt(ux+':digitalmic:pin[]',4,'use global (")); oappendi(i2c_sda); oappend(")',-1);"); 
+      oappend(SET_F("addInfo(uxp,4,'','I2C SDA');"));
+      oappend(SET_F("rOpt(uxp,4,'use global (")); oappendi(i2c_sda); oappend(")',-1);"); 
       #ifdef ES7243_SDAPIN
-        oappend(SET_F("xOpt(ux+':digitalmic:pin[]',4,' ⎌',")); oappendi(ES7243_SDAPIN); oappend(");"); 
+        oappend(SET_F("xOpt(uxp,4,' ⎌',")); oappendi(ES7243_SDAPIN); oappend(");"); 
       #endif
 
-      oappend(SET_F("addInfo(ux+':digitalmic:pin[]',5,'','I2C SCL');"));
-      oappend(SET_F("rOpt(ux+':digitalmic:pin[]',5,'use global (")); oappendi(i2c_scl); oappend(")',-1);"); 
+      oappend(SET_F("addInfo(uxp,5,'','I2C SCL');"));
+      oappend(SET_F("rOpt(uxp,5,'use global (")); oappendi(i2c_scl); oappend(")',-1);"); 
       #ifdef ES7243_SCLPIN
-        oappend(SET_F("xOpt(ux+':digitalmic:pin[]',5,' ⎌',")); oappendi(ES7243_SCLPIN); oappend(");"); 
+        oappend(SET_F("xOpt(uxp,5,' ⎌',")); oappendi(ES7243_SCLPIN); oappend(");"); 
       #endif
-      oappend(SET_F("dRO(ux+':digitalmic:pin[]',5);")); // disable read only pins
+      oappend(SET_F("dRO(uxp,5);")); // disable read only pins
 #endif
     }
 

From 28cb5c88b6efffb6f618b069cd1561ff2385ea73 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Wed, 3 Jul 2024 16:20:44 -0400
Subject: [PATCH 051/200] Skeleton, not working yet.

---
 usermods/audioreactive/audio_reactive.h |  22 +++
 usermods/audioreactive/audio_source.h   | 174 ++++++++++++++++++++++++
 2 files changed, 196 insertions(+)

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index b958184c..ff1c9ed5 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -1923,6 +1923,23 @@ class AudioReactive : public Usermod {
           if (i2c_sda >= 0) sdaPin = -1;                        // -1 = use global
           if (i2c_scl >= 0) sclPin = -1;
 
+          if (audioSource) audioSource->initialize(i2swsPin, i2ssdPin, i2sckPin, mclkPin);
+          break;
+        case 8:
+        #ifdef use_ac101_mic
+          DEBUGSR_PRINTLN(F("AR: AC101 Source (Mic)"));
+        #else
+          DEBUGSR_PRINTLN(F("AR: AC101 Source (Line-In)"));
+        #endif
+          audioSource = new AC101Source(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;
 
@@ -2802,6 +2819,11 @@ class AudioReactive : public Usermod {
       #else
         oappend(SET_F("addOption(dd,'WM8978 ☾',7);"));
       #endif
+      #if SR_DMTYPE==8
+        oappend(SET_F("addOption(dd,'AC101 ☾ (⎌)',8);"));
+      #else
+        oappend(SET_F("addOption(dd,'AC101 ☾',8);"));
+      #endif
       #ifdef SR_SQUELCH
         oappend(SET_F("addInfo('AudioReactive: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 cf3e3b74..c83af476 100644
--- a/usermods/audioreactive/audio_source.h
+++ b/usermods/audioreactive/audio_source.h
@@ -736,6 +736,180 @@ class WM8978Source : public I2SSource {
 
 };
 
+class AC101Source : public I2SSource {
+  private:
+    // I2C initialization functions for WM8978
+    void _ac101I2cBegin() {
+      Wire.setClock(400000);
+    }
+
+    void _ac101I2cWrite(uint8_t reg_addr, uint16_t val) {
+      #ifndef AC101_ADDR
+        #define AC101_ADDR 0x1A
+      #endif
+      char send_buff[3];
+      send_buff[0] = reg_addr;
+      send_buff[1] = (val >> 8) & 0xff;
+      send_buff[2] = val & 0xff;
+      Wire.beginTransmission(AC101_ADDR);
+      Wire.write((const uint8_t*)send_buff, 3);
+      uint8_t i2cErr = Wire.endTransmission();  // i2cErr == 0 means OK
+      if (i2cErr != 0) {
+        DEBUGSR_PRINTF("AR: AC101 I2C write failed with error=%d  (addr=0x%X, reg 0x%X, val 0x%X).\n", i2cErr, AC101_ADDR, reg_addr, val);
+      }
+    }
+
+    void _ac101InitAdc() {
+      // https://files.seeedstudio.com/wiki/ReSpeaker_6-Mics_Circular_Array_kit_for_Raspberry_Pi/reg/AC101_User_Manual_v1.1.pdf
+      //
+      _ac101I2cBegin(); 
+
+      #define CHIP_AUDIO_RS	  	0x00
+      #define PLL_CTRL1			    0x01
+      #define PLL_CTRL2			    0x02
+      #define SYSCLK_CTRL		  	0x03
+      #define MOD_CLK_ENA		  	0x04
+      #define MOD_RST_CTRL	  	0x05
+      #define I2S_SR_CTRL		  	0x06
+      #define I2S1LCK_CTRL		  0x10
+      #define I2S1_SDOUT_CTRL	  0x11
+      #define I2S1_SDIN_CTRL	  0x12
+      #define I2S1_MXR_SRC	  	0x13
+      #define I2S1_VOL_CTRL1  	0x14
+      #define I2S1_VOL_CTRL2  	0x15
+      #define I2S1_VOL_CTRL3  	0x16
+      #define I2S1_VOL_CTRL4  	0x17
+      #define I2S1_MXR_GAIN	  	0x18
+      #define ADC_DIG_CTRL	  	0x40
+      #define ADC_VOL_CTRL	  	0x41
+      #define HMIC_CTRL1		  	0x44
+      #define HMIC_CTRL2		  	0x45
+      #define HMIC_STATUS	  		0x46
+      #define DAC_DIG_CTRL	  	0x48
+      #define DAC_VOL_CTRL	  	0x49
+      #define DAC_MXR_SRC		  	0x4c
+      #define DAC_MXR_GAIN	  	0x4d
+      #define ADC_APC_CTRL		  0x50
+      #define ADC_SRC				    0x51
+      #define ADC_SRCBST_CTRL	  0x52
+      #define OMIXER_DACA_CTRL  0x53
+      #define OMIXER_SR			    0x54
+      #define OMIXER_BST1_CTRL	0x55
+      #define HPOUT_CTRL			  0x56
+      #define SPKOUT_CTRL			  0x58
+      #define AC_DAC_DAPCTRL		0xa0
+      #define AC_DAC_DAPHHPFC 	0xa1
+      #define AC_DAC_DAPLHPFC 	0xa2
+      #define AC_DAC_DAPLHAVC 	0xa3
+      #define AC_DAC_DAPLLAVC 	0xa4
+      #define AC_DAC_DAPRHAVC 	0xa5
+      #define AC_DAC_DAPRLAVC 	0xa6
+      #define AC_DAC_DAPHGDEC 	0xa7
+      #define AC_DAC_DAPLGDEC 	0xa8
+      #define AC_DAC_DAPHGATC 	0xa9
+      #define AC_DAC_DAPLGATC 	0xaa
+      #define AC_DAC_DAPHETHD 	0xab
+      #define AC_DAC_DAPLETHD 	0xac
+      #define AC_DAC_DAPHGKPA 	0xad
+      #define AC_DAC_DAPLGKPA 	0xae
+      #define AC_DAC_DAPHGOPA 	0xaf
+      #define AC_DAC_DAPLGOPA 	0xb0
+      #define AC_DAC_DAPOPT   	0xb1
+      #define DAC_DAP_ENA     	0xb5
+
+      _ac101I2cWrite(CHIP_AUDIO_RS, 0x123); // Reset (any value written does a reset)
+      vTaskDelay(1000 / portTICK_PERIOD_MS);
+      _ac101I2cWrite(SPKOUT_CTRL, 0xe880);
+
+      //Enable the PLL from 256*44.1KHz MCLK source
+      _ac101I2cWrite(PLL_CTRL1, 0x014f);
+      //res |= ac101_write_reg(PLL_CTRL2, 0x83c0);
+      _ac101I2cWrite(PLL_CTRL2, 0x8600);
+
+      //Clocking system
+      _ac101I2cWrite(SYSCLK_CTRL, 0x8b08);
+      _ac101I2cWrite(MOD_CLK_ENA, 0x800c);
+      _ac101I2cWrite(MOD_RST_CTRL, 0x800c);
+      _ac101I2cWrite(I2S_SR_CTRL, 0b0111000000000000); //sample rate 22050 Hz
+      //AIF config
+      _ac101I2cWrite(I2S1LCK_CTRL, 0x8850);	//BCLK/LRCK
+      _ac101I2cWrite(I2S1_SDOUT_CTRL, 0xc000); //
+      _ac101I2cWrite(I2S1_SDIN_CTRL, 0xc000);
+      _ac101I2cWrite(I2S1_MXR_SRC, 0x2200); //
+
+      _ac101I2cWrite(ADC_SRCBST_CTRL, 0xccc4);
+      _ac101I2cWrite(ADC_SRC, 0x2020);
+      _ac101I2cWrite(ADC_DIG_CTRL, 0x8000);
+      _ac101I2cWrite(ADC_APC_CTRL, 0xbbc3);
+
+      //Path Configuration
+      _ac101I2cWrite(DAC_MXR_SRC, 0xcc00);
+      _ac101I2cWrite(DAC_DIG_CTRL, 0x8000);
+      _ac101I2cWrite(OMIXER_SR, 0x0081);
+      _ac101I2cWrite(OMIXER_DACA_CTRL, 0xf080); //}
+
+      //* Enable Speaker output
+      // _ac101I2cWrite(0x58, 0xeabd);
+
+      _ac101I2cWrite(ADC_SRC, 0b0000010000001000); // Line-in to ADC
+      _ac101I2cWrite(ADC_DIG_CTRL, 0x8000);
+      _ac101I2cWrite(ADC_APC_CTRL, 0x3bc0);
+      //I2S1_SDOUT_CTRL
+      //res |= _ac101I2cWrite(PLL_CTRL2, 0x8120);
+      _ac101I2cWrite(MOD_CLK_ENA, 0x800c);
+      _ac101I2cWrite(MOD_RST_CTRL, 0x800c);
+      //res |= _ac101I2cWrite(0x06, 0x3000);
+      //* Enable Headphoe output
+      _ac101I2cWrite(OMIXER_DACA_CTRL, 0xff80);
+      _ac101I2cWrite(HPOUT_CTRL, 0xc3c1);
+      _ac101I2cWrite(HPOUT_CTRL, 0xcb00);
+      vTaskDelay(100 / portTICK_PERIOD_MS);
+      _ac101I2cWrite(HPOUT_CTRL, 0xfbc0);
+
+      _ac101I2cWrite(OMIXER_SR, 0b0000010000001000); // default all 0
+
+      //* Enable Speaker output
+      _ac101I2cWrite(SPKOUT_CTRL, 0xeabd);
+
+
+    }
+
+  public:
+    AC101Source(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("AC101Source:: initialize();");
+
+      // if ((i2sckPin < 0) || (mclkPin < 0)) { // WLEDMM not sure if this check is needed here, too
+      //    ERRORSR_PRINTF("\nAR: invalid I2S WM8978 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 AC101 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
+      _ac101InitAdc();
+      I2SSource::initialize(i2swsPin, i2ssdPin, i2sckPin, mclkPin);
+    }
+
+    void deinitialize() {
+      I2SSource::deinitialize();
+    }
+
+};
+
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 2, 0)
 #if !defined(SOC_I2S_SUPPORTS_ADC) && !defined(SOC_I2S_SUPPORTS_ADC_DAC)
   #warning this MCU does not support analog sound input

From 788347440466e84df4c58d899aa1081c6b3251b3 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 4 Jul 2024 18:37:31 +0200
Subject: [PATCH 052/200] postProcessFFTResults minor refactoring

* limiter on/off : made the logic a bit clearer.
* use a simpler way of writing filters: a = n*a + (1-n)*b --> a = a+ n*(b-a)

no functional impact.
---
 usermods/audioreactive/audio_reactive.h | 42 ++++++++++++++-----------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index b6983c6d..79172591 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -946,27 +946,33 @@ static void postProcessFFTResults(bool noiseGateOpen, int numberOfChannels) // p
         if(fftCalc[i] < 0) fftCalc[i] = 0;
       }
 
-      // smooth results - rise fast, fall slower
-      if(fftCalc[i] > fftAvg[i])   // rise fast 
-        fftAvg[i] = fftCalc[i] *0.78f + 0.22f*fftAvg[i];  // will need approx 1-2 cycles (50ms) for converging against fftCalc[i]
-      else {                       // fall slow
-        if (decayTime < 250)      fftAvg[i] = fftCalc[i]*0.4f + 0.6f*fftAvg[i]; 
-        else if (decayTime < 500)  fftAvg[i] = fftCalc[i]*0.33f + 0.67f*fftAvg[i]; 
-        else if (decayTime < 1000) fftAvg[i] = fftCalc[i]*0.22f + 0.78f*fftAvg[i];  // approx  5 cycles (225ms) for falling to zero
-        else if (decayTime < 2000) fftAvg[i] = fftCalc[i]*0.17f + 0.83f*fftAvg[i];  // default - approx  9 cycles (225ms) for falling to zero
-        else if (decayTime < 3000) fftAvg[i] = fftCalc[i]*0.14f + 0.86f*fftAvg[i];  // approx 14 cycles (350ms) for falling to zero
-        else if (decayTime < 4000) fftAvg[i] = fftCalc[i]*0.1f  + 0.9f*fftAvg[i];
-        else fftAvg[i] = fftCalc[i]*0.05f  + 0.95f*fftAvg[i];
-      }
-      // constrain internal vars - just to be sure
-      fftCalc[i] = constrain(fftCalc[i], 0.0f, 1023.0f);
-      fftAvg[i] = constrain(fftAvg[i], 0.0f, 1023.0f);
-
       float currentResult;
-      if(limiterOn == true)
+      if(limiterOn == true) {
+        // Limiter ON -> smooth results -> rise fast, fall slower
+        if(fftCalc[i] > fftAvg[i]) {  // rise fast
+          fftAvg[i] += 0.78f * (fftCalc[i] - fftAvg[i]);  // will need approx 1-2 cycles (50ms) for converging against fftCalc[i]
+        } else {                       // fall slow
+          if (decayTime < 150)       fftAvg[i] += 0.50f * (fftCalc[i] - fftAvg[i]); 
+          else if (decayTime < 250)  fftAvg[i] += 0.40f * (fftCalc[i] - fftAvg[i]); 
+          else if (decayTime < 500)  fftAvg[i] += 0.33f * (fftCalc[i] - fftAvg[i]); 
+          else if (decayTime < 1000) fftAvg[i] += 0.22f * (fftCalc[i] - fftAvg[i]);  // approx  5 cycles (225ms) for falling to zero
+          else if (decayTime < 2000) fftAvg[i] += 0.17f * (fftCalc[i] - fftAvg[i]);  // default - approx  9 cycles (225ms) for falling to zero
+          else if (decayTime < 3000) fftAvg[i] += 0.14f * (fftCalc[i] - fftAvg[i]);  // approx 14 cycles (350ms) for falling to zero
+          else if (decayTime < 4000) fftAvg[i] += 0.10f * (fftCalc[i] - fftAvg[i]);
+          else fftAvg[i] += 0.05f * (fftCalc[i] - fftAvg[i]);
+        }
+        // constrain internal vars - just to be sure
+        fftCalc[i] = constrain(fftCalc[i], 0.0f, 1023.0f);
+        fftAvg[i] = constrain(fftAvg[i], 0.0f, 1023.0f);
+        // use filtered result
         currentResult = fftAvg[i];
-      else
+      } else {
+        // Limiter OFF -> no adjustments
+        fftCalc[i] = constrain(fftCalc[i], 0.0f, 1023.0f);
+        fftAvg[i] = fftCalc[i]; // keep filters up-to-date
+        // use not filtered result
         currentResult = fftCalc[i];
+      }
 
       switch (FFTScalingMode) {
         case 1:

From 7d04660b913fedecc62f635f519444866e2ac4a2 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 4 Jul 2024 20:06:13 +0200
Subject: [PATCH 053/200] postProcessFFTResults adjustments for FastPath

samples arrive 2x as fast in fast mode - adjust filters accordingly
---
 usermods/audioreactive/audio_reactive.h | 58 ++++++++++++++-----------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index 79172591..66175681 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -285,7 +285,7 @@ static float mapf(float x, float in_min, float in_max, float out_min, float out_
 static float fftAddAvg(int from, int to);   // average of several FFT result bins
 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); // post-processing and post-amp of GEQ channels
+static void postProcessFFTResults(bool noiseGateOpen, int numberOfChannels, bool i2sFastpath); // post-processing and post-amp of GEQ channels
 
 
 static TaskHandle_t FFT_Task = nullptr;
@@ -860,8 +860,8 @@ void FFTcode(void * parameter)
 
     // post-processing of frequency channels (pink noise adjustment, AGC, smoothing, scaling)
     if (pinkIndex > MAX_PINK) pinkIndex = MAX_PINK;
-    //postProcessFFTResults((fabsf(sampleAvg) > 0.25f)? true : false , NUM_GEQ_CHANNELS);
-    postProcessFFTResults((fabsf(volumeSmth)>0.25f)? true : false , NUM_GEQ_CHANNELS);    // this function modifies fftCalc, fftAvg and fftResult
+
+    postProcessFFTResults((fabsf(volumeSmth) > 0.25f)? true : false, NUM_GEQ_CHANNELS, usingOldSamples);    // this function modifies fftCalc, fftAvg and fftResult
 
 #if defined(WLED_DEBUG) || defined(SR_DEBUG)|| defined(SR_STATS)
     // timing
@@ -933,7 +933,7 @@ static void runMicFilter(uint16_t numSamples, float *sampleBuffer)          // p
   }
 }
 
-static void postProcessFFTResults(bool noiseGateOpen, int numberOfChannels) // post-processing and post-amp of GEQ channels
+static void postProcessFFTResults(bool noiseGateOpen, int numberOfChannels, bool i2sFastpath) // post-processing and post-amp of GEQ channels
 {
     for (int i=0; i < numberOfChannels; i++) {
 
@@ -946,34 +946,42 @@ static void postProcessFFTResults(bool noiseGateOpen, int numberOfChannels) // p
         if(fftCalc[i] < 0) fftCalc[i] = 0;
       }
 
-      float currentResult;
+      float speed = 1.0f;  // filter correction for sampling speed ->  1.0 in normal mode (43hz)
+      if (i2sFastpath) speed = 0.6931471805599453094f * 1.1f;  //  ->  ln(2) from math, *1.1 from my gut feeling ;-) in fast mode (86hz)
+
       if(limiterOn == true) {
-        // Limiter ON -> smooth results -> rise fast, fall slower
+        // Limiter ON -> smooth results
         if(fftCalc[i] > fftAvg[i]) {  // rise fast
-          fftAvg[i] += 0.78f * (fftCalc[i] - fftAvg[i]);  // will need approx 1-2 cycles (50ms) for converging against fftCalc[i]
+          fftAvg[i] += speed * 0.78f * (fftCalc[i] - fftAvg[i]);  // will need approx 1-2 cycles (50ms) for converging against fftCalc[i]
         } else {                       // fall slow
-          if (decayTime < 150)       fftAvg[i] += 0.50f * (fftCalc[i] - fftAvg[i]); 
-          else if (decayTime < 250)  fftAvg[i] += 0.40f * (fftCalc[i] - fftAvg[i]); 
-          else if (decayTime < 500)  fftAvg[i] += 0.33f * (fftCalc[i] - fftAvg[i]); 
-          else if (decayTime < 1000) fftAvg[i] += 0.22f * (fftCalc[i] - fftAvg[i]);  // approx  5 cycles (225ms) for falling to zero
-          else if (decayTime < 2000) fftAvg[i] += 0.17f * (fftCalc[i] - fftAvg[i]);  // default - approx  9 cycles (225ms) for falling to zero
-          else if (decayTime < 3000) fftAvg[i] += 0.14f * (fftCalc[i] - fftAvg[i]);  // approx 14 cycles (350ms) for falling to zero
-          else if (decayTime < 4000) fftAvg[i] += 0.10f * (fftCalc[i] - fftAvg[i]);
-          else fftAvg[i] += 0.05f * (fftCalc[i] - fftAvg[i]);
+          if (decayTime < 150)       fftAvg[i] += speed * 0.50f * (fftCalc[i] - fftAvg[i]); 
+          else if (decayTime < 250)  fftAvg[i] += speed * 0.40f * (fftCalc[i] - fftAvg[i]); 
+          else if (decayTime < 500)  fftAvg[i] += speed * 0.33f * (fftCalc[i] - fftAvg[i]); 
+          else if (decayTime < 1000) fftAvg[i] += speed * 0.22f * (fftCalc[i] - fftAvg[i]);  // approx  5 cycles (225ms) for falling to zero
+          else if (decayTime < 2000) fftAvg[i] += speed * 0.17f * (fftCalc[i] - fftAvg[i]);  // default - approx  9 cycles (225ms) for falling to zero
+          else if (decayTime < 3000) fftAvg[i] += speed * 0.14f * (fftCalc[i] - fftAvg[i]);  // approx 14 cycles (350ms) for falling to zero
+          else if (decayTime < 4000) fftAvg[i] += speed * 0.10f * (fftCalc[i] - fftAvg[i]);
+          else fftAvg[i] += speed * 0.05f * (fftCalc[i] - fftAvg[i]);
         }
-        // constrain internal vars - just to be sure
-        fftCalc[i] = constrain(fftCalc[i], 0.0f, 1023.0f);
-        fftAvg[i] = constrain(fftAvg[i], 0.0f, 1023.0f);
-        // use filtered result
-        currentResult = fftAvg[i];
       } else {
-        // Limiter OFF -> no adjustments
-        fftCalc[i] = constrain(fftCalc[i], 0.0f, 1023.0f);
-        fftAvg[i] = fftCalc[i]; // keep filters up-to-date
-        // use not filtered result
-        currentResult = fftCalc[i];
+        // Limiter OFF
+        if (i2sFastpath) { 
+          // fast mode -> average last two results
+          float tmp = fftCalc[i];
+          fftCalc[i] = 0.7f * tmp + 0.3f * fftAvg[i];
+          fftAvg[i] = tmp; // store current sample for next run
+        } else {
+          // normal mode -> no adjustments
+          fftAvg[i] = fftCalc[i]; // keep filters up-to-date
+        }
       }
 
+      // constrain internal vars - just to be sure
+      fftCalc[i] = constrain(fftCalc[i], 0.0f, 1023.0f);
+      fftAvg[i] = constrain(fftAvg[i], 0.0f, 1023.0f);
+
+      float currentResult = limiterOn ? fftAvg[i] : fftCalc[i]; // continue with filtered result (limiter on) or unfiltered result (limiter off)
+
       switch (FFTScalingMode) {
         case 1:
             // Logarithmic scaling

From 9b14de06b2b1229c9f43bd3e3134691a1b687498 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 4 Jul 2024 20:13:57 +0200
Subject: [PATCH 054/200] fix build error on -S2, -C3

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

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index 66175681..8f4ed3af 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -861,7 +861,11 @@ void FFTcode(void * parameter)
     // post-processing of frequency channels (pink noise adjustment, AGC, smoothing, scaling)
     if (pinkIndex > MAX_PINK) pinkIndex = MAX_PINK;
 
+#ifdef FFT_USE_SLIDING_WINDOW
     postProcessFFTResults((fabsf(volumeSmth) > 0.25f)? true : false, NUM_GEQ_CHANNELS, usingOldSamples);    // this function modifies fftCalc, fftAvg and fftResult
+#else
+    postProcessFFTResults((fabsf(volumeSmth) > 0.25f)? true : false, NUM_GEQ_CHANNELS, false);    // this function modifies fftCalc, fftAvg and fftResult
+#endif
 
 #if defined(WLED_DEBUG) || defined(SR_DEBUG)|| defined(SR_STATS)
     // timing

From 160e66a766b2905d4fb496fc108e178f3542624d Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 4 Jul 2024 21:44:09 +0200
Subject: [PATCH 055/200] user-selectable FFT window functions

experiments: user-selectable FFT "windowing" options

https://en.wikipedia.org/wiki/Window_function#Cosine-sum_windows
---
 usermods/audioreactive/audio_reactive.h | 164 ++++++++++++++----------
 1 file changed, 99 insertions(+), 65 deletions(-)

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index 8f4ed3af..255815fd 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -179,7 +179,7 @@ static bool limiterOn = false;                 // bool: enable / disable dynamic
 static bool limiterOn = true;
 #endif
 #ifdef FFT_USE_SLIDING_WINDOW
-static uint16_t attackTime = 14;              // int: attack time in milliseconds. Default 0.014sec
+static uint16_t attackTime = 24;              // int: attack time in milliseconds. Default 0.024sec
 static uint16_t decayTime = 250;              // int: decay time in milliseconds.  New default 250ms.
 #else
 static uint16_t attackTime = 50;              // int: attack time in milliseconds. Default 0.08sec
@@ -257,6 +257,7 @@ static constexpr uint8_t averageByRMS = false;                      // false: us
 static constexpr uint8_t averageByRMS = true;                       // false: use mean value, true: use RMS (root mean squared). use better method on fast MCUs.
 #endif
 static uint8_t freqDist = 0;                              // 0=old 1=rightshift mode
+static uint8_t fftWindow = 0;                             // FFT windowing function (0 = default)
 #ifdef FFT_USE_SLIDING_WINDOW
 static uint8_t doSlidingFFT = 1;                            // 1 = use sliding window FFT (faster & more accurate)
 #endif
@@ -685,17 +686,41 @@ void FFTcode(void * parameter)
     micReal_max2 = datMax;
 #endif
 #endif
+
+    float wc = 1.0; // FFT window correction factor, relative to Blackman_Harris
+
     // run FFT (takes 3-5ms on ESP32)
     //if (fabsf(sampleAvg) > 0.25f) { // noise gate open
     if (fabsf(volumeSmth) > 0.25f) { // noise gate open
       if ((skipSecondFFT == false) || (isFirstRun == true)) {
         // run FFT (takes 2-3ms on ESP32, ~12ms on ESP32-S2, ~30ms on -C3)
         if (doDCRemoval) FFT.dcRemoval();                                            // remove DC offset
-        #if !defined(FFT_PREFER_EXACT_PEAKS)
-          FFT.windowing( FFTWindow::Flat_top, FFTDirection::Forward);        // Weigh data using "Flat Top" function - better amplitude accuracy
-        #else
-          FFT.windowing(FFTWindow::Blackman_Harris, FFTDirection::Forward);  // Weigh data using "Blackman- Harris" window - sharp peaks due to excellent sideband rejection
+        switch(fftWindow) {                                                          // apply FFT window
+          case 1:
+            FFT.windowing(FFTWindow::Hann, FFTDirection::Forward);  // recommended for 50% overlap
+            wc = 0.66415918066;     // 1.8554726898 * 2.0
+          break;
+          case 2:
+            FFT.windowing( FFTWindow::Nuttall, FFTDirection::Forward);
+            wc = 0.9916873881f;     // 2.8163172034 * 2.0
+          break;
+          case 3:
+            FFT.windowing( FFTWindow::Hamming, FFTDirection::Forward);
+            wc = 0.664159180663f;   // 1.8549343278 * 2.0
+          break;
+          case 4:
+            FFT.windowing( FFTWindow::Flat_top, FFTDirection::Forward);        // Weigh data using "Flat Top" function - better amplitude preservation, low frequency accuracy
+            wc = 1.276771793156f;   // 3.5659039231 * 2.0
+          break;
+          case 0: // falls through
+          default:
+            FFT.windowing(FFTWindow::Blackman_Harris, FFTDirection::Forward);  // Weigh data using "Blackman- Harris" window - sharp peaks due to excellent sideband rejection
+            wc = 1.0f;              // 2.7929062517 * 2.0
+        }
+        #ifdef FFT_USE_SLIDING_WINDOW
+        if (usingOldSamples) wc = wc * 1.10f; // compensate for loss caused by averaging
         #endif
+
         FFT.compute( FFTDirection::Forward );                       // Compute FFT
         FFT.complexToMagnitude();                                   // Compute magnitudes
         vReal[0] = 0;   // The remaining DC offset on the signal produces a strong spike on position 0 that should be eliminated to avoid issues.
@@ -715,6 +740,7 @@ void FFTcode(void * parameter)
         #else
           FFT.majorPeak(FFT_MajorPeak, FFT_Magnitude);                // let the effects know which freq was most dominant
         #endif
+        FFT_Magnitude *= wc;  // apply correction factor
 
         if (FFT_MajorPeak < (SAMPLE_RATE /  samplesFFT)) {FFT_MajorPeak = 1.0f; FFT_Magnitude = 0;}                  // too low - use zero
         if (FFT_MajorPeak > (0.42f * SAMPLE_RATE)) {FFT_MajorPeak = last_majorpeak; FFT_Magnitude = last_magnitude;} // too high - keep last peak
@@ -764,23 +790,23 @@ void FFTcode(void * parameter)
     * End frequency = Start frequency * multiplier ^ 16
     * Multiplier = (End frequency/ Start frequency) ^ 1/16
     * Multiplier = 1.320367784
-    */                                    //  Range
-      fftCalc[ 0] = fftAddAvg(2,4);       // 60 - 100
-      fftCalc[ 1] = fftAddAvg(4,5);       // 80 - 120
-      fftCalc[ 2] = fftAddAvg(5,7);       // 100 - 160
-      fftCalc[ 3] = fftAddAvg(7,9);       // 140 - 200
-      fftCalc[ 4] = fftAddAvg(9,12);      // 180 - 260
-      fftCalc[ 5] = fftAddAvg(12,16);     // 240 - 340
-      fftCalc[ 6] = fftAddAvg(16,21);     // 320 - 440
-      fftCalc[ 7] = fftAddAvg(21,29);     // 420 - 600
-      fftCalc[ 8] = fftAddAvg(29,37);     // 580 - 760
-      fftCalc[ 9] = fftAddAvg(37,48);     // 740 - 980
-      fftCalc[10] = fftAddAvg(48,64);     // 960 - 1300
-      fftCalc[11] = fftAddAvg(64,84);     // 1280 - 1700
-      fftCalc[12] = fftAddAvg(84,111);    // 1680 - 2240
-      fftCalc[13] = fftAddAvg(111,147);   // 2220 - 2960
-      fftCalc[14] = fftAddAvg(147,194);   // 2940 - 3900
-      fftCalc[15] = fftAddAvg(194,250);   // 3880 - 5000 // avoid the last 5 bins, which are usually inaccurate
+    */                                         //  Range
+      fftCalc[ 0] = wc * fftAddAvg(2,4);       // 60 - 100
+      fftCalc[ 1] = wc * fftAddAvg(4,5);       // 80 - 120
+      fftCalc[ 2] = wc * fftAddAvg(5,7);       // 100 - 160
+      fftCalc[ 3] = wc * fftAddAvg(7,9);       // 140 - 200
+      fftCalc[ 4] = wc * fftAddAvg(9,12);      // 180 - 260
+      fftCalc[ 5] = wc * fftAddAvg(12,16);     // 240 - 340
+      fftCalc[ 6] = wc * fftAddAvg(16,21);     // 320 - 440
+      fftCalc[ 7] = wc * fftAddAvg(21,29);     // 420 - 600
+      fftCalc[ 8] = wc * fftAddAvg(29,37);     // 580 - 760
+      fftCalc[ 9] = wc * fftAddAvg(37,48);     // 740 - 980
+      fftCalc[10] = wc * fftAddAvg(48,64);     // 960 - 1300
+      fftCalc[11] = wc * fftAddAvg(64,84);     // 1280 - 1700
+      fftCalc[12] = wc * fftAddAvg(84,111);    // 1680 - 2240
+      fftCalc[13] = wc * fftAddAvg(111,147);   // 2220 - 2960
+      fftCalc[14] = wc * fftAddAvg(147,194);   // 2940 - 3900
+      fftCalc[15] = wc * fftAddAvg(194,250);   // 3880 - 5000 // avoid the last 5 bins, which are usually inaccurate
 #else
   //WLEDMM: different distributions
   if (freqDist == 0) {
@@ -788,60 +814,60 @@ void FFTcode(void * parameter)
                                                     // bins frequency  range
       if (useInputFilter==1) {
         // skip frequencies below 100hz
-        fftCalc[ 0] = 0.8f * fftAddAvg(3,3);
-        fftCalc[ 1] = 0.9f * fftAddAvg(4,4);
-        fftCalc[ 2] = fftAddAvg(5,5);
-        fftCalc[ 3] = fftAddAvg(6,6);
+        fftCalc[ 0] = wc * 0.8f * fftAddAvg(3,3);
+        fftCalc[ 1] = wc * 0.9f * fftAddAvg(4,4);
+        fftCalc[ 2] = wc * fftAddAvg(5,5);
+        fftCalc[ 3] = wc * fftAddAvg(6,6);
         // don't use the last bins from 206 to 255. 
-        fftCalc[15] = fftAddAvg(165,205) * 0.75f;   // 40 7106 - 8828 high             -- with some damping
+        fftCalc[15] = wc * fftAddAvg(165,205) * 0.75f;   // 40 7106 - 8828 high             -- with some damping
       } else {
-        fftCalc[ 0] = fftAddAvg(1,1);               // 1    43 - 86   sub-bass
-        fftCalc[ 1] = fftAddAvg(2,2);               // 1    86 - 129  bass
-        fftCalc[ 2] = fftAddAvg(3,4);               // 2   129 - 216  bass
-        fftCalc[ 3] = fftAddAvg(5,6);               // 2   216 - 301  bass + midrange
+        fftCalc[ 0] = wc * fftAddAvg(1,1);               // 1    43 - 86   sub-bass
+        fftCalc[ 1] = wc * fftAddAvg(2,2);               // 1    86 - 129  bass
+        fftCalc[ 2] = wc * fftAddAvg(3,4);               // 2   129 - 216  bass
+        fftCalc[ 3] = wc * fftAddAvg(5,6);               // 2   216 - 301  bass + midrange
         // don't use the last bins from 216 to 255. They are usually contaminated by aliasing (aka noise) 
-        fftCalc[15] = fftAddAvg(165,215) * 0.70f;   // 50 7106 - 9259 high             -- with some damping
+        fftCalc[15] = wc * fftAddAvg(165,215) * 0.70f;   // 50 7106 - 9259 high             -- with some damping
       }
-      fftCalc[ 4] = fftAddAvg(7,9);                // 3   301 - 430  midrange
-      fftCalc[ 5] = fftAddAvg(10,12);               // 3   430 - 560  midrange
-      fftCalc[ 6] = fftAddAvg(13,18);               // 5   560 - 818  midrange
-      fftCalc[ 7] = fftAddAvg(19,25);               // 7   818 - 1120 midrange -- 1Khz should always be the center !
-      fftCalc[ 8] = fftAddAvg(26,32);               // 7  1120 - 1421 midrange
-      fftCalc[ 9] = fftAddAvg(33,43);               // 9  1421 - 1895 midrange
-      fftCalc[10] = fftAddAvg(44,55);               // 12 1895 - 2412 midrange + high mid
-      fftCalc[11] = fftAddAvg(56,69);               // 14 2412 - 3015 high mid
-      fftCalc[12] = fftAddAvg(70,85);               // 16 3015 - 3704 high mid
-      fftCalc[13] = fftAddAvg(86,103);              // 18 3704 - 4479 high mid
-      fftCalc[14] = fftAddAvg(104,164) * 0.88f;     // 61 4479 - 7106 high mid + high  -- with slight damping
+      fftCalc[ 4] = wc * fftAddAvg(7,9);                // 3   301 - 430  midrange
+      fftCalc[ 5] = wc * fftAddAvg(10,12);               // 3   430 - 560  midrange
+      fftCalc[ 6] = wc * fftAddAvg(13,18);               // 5   560 - 818  midrange
+      fftCalc[ 7] = wc * fftAddAvg(19,25);               // 7   818 - 1120 midrange -- 1Khz should always be the center !
+      fftCalc[ 8] = wc * fftAddAvg(26,32);               // 7  1120 - 1421 midrange
+      fftCalc[ 9] = wc * fftAddAvg(33,43);               // 9  1421 - 1895 midrange
+      fftCalc[10] = wc * fftAddAvg(44,55);               // 12 1895 - 2412 midrange + high mid
+      fftCalc[11] = wc * fftAddAvg(56,69);               // 14 2412 - 3015 high mid
+      fftCalc[12] = wc * fftAddAvg(70,85);               // 16 3015 - 3704 high mid
+      fftCalc[13] = wc * fftAddAvg(86,103);              // 18 3704 - 4479 high mid
+      fftCalc[14] = wc * fftAddAvg(104,164) * 0.88f;     // 61 4479 - 7106 high mid + high  -- with slight damping
   }
   else if (freqDist == 1) { //WLEDMM: Rightshift: note ewowi: frequencies in comments are not correct
       if (useInputFilter==1) {
         // skip frequencies below 100hz
-        fftCalc[ 0] = 0.8f * fftAddAvg(1,1);
-        fftCalc[ 1] = 0.9f * fftAddAvg(2,2);
-        fftCalc[ 2] = fftAddAvg(3,3);
-        fftCalc[ 3] = fftAddAvg(4,4);
+        fftCalc[ 0] = wc * 0.8f * fftAddAvg(1,1);
+        fftCalc[ 1] = wc * 0.9f * fftAddAvg(2,2);
+        fftCalc[ 2] = wc * fftAddAvg(3,3);
+        fftCalc[ 3] = wc * fftAddAvg(4,4);
         // don't use the last bins from 206 to 255. 
-        fftCalc[15] = fftAddAvg(165,205) * 0.75f;   // 40 7106 - 8828 high             -- with some damping
+        fftCalc[15] = wc * fftAddAvg(165,205) * 0.75f;   // 40 7106 - 8828 high             -- with some damping
       } else {
-        fftCalc[ 0] = fftAddAvg(1,1);               // 1    43 - 86   sub-bass
-        fftCalc[ 1] = fftAddAvg(2,2);               // 1    86 - 129  bass
-        fftCalc[ 2] = fftAddAvg(3,3);               // 2   129 - 216  bass
-        fftCalc[ 3] = fftAddAvg(4,4);               // 2   216 - 301  bass + midrange
+        fftCalc[ 0] = wc * fftAddAvg(1,1);               // 1    43 - 86   sub-bass
+        fftCalc[ 1] = wc * fftAddAvg(2,2);               // 1    86 - 129  bass
+        fftCalc[ 2] = wc * fftAddAvg(3,3);               // 2   129 - 216  bass
+        fftCalc[ 3] = wc * fftAddAvg(4,4);               // 2   216 - 301  bass + midrange
         // don't use the last bins from 216 to 255. They are usually contaminated by aliasing (aka noise) 
-        fftCalc[15] = fftAddAvg(165,215) * 0.70f;   // 50 7106 - 9259 high             -- with some damping
+        fftCalc[15] = wc * fftAddAvg(165,215) * 0.70f;   // 50 7106 - 9259 high             -- with some damping
       }
-      fftCalc[ 4] = fftAddAvg(5,6);                // 3   301 - 430  midrange
-      fftCalc[ 5] = fftAddAvg(7,8);               // 3   430 - 560  midrange
-      fftCalc[ 6] = fftAddAvg(9,10);               // 5   560 - 818  midrange
-      fftCalc[ 7] = fftAddAvg(11,13);               // 7   818 - 1120 midrange -- 1Khz should always be the center !
-      fftCalc[ 8] = fftAddAvg(14,18);               // 7  1120 - 1421 midrange
-      fftCalc[ 9] = fftAddAvg(19,25);               // 9  1421 - 1895 midrange
-      fftCalc[10] = fftAddAvg(26,36);               // 12 1895 - 2412 midrange + high mid
-      fftCalc[11] = fftAddAvg(37,45);               // 14 2412 - 3015 high mid
-      fftCalc[12] = fftAddAvg(46,66);               // 16 3015 - 3704 high mid
-      fftCalc[13] = fftAddAvg(67,97);              // 18 3704 - 4479 high mid
-      fftCalc[14] = fftAddAvg(98,164) * 0.88f;     // 61 4479 - 7106 high mid + high  -- with slight damping
+      fftCalc[ 4] = wc * fftAddAvg(5,6);                // 3   301 - 430  midrange
+      fftCalc[ 5] = wc * fftAddAvg(7,8);               // 3   430 - 560  midrange
+      fftCalc[ 6] = wc * fftAddAvg(9,10);               // 5   560 - 818  midrange
+      fftCalc[ 7] = wc * fftAddAvg(11,13);               // 7   818 - 1120 midrange -- 1Khz should always be the center !
+      fftCalc[ 8] = wc * fftAddAvg(14,18);               // 7  1120 - 1421 midrange
+      fftCalc[ 9] = wc * fftAddAvg(19,25);               // 9  1421 - 1895 midrange
+      fftCalc[10] = wc * fftAddAvg(26,36);               // 12 1895 - 2412 midrange + high mid
+      fftCalc[11] = wc * fftAddAvg(37,45);               // 14 2412 - 3015 high mid
+      fftCalc[12] = wc * fftAddAvg(46,66);               // 16 3015 - 3704 high mid
+      fftCalc[13] = wc * fftAddAvg(67,97);              // 18 3704 - 4479 high mid
+      fftCalc[14] = wc * fftAddAvg(98,164) * 0.88f;     // 61 4479 - 7106 high mid + high  -- with slight damping
   }
 #endif
       } else {  // noise gate closed - just decay old values
@@ -2756,7 +2782,7 @@ class AudioReactive : public Usermod {
       poweruser[F("micLev")] = micLevelMethod;
       poweruser[F("freqDist")] = freqDist;
       //poweruser[F("freqRMS")] = averageByRMS;
-
+      poweruser[F("FFT_Window")] = fftWindow;
 #ifdef FFT_USE_SLIDING_WINDOW
       poweruser[F("I2S_FastPath")] = doSlidingFFT;
 #endif
@@ -2831,6 +2857,7 @@ class AudioReactive : public Usermod {
       configComplete &= getJsonValue(top["experiments"][F("micLev")], micLevelMethod);
       configComplete &= getJsonValue(top["experiments"][F("freqDist")], freqDist);
       //configComplete &= getJsonValue(top["experiments"][F("freqRMS")],  averageByRMS);
+      configComplete &= getJsonValue(top["experiments"][F("FFT_Window")], fftWindow);
 #ifdef FFT_USE_SLIDING_WINDOW
       configComplete &= getJsonValue(top["experiments"][F("I2S_FastPath")], doSlidingFFT);
 #endif
@@ -2944,6 +2971,13 @@ class AudioReactive : public Usermod {
       //oappend(SET_F("addOption(dd,'On',1);"));
       //oappend(SET_F("addInfo(ux+':experiments:freqRMS',1,'☾');"));
 
+      oappend(SET_F("dd=addDropdown(ux,'experiments:FFT_Window');"));
+      oappend(SET_F("addOption(dd,'Blackman-Harris (MM standard)',0);"));
+      oappend(SET_F("addOption(dd,'Hann (balanced)',1);"));
+      oappend(SET_F("addOption(dd,'Nuttall (more accurate)',2);"));
+      oappend(SET_F("addOption(dd,'Hamming',3);"));
+      oappend(SET_F("addOption(dd,'Flat-Top (AC WLED, inaccurate)',4);"));
+
 #ifdef FFT_USE_SLIDING_WINDOW
       oappend(SET_F("dd=addDropdown(ux,'experiments:I2S_FastPath');"));
       oappend(SET_F("addOption(dd,'Off',0);"));

From cba883c663143b2068b0c2c9bca72edb50707635 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 5 Jul 2024 15:12:41 +0200
Subject: [PATCH 056/200] parameter tuning

*some filter parameter tinkering
* restore FFT_MajPeakSmth in UDP SoundSync receiver
---
 usermods/audioreactive/audio_reactive.h | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index 255815fd..496f6866 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -240,7 +240,7 @@ const double agcFollowSlow[AGC_NUM_PRESETS]   = {1/6144.f,1/4096.f,1/8192.f}; //
 const double agcControlKp[AGC_NUM_PRESETS]    = {    0.6f,    1.5f,   0.65f}; // AGC - PI control, proportional gain parameter
 const double agcControlKi[AGC_NUM_PRESETS]    = {    1.7f,   1.85f,    1.2f}; // AGC - PI control, integral gain parameter
 #if defined(WLEDMM_FASTPATH)
-const float agcSampleSmooth[AGC_NUM_PRESETS]  = {  1/6.f,   1/5.f,  1/10.f}; // smoothing factor for sampleAgc (use rawSampleAgc if you want the non-smoothed value)
+const float agcSampleSmooth[AGC_NUM_PRESETS]  = {  1/8.f,   1/5.f,  1/12.f}; // smoothing factor for sampleAgc (use rawSampleAgc if you want the non-smoothed value)
 #else
 const float agcSampleSmooth[AGC_NUM_PRESETS]  = {  1/12.f,   1/6.f,  1/16.f}; // smoothing factor for sampleAgc (use rawSampleAgc if you want the non-smoothed value)
 #endif
@@ -1434,13 +1434,8 @@ class AudioReactive : public Usermod {
     {
       float    sampleAdj;           // Gain adjusted sample value
       float    tmpSample;           // An interim sample variable used for calculations.
-#ifdef WLEDMM_FASTPATH
-      constexpr float weighting = 0.35f;  // slightly reduced filter strength, to reduce audio latency
-      constexpr float weighting2 = 0.25f;
-#else
-      const float weighting = 0.2f; // Exponential filter weighting. Will be adjustable in a future release.
+      const float weighting = 0.18f; // Exponential filter weighting. Will be adjustable in a future release.
       const float weighting2 = 0.073f; // Exponential filter weighting, for rising signal (a bit more robust against spikes)
-#endif
       const int   AGC_preset = (soundAgc > 0)? (soundAgc-1): 0; // make sure the _compiler_ knows this value will not change while we are inside the function
       static bool isFrozen = false;
       static bool haveSilence = true;
@@ -1492,9 +1487,11 @@ class AudioReactive : public Usermod {
       if ((micLevelMethod == 2) && !haveSilence && (expAdjF >= (1.5f * float(soundSquelch)))) 
         isFrozen = true;    // fast freeze mode: freeze micLevel once the volume rises 50% above squelch
 
-      //expAdjF = (micInNoDC <= soundSquelch) ? 0: expAdjF; // simple noise gate - experimental
-      expAdjF = (expAdjF <= soundSquelch) ? 0: expAdjF; // simple noise gate
-      if ((soundSquelch == 0) && (expAdjF < 0.25f)) expAdjF = 0; // do something meaningfull when "squelch = 0"
+      // simple noise gate
+      if ((expAdjF <= soundSquelch) || ((soundSquelch == 0) && (expAdjF < 0.25f))) {
+        expAdjF = 0.0f;
+        micInNoDC = 0.0f;
+      }
 
       if (expAdjF <= 0.5f) 
         haveSilence = true;
@@ -1515,7 +1512,7 @@ class AudioReactive : public Usermod {
       sampleAdj = tmpSample * sampleGain / 40.0f * inputLevel/128.0f + tmpSample / 16.0f; // Adjust the gain. with inputLevel adjustment
       sampleReal = tmpSample;
 
-      sampleAdj = fmax(fmin(sampleAdj, 255), 0);        // Question: why are we limiting the value to 8 bits ???
+      sampleAdj = fmax(fmin(sampleAdj, 255.0f), 0.0f);        // Question: why are we limiting the value to 8 bits ???
       sampleRaw = (int16_t)sampleAdj;                   // ONLY update sample ONCE!!!!
 
       // keep "peak" sample, but decay value if current sample is below peak
@@ -1538,7 +1535,7 @@ class AudioReactive : public Usermod {
       if (sampleMax < 0.5f) sampleMax = 0.0f;
 
 #if defined(WLEDMM_FASTPATH)
-      sampleAvg = ((sampleAvg * 7.0f) + sampleAdj) / 8.0f;   // make reactions a bit more "crisp" in fastpath mode 
+      sampleAvg = ((sampleAvg * 11.0f) + sampleAdj) / 12.0f;   // make reactions a bit more "crisp" in fastpath mode 
 #else
       sampleAvg = ((sampleAvg * 15.0f) + sampleAdj) / 16.0f;   // Smooth it out over the last 16 samples.
 #endif
@@ -1791,6 +1788,9 @@ class AudioReactive : public Usermod {
       my_magnitude  = fmaxf(receivedPacket.FFT_Magnitude, 0.0f);
       FFT_Magnitude = my_magnitude;
       FFT_MajorPeak = constrain(receivedPacket.FFT_MajorPeak, 1.0f, 11025.0f);  // restrict value to range expected by effects
+#ifdef ARDUINO_ARCH_ESP32
+      FFT_MajPeakSmth = FFT_MajPeakSmth + 0.42f * (FFT_MajorPeak - FFT_MajPeakSmth); // simulate smooth value
+#endif
       agcSensitivity = 128.0f; // substitute - V2 format does not include this value
       zeroCrossingCount = receivedPacket.zeroCrossingCount;
 

From bd997f7056d0940a77ea325ba5ea185cfd402f89 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 5 Jul 2024 15:37:03 +0200
Subject: [PATCH 057/200] added Blackman window

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

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index 496f6866..6ec8fb23 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -704,6 +704,10 @@ void FFTcode(void * parameter)
             FFT.windowing( FFTWindow::Nuttall, FFTDirection::Forward);
             wc = 0.9916873881f;     // 2.8163172034 * 2.0
           break;
+          case 5:
+            FFT.windowing( FFTWindow::Blackman, FFTDirection::Forward);
+            wc = 0.84762867875f;     // 2.3673474360 * 2.0
+          break;
           case 3:
             FFT.windowing( FFTWindow::Hamming, FFTDirection::Forward);
             wc = 0.664159180663f;   // 1.8549343278 * 2.0
@@ -2975,6 +2979,7 @@ class AudioReactive : public Usermod {
       oappend(SET_F("addOption(dd,'Blackman-Harris (MM standard)',0);"));
       oappend(SET_F("addOption(dd,'Hann (balanced)',1);"));
       oappend(SET_F("addOption(dd,'Nuttall (more accurate)',2);"));
+      oappend(SET_F("addOption(dd,'Blackman',5);"));
       oappend(SET_F("addOption(dd,'Hamming',3);"));
       oappend(SET_F("addOption(dd,'Flat-Top (AC WLED, inaccurate)',4);"));
 

From 4d03af6466f68891fe1ec696188542c51aac4c13 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 5 Jul 2024 17:53:43 +0200
Subject: [PATCH 058/200] mic quality dropdown, cleanup

* mic quality: When set to "low noise" or "perfect", only minimal smoothing is performed on the "Mic Volume" input.
Every filter adds a delay, so this option can lead to better on-spot responses from effects.

* cleanup: removed a few unused variables and unused code.
---
 usermods/audioreactive/audio_reactive.h | 236 +++++++++++-------------
 1 file changed, 104 insertions(+), 132 deletions(-)

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index 6ec8fb23..2de84087 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -178,6 +178,7 @@ static bool limiterOn = false;                 // bool: enable / disable dynamic
 #else
 static bool limiterOn = true;
 #endif
+static uint8_t micQuality = 0;   // affects input filtering; 0 normal, 1 minimal filtering, 2 no filtering
 #ifdef FFT_USE_SLIDING_WINDOW
 static uint16_t attackTime = 24;              // int: attack time in milliseconds. Default 0.024sec
 static uint16_t decayTime = 250;              // int: decay time in milliseconds.  New default 250ms.
@@ -690,7 +691,6 @@ void FFTcode(void * parameter)
     float wc = 1.0; // FFT window correction factor, relative to Blackman_Harris
 
     // run FFT (takes 3-5ms on ESP32)
-    //if (fabsf(sampleAvg) > 0.25f) { // noise gate open
     if (fabsf(volumeSmth) > 0.25f) { // noise gate open
       if ((skipSecondFFT == false) || (isFirstRun == true)) {
         // run FFT (takes 2-3ms on ESP32, ~12ms on ESP32-S2, ~30ms on -C3)
@@ -776,7 +776,6 @@ void FFTcode(void * parameter)
     }
 
     if ((skipSecondFFT == false) || (isFirstRun == true)) {
-
       for (int i = 0; i < samplesFFT; i++) {
         float t = fabsf(vReal[i]);                      // just to be sure - values in fft bins should be positive any way
         vReal[i] = t / 16.0f;                           // Reduce magnitude. Want end result to be scaled linear and ~4096 max.
@@ -785,102 +784,72 @@ void FFTcode(void * parameter)
       // mapping of FFT result bins to frequency channels
       //if (fabsf(sampleAvg) > 0.25f) { // noise gate open
       if (fabsf(volumeSmth) > 0.25f) { // noise gate open
-#if 0
-    /* This FFT post processing is a DIY endeavour. What we really need is someone with sound engineering expertise to do a great job here AND most importantly, that the animations look GREAT as a result.
-    *
-    * Andrew's updated mapping of 256 bins down to the 16 result bins with Sample Freq = 10240, samplesFFT = 512 and some overlap.
-    * Based on testing, the lowest/Start frequency is 60 Hz (with bin 3) and a highest/End frequency of 5120 Hz in bin 255.
-    * Now, Take the 60Hz and multiply by 1.320367784 to get the next frequency and so on until the end. Then determine the bins.
-    * End frequency = Start frequency * multiplier ^ 16
-    * Multiplier = (End frequency/ Start frequency) ^ 1/16
-    * Multiplier = 1.320367784
-    */                                         //  Range
-      fftCalc[ 0] = wc * fftAddAvg(2,4);       // 60 - 100
-      fftCalc[ 1] = wc * fftAddAvg(4,5);       // 80 - 120
-      fftCalc[ 2] = wc * fftAddAvg(5,7);       // 100 - 160
-      fftCalc[ 3] = wc * fftAddAvg(7,9);       // 140 - 200
-      fftCalc[ 4] = wc * fftAddAvg(9,12);      // 180 - 260
-      fftCalc[ 5] = wc * fftAddAvg(12,16);     // 240 - 340
-      fftCalc[ 6] = wc * fftAddAvg(16,21);     // 320 - 440
-      fftCalc[ 7] = wc * fftAddAvg(21,29);     // 420 - 600
-      fftCalc[ 8] = wc * fftAddAvg(29,37);     // 580 - 760
-      fftCalc[ 9] = wc * fftAddAvg(37,48);     // 740 - 980
-      fftCalc[10] = wc * fftAddAvg(48,64);     // 960 - 1300
-      fftCalc[11] = wc * fftAddAvg(64,84);     // 1280 - 1700
-      fftCalc[12] = wc * fftAddAvg(84,111);    // 1680 - 2240
-      fftCalc[13] = wc * fftAddAvg(111,147);   // 2220 - 2960
-      fftCalc[14] = wc * fftAddAvg(147,194);   // 2940 - 3900
-      fftCalc[15] = wc * fftAddAvg(194,250);   // 3880 - 5000 // avoid the last 5 bins, which are usually inaccurate
-#else
-  //WLEDMM: different distributions
-  if (freqDist == 0) {
-      /* new mapping, optimized for 22050 Hz by softhack007 --- update: removed overlap */
-                                                    // bins frequency  range
-      if (useInputFilter==1) {
-        // skip frequencies below 100hz
-        fftCalc[ 0] = wc * 0.8f * fftAddAvg(3,3);
-        fftCalc[ 1] = wc * 0.9f * fftAddAvg(4,4);
-        fftCalc[ 2] = wc * fftAddAvg(5,5);
-        fftCalc[ 3] = wc * fftAddAvg(6,6);
-        // don't use the last bins from 206 to 255. 
-        fftCalc[15] = wc * fftAddAvg(165,205) * 0.75f;   // 40 7106 - 8828 high             -- with some damping
-      } else {
-        fftCalc[ 0] = wc * fftAddAvg(1,1);               // 1    43 - 86   sub-bass
-        fftCalc[ 1] = wc * fftAddAvg(2,2);               // 1    86 - 129  bass
-        fftCalc[ 2] = wc * fftAddAvg(3,4);               // 2   129 - 216  bass
-        fftCalc[ 3] = wc * fftAddAvg(5,6);               // 2   216 - 301  bass + midrange
-        // don't use the last bins from 216 to 255. They are usually contaminated by aliasing (aka noise) 
-        fftCalc[15] = wc * fftAddAvg(165,215) * 0.70f;   // 50 7106 - 9259 high             -- with some damping
-      }
-      fftCalc[ 4] = wc * fftAddAvg(7,9);                // 3   301 - 430  midrange
-      fftCalc[ 5] = wc * fftAddAvg(10,12);               // 3   430 - 560  midrange
-      fftCalc[ 6] = wc * fftAddAvg(13,18);               // 5   560 - 818  midrange
-      fftCalc[ 7] = wc * fftAddAvg(19,25);               // 7   818 - 1120 midrange -- 1Khz should always be the center !
-      fftCalc[ 8] = wc * fftAddAvg(26,32);               // 7  1120 - 1421 midrange
-      fftCalc[ 9] = wc * fftAddAvg(33,43);               // 9  1421 - 1895 midrange
-      fftCalc[10] = wc * fftAddAvg(44,55);               // 12 1895 - 2412 midrange + high mid
-      fftCalc[11] = wc * fftAddAvg(56,69);               // 14 2412 - 3015 high mid
-      fftCalc[12] = wc * fftAddAvg(70,85);               // 16 3015 - 3704 high mid
-      fftCalc[13] = wc * fftAddAvg(86,103);              // 18 3704 - 4479 high mid
-      fftCalc[14] = wc * fftAddAvg(104,164) * 0.88f;     // 61 4479 - 7106 high mid + high  -- with slight damping
-  }
-  else if (freqDist == 1) { //WLEDMM: Rightshift: note ewowi: frequencies in comments are not correct
-      if (useInputFilter==1) {
-        // skip frequencies below 100hz
-        fftCalc[ 0] = wc * 0.8f * fftAddAvg(1,1);
-        fftCalc[ 1] = wc * 0.9f * fftAddAvg(2,2);
-        fftCalc[ 2] = wc * fftAddAvg(3,3);
-        fftCalc[ 3] = wc * fftAddAvg(4,4);
-        // don't use the last bins from 206 to 255. 
-        fftCalc[15] = wc * fftAddAvg(165,205) * 0.75f;   // 40 7106 - 8828 high             -- with some damping
-      } else {
-        fftCalc[ 0] = wc * fftAddAvg(1,1);               // 1    43 - 86   sub-bass
-        fftCalc[ 1] = wc * fftAddAvg(2,2);               // 1    86 - 129  bass
-        fftCalc[ 2] = wc * fftAddAvg(3,3);               // 2   129 - 216  bass
-        fftCalc[ 3] = wc * fftAddAvg(4,4);               // 2   216 - 301  bass + midrange
-        // don't use the last bins from 216 to 255. They are usually contaminated by aliasing (aka noise) 
-        fftCalc[15] = wc * fftAddAvg(165,215) * 0.70f;   // 50 7106 - 9259 high             -- with some damping
-      }
-      fftCalc[ 4] = wc * fftAddAvg(5,6);                // 3   301 - 430  midrange
-      fftCalc[ 5] = wc * fftAddAvg(7,8);               // 3   430 - 560  midrange
-      fftCalc[ 6] = wc * fftAddAvg(9,10);               // 5   560 - 818  midrange
-      fftCalc[ 7] = wc * fftAddAvg(11,13);               // 7   818 - 1120 midrange -- 1Khz should always be the center !
-      fftCalc[ 8] = wc * fftAddAvg(14,18);               // 7  1120 - 1421 midrange
-      fftCalc[ 9] = wc * fftAddAvg(19,25);               // 9  1421 - 1895 midrange
-      fftCalc[10] = wc * fftAddAvg(26,36);               // 12 1895 - 2412 midrange + high mid
-      fftCalc[11] = wc * fftAddAvg(37,45);               // 14 2412 - 3015 high mid
-      fftCalc[12] = wc * fftAddAvg(46,66);               // 16 3015 - 3704 high mid
-      fftCalc[13] = wc * fftAddAvg(67,97);              // 18 3704 - 4479 high mid
-      fftCalc[14] = wc * fftAddAvg(98,164) * 0.88f;     // 61 4479 - 7106 high mid + high  -- with slight damping
-  }
-#endif
-      } else {  // noise gate closed - just decay old values
-        isFirstRun = false;
-        for (int i=0; i < NUM_GEQ_CHANNELS; i++) {
-          fftCalc[i] *= 0.85f;  // decay to zero
-          if (fftCalc[i] < 4.0f) fftCalc[i] = 0.0f;
+        //WLEDMM: different distributions
+        if (freqDist == 0) {
+          /* new mapping, optimized for 22050 Hz by softhack007 --- update: removed overlap */
+                                                         // bins frequency  range
+          if (useInputFilter==1) {
+            // skip frequencies below 100hz
+            fftCalc[ 0] = wc * 0.8f * fftAddAvg(3,3);
+            fftCalc[ 1] = wc * 0.9f * fftAddAvg(4,4);
+            fftCalc[ 2] = wc * fftAddAvg(5,5);
+            fftCalc[ 3] = wc * fftAddAvg(6,6);
+            // don't use the last bins from 206 to 255. 
+            fftCalc[15] = wc * fftAddAvg(165,205) * 0.75f;   // 40 7106 - 8828 high             -- with some damping
+          } else {
+            fftCalc[ 0] = wc * fftAddAvg(1,1);               // 1    43 - 86   sub-bass
+            fftCalc[ 1] = wc * fftAddAvg(2,2);               // 1    86 - 129  bass
+            fftCalc[ 2] = wc * fftAddAvg(3,4);               // 2   129 - 216  bass
+            fftCalc[ 3] = wc * fftAddAvg(5,6);               // 2   216 - 301  bass + midrange
+            // don't use the last bins from 216 to 255. They are usually contaminated by aliasing (aka noise) 
+            fftCalc[15] = wc * fftAddAvg(165,215) * 0.70f;   // 50 7106 - 9259 high             -- with some damping
+          }
+          fftCalc[ 4] = wc * fftAddAvg(7,9);                 // 3   301 - 430  midrange
+          fftCalc[ 5] = wc * fftAddAvg(10,12);               // 3   430 - 560  midrange
+          fftCalc[ 6] = wc * fftAddAvg(13,18);               // 5   560 - 818  midrange
+          fftCalc[ 7] = wc * fftAddAvg(19,25);               // 7   818 - 1120 midrange -- 1Khz should always be the center !
+          fftCalc[ 8] = wc * fftAddAvg(26,32);               // 7  1120 - 1421 midrange
+          fftCalc[ 9] = wc * fftAddAvg(33,43);               // 9  1421 - 1895 midrange
+          fftCalc[10] = wc * fftAddAvg(44,55);               // 12 1895 - 2412 midrange + high mid
+          fftCalc[11] = wc * fftAddAvg(56,69);               // 14 2412 - 3015 high mid
+          fftCalc[12] = wc * fftAddAvg(70,85);               // 16 3015 - 3704 high mid
+          fftCalc[13] = wc * fftAddAvg(86,103);              // 18 3704 - 4479 high mid
+          fftCalc[14] = wc * fftAddAvg(104,164) * 0.88f;     // 61 4479 - 7106 high mid + high  -- with slight damping
+      } else if (freqDist == 1) { //WLEDMM: Rightshift: note ewowi: frequencies in comments are not correct
+        if (useInputFilter==1) {
+          // skip frequencies below 100hz
+          fftCalc[ 0] = wc * 0.8f * fftAddAvg(1,1);
+          fftCalc[ 1] = wc * 0.9f * fftAddAvg(2,2);
+          fftCalc[ 2] = wc * fftAddAvg(3,3);
+          fftCalc[ 3] = wc * fftAddAvg(4,4);
+          // don't use the last bins from 206 to 255. 
+          fftCalc[15] = wc * fftAddAvg(165,205) * 0.75f;   // 40 7106 - 8828 high             -- with some damping
+        } else {
+          fftCalc[ 0] = wc * fftAddAvg(1,1);               // 1    43 - 86   sub-bass
+          fftCalc[ 1] = wc * fftAddAvg(2,2);               // 1    86 - 129  bass
+          fftCalc[ 2] = wc * fftAddAvg(3,3);               // 2   129 - 216  bass
+          fftCalc[ 3] = wc * fftAddAvg(4,4);               // 2   216 - 301  bass + midrange
+          // don't use the last bins from 216 to 255. They are usually contaminated by aliasing (aka noise) 
+          fftCalc[15] = wc * fftAddAvg(165,215) * 0.70f;   // 50 7106 - 9259 high             -- with some damping
         }
+        fftCalc[ 4] = wc * fftAddAvg(5,6);                 // 3   301 - 430  midrange
+        fftCalc[ 5] = wc * fftAddAvg(7,8);                 // 3   430 - 560  midrange
+        fftCalc[ 6] = wc * fftAddAvg(9,10);                // 5   560 - 818  midrange
+        fftCalc[ 7] = wc * fftAddAvg(11,13);               // 7   818 - 1120 midrange -- 1Khz should always be the center !
+        fftCalc[ 8] = wc * fftAddAvg(14,18);               // 7  1120 - 1421 midrange
+        fftCalc[ 9] = wc * fftAddAvg(19,25);               // 9  1421 - 1895 midrange
+        fftCalc[10] = wc * fftAddAvg(26,36);               // 12 1895 - 2412 midrange + high mid
+        fftCalc[11] = wc * fftAddAvg(37,45);               // 14 2412 - 3015 high mid
+        fftCalc[12] = wc * fftAddAvg(46,66);               // 16 3015 - 3704 high mid
+        fftCalc[13] = wc * fftAddAvg(67,97);               // 18 3704 - 4479 high mid
+        fftCalc[14] = wc * fftAddAvg(98,164) * 0.88f;      // 61 4479 - 7106 high mid + high  -- with slight damping
       }
+    } else {  // noise gate closed - just decay old values
+      isFirstRun = false;
+      for (int i=0; i < NUM_GEQ_CHANNELS; i++) {
+        fftCalc[i] *= 0.85f;  // decay to zero
+        if (fftCalc[i] < 4.0f) fftCalc[i] = 0.0f;
+    } }
 
       memcpy(lastFftCalc, fftCalc, sizeof(lastFftCalc)); // make a backup of last "good" channels
 
@@ -1211,7 +1180,6 @@ class AudioReactive : public Usermod {
     double   control_integrated = 0.0;   // persistent across calls to agcAvg(); "integrator control" = accumulated error
 
     // variables used by getSample() and agcAvg()
-    int16_t  micIn = 0;           // Current sample starts with negative values and large values, which is why it's 16 bit signed
     double   sampleMax = 0.0;     // Max sample over a few seconds. Needed for AGC controller.
     double   micLev = 0.0;        // Used to convert returned value to have '0' as minimum. A leveller
     float    expAdjF = 0.0f;      // Used for exponential filter.
@@ -1268,7 +1236,6 @@ class AudioReactive : public Usermod {
       //PLOT_PRINT("sampleAgc:");   PLOT_PRINT(sampleAgc);   PLOT_PRINT("\t");
       //PLOT_PRINT("sampleAvg:");   PLOT_PRINT(sampleAvg);   PLOT_PRINT("\t");
       //PLOT_PRINT("sampleReal:");  PLOT_PRINT(sampleReal);  PLOT_PRINT("\t");
-      //PLOT_PRINT("micIn:");       PLOT_PRINT(micIn);       PLOT_PRINT("\t");
       //PLOT_PRINT("sample:");      PLOT_PRINT(sample);      PLOT_PRINT("\t");
       //PLOT_PRINT("sampleMax:");   PLOT_PRINT(sampleMax);   PLOT_PRINT("\t");
       //PLOT_PRINT("multAgc:");     PLOT_PRINT(multAgc, 4);  PLOT_PRINT("\t");
@@ -1418,6 +1385,15 @@ class AudioReactive : public Usermod {
 
       // update global vars ONCE - multAgc, sampleAGC, rawSampleAgc
       multAgc = multAgcTemp;
+      if (micQuality > 0) {
+        if (micQuality > 1) {
+          rawSampleAgc = 0.95f * tmpAgc + 0.05f * (float)rawSampleAgc; // raw path
+          sampleAgc += 0.95f * (tmpAgc - sampleAgc); // smooth path
+        } else {
+          rawSampleAgc = 0.70f * tmpAgc + 0.30f * (float)rawSampleAgc; // min filtering path
+          sampleAgc += 0.70f * (tmpAgc - sampleAgc);
+        }
+      } else {
 #if defined(WLEDMM_FASTPATH)
       rawSampleAgc = 0.65f * tmpAgc + 0.35f * (float)rawSampleAgc;
 #else
@@ -1428,7 +1404,7 @@ class AudioReactive : public Usermod {
         sampleAgc =  0.5f * tmpAgc + 0.5f * sampleAgc;    // fast path to zero
       else
         sampleAgc += agcSampleSmooth[AGC_preset] * (tmpAgc - sampleAgc); // smooth path
-
+      }
       sampleAgc = fabsf(sampleAgc);                                      // // make sure we have a positive value
       last_soundAgc = soundAgc;
     } // agcAvg()
@@ -1446,27 +1422,6 @@ class AudioReactive : public Usermod {
       static unsigned long lastSoundTime = 0; // for delaying un-freeze
       static unsigned long startuptime = 0;   // "fast freeze" mode: do not interfere during first 12 seconds (filter startup time) 
 
-      #ifdef WLED_DISABLE_SOUND
-        micIn = inoise8(millis(), millis());          // Simulated analog read
-        micDataReal = micIn;
-      #else
-        #ifdef ARDUINO_ARCH_ESP32
-        micIn = int(micDataReal);      // micDataSm = ((micData * 3) + micData)/4;
-        #else
-        // this is the minimal code for reading analog mic input on 8266.
-        // warning!! Absolutely experimental code. Audio on 8266 is still not working. Expects a million follow-on problems. 
-        static unsigned long lastAnalogTime = 0;
-        static float lastAnalogValue = 0.0f;
-        if (millis() - lastAnalogTime > 20) {
-            micDataReal = analogRead(A0); // read one sample with 10bit resolution. This is a dirty hack, supporting volumereactive effects only.
-            lastAnalogTime = millis();
-            lastAnalogValue = micDataReal;
-            yield();
-        } else micDataReal = lastAnalogValue;
-        micIn = int(micDataReal);
-        #endif
-      #endif
-
       if (startuptime == 0) startuptime = millis();   // fast freeze mode - remember filter startup time
       if ((micLevelMethod < 1) || !isFrozen) {        // following the input level, UNLESS mic Level was frozen
         micLev += (micDataReal-micLev) / 12288.0f;
@@ -1477,7 +1432,6 @@ class AudioReactive : public Usermod {
         if (!haveSilence) isFrozen = true;                 // freeze mode: freeze micLevel so it cannot rise again
       }
 
-      micIn -= micLev;                                  // Let's center it to 0 now
       // Using an exponential filter to smooth out the signal. We'll add controls for this in a future release.
       float micInNoDC = fabsf(micDataReal - micLev);
 
@@ -1511,10 +1465,15 @@ class AudioReactive : public Usermod {
       if ((micLevelMethod == 2) && (millis() - startuptime < 12000)) isFrozen = false;   // fast freeze: no freeze in first 12 seconds (filter startup phase)
 
       tmpSample = expAdjF;
-      micIn = abs(micIn);                               // And get the absolute value of each sample
 
-      sampleAdj = tmpSample * sampleGain / 40.0f * inputLevel/128.0f + tmpSample / 16.0f; // Adjust the gain. with inputLevel adjustment
-      sampleReal = tmpSample;
+      // Adjust the gain. with inputLevel adjustment.
+      if (micQuality > 0) {
+        sampleAdj = micInNoDC * sampleGain / 40.0f * inputLevel/128.0f + micInNoDC / 16.0f; // ... using unfiltered sample
+        sampleReal = micInNoDC;
+      } else {
+        sampleAdj = tmpSample * sampleGain / 40.0f * inputLevel/128.0f + tmpSample / 16.0f; // ... using pre-filtered sample
+        sampleReal = tmpSample;
+      }
 
       sampleAdj = fmax(fmin(sampleAdj, 255.0f), 0.0f);        // Question: why are we limiting the value to 8 bits ???
       sampleRaw = (int16_t)sampleAdj;                   // ONLY update sample ONCE!!!!
@@ -1538,11 +1497,16 @@ class AudioReactive : public Usermod {
       }
       if (sampleMax < 0.5f) sampleMax = 0.0f;
 
+      if (micQuality > 0) {
+        if (micQuality > 1) sampleAvg += 0.95f * (sampleAdj - sampleAvg);
+        else sampleAvg += 0.70f * (sampleAdj - sampleAvg);
+      } else {
 #if defined(WLEDMM_FASTPATH)
       sampleAvg = ((sampleAvg * 11.0f) + sampleAdj) / 12.0f;   // make reactions a bit more "crisp" in fastpath mode 
 #else
       sampleAvg = ((sampleAvg * 15.0f) + sampleAdj) / 16.0f;   // Smooth it out over the last 16 samples.
 #endif
+      }
       sampleAvg = fabsf(sampleAvg);                            // make sure we have a positive value
     } // getSample()
 
@@ -2784,6 +2748,7 @@ class AudioReactive : public Usermod {
       //WLEDMM: experimental settings
       JsonObject poweruser = top.createNestedObject("experiments");
       poweruser[F("micLev")] = micLevelMethod;
+      poweruser[F("Mic_Quality")] = micQuality;
       poweruser[F("freqDist")] = freqDist;
       //poweruser[F("freqRMS")] = averageByRMS;
       poweruser[F("FFT_Window")] = fftWindow;
@@ -2859,6 +2824,7 @@ class AudioReactive : public Usermod {
 
       //WLEDMM: experimental settings
       configComplete &= getJsonValue(top["experiments"][F("micLev")], micLevelMethod);
+      configComplete &= getJsonValue(top["experiments"][F("Mic_Quality")], micQuality);
       configComplete &= getJsonValue(top["experiments"][F("freqDist")], freqDist);
       //configComplete &= getJsonValue(top["experiments"][F("freqRMS")],  averageByRMS);
       configComplete &= getJsonValue(top["experiments"][F("FFT_Window")], fftWindow);
@@ -2959,23 +2925,29 @@ class AudioReactive : public Usermod {
       oappend(SET_F("addOption(dd,'Lazy',3);"));
 
       //WLEDMM: experimental settings
-      oappend(SET_F("dd=addDropdown(ux,'experiments:micLev');"));
+      oappend(SET_F("xx='experiments';")); // shortcut
+      oappend(SET_F("dd=addDropdown(ux,xx+':micLev');"));
       oappend(SET_F("addOption(dd,'Floating  (⎌)',0);"));
       oappend(SET_F("addOption(dd,'Freeze',1);"));
       oappend(SET_F("addOption(dd,'Fast Freeze',2);"));
-      oappend(SET_F("addInfo(ux+':experiments:micLev',1,'☾');"));
+      oappend(SET_F("addInfo(ux+':'+xx+':micLev',1,'☾');"));
 
-      oappend(SET_F("dd=addDropdown(ux,'experiments:freqDist');"));
+      oappend(SET_F("dd=addDropdown(ux,xx+':Mic_Quality');"));
+      oappend(SET_F("addOption(dd,'average (standard)',0);"));
+      oappend(SET_F("addOption(dd,'low noise',1);"));
+      oappend(SET_F("addOption(dd,'perfect',2);"));
+
+      oappend(SET_F("dd=addDropdown(ux,xx+':freqDist');"));
       oappend(SET_F("addOption(dd,'Normal  (⎌)',0);"));
       oappend(SET_F("addOption(dd,'RightShift',1);"));
-      oappend(SET_F("addInfo(ux+':experiments:freqDist',1,'☾');"));
+      oappend(SET_F("addInfo(ux+':'+xx+':freqDist',1,'☾');"));
 
-      //oappend(SET_F("dd=addDropdown(ux,'experiments:freqRMS');"));
+      //oappend(SET_F("dd=addDropdown(ux,xx+':freqRMS');"));
       //oappend(SET_F("addOption(dd,'Off  (⎌)',0);"));
       //oappend(SET_F("addOption(dd,'On',1);"));
       //oappend(SET_F("addInfo(ux+':experiments:freqRMS',1,'☾');"));
 
-      oappend(SET_F("dd=addDropdown(ux,'experiments:FFT_Window');"));
+      oappend(SET_F("dd=addDropdown(ux,xx+':FFT_Window');"));
       oappend(SET_F("addOption(dd,'Blackman-Harris (MM standard)',0);"));
       oappend(SET_F("addOption(dd,'Hann (balanced)',1);"));
       oappend(SET_F("addOption(dd,'Nuttall (more accurate)',2);"));
@@ -2984,10 +2956,10 @@ class AudioReactive : public Usermod {
       oappend(SET_F("addOption(dd,'Flat-Top (AC WLED, inaccurate)',4);"));
 
 #ifdef FFT_USE_SLIDING_WINDOW
-      oappend(SET_F("dd=addDropdown(ux,'experiments:I2S_FastPath');"));
+      oappend(SET_F("dd=addDropdown(ux,xx+':I2S_FastPath');"));
       oappend(SET_F("addOption(dd,'Off',0);"));
       oappend(SET_F("addOption(dd,'On  (⎌)',1);"));
-      oappend(SET_F("addInfo(ux+':experiments:I2S_FastPath',1,'☾');"));
+      oappend(SET_F("addInfo(ux+':'+xx+':I2S_FastPath',1,'☾');"));
 #endif
 
       oappend(SET_F("dd=addDropdown(ux,'dynamics:limiter');"));

From 528ec1fa4cfb46025519183c387eafdc3ce3c262 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 5 Jul 2024 18:25:48 +0200
Subject: [PATCH 059/200] version of today, -b32.41

featuring FastPath v2
---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 wled00/wled.h     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 80dcf5ec..dce951b8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "wled",
-  "version": "0.14.1-b32.40",
+  "version": "0.14.1-b32.41",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "wled",
-      "version": "0.14.1-b32.40",
+      "version": "0.14.1-b32.41",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "clean-css": "^4.2.3",
diff --git a/package.json b/package.json
index 0536796c..2faab264 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wled",
-  "version": "0.14.1-b32.40",
+  "version": "0.14.1-b32.41",
   "description": "Tools for WLED project",
   "main": "tools/cdata.js",
   "directories": {
diff --git a/wled00/wled.h b/wled00/wled.h
index 8ff90dd5..f06f3a36 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2406240
+#define VERSION 2407050
 
 // 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 5123128e9c7bcc69a2397a0bd36ebb566548e481 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Tue, 9 Jul 2024 18:39:58 +0100
Subject: [PATCH 060/200] Limit hub75 chain length by height 64 not width to
 allow for 2 x 64x32

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

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index fff5ecb3..cb00ad29 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -518,9 +518,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
       break;
   }
 
-  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(mxconfig.mx_width >= 64 && (bc.pins[0] > 1)) {
+  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;
   }
@@ -609,6 +607,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
 #endif
 
+  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);
 

From fb30f9c64142dad49cdda3baa73f959e52969929 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Tue, 9 Jul 2024 21:35:53 +0100
Subject: [PATCH 061/200] Add Hub75Matrix 64x32 (Outdoor 8S)

---
 wled00/bus_manager.cpp        | 8 +++++++-
 wled00/data/settings_leds.htm | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index cb00ad29..2bd0a338 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -650,12 +650,18 @@ 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");
+      USER_PRINTLN("MatrixPanel_I2S_DMA FOUR_SCAN_32PX_HIGH - 32x32");
       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);
+      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);
       fourScanPanel->setPhysicalPanelScanRate(FOUR_SCAN_64PX_HIGH);
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index e1979fdc..5e31ee4c 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -384,7 +384,8 @@ ${i+1}:
 <option value="102">Hub75Matrix 64x32</option>
 <option value="103">Hub75Matrix 64x64</option>
 <option value="105">Hub75Matrix 32x32 (Outdoor 8S)</option>
-<option value="106">Hub75Matrix 64x64 (Outdoor 16S)</option>
+<option value="106">Hub75Matrix 64x32 (Outdoor 8S)</option>
+<option value="107">Hub75Matrix 64x64 (Outdoor 16S)</option>
 </select><br>
 <div id="co${i}" style="display:inline">Color Order:
 <select name="CO${i}">

From e2f23542f5eac0d7c1e11e2d86be67500dd893d7 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Wed, 10 Jul 2024 08:25:40 +0100
Subject: [PATCH 062/200] Add @TroyHacks 3D GEQ

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

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 416884cf..dcd40196 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8355,6 +8355,129 @@ uint16_t mode_2Dwavingcell() {
 }
 static const char _data_FX_MODE_2DWAVINGCELL[] PROGMEM = "Waving Cell@!,,Amplitude 1,Amplitude 2,Amplitude 3;;!;2";
 
+uint16_t mode_3DGEQ(void) {
+
+  static uint16_t projector;
+  static uint16_t projector_dir = 1;
+
+  // delay(1000);
+
+  if (SEGENV.call == 0) {
+    projector = 0;
+    SEGMENT.setUpLeds(); // WLEDMM use lossless getPixelColor()
+    SEGMENT.fill(BLACK);
+  } else {
+    projector += projector_dir;
+    if (projector == SEGMENT.virtualWidth()) projector_dir = -1;
+    if (projector == 0) projector_dir = 1;
+  }
+
+  uint_fast8_t split = map(projector,0,SEGMENT.virtualWidth(),0,15);
+
+  if (SEGMENT.speed > 250) {
+    SEGMENT.fill(BLACK);
+  } else {
+    SEGMENT.fadeToBlackBy(SEGMENT.speed);
+  }
+
+  const int NUM_BANDS = 16; // map(SEGMENT.custom1, 0, 255, 1, 16);
+  const uint16_t cols = SEGMENT.virtualWidth();
+  const uint16_t rows = SEGMENT.virtualHeight();
+
+  um_data_t *um_data;
+  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
+    // add support for no audio
+    um_data = simulateSound(SEGMENT.soundSim);
+  }
+  uint8_t *fftResult = (uint8_t*)um_data->u_data[2];
+
+  uint8_t heights[16] = { 0 };
+
+  for (int i=0; i<16; i++) {
+    heights[i] = map(fftResult[i],0,255,0,rows-10);
+  }
+
+  for (int i=0; i<=split; i++) { // paint right vertical faces and top
+
+    uint16_t colorIndex = map(cols/16*i, 0, cols-1, 0, 255);
+    uint32_t ledColor = SEGMENT.color_from_palette(colorIndex, false, PALETTE_SOLID_WRAP, 0);
+
+    int linex = i*(cols/16);
+
+    if (heights[i] > 1) {
+
+      for (int y = 0; y <= heights[i]; y++) {
+        SEGMENT.drawLine(linex+(cols/16)-1,rows-y-1,projector,0,color_fade(ledColor,32,true));
+      } 
+
+      for (int x=linex; x<=linex+(cols/16)-1;x++) {
+        SEGMENT.drawLine(x,            rows-heights[i]-2,projector,0,color_fade(ledColor,128,true)); // top perspective
+      }
+
+    }
+
+  }
+
+  for (int i=15; i>split; i--) { // paint left vertical faces and top
+
+    uint16_t colorIndex = map(cols/16*i, 0, cols-1, 0, 255);
+    uint32_t ledColor = SEGMENT.color_from_palette(colorIndex, false, PALETTE_SOLID_WRAP, 0);
+
+    int linex = i*(cols/16);
+
+    if (heights[i] > 1) {
+
+      for (int y = 0; y <= heights[i]; y++) {
+        SEGMENT.drawLine(linex           ,rows-y-1,projector,0,color_fade(ledColor,32,true));
+      } 
+
+      for (int x=linex; x<=linex+(cols/16)-1;x++) {
+        SEGMENT.drawLine(x,            rows-heights[i]-2,projector,0,color_fade(ledColor,128,true)); // top perspective
+      }
+      
+    }
+
+  }
+
+  for (int i=0; i<16; i++) {
+
+    uint16_t colorIndex = map(cols/16*i, 0, cols-1, 0, 255);
+    uint32_t ledColor = SEGMENT.color_from_palette(colorIndex, false, PALETTE_SOLID_WRAP, 0);
+
+    int linex = i*(cols/16);
+
+    if (heights[i] > 1) {
+
+      // Full bright fronts, fills all front face.
+      // for (int x=linex; x<linex+(cols/16);x++) { 
+      //   SEGMENT.drawLine(x,rows-1,x,rows-heights[i]-1,ledColor); // front fill
+      // }
+
+      // Faded fronts, assumes border added later.
+      // for (int x=linex+1; x<linex+(cols/16)-1;x++) { 
+      //   SEGMENT.drawLine(x,rows-2,x,rows-heights[i]-2,color_fade(ledColor,64,true)); // front fill
+      // }
+
+      // "Negative Space" - draw pure black fronts
+      for (int x=linex; x<linex+(cols/16);x++) { 
+        SEGMENT.drawLine(x,rows-1,x,rows-heights[i]-1,BLACK); // front fill
+      }
+
+      // Border
+      // SEGMENT.drawLine(linex,            rows-1,linex,rows-heights[i]-1,ledColor); // left side line
+      // SEGMENT.drawLine(linex+(cols/16)-1,rows-1,linex+(cols/16)-1,rows-heights[i]-1,ledColor); // right side line
+      // SEGMENT.drawLine(linex,            rows-heights[i]-2,linex+(cols/16)-1,rows-heights[i]-2,ledColor); // top line
+      // SEGMENT.drawLine(linex,            rows-1,linex+(cols/16)-1,rows-1,ledColor); // bottom line
+
+    }
+
+  }
+
+  return FRAMETIME;
+
+}
+static const char _data_FX_MODE_3DGEQ[] PROGMEM = "3D GEQ" // TODO set Audio, 2D and controls etc
+
 
 #endif // WLED_DISABLE_2D
 
@@ -8601,6 +8724,9 @@ void WS2812FX::setupEffectData() {
   addEffect(FX_MODE_2DWAVINGCELL, &mode_2Dwavingcell, _data_FX_MODE_2DWAVINGCELL);
 
   addEffect(FX_MODE_2DAKEMI, &mode_2DAkemi, _data_FX_MODE_2DAKEMI); // audio
+
+  addEffect(FX_MODE_3DGEQ, &mode_3DGEQ, _data_FX_MODE_3DGEQ); // audio
+
 #endif // WLED_DISABLE_2D
 
 }
diff --git a/wled00/FX.h b/wled00/FX.h
index b8864db4..10c4c7d0 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -344,8 +344,9 @@ bool strip_uses_global_leds(void);              // WLEDMM implemented in FX_fcn.
 #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
+#define FX_MODE_3DGEQ                  195 // WLED-MM 3D GEQ
 
-#define MODE_COUNT                     195
+#define MODE_COUNT                     196
 
 typedef enum mapping1D2D {
   M12_Pixels = 0,

From e452d4d316a46902a7b22488da23dfe5d230874b Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Wed, 10 Jul 2024 08:26:07 +0100
Subject: [PATCH 063/200] Add @TroyHacks 3D GEQ

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

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index dcd40196..70fa797d 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8357,6 +8357,8 @@ static const char _data_FX_MODE_2DWAVINGCELL[] PROGMEM = "Waving Cell@!,,Amplitu
 
 uint16_t mode_3DGEQ(void) {
 
+  // Author: @TroyHacks
+  
   static uint16_t projector;
   static uint16_t projector_dir = 1;
 

From 2d7e416879bdc3a481596cd479d98727872ddc59 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Wed, 10 Jul 2024 08:33:42 +0100
Subject: [PATCH 064/200] ;

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

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 70fa797d..70163a1e 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8478,7 +8478,7 @@ uint16_t mode_3DGEQ(void) {
   return FRAMETIME;
 
 }
-static const char _data_FX_MODE_3DGEQ[] PROGMEM = "3D GEQ" // TODO set Audio, 2D and controls etc
+static const char _data_FX_MODE_3DGEQ[] PROGMEM = "3D GEQ"; // TODO set Audio, 2D and controls etc
 
 
 #endif // WLED_DISABLE_2D

From 45f288a2f2aa942543ee1a411fe5c629cdd64f59 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Wed, 10 Jul 2024 08:59:05 +0100
Subject: [PATCH 065/200] 3D GEQ - make front brightness a control

---
 wled00/FX.cpp | 47 +++++++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 70163a1e..02d9efcf 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8358,7 +8358,7 @@ static const char _data_FX_MODE_2DWAVINGCELL[] PROGMEM = "Waving Cell@!,,Amplitu
 uint16_t mode_3DGEQ(void) {
 
   // Author: @TroyHacks
-  
+
   static uint16_t projector;
   static uint16_t projector_dir = 1;
 
@@ -8441,6 +8441,7 @@ uint16_t mode_3DGEQ(void) {
 
   }
 
+  uint8_t frontBrightness = SEGMENT.custom1;
   for (int i=0; i<16; i++) {
 
     uint16_t colorIndex = map(cols/16*i, 0, cols-1, 0, 255);
@@ -8450,35 +8451,41 @@ uint16_t mode_3DGEQ(void) {
 
     if (heights[i] > 1) {
 
-      // Full bright fronts, fills all front face.
-      // for (int x=linex; x<linex+(cols/16);x++) { 
-      //   SEGMENT.drawLine(x,rows-1,x,rows-heights[i]-1,ledColor); // front fill
-      // }
-
-      // Faded fronts, assumes border added later.
-      // for (int x=linex+1; x<linex+(cols/16)-1;x++) { 
-      //   SEGMENT.drawLine(x,rows-2,x,rows-heights[i]-2,color_fade(ledColor,64,true)); // front fill
-      // }
-
-      // "Negative Space" - draw pure black fronts
-      for (int x=linex; x<linex+(cols/16);x++) { 
-        SEGMENT.drawLine(x,rows-1,x,rows-heights[i]-1,BLACK); // front fill
+      if(frontBrightness > 250) {
+        // Full bright fronts, fills all front face.
+        for (int x=linex; x<linex+(cols/16);x++) { 
+          SEGMENT.drawLine(x,rows-1,x,rows-heights[i]-1,ledColor); // front fill
+        }
+      }
+      else if(frontBrightness >= 50) {
+        // Faded fronts, assumes border added later.
+        for (int x=linex+1; x<linex+(cols/16)-1;x++) { 
+          SEGMENT.drawLine(x,rows-2,x,rows-heights[i]-2,color_fade(ledColor,64,true)); // front fill
+        }
+      }
+      else {
+        // "Negative Space" - draw pure black fronts
+        for (int x=linex; x<linex+(cols/16);x++) { 
+          SEGMENT.drawLine(x,rows-1,x,rows-heights[i]-1,BLACK); // front fill
+        }
       }
 
+    if(frontBrightness >= 50) { // TODO: other values too? not sure exactly when we want the border
       // Border
-      // SEGMENT.drawLine(linex,            rows-1,linex,rows-heights[i]-1,ledColor); // left side line
-      // SEGMENT.drawLine(linex+(cols/16)-1,rows-1,linex+(cols/16)-1,rows-heights[i]-1,ledColor); // right side line
-      // SEGMENT.drawLine(linex,            rows-heights[i]-2,linex+(cols/16)-1,rows-heights[i]-2,ledColor); // top line
-      // SEGMENT.drawLine(linex,            rows-1,linex+(cols/16)-1,rows-1,ledColor); // bottom line
-
+      SEGMENT.drawLine(linex,            rows-1,linex,rows-heights[i]-1,ledColor); // left side line
+      SEGMENT.drawLine(linex+(cols/16)-1,rows-1,linex+(cols/16)-1,rows-heights[i]-1,ledColor); // right side line
+      SEGMENT.drawLine(linex,            rows-heights[i]-2,linex+(cols/16)-1,rows-heights[i]-2,ledColor); // top line
+      SEGMENT.drawLine(linex,            rows-1,linex+(cols/16)-1,rows-1,ledColor); // bottom line
     }
 
   }
 
+  }
+
   return FRAMETIME;
 
 }
-static const char _data_FX_MODE_3DGEQ[] PROGMEM = "3D GEQ"; // TODO set Audio, 2D and controls etc
+static const char _data_FX_MODE_3DGEQ[] PROGMEM = "3D GEQ☾@!,,Fill Front,,;;!;2"; // TODO set Audio, 2D and controls etc
 
 
 #endif // WLED_DISABLE_2D

From f6cd28cea2ed291560d1e8b44b14e6d354d2eb0d Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Wed, 10 Jul 2024 09:20:58 +0100
Subject: [PATCH 066/200] 3D GEQ - customisable number of bands

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

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 02d9efcf..6cda5cf9 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8382,7 +8382,7 @@ uint16_t mode_3DGEQ(void) {
     SEGMENT.fadeToBlackBy(SEGMENT.speed);
   }
 
-  const int NUM_BANDS = 16; // map(SEGMENT.custom1, 0, 255, 1, 16);
+  const int NUM_BANDS = map(SEGMENT.custom1, 0, 255, 1, 16);
   const uint16_t cols = SEGMENT.virtualWidth();
   const uint16_t rows = SEGMENT.virtualHeight();
 
@@ -8393,26 +8393,26 @@ uint16_t mode_3DGEQ(void) {
   }
   uint8_t *fftResult = (uint8_t*)um_data->u_data[2];
 
-  uint8_t heights[16] = { 0 };
+  uint8_t heights[NUM_BANDS] = { 0 };
 
-  for (int i=0; i<16; i++) {
-    heights[i] = map(fftResult[i],0,255,0,rows-10);
+  for (int i=0; i<NUM_BANDS; i++) {
+    heights[i] = map(fftResult[i],0,255,0,rows-10); // TODO: avg don't just take lower bands?
   }
 
   for (int i=0; i<=split; i++) { // paint right vertical faces and top
 
-    uint16_t colorIndex = map(cols/16*i, 0, cols-1, 0, 255);
+    uint16_t colorIndex = map(cols/NUM_BANDS*i, 0, cols-1, 0, 255);
     uint32_t ledColor = SEGMENT.color_from_palette(colorIndex, false, PALETTE_SOLID_WRAP, 0);
 
-    int linex = i*(cols/16);
+    int linex = i*(cols/NUM_BANDS);
 
     if (heights[i] > 1) {
 
       for (int y = 0; y <= heights[i]; y++) {
-        SEGMENT.drawLine(linex+(cols/16)-1,rows-y-1,projector,0,color_fade(ledColor,32,true));
+        SEGMENT.drawLine(linex+(cols/NUM_BANDS)-1,rows-y-1,projector,0,color_fade(ledColor,32,true));
       } 
 
-      for (int x=linex; x<=linex+(cols/16)-1;x++) {
+      for (int x=linex; x<=linex+(cols/NUM_BANDS)-1;x++) {
         SEGMENT.drawLine(x,            rows-heights[i]-2,projector,0,color_fade(ledColor,128,true)); // top perspective
       }
 
@@ -8422,10 +8422,10 @@ uint16_t mode_3DGEQ(void) {
 
   for (int i=15; i>split; i--) { // paint left vertical faces and top
 
-    uint16_t colorIndex = map(cols/16*i, 0, cols-1, 0, 255);
+    uint16_t colorIndex = map(cols/NUM_BANDS*i, 0, cols-1, 0, 255);
     uint32_t ledColor = SEGMENT.color_from_palette(colorIndex, false, PALETTE_SOLID_WRAP, 0);
 
-    int linex = i*(cols/16);
+    int linex = i*(cols/NUM_BANDS);
 
     if (heights[i] > 1) {
 
@@ -8433,7 +8433,7 @@ uint16_t mode_3DGEQ(void) {
         SEGMENT.drawLine(linex           ,rows-y-1,projector,0,color_fade(ledColor,32,true));
       } 
 
-      for (int x=linex; x<=linex+(cols/16)-1;x++) {
+      for (int x=linex; x<=linex+(cols/NUM_BANDS)-1;x++) {
         SEGMENT.drawLine(x,            rows-heights[i]-2,projector,0,color_fade(ledColor,128,true)); // top perspective
       }
       
@@ -8441,31 +8441,31 @@ uint16_t mode_3DGEQ(void) {
 
   }
 
-  uint8_t frontBrightness = SEGMENT.custom1;
-  for (int i=0; i<16; i++) {
+  uint8_t frontBrightness = SEGMENT.custom2;
+  for (int i=0; i<NUM_BANDS; i++) {
 
-    uint16_t colorIndex = map(cols/16*i, 0, cols-1, 0, 255);
+    uint16_t colorIndex = map(cols/NUM_BANDS*i, 0, cols-1, 0, 255);
     uint32_t ledColor = SEGMENT.color_from_palette(colorIndex, false, PALETTE_SOLID_WRAP, 0);
 
-    int linex = i*(cols/16);
+    int linex = i*(cols/NUM_BANDS);
 
     if (heights[i] > 1) {
 
       if(frontBrightness > 250) {
         // Full bright fronts, fills all front face.
-        for (int x=linex; x<linex+(cols/16);x++) { 
+        for (int x=linex; x<linex+(cols/NUM_BANDS);x++) { 
           SEGMENT.drawLine(x,rows-1,x,rows-heights[i]-1,ledColor); // front fill
         }
       }
       else if(frontBrightness >= 50) {
         // Faded fronts, assumes border added later.
-        for (int x=linex+1; x<linex+(cols/16)-1;x++) { 
+        for (int x=linex+1; x<linex+(cols/NUM_BANDS)-1;x++) { 
           SEGMENT.drawLine(x,rows-2,x,rows-heights[i]-2,color_fade(ledColor,64,true)); // front fill
         }
       }
       else {
         // "Negative Space" - draw pure black fronts
-        for (int x=linex; x<linex+(cols/16);x++) { 
+        for (int x=linex; x<linex+(cols/NUM_BANDS);x++) { 
           SEGMENT.drawLine(x,rows-1,x,rows-heights[i]-1,BLACK); // front fill
         }
       }
@@ -8473,9 +8473,9 @@ uint16_t mode_3DGEQ(void) {
     if(frontBrightness >= 50) { // TODO: other values too? not sure exactly when we want the border
       // Border
       SEGMENT.drawLine(linex,            rows-1,linex,rows-heights[i]-1,ledColor); // left side line
-      SEGMENT.drawLine(linex+(cols/16)-1,rows-1,linex+(cols/16)-1,rows-heights[i]-1,ledColor); // right side line
-      SEGMENT.drawLine(linex,            rows-heights[i]-2,linex+(cols/16)-1,rows-heights[i]-2,ledColor); // top line
-      SEGMENT.drawLine(linex,            rows-1,linex+(cols/16)-1,rows-1,ledColor); // bottom line
+      SEGMENT.drawLine(linex+(cols/NUM_BANDS)-1,rows-1,linex+(cols/NUM_BANDS)-1,rows-heights[i]-1,ledColor); // right side line
+      SEGMENT.drawLine(linex,            rows-heights[i]-2,linex+(cols/NUM_BANDS)-1,rows-heights[i]-2,ledColor); // top line
+      SEGMENT.drawLine(linex,            rows-1,linex+(cols/NUM_BANDS)-1,rows-1,ledColor); // bottom line
     }
 
   }
@@ -8485,7 +8485,7 @@ uint16_t mode_3DGEQ(void) {
   return FRAMETIME;
 
 }
-static const char _data_FX_MODE_3DGEQ[] PROGMEM = "3D GEQ☾@!,,Fill Front,,;;!;2"; // TODO set Audio, 2D and controls etc
+static const char _data_FX_MODE_3DGEQ[] PROGMEM = "3D GEQ☾@!,,Bands,Fill Front,;;!;2"; // TODO set Audio, 2D and controls etc
 
 
 #endif // WLED_DISABLE_2D

From cb3d06bc894ca4c61aa7b8bbecb44d2684726859 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Wed, 10 Jul 2024 09:24:26 +0100
Subject: [PATCH 067/200] 3D GEQ - variable front brightness

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

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 6cda5cf9..d157d5ce 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8460,7 +8460,7 @@ uint16_t mode_3DGEQ(void) {
       else if(frontBrightness >= 50) {
         // Faded fronts, assumes border added later.
         for (int x=linex+1; x<linex+(cols/NUM_BANDS)-1;x++) { 
-          SEGMENT.drawLine(x,rows-2,x,rows-heights[i]-2,color_fade(ledColor,64,true)); // front fill
+          SEGMENT.drawLine(x,rows-2,x,rows-heights[i]-2,color_fade(ledColor,map(frontBrightness, 50, 250, 0, 255),true)); // front fill
         }
       }
       else {

From 3fd80787226e5ce65655fff92a43176ac3659518 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Wed, 10 Jul 2024 09:40:40 +0100
Subject: [PATCH 068/200] 3D GEQ - customisable number of bands

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

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index d157d5ce..144499c5 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8374,8 +8374,6 @@ uint16_t mode_3DGEQ(void) {
     if (projector == 0) projector_dir = 1;
   }
 
-  uint_fast8_t split = map(projector,0,SEGMENT.virtualWidth(),0,15);
-
   if (SEGMENT.speed > 250) {
     SEGMENT.fill(BLACK);
   } else {
@@ -8385,6 +8383,7 @@ uint16_t mode_3DGEQ(void) {
   const int NUM_BANDS = map(SEGMENT.custom1, 0, 255, 1, 16);
   const uint16_t cols = SEGMENT.virtualWidth();
   const uint16_t rows = SEGMENT.virtualHeight();
+  const uint_fast8_t split = map(projector,0,SEGMENT.virtualWidth(),0,(NUM_BANDS - 1));
 
   um_data_t *um_data;
   if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
@@ -8420,7 +8419,7 @@ uint16_t mode_3DGEQ(void) {
 
   }
 
-  for (int i=15; i>split; i--) { // paint left vertical faces and top
+  for (int i=(NUM_BANDS - 1); i>split; i--) { // paint left vertical faces and top
 
     uint16_t colorIndex = map(cols/NUM_BANDS*i, 0, cols-1, 0, 255);
     uint32_t ledColor = SEGMENT.color_from_palette(colorIndex, false, PALETTE_SOLID_WRAP, 0);

From bda4bbeeecabce2cc23fd96a98bba00ae95f2358 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Wed, 10 Jul 2024 23:00:42 +0100
Subject: [PATCH 069/200] 3D GEQ - fade speed

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

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 144499c5..e61a466b 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8484,7 +8484,7 @@ uint16_t mode_3DGEQ(void) {
   return FRAMETIME;
 
 }
-static const char _data_FX_MODE_3DGEQ[] PROGMEM = "3D GEQ☾@!,,Bands,Fill Front,;;!;2"; // TODO set Audio, 2D and controls etc
+static const char _data_FX_MODE_3DGEQ[] PROGMEM = "3D GEQ☾@!Fade Speed,,Bands,Fill Front,;;!;2"; // TODO set Audio, 2D and controls etc
 
 
 #endif // WLED_DISABLE_2D

From 60fbf07bcad983344c63ebd1dcf47708050d3daa Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Wed, 10 Jul 2024 23:01:21 +0100
Subject: [PATCH 070/200] Fix mx_width and height for 4scan

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

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 2bd0a338..9ad6c948 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -513,6 +513,10 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
       mxconfig.mx_height = 32 / 2;
       break;
     case 106:
+      mxconfig.mx_width = 64 * 2;
+      mxconfig.mx_height = 32 / 2;
+      break;
+    case 107:
       mxconfig.mx_width = 64 * 2;
       mxconfig.mx_height = 64 / 2;
       break;

From 8f4380b075a3ba054d15b0a82330843a6ad436cf Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Wed, 10 Jul 2024 23:51:53 +0100
Subject: [PATCH 071/200] Rename 3D GEQ to GEQ Laser

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

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index e61a466b..6ae0672b 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8355,7 +8355,7 @@ uint16_t mode_2Dwavingcell() {
 }
 static const char _data_FX_MODE_2DWAVINGCELL[] PROGMEM = "Waving Cell@!,,Amplitude 1,Amplitude 2,Amplitude 3;;!;2";
 
-uint16_t mode_3DGEQ(void) {
+uint16_t mode_GEQLASER(void) {
 
   // Author: @TroyHacks
 
@@ -8484,7 +8484,7 @@ uint16_t mode_3DGEQ(void) {
   return FRAMETIME;
 
 }
-static const char _data_FX_MODE_3DGEQ[] PROGMEM = "3D GEQ☾@!Fade Speed,,Bands,Fill Front,;;!;2"; // TODO set Audio, 2D and controls etc
+static const char _data_FX_MODE_GEQLASER[] PROGMEM = "GEQ Laser ☾@Fade Speed,,Bands,Fill Front,;;!;2f"; 
 
 
 #endif // WLED_DISABLE_2D
@@ -8733,7 +8733,7 @@ void WS2812FX::setupEffectData() {
 
   addEffect(FX_MODE_2DAKEMI, &mode_2DAkemi, _data_FX_MODE_2DAKEMI); // audio
 
-  addEffect(FX_MODE_3DGEQ, &mode_3DGEQ, _data_FX_MODE_3DGEQ); // audio
+  addEffect(FX_MODE_GEQLASER, &mode_GEQLASER, _data_FX_MODE_GEQLASER); // audio
 
 #endif // WLED_DISABLE_2D
 
diff --git a/wled00/FX.h b/wled00/FX.h
index 10c4c7d0..2143d984 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -344,7 +344,7 @@ bool strip_uses_global_leds(void);              // WLEDMM implemented in FX_fcn.
 #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
-#define FX_MODE_3DGEQ                  195 // WLED-MM 3D GEQ
+#define FX_MODE_GEQLASER                  195 // WLED-MM GEQ Laser
 
 #define MODE_COUNT                     196
 

From 1fe871c42ce73463fb0177d118419f26e14aa57a Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Wed, 10 Jul 2024 18:54:02 -0400
Subject: [PATCH 072/200] Fully working with analog loopthru

---
 usermods/audioreactive/audio_source.h | 111 +++++---------------------
 1 file changed, 19 insertions(+), 92 deletions(-)

diff --git a/usermods/audioreactive/audio_source.h b/usermods/audioreactive/audio_source.h
index c83af476..f8156fe7 100644
--- a/usermods/audioreactive/audio_source.h
+++ b/usermods/audioreactive/audio_source.h
@@ -749,8 +749,8 @@ class AC101Source : public I2SSource {
       #endif
       char send_buff[3];
       send_buff[0] = reg_addr;
-      send_buff[1] = (val >> 8) & 0xff;
-      send_buff[2] = val & 0xff;
+      send_buff[1] = uint8_t((val >> 8) & 0xff);
+      send_buff[2] = uint8_t(val & 0xff);
       Wire.beginTransmission(AC101_ADDR);
       Wire.write((const uint8_t*)send_buff, 3);
       uint8_t i2cErr = Wire.endTransmission();  // i2cErr == 0 means OK
@@ -765,112 +765,39 @@ class AC101Source : public I2SSource {
       _ac101I2cBegin(); 
 
       #define CHIP_AUDIO_RS	  	0x00
-      #define PLL_CTRL1			    0x01
-      #define PLL_CTRL2			    0x02
       #define SYSCLK_CTRL		  	0x03
       #define MOD_CLK_ENA		  	0x04
       #define MOD_RST_CTRL	  	0x05
       #define I2S_SR_CTRL		  	0x06
       #define I2S1LCK_CTRL		  0x10
       #define I2S1_SDOUT_CTRL	  0x11
-      #define I2S1_SDIN_CTRL	  0x12
       #define I2S1_MXR_SRC	  	0x13
-      #define I2S1_VOL_CTRL1  	0x14
-      #define I2S1_VOL_CTRL2  	0x15
-      #define I2S1_VOL_CTRL3  	0x16
-      #define I2S1_VOL_CTRL4  	0x17
-      #define I2S1_MXR_GAIN	  	0x18
       #define ADC_DIG_CTRL	  	0x40
-      #define ADC_VOL_CTRL	  	0x41
-      #define HMIC_CTRL1		  	0x44
-      #define HMIC_CTRL2		  	0x45
-      #define HMIC_STATUS	  		0x46
-      #define DAC_DIG_CTRL	  	0x48
-      #define DAC_VOL_CTRL	  	0x49
-      #define DAC_MXR_SRC		  	0x4c
-      #define DAC_MXR_GAIN	  	0x4d
       #define ADC_APC_CTRL		  0x50
       #define ADC_SRC				    0x51
       #define ADC_SRCBST_CTRL	  0x52
       #define OMIXER_DACA_CTRL  0x53
       #define OMIXER_SR			    0x54
-      #define OMIXER_BST1_CTRL	0x55
       #define HPOUT_CTRL			  0x56
-      #define SPKOUT_CTRL			  0x58
-      #define AC_DAC_DAPCTRL		0xa0
-      #define AC_DAC_DAPHHPFC 	0xa1
-      #define AC_DAC_DAPLHPFC 	0xa2
-      #define AC_DAC_DAPLHAVC 	0xa3
-      #define AC_DAC_DAPLLAVC 	0xa4
-      #define AC_DAC_DAPRHAVC 	0xa5
-      #define AC_DAC_DAPRLAVC 	0xa6
-      #define AC_DAC_DAPHGDEC 	0xa7
-      #define AC_DAC_DAPLGDEC 	0xa8
-      #define AC_DAC_DAPHGATC 	0xa9
-      #define AC_DAC_DAPLGATC 	0xaa
-      #define AC_DAC_DAPHETHD 	0xab
-      #define AC_DAC_DAPLETHD 	0xac
-      #define AC_DAC_DAPHGKPA 	0xad
-      #define AC_DAC_DAPLGKPA 	0xae
-      #define AC_DAC_DAPHGOPA 	0xaf
-      #define AC_DAC_DAPLGOPA 	0xb0
-      #define AC_DAC_DAPOPT   	0xb1
-      #define DAC_DAP_ENA     	0xb5
 
-      _ac101I2cWrite(CHIP_AUDIO_RS, 0x123); // Reset (any value written does a reset)
-      vTaskDelay(1000 / portTICK_PERIOD_MS);
-      _ac101I2cWrite(SPKOUT_CTRL, 0xe880);
-
-      //Enable the PLL from 256*44.1KHz MCLK source
-      _ac101I2cWrite(PLL_CTRL1, 0x014f);
-      //res |= ac101_write_reg(PLL_CTRL2, 0x83c0);
-      _ac101I2cWrite(PLL_CTRL2, 0x8600);
-
-      //Clocking system
-      _ac101I2cWrite(SYSCLK_CTRL, 0x8b08);
-      _ac101I2cWrite(MOD_CLK_ENA, 0x800c);
-      _ac101I2cWrite(MOD_RST_CTRL, 0x800c);
-      _ac101I2cWrite(I2S_SR_CTRL, 0b0111000000000000); //sample rate 22050 Hz
-      //AIF config
-      _ac101I2cWrite(I2S1LCK_CTRL, 0x8850);	//BCLK/LRCK
-      _ac101I2cWrite(I2S1_SDOUT_CTRL, 0xc000); //
-      _ac101I2cWrite(I2S1_SDIN_CTRL, 0xc000);
-      _ac101I2cWrite(I2S1_MXR_SRC, 0x2200); //
-
-      _ac101I2cWrite(ADC_SRCBST_CTRL, 0xccc4);
-      _ac101I2cWrite(ADC_SRC, 0x2020);
-      _ac101I2cWrite(ADC_DIG_CTRL, 0x8000);
-      _ac101I2cWrite(ADC_APC_CTRL, 0xbbc3);
-
-      //Path Configuration
-      _ac101I2cWrite(DAC_MXR_SRC, 0xcc00);
-      _ac101I2cWrite(DAC_DIG_CTRL, 0x8000);
-      _ac101I2cWrite(OMIXER_SR, 0x0081);
-      _ac101I2cWrite(OMIXER_DACA_CTRL, 0xf080); //}
-
-      //* Enable Speaker output
-      // _ac101I2cWrite(0x58, 0xeabd);
-
-      _ac101I2cWrite(ADC_SRC, 0b0000010000001000); // Line-in to ADC
-      _ac101I2cWrite(ADC_DIG_CTRL, 0x8000);
-      _ac101I2cWrite(ADC_APC_CTRL, 0x3bc0);
-      //I2S1_SDOUT_CTRL
-      //res |= _ac101I2cWrite(PLL_CTRL2, 0x8120);
-      _ac101I2cWrite(MOD_CLK_ENA, 0x800c);
-      _ac101I2cWrite(MOD_RST_CTRL, 0x800c);
-      //res |= _ac101I2cWrite(0x06, 0x3000);
-      //* Enable Headphoe output
-      _ac101I2cWrite(OMIXER_DACA_CTRL, 0xff80);
-      _ac101I2cWrite(HPOUT_CTRL, 0xc3c1);
-      _ac101I2cWrite(HPOUT_CTRL, 0xcb00);
-      vTaskDelay(100 / portTICK_PERIOD_MS);
-      _ac101I2cWrite(HPOUT_CTRL, 0xfbc0);
-
-      _ac101I2cWrite(OMIXER_SR, 0b0000010000001000); // default all 0
-
-      //* Enable Speaker output
-      _ac101I2cWrite(SPKOUT_CTRL, 0xeabd);
+      _ac101I2cWrite(CHIP_AUDIO_RS, 0x123); // I think anything written here is a reset as 0x123 is kinda suss.
+      
+      delay(100);
 
+      _ac101I2cWrite(SYSCLK_CTRL,       0b0000100000001000); // System Clock is I2S MCLK
+      _ac101I2cWrite(MOD_CLK_ENA,       0b1000000000001000); // I2S and ADC Clock Enable
+      _ac101I2cWrite(MOD_RST_CTRL,      0b1000000000001000); // I2S and ADC Clock Enable
+      _ac101I2cWrite(I2S_SR_CTRL,       0b0100000000000000); // set to 22050hz just in case
+      _ac101I2cWrite(I2S1LCK_CTRL,      0b1000000000110000); // set I2S slave mode, 24-bit word size
+      _ac101I2cWrite(I2S1_SDOUT_CTRL,   0b1100000000000000); // I2S enable Left/Right channels
+      _ac101I2cWrite(I2S1_MXR_SRC,      0b0010001000000000); // I2S digital Mixer, ADC L/R data
+      _ac101I2cWrite(ADC_SRCBST_CTRL,   0b0000000000000100); // mute all boosts. last 3 bits are reserved/default
+      _ac101I2cWrite(OMIXER_SR,         0b0000010000001000); // Line L/R to output mixer
+      _ac101I2cWrite(ADC_SRC,           0b0000010000001000); // Line L/R to ADC
+      _ac101I2cWrite(ADC_DIG_CTRL,      0b1000000000000000); // Enable ADC
+      _ac101I2cWrite(ADC_APC_CTRL,      0b1011100100000000); // ADC L/R enabled, 0dB gain
+      _ac101I2cWrite(OMIXER_DACA_CTRL,  0b0011111110000000); // L/R Analog Output Mixer enabled, headphone DC offset default
+      _ac101I2cWrite(HPOUT_CTRL,        0b1111101111110001); // Headphone out from Analog Mixer stage, no reduction in volume
 
     }
 

From aed861d063c2a4f66d42788fad811270b2bdce03 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Wed, 10 Jul 2024 23:58:35 +0100
Subject: [PATCH 073/200] GEQ Laser use SEGMENT.data

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

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 6ae0672b..68b848cd 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8359,19 +8359,21 @@ uint16_t mode_GEQLASER(void) {
 
   // Author: @TroyHacks
 
-  static uint16_t projector;
-  static uint16_t projector_dir = 1;
+  const size_t dataSize = sizeof(uint16_t);
+  if (!SEGENV.allocateData(dataSize * 2)) return mode_static(); //allocation failed
 
-  // delay(1000);
+  uint16_t *projector = reinterpret_cast<uint16_t*>(SEGENV.data);
+  uint16_t *projector_dir = reinterpret_cast<uint16_t*>(SEGENV.data + dataSize);
 
   if (SEGENV.call == 0) {
-    projector = 0;
+    *projector = 0;
+    *projector_dir = 0;
     SEGMENT.setUpLeds(); // WLEDMM use lossless getPixelColor()
     SEGMENT.fill(BLACK);
   } else {
-    projector += projector_dir;
-    if (projector == SEGMENT.virtualWidth()) projector_dir = -1;
-    if (projector == 0) projector_dir = 1;
+    *projector += *projector_dir;
+    if (*projector == SEGMENT.virtualWidth()) *projector_dir = -1;
+    if (*projector == 0) *projector_dir = 1;
   }
 
   if (SEGMENT.speed > 250) {
@@ -8383,7 +8385,7 @@ uint16_t mode_GEQLASER(void) {
   const int NUM_BANDS = map(SEGMENT.custom1, 0, 255, 1, 16);
   const uint16_t cols = SEGMENT.virtualWidth();
   const uint16_t rows = SEGMENT.virtualHeight();
-  const uint_fast8_t split = map(projector,0,SEGMENT.virtualWidth(),0,(NUM_BANDS - 1));
+  const uint_fast8_t split = map(*projector,0,SEGMENT.virtualWidth(),0,(NUM_BANDS - 1));
 
   um_data_t *um_data;
   if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
@@ -8395,7 +8397,7 @@ uint16_t mode_GEQLASER(void) {
   uint8_t heights[NUM_BANDS] = { 0 };
 
   for (int i=0; i<NUM_BANDS; i++) {
-    heights[i] = map(fftResult[i],0,255,0,rows-10); // TODO: avg don't just take lower bands?
+    heights[i] = map(fftResult[i],0,255,0,rows-10);
   }
 
   for (int i=0; i<=split; i++) { // paint right vertical faces and top
@@ -8408,11 +8410,11 @@ uint16_t mode_GEQLASER(void) {
     if (heights[i] > 1) {
 
       for (int y = 0; y <= heights[i]; y++) {
-        SEGMENT.drawLine(linex+(cols/NUM_BANDS)-1,rows-y-1,projector,0,color_fade(ledColor,32,true));
+        SEGMENT.drawLine(linex+(cols/NUM_BANDS)-1,rows-y-1,*projector,0,color_fade(ledColor,32,true));
       } 
 
       for (int x=linex; x<=linex+(cols/NUM_BANDS)-1;x++) {
-        SEGMENT.drawLine(x,            rows-heights[i]-2,projector,0,color_fade(ledColor,128,true)); // top perspective
+        SEGMENT.drawLine(x,            rows-heights[i]-2,*projector,0,color_fade(ledColor,128,true)); // top perspective
       }
 
     }
@@ -8429,11 +8431,11 @@ uint16_t mode_GEQLASER(void) {
     if (heights[i] > 1) {
 
       for (int y = 0; y <= heights[i]; y++) {
-        SEGMENT.drawLine(linex           ,rows-y-1,projector,0,color_fade(ledColor,32,true));
+        SEGMENT.drawLine(linex           ,rows-y-1,*projector,0,color_fade(ledColor,32,true));
       } 
 
       for (int x=linex; x<=linex+(cols/NUM_BANDS)-1;x++) {
-        SEGMENT.drawLine(x,            rows-heights[i]-2,projector,0,color_fade(ledColor,128,true)); // top perspective
+        SEGMENT.drawLine(x,            rows-heights[i]-2,*projector,0,color_fade(ledColor,128,true)); // top perspective
       }
       
     }

From f7e2f14ca4badfcbd8e45bbd88e752926ae3751d Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Wed, 10 Jul 2024 19:03:38 -0400
Subject: [PATCH 074/200] Minor tab and comment clean-up.

---
 usermods/audioreactive/audio_source.h | 36 ++++++++++++++-------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/usermods/audioreactive/audio_source.h b/usermods/audioreactive/audio_source.h
index f8156fe7..d7c0478c 100644
--- a/usermods/audioreactive/audio_source.h
+++ b/usermods/audioreactive/audio_source.h
@@ -761,27 +761,29 @@ class AC101Source : public I2SSource {
 
     void _ac101InitAdc() {
       // https://files.seeedstudio.com/wiki/ReSpeaker_6-Mics_Circular_Array_kit_for_Raspberry_Pi/reg/AC101_User_Manual_v1.1.pdf
-      //
-      _ac101I2cBegin(); 
+      // This supports mostly the older AI Thinkier AudioKit A1S that has an AC101 chip
+      // Newer versions use the ES3833 chip - which we also support.
 
-      #define CHIP_AUDIO_RS	  	0x00
-      #define SYSCLK_CTRL		  	0x03
-      #define MOD_CLK_ENA		  	0x04
-      #define MOD_RST_CTRL	  	0x05
-      #define I2S_SR_CTRL		  	0x06
-      #define I2S1LCK_CTRL		  0x10
-      #define I2S1_SDOUT_CTRL	  0x11
-      #define I2S1_MXR_SRC	  	0x13
-      #define ADC_DIG_CTRL	  	0x40
-      #define ADC_APC_CTRL		  0x50
-      #define ADC_SRC				    0x51
-      #define ADC_SRCBST_CTRL	  0x52
+      _ac101I2cBegin();
+
+      #define CHIP_AUDIO_RS     0x00
+      #define SYSCLK_CTRL       0x03
+      #define MOD_CLK_ENA       0x04
+      #define MOD_RST_CTRL      0x05
+      #define I2S_SR_CTRL       0x06
+      #define I2S1LCK_CTRL      0x10
+      #define I2S1_SDOUT_CTRL   0x11
+      #define I2S1_MXR_SRC      0x13
+      #define ADC_DIG_CTRL      0x40
+      #define ADC_APC_CTRL      0x50
+      #define ADC_SRC           0x51
+      #define ADC_SRCBST_CTRL   0x52
       #define OMIXER_DACA_CTRL  0x53
-      #define OMIXER_SR			    0x54
-      #define HPOUT_CTRL			  0x56
+      #define OMIXER_SR         0x54
+      #define HPOUT_CTRL        0x56
 
       _ac101I2cWrite(CHIP_AUDIO_RS, 0x123); // I think anything written here is a reset as 0x123 is kinda suss.
-      
+
       delay(100);
 
       _ac101I2cWrite(SYSCLK_CTRL,       0b0000100000001000); // System Clock is I2S MCLK

From 1c33a4bbea66b2bf6f6e002afe11e8551fe5dcbf Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Wed, 10 Jul 2024 19:08:58 -0400
Subject: [PATCH 075/200] Remove references to AC101 mic mode (not implemented)

---
 usermods/audioreactive/audio_reactive.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index ea43aa60..f7c91594 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -2013,11 +2013,7 @@ class AudioReactive : public Usermod {
           if (audioSource) audioSource->initialize(i2swsPin, i2ssdPin, i2sckPin, mclkPin);
           break;
         case 8:
-        #ifdef use_ac101_mic
-          DEBUGSR_PRINTLN(F("AR: AC101 Source (Mic)"));
-        #else
           DEBUGSR_PRINTLN(F("AR: AC101 Source (Line-In)"));
-        #endif
           audioSource = new AC101Source(SAMPLE_RATE, BLOCK_SIZE, 1.0f);
           //useInputFilter = 0; // to disable low-cut software filtering and restore previous behaviour
           delay(100);

From 346914b9657ac64600df21b48a8198c8df0ca4d1 Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Sat, 13 Jul 2024 01:37:43 +0200
Subject: [PATCH 076/200] setPixelColorXY small optimizations

Caching a few segment vars gives a 5% speedup on big setups.

Its 2024, and compilers are still stupid :-P
---
 wled00/FX_2Dfcn.cpp | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 061d8c19..cc91c2cf 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -214,7 +214,10 @@ uint32_t WS2812FX::getPixelColorXY(uint16_t x, uint16_t y) {
 void IRAM_ATTR_YN Segment::setPixelColorXY(int x, int y, uint32_t col) //WLEDMM: IRAM_ATTR conditionally
 {
   if (Segment::maxHeight==1) return; // not a matrix set-up
-  if (x<0 || y<0 || x >= virtualWidth() || y >= virtualHeight()) return;  // if pixel would fall out of virtual segment just exit
+  const int_fast16_t cols = virtualWidth();  // WLEDMM optimization
+  const int_fast16_t rows = virtualHeight();
+
+  if (x<0 || y<0 || x >= cols || y >= rows) return;  // if pixel would fall out of virtual segment just exit
 
   unsigned i = UINT_MAX;
   bool sameColor = false;
@@ -231,11 +234,11 @@ 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) && (ledsrgb[i] == CRGB(col)) && (_globalLeds == nullptr)) return; // WLEDMM looks like nothing to do (but we don't trust globalleds)
+  if ((i < UINT_MAX) && sameColor && (call > 0) && (!transitional) && (ledsrgb[i] == CRGB(col)) && (_globalLeds == nullptr)) return; // WLEDMM looks like nothing to do (but we don't trust globalleds)
 #endif
 
-  if (reverse  ) x = virtualWidth()  - x - 1;
-  if (reverse_y) y = virtualHeight() - y - 1;
+  if (reverse  ) x = cols  - x - 1;
+  if (reverse_y) y = rows - y - 1;
   if (transpose) { uint16_t t = x; x = y; y = t; } // swap X & Y if segment transposed
 
   // WLEDMM shortcut when no grouping/spacing used
@@ -245,27 +248,32 @@ void IRAM_ATTR_YN Segment::setPixelColorXY(int x, int y, uint32_t col) //WLEDMM:
     return;
   }
 
-  x *= groupLength(); // expand to physical pixels
-  y *= groupLength(); // expand to physical pixels
-  if (x >= width() || y >= height()) return;  // if pixel would fall out of segment just exit
+  const int_fast16_t glen_ = groupLength(); // WLEDMM optimization
+  const int_fast16_t wid_ =  width();
+  const int_fast16_t hei_ = height();
 
-  for (int j = 0; j < grouping; j++) {   // groupping vertically
-    for (int g = 0; g < grouping; g++) { // groupping horizontally
+  x *= glen_; // expand to physical pixels
+  y *= glen_; // expand to physical pixels
+  if (x >= wid_ || y >= hei_) return;  // if pixel would fall out of segment just exit
+
+  const int grp_ = grouping; // WLEDMM optimization
+  for (int j = 0; j < grp_; j++) {   // groupping vertically
+    for (int g = 0; g < grp_; g++) { // groupping horizontally
       uint_fast16_t xX = (x+g), yY = (y+j);    //WLEDMM: use fast types
-      if (xX >= width() || yY >= height()) continue; // we have reached one dimension's end
+      if (xX >= wid_ || yY >= hei_) continue; // we have reached one dimension's end
 
       strip.setPixelColorXY(start + xX, startY + yY, col);
 
       if (mirror) { //set the corresponding horizontally mirrored pixel
-        if (transpose) strip.setPixelColorXY(start + xX, startY + height() - yY - 1, col);
-        else           strip.setPixelColorXY(start + width() - xX - 1, startY + yY, col);
+        if (transpose) strip.setPixelColorXY(start + xX, startY + hei_ - yY - 1, col);
+        else           strip.setPixelColorXY(start + wid_ - xX - 1, startY + yY, col);
       }
       if (mirror_y) { //set the corresponding vertically mirrored pixel
-        if (transpose) strip.setPixelColorXY(start + width() - xX - 1, startY + yY, col);
-        else           strip.setPixelColorXY(start + xX, startY + height() - yY - 1, col);
+        if (transpose) strip.setPixelColorXY(start + wid_ - xX - 1, startY + yY, col);
+        else           strip.setPixelColorXY(start + xX, startY + hei_ - yY - 1, col);
       }
       if (mirror_y && mirror) { //set the corresponding vertically AND horizontally mirrored pixel
-        strip.setPixelColorXY(width() - xX - 1, height() - yY - 1, col);
+        strip.setPixelColorXY(wid_ - xX - 1, hei_ - yY - 1, col);
       }
     }
   }

From ce8f01bf902b42c112157c4e5d57d885812f32e2 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Fri, 12 Jul 2024 21:48:09 -0400
Subject: [PATCH 077/200] Bugfixed GEQ 3D

Bug fixes after lots of testing, better settings, etc.

Big thanks to @netmindz  for restructuring the code.

Add rough distance stop to Segment::drawLine()
---
 wled00/FX.cpp       | 108 +++++++++++++++++++++++++-------------------
 wled00/FX.h         |   4 +-
 wled00/FX_2Dfcn.cpp |   4 +-
 3 files changed, 66 insertions(+), 50 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 68b848cd..f1339bd1 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8371,21 +8371,18 @@ uint16_t mode_GEQLASER(void) {
     SEGMENT.setUpLeds(); // WLEDMM use lossless getPixelColor()
     SEGMENT.fill(BLACK);
   } else {
-    *projector += *projector_dir;
+    if (SEGENV.call % map(SEGMENT.speed,0,255,10,1) == 0) *projector += *projector_dir;
     if (*projector == SEGMENT.virtualWidth()) *projector_dir = -1;
     if (*projector == 0) *projector_dir = 1;
   }
 
-  if (SEGMENT.speed > 250) {
-    SEGMENT.fill(BLACK);
-  } else {
-    SEGMENT.fadeToBlackBy(SEGMENT.speed);
-  }
+  SEGMENT.fill(BLACK);
 
-  const int NUM_BANDS = map(SEGMENT.custom1, 0, 255, 1, 16);
+  const int NUM_BANDS = map(SEGMENT.custom3, 0, 31, 1, 16); // custom3 is 0..31
   const uint16_t cols = SEGMENT.virtualWidth();
   const uint16_t rows = SEGMENT.virtualHeight();
-  const uint_fast8_t split = map(*projector,0,SEGMENT.virtualWidth(),0,(NUM_BANDS - 1));
+  uint32_t ledColorTemp;
+  uint_fast8_t split = map(*projector,0,SEGMENT.virtualWidth(),0,(NUM_BANDS - 1));
 
   um_data_t *um_data;
   if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
@@ -8397,10 +8394,14 @@ uint16_t mode_GEQLASER(void) {
   uint8_t heights[NUM_BANDS] = { 0 };
 
   for (int i=0; i<NUM_BANDS; i++) {
-    heights[i] = map(fftResult[i],0,255,0,rows-10);
+    heights[i] = map8(fftResult[i],0,rows*0.85);
   }
 
-  for (int i=0; i<=split; i++) { // paint right vertical faces and top
+  uint16_t horizon = map(SEGMENT.custom1,0,255,rows-1,0); 
+  uint16_t distance = map8(SEGMENT.custom2,1,rows-1);
+  if (SEGMENT.custom2 == 255) distance = UINT16_MAX;
+
+  for (int i=0; i<=split; i++) { // paint right vertical faces and top - LEFT to RIGHT
 
     uint16_t colorIndex = map(cols/NUM_BANDS*i, 0, cols-1, 0, 255);
     uint32_t ledColor = SEGMENT.color_from_palette(colorIndex, false, PALETTE_SOLID_WRAP, 0);
@@ -8409,19 +8410,27 @@ uint16_t mode_GEQLASER(void) {
 
     if (heights[i] > 1) {
 
+      ledColorTemp = color_fade(ledColor,32,true);
+
       for (int y = 0; y <= heights[i]; y++) {
-        SEGMENT.drawLine(linex+(cols/NUM_BANDS)-1,rows-y-1,*projector,0,color_fade(ledColor,32,true));
+        SEGMENT.drawLine(linex+(cols/NUM_BANDS)-1,rows-y-1,*projector,horizon,ledColorTemp,distance); // right side perspective
       } 
 
-      for (int x=linex; x<=linex+(cols/NUM_BANDS)-1;x++) {
-        SEGMENT.drawLine(x,            rows-heights[i]-2,*projector,0,color_fade(ledColor,128,true)); // top perspective
+      ledColorTemp = color_fade(ledColor,128,true);
+
+      if (heights[i] < rows-horizon && (*projector <=linex || *projector >= linex+(cols/NUM_BANDS)-1)) { // draw if above horizon AND not directly under projector (special case later)
+
+        for (uint_fast8_t x=linex; x<=linex+(cols/NUM_BANDS)-1;x++) { 
+          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,distance); // top perspective
+        }
+
       }
 
     }
 
   }
 
-  for (int i=(NUM_BANDS - 1); i>split; i--) { // paint left vertical faces and top
+  for (int i=(NUM_BANDS - 1); i>split; i--) { // paint left vertical faces and top - RIGHT to LEFT
 
     uint16_t colorIndex = map(cols/NUM_BANDS*i, 0, cols-1, 0, 255);
     uint32_t ledColor = SEGMENT.color_from_palette(colorIndex, false, PALETTE_SOLID_WRAP, 0);
@@ -8430,19 +8439,26 @@ uint16_t mode_GEQLASER(void) {
 
     if (heights[i] > 1) {
 
-      for (int y = 0; y <= heights[i]; y++) {
-        SEGMENT.drawLine(linex           ,rows-y-1,*projector,0,color_fade(ledColor,32,true));
-      } 
+      ledColorTemp = color_fade(ledColor,32,true);
 
-      for (int x=linex; x<=linex+(cols/NUM_BANDS)-1;x++) {
-        SEGMENT.drawLine(x,            rows-heights[i]-2,*projector,0,color_fade(ledColor,128,true)); // top perspective
+      for (uint_fast8_t y = 0; y <= heights[i]; y++) {
+        SEGMENT.drawLine(linex,rows-y-1,*projector,horizon,ledColorTemp,distance); // left side perspective
       }
       
+      ledColorTemp = color_fade(ledColor,128,true);
+
+      if (heights[i] < rows-horizon && (*projector <=linex || *projector >= linex+(cols/NUM_BANDS)-1)) { // draw if above horizon AND not directly under projector (special case later)
+
+        for (uint_fast8_t x=linex; x<=linex+(cols/NUM_BANDS)-1;x++) {
+          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,distance); // top perspective
+        }
+
+      }
+
     }
 
   }
 
-  uint8_t frontBrightness = SEGMENT.custom2;
   for (int i=0; i<NUM_BANDS; i++) {
 
     uint16_t colorIndex = map(cols/NUM_BANDS*i, 0, cols-1, 0, 255);
@@ -8450,44 +8466,44 @@ uint16_t mode_GEQLASER(void) {
 
     int linex = i*(cols/NUM_BANDS);
 
-    if (heights[i] > 1) {
+    if (*projector >=linex && *projector <= linex+(cols/NUM_BANDS)-1) { // special case when top perspective is directly under the projector
 
-      if(frontBrightness > 250) {
-        // Full bright fronts, fills all front face.
-        for (int x=linex; x<linex+(cols/NUM_BANDS);x++) { 
-          SEGMENT.drawLine(x,rows-1,x,rows-heights[i]-1,ledColor); // front fill
-        }
-      }
-      else if(frontBrightness >= 50) {
-        // Faded fronts, assumes border added later.
-        for (int x=linex+1; x<linex+(cols/NUM_BANDS)-1;x++) { 
-          SEGMENT.drawLine(x,rows-2,x,rows-heights[i]-2,color_fade(ledColor,map(frontBrightness, 50, 250, 0, 255),true)); // front fill
-        }
-      }
-      else {
-        // "Negative Space" - draw pure black fronts
-        for (int x=linex; x<linex+(cols/NUM_BANDS);x++) { 
-          SEGMENT.drawLine(x,rows-1,x,rows-heights[i]-1,BLACK); // front fill
+      if (heights[i] > 1 && heights[i] < rows-horizon) {
+
+        ledColorTemp = color_fade(ledColor,128,true);
+
+        for (uint_fast8_t x=linex; x<=linex+(cols/NUM_BANDS)-1;x++) {
+          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,distance); // top perspective
         }
+
       }
 
-    if(frontBrightness >= 50) { // TODO: other values too? not sure exactly when we want the border
-      // Border
-      SEGMENT.drawLine(linex,            rows-1,linex,rows-heights[i]-1,ledColor); // left side line
-      SEGMENT.drawLine(linex+(cols/NUM_BANDS)-1,rows-1,linex+(cols/NUM_BANDS)-1,rows-heights[i]-1,ledColor); // right side line
-      SEGMENT.drawLine(linex,            rows-heights[i]-2,linex+(cols/NUM_BANDS)-1,rows-heights[i]-2,ledColor); // top line
-      SEGMENT.drawLine(linex,            rows-1,linex+(cols/NUM_BANDS)-1,rows-1,ledColor); // bottom line
     }
 
-  }
+    if (heights[i] > 1) {
+  
+      ledColorTemp = color_fade(ledColor,SEGMENT.intensity,true);
+
+      for (uint_fast8_t x=linex; x<linex+(cols/NUM_BANDS);x++) { 
+        SEGMENT.drawLine(x,rows-1,x,rows-heights[i]-1,ledColorTemp); // front fill
+      }
+
+      if (heights[i] > rows-horizon) {
+
+        if (SEGMENT.intensity == 0) ledColorTemp = color_fade(ledColor,32,true); // match side fill if we're in blackout mode
+
+        SEGMENT.drawLine(linex,rows-heights[i]-1,linex+(cols/NUM_BANDS)-1,rows-heights[i]-1,ledColorTemp); // top line to simulate hidden top fill
+
+      }
+
+    }
 
   }
 
   return FRAMETIME;
 
 }
-static const char _data_FX_MODE_GEQLASER[] PROGMEM = "GEQ Laser ☾@Fade Speed,,Bands,Fill Front,;;!;2f"; 
-
+static const char _data_FX_MODE_GEQLASER[] PROGMEM = "GEQ 3D ☾@Speed,Front Fill,Horizon,Distance,Num Bands,,,;!,,Peaks;!;2f;sx=255,ix=255,c1=255,c2=255,c3=255,pal=11";
 
 #endif // WLED_DISABLE_2D
 
diff --git a/wled00/FX.h b/wled00/FX.h
index 2143d984..f6a5fd31 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -687,8 +687,8 @@ typedef struct Segment {
     void move(uint8_t dir, uint8_t delta, bool wrap = false);
     void draw_circle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c);
     void fill_circle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c);
-    void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c);
-    void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, CRGB c) { drawLine(x0, y0, x1, y1, RGBW32(c.r,c.g,c.b,0)); } // automatic inline
+    void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c, uint16_t d = UINT16_MAX);
+    void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, CRGB c, uint16_t d = UINT16_MAX) { drawLine(x0, y0, x1, y1, RGBW32(c.r,c.g,c.b,0), d); } // automatic inline
     void drawArc(uint16_t x0, uint16_t y0, uint16_t radius, uint32_t color, uint32_t fillColor = 0);
     void drawArc(uint16_t x0, uint16_t y0, uint16_t 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);
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 1d217ff0..83599c97 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -582,7 +582,7 @@ void Segment::nscale8(uint8_t scale) {  //WLEDMM: use fast types
 }
 
 //line function
-void Segment::drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c) {
+void Segment::drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c, uint16_t distance) {
   if (!isActive()) return; // not active
   const uint16_t cols = virtualWidth();
   const uint16_t rows = virtualHeight();
@@ -590,7 +590,7 @@ void Segment::drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint3
   const int16_t dx = abs(x1-x0), sx = x0<x1 ? 1 : -1;
   const int16_t dy = abs(y1-y0), sy = y0<y1 ? 1 : -1;
   int16_t err = (dx>dy ? dx : -dy)/2, e2;
-  for (;;) {
+  for (uint_fast16_t d=0; d<distance; d++) {
     setPixelColorXY(x0,y0,c);
     if (x0==x1 && y0==y1) break;
     e2 = err;

From 4c8d5002158aa5eb61b9c884ba5ea794cdd2148e Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Fri, 12 Jul 2024 22:12:59 -0400
Subject: [PATCH 078/200] Seems someone improved drawline() - fixed for this

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

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 82fd2225..ff62e775 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8413,7 +8413,7 @@ uint16_t mode_GEQLASER(void) {
       ledColorTemp = color_fade(ledColor,32,true);
 
       for (int y = 0; y <= heights[i]; y++) {
-        SEGMENT.drawLine(linex+(cols/NUM_BANDS)-1,rows-y-1,*projector,horizon,ledColorTemp,distance); // right side perspective
+        SEGMENT.drawLine(linex+(cols/NUM_BANDS)-1,rows-y-1,*projector,horizon,ledColorTemp,true,distance); // right side perspective
       } 
 
       ledColorTemp = color_fade(ledColor,128,true);
@@ -8421,7 +8421,7 @@ uint16_t mode_GEQLASER(void) {
       if (heights[i] < rows-horizon && (*projector <=linex || *projector >= linex+(cols/NUM_BANDS)-1)) { // draw if above horizon AND not directly under projector (special case later)
 
         for (uint_fast8_t x=linex; x<=linex+(cols/NUM_BANDS)-1;x++) { 
-          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,distance); // top perspective
+          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,true,distance); // top perspective
         }
 
       }
@@ -8442,7 +8442,7 @@ uint16_t mode_GEQLASER(void) {
       ledColorTemp = color_fade(ledColor,32,true);
 
       for (uint_fast8_t y = 0; y <= heights[i]; y++) {
-        SEGMENT.drawLine(linex,rows-y-1,*projector,horizon,ledColorTemp,distance); // left side perspective
+        SEGMENT.drawLine(linex,rows-y-1,*projector,horizon,ledColorTemp,true,distance); // left side perspective
       }
       
       ledColorTemp = color_fade(ledColor,128,true);
@@ -8450,7 +8450,7 @@ uint16_t mode_GEQLASER(void) {
       if (heights[i] < rows-horizon && (*projector <=linex || *projector >= linex+(cols/NUM_BANDS)-1)) { // draw if above horizon AND not directly under projector (special case later)
 
         for (uint_fast8_t x=linex; x<=linex+(cols/NUM_BANDS)-1;x++) {
-          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,distance); // top perspective
+          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,true,distance); // top perspective
         }
 
       }
@@ -8473,7 +8473,7 @@ uint16_t mode_GEQLASER(void) {
         ledColorTemp = color_fade(ledColor,128,true);
 
         for (uint_fast8_t x=linex; x<=linex+(cols/NUM_BANDS)-1;x++) {
-          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,distance); // top perspective
+          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,true,distance); // top perspective
         }
 
       }

From 643f82daf061af4b0021082319c66d670e8330b9 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Fri, 12 Jul 2024 22:32:14 -0400
Subject: [PATCH 079/200] Don't use new soft drawline() option

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

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index ff62e775..72ec8310 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8413,7 +8413,7 @@ uint16_t mode_GEQLASER(void) {
       ledColorTemp = color_fade(ledColor,32,true);
 
       for (int y = 0; y <= heights[i]; y++) {
-        SEGMENT.drawLine(linex+(cols/NUM_BANDS)-1,rows-y-1,*projector,horizon,ledColorTemp,true,distance); // right side perspective
+        SEGMENT.drawLine(linex+(cols/NUM_BANDS)-1,rows-y-1,*projector,horizon,ledColorTemp,false,distance); // right side perspective
       } 
 
       ledColorTemp = color_fade(ledColor,128,true);
@@ -8421,7 +8421,7 @@ uint16_t mode_GEQLASER(void) {
       if (heights[i] < rows-horizon && (*projector <=linex || *projector >= linex+(cols/NUM_BANDS)-1)) { // draw if above horizon AND not directly under projector (special case later)
 
         for (uint_fast8_t x=linex; x<=linex+(cols/NUM_BANDS)-1;x++) { 
-          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,true,distance); // top perspective
+          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,false,distance); // top perspective
         }
 
       }
@@ -8442,7 +8442,7 @@ uint16_t mode_GEQLASER(void) {
       ledColorTemp = color_fade(ledColor,32,true);
 
       for (uint_fast8_t y = 0; y <= heights[i]; y++) {
-        SEGMENT.drawLine(linex,rows-y-1,*projector,horizon,ledColorTemp,true,distance); // left side perspective
+        SEGMENT.drawLine(linex,rows-y-1,*projector,horizon,ledColorTemp,false,distance); // left side perspective
       }
       
       ledColorTemp = color_fade(ledColor,128,true);
@@ -8450,7 +8450,7 @@ uint16_t mode_GEQLASER(void) {
       if (heights[i] < rows-horizon && (*projector <=linex || *projector >= linex+(cols/NUM_BANDS)-1)) { // draw if above horizon AND not directly under projector (special case later)
 
         for (uint_fast8_t x=linex; x<=linex+(cols/NUM_BANDS)-1;x++) {
-          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,true,distance); // top perspective
+          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,false,distance); // top perspective
         }
 
       }
@@ -8473,7 +8473,7 @@ uint16_t mode_GEQLASER(void) {
         ledColorTemp = color_fade(ledColor,128,true);
 
         for (uint_fast8_t x=linex; x<=linex+(cols/NUM_BANDS)-1;x++) {
-          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,true,distance); // top perspective
+          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,false,distance); // top perspective
         }
 
       }

From 75f0c7cb982424f03a02436ab6b67ffa0fc5d670 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Fri, 12 Jul 2024 22:34:37 -0400
Subject: [PATCH 080/200] Oopsy

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

diff --git a/wled00/FX.h b/wled00/FX.h
index 97f2db27..d838cd0f 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -695,7 +695,7 @@ typedef struct Segment {
     void fillCircle(uint16_t cx, uint16_t cy, uint8_t radius, uint32_t c, bool soft = false);
     inline void fillCircle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c, bool soft = false) { fillCircle(cx, cy, radius, RGBW32(c.r,c.g,c.b,0), soft); }
     void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c, bool soft = false, uint16_t distance = UINT16_MAX);
-    inline void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, CRGB c, bool soft = false, uint16_t distance = UINT16_MAX)) { drawLine(x0, y0, x1, y1, RGBW32(c.r,c.g,c.b,0), soft, distance); } // automatic inline
+    inline void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, CRGB c, bool soft = false, uint16_t distance = UINT16_MAX) { drawLine(x0, y0, x1, y1, RGBW32(c.r,c.g,c.b,0), soft, distance); } // automatic inline
     void drawArc(uint16_t x0, uint16_t y0, uint16_t radius, uint32_t color, uint32_t fillColor = 0);
     inline void drawArc(uint16_t x0, uint16_t y0, uint16_t 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);

From 584ca5e8aec26c90b49b29d064da2d9a1ab679aa Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sat, 13 Jul 2024 13:51:59 +0100
Subject: [PATCH 081/200] Double buffer needed to prevent flicker for effects
 like GEQ

---
 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 9ad6c948..bb4c4bc8 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -490,7 +490,7 @@ void BusNetwork::cleanup() {
 
 BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWhite) {
 
-  mxconfig.double_buff = false; // <------------- Turn on double buffer
+  mxconfig.double_buff = true; // <------------- Turn on double buffer
 
 
   fourScanPanel = nullptr;

From aa6d275a86efdbc8c57f52a1c27c66bf0189762e Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Thu, 7 Mar 2024 10:44:07 +0000
Subject: [PATCH 082/200] Swap DMX port to 1, persist user choice of port,
 validate port vs UART count

---
 wled00/cfg.cpp                | 2 ++
 wled00/data/settings_sync.htm | 2 +-
 wled00/dmx_input.cpp          | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp
index 24e923c8..4de49f99 100644
--- a/wled00/cfg.cpp
+++ b/wled00/cfg.cpp
@@ -468,6 +468,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
     CJSON(dmxInputTransmitPin, if_live_dmx[F("inputRxPin")]);
     CJSON(dmxInputReceivePin, if_live_dmx[F("inputTxPin")]);
     CJSON(dmxInputEnablePin, if_live_dmx[F("inputEnablePin")]);
+    CJSON(dmxInputPort, if_live_dmx[F("dmxInputPort")]);
   #endif
 
   CJSON(arlsForceMaxBri, if_live[F("maxbri")]);
@@ -958,6 +959,7 @@ void serializeConfig() {
     if_live_dmx[F("inputRxPin")] = dmxInputTransmitPin;
     if_live_dmx[F("inputTxPin")] = dmxInputReceivePin;
     if_live_dmx[F("inputEnablePin")] = dmxInputEnablePin;
+    if_live_dmx[F("dmxInputPort")] = dmxInputPort;
   #endif
 
   if_live[F("timeout")] = realtimeTimeoutMs / 100;
diff --git a/wled00/data/settings_sync.htm b/wled00/data/settings_sync.htm
index ca55295d..068a2dee 100644
--- a/wled00/data/settings_sync.htm
+++ b/wled00/data/settings_sync.htm
@@ -178,7 +178,7 @@ Realtime LED offset: <input name="WO" type="number" min="-255" max="255" require
 	DMX RX: <input name="IDMR" type="number" min="-1" max="99">RO<br/>
 	DMX TX: <input name="IDMT" type="number" min="-1" max="99">DI<br/>
 	DMX Enable: <input name="IDME" type="number" min="-1" max="99">RE+DE<br/>
-	<div style="display: none">DMX Port: <input name="IDMP" type="number" min="1" max="2"><br/></div>
+	DMX Port: <input name="IDMP" type="number" min="1" max="2"><br/>
 </div> 
 <div id="dmxInputOff"> <!--WLEDMM-->
 	<br><em style="color:darkorange">This firmware build does not include DMX Input support. <br></em>
diff --git a/wled00/dmx_input.cpp b/wled00/dmx_input.cpp
index 77ebc859..821481e5 100644
--- a/wled00/dmx_input.cpp
+++ b/wled00/dmx_input.cpp
@@ -106,6 +106,7 @@ bool DMXInput::installDriver()
 {
 
   const auto config = createConfig();
+  USER_PRINTF("DMX port: %u\n", inputPortNum);
   if (!dmx_driver_install(inputPortNum, &config, DMX_INTR_FLAGS_DEFAULT)) {
     USER_PRINTF("Error: Failed to install dmx driver\n");
     return false;
@@ -134,7 +135,7 @@ void DMXInput::init(uint8_t rxPin, uint8_t txPin, uint8_t enPin, uint8_t inputPo
   // }
 #endif
 
-  if (inputPortNum < 3 && inputPortNum > 0) {
+  if (inputPortNum <= (SOC_UART_NUM - 1) && inputPortNum > 0) {
     this->inputPortNum = inputPortNum;
   }
   else {

From dddd1574ec7a63694d81c923f2df419a87909adb Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Sun, 14 Jul 2024 14:11:11 +0200
Subject: [PATCH 083/200] (experimental) setPixelColorXY_fast speedup by
 setPixelColorXY_fast

* adding a _fast_ variant of SetPixelColorXY, that does not perform any error checking.
* drawLine uses the fast setPixelColor variant (bresenham algo only)
* for TESTING: segment option "reverse" switches back to the "original slow" code.
surely needs some more optimization and improvements.

First test on GEQ 3D shows 10%-30% speedup
---
 wled00/FX.h         |  4 +++
 wled00/FX_2Dfcn.cpp | 85 ++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 88 insertions(+), 1 deletion(-)

diff --git a/wled00/FX.h b/wled00/FX.h
index d838cd0f..0d7be0bf 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -666,6 +666,9 @@ typedef struct Segment {
       if (height == 0) return (x%width);  // softhack007 avoid div/0
       return (x%width) + (y%height) * width;
     }
+
+    //void setPixelColorXY_fast(int x, int y,uint32_t c); // set relative pixel within segment with color - wrapper for _fast
+    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(int x, int y, uint32_t c); // set relative pixel within segment with color
     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)); }
@@ -981,6 +984,7 @@ class WS2812FX {  // 96 bytes
 
     void
       setUpMatrix(),
+      setPixelColorXY_fast(int x, int y, uint32_t c),
       setPixelColorXY(int x, int y, uint32_t c);
 
     // outsmart the compiler :) by correctly overloading
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 93810301..f3bd6ce1 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -176,6 +176,15 @@ void WS2812FX::setUpMatrix() {
 #endif
 }
 
+// absolute matrix version of setPixelColor(), without error checking
+void IRAM_ATTR WS2812FX::setPixelColorXY_fast(int x, int y, uint32_t col) //WLEDMM: IRAM_ATTR conditionally
+{
+  uint_fast16_t index = y * Segment::maxWidth + x;
+  if (index < customMappingSize) index = customMappingTable[index];
+  if (index >= _length) return;
+  busses.setPixelColor(index, col);
+}
+
 // absolute matrix version of setPixelColor()
 void IRAM_ATTR_YN WS2812FX::setPixelColorXY(int x, int y, uint32_t col) //WLEDMM: IRAM_ATTR conditionally
 {
@@ -211,6 +220,67 @@ uint32_t WS2812FX::getPixelColorXY(uint16_t x, uint16_t y) {
 // XY(x,y) - gets pixel index within current segment (often used to reference leds[] array element)
 // WLEDMM Segment::XY()is declared inline, see FX.h
 
+
+// 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 Segment::setPixelColorXY_fast(int x, int y, uint32_t col, uint32_t scaled_col, int cols, int rows) //WLEDMM
+{
+  // if (Segment::maxHeight==1) return; // not a matrix set-up
+  // const int_fast16_t cols = virtualWidth();  // WLEDMM optimization
+  // const int_fast16_t rows = virtualHeight();
+  // if (x<0 || y<0 || x >= cols || y >= rows) return;  // if pixel would fall out of virtual segment just exit
+  unsigned i = UINT_MAX;
+  bool sameColor = false;
+  if (ledsrgb) { // WLEDMM small optimization
+    //i = XY(x,y);
+    //i = (x%cols) + (y%rows) * cols; // avoid error checking done in XY()
+    i = x + y*cols; // avoid error checking done by XY() - be optimistic about ranges of x and y
+    CRGB fastled_col = CRGB(col);
+    if (ledsrgb[i] == fastled_col) sameColor = true;
+    else ledsrgb[i] = fastled_col;
+  }
+#if 0
+  // we are NOT doing brightness here - must be done by the calling function!
+  //uint32_t scaled_col = col;
+  uint8_t _bri_t = currentBri(on ? opacity : 0);
+  if (!_bri_t && !transitional) return;
+  if (_bri_t < 255) scaled_col = color_fade(col, _bri_t);
+  else scaled_col  = col;
+#endif
+
+#if 0 // this is still a dangerous optimization
+  if ((i < UINT_MAX) && sameColor && (call > 0) && (!transitional) && (ledsrgb[i] == CRGB(col)) && (_globalLeds == nullptr)) return; // WLEDMM looks like nothing to do (but we don't trust globalleds)
+#endif
+
+  // handle reverse and transpose
+  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
+
+  // set the requested pixel
+  strip.setPixelColorXY_fast(start + x, startY + y, scaled_col);
+  bool simpleSegment = !mirror && !mirror_y;
+  //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;
+  //if (x >= wid_ || y >= hei_) return;  // if pixel would fall out of segment just exit - should never happen, because  width() >= virtualWidth()
+  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);
+  }
+  if (mirror_y) { //set the corresponding vertically mirrored pixel
+    if (transpose) strip.setPixelColorXY_fast(start + wid_ - x - 1, startY + y, scaled_col);
+    else           strip.setPixelColorXY_fast(start + x, startY + hei_ - y - 1, scaled_col);
+  }
+  if (mirror_y && mirror) { //set the corresponding vertically AND horizontally mirrored pixel
+    strip.setPixelColorXY_fast(wid_ - x - 1, hei_ - y - 1, scaled_col);
+  }
+}
+
+
+// normal Segment::setPixelColorXY with error checking, and support for grouping / spacing
 void IRAM_ATTR_YN Segment::setPixelColorXY(int x, int y, uint32_t col) //WLEDMM: IRAM_ATTR conditionally
 {
   if (Segment::maxHeight==1) return; // not a matrix set-up
@@ -608,6 +678,7 @@ void Segment::nscale8(uint8_t scale) {  //WLEDMM: use fast types
 //line function
 void Segment::drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c, bool soft, uint16_t distance) {
   if (!isActive()) return; // not active
+  // if (Segment::maxHeight==1) return; // not a matrix set-up
   const int cols = virtualWidth();
   const int rows = virtualHeight();
   if (x0 >= cols || x1 >= cols || y0 >= rows || y1 >= rows) return;
@@ -621,6 +692,16 @@ void Segment::drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint3
     return;
   }
 
+  // WLEDMM shortcut when no grouping/spacing used
+  bool simpleSegment = !reverse && (grouping == 1) && (spacing == 0);  // !reverse is just for back-to-back testing against "slow" functions
+  uint32_t scaled_col = c;
+  if (simpleSegment) {
+      // segment brightness must be pre-calculated for the "fast" setPixelColorXY variant!
+      uint8_t _bri_t = currentBri(on ? opacity : 0);
+      if (!_bri_t && !transitional) return;
+      if (_bri_t < 255) scaled_col = color_fade(c, _bri_t);
+  }
+
   if (soft) {
     // Xiaolin Wu’s algorithm
     const bool steep = dy > dx;
@@ -651,7 +732,9 @@ void Segment::drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint3
     // Bresenham's algorithm
     int err = (dx>dy ? dx : -dy)/2;   // error direction
     for (uint_fast16_t d=0; d<distance; d++) {
-      setPixelColorXY(x0, y0, c);
+      // if (x0 >= cols || y0 >= rows) break; // WLEDMM we hit the edge - should never happen
+      if (simpleSegment) setPixelColorXY_fast(x0, y0, c, scaled_col, cols, rows);
+      else setPixelColorXY(x0, y0, c);
       if (x0==x1 && y0==y1) break;
       int e2 = err;
       if (e2 >-dx) { err -= dy; x0 += sx; }

From 6aaf7a908dd4703d04dc5b48f67cff11bf9b729c Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Sun, 14 Jul 2024 23:49:37 +0200
Subject: [PATCH 084/200] more sPC optimizations

* made setPixelColorXY_fast private
* optimized Segment::fill() to use setPixelColorXY_fast
* "bar" 1D expand optimization
---
 wled00/FX.h         |  2 +-
 wled00/FX_2Dfcn.cpp | 21 +++++++++++----------
 wled00/FX_fcn.cpp   | 25 ++++++++++++++++++++-----
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/wled00/FX.h b/wled00/FX.h
index 0d7be0bf..fbc84737 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -432,6 +432,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!!!
 
     // perhaps this should be per segment, not static
     static CRGBPalette16 _currentPalette;     // palette used for current effect (includes transition, used in color_from_palette())
@@ -668,7 +669,6 @@ typedef struct Segment {
     }
 
     //void setPixelColorXY_fast(int x, int y,uint32_t c); // set relative pixel within segment with color - wrapper for _fast
-    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(int x, int y, uint32_t c); // set relative pixel within segment with color
     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)); }
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index f3bd6ce1..95786b8d 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -260,7 +260,7 @@ void IRAM_ATTR Segment::setPixelColorXY_fast(int x, int y, uint32_t col, uint32_
   // set the requested pixel
   strip.setPixelColorXY_fast(start + x, startY + y, scaled_col);
   bool simpleSegment = !mirror && !mirror_y;
-  //if (simpleSegment) return;   // WLEDMM shortcut when no mirroring needed
+  if (simpleSegment) return;   // WLEDMM shortcut when no mirroring needed
 
   // handle mirroring
   const int_fast16_t wid_ = stop - start;
@@ -683,15 +683,6 @@ void Segment::drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint3
   const int rows = virtualHeight();
   if (x0 >= cols || x1 >= cols || y0 >= rows || y1 >= rows) return;
 
-  const int dx = abs(x1-x0), sx = x0<x1 ? 1 : -1; // x distance & step
-  const int dy = abs(y1-y0), sy = y0<y1 ? 1 : -1; // y distance & step
-
-  // single pixel (line length == 0)
-  if (dx+dy == 0) {
-    setPixelColorXY(x0, y0, c);
-    return;
-  }
-
   // WLEDMM shortcut when no grouping/spacing used
   bool simpleSegment = !reverse && (grouping == 1) && (spacing == 0);  // !reverse is just for back-to-back testing against "slow" functions
   uint32_t scaled_col = c;
@@ -702,6 +693,16 @@ void Segment::drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint3
       if (_bri_t < 255) scaled_col = color_fade(c, _bri_t);
   }
 
+  const int dx = abs(x1-x0), sx = x0<x1 ? 1 : -1; // x distance & step
+  const int dy = abs(y1-y0), sy = y0<y1 ? 1 : -1; // y distance & step
+
+  // single pixel (line length == 0)
+  if (dx+dy == 0) {
+    if (simpleSegment) setPixelColorXY_fast(x0, y0, c, scaled_col, cols, rows);
+    else setPixelColorXY(x0, y0, c);
+    return;
+  }
+
   if (soft) {
     // Xiaolin Wu’s algorithm
     const bool steep = dy > dx;
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 34e59e40..fae5199e 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -920,7 +920,8 @@ void IRAM_ATTR_YN Segment::setPixelColor(int i, uint32_t col) //WLEDMM: IRAM_ATT
       case M12_pBar:
         // expand 1D effect vertically or have it play on virtual strips
         if (vStrip>0) setPixelColorXY(vStrip - 1, vH - i - 1, col);
-        else          for (int x = 0; x < vW; x++) setPixelColorXY(x, vH - i - 1, col);
+        //else          for (int x = 0; x < vW; x++) setPixelColorXY(x, vH - i - 1, col);
+        else drawLine(0, vH - i - 1, vW-1, vH - i - 1, col, false); // WLEDMM draw line instead of plotting each pixel
         break;
       case M12_pArc:
         // expand in circular fashion from center
@@ -1315,15 +1316,29 @@ void Segment::refreshLightCapabilities() {
 }
 
 /*
- * Fills segment with color
+ * Fills segment with color - WLEDMM using faster sPC if possible
  */
 void Segment::fill(uint32_t c) {
   if (!isActive()) return; // not active
   const uint_fast16_t cols = is2D() ? virtualWidth() : virtualLength();             // WLEDMM use fast int types
   const uint_fast16_t rows = virtualHeight(); // will be 1 for 1D
-  for(uint_fast16_t y = 0; y < rows; y++) for (uint_fast16_t x = 0; x < cols; x++) {
-    if (is2D()) setPixelColorXY((uint16_t)x, (uint16_t)y, c);
-    else        setPixelColor((uint16_t)x, c);
+
+  if (is2D()) {
+    // pre-calculate scaled color
+    uint32_t scaled_col = c;
+    bool simpleSegment = !reverse && (grouping == 1) && (spacing == 0);  // !reverse is just for back-to-back testing against "slow" functions
+    if (simpleSegment) {
+      uint8_t _bri_t = currentBri(on ? opacity : 0);
+      if (!_bri_t && !transitional) return;
+      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++) {
+      if (simpleSegment) setPixelColorXY_fast(x, y, c, scaled_col, cols, rows);
+      else setPixelColorXY(x, y, c);
+    }
+  } else { // fill 1D strip
+    for (int x = 0; x < cols; x++) setPixelColor(x, c);
   }
 }
 

From 3857862e0384c2f4e71a3cbd177b4c644a6bacc3 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Sun, 14 Jul 2024 22:32:42 -0400
Subject: [PATCH 085/200] Optimized side-wall drawing

Only draw what will be visible.

This is a pretty solid speed increase when the adjacent bar is close in height, or if it's taller and would occlude it anyway, it'll be skipped.
---
 wled00/FX.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 72ec8310..be19f00e 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8412,7 +8412,7 @@ uint16_t mode_GEQLASER(void) {
 
       ledColorTemp = color_fade(ledColor,32,true);
 
-      for (int y = 0; y <= heights[i]; y++) {
+      for (int y = heights[i+1]; y <= heights[i]; y++) { // don't bother drawing what we'll hide anyway
         SEGMENT.drawLine(linex+(cols/NUM_BANDS)-1,rows-y-1,*projector,horizon,ledColorTemp,false,distance); // right side perspective
       } 
 
@@ -8441,7 +8441,7 @@ uint16_t mode_GEQLASER(void) {
 
       ledColorTemp = color_fade(ledColor,32,true);
 
-      for (uint_fast8_t y = 0; y <= heights[i]; y++) {
+      for (uint_fast8_t y = heights[i-1]; y <= heights[i]; y++) { // don't bother drawing what we'll hide anyway
         SEGMENT.drawLine(linex,rows-y-1,*projector,horizon,ledColorTemp,false,distance); // left side perspective
       }
       

From d2762c35b03bd7747cbfe43947589725fddb97df Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 15 Jul 2024 11:57:46 +0200
Subject: [PATCH 086/200] Update FX.cpp

* add more accurate version of map() - reduces slight flickering in some 2D effects
* cache fftResult[] in effects (um_data->fftresult might get updated while the effect still calculates)
---
 wled00/FX.cpp | 83 ++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 56 insertions(+), 27 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 01fd923c..f599c511 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -79,6 +79,24 @@ static float mapf(float x, float in_min, float in_max, float out_min, float out_
   return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
 }
 
+// more accurate integer version of map() - based on map3() proposed in https://forum.arduino.cc/t/how-map-loses-precision-and-how-to-fix-it/371026/3
+// rounding instead of truncation, better handling of inverted ranges
+static long map2(long x, long in_min, long in_max, long out_min, long out_max)
+{
+  long out_range = out_max - out_min;
+  if (out_range > 0) out_range ++;
+  else if (out_range < 0) out_range --;
+  else return out_min; // output range is 0
+
+  long in_range = in_max - in_min;
+  if (in_range > 0) in_range++;
+  else if (in_range < 0) in_range --;
+  else return out_min; // input range is 0 - Result is actually infinity but long has no such thing. The least negative long is another choice.
+
+  return ((x - in_min) * out_range) / in_range + out_min;
+}
+
+
 // effect functions
 
 /*
@@ -1986,7 +2004,7 @@ uint16_t mode_partyjerk() {
   if (SEGENV.aux1 > 254) {
     SEGENV.aux1 = 0;
   }
-  if (SEGENV.aux0 > map(SEGMENT.custom1, 0, 255, 0, 14)) {
+  if (SEGENV.aux0 > map2(SEGMENT.custom1, 0, 255, 0, 14)) {
     SEGENV.aux0 = 0;
     SEGENV.aux1++;
   }
@@ -1995,7 +2013,7 @@ uint16_t mode_partyjerk() {
   uint16_t counter = 0;
 
   if (volumeSmth * 2 > (255 - SEGMENT.intensity)) {
-    speed = SEGMENT.speed * map(SEGMENT.custom2, 0, 255, 0, 100);
+    speed = SEGMENT.speed * map2(SEGMENT.custom2, 0, 255, 0, 100);
   } else {
     speed = SEGMENT.speed;
   };
@@ -4768,7 +4786,7 @@ uint16_t mode_aurora(void) {
 
   if(SEGENV.aux0 != SEGMENT.intensity || SEGENV.call == 0) {
     //Intensity slider changed or first call
-    SEGENV.aux1 = map(SEGMENT.intensity, 0, 255, 2, W_MAX_COUNT);
+    SEGENV.aux1 = map2(SEGMENT.intensity, 0, 255, 2, W_MAX_COUNT);
     SEGENV.aux0 = SEGMENT.intensity;
 
     if(!SEGENV.allocateData(sizeof(AuroraWave) * SEGENV.aux1)) { // 26 on 32 segment ESP32, 9 on 16 segment ESP8266
@@ -5187,9 +5205,9 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
   bool allColors   = SEGMENT.check1;
   bool overlayBG   = SEGMENT.check2;
   bool wrap        = SEGMENT.check3;
-  byte blur        = map(SEGMENT.custom1, 0, 255, 255, 0);
+  byte blur        = map2(SEGMENT.custom1, 0, 255, 255, 0);
   bool bgBlendMode = SEGMENT.custom1 > 220 && !overlayBG; // if blur is high and not overlaying, use bg blend mode
-  byte bgBlur      = map(SEGMENT.custom1 - 220, 0, 35, 255, 128);
+  byte bgBlur      = map2(SEGMENT.custom1 - 220, 0, 35, 255, 128);
   uint32_t bgColor = SEGCOLOR(1);
   uint32_t color   = allColors ? random16() * random16() : SEGMENT.color_from_palette(0, false, PALETTE_SOLID_WRAP, 0);
   uint16_t cIndex; 
@@ -5748,7 +5766,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 = map(cols, 8, 64, 310, 63);
+  uint16_t adjScale = map2(cols, 8, 64, 310, 63);
 
   adjustHeight = max(min(adjustHeight, 28.0f), minScale);     // WLEDMM bugfix for larger fixtures
   adjScale = max(min(adjScale, uint16_t(310)), uint16_t(63)); // WLEDMM
@@ -5767,8 +5785,8 @@ uint16_t mode_2DPolarLights(void) {        // By: Kostyantyn Matviyevskyy  https
     }
   }
 */
-  uint16_t _scale = map(SEGMENT.intensity, 0, 255, 30, adjScale);
-  byte _speed = map(SEGMENT.speed, 0, 255, 128, 16);
+  uint16_t _scale = map2(SEGMENT.intensity, 0, 255, 30, adjScale);
+  byte _speed = map2(SEGMENT.speed, 0, 255, 128, 16);
 
   //WLEDMM add SuperSync control
   uint16_t xStart, xEnd, yStart, yEnd;
@@ -6439,6 +6457,10 @@ static const char _data_FX_MODE_2DDRIFTROSE[] PROGMEM = "Drift Rose@Fade,Blur;;;
     volumeSmth    = *(float*)   um_data->u_data[0];
     volumeRaw     = *(int16_t*) um_data->u_data[1];
     fftResult     =  (uint8_t*) um_data->u_data[2];
+or
+    uint8_t fftResult[NUM_GEQ_CHANNELS] = {0};
+    if (um_data->u_data != nullptr) memcpy(fftResult, um_data->u_data[2], sizeof(fftResult));  // WLEDMM to buffer curent values
+
     samplePeak    = *(uint8_t*) um_data->u_data[3];
     FFT_MajorPeak = *(float*)   um_data->u_data[4];
     my_magnitude  = *(float*)   um_data->u_data[5];
@@ -6456,6 +6478,8 @@ static const char _data_FX_MODE_2DDRIFTROSE[] PROGMEM = "Drift Rose@Fade,Blur;;;
 
 // a few constants needed for AudioReactive effects
 
+#define NUM_GEQ_CHANNELS 16                                           // number of audioreactive frequency channels.
+
 // for 22Khz sampling
 #define MIN_FREQUENCY   80             // 80 HZ - due to lower resolution
 #define MIN_FREQ_LOG10  1.90309f       // log10(MIN_FREQUENCY) 
@@ -7018,7 +7042,7 @@ uint16_t mode_noisemeter(void) {                // Noisemeter. By Andrew Tuline.
   if (SEGENV.call == 0) {SEGENV.setUpLeds(); SEGMENT.fill(BLACK);}   // WLEDMM use lossless getPixelColor()
 
   //uint8_t fadeRate = map(SEGMENT.speed,0,255,224,255);
-  uint8_t fadeRate = map(SEGMENT.speed,0,255,200,254);
+  uint8_t fadeRate = map2(SEGMENT.speed,0,255,200,254);
   SEGMENT.fade_out(fadeRate);
 
   float tmpSound2 = volumeRaw * 2.0 * (float)SEGMENT.intensity / 255.0;
@@ -7128,7 +7152,7 @@ static const char _data_FX_MODE_PLASMOID[] PROGMEM = "Plasmoid@Phase,# of pixels
 uint16_t mode_puddlepeak(void) {                // Puddlepeak. By Andrew Tuline.
 
   uint16_t size = 0;
-  uint8_t fadeVal = map(SEGMENT.speed,0,255, 224, 254);
+  uint8_t fadeVal = map2(SEGMENT.speed,0,255, 224, 254);
   uint16_t pos = random16(SEGLEN);                        // Set a random starting position.
 
   um_data_t *um_data;
@@ -7174,7 +7198,7 @@ static const char _data_FX_MODE_PUDDLEPEAK[] PROGMEM = "Puddlepeak@Fade rate,Pud
 //////////////////////
 uint16_t mode_puddles(void) {                   // Puddles. By Andrew Tuline.
   uint16_t size = 0;
-  uint8_t fadeVal = map(SEGMENT.speed, 0, 255, 224, 254);
+  uint8_t fadeVal = map2(SEGMENT.speed, 0, 255, 224, 254);
   uint16_t pos = random16(SEGLEN);                        // Set a random starting position.
 
   if (SEGENV.call == 0) {
@@ -7380,7 +7404,7 @@ uint16_t mode_DJLight(void) {                   // Written by Stefan Petrick, Ad
     //if (color.getLuma() > 12) color.maximizeBrightness();          // for testing
 
     //SEGMENT.setPixelColor(mid, color.fadeToBlackBy(map(fftResult[4], 0, 255, 255, 4)));     // 0.13.x  fade -> 180hz-260hz
-    uint8_t fadeVal = map(fftResult[3], 0, 255, 255, 4);                                      // 0.14.x  fade -> 216hz-301hz
+    uint8_t fadeVal = map2(fftResult[3], 0, 255, 255, 4);                                      // 0.14.x  fade -> 216hz-301hz
     if (SEGENV.check1) fadeVal = constrain(fadeVal, 0, 176);  // "candy factory" mode - avoid complete fade-out
     SEGMENT.setPixelColor(mid, color.fadeToBlackBy(fadeVal));
 
@@ -7684,7 +7708,8 @@ uint16_t mode_noisemove(void) {                 // Noisemove.    By: Andrew Tuli
     // add support for no audio
     um_data = simulateSound(SEGMENT.soundSim);
   }
-  uint8_t *fftResult = (uint8_t*)um_data->u_data[2];
+  uint8_t fftResult[NUM_GEQ_CHANNELS] = {0};
+  if (um_data->u_data != nullptr) memcpy(fftResult, um_data->u_data[2], sizeof(fftResult));  // WLEDMM buffer curent values
 
   if (SEGENV.call == 0) {
     SEGENV.setUpLeds();   // WLEDMM use lossless getPixelColor()
@@ -7694,11 +7719,11 @@ uint16_t mode_noisemove(void) {                 // Noisemove.    By: Andrew Tuli
   int fadeoutDelay = (256 - SEGMENT.speed) / 96;
   if ((fadeoutDelay <= 1 ) || ((SEGENV.call % fadeoutDelay) == 0)) SEGMENT.fadeToBlackBy(4+ SEGMENT.speed/4);
 
-  uint8_t numBins = map(SEGMENT.intensity,0,255,0,16);    // Map slider to fftResult bins.
+  uint8_t numBins = map2(SEGMENT.intensity,0,255,0,16);    // Map slider to fftResult bins.
   for (int i=0; i<numBins; i++) {                         // How many active bins are we using.
     uint16_t locn = inoise16(strip.now*SEGMENT.speed+i*50000, strip.now*SEGMENT.speed);   // Get a new pixel location from moving noise.
     // if SEGLEN equals 1 locn will be always 0, hence we set the first pixel only
-    locn = map(locn, 7500, 58000, 0, SEGLEN-1);           // Map that to the length of the strand, and ensure we don't go over.
+    locn = map2(locn, 7500, 58000, 0, SEGLEN-1);           // Map that to the length of the strand, and ensure we don't go over.
     SEGMENT.setPixelColor(locn, color_blend(SEGCOLOR(1), SEGMENT.color_from_palette(i*64, false, PALETTE_SOLID_WRAP, 0), fftResult[i % 16]*4));
   }
 
@@ -7816,7 +7841,7 @@ static const char _data_FX_MODE_WATERFALL[] PROGMEM = "Waterfall@!,Adjust color,
 uint16_t mode_2DGEQ(void) { // By Will Tatam. Code reduction by Ewoud Wijma.
   if (!strip.isMatrix) return mode_static(); // not a 2D set-up
 
-  const int NUM_BANDS = map(SEGMENT.custom1, 0, 255, 1, 16);
+  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
@@ -7829,7 +7854,9 @@ uint16_t mode_2DGEQ(void) { // By Will Tatam. Code reduction by Ewoud Wijma.
     // add support for no audio
     um_data = simulateSound(SEGMENT.soundSim);
   }
-  uint8_t *fftResult = (uint8_t*)um_data->u_data[2];
+  uint8_t fftResult[NUM_GEQ_CHANNELS] = {0};
+  if (um_data->u_data != nullptr) memcpy(fftResult, um_data->u_data[2], sizeof(fftResult));  // WLEDMM buffer curent values
+
   #ifdef SR_DEBUG
   uint8_t samplePeak = *(uint8_t*)um_data->u_data[3];
   #endif
@@ -7862,7 +7889,7 @@ uint16_t mode_2DGEQ(void) { // By Will Tatam. Code reduction by Ewoud Wijma.
     remaining--; //consume remaining
 
     // Serial.printf("x %d b %d n %d w %f %f\n", x, band, NUM_BANDS, bandwidth, remaining);
-    uint8_t frBand = ((NUM_BANDS < 16) && (NUM_BANDS > 1)) ? map(band, 0, NUM_BANDS - 1, 0, 15):band; // always use full range. comment out this line to get the previous behaviour.
+    uint8_t frBand = ((NUM_BANDS < 16) && (NUM_BANDS > 1)) ? map2(band, 0, NUM_BANDS - 1, 0, 15):band; // always use full range. comment out this line to get the previous behaviour.
     // frBand = constrain(frBand, 0, 15); //WLEDMM can never be out of bounds (I think...)
     uint16_t colorIndex = frBand * 17; //WLEDMM 0.255
     uint16_t bandHeight = fftResult[frBand];  // WLEDMM we use the original ffResult, to preserve accuracy
@@ -7872,7 +7899,7 @@ uint16_t mode_2DGEQ(void) { // By Will Tatam. Code reduction by Ewoud Wijma.
       // get height of next (right side) bar
       uint8_t nextband = (remaining < 1)? band +1: band;
       nextband = constrain(nextband, 0, 15);  // just to be sure
-      frBand = ((NUM_BANDS < 16) && (NUM_BANDS > 1)) ? map(nextband, 0, NUM_BANDS - 1, 0, 15):nextband; // always use full range. comment out this line to get the previous behaviour.
+      frBand = ((NUM_BANDS < 16) && (NUM_BANDS > 1)) ? map2(nextband, 0, NUM_BANDS - 1, 0, 15):nextband; // always use full range. comment out this line to get the previous behaviour.
       uint16_t nextBandHeight = fftResult[frBand];
       // smooth Band height
       bandHeight = (7*bandHeight + 3*lastBandHeight + 3*nextBandHeight) / 12;   // yeees, its 12 not 13 (10% amplification)
@@ -7920,7 +7947,7 @@ uint16_t mode_2DFunkyPlank(void) {              // Written by ??? Adapted by Wil
   const uint16_t cols = SEGMENT.virtualWidth();
   const uint16_t rows = SEGMENT.virtualHeight();
 
-  int NUMB_BANDS = map(SEGMENT.custom1, 0, 255, 1, 16);
+  int NUMB_BANDS = map2(SEGMENT.custom1, 0, 255, 1, 16);
   int barWidth = (cols / NUMB_BANDS);
   int bandInc = 1;
   if (barWidth == 0) {
@@ -7934,7 +7961,8 @@ uint16_t mode_2DFunkyPlank(void) {              // Written by ??? Adapted by Wil
     // add support for no audio
     um_data = simulateSound(SEGMENT.soundSim);
   }
-  uint8_t *fftResult = (uint8_t*)um_data->u_data[2];
+  uint8_t fftResult[NUM_GEQ_CHANNELS] = {0};
+  if (um_data->u_data != nullptr) memcpy(fftResult, um_data->u_data[2], sizeof(fftResult));  // WLEDMM buffer curent values
 
   if (SEGENV.call == 0) {
     SEGMENT.setUpLeds();
@@ -7949,7 +7977,7 @@ uint16_t mode_2DFunkyPlank(void) {              // Written by ??? Adapted by Wil
     int b = 0;
     for (int band = 0; band < NUMB_BANDS; band += bandInc, b++) {
       int hue = fftResult[band % 16];
-      int v = map(fftResult[band % 16], 0, 255, 10, 255);
+      int v = map2(fftResult[band % 16], 0, 255, 10, 255);
       for (int w = 0; w < barWidth; w++) {
          int xpos = (barWidth * b) + w;
          SEGMENT.setPixelColorXY(xpos, 0, CHSV(hue, 255, v));
@@ -8021,11 +8049,12 @@ uint16_t mode_2DAkemi(void) {
   const float lightFactor  = 0.15f;
   const float normalFactor = 0.4f;
 
-  um_data_t *um_data;
+  um_data_t *um_data = nullptr;
   if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
     um_data = simulateSound(SEGMENT.soundSim);
   }
-  uint8_t *fftResult = (uint8_t*)um_data->u_data[2];
+  uint8_t fftResult[NUM_GEQ_CHANNELS] = {0};
+  if (um_data->u_data != nullptr) memcpy(fftResult, um_data->u_data[2], sizeof(fftResult));  // WLEDMM buffer curent values
   float base = fftResult[0]/255.0f;
 
   //draw and color Akemi
@@ -8047,7 +8076,7 @@ uint16_t mode_2DAkemi(void) {
       default: color = BLACK; break;
     }
 
-    if (SEGMENT.intensity > 128 && fftResult && fftResult[0] > 128) { //dance if base is high
+    if (SEGMENT.intensity > 128 && um_data && fftResult[0] > 128) { //dance if base is high
       SEGMENT.setPixelColorXY(x, 0, BLACK);
       SEGMENT.setPixelColorXY(x, y+1, color);
     } else
@@ -8055,11 +8084,11 @@ uint16_t mode_2DAkemi(void) {
   }
 
   //add geq left and right
-  if (um_data && fftResult) {
+  if (um_data) {
     for (int x=0; x < cols/8; x++) {
       uint16_t band = x * cols/8;
       band = constrain(band, 0, 15);
-      uint16_t barHeight = map(fftResult[band], 0, 255, 0, 17*rows/32);
+      uint16_t barHeight = map2(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++) {

From d0927a5142d73810f11c3f60ab9fb1a15a390e68 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 15 Jul 2024 12:29:29 +0200
Subject: [PATCH 087/200] akemi and GEQ didn't like map2

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

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index f599c511..ba2f1c3c 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -7889,7 +7889,7 @@ uint16_t mode_2DGEQ(void) { // By Will Tatam. Code reduction by Ewoud Wijma.
     remaining--; //consume remaining
 
     // Serial.printf("x %d b %d n %d w %f %f\n", x, band, NUM_BANDS, bandwidth, remaining);
-    uint8_t frBand = ((NUM_BANDS < 16) && (NUM_BANDS > 1)) ? map2(band, 0, NUM_BANDS - 1, 0, 15):band; // always use full range. comment out this line to get the previous behaviour.
+    uint8_t frBand = ((NUM_BANDS < 16) && (NUM_BANDS > 1)) ? map(band, 0, NUM_BANDS - 1, 0, 15):band; // always use full range. comment out this line to get the previous behaviour.
     // frBand = constrain(frBand, 0, 15); //WLEDMM can never be out of bounds (I think...)
     uint16_t colorIndex = frBand * 17; //WLEDMM 0.255
     uint16_t bandHeight = fftResult[frBand];  // WLEDMM we use the original ffResult, to preserve accuracy
@@ -7899,7 +7899,7 @@ uint16_t mode_2DGEQ(void) { // By Will Tatam. Code reduction by Ewoud Wijma.
       // get height of next (right side) bar
       uint8_t nextband = (remaining < 1)? band +1: band;
       nextband = constrain(nextband, 0, 15);  // just to be sure
-      frBand = ((NUM_BANDS < 16) && (NUM_BANDS > 1)) ? map2(nextband, 0, NUM_BANDS - 1, 0, 15):nextband; // always use full range. comment out this line to get the previous behaviour.
+      frBand = ((NUM_BANDS < 16) && (NUM_BANDS > 1)) ? map(nextband, 0, NUM_BANDS - 1, 0, 15):nextband; // always use full range. comment out this line to get the previous behaviour.
       uint16_t nextBandHeight = fftResult[frBand];
       // smooth Band height
       bandHeight = (7*bandHeight + 3*lastBandHeight + 3*nextBandHeight) / 12;   // yeees, its 12 not 13 (10% amplification)
@@ -8088,7 +8088,7 @@ uint16_t mode_2DAkemi(void) {
     for (int x=0; x < cols/8; x++) {
       uint16_t band = x * cols/8;
       band = constrain(band, 0, 15);
-      uint16_t barHeight = map2(fftResult[band], 0, 255, 0, 17*rows/32);
+      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++) {

From 4f6eb8b1618a8f1f929eeaab76d291c8dd4490d4 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 15 Jul 2024 13:24:18 +0200
Subject: [PATCH 088/200] prevent array bounds violation

+ don't use dynamic array for heights[] - dynamic arrays are using malloc() -> heap frag.
---
 wled00/FX.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 599dea0d..5b367e84 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8420,7 +8420,7 @@ uint16_t mode_GEQLASER(void) {
   }
   uint8_t *fftResult = (uint8_t*)um_data->u_data[2];
 
-  uint8_t heights[NUM_BANDS] = { 0 };
+  uint8_t heights[NUM_GEQ_CHANNELS] = { 0 };
 
   for (int i=0; i<NUM_BANDS; i++) {
     heights[i] = map8(fftResult[i],0,rows*0.85);
@@ -8441,7 +8441,7 @@ uint16_t mode_GEQLASER(void) {
 
       ledColorTemp = color_fade(ledColor,32,true);
 
-      for (int y = heights[i+1]; y <= heights[i]; y++) { // don't bother drawing what we'll hide anyway
+      for (int y = (i<NUM_BANDS-1) ? heights[i+1] : 0; y <= heights[i]; y++) { // don't bother drawing what we'll hide anyway
         SEGMENT.drawLine(linex+(cols/NUM_BANDS)-1,rows-y-1,*projector,horizon,ledColorTemp,false,distance); // right side perspective
       } 
 
@@ -8470,7 +8470,7 @@ uint16_t mode_GEQLASER(void) {
 
       ledColorTemp = color_fade(ledColor,32,true);
 
-      for (uint_fast8_t y = heights[i-1]; y <= heights[i]; y++) { // don't bother drawing what we'll hide anyway
+      for (uint_fast8_t y = (i>0) ? heights[i-1] : 0; y <= heights[i]; y++) { // don't bother drawing what we'll hide anyway
         SEGMENT.drawLine(linex,rows-y-1,*projector,horizon,ledColorTemp,false,distance); // left side perspective
       }
       

From 5401328b6e69182cdbf879c4dd81d66e8bdc6d00 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 15 Jul 2024 14:05:19 +0200
Subject: [PATCH 089/200] loop optimizations

* made cols/rows integer, to avoid that "cols-x" wraps around
* pre-compute some expressions that don't depend on loop counters

--> wins us 1-4 fps on my 72x72 test setup
---
 wled00/FX.cpp | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 5b367e84..8d523ffc 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8408,8 +8408,8 @@ uint16_t mode_GEQLASER(void) {
   SEGMENT.fill(BLACK);
 
   const int NUM_BANDS = map(SEGMENT.custom3, 0, 31, 1, 16); // custom3 is 0..31
-  const uint16_t cols = SEGMENT.virtualWidth();
-  const uint16_t rows = SEGMENT.virtualHeight();
+  const int cols = SEGMENT.virtualWidth();
+  const int rows = SEGMENT.virtualHeight();
   uint32_t ledColorTemp;
   uint_fast8_t split = map(*projector,0,SEGMENT.virtualWidth(),0,(NUM_BANDS - 1));
 
@@ -8421,9 +8421,8 @@ uint16_t mode_GEQLASER(void) {
   uint8_t *fftResult = (uint8_t*)um_data->u_data[2];
 
   uint8_t heights[NUM_GEQ_CHANNELS] = { 0 };
-
   for (int i=0; i<NUM_BANDS; i++) {
-    heights[i] = map8(fftResult[i],0,rows*0.85);
+    heights[i] = map8(fftResult[i],0,rows*0.85); // cache fftResult[] as data might be updated in parallel by the audioreactive core
   }
 
   uint16_t horizon = map(SEGMENT.custom1,0,255,rows-1,0); 
@@ -8440,16 +8439,17 @@ uint16_t mode_GEQLASER(void) {
     if (heights[i] > 1) {
 
       ledColorTemp = color_fade(ledColor,32,true);
+      int pPos = linex+(cols/NUM_BANDS)-1;
 
       for (int y = (i<NUM_BANDS-1) ? heights[i+1] : 0; y <= heights[i]; y++) { // don't bother drawing what we'll hide anyway
-        SEGMENT.drawLine(linex+(cols/NUM_BANDS)-1,rows-y-1,*projector,horizon,ledColorTemp,false,distance); // right side perspective
+        SEGMENT.drawLine(pPos,rows-y-1,*projector,horizon,ledColorTemp,false,distance); // right side perspective
       } 
 
       ledColorTemp = color_fade(ledColor,128,true);
 
-      if (heights[i] < rows-horizon && (*projector <=linex || *projector >= linex+(cols/NUM_BANDS)-1)) { // draw if above horizon AND not directly under projector (special case later)
+      if (heights[i] < rows-horizon && (*projector <=linex || *projector >= pPos)) { // draw if above horizon AND not directly under projector (special case later)
 
-        for (uint_fast8_t x=linex; x<=linex+(cols/NUM_BANDS)-1;x++) { 
+        for (uint_fast8_t x=linex; x<=pPos;x++) { 
           SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,false,distance); // top perspective
         }
 
@@ -8465,6 +8465,7 @@ uint16_t mode_GEQLASER(void) {
     uint32_t ledColor = SEGMENT.color_from_palette(colorIndex, false, PALETTE_SOLID_WRAP, 0);
 
     int linex = i*(cols/NUM_BANDS);
+    int pPos = linex+(cols/NUM_BANDS)-1;
 
     if (heights[i] > 1) {
 
@@ -8476,9 +8477,9 @@ uint16_t mode_GEQLASER(void) {
       
       ledColorTemp = color_fade(ledColor,128,true);
 
-      if (heights[i] < rows-horizon && (*projector <=linex || *projector >= linex+(cols/NUM_BANDS)-1)) { // draw if above horizon AND not directly under projector (special case later)
+      if (heights[i] < rows-horizon && (*projector <=linex || *projector >= pPos)) { // draw if above horizon AND not directly under projector (special case later)
 
-        for (uint_fast8_t x=linex; x<=linex+(cols/NUM_BANDS)-1;x++) {
+        for (uint_fast8_t x=linex; x<=pPos;x++) {
           SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,false,distance); // top perspective
         }
 
@@ -8494,14 +8495,16 @@ uint16_t mode_GEQLASER(void) {
     uint32_t ledColor = SEGMENT.color_from_palette(colorIndex, false, PALETTE_SOLID_WRAP, 0);
 
     int linex = i*(cols/NUM_BANDS);
+    int pPos  = linex+(cols/NUM_BANDS)-1;
+    int pPos1 = linex+(cols/NUM_BANDS);
 
-    if (*projector >=linex && *projector <= linex+(cols/NUM_BANDS)-1) { // special case when top perspective is directly under the projector
+    if (*projector >=linex && *projector <= pPos) { // special case when top perspective is directly under the projector
 
       if (heights[i] > 1 && heights[i] < rows-horizon) {
 
         ledColorTemp = color_fade(ledColor,128,true);
 
-        for (uint_fast8_t x=linex; x<=linex+(cols/NUM_BANDS)-1;x++) {
+        for (uint_fast8_t x=linex; x<=pPos;x++) {
           SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,false,distance); // top perspective
         }
 
@@ -8513,7 +8516,7 @@ uint16_t mode_GEQLASER(void) {
   
       ledColorTemp = color_fade(ledColor,SEGMENT.intensity,true);
 
-      for (uint_fast8_t x=linex; x<linex+(cols/NUM_BANDS);x++) { 
+      for (uint_fast8_t x=linex; x<pPos1;x++) { 
         SEGMENT.drawLine(x,rows-1,x,rows-heights[i]-1,ledColorTemp); // front fill
       }
 
@@ -8521,7 +8524,7 @@ uint16_t mode_GEQLASER(void) {
 
         if (SEGMENT.intensity == 0) ledColorTemp = color_fade(ledColor,32,true); // match side fill if we're in blackout mode
 
-        SEGMENT.drawLine(linex,rows-heights[i]-1,linex+(cols/NUM_BANDS)-1,rows-heights[i]-1,ledColorTemp); // top line to simulate hidden top fill
+        SEGMENT.drawLine(linex,rows-heights[i]-1,pPos,rows-heights[i]-1,ledColorTemp); // top line to simulate hidden top fill
 
       }
 

From 54f9d4ca6dbfbd69fc7469c4c10561c5ff36abeb Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Mon, 15 Jul 2024 08:17:00 -0400
Subject: [PATCH 090/200] Borders checkbox for @netmindz

Netmindz likes the borders. Now a check-box to enable.
---
 wled00/FX.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 8d523ffc..02f62a2b 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8520,14 +8520,21 @@ uint16_t mode_GEQLASER(void) {
         SEGMENT.drawLine(x,rows-1,x,rows-heights[i]-1,ledColorTemp); // front fill
       }
 
-      if (heights[i] > rows-horizon) {
+      if (!SEGMENT.check1 && heights[i] > rows-horizon) {
 
         if (SEGMENT.intensity == 0) ledColorTemp = color_fade(ledColor,32,true); // match side fill if we're in blackout mode
 
-        SEGMENT.drawLine(linex,rows-heights[i]-1,pPos,rows-heights[i]-1,ledColorTemp); // top line to simulate hidden top fill
+        SEGMENT.drawLine(linex,rows-heights[i]-1,linex+(cols/NUM_BANDS)-1,rows-heights[i]-1,ledColorTemp); // top line to simulate hidden top fill
 
       }
 
+      if (SEGMENT.check1) {
+        SEGMENT.drawLine(linex,            rows-1,linex,rows-heights[i]-1,ledColor); // left side line
+        SEGMENT.drawLine(linex+(cols/16)-1,rows-1,linex+(cols/16)-1,rows-heights[i]-1,ledColor); // right side line
+        SEGMENT.drawLine(linex,            rows-heights[i]-2,linex+(cols/16)-1,rows-heights[i]-2,ledColor); // top line
+        SEGMENT.drawLine(linex,            rows-1,linex+(cols/16)-1,rows-1,ledColor); // bottom line
+      } 
+
     }
 
   }

From 98c15d7ec05fcff98015f8c6c470cd3bb20e1726 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Mon, 15 Jul 2024 08:18:42 -0400
Subject: [PATCH 091/200] Borders checkbox

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

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 02f62a2b..95041774 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8542,7 +8542,7 @@ uint16_t mode_GEQLASER(void) {
   return FRAMETIME;
 
 }
-static const char _data_FX_MODE_GEQLASER[] PROGMEM = "GEQ 3D ☾@Speed,Front Fill,Horizon,Distance,Num Bands,,,;!,,Peaks;!;2f;sx=255,ix=255,c1=255,c2=255,c3=255,pal=11";
+static const char _data_FX_MODE_GEQLASER[] PROGMEM = "GEQ 3D ☾@Speed,Front Fill,Horizon,Distance,Num Bands,Borders,,;!,,Peaks;!;2f;sx=255,ix=255,c1=255,c2=255,c3=255,pal=11";
 
 #endif // WLED_DISABLE_2D
 

From 961040849e16ea95e9d12a374c4f344b06762c5a Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 15 Jul 2024 18:06:25 +0200
Subject: [PATCH 092/200] speedup for pinwheel mapping

fast sPC() in pinwheel mapping -> ~10% speedup
---
 wled00/FX_fcn.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index fae5199e..78bae5f4 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -1004,6 +1004,16 @@ void IRAM_ATTR_YN Segment::setPixelColor(int i, uint32_t col) //WLEDMM: IRAM_ATT
         }
         break;
       case M12_sPinwheel: {
+        // WLEDMM shortcut when no grouping/spacing used
+        bool simpleSegment = !reverse && (grouping == 1) && (spacing == 0);  // !reverse is just for back-to-back testing against "slow" functions
+        uint32_t scaled_col = col;
+        if (simpleSegment) {
+          // segment brightness must be pre-calculated for the "fast" setPixelColorXY variant!
+          uint8_t _bri_t = currentBri(on ? opacity : 0);
+          if (!_bri_t && !transitional) return;
+          if (_bri_t < 255) scaled_col = color_fade(col, _bri_t);
+        }
+
         // i = angle --> 0 - 296  (Big), 0 - 192  (Medium), 0 - 72 (Small)
         float centerX = roundf((vW-1) / 2.0f);
         float centerY = roundf((vH-1) / 2.0f);
@@ -1040,7 +1050,10 @@ void IRAM_ATTR_YN Segment::setPixelColor(int i, uint32_t col) //WLEDMM: IRAM_ATT
           int x = posx / Fixed_Scale;
           int y = posy / Fixed_Scale;
           // set pixel
-          if (x != lastX || y != lastY) setPixelColorXY(x, y, col);  // only paint if pixel position is different
+          if (x != lastX || y != lastY) { // only paint if pixel position is different
+            if (simpleSegment) setPixelColorXY_fast(x, y, col, scaled_col, vW, vH);
+            else setPixelColorXY(x, y, col);  
+          }
           lastX = x;
           lastY = y;
           // advance to next position

From 6565e716aba033a5c62284b4d122a9f6e00c9829 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 15 Jul 2024 18:14:30 +0200
Subject: [PATCH 093/200] GEQ speedup

use drawLine() to draw a complete bar at once. Only possible if _not_ doing colored bars.
---
 wled00/FX.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 95041774..ba8d3cd8 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -7914,13 +7914,17 @@ 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
+      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
+    } else {
     for (int y=0; y < barHeight; y++) {
       if (SEGMENT.check1) //color_vertical / color bars toggle
         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);
-    }
+    } }
     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);
 

From 88d12547a496516d0caa049c2a77a0012ab48035 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 15 Jul 2024 18:24:27 +0200
Subject: [PATCH 094/200] FX.cpp: scrolling text tag #pow --> #amp

scrolling text: #pow --> #amp
because its ampere, not power.
---
 wled00/FX.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index ba2f1c3c..af1c7423 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -6375,7 +6375,7 @@ 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("%2d"), (int) strip.getFps());                     // WLEDMM
-    else if (!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.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);
   }
   const int numberOfLetters = strlen(text);

From 9928f5b9eca3d1893748d289ea6085137c552930 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 15 Jul 2024 18:27:25 +0200
Subject: [PATCH 095/200] fixie

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

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index af1c7423..533977dc 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -6375,7 +6375,7 @@ 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("%2d"), (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.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);
   }
   const int numberOfLetters = strlen(text);

From e3d27de3951d7c5e47790bcea3f86f79afab5a9a Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 16 Jul 2024 13:27:56 +0200
Subject: [PATCH 096/200] better handling of perspective

drawLine parameter "depth" shortens a line by a fraction - useful for VP perspective (vanishing point)
---
 wled00/FX.cpp       | 15 +++++++--------
 wled00/FX.h         |  4 ++--
 wled00/FX_2Dfcn.cpp | 15 +++++++++++++--
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index ba8d3cd8..65a583e6 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8430,8 +8430,7 @@ uint16_t mode_GEQLASER(void) {
   }
 
   uint16_t horizon = map(SEGMENT.custom1,0,255,rows-1,0); 
-  uint16_t distance = map8(SEGMENT.custom2,1,rows-1);
-  if (SEGMENT.custom2 == 255) distance = UINT16_MAX;
+  uint8_t depth = SEGMENT.custom2;  // depth of perspective. 255 = infinite ("laser")
 
   for (int i=0; i<=split; i++) { // paint right vertical faces and top - LEFT to RIGHT
 
@@ -8446,7 +8445,7 @@ uint16_t mode_GEQLASER(void) {
       int pPos = linex+(cols/NUM_BANDS)-1;
 
       for (int y = (i<NUM_BANDS-1) ? heights[i+1] : 0; y <= heights[i]; y++) { // don't bother drawing what we'll hide anyway
-        SEGMENT.drawLine(pPos,rows-y-1,*projector,horizon,ledColorTemp,false,distance); // right side perspective
+        SEGMENT.drawLine(pPos,rows-y-1,*projector,horizon,ledColorTemp,false,depth); // right side perspective
       } 
 
       ledColorTemp = color_fade(ledColor,128,true);
@@ -8454,7 +8453,7 @@ uint16_t mode_GEQLASER(void) {
       if (heights[i] < rows-horizon && (*projector <=linex || *projector >= pPos)) { // draw if above horizon AND not directly under projector (special case later)
 
         for (uint_fast8_t x=linex; x<=pPos;x++) { 
-          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,false,distance); // top perspective
+          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,false,depth); // top perspective
         }
 
       }
@@ -8476,7 +8475,7 @@ uint16_t mode_GEQLASER(void) {
       ledColorTemp = color_fade(ledColor,32,true);
 
       for (uint_fast8_t y = (i>0) ? heights[i-1] : 0; y <= heights[i]; y++) { // don't bother drawing what we'll hide anyway
-        SEGMENT.drawLine(linex,rows-y-1,*projector,horizon,ledColorTemp,false,distance); // left side perspective
+        SEGMENT.drawLine(linex,rows-y-1,*projector,horizon,ledColorTemp,false,depth); // left side perspective
       }
       
       ledColorTemp = color_fade(ledColor,128,true);
@@ -8484,7 +8483,7 @@ uint16_t mode_GEQLASER(void) {
       if (heights[i] < rows-horizon && (*projector <=linex || *projector >= pPos)) { // draw if above horizon AND not directly under projector (special case later)
 
         for (uint_fast8_t x=linex; x<=pPos;x++) {
-          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,false,distance); // top perspective
+          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,false,depth); // top perspective
         }
 
       }
@@ -8509,7 +8508,7 @@ uint16_t mode_GEQLASER(void) {
         ledColorTemp = color_fade(ledColor,128,true);
 
         for (uint_fast8_t x=linex; x<=pPos;x++) {
-          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,false,distance); // top perspective
+          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,false,depth); // top perspective
         }
 
       }
@@ -8546,7 +8545,7 @@ uint16_t mode_GEQLASER(void) {
   return FRAMETIME;
 
 }
-static const char _data_FX_MODE_GEQLASER[] PROGMEM = "GEQ 3D ☾@Speed,Front Fill,Horizon,Distance,Num Bands,Borders,,;!,,Peaks;!;2f;sx=255,ix=255,c1=255,c2=255,c3=255,pal=11";
+static const char _data_FX_MODE_GEQLASER[] PROGMEM = "GEQ 3D ☾@Speed,Front Fill,Horizon,Depth,Num Bands,Borders,,;!,,Peaks;!;2f;sx=255,ix=255,c1=255,c2=255,c3=255,pal=11";
 
 #endif // WLED_DISABLE_2D
 
diff --git a/wled00/FX.h b/wled00/FX.h
index fbc84737..af707b41 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -697,8 +697,8 @@ typedef struct Segment {
     inline void drawCircle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c, bool soft = false) { drawCircle(cx, cy, radius, RGBW32(c.r,c.g,c.b,0), soft); }
     void fillCircle(uint16_t cx, uint16_t cy, uint8_t radius, uint32_t c, bool soft = false);
     inline void fillCircle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c, bool soft = false) { fillCircle(cx, cy, radius, RGBW32(c.r,c.g,c.b,0), soft); }
-    void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c, bool soft = false, uint16_t distance = UINT16_MAX);
-    inline void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, CRGB c, bool soft = false, uint16_t distance = UINT16_MAX) { drawLine(x0, y0, x1, y1, RGBW32(c.r,c.g,c.b,0), soft, distance); } // automatic inline
+    void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c, bool soft = false, uint8_t depth = UINT8_MAX);
+    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(uint16_t x0, uint16_t y0, uint16_t radius, uint32_t color, uint32_t fillColor = 0);
     inline void drawArc(uint16_t x0, uint16_t y0, uint16_t 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);
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 95786b8d..0a79a856 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -676,7 +676,7 @@ void Segment::nscale8(uint8_t scale) {  //WLEDMM: use fast types
 }
 
 //line function
-void Segment::drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c, bool soft, uint16_t distance) {
+void Segment::drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c, bool soft, uint8_t depth) {
   if (!isActive()) return; // not active
   // if (Segment::maxHeight==1) return; // not a matrix set-up
   const int cols = virtualWidth();
@@ -693,6 +693,17 @@ void Segment::drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint3
       if (_bri_t < 255) scaled_col = color_fade(c, _bri_t);
   }
 
+  // WLEDMM shorten line according to depth
+  if (depth < UINT8_MAX) {
+    if (depth<2) {x1 = x0; y1=y0; } // single pixel
+    else {
+      int dx1 = ((int(x1) - int(x0)) * int(depth)) / 255;  // X distance, scaled down by depth 
+      int dy1 = ((int(y1) - int(y0)) * int(depth)) / 255;  // Y distance, scaled down by depth
+      x1 = x0 + dx1;
+      y1 = y0 + dy1;
+    }
+  }
+
   const int dx = abs(x1-x0), sx = x0<x1 ? 1 : -1; // x distance & step
   const int dy = abs(y1-y0), sy = y0<y1 ? 1 : -1; // y distance & step
 
@@ -732,7 +743,7 @@ void Segment::drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint3
   } else {
     // Bresenham's algorithm
     int err = (dx>dy ? dx : -dy)/2;   // error direction
-    for (uint_fast16_t d=0; d<distance; d++) {
+    for (;;) {
       // if (x0 >= cols || y0 >= rows) break; // WLEDMM we hit the edge - should never happen
       if (simpleSegment) setPixelColorXY_fast(x0, y0, c, scaled_col, cols, rows);
       else setPixelColorXY(x0, y0, c);

From 96584c6c702f60f29deb0d65fcbbf4afa1e8aeee Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Tue, 16 Jul 2024 15:13:05 +0200
Subject: [PATCH 097/200] better rounding

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

diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 0a79a856..f6605029 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -695,12 +695,15 @@ void Segment::drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint3
 
   // WLEDMM shorten line according to depth
   if (depth < UINT8_MAX) {
+    if (depth == 0) return;         // nothing to paint
     if (depth<2) {x1 = x0; y1=y0; } // single pixel
-    else {
-      int dx1 = ((int(x1) - int(x0)) * int(depth)) / 255;  // X distance, scaled down by depth 
-      int dy1 = ((int(y1) - int(y0)) * int(depth)) / 255;  // Y distance, scaled down by depth
-      x1 = x0 + dx1;
-      y1 = y0 + dy1;
+    else {                          // shorten line
+      x0 *=2; y0 *=2; // we do everything "*2" for better rounding
+      int dx1 = ((int(2*x1) - int(x0)) * int(depth)) / 255;  // X distance, scaled down by depth 
+      int dy1 = ((int(2*y1) - int(y0)) * int(depth)) / 255;  // Y distance, scaled down by depth
+      x1 = (x0 + dx1 +1) / 2;
+      y1 = (y0 + dy1 +1) / 2;
+      x0 /=2; y0 /=2;
     }
   }
 

From e3b4a0839383f00077c784b7373f9fee2c841122 Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Tue, 16 Jul 2024 16:03:19 +0200
Subject: [PATCH 098/200] soft light option

* bugfix for Borders (did not work with <16 bands)

* new option for soft light: when checked, the left & right edges of top lights are drawn with anti-aliasing on. Costs us 1-2 fps, so I made it optional.
---
 wled00/FX.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 65a583e6..4b4fb251 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -7879,7 +7879,7 @@ uint16_t mode_2DGEQ(void) { // By Will Tatam. Code reduction by Ewoud Wijma.
 
   uint16_t lastBandHeight = 0;  // WLEDMM: for smoothing out bars
 
-  //WLEDMM: evenly ditribut bands
+  //WLEDMM: evenly ditribute bands
   float bandwidth = (float)cols / NUM_BANDS;
   float remaining = bandwidth;
   uint8_t band = 0;
@@ -8453,7 +8453,8 @@ uint16_t mode_GEQLASER(void) {
       if (heights[i] < rows-horizon && (*projector <=linex || *projector >= pPos)) { // draw if above horizon AND not directly under projector (special case later)
 
         for (uint_fast8_t x=linex; x<=pPos;x++) { 
-          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,false,depth); // top perspective
+          bool doSoft = SEGMENT.check2 && ((x==linex) || (x==pPos)); // only first and last line need AA
+          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,doSoft,depth); // top perspective
         }
 
       }
@@ -8483,7 +8484,8 @@ uint16_t mode_GEQLASER(void) {
       if (heights[i] < rows-horizon && (*projector <=linex || *projector >= pPos)) { // draw if above horizon AND not directly under projector (special case later)
 
         for (uint_fast8_t x=linex; x<=pPos;x++) {
-          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,false,depth); // top perspective
+          bool doSoft = SEGMENT.check2 && ((x==linex) || (x==pPos)); // only first and last line need AA
+          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,doSoft,depth); // top perspective
         }
 
       }
@@ -8532,10 +8534,10 @@ uint16_t mode_GEQLASER(void) {
       }
 
       if (SEGMENT.check1) {
-        SEGMENT.drawLine(linex,            rows-1,linex,rows-heights[i]-1,ledColor); // left side line
-        SEGMENT.drawLine(linex+(cols/16)-1,rows-1,linex+(cols/16)-1,rows-heights[i]-1,ledColor); // right side line
-        SEGMENT.drawLine(linex,            rows-heights[i]-2,linex+(cols/16)-1,rows-heights[i]-2,ledColor); // top line
-        SEGMENT.drawLine(linex,            rows-1,linex+(cols/16)-1,rows-1,ledColor); // bottom line
+        SEGMENT.drawLine(linex,                   rows-1,linex,rows-heights[i]-1,ledColor); // left side line
+        SEGMENT.drawLine(linex+(cols/NUM_BANDS)-1,rows-1,linex+(cols/NUM_BANDS)-1,rows-heights[i]-1,ledColor); // right side line
+        SEGMENT.drawLine(linex,                   rows-heights[i]-2,linex+(cols/NUM_BANDS)-1,rows-heights[i]-2,ledColor); // top line
+        SEGMENT.drawLine(linex,                   rows-1,linex+(cols/NUM_BANDS)-1,rows-1,ledColor); // bottom line
       } 
 
     }
@@ -8545,7 +8547,7 @@ uint16_t mode_GEQLASER(void) {
   return FRAMETIME;
 
 }
-static const char _data_FX_MODE_GEQLASER[] PROGMEM = "GEQ 3D ☾@Speed,Front Fill,Horizon,Depth,Num Bands,Borders,,;!,,Peaks;!;2f;sx=255,ix=255,c1=255,c2=255,c3=255,pal=11";
+static const char _data_FX_MODE_GEQLASER[] PROGMEM = "GEQ 3D ☾@Speed,Front Fill,Horizon,Depth,Num Bands,Borders,Soft Light,;!,,Peaks;!;2f;sx=255,ix=255,c1=255,c2=255,c3=255,pal=11";
 
 #endif // WLED_DISABLE_2D
 

From 1f14673f4392d83e16b5e5a8bca961986ad48067 Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Tue, 16 Jul 2024 16:08:08 +0200
Subject: [PATCH 099/200] workaround for "cannot read properties of undefined.
 reading 'split'

hmpf ... looks like somewhere deep in WLED, the FX name string gets limited to 127 chars....
---
 wled00/FX.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 4b4fb251..bede7570 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8547,7 +8547,7 @@ uint16_t mode_GEQLASER(void) {
   return FRAMETIME;
 
 }
-static const char _data_FX_MODE_GEQLASER[] PROGMEM = "GEQ 3D ☾@Speed,Front Fill,Horizon,Depth,Num Bands,Borders,Soft Light,;!,,Peaks;!;2f;sx=255,ix=255,c1=255,c2=255,c3=255,pal=11";
+static const char _data_FX_MODE_GEQLASER[] PROGMEM = "GEQ 3D ☾@Speed,Front Fill,Horizon,Depth,Num Bands,Borders,Soft,;!,,Peaks;!;2f;sx=255,ix=255,c1=255,c2=255,c3=255,pal=11";
 
 #endif // WLED_DISABLE_2D
 

From 4051d5ddd8b3d128daa4a395154cee8ce4610c4c Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 16 Jul 2024 18:40:11 +0200
Subject: [PATCH 100/200] increase limit for FX string: 127 --> 191 bytes

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

diff --git a/wled00/json.cpp b/wled00/json.cpp
index 444f0e4d..f672f53d 100644
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@@ -1397,9 +1397,9 @@ void serializeNodes(JsonObject root)
 // deserializes mode data string into JsonArray
 void serializeModeData(JsonArray fxdata)
 {
-  char lineBuffer[128];
+  char lineBuffer[192] = { 0 };
   for (size_t i = 0; i < strip.getModeCount(); i++) {
-    strncpy_P(lineBuffer, strip.getModeData(i), 127);
+    strncpy_P(lineBuffer, strip.getModeData(i), sizeof(lineBuffer)-1);
     if (lineBuffer[0] != 0) {
       char* dataPtr = strchr(lineBuffer,'@');
       if (dataPtr) fxdata.add(dataPtr+1);
@@ -1411,9 +1411,9 @@ void serializeModeData(JsonArray fxdata)
 // deserializes mode names string into JsonArray
 // also removes effect data extensions (@...) from deserialized names
 void serializeModeNames(JsonArray arr) {
-  char lineBuffer[128];
+  char lineBuffer[192] = { 0 };
   for (size_t i = 0; i < strip.getModeCount(); i++) {
-    strncpy_P(lineBuffer, strip.getModeData(i), 127);
+    strncpy_P(lineBuffer, strip.getModeData(i), sizeof(lineBuffer)-1);
     if (lineBuffer[0] != 0) {
       char* dataPtr = strchr(lineBuffer,'@');
       if (dataPtr) *dataPtr = 0; // terminate mode data after name

From 7a83f1759dbf98fa95e3b58bb4967421f1d37b0d Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Tue, 16 Jul 2024 20:26:52 +0200
Subject: [PATCH 101/200] removed a/b testing via Reverse X (segment option)

---
 wled00/FX_2Dfcn.cpp | 6 +++---
 wled00/FX_fcn.cpp   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index f6605029..900933f5 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -249,7 +249,7 @@ void IRAM_ATTR Segment::setPixelColorXY_fast(int x, int y, uint32_t col, uint32_
 #endif
 
 #if 0 // this is still a dangerous optimization
-  if ((i < UINT_MAX) && sameColor && (call > 0) && (!transitional) && (ledsrgb[i] == CRGB(col)) && (_globalLeds == nullptr)) return; // WLEDMM looks like nothing to do (but we don't trust globalleds)
+  if ((i < UINT_MAX) && sameColor && (call > 0) && (!transitional) && (ledsrgb[i] == CRGB(scaled_col))) return; // WLEDMM looks like nothing to do
 #endif
 
   // handle reverse and transpose
@@ -304,7 +304,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)) && (_globalLeds == nullptr)) return; // WLEDMM looks like nothing to do (but we don't trust globalleds)
+  if ((i < UINT_MAX) && sameColor && (call > 0) && (!transitional) && (ledsrgb[i] == CRGB(col))) return; // WLEDMM looks like nothing to do
 #endif
 
   if (reverse  ) x = cols  - x - 1;
@@ -684,7 +684,7 @@ void Segment::drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint3
   if (x0 >= cols || x1 >= cols || y0 >= rows || y1 >= rows) return;
 
   // WLEDMM shortcut when no grouping/spacing used
-  bool simpleSegment = !reverse && (grouping == 1) && (spacing == 0);  // !reverse is just for back-to-back testing against "slow" functions
+  bool simpleSegment = (grouping == 1) && (spacing == 0);
   uint32_t scaled_col = c;
   if (simpleSegment) {
       // segment brightness must be pre-calculated for the "fast" setPixelColorXY variant!
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 78bae5f4..11a5e0ea 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -1005,7 +1005,7 @@ void IRAM_ATTR_YN Segment::setPixelColor(int i, uint32_t col) //WLEDMM: IRAM_ATT
         break;
       case M12_sPinwheel: {
         // WLEDMM shortcut when no grouping/spacing used
-        bool simpleSegment = !reverse && (grouping == 1) && (spacing == 0);  // !reverse is just for back-to-back testing against "slow" functions
+        bool simpleSegment = (grouping == 1) && (spacing == 0);
         uint32_t scaled_col = col;
         if (simpleSegment) {
           // segment brightness must be pre-calculated for the "fast" setPixelColorXY variant!
@@ -1339,7 +1339,7 @@ void Segment::fill(uint32_t c) {
   if (is2D()) {
     // pre-calculate scaled color
     uint32_t scaled_col = c;
-    bool simpleSegment = !reverse && (grouping == 1) && (spacing == 0);  // !reverse is just for back-to-back testing against "slow" functions
+    bool simpleSegment = (grouping == 1) && (spacing == 0);
     if (simpleSegment) {
       uint8_t _bri_t = currentBri(on ? opacity : 0);
       if (!_bri_t && !transitional) return;

From 9bcc5da132dcc0153dab14622ced09e9accd9007 Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Tue, 16 Jul 2024 20:48:15 +0200
Subject: [PATCH 102/200] code cleanup

- removed commented-out code
- reduced blank lines
---
 wled00/FX.cpp       | 54 ++++++++++-----------------------------------
 wled00/FX_2Dfcn.cpp | 15 -------------
 2 files changed, 12 insertions(+), 57 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 3d009d6b..8f93c274 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8388,13 +8388,15 @@ uint16_t mode_2Dwavingcell() {
 }
 static const char _data_FX_MODE_2DWAVINGCELL[] PROGMEM = "Waving Cell@!,,Amplitude 1,Amplitude 2,Amplitude 3;;!;2";
 
+/////////////////////////
+//     ** 3D GEQ       //
+/////////////////////////
 uint16_t mode_GEQLASER(void) {
 
   // Author: @TroyHacks
 
   const size_t dataSize = sizeof(uint16_t);
   if (!SEGENV.allocateData(dataSize * 2)) return mode_static(); //allocation failed
-
   uint16_t *projector = reinterpret_cast<uint16_t*>(SEGENV.data);
   uint16_t *projector_dir = reinterpret_cast<uint16_t*>(SEGENV.data + dataSize);
 
@@ -8411,11 +8413,13 @@ uint16_t mode_GEQLASER(void) {
 
   SEGMENT.fill(BLACK);
 
-  const int NUM_BANDS = map(SEGMENT.custom3, 0, 31, 1, 16); // custom3 is 0..31
+  uint32_t ledColorTemp;
   const int cols = SEGMENT.virtualWidth();
   const int rows = SEGMENT.virtualHeight();
-  uint32_t ledColorTemp;
-  uint_fast8_t split = map(*projector,0,SEGMENT.virtualWidth(),0,(NUM_BANDS - 1));
+  const int NUM_BANDS = map(SEGMENT.custom3, 0, 31, 1, 16); // custom3 is 0..31
+  uint_fast8_t split  = map(*projector,0,SEGMENT.virtualWidth(),0,(NUM_BANDS - 1));
+  uint16_t horizon    = map(SEGMENT.custom1,0,255,rows-1,0); 
+  uint8_t depth       = SEGMENT.custom2;  // depth of perspective. 255 = infinite ("laser")
 
   um_data_t *um_data;
   if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
@@ -8429,108 +8433,78 @@ uint16_t mode_GEQLASER(void) {
     heights[i] = map8(fftResult[i],0,rows*0.85); // cache fftResult[] as data might be updated in parallel by the audioreactive core
   }
 
-  uint16_t horizon = map(SEGMENT.custom1,0,255,rows-1,0); 
-  uint8_t depth = SEGMENT.custom2;  // depth of perspective. 255 = infinite ("laser")
 
   for (int i=0; i<=split; i++) { // paint right vertical faces and top - LEFT to RIGHT
-
     uint16_t colorIndex = map(cols/NUM_BANDS*i, 0, cols-1, 0, 255);
     uint32_t ledColor = SEGMENT.color_from_palette(colorIndex, false, PALETTE_SOLID_WRAP, 0);
-
     int linex = i*(cols/NUM_BANDS);
 
     if (heights[i] > 1) {
-
       ledColorTemp = color_fade(ledColor,32,true);
       int pPos = linex+(cols/NUM_BANDS)-1;
-
       for (int y = (i<NUM_BANDS-1) ? heights[i+1] : 0; y <= heights[i]; y++) { // don't bother drawing what we'll hide anyway
         SEGMENT.drawLine(pPos,rows-y-1,*projector,horizon,ledColorTemp,false,depth); // right side perspective
       } 
 
       ledColorTemp = color_fade(ledColor,128,true);
-
       if (heights[i] < rows-horizon && (*projector <=linex || *projector >= pPos)) { // draw if above horizon AND not directly under projector (special case later)
-
         for (uint_fast8_t x=linex; x<=pPos;x++) { 
           bool doSoft = SEGMENT.check2 && ((x==linex) || (x==pPos)); // only first and last line need AA
           SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,doSoft,depth); // top perspective
         }
-
       }
-
     }
-
   }
 
-  for (int i=(NUM_BANDS - 1); i>split; i--) { // paint left vertical faces and top - RIGHT to LEFT
 
+  for (int i=(NUM_BANDS - 1); i>split; i--) { // paint left vertical faces and top - RIGHT to LEFT
     uint16_t colorIndex = map(cols/NUM_BANDS*i, 0, cols-1, 0, 255);
     uint32_t ledColor = SEGMENT.color_from_palette(colorIndex, false, PALETTE_SOLID_WRAP, 0);
-
     int linex = i*(cols/NUM_BANDS);
     int pPos = linex+(cols/NUM_BANDS)-1;
 
     if (heights[i] > 1) {
-
       ledColorTemp = color_fade(ledColor,32,true);
-
       for (uint_fast8_t y = (i>0) ? heights[i-1] : 0; y <= heights[i]; y++) { // don't bother drawing what we'll hide anyway
         SEGMENT.drawLine(linex,rows-y-1,*projector,horizon,ledColorTemp,false,depth); // left side perspective
       }
-      
+
       ledColorTemp = color_fade(ledColor,128,true);
-
       if (heights[i] < rows-horizon && (*projector <=linex || *projector >= pPos)) { // draw if above horizon AND not directly under projector (special case later)
-
         for (uint_fast8_t x=linex; x<=pPos;x++) {
           bool doSoft = SEGMENT.check2 && ((x==linex) || (x==pPos)); // only first and last line need AA
           SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,doSoft,depth); // top perspective
         }
-
       }
-
     }
-
   }
 
-  for (int i=0; i<NUM_BANDS; i++) {
 
+  for (int i=0; i<NUM_BANDS; i++) {
     uint16_t colorIndex = map(cols/NUM_BANDS*i, 0, cols-1, 0, 255);
     uint32_t ledColor = SEGMENT.color_from_palette(colorIndex, false, PALETTE_SOLID_WRAP, 0);
-
     int linex = i*(cols/NUM_BANDS);
     int pPos  = linex+(cols/NUM_BANDS)-1;
     int pPos1 = linex+(cols/NUM_BANDS);
 
     if (*projector >=linex && *projector <= pPos) { // special case when top perspective is directly under the projector
-
       if (heights[i] > 1 && heights[i] < rows-horizon) {
-
         ledColorTemp = color_fade(ledColor,128,true);
-
         for (uint_fast8_t x=linex; x<=pPos;x++) {
           SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,false,depth); // top perspective
         }
-
       }
-
     }
 
     if (heights[i] > 1) {
-  
       ledColorTemp = color_fade(ledColor,SEGMENT.intensity,true);
-
       for (uint_fast8_t x=linex; x<pPos1;x++) { 
         SEGMENT.drawLine(x,rows-1,x,rows-heights[i]-1,ledColorTemp); // front fill
       }
 
       if (!SEGMENT.check1 && heights[i] > rows-horizon) {
-
         if (SEGMENT.intensity == 0) ledColorTemp = color_fade(ledColor,32,true); // match side fill if we're in blackout mode
-
         SEGMENT.drawLine(linex,rows-heights[i]-1,linex+(cols/NUM_BANDS)-1,rows-heights[i]-1,ledColorTemp); // top line to simulate hidden top fill
-
       }
 
       if (SEGMENT.check1) {
@@ -8538,14 +8512,10 @@ uint16_t mode_GEQLASER(void) {
         SEGMENT.drawLine(linex+(cols/NUM_BANDS)-1,rows-1,linex+(cols/NUM_BANDS)-1,rows-heights[i]-1,ledColor); // right side line
         SEGMENT.drawLine(linex,                   rows-heights[i]-2,linex+(cols/NUM_BANDS)-1,rows-heights[i]-2,ledColor); // top line
         SEGMENT.drawLine(linex,                   rows-1,linex+(cols/NUM_BANDS)-1,rows-1,ledColor); // bottom line
-      } 
-
+      }
     }
-
   }
-
   return FRAMETIME;
-
 }
 static const char _data_FX_MODE_GEQLASER[] PROGMEM = "GEQ 3D ☾@Speed,Front Fill,Horizon,Depth,Num Bands,Borders,Soft,;!,,Peaks;!;2f;sx=255,ix=255,c1=255,c2=255,c3=255,pal=11";
 
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 900933f5..83ec0f54 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -225,28 +225,14 @@ uint32_t WS2812FX::getPixelColorXY(uint16_t x, uint16_t y) {
 // * expects scaled color (final brightness) as additional input parameter, plus segment  virtualWidth() and virtualHeight()
 void IRAM_ATTR Segment::setPixelColorXY_fast(int x, int y, uint32_t col, uint32_t scaled_col, int cols, int rows) //WLEDMM
 {
-  // if (Segment::maxHeight==1) return; // not a matrix set-up
-  // const int_fast16_t cols = virtualWidth();  // WLEDMM optimization
-  // const int_fast16_t rows = virtualHeight();
-  // if (x<0 || y<0 || x >= cols || y >= rows) return;  // if pixel would fall out of virtual segment just exit
   unsigned i = UINT_MAX;
   bool sameColor = false;
   if (ledsrgb) { // WLEDMM small optimization
-    //i = XY(x,y);
-    //i = (x%cols) + (y%rows) * cols; // avoid error checking done in XY()
     i = x + y*cols; // avoid error checking done by XY() - be optimistic about ranges of x and y
     CRGB fastled_col = CRGB(col);
     if (ledsrgb[i] == fastled_col) sameColor = true;
     else ledsrgb[i] = fastled_col;
   }
-#if 0
-  // we are NOT doing brightness here - must be done by the calling function!
-  //uint32_t scaled_col = col;
-  uint8_t _bri_t = currentBri(on ? opacity : 0);
-  if (!_bri_t && !transitional) return;
-  if (_bri_t < 255) scaled_col = color_fade(col, _bri_t);
-  else scaled_col  = col;
-#endif
 
 #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
@@ -265,7 +251,6 @@ void IRAM_ATTR Segment::setPixelColorXY_fast(int x, int y, uint32_t col, uint32_
   // handle mirroring
   const int_fast16_t wid_ = stop - start;
   const int_fast16_t hei_ = stopY - startY;
-  //if (x >= wid_ || y >= hei_) return;  // if pixel would fall out of segment just exit - should never happen, because  width() >= virtualWidth()
   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);

From 9260111cd7c0855b90887a9d785705cb34f3a44e Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Tue, 16 Jul 2024 23:22:50 +0200
Subject: [PATCH 103/200] use drawLine for 1D2D mapping modes

thanks @troyhacks for providing the idea.
---
 wled00/FX_fcn.cpp | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 11a5e0ea..65849ff1 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -920,8 +920,7 @@ void IRAM_ATTR_YN Segment::setPixelColor(int i, uint32_t col) //WLEDMM: IRAM_ATT
       case M12_pBar:
         // expand 1D effect vertically or have it play on virtual strips
         if (vStrip>0) setPixelColorXY(vStrip - 1, vH - i - 1, col);
-        //else          for (int x = 0; x < vW; x++) setPixelColorXY(x, vH - i - 1, col);
-        else drawLine(0, vH - i - 1, vW-1, vH - i - 1, col, false); // WLEDMM draw line instead of plotting each pixel
+        else drawLine(0,vH-i-1, vW-1,vH-i-1, col, false); // WLEDMM draw line instead of plotting each pixel
         break;
       case M12_pArc:
         // expand in circular fashion from center
@@ -966,9 +965,12 @@ void IRAM_ATTR_YN Segment::setPixelColor(int i, uint32_t col) //WLEDMM: IRAM_ATT
           //}
         }
         break;
-      case M12_pCorner:
-        for (int x = 0; x <= i; x++) setPixelColorXY(x, i, col);
-        for (int y = 0; y <  i; y++) setPixelColorXY(i, y, col);
+      case M12_pCorner: {
+          int x = min(i, vW-1);
+          int y = min(i, vH-1);
+          if (i <= y) drawLine(0,y, x,y, col, false);  // botton line (if visible)
+          if (i <= x) drawLine(x,0, x,y, col, false);  // right line (if visible)
+        }
         break;
       case M12_jMap: //WLEDMM jMap
         if (jMap)
@@ -993,14 +995,17 @@ void IRAM_ATTR_YN Segment::setPixelColor(int i, uint32_t col) //WLEDMM: IRAM_ATT
           setPixelColorXY(x, y, col);
         }
         else { // pCorner -> block
-          for (int x = vW / 2 - i - 1; x <= vW / 2 + i; x++) { // top and bottom horizontal lines
-              setPixelColorXY(x, vH / 2 - i - 1, col);
-              setPixelColorXY(x, vH / 2 + i    , col);
-          }
-          for (int y = vH / 2 - i - 1 + 1; y <= vH / 2 + i - 1; y++) { //left and right vertical lines
-            setPixelColorXY(vW / 2 - i - 1, y, col);
-            setPixelColorXY(vW / 2 + i    , y, col);
-          }
+          int centerX = (vW+1)/2 - 1;
+          int centerY = (vH+1)/2 - 1;
+          int xLeft   = max(centerX-i, 0);
+          int yTop    = max(centerY-i, 0);
+          int xRight  = min(centerX+i+1, vW-1);
+          int yBottom = min(centerY+i+1, vH-1);
+
+          if (yTop == centerY-i)      drawLine(xLeft,yTop, xRight, yTop, col);       // top and bottom horizontal lines, if visible
+          if (yBottom == centerY+i+1) drawLine(xLeft,yBottom, xRight, yBottom, col);
+          if (xLeft == centerX-i)     drawLine(xLeft,yTop, xLeft, yBottom, col);     // left and right vertical lines, if visible
+          if (xRight == centerX+i+1)  drawLine(xRight,yTop, xRight, yBottom, col);
         }
         break;
       case M12_sPinwheel: {

From 7b8d025a2478b88e5287713ae48612438d5ba0c4 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Tue, 16 Jul 2024 18:46:23 -0400
Subject: [PATCH 104/200] GPL3 License for GEQ 3D

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

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 8f93c274..5d273855 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -1,3 +1,4 @@
+/* Some portions of this code have other licenses, like GEQ 3D. Please review fully. */
 /*
   WS2812FX.cpp contains all effect methods
   Harm Aldick - 2016
@@ -8388,13 +8389,32 @@ uint16_t mode_2Dwavingcell() {
 }
 static const char _data_FX_MODE_2DWAVINGCELL[] PROGMEM = "Waving Cell@!,,Amplitude 1,Amplitude 2,Amplitude 3;;!;2";
 
+/* 
+   @title     MoonModules WLED - GEQ 3D Effect
+   @file      included in FX.cpp
+   @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/>.
+*/
+
 /////////////////////////
 //     ** 3D GEQ       //
 /////////////////////////
 uint16_t mode_GEQLASER(void) {
 
   // Author: @TroyHacks
-
+  // @license GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
+  
   const size_t dataSize = sizeof(uint16_t);
   if (!SEGENV.allocateData(dataSize * 2)) return mode_static(); //allocation failed
   uint16_t *projector = reinterpret_cast<uint16_t*>(SEGENV.data);

From 680857290778da7d8d9b38b6dcf50938f851e5c9 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Tue, 16 Jul 2024 19:05:11 -0400
Subject: [PATCH 105/200] doSoft fix for GEQ 3D

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

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 5d273855..dcd6b2b8 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8511,7 +8511,8 @@ uint16_t mode_GEQLASER(void) {
       if (heights[i] > 1 && heights[i] < rows-horizon) {
         ledColorTemp = color_fade(ledColor,128,true);
         for (uint_fast8_t x=linex; x<=pPos;x++) {
-          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,false,depth); // top perspective
+          bool doSoft = SEGMENT.check2 && ((x==linex) || (x==pPos)); // only first and last line need AA
+          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,doSoft,depth); // top perspective
         }
       }
     }

From 2867fa6ceffd05962f749e2ebff8e917fb8712ff Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Wed, 17 Jul 2024 09:00:19 +0100
Subject: [PATCH 106/200] Set default name

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

diff --git a/platformio.ini b/platformio.ini
index 6ae4c790..8f9aea5b 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -2519,6 +2519,7 @@ 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}
   -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
   -D ARDUINO_USB_CDC_ON_BOOT=0
   -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)

From bb7b4b2f79f1a62ce6581d2431017273b089be9b Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Wed, 17 Jul 2024 09:29:15 +0100
Subject: [PATCH 107/200] Tweak SmartMatrix build flags - smaller image size
 and brighter output

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

diff --git a/platformio.ini b/platformio.ini
index 8f9aea5b..db4d5952 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1030,8 +1030,11 @@ DMXin_lib_deps = https://github.com/someweisguy/esp_dmx.git#47db25d  ;; for DMX_
 DMXin_lib_ignore = esp_dmx ;; to remove the esp-dmx lib dependancy (saves a few bytes)
 
 HUB75_build_flags =
-  -D WLED_ENABLE_HUB75MATRIX ;-D SPIRAM_FRAMEBUFFER ;; WLEDMM HUB75 support - requires ESP-IDF v4.4.x
-  -D NO_GFX ; Disable the use of Adafruit_GFX by the HUB75 driver
+  -D WLED_ENABLE_HUB75MATRIX ;; - requires ESP-IDF v4.4.x
+   ;-D SPIRAM_FRAMEBUFFER ;; ONLY SUPPORTED ON ESP32-S3 VARIANTS WITH OCTAL (not quad) SPIRAM/PSRAM
+  -D NO_GFX ;; Disable the use of Adafruit_GFX by the HUB75 driver
+  -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
 HUB75_lib_deps = https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA.git @ 3.0.10
 HUB75_lib_ignore = ESP32 HUB75 LED MATRIX PANEL DMA Display ;; to remove the HUB75 lib dependancy (saves a few bytes)
 

From d1cf8a679ff87da7f380f5629c12ffaf8a025ccb Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Wed, 17 Jul 2024 10:23:50 +0100
Subject: [PATCH 108/200] Only enable double buffering for matrix portal due to
 memory issues on classic esp32

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

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index bb4c4bc8..84569577 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -490,7 +490,7 @@ void BusNetwork::cleanup() {
 
 BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWhite) {
 
-  mxconfig.double_buff = true; // <------------- Turn on double buffer
+  mxconfig.double_buff = false; // default to off, known to cause issue with some effects but needs more memory
 
 
   fourScanPanel = nullptr;
@@ -535,6 +535,8 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
   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;

From 14f286fc8b33862ca7f3cd972db264ceb95aa6b5 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 17 Jul 2024 12:08:31 +0200
Subject: [PATCH 109/200] increase MAX_LEDS_PER_BUS to 8464 (92x92)

previous limit was 2048 (const.h) or 4096 (settings_leds.htm). Some busses like HUB75 or Network are abled to handle all LEDs on one connection.
---
 wled00/const.h                | 15 +++++++++++++--
 wled00/data/settings_leds.htm |  2 +-
 wled00/wled.h                 |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/wled00/const.h b/wled00/const.h
index 7857a1d3..d4ec0442 100644
--- a/wled00/const.h
+++ b/wled00/const.h
@@ -385,7 +385,8 @@
 #ifdef ESP8266
 #define MAX_LEDS 1664 //can't rely on memory limit to limit this to 1600 LEDs
 #else
-#define MAX_LEDS 8192
+//#define MAX_LEDS 8192
+#define MAX_LEDS 8464 // WLEDMM 92x92
 #endif
 #endif
 
@@ -402,7 +403,15 @@
 #endif
 
 #ifndef MAX_LEDS_PER_BUS
-#define MAX_LEDS_PER_BUS 2048   // may not be enough for fast LEDs (i.e. APA102)
+#if !defined(ARDUINO_ARCH_ESP32)
+  #define MAX_LEDS_PER_BUS 2048   // may not be enough for fast LEDs (i.e. APA102)
+#else
+  #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S3
+    #define MAX_LEDS_PER_BUS MAX_LEDS // for fast LEDs and fast MCUs (i.e. APA102, HUB75, ART.Net) - allows to have all LEDs on one bus
+  #else
+    #define MAX_LEDS_PER_BUS 2048     // may not be enough for fast LEDs (i.e. APA102)
+  #endif
+#endif  
 #endif
 
 // string temp buffer (now stored in stack locally) // WLEDMM ...which is actually not the greatest design choice on ESP32
@@ -448,6 +457,7 @@
 #define TOUCH_THRESHOLD 32 // limit to recognize a touch, higher value means more sensitive
 
 // Size of buffer for API JSON object (increase for more segments)
+#if !defined(JSON_BUFFER_SIZE)
 #ifdef ESP8266
   #define JSON_BUFFER_SIZE 10240
 #else
@@ -465,6 +475,7 @@
   #define JSON_BUFFER_SIZE 24576
  #endif
 #endif
+#endif
 
 //#define MIN_HEAP_SIZE (8k for AsyncWebServer)
 #define MIN_HEAP_SIZE 8192
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 5e31ee4c..677c382e 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=4096,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=8465,maxL=1333,maxLbquot=0; //maximum bytes for LED allocation: 4kB for 8266, 32kB for 32
 		d.um_p = [];
 		d.rsvd = [];
 		d.ro_gpio = [];
diff --git a/wled00/wled.h b/wled00/wled.h
index f06f3a36..18814dc2 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2407050
+#define VERSION 2407170
 
 // 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 40c2ef4e98833da72f76991213da54f1234f7901 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 17 Jul 2024 12:29:15 +0200
Subject: [PATCH 110/200] GEQ 3D robustness improvements

* require at least a 3x3 setup
* make sure that NUM_BANDS is limited by available columns
* avoid drawing with negative Y
* slightly reduce default "front fill", so that "borders" has a visible effect when running with defaults
---
 wled00/FX.cpp | 45 ++++++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index dcd6b2b8..91e52099 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8414,7 +8414,12 @@ uint16_t mode_GEQLASER(void) {
 
   // Author: @TroyHacks
   // @license GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
-  
+
+  if (!strip.isMatrix) return mode_static(); // not a 2D set-up  
+  const int cols = SEGMENT.virtualWidth();
+  const int rows = SEGMENT.virtualHeight();
+  if ((cols < 3) || (rows < 3)) return mode_static(); // too small
+
   const size_t dataSize = sizeof(uint16_t);
   if (!SEGENV.allocateData(dataSize * 2)) return mode_static(); //allocation failed
   uint16_t *projector = reinterpret_cast<uint16_t*>(SEGENV.data);
@@ -8434,11 +8439,9 @@ uint16_t mode_GEQLASER(void) {
   SEGMENT.fill(BLACK);
 
   uint32_t ledColorTemp;
-  const int cols = SEGMENT.virtualWidth();
-  const int rows = SEGMENT.virtualHeight();
-  const int NUM_BANDS = map(SEGMENT.custom3, 0, 31, 1, 16); // custom3 is 0..31
-  uint_fast8_t split  = map(*projector,0,SEGMENT.virtualWidth(),0,(NUM_BANDS - 1));
-  uint16_t horizon    = map(SEGMENT.custom1,0,255,rows-1,0); 
+  const int NUM_BANDS = max(2, min(cols, int(map2(SEGMENT.custom3, 0, 31, 1, NUM_GEQ_CHANNELS)))); // custom3 is 0..31 - constrain NUM_BANDS between 2(for split) and cols (for small width segments)
+  uint_fast8_t split  = map2(*projector,0,SEGMENT.virtualWidth(),0,(NUM_BANDS - 1));
+  uint16_t horizon    = map2(SEGMENT.custom1,0,255,rows-1,0); 
   uint8_t depth       = SEGMENT.custom2;  // depth of perspective. 255 = infinite ("laser")
 
   um_data_t *um_data;
@@ -8450,7 +8453,7 @@ uint16_t mode_GEQLASER(void) {
 
   uint8_t heights[NUM_GEQ_CHANNELS] = { 0 };
   for (int i=0; i<NUM_BANDS; i++) {
-    heights[i] = map8(fftResult[i],0,rows*0.85); // cache fftResult[] as data might be updated in parallel by the audioreactive core
+    heights[i] = map8(fftResult[i],0,roundf(rows*0.85f)); // cache fftResult[] as data might be updated in parallel by the audioreactive core
   }
 
 
@@ -8463,14 +8466,16 @@ uint16_t mode_GEQLASER(void) {
       ledColorTemp = color_fade(ledColor,32,true);
       int pPos = linex+(cols/NUM_BANDS)-1;
       for (int y = (i<NUM_BANDS-1) ? heights[i+1] : 0; y <= heights[i]; y++) { // don't bother drawing what we'll hide anyway
-        SEGMENT.drawLine(pPos,rows-y-1,*projector,horizon,ledColorTemp,false,depth); // right side perspective
+        if (rows-y > 0) SEGMENT.drawLine(pPos,rows-y-1,*projector,horizon,ledColorTemp,false,depth); // right side perspective
       } 
 
       ledColorTemp = color_fade(ledColor,128,true);
       if (heights[i] < rows-horizon && (*projector <=linex || *projector >= pPos)) { // draw if above horizon AND not directly under projector (special case later)
-        for (uint_fast8_t x=linex; x<=pPos;x++) { 
-          bool doSoft = SEGMENT.check2 && ((x==linex) || (x==pPos)); // only first and last line need AA
-          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,doSoft,depth); // top perspective
+        if (rows-heights[i] > 1) {  // sanity check - avoid negative Y
+          for (uint_fast8_t x=linex; x<=pPos;x++) { 
+            bool doSoft = SEGMENT.check2 && ((x==linex) || (x==pPos)); // only first and last line need AA
+            SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,doSoft,depth); // top perspective
+          }
         }
       }
     }
@@ -8486,14 +8491,16 @@ uint16_t mode_GEQLASER(void) {
     if (heights[i] > 1) {
       ledColorTemp = color_fade(ledColor,32,true);
       for (uint_fast8_t y = (i>0) ? heights[i-1] : 0; y <= heights[i]; y++) { // don't bother drawing what we'll hide anyway
-        SEGMENT.drawLine(linex,rows-y-1,*projector,horizon,ledColorTemp,false,depth); // left side perspective
+        if (rows-y > 0) SEGMENT.drawLine(linex,rows-y-1,*projector,horizon,ledColorTemp,false,depth); // left side perspective
       }
 
       ledColorTemp = color_fade(ledColor,128,true);
       if (heights[i] < rows-horizon && (*projector <=linex || *projector >= pPos)) { // draw if above horizon AND not directly under projector (special case later)
-        for (uint_fast8_t x=linex; x<=pPos;x++) {
-          bool doSoft = SEGMENT.check2 && ((x==linex) || (x==pPos)); // only first and last line need AA
-          SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,doSoft,depth); // top perspective
+        if (rows-heights[i] > 1) {  // sanity check - avoid negative Y
+          for (uint_fast8_t x=linex; x<=pPos;x++) {
+            bool doSoft = SEGMENT.check2 && ((x==linex) || (x==pPos)); // only first and last line need AA
+            SEGMENT.drawLine(x,rows-heights[i]-2,*projector,horizon,ledColorTemp,doSoft,depth); // top perspective
+          }
         }
       }
     }
@@ -8508,7 +8515,7 @@ uint16_t mode_GEQLASER(void) {
     int pPos1 = linex+(cols/NUM_BANDS);
 
     if (*projector >=linex && *projector <= pPos) { // special case when top perspective is directly under the projector
-      if (heights[i] > 1 && heights[i] < rows-horizon) {
+      if ((heights[i] > 1) && (heights[i] < rows-horizon) && (rows-heights[i] > 1)) {
         ledColorTemp = color_fade(ledColor,128,true);
         for (uint_fast8_t x=linex; x<=pPos;x++) {
           bool doSoft = SEGMENT.check2 && ((x==linex) || (x==pPos)); // only first and last line need AA
@@ -8517,7 +8524,7 @@ uint16_t mode_GEQLASER(void) {
       }
     }
 
-    if (heights[i] > 1) {
+    if ((heights[i] > 1) && (rows-heights[i] > 0)) {
       ledColorTemp = color_fade(ledColor,SEGMENT.intensity,true);
       for (uint_fast8_t x=linex; x<pPos1;x++) { 
         SEGMENT.drawLine(x,rows-1,x,rows-heights[i]-1,ledColorTemp); // front fill
@@ -8528,7 +8535,7 @@ uint16_t mode_GEQLASER(void) {
         SEGMENT.drawLine(linex,rows-heights[i]-1,linex+(cols/NUM_BANDS)-1,rows-heights[i]-1,ledColorTemp); // top line to simulate hidden top fill
       }
 
-      if (SEGMENT.check1) {
+      if ((SEGMENT.check1) && (rows-heights[i] > 1)) {
         SEGMENT.drawLine(linex,                   rows-1,linex,rows-heights[i]-1,ledColor); // left side line
         SEGMENT.drawLine(linex+(cols/NUM_BANDS)-1,rows-1,linex+(cols/NUM_BANDS)-1,rows-heights[i]-1,ledColor); // right side line
         SEGMENT.drawLine(linex,                   rows-heights[i]-2,linex+(cols/NUM_BANDS)-1,rows-heights[i]-2,ledColor); // top line
@@ -8538,7 +8545,7 @@ uint16_t mode_GEQLASER(void) {
   }
   return FRAMETIME;
 }
-static const char _data_FX_MODE_GEQLASER[] PROGMEM = "GEQ 3D ☾@Speed,Front Fill,Horizon,Depth,Num Bands,Borders,Soft,;!,,Peaks;!;2f;sx=255,ix=255,c1=255,c2=255,c3=255,pal=11";
+static const char _data_FX_MODE_GEQLASER[] PROGMEM = "GEQ 3D ☾@Speed,Front Fill,Horizon,Depth,Num Bands,Borders,Soft,;!,,Peaks;!;2f;sx=255,ix=228,c1=255,c2=255,c3=255,pal=11";
 
 #endif // WLED_DISABLE_2D
 

From 13dd7f34079f9ef752f03a5d1ea7892c66564fd3 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 17 Jul 2024 12:44:35 +0200
Subject: [PATCH 111/200] fixing a possible drawLine with x < 0 in GEQ 3D

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

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 91e52099..b0e46366 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8464,7 +8464,7 @@ uint16_t mode_GEQLASER(void) {
 
     if (heights[i] > 1) {
       ledColorTemp = color_fade(ledColor,32,true);
-      int pPos = linex+(cols/NUM_BANDS)-1;
+      int pPos = max(0, linex+(cols/NUM_BANDS)-1);
       for (int y = (i<NUM_BANDS-1) ? heights[i+1] : 0; y <= heights[i]; y++) { // don't bother drawing what we'll hide anyway
         if (rows-y > 0) SEGMENT.drawLine(pPos,rows-y-1,*projector,horizon,ledColorTemp,false,depth); // right side perspective
       } 
@@ -8486,7 +8486,7 @@ uint16_t mode_GEQLASER(void) {
     uint16_t colorIndex = map(cols/NUM_BANDS*i, 0, cols-1, 0, 255);
     uint32_t ledColor = SEGMENT.color_from_palette(colorIndex, false, PALETTE_SOLID_WRAP, 0);
     int linex = i*(cols/NUM_BANDS);
-    int pPos = linex+(cols/NUM_BANDS)-1;
+    int pPos = max(0, linex+(cols/NUM_BANDS)-1);
 
     if (heights[i] > 1) {
       ledColorTemp = color_fade(ledColor,32,true);

From 2ba6350cbd1f81f9511c42b5dc63864a54f5f3e8 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 17 Jul 2024 15:24:21 +0200
Subject: [PATCH 112/200] GEQ 3D bugfixing and minor improvements

* prevent loss of projector when changing segment witdth (mirror).
* prevent unsigned wrap-around "0 -1" for projector
* use aux0 and aux1 segment vars (use them as signed)
* change default NUM_BANDS to 50% - better for smaller panels
* if less than 16 bands : map to full range instead of only showing lower frequencies - same behavious as GEQ 2D.
---
 wled00/FX.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index b0e46366..7797835b 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8420,21 +8420,20 @@ uint16_t mode_GEQLASER(void) {
   const int rows = SEGMENT.virtualHeight();
   if ((cols < 3) || (rows < 3)) return mode_static(); // too small
 
-  const size_t dataSize = sizeof(uint16_t);
-  if (!SEGENV.allocateData(dataSize * 2)) return mode_static(); //allocation failed
-  uint16_t *projector = reinterpret_cast<uint16_t*>(SEGENV.data);
-  uint16_t *projector_dir = reinterpret_cast<uint16_t*>(SEGENV.data + dataSize);
+  int16_t *projector     = reinterpret_cast<int16_t *>(&(SEGENV.aux0)); // *projector is an alias for aux0 (uint16_t)
+  int16_t *projector_dir = reinterpret_cast<int16_t *>(&(SEGENV.aux1)); // *projector_dir is an alias for aux1  (uint16_t)
 
   if (SEGENV.call == 0) {
     *projector = 0;
-    *projector_dir = 0;
+    *projector_dir = 1;
     SEGMENT.setUpLeds(); // WLEDMM use lossless getPixelColor()
     SEGMENT.fill(BLACK);
   } else {
     if (SEGENV.call % map(SEGMENT.speed,0,255,10,1) == 0) *projector += *projector_dir;
-    if (*projector == SEGMENT.virtualWidth()) *projector_dir = -1;
-    if (*projector == 0) *projector_dir = 1;
+    if (*projector >= cols) *projector_dir = -1;
+    if (*projector <= 0) *projector_dir = 1;
   }
+  *projector = constrain(*projector, 0, cols-1); // make sure we don't walk out of range
 
   SEGMENT.fill(BLACK);
 
@@ -8453,7 +8452,9 @@ uint16_t mode_GEQLASER(void) {
 
   uint8_t heights[NUM_GEQ_CHANNELS] = { 0 };
   for (int i=0; i<NUM_BANDS; i++) {
-    heights[i] = map8(fftResult[i],0,roundf(rows*0.85f)); // cache fftResult[] as data might be updated in parallel by the audioreactive core
+    unsigned band = i;
+    if (NUM_BANDS < NUM_GEQ_CHANNELS) band = map2(band, 0, NUM_BANDS - 1, 0, NUM_GEQ_CHANNELS-1); // always use full range.
+    heights[i] = map8(fftResult[band],0,roundf(rows*0.85f)); // cache fftResult[] as data might be updated in parallel by the audioreactive core
   }
 
 
@@ -8545,7 +8546,7 @@ uint16_t mode_GEQLASER(void) {
   }
   return FRAMETIME;
 }
-static const char _data_FX_MODE_GEQLASER[] PROGMEM = "GEQ 3D ☾@Speed,Front Fill,Horizon,Depth,Num Bands,Borders,Soft,;!,,Peaks;!;2f;sx=255,ix=228,c1=255,c2=255,c3=255,pal=11";
+static const char _data_FX_MODE_GEQLASER[] PROGMEM = "GEQ 3D ☾@Speed,Front Fill,Horizon,Depth,Num Bands,Borders,Soft,;!,,Peaks;!;2f;sx=255,ix=228,c1=255,c2=255,c3=15,pal=11";
 
 #endif // WLED_DISABLE_2D
 

From afa6e31ddd18cc48ddfb420fca9bf0646b87ba4c Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 17 Jul 2024 16:15:29 +0200
Subject: [PATCH 113/200] GEQ 3D: improve display for small panels

provides a bit more space for the "laser" when panel height is below 18.
---
 wled00/FX.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 7797835b..1ea7f2ac 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8451,10 +8451,11 @@ uint16_t mode_GEQLASER(void) {
   uint8_t *fftResult = (uint8_t*)um_data->u_data[2];
 
   uint8_t heights[NUM_GEQ_CHANNELS] = { 0 };
+  const uint8_t maxHeight = roundf(float(rows) * ((rows<18) ? 0.75f : 0.85f));           // slightly reduce bar height on small panels 
   for (int i=0; i<NUM_BANDS; i++) {
     unsigned band = i;
     if (NUM_BANDS < NUM_GEQ_CHANNELS) band = map2(band, 0, NUM_BANDS - 1, 0, NUM_GEQ_CHANNELS-1); // always use full range.
-    heights[i] = map8(fftResult[band],0,roundf(rows*0.85f)); // cache fftResult[] as data might be updated in parallel by the audioreactive core
+    heights[i] = map8(fftResult[band],0,maxHeight); // cache fftResult[] as data might be updated in parallel by the audioreactive core
   }
 
 

From 6cfbc48eadc57d00bb7b0539ef2391f66be74ebb Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Wed, 17 Jul 2024 21:49:10 +0200
Subject: [PATCH 114/200] busmanger debug help

* avoid crash when HUB75 driver is not compiled into firmware
* minimal info about PWM and Network busses
* show SPI frequency for DotStar driver
---
 wled00/bus_manager.cpp | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 84569577..a24fdf28 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -127,7 +127,9 @@ BusDigital::BusDigital(BusConfig &bc, uint8_t nr, const ColorOrderMap &com) : Bu
   _valid = (_busPtr != nullptr);
   _colorOrder = bc.colorOrder;
   if (_pins[1] != 255) {  // WLEDMM USER_PRINTF
-    USER_PRINTF("%successfully inited strip %u (len %u) with type %u and pins %u,%u (itype %u)\n", _valid?"S":"Uns", nr, _len, bc.type, _pins[0],_pins[1],_iType);
+    USER_PRINTF("%successfully inited strip %u (len %u) with type %u and pins %u,%u (itype %u)", _valid?"S":"Uns", nr, _len, bc.type, _pins[0],_pins[1],_iType);
+    if (bc.frequency > 999) USER_PRINTF(", %d MHz", bc.frequency/1000);
+    USER_PRINTLN();
   } else {
     USER_PRINTF("%successfully inited strip %u (len %u) with type %u and pin %u (itype %u)\n", _valid?"S":"Uns", nr, _len, bc.type, _pins[0],_iType);
   }
@@ -241,6 +243,7 @@ BusPwm::BusPwm(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWhite) {
   }
   #endif
 
+  USER_PRINT("[PWM");
   for (uint8_t i = 0; i < numPins; i++) {
     uint8_t currentPin = bc.pins[i];
     if (!pinManager.allocatePin(currentPin, true, PinOwner::BusPwm)) {
@@ -253,7 +256,9 @@ BusPwm::BusPwm(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWhite) {
     ledcSetup(_ledcStart + i, _frequency, 8);
     ledcAttachPin(_pins[i], _ledcStart + i);
     #endif
+    USER_PRINT(" "); USER_PRINT(currentPin);
   }
+  USER_PRINTLN("] ");
   reversed = bc.reversed;
   _valid = true;
 }
@@ -389,6 +394,7 @@ BusOnOff::BusOnOff(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWhite) {
   pinMode(_pin, OUTPUT);
   reversed = bc.reversed;
   _valid = true;
+  USER_PRINTF("[On-Off %d] \n", int(currentPin));
 }
 
 void BusOnOff::setPixelColor(uint16_t pix, uint32_t c) {
@@ -421,18 +427,22 @@ uint8_t BusOnOff::getPins(uint8_t* pinArray) {
 
 BusNetwork::BusNetwork(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWhite) {
   _valid = false;
+  USER_PRINT("[");
   switch (bc.type) {
     case TYPE_NET_ARTNET_RGB:
       _rgbw = false;
       _UDPtype = 2;
+      USER_PRINT("NET_ARTNET_RGB");
       break;
     case TYPE_NET_E131_RGB:
       _rgbw = false;
       _UDPtype = 1;
+      USER_PRINT("NET_E131_RGB");
       break;
     default: // TYPE_NET_DDP_RGB / TYPE_NET_DDP_RGBW
       _rgbw = bc.type == TYPE_NET_DDP_RGBW;
       _UDPtype = 0;
+      USER_PRINT(bc.type == TYPE_NET_DDP_RGBW ? "NET_DDP_RGBW" : "NET_DDP_RGB");
       break;
   }
   _UDPchannels = _rgbw ? 4 : 3;
@@ -443,6 +453,7 @@ 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]);
 }
 
 void BusNetwork::setPixelColor(uint16_t pix, uint32_t c) {
@@ -749,10 +760,14 @@ int BusManager::add(BusConfig &bc) {
   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);
-#ifdef WLED_ENABLE_HUB75MATRIX
   } else if (bc.type >= TYPE_HUB75MATRIX && bc.type <= (TYPE_HUB75MATRIX + 10)) {
+#ifdef WLED_ENABLE_HUB75MATRIX
     DEBUG_PRINTLN("BusManager::add - Adding BusHub75Matrix");
     busses[numBusses] = new BusHub75Matrix(bc);
+    USER_PRINTLN("[BusHub75Matrix] ");
+#else
+    USER_PRINTLN("[unsupported! BusHub75Matrix] ");
+    return -1;
 #endif
   } else if (IS_DIGITAL(bc.type)) {
     busses[numBusses] = new BusDigital(bc, numBusses, colorOrderMap);

From 0f6f6e306527948a5e3b473bf6de016284591d52 Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Wed, 17 Jul 2024 21:50:53 +0200
Subject: [PATCH 115/200] SPI speed: add MAX (40Mhz) and OVER (60Mhz)

experimental
---
 wled00/data/settings_leds.htm | 4 ++--
 wled00/set.cpp                | 2 ++
 wled00/xml.cpp                | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 677c382e..6d7c36c9 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -397,9 +397,9 @@ ${i+1}:
 <option value="5">GBR</option>
 </select></div>
 <div id="dig${i}w" style="display:none">Swap: <select name="WO${i}"><option value="0">None</option><option value="1">W & B</option><option value="2">W & G</option><option value="3">W & R</option></select></div>
-<div id="dig${i}l" style="display:none">Clock: <select name="SP${i}"><option value="0">Slowest</option><option value="1">Slow</option><option value="2">Normal</option><option value="3">Fast</option><option value="4">Fastest</option></select></div>
+<div id="dig${i}l" style="display:none">Clock: <select name="SP${i}"><option value="0">Slowest</option><option value="1">Slow</option><option value="2">Normal</option><option value="3">Fast</option><option value="4">Fastest</option><option value="5">MAX</option><option value="6">overspeed</option></select></div>
 <div>
-<span id="psd${i}">Start:</span> <input type="number" name="LS${i}" id="ls${i}" class="l starts" min="0" max="8191" value="${lastEnd(i)}" oninput="startsDirty[${i}]=true;UI();" required />&nbsp;
+<span id="psd${i}">Start:</span> <input type="number" name="LS${i}" id="ls${i}" class="l starts" min="0" max="8464" value="${lastEnd(i)}" oninput="startsDirty[${i}]=true;UI();" required />&nbsp;
 <div id="dig${i}c" style="display:inline">Length: <input type="number" name="LC${i}" class="l" min="1" max="${maxPB}" value="1" required oninput="UI()" /></div><br>
 </div>
 <span id="p0d${i}">GPIO:</span> <input type="number" name="L0${i}" required class="s" onchange="UI()"/>
diff --git a/wled00/set.cpp b/wled00/set.cpp
index 31fbb784..044b6e77 100644
--- a/wled00/set.cpp
+++ b/wled00/set.cpp
@@ -159,6 +159,8 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
           case 2 : freqHz =  5000; break;
           case 3 : freqHz = 10000; break;
           case 4 : freqHz = 20000; break;
+          case 5 : freqHz = 40000; break; // WLEDMM max speed 40Mhz - requires carefull wiring
+          case 6 : freqHz = 60000; break; // WLEDMM overspeed 60Mhz - may or may not work
         }
       } else {
         freqHz = 0;
diff --git a/wled00/xml.cpp b/wled00/xml.cpp
index efc5840c..b90b7bb7 100644
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -469,6 +469,8 @@ void getSettingsJS(AsyncWebServerRequest* request, byte subPage, char* dest) //W
           case  5000 : speed = 2; break;
           case 10000 : speed = 3; break;
           case 20000 : speed = 4; break;
+          case 40000 : speed = 5; break; // WLEDMM max speed 40Mhz - requires carefull wiring
+          case 60000 : speed = 6; break; // WLEDMM overspeed 60Mhz - may or may not work
         }
       }
       sappend('v',sp,speed);

From 5b406e5500b51203def8889f9d76a25f7835ca7c Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Wed, 17 Jul 2024 21:51:37 +0200
Subject: [PATCH 116/200] build 2407171

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

diff --git a/wled00/wled.h b/wled00/wled.h
index 18814dc2..5d881cf0 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2407170
+#define VERSION 2407171
 
 // 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 dfbf9729d52facbe8aa2e1ec2e014c4a31e64d2e Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 18 Jul 2024 14:56:49 +0200
Subject: [PATCH 117/200] Update platformio.ini - hotfix for HUB75 build

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

diff --git a/platformio.ini b/platformio.ini
index db4d5952..1322b1cc 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1035,7 +1035,8 @@ HUB75_build_flags =
   -D NO_GFX ;; Disable the use of Adafruit_GFX by the HUB75 driver
   -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
-HUB75_lib_deps = https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA.git @ 3.0.10
+;; HUB75_lib_deps = https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA.git @ 3.0.10  ;; does not work any more
+HUB75_lib_deps = https://github.com/mrcodetastic/ESP32-HUB75-MatrixPanel-DMA.git#987ca1c87df5bd68f2330d83f21833a59ca6cf61 ;; something strange is going on here ...
 HUB75_lib_ignore = ESP32 HUB75 LED MATRIX PANEL DMA Display ;; to remove the HUB75 lib dependancy (saves a few bytes)
 
 NetDebug_build_flags =

From ed636aa52208a0bad4b655506adf163304148bd6 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 18 Jul 2024 15:26:05 +0200
Subject: [PATCH 118/200] Update platformio.ini - another hub75 correction

this is exactly 1 commit after the 3.0.10 tag.
---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 1322b1cc..2e0878a6 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1036,7 +1036,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
 ;; HUB75_lib_deps = https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA.git @ 3.0.10  ;; does not work any more
-HUB75_lib_deps = https://github.com/mrcodetastic/ESP32-HUB75-MatrixPanel-DMA.git#987ca1c87df5bd68f2330d83f21833a59ca6cf61 ;; something strange is going on here ...
+HUB75_lib_deps = https://github.com/mrcodetastic/ESP32-HUB75-MatrixPanel-DMA.git#692078352e51166194b916115dce9ba8a80d41fd ;; something strange is going on here ...
 HUB75_lib_ignore = ESP32 HUB75 LED MATRIX PANEL DMA Display ;; to remove the HUB75 lib dependancy (saves a few bytes)
 
 NetDebug_build_flags =

From d255beca92618a13d340928c03d71abf3bad4d20 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 18 Jul 2024 15:29:43 +0200
Subject: [PATCH 119/200] Update platformio.ini - final hub75 correction

TWO commits after the release tag - I think this is the correct one now. Fingers crossed.
---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 2e0878a6..4af34b86 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1036,7 +1036,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
 ;; HUB75_lib_deps = https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA.git @ 3.0.10  ;; does not work any more
-HUB75_lib_deps = https://github.com/mrcodetastic/ESP32-HUB75-MatrixPanel-DMA.git#692078352e51166194b916115dce9ba8a80d41fd ;; something strange is going on here ...
+HUB75_lib_deps = https://github.com/mrcodetastic/ESP32-HUB75-MatrixPanel-DMA.git#1e4c80a26454aca7b8129bd5a966b0af329d2703 ;; something strange is going on here ...
 HUB75_lib_ignore = ESP32 HUB75 LED MATRIX PANEL DMA Display ;; to remove the HUB75 lib dependancy (saves a few bytes)
 
 NetDebug_build_flags =

From 33accd867103fce1454b8e9274b01ca84b0db8d4 Mon Sep 17 00:00:00 2001
From: Brandon502 <105077712+Brandon502@users.noreply.github.com>
Date: Sun, 21 Jul 2024 15:03:23 -0400
Subject: [PATCH 120/200] GoL - Optimizations

Uncapped update option if speed set to 255.
---
 wled00/FX.cpp | 159 +++++++++++++++++++++++++-------------------------
 1 file changed, 79 insertions(+), 80 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 1ea7f2ac..4f89af77 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5191,27 +5191,26 @@ 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() + 7) / 8); // round up to nearest byte
-  const size_t detectionSize =  sizeof(uint16_t) * 3; // 2 CRCs, gliderLength
+  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);
+  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
+  uint16_t &generation   = SEGENV.aux0; //Rename SEGENV/SEGMENT variables for readability
   bool allColors   = SEGMENT.check1;
   bool overlayBG   = SEGMENT.check2;
   bool wrap        = SEGMENT.check3;
-  byte blur        = map2(SEGMENT.custom1, 0, 255, 255, 0);
   bool bgBlendMode = SEGMENT.custom1 > 220 && !overlayBG; // if blur is high and not overlaying, use bg blend mode
-  byte bgBlur      = map2(SEGMENT.custom1 - 220, 0, 35, 255, 128);
+  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);
-  uint16_t cIndex; 
 
   if (SEGENV.call == 0) {
     SEGMENT.setUpLeds();
@@ -5225,11 +5224,11 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
     random16_set_seed(strip.now>>2); //seed the random generator
     //Setup Grid
     memset(cells, 0, dataSize);
-    for (int x = 0; x < cols; x++) for (int y = 0; y < rows; y++) {
-      cIndex = y * cols + x;
+    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, cIndex, true);
-        if (!overlayBG) SEGMENT.setPixelColorXY(x,y, bgColor); // Initial color set in redraw loop
+        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); 
@@ -5250,99 +5249,98 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
     *gliderLength = cols * rows / a * 4;
   }
 
-  int aliveCount  = 0; // Solo glider detection
-  bool blurDead   = SEGENV.step > strip.now && blur && !bgBlendMode && !overlayBG;
+  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) 
-  // Always redraw dead cells if not overlaying background. Allows overlayFG by default.
   // Generation 1 draws alive cells randomly and fades dead cells
-  for (int x = 0; x < cols; x++) for (int y = 0; y < rows; y++) {
-    cIndex = y * cols + x;
-    bool alive = getBitValue(cells, cIndex);
-    if (alive) aliveCount++;
-    uint32_t cellColor = SEGMENT.getPixelColorXY(x,y);
-    bool aliveBgColor = (alive && !overlayBG && generation == 1 && cellColor == bgColor);
+  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
-      aliveBgColor = false;
+      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
     }
-    else if ( alive && overlayBG)                     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 || aliveBgColor) && !overlayBG && !bgBlendMode) SEGMENT.setPixelColorXY(x,y, cellColor);             // Redraw dead cells/alive off cells for default overlayFG
-    else if (!alive && !overlayBG && generation == 1) SEGMENT.setPixelColorXY(x,y, color_blend(cellColor, bgColor, 16));  // Fade dead cells (bgBlendMode) on generation 1
   }
   
-  if (SEGENV.step > strip.now || strip.now - SEGENV.step < 1000 / (uint32_t)map(SEGMENT.speed,0,255,1,64)) return FRAMETIME; //skip if not enough time has passed (1-64 updates/sec)
+  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
-  bool cellChanged = false; // Detect still live and dead grids
-  //cell coordinates
-  uint16_t cX;
-  uint16_t cY;
+  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 (int x = 0; x < cols; x++) for (int y = 0; y < rows; y++) {
-    byte neighbors = 0;
-    byte colorCount = 0; //track number of valid colors
-    uint32_t nColors[3]; // track 3 colors, dying cells may overwrite but this wont be used
+  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++;
 
-    for (int i = -1; i <= 1; i++) for (int j = -1; j <= 1; j++) { // iterate through 3*3 matrix
-      if (i == 0 && j == 0) continue; // ignore itself
-      if (!wrap || generation % 1500 == 0 || aliveCount == 5) { //no wrap, disable wrap every 1500 generations to prevent undetected repeats
-        cX = x + i;
-        cY = y + j;
-        if (cX < 0 || cY < 0 || cX >= cols || cY >= rows) continue; //skip if out of bounds
-      } else { //wrap around
-        cX = (x + i + cols) % cols;
-        cY = (y + j + rows) % rows;
-      }
-      cIndex = cY * cols + cX; //neighbor cell index
-      // count neighbors and store upto 3 neighbor colors
-      if (getBitValue(cells, cIndex)) { //if alive
-        neighbors++;
-        if (!getBitValue(futureCells, cIndex) || SEGMENT.getPixelColorXY(cX,cY) == bgColor) continue; //parent just died, color lost
-        color = SEGMENT.getPixelColorXY(cX, cY);
-        nColors[colorCount % 3] = color;
-        colorCount++;
+    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
-    cIndex = y * cols + x; //current cell index
-    bool cellValue = getBitValue(cells, cIndex);
-    if ((cellValue) && (neighbors < 2 || neighbors > 3)) {
+    if (cellValue && (neighbors < 2 || neighbors > 3)) {
       // Loneliness or Overpopulation
-      cellChanged = true;
       setBitValue(futureCells, cIndex, false);
-      // Blur/turn off dying cells
-      if (!overlayBG) SEGMENT.setPixelColorXY(x,y, color_blend(SEGMENT.getPixelColorXY(x,y), bgColor, bgBlendMode ? bgBlur : blur));
+      if (!overlayBG) SEGMENT.setPixelColorXY(x,y, color_blend(cellColor, bgColor, blur));
     } 
-    else if (!(cellValue) && (neighbors == 3)) { 
+    else if (neighbors == 3 && !cellValue) { 
       // Reproduction
-      setBitValue(futureCells, cIndex, true);
-      cellChanged = true;
-      // find dominant color and assign it to a new born cell no longer storing colors, if parent dies the color is lost
-      uint32_t dominantColor; 
-      if (colorCount == 3) { //All parents survived
-        if ((nColors[0] == nColors[1]) || (nColors[0] == nColors[2])) dominantColor = nColors[0];
-        else if (nColors[1] == nColors[2]) dominantColor = nColors[1];
-        else dominantColor = nColors[random8(3)];
+      // 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;
+        
       }
-      else if (colorCount == 2) dominantColor = nColors[random8(2)]; // 1 leading parent died
-      else if (colorCount == 1) dominantColor = nColors[0];          // 2 leading parents died
-      else dominantColor = color;                                    // all parents died use last seen color
-      // mutate color chance
-      if (random8() < SEGMENT.intensity || dominantColor == bgColor) dominantColor = allColors ? random16() * random16() : SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 0);
-      SEGMENT.setPixelColorXY(x,y, dominantColor);
+      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 
-      if (!cellValue && !overlayBG && !bgBlendMode) SEGMENT.setPixelColorXY(x,y, color_blend(SEGMENT.getPixelColorXY(x,y), bgColor, blur)); 
+    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);
@@ -5351,7 +5349,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
   uint16_t crc = crc16((const unsigned char*)cells, dataSize);
 
   bool repetition = false;
-  if (!cellChanged || crc == *oscillatorCRC || crc == *spaceshipCRC) repetition = true; //check if cell changed this gen and compare previous stored crc values
+  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
@@ -5360,6 +5358,7 @@ uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https:
   // 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;

From 79402208eebe49977354701433bee80727f5e14b Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Wed, 24 Jul 2024 21:18:57 -0400
Subject: [PATCH 121/200] Allow E131_MAX_UNIVERSE_COUNT override

---
 wled00/const.h | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/wled00/const.h b/wled00/const.h
index d4ec0442..5203d774 100644
--- a/wled00/const.h
+++ b/wled00/const.h
@@ -425,13 +425,15 @@
   #endif
 #endif
 
-#ifdef WLED_USE_ETHERNET
-  #define E131_MAX_UNIVERSE_COUNT 20
-#else
-  #ifdef ESP8266
-    #define E131_MAX_UNIVERSE_COUNT 9
+#ifndef E131_MAX_UNIVERSE_COUNT
+  #ifdef WLED_USE_ETHERNET
+    #define E131_MAX_UNIVERSE_COUNT 20
   #else
-    #define E131_MAX_UNIVERSE_COUNT 12
+    #ifdef ESP8266
+      #define E131_MAX_UNIVERSE_COUNT 9
+    #else
+      #define E131_MAX_UNIVERSE_COUNT 12
+    #endif
   #endif
 #endif
 

From a84ac5b1eeae1a0e9322205c4c80cffaeedf07ad Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 22 Jul 2024 11:25:00 +0200
Subject: [PATCH 122/200] Merge pull request #4060 from DedeHai/0_15_bootdelay

boot-up delay to fix wifi not starting in some setups

use
`-D WLED_BOOTUPDELAY=500` (or some other delay you want, in milliseconds)
in platformio env definition to add 500ms of delay before hardware init.
---
 wled00/wled.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index 71050d99..171be5c7 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -448,6 +448,9 @@ void WLED::setup()
   #ifdef ARDUINO_ARCH_ESP32
   pinMode(hardwareRX, INPUT_PULLDOWN); delay(1);        // suppress noise in case RX pin is floating (at low noise energy) - see issue #3128
   #endif
+  #ifdef WLED_BOOTUPDELAY
+  delay(WLED_BOOTUPDELAY); // delay to let voltage stabilize, helps with boot issues on some setups
+  #endif
   Serial.begin(115200);
   if (!Serial) delay(1000); // WLEDMM make sure that Serial has initalized
 

From 0562debbe1670fc72971d95da296cc9fb53f5f9a Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sun, 28 Jul 2024 10:38:39 +0100
Subject: [PATCH 123/200] hub75 - slow updates to reduce wifi performance
 issues

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

diff --git a/platformio.ini b/platformio.ini
index 4af34b86..5f53cd1d 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1035,8 +1035,9 @@ HUB75_build_flags =
   -D NO_GFX ;; Disable the use of Adafruit_GFX by the HUB75 driver
   -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/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA.git @ 3.0.10  ;; does not work any more
-HUB75_lib_deps = https://github.com/mrcodetastic/ESP32-HUB75-MatrixPanel-DMA.git#1e4c80a26454aca7b8129bd5a966b0af329d2703 ;; something strange is going on here ...
+HUB75_lib_deps = https://github.com/mrcodetastic/ESP32-HUB75-MatrixPanel-DMA.git @ 3.0.11
 HUB75_lib_ignore = ESP32 HUB75 LED MATRIX PANEL DMA Display ;; to remove the HUB75 lib dependancy (saves a few bytes)
 
 NetDebug_build_flags =

From ecb8817c907caf2dafd36352850d0d6c9eb4e550 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 30 Jul 2024 16:03:19 +0200
Subject: [PATCH 124/200] Update audio_source.h - swapped channel bug still
 exists in 2.0.17

Actually we could even check for " < 5.0.0 " - arduino 2.0.x is in maintenance mode now, and I see little chance that a fix will appear before 3.0.0.
---
 usermods/audioreactive/audio_source.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usermods/audioreactive/audio_source.h b/usermods/audioreactive/audio_source.h
index d7c0478c..77111446 100644
--- a/usermods/audioreactive/audio_source.h
+++ b/usermods/audioreactive/audio_source.h
@@ -93,7 +93,7 @@
  * if you want to receive two channels, one is the actual data from microphone and another channel is suppose to receive 0, it's different data in two channels, you need to choose I2S_CHANNEL_FMT_RIGHT_LEFT in this case.
 */
 
-#if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 0)) && (ESP_IDF_VERSION <= ESP_IDF_VERSION_VAL(4, 4, 6)) // fixed in IDF 4.4.5, however arduino-esp32 2.0.14 did an "I2S rollback" to 4.4.4
+#if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 0)) && (ESP_IDF_VERSION <= ESP_IDF_VERSION_VAL(4, 4, 8)) // should be fixed in IDF 4.4.5, however arduino-esp32 2.0.14 - 2.0.17 did an "I2S rollback" to 4.4.4
 // espressif bug: only_left has no sound, left and right are swapped 
 // https://github.com/espressif/esp-idf/issues/9635  I2S mic not working since 4.4 (IDFGH-8138)
 // https://github.com/espressif/esp-idf/issues/8538  I2S channel selection issue? (IDFGH-6918)

From 114cdfefd842cb9f570dafff18bd4ca5bd1b7a73 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 30 Jul 2024 16:16:44 +0200
Subject: [PATCH 125/200] Hub75 lib versions rollback

3.0.11 breaks the gh build.
---
 platformio.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 5f53cd1d..59b43b1f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1037,7 +1037,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
 ;; HUB75_lib_deps = https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA.git @ 3.0.10  ;; does not work any more
-HUB75_lib_deps = https://github.com/mrcodetastic/ESP32-HUB75-MatrixPanel-DMA.git @ 3.0.11
+;; 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 ;; something strange is going on here ...
 HUB75_lib_ignore = ESP32 HUB75 LED MATRIX PANEL DMA Display ;; to remove the HUB75 lib dependancy (saves a few bytes)
 
 NetDebug_build_flags =

From 18f9d64e24fe31921d4c8f0cfc88a8830898e7dc Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 3 Aug 2024 23:49:13 +0200
Subject: [PATCH 126/200] HUB75 lib version 3.0.11

using the git hash of version 3.0.11
---
 platformio.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 59b43b1f..ec1a387d 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1036,9 +1036,9 @@ 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/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA.git @ 3.0.10  ;; does not work any more
 ;; 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 ;; 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_ignore = ESP32 HUB75 LED MATRIX PANEL DMA Display ;; to remove the HUB75 lib dependancy (saves a few bytes)
 
 NetDebug_build_flags =

From 5f4834dec4acb4cfe3613a1145cc06697c5582ed Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 5 Aug 2024 17:06:38 +0200
Subject: [PATCH 127/200] small improvements

* optimized fadeToBlackBy() - don't repaint unchanged pixels
* made MIN_HEAP_SIZE configurable by build_flags
* specific error message when not enough memory for LEDs buffer
---
 wled00/FX_fcn.cpp    | 8 +++++---
 wled00/const.h       | 3 +++
 wled00/data/index.js | 3 +++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 65849ff1..4c43218a 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -132,7 +132,7 @@ void Segment::allocLeds() {
     ledsrgbSize = ledsrgb?size:0;
     if (ledsrgb == nullptr) {
       USER_PRINTLN("allocLeds failed!!");
-      errorFlag = ERR_LOW_MEM; // WLEDMM raise errorflag
+      errorFlag = ERR_LOW_BUF; // WLEDMM raise errorflag
     }
   }
   else {
@@ -1442,8 +1442,10 @@ void Segment::fadeToBlackBy(uint8_t fadeBy) {
 
   // WLEDMM minor optimization
   if(is2D()) {
-    for (uint_fast16_t y = 0; y < rows; y++) for (uint_fast16_t x = 0; x < cols; x++) {
-      setPixelColorXY((uint16_t)x, (uint16_t)y, CRGB(getPixelColorXY(x,y)).nscale8(scaledown));
+    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
+      uint32_t cc2 = color_fade(cc, scaledown);                      // fade
+      if (cc2 != cc) setPixelColorXY((uint16_t)x, (uint16_t)y, cc2); // WLEDMM only re-paint if faded color is different
     }
   } else {
     for (uint_fast16_t x = 0; x < cols; x++) {
diff --git a/wled00/const.h b/wled00/const.h
index 5203d774..ff8b0371 100644
--- a/wled00/const.h
+++ b/wled00/const.h
@@ -352,6 +352,7 @@
 #define ERR_LOW_SEG_MEM 34  // WLEDMM: low memory (segment data RAM)
 #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)
 
 // Timer mode types
 #define NL_MODE_SET               0            //After nightlight time elapsed, set to target brightness
@@ -480,7 +481,9 @@
 #endif
 
 //#define MIN_HEAP_SIZE (8k for AsyncWebServer)
+#if !defined(MIN_HEAP_SIZE)
 #define MIN_HEAP_SIZE 8192
+#endif
 
 // Maximum size of node map (list of other WLED instances)
 #ifdef ESP8266
diff --git a/wled00/data/index.js b/wled00/data/index.js
index e89ad78e..61480d5e 100644
--- a/wled00/data/index.js
+++ b/wled00/data/index.js
@@ -2008,6 +2008,9 @@ function readState(s,command=false)
 		case 36:
 			errstr = "Low Memory (oappend buffer).";
 		  break;
+		case 37:
+			errstr = "no memory for LEDs buffer.";
+		  break;
 		}
 	  showToast('Error ' + s.error + ": " + errstr, true);
 	}

From 6505e04cbf9b978068feed57588c41a49a2fc61b Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 5 Aug 2024 17:09:50 +0200
Subject: [PATCH 128/200] minor effect improvements

* 2DBlackHole: improved accuracy
* 2Dfloatingblobs: draw anti-aliased blobs when "blur" slider = 1
* FX framework: un-clutter and optimize "XY()"
---
 wled00/FX.cpp | 16 +++++++++-------
 wled00/FX.h   |  6 ++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 4f89af77..4cce3230 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -4922,17 +4922,18 @@ uint16_t mode_2DBlackHole(void) {            // By: Stepko https://editor.soulma
   }
 
   SEGMENT.fadeToBlackBy(16 + (SEGMENT.speed>>3)); // create fading trails
-  unsigned long t = strip.now/128;                 // timebase
+  const unsigned long ratio = 128;                // rotation speed
+  unsigned long t = strip.now;                    // timebase
   // outer stars
-  for (size_t i = 0; i < 8; i++) {
-    x = beatsin8(SEGMENT.custom1>>3,   0, cols - 1, 0, ((i % 2) ? 128 : 0) + t * i);
-    y = beatsin8(SEGMENT.intensity>>3, 0, rows - 1, 0, ((i % 2) ? 192 : 64) + t * i);
+  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);
     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);
-    y = beatsin8(SEGMENT.custom3   , rows/4, rows - 1 - rows/4, 0, ((i % 2) ? 192 : 64) + t * 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);
     SEGMENT.addPixelColorXY(x, y, CHSV(i*32, 255, 255));
   }
   // central white dot
@@ -6270,6 +6271,7 @@ uint16_t mode_2Dfloatingblobs(void) {
   }
 
   SEGMENT.fadeToBlackBy(20);
+  bool drawAA = (SEGMENT.custom1 > 0) && (SEGMENT.custom1 < 5); //WLEDMM
 
   // Bounce balls around
   for (size_t i = 0; i < Amount; i++) {
@@ -6289,7 +6291,7 @@ uint16_t mode_2Dfloatingblobs(void) {
       }
     }
     uint32_t c = SEGMENT.color_from_palette(blob->color[i], false, false, 0);
-    if (blob->r[i] > 1.f) SEGMENT.fillCircle(roundf(blob->x[i]), roundf(blob->y[i]), roundf(blob->r[i]), c);
+    if (blob->r[i] > 1.f) SEGMENT.fillCircle(roundf(blob->x[i]), roundf(blob->y[i]), roundf(blob->r[i]), c, drawAA);
     else                  SEGMENT.setPixelColorXY((int)roundf(blob->x[i]), (int)roundf(blob->y[i]), c);
     // move x
     if (blob->x[i] + blob->r[i] >= cols - 1) blob->x[i] += (blob->sX[i] * ((cols - 1 - blob->x[i]) / blob->r[i] + 0.005f));
diff --git a/wled00/FX.h b/wled00/FX.h
index af707b41..00ae3183 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -661,10 +661,8 @@ typedef struct Segment {
   
   #ifndef WLED_DISABLE_2D
     inline uint16_t XY(uint_fast16_t x, uint_fast16_t y) { // support function to get relative index within segment (for leds[]) // WLEDMM inline for speed
-      uint_fast16_t width  = virtualWidth();   // segment width in logical pixels
-      uint_fast16_t height = virtualHeight();  // segment height in logical pixels
-      if (width == 0) return 0;           // softhack007 avoid div/0
-      if (height == 0) return (x%width);  // softhack007 avoid div/0
+      uint_fast16_t width  = max(uint16_t(1), virtualWidth());   // segment width in logical pixels  -- softhack007 avoid div/0
+      uint_fast16_t height = max(uint16_t(1), virtualHeight());  // segment height in logical pixels -- softhack007 avoid div/0
       return (x%width) + (y%height) * width;
     }
 

From 078bd7077504f8fca97dfb5c1cac5613a50f6fa0 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 5 Aug 2024 17:28:03 +0200
Subject: [PATCH 129/200] HUB75 speedups and minor improvements

* HUB75: allow to use native driver gamma correction - requires to undo WLED gamma
* added unGamma24() function
* HUB75: optimized setPixelColor()
* some experimental HUB75 stuff
---
 wled00/bus_manager.cpp | 33 ++++++++++++++++++++++++---------
 wled00/bus_manager.h   |  3 ++-
 wled00/colors.cpp      |  6 ++++++
 wled00/fcn_declare.h   |  1 +
 wled00/wled.h          |  2 +-
 5 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index a24fdf28..604a92c5 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -501,6 +501,7 @@ 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
 
 
@@ -594,6 +595,13 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   mxconfig.gpio.d = 21;
   mxconfig.gpio.e = 12;
 
+  // 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.min_refresh_rate = 120;
+
 #else
   USER_PRINTLN("MatrixPanel_I2S_DMA - Default pins");
   /*
@@ -691,18 +699,25 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 }
 
 void BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c) {
-  r = R(c);
-  g = G(c);
-  b = B(c);
+  if (!_valid || pix >= _len) return;
+#ifndef NO_CIE1931
+  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);
+
   if(fourScanPanel != nullptr) {
-    x = pix % fourScanPanel->width();
-    y = floor(pix / fourScanPanel->width());
-    fourScanPanel->drawPixelRGB888(x, y, r, g, b);
+    int pxwidth = fourScanPanel->width();
+    int x = pix % pxwidth;
+    int y = pix / pxwidth;
+    fourScanPanel->drawPixelRGB888(int16_t(x), int16_t(y), r, g, b);
   }
   else {
-    x = pix % display->width();
-    y = floor(pix / display->width());
-    display->drawPixelRGB888(x, y, r, g, b);
+    int pxwidth = display->width();
+    int x = pix % pxwidth;
+    int y = pix / pxwidth;
+    display->drawPixelRGB888(int16_t(x), int16_t(y), r, g, b);
   }
 }
 
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 0bfd3e04..40fc0061 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -4,6 +4,7 @@
 #ifdef WLED_ENABLE_HUB75MATRIX
 #include <ESP32-HUB75-MatrixPanel-I2S-DMA.h>
 #include <ESP32-VirtualMatrixPanel-I2S-DMA.h>
+//extern volatile bool previousBufferFree; // experimental
 #endif
 /*
  * Class for addressing various light types
@@ -348,6 +349,7 @@ class BusHub75Matrix : public Bus {
     void show() {
       if(mxconfig.double_buff) {
         display->flipDMABuffer(); // Show the back buffer, set currently 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
       }
     }
@@ -377,7 +379,6 @@ class BusHub75Matrix : public Bus {
     MatrixPanel_I2S_DMA *display = nullptr;
     VirtualMatrixPanel  *fourScanPanel = nullptr;
     HUB75_I2S_CFG mxconfig;
-    uint8_t r, g, b, x, y;
     
 };
 #endif
diff --git a/wled00/colors.cpp b/wled00/colors.cpp
index 465fefbb..f7751861 100644
--- a/wled00/colors.cpp
+++ b/wled00/colors.cpp
@@ -413,6 +413,12 @@ uint8_t unGamma8(uint8_t value) {
   if (gammaTinv[255] == 0) calcInvGammaTable(gammaCorrectVal);
   return gammaTinv[value];
 }
+
+uint32_t unGamma24(uint32_t c) {
+  if ((gammaCorrectVal < 0.999f) || (gammaCorrectVal > 3.0f)) return c;
+  if (gammaTinv[255] == 0) calcInvGammaTable(gammaCorrectVal);
+  return RGBW32(gammaTinv[R(c)], gammaTinv[G(c)], gammaTinv[B(c)], W(c));
+}
 // wleDMM end
 
 uint8_t gamma8_cal(uint8_t b, float gamma)
diff --git a/wled00/fcn_declare.h b/wled00/fcn_declare.h
index aa0645d0..a0713d0f 100644
--- a/wled00/fcn_declare.h
+++ b/wled00/fcn_declare.h
@@ -69,6 +69,7 @@ void calcGammaTable(float gamma);
 uint8_t __attribute__((pure)) gamma8(uint8_t b);                                              // WLEDMM: added attribute pure
 uint32_t __attribute__((pure)) gamma32(uint32_t);                                             // WLEDMM: added attribute pure
 uint8_t unGamma8(uint8_t value);                                                              // WLEDMM revert gamma correction
+uint32_t unGamma24(uint32_t c);                                                               // WLEDMM for 24bit color (white left as-is)
 
 //dmx_output.cpp
 void initDMXOutput();
diff --git a/wled00/wled.h b/wled00/wled.h
index 5d881cf0..be21de04 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2407171
+#define VERSION 2408050
 
 // 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 5240c3450b116dc1df935926487c1549e525b304 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 5 Aug 2024 21:30:25 +0200
Subject: [PATCH 130/200] Segment drawing optimizations (FASTPATH only)

* cache width, height, and a few more values that are normally re-calculated for each pixel
* make normal sPC a bit faster
* Segment::fade_out() optimization

--> only active in FASTPATH mode, to preserve flash on small devices (8266)
--> code still needs some polishing
--> up to 20% speedup with some 2D effects (esp32,  flash qio 80Mhz, -O2)
---
 wled00/FX.h         | 50 ++++++++++++++++++++++++++++++++++++++++++++-
 wled00/FX_2Dfcn.cpp | 23 ++++++++++++++++++---
 wled00/FX_fcn.cpp   | 24 ++++++++++++++++------
 wled00/wled.h       |  2 +-
 4 files changed, 88 insertions(+), 11 deletions(-)

diff --git a/wled00/FX.h b/wled00/FX.h
index 00ae3183..aa5014e2 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -434,6 +434,19 @@ typedef struct Segment {
     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!!!
 
+#ifdef WLEDMM_FASTPATH
+    // WLEDMM cache some values that won't change while drawing a frame
+    bool _isSimpleSegment = false;
+    bool _isValid2D = false;
+    uint8_t _brightness = 255; // final pixel brightness - including transitions and segment opacity
+    uint16_t _2dWidth = 0;  // virtualWidth
+    uint16_t _2dHeight = 0; // virtualHeight
+
+    void setPixelColorXY_slow(int x, int y, uint32_t c); // set relative pixel within segment with color - full slow version
+#else
+    void setPixelColorXY_slow(int x, int y, uint32_t c) { setPixelColorXY(x,y,c); }  // not FASTPATH - slow is the normal
+#endif
+
     // perhaps this should be per segment, not static
     static CRGBPalette16 _currentPalette;     // palette used for current effect (includes transition, used in color_from_palette())
 
@@ -587,6 +600,7 @@ typedef struct Segment {
     bool allocateData(size_t len);
     void deallocateData(void);
     void resetIfRequired(void);
+    void startFrame(void); // cache a few values that don't change while an effect is drawing
     /**
       * Flags that before the next effect is calculated,
       * the internal segment state should be reset.
@@ -642,6 +656,7 @@ typedef struct Segment {
     uint32_t __attribute__((pure)) color_wheel(uint8_t pos);
 
     // 2D matrix
+#ifndef WLEDMM_FASTPATH
     inline uint16_t virtualWidth() const {  // WLEDMM use fast types, and make function inline
       uint_fast16_t groupLen = groupLength();
       uint_fast16_t vWidth = ((transpose ? height() : width()) + groupLen - 1) / groupLen;
@@ -654,6 +669,23 @@ typedef struct Segment {
       if (mirror_y) vHeight = (vHeight + 1) /2;  // divide by 2 if mirror, leave at least a single LED
       return vHeight;
     }
+#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
+
+    uint16_t calc_virtualWidth() const {
+      uint_fast16_t groupLen = groupLength();
+      uint_fast16_t vWidth = ((transpose ? height() : width()) + groupLen - 1) / groupLen;
+      if (mirror) vWidth = (vWidth + 1) /2;  // divide by 2 if mirror, leave at least a single LED
+      return vWidth;
+    }
+    uint16_t calc_virtualHeight() const {
+      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;
+    }
+#endif
 
     uint16_t nrOfVStrips(void) const;
     void createjMap(); //WLEDMM jMap
@@ -666,8 +698,24 @@ typedef struct Segment {
       return (x%width) + (y%height) * width;
     }
 
-    //void setPixelColorXY_fast(int x, int y,uint32_t c); // set relative pixel within segment with color - wrapper for _fast
+#ifdef WLEDMM_FASTPATH
+    // WLEDMM this is a "gateway" function - we either call _fast or fall back to "slow" 
+    inline void setPixelColorXY(int x, int y, uint32_t col) {
+      if (!_isSimpleSegment) { // slow path
+        setPixelColorXY_slow(x, y, col);
+      } else {                 // fast path
+        // some sanity checks
+        if (!_isValid2D) return;                                               // not active
+        if ((unsigned(x) >= _2dWidth) || (unsigned(y) >= _2dHeight)) return;   // check if (x,y) are out-of-range - due to 2's complement, this also catches negative values
+        if (!_brightness && !transitional) return;                             // black-out
+
+        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
+  }
+}
+#else
     void setPixelColorXY(int x, int y, uint32_t c); // set relative pixel within segment with color
+#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)); }
     inline void setPixelColorXY(int x, int y, CRGB c)                             { setPixelColorXY(x, y, RGBW32(c.r,c.g,c.b,0)); }
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 83ec0f54..df4387db 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -217,6 +217,19 @@ uint32_t WS2812FX::getPixelColorXY(uint16_t x, uint16_t y) {
 
 #ifndef WLED_DISABLE_2D
 
+// WLEDMM cache some values so we don't need to re-calc then for each pixel
+void Segment::startFrame(void) {
+#ifdef WLEDMM_FASTPATH
+  _isValid2D  = isActive() && is2D();
+  _brightness = currentBri(on ? opacity : 0);
+  _isSimpleSegment = (grouping == 1) && (spacing == 0); // we can handle pixels faster when no grouping or spacing is involved
+  // if (reverse_y) _isSimpleSegment = false; // for A/B testing
+  _2dWidth    = is2D() ? calc_virtualWidth() : virtualLength();
+  _2dHeight   = calc_virtualHeight();
+#endif
+}
+// WLEDMM end
+
 // XY(x,y) - gets pixel index within current segment (often used to reference leds[] array element)
 // WLEDMM Segment::XY()is declared inline, see FX.h
 
@@ -266,7 +279,11 @@ void IRAM_ATTR Segment::setPixelColorXY_fast(int x, int y, uint32_t col, uint32_
 
 
 // normal Segment::setPixelColorXY with error checking, and support for grouping / spacing
+#ifdef WLEDMM_FASTPATH
+void IRAM_ATTR_YN Segment::setPixelColorXY_slow(int x, int y, uint32_t col) //WLEDMM: IRAM_ATTR conditionally, renamed to "_slow"
+#else
 void IRAM_ATTR_YN Segment::setPixelColorXY(int x, int y, uint32_t col) //WLEDMM: IRAM_ATTR conditionally
+#endif
 {
   if (Segment::maxHeight==1) return; // not a matrix set-up
   const int_fast16_t cols = virtualWidth();  // WLEDMM optimization
@@ -520,7 +537,7 @@ void Segment::box_blur(uint16_t i, bool vertical, fract8 blur_amount) {
   for (int j = 0; j < dim1; j++) {
     int x = vertical ? i : j;
     int y = vertical ? j : i;
-    setPixelColorXY(x, y, out[j]);
+    if (in[j] != out[j]) setPixelColorXY(x, y, out[j]);
   }
 }
 
@@ -698,7 +715,7 @@ void Segment::drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint3
   // single pixel (line length == 0)
   if (dx+dy == 0) {
     if (simpleSegment) setPixelColorXY_fast(x0, y0, c, scaled_col, cols, rows);
-    else setPixelColorXY(x0, y0, c);
+    else setPixelColorXY_slow(x0, y0, c);
     return;
   }
 
@@ -734,7 +751,7 @@ void Segment::drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint3
     for (;;) {
       // if (x0 >= cols || y0 >= rows) break; // WLEDMM we hit the edge - should never happen
       if (simpleSegment) setPixelColorXY_fast(x0, y0, c, scaled_col, cols, rows);
-      else setPixelColorXY(x0, y0, c);
+      else setPixelColorXY_slow(x0, y0, c);
       if (x0==x1 && y0==y1) break;
       int e2 = err;
       if (e2 >-dx) { err -= dy; x0 += sx; }
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 4c43218a..faf23625 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -266,6 +266,7 @@ void Segment::resetIfRequired() {
     deallocateData();
     next_time = 0; step = 0; call = 0; aux0 = 0; aux1 = 0;
     reset = false; // setOption(SEG_OPTION_RESET, false);
+    startFrame();   // WLEDMM update cached propoerties
   }
 }
 
@@ -673,7 +674,11 @@ 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();
@@ -765,7 +770,11 @@ 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);
@@ -1057,7 +1066,7 @@ void IRAM_ATTR_YN Segment::setPixelColor(int i, uint32_t col) //WLEDMM: IRAM_ATT
           // set pixel
           if (x != lastX || y != lastY) { // only paint if pixel position is different
             if (simpleSegment) setPixelColorXY_fast(x, y, col, scaled_col, vW, vH);
-            else setPixelColorXY(x, y, col);  
+            else setPixelColorXY_slow(x, y, col);  
           }
           lastX = x;
           lastY = y;
@@ -1353,7 +1362,7 @@ void Segment::fill(uint32_t c) {
     // fill 2D segment
     for(int y = 0; y < rows; y++) for (int x = 0; x < cols; x++) {
       if (simpleSegment) setPixelColorXY_fast(x, y, c, scaled_col, cols, rows);
-      else setPixelColorXY(x, y, c);
+      else setPixelColorXY_slow(x, y, c);
     }
   } else { // fill 1D strip
     for (int x = 0; x < cols; x++) setPixelColor(x, c);
@@ -1408,7 +1417,7 @@ void Segment::fade_out(uint8_t rate) {
   int g2 = G(color2);
   int b2 = B(color2);
 
-  for (uint_fast16_t y = 0; y < rows; y++) for (uint_fast16_t x = 0; x < cols; x++) {
+  for (int y = 0; y < rows; y++) for (int x = 0; x < cols; x++) {
     uint32_t color = is2D() ? getPixelColorXY(x, y) : getPixelColor(x);
     if (color == color2) continue;  // WLEDMM speedup - pixel color = target color, so nothing to do
     int w1 = W(color);
@@ -1426,10 +1435,12 @@ void Segment::fade_out(uint8_t rate) {
     rdelta += (r2 == r1) ? 0 : (r2 > r1) ? 1 : -1;
     gdelta += (g2 == g1) ? 0 : (g2 > g1) ? 1 : -1;
     bdelta += (b2 == b1) ? 0 : (b2 > b1) ? 1 : -1;
+    uint32_t colorNew = RGBW32(r1 + rdelta, g1 + gdelta, b1 + bdelta, w1 + wdelta); // WLEDMM
 
-    //if ((wdelta == 0) && (rdelta == 0) && (gdelta == 0) && (bdelta == 0)) continue; // WLEDMM delta = zero => no change // causes problem with text overlay
-    if (is2D()) setPixelColorXY((uint16_t)x, (uint16_t)y, r1 + rdelta, g1 + gdelta, b1 + bdelta, w1 + wdelta);
-    else        setPixelColor((uint16_t)x, r1 + rdelta, g1 + gdelta, b1 + bdelta, w1 + wdelta);
+    if (colorNew != color) {                                                        // WLEDMM speedup - do not repaint the same color
+      if (is2D()) setPixelColorXY(x, y, colorNew);
+      else        setPixelColor(x, colorNew);
+    }
   }
 }
 
@@ -1836,6 +1847,7 @@ 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]);
 
+        seg.startFrame();   // WLEDMM
         // 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());
diff --git a/wled00/wled.h b/wled00/wled.h
index be21de04..2ff0d902 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2408050
+#define VERSION 2408051
 
 // 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 9ee4165dad6fefd65fedc483ef34b8a620bcf073 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Mon, 5 Aug 2024 16:37:49 -0400
Subject: [PATCH 131/200] Freqmatrix stop identical first pixel/line

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

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 4cce3230..d6c5820c 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -7513,9 +7513,9 @@ uint16_t mode_freqmatrix(void) {                // Freqmatrix. By Andreas Plesch
     }
 
     // shift the pixels one pixel up
-    SEGMENT.setPixelColor(0, color);
     // if SEGLEN equals 1 this loop won't execute
     for (int i = SEGLEN - 1; i > 0; i--) SEGMENT.setPixelColor(i, SEGMENT.getPixelColor(i-1)); //move to the left
+    SEGMENT.setPixelColor(0, color);
   }
 
   return FRAMETIME;

From 42919f9daf8e1073840b511cbc34f1e16f5986de Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 6 Aug 2024 15:53:46 +0200
Subject: [PATCH 132/200] blob effect improvements, and a dirty hack for HUB75
 double buffer

* mode_2Dfloatingblobs() improvements for large panels
* Segment::fillCircle() speed optimizations
* HUB75 hack (disabled by default): skip first fill(BLACK) when using double buffering (as the buffer gets cleared after each frame)
---
 wled00/FX.cpp       |  9 ++++++---
 wled00/FX.h         |  5 +++--
 wled00/FX_2Dfcn.cpp | 30 ++++++++++++++++++++++--------
 wled00/FX_fcn.cpp   | 12 ++++++++++++
 wled00/wled.h       |  2 +-
 5 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index d6c5820c..a9bfccbb 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -6271,7 +6271,10 @@ uint16_t mode_2Dfloatingblobs(void) {
   }
 
   SEGMENT.fadeToBlackBy(20);
-  bool drawAA = (SEGMENT.custom1 > 0) && (SEGMENT.custom1 < 5); //WLEDMM
+  bool drawAA = (SEGMENT.custom1 > 0) && (SEGMENT.custom1 < 6); //WLEDMM
+  const uint16_t minDim = min(cols, rows); // WLEDMM use smaller dimension to find good blob size
+  float max_grow = min(minDim/4.f,2.f);
+  if (minDim>=24) max_grow =(minDim/8.0f);   // WLEDMM allow bigger blobs
 
   // Bounce balls around
   for (size_t i = 0; i < Amount; i++) {
@@ -6280,13 +6283,13 @@ uint16_t mode_2Dfloatingblobs(void) {
     if (blob->grow[i]) {
       // enlarge radius until it is >= 4
       blob->r[i] += (fabsf(blob->sX[i]) > fabsf(blob->sY[i]) ? fabsf(blob->sX[i]) : fabsf(blob->sY[i])) * 0.05f;
-      if (blob->r[i] >= min(cols/4.f,2.f)) {
+      if (blob->r[i] >= max_grow) {
         blob->grow[i] = false;
       }
     } else {
       // reduce radius until it is < 1
       blob->r[i] -= (fabsf(blob->sX[i]) > fabsf(blob->sY[i]) ? fabsf(blob->sX[i]) : fabsf(blob->sY[i])) * 0.05f;
-      if (blob->r[i] < 1.f) {
+      if (blob->r[i] < 0.8f) {
         blob->grow[i] = true;
       }
     }
diff --git a/wled00/FX.h b/wled00/FX.h
index aa5014e2..1393d5a2 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -439,6 +439,7 @@ typedef struct Segment {
     bool _isSimpleSegment = false;
     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
 
@@ -741,8 +742,8 @@ typedef struct Segment {
     void move(uint8_t dir, uint8_t delta, bool wrap = false);
     void drawCircle(uint16_t cx, uint16_t cy, uint8_t radius, uint32_t c, bool soft = false);
     inline void drawCircle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c, bool soft = false) { drawCircle(cx, cy, radius, RGBW32(c.r,c.g,c.b,0), soft); }
-    void fillCircle(uint16_t cx, uint16_t cy, uint8_t radius, uint32_t c, bool soft = false);
-    inline void fillCircle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c, bool soft = false) { fillCircle(cx, cy, radius, RGBW32(c.r,c.g,c.b,0), soft); }
+    void fillCircle(unsigned cx, unsigned cy, int radius, uint32_t col, bool soft);
+    inline void fillCircle(unsigned cx, unsigned cy, int radius, CRGB c, bool soft = false) { fillCircle(cx, cy, radius, RGBW32(c.r,c.g,c.b,0), soft); }
     void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c, bool soft = false, uint8_t depth = UINT8_MAX);
     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(uint16_t x0, uint16_t y0, uint16_t radius, uint32_t color, uint32_t fillColor = 0);
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index df4387db..e6587d7d 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -226,6 +226,9 @@ void Segment::startFrame(void) {
   // if (reverse_y) _isSimpleSegment = false; // for A/B testing
   _2dWidth    = is2D() ? calc_virtualWidth() : virtualLength();
   _2dHeight   = calc_virtualHeight();
+  #if 0 && defined(WLED_ENABLE_HUB75MATRIX)
+    _firstFill = true; // dirty HACK
+  #endif
 #endif
 }
 // WLEDMM end
@@ -651,19 +654,26 @@ void Segment::drawCircle(uint16_t cx, uint16_t cy, uint8_t radius, uint32_t col,
 }
 
 // by stepko, taken from https://editor.soulmatelights.com/gallery/573-blobs
-void Segment::fillCircle(uint16_t cx, uint16_t cy, uint8_t radius, uint32_t col, bool soft) {
-  if (!isActive() || radius == 0) return; // not active
+void Segment::fillCircle(unsigned cx, unsigned cy, int radius, uint32_t col, bool soft) {
+  if (!isActive() || radius <= 0) return; // not active
   // draw soft bounding circle
   if (soft) drawCircle(cx, cy, radius, col, soft);
-  // fill it
   const int cols = virtualWidth();
   const int rows = virtualHeight();
-  for (int y = -radius; y <= radius; y++) {
-    for (int x = -radius; x <= radius; x++) {
-      if (x * x + y * y <= radius * radius &&
-          int16_t(cx)+x>=0 && int16_t(cy)+y>=0 &&
-          int16_t(cx)+x<cols && int16_t(cy)+y<rows)
+
+  const int_fast32_t maxRadius2 = radius * radius - (((radius > 3) && !soft) ? 1:0);   // WLEDMM pre-compute r^2; '-1' removes spikes from bigger blobs
+  // WLEDMM pre-compute boundaries
+  const int startx = max(-radius, -int(cx));
+  const int endx = min(radius, cols-1-int(cx));
+  const int starty = max(-radius, -int(cy));
+  const int endy = min(radius, rows-1-int(cy));
+
+  // fill it - WLEDMM optimized
+  for (int y = starty; y <= endy; y++) {
+    for (int x = startx; x <= endx; x++) {
+      if ((x * x + y * y) <= maxRadius2) {
         setPixelColorXY(cx + x, cy + y, col);
+      }
     }
   }
 }
@@ -690,7 +700,11 @@ void Segment::drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint3
   uint32_t scaled_col = c;
   if (simpleSegment) {
       // segment brightness must be pre-calculated for the "fast" setPixelColorXY variant!
+      #ifdef WLEDMM_FASTPATH
+      uint8_t _bri_t = _brightness;
+      #else
       uint8_t _bri_t = currentBri(on ? opacity : 0);
+      #endif
       if (!_bri_t && !transitional) return;
       if (_bri_t < 255) scaled_col = color_fade(c, _bri_t);
   }
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index faf23625..0e63c853 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -1347,6 +1347,18 @@ void Segment::refreshLightCapabilities() {
  */
 void 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
 
diff --git a/wled00/wled.h b/wled00/wled.h
index 2ff0d902..34667df1 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2408051
+#define VERSION 2408060
 
 // 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 5778b596beb8142896cd8a008ae98adb71c6c73d Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Tue, 6 Aug 2024 10:44:44 -0400
Subject: [PATCH 133/200] ESP32-ETHERNET-KIT-VE Fix

Changed eth_address from 0 to 1 based on testing with devkit as it wasn't working by default with 0
---
 wled00/network.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/network.cpp b/wled00/network.cpp
index 1e414d81..7e0048d8 100644
--- a/wled00/network.cpp
+++ b/wled00/network.cpp
@@ -89,7 +89,7 @@ const ethernet_settings ethernetBoards[] = {
 
   // ESP32-ETHERNET-KIT-VE
   {
-    0,                    // eth_address,
+    1,                    // eth_address, WLED-MM: Changed from 0 to 1 based on not working with 0 on same devkit.
     5,                    // eth_power,
     23,                   // eth_mdc,
     18,                   // eth_mdio,

From 273154db762f8e17c0a756c4370741f8c7acdcd4 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 6 Aug 2024 18:13:59 +0200
Subject: [PATCH 134/200] drawArc speedup (Circle mapping mode)

* Optimize drawArc to skip pixels that are off-screen or outside the circle's bounding box. Also move repeating calculations out of the inner loop.

testcase 64x64 : 8fps --> 33 fps :-)
---
 wled00/FX.h         |  4 ++--
 wled00/FX_2Dfcn.cpp | 42 +++++++++++++++++++++++++-----------------
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/wled00/FX.h b/wled00/FX.h
index 1393d5a2..98e934e0 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -746,8 +746,8 @@ typedef struct Segment {
     inline void fillCircle(unsigned cx, unsigned cy, int radius, CRGB c, bool soft = false) { fillCircle(cx, cy, radius, RGBW32(c.r,c.g,c.b,0), soft); }
     void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c, bool soft = false, uint8_t depth = UINT8_MAX);
     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(uint16_t x0, uint16_t y0, uint16_t radius, uint32_t color, uint32_t fillColor = 0);
-    inline void drawArc(uint16_t x0, uint16_t y0, uint16_t 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 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);
     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);
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index e6587d7d..71fb0cb2 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -774,27 +774,34 @@ void Segment::drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint3
   }
 }
 
-void Segment::drawArc(uint16_t x0, uint16_t y0, uint16_t radius, uint32_t color, uint32_t fillColor) {
-  if (!isActive()) return; // not active
-  // float step = degrees / (2.85f*MAX(radius,1));
-  // for (float rad = 0.0f; rad <= degrees+step/2; rad += step) {
-  //   // may want to try float version as well (with or without antialiasing)
-  //   int x = roundf(sin_t(rad) * radius);
-  //   int y = roundf(cos_t(rad) * radius);
-  //   setPixelColorXY(x+x0, y+y0, c);
-  // }
-  float minradius = radius - .5;
-  float maxradius = radius + .5;
-  for (int x=0; x<virtualWidth(); x++) for (int y=0; y<virtualHeight(); y++) {
+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;
+  // WLEDMM pre-calculate values to speed up the loop
+  const int minradius2 = roundf(minradius * minradius);
+  const int maxradius2 = roundf(maxradius * maxradius);
 
-    int newX = x - x0;
-    int newY = y - y0;
+  // WLEDMM only loop over surrounding square (50% faster)
+  const int width = virtualWidth();
+  const int height = virtualHeight();
+  const int startx = max(0, int(x0)-radius-1);
+  const int endx = min(width, int(x0)+radius+1);
+  const int starty = max(0, int(y0)-radius-1);
+  const int endy = min(height, int(y0)+radius+1);
 
-    if (newX*newX + newY*newY >= minradius * minradius && newX*newX + newY*newY <= maxradius * maxradius)
+  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 (newX*newX + newY*newY < minradius * minradius)
+      if (distance2 < minradius2)
         setPixelColorXY(x, y, fillColor);
+    }
   }
 }
 
@@ -890,10 +897,11 @@ void Segment::wu_pixel(uint32_t x, uint32_t y, CRGB c) {      //awesome wu_pixel
   // 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));
+    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);
-    setPixelColorXY(int((x >> 8) + (i & 1)), int((y >> 8) + ((i >> 1) & 1)), led);
+    if (led != oldLed) setPixelColorXY(int((x >> 8) + (i & 1)), int((y >> 8) + ((i >> 1) & 1)), led); // WLEDMM don't repaint same color
   }
 }
 #undef WU_WEIGHT

From 7f9da309c9d37a27226b0a2e247e47494fafa50b Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 7 Aug 2024 14:58:38 +0200
Subject: [PATCH 135/200] const const const

adding hints for the compiler for optimization.
In case your custom build complains about "const", just remove the keyword. based on https://github.com/Aircoookie/WLED/commit/e82f38e277b6ad3d7b943b8868c3f88cb7c53382, but going further :-)

* "const" class functions : function does not modify any class attributes ( --> "this" becomes const)

* __attribute__((pure)) :  function return value depends only on the parameters and/or global variables. The function does not modify any global or static variables.
* __attribute__((const)) : function only examines arguments (no globals), and has no effects except the return value. This slightly more strict than "pure"
* hot: tells the compiler "this functions is called very often"
* cold: the opposite of hot
---
 usermods/audioreactive/audio_reactive.h |  2 +-
 wled00/FX.h                             | 74 ++++++++++----------
 wled00/FX_2Dfcn.cpp                     |  8 +--
 wled00/FX_fcn.cpp                       | 36 +++++-----
 wled00/bus_manager.cpp                  | 34 +++++-----
 wled00/bus_manager.h                    | 90 ++++++++++++-------------
 wled00/colors.cpp                       | 14 ++--
 wled00/fcn_declare.h                    | 15 +++--
 wled00/led.cpp                          |  2 +-
 wled00/pin_manager.cpp                  |  4 +-
 wled00/pin_manager.h                    |  4 +-
 wled00/src/dependencies/time/TimeLib.h  |  2 +-
 wled00/wled.h                           |  6 +-
 wled00/wled00.ino                       |  2 +
 14 files changed, 148 insertions(+), 145 deletions(-)

diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index f7c91594..709a5960 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -285,7 +285,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);      // audio processing task: read samples, run FFT, fill GEQ channels from FFT results
+void FFTcode(void * parameter)  __attribute__((noreturn));      // 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
 
diff --git a/wled00/FX.h b/wled00/FX.h
index 98e934e0..387b9e55 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -33,7 +33,7 @@
 
 bool canUseSerial(void);                        // WLEDMM implemented in wled_serial.cpp
 void strip_wait_until_idle(String whoCalledMe); // WLEDMM implemented in FX_fcn.cpp
-bool strip_uses_global_leds(void);              // WLEDMM implemented in FX_fcn.cpp
+bool strip_uses_global_leds(void) __attribute__((pure));  // WLEDMM implemented in FX_fcn.cpp
 
 #define FASTLED_INTERNAL //remove annoying pragma messages
 #define USE_GET_MILLISECOND_TIMER
@@ -640,7 +640,7 @@ typedef struct Segment {
     void setPixelColor(float i, uint32_t c, bool aa = true);
     inline void setPixelColor(float i, uint8_t r, uint8_t g, uint8_t b, uint8_t w = 0, bool aa = true) { setPixelColor(i, RGBW32(r,g,b,w), aa); }
     inline void setPixelColor(float i, CRGB c, bool aa = true)                                         { setPixelColor(i, RGBW32(c.r,c.g,c.b,0), aa); }
-    uint32_t __attribute__((pure)) getPixelColor(int i);  // WLEDMM attribute added
+    uint32_t __attribute__((pure)) getPixelColor(int i) const;  // WLEDMM attribute added
     // 1D support functions (some implement 2D as well)
     void blur(uint8_t, bool smear = false);
     void fill(uint32_t c);
@@ -652,7 +652,7 @@ typedef struct Segment {
     inline void addPixelColor(int n, byte r, byte g, byte b, byte w = 0, bool fast = false) { addPixelColor(n, RGBW32(r,g,b,w), fast); } // automatically inline
     inline void addPixelColor(int n, CRGB c, bool fast = false)          { addPixelColor(n, RGBW32(c.r,c.g,c.b,0), fast); } // automatically inline
     void fadePixelColor(uint16_t n, uint8_t fade);
-    uint8_t get_random_wheel_index(uint8_t pos);
+    uint8_t get_random_wheel_index(uint8_t pos)  const;
 	  uint32_t __attribute__((pure)) color_from_palette(uint_fast16_t, bool mapping, bool wrap, uint8_t mcol, uint8_t pbri = 255);
     uint32_t __attribute__((pure)) color_wheel(uint8_t pos);
 
@@ -693,7 +693,7 @@ typedef struct Segment {
     void deletejMap(); //WLEDMM jMap
   
   #ifndef WLED_DISABLE_2D
-    inline uint16_t XY(uint_fast16_t x, uint_fast16_t y) { // support function to get relative index within segment (for leds[]) // WLEDMM inline for speed
+    inline uint16_t XY(uint_fast16_t x, uint_fast16_t y)  const  { // support function to get relative index within segment (for leds[]) // WLEDMM inline for speed
       uint_fast16_t width  = max(uint16_t(1), virtualWidth());   // segment width in logical pixels  -- softhack007 avoid div/0
       uint_fast16_t height = max(uint16_t(1), virtualHeight());  // segment height in logical pixels -- softhack007 avoid div/0
       return (x%width) + (y%height) * width;
@@ -726,7 +726,7 @@ 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);
+    uint32_t __attribute__((pure)) getPixelColorXY(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); }
@@ -792,7 +792,7 @@ typedef struct Segment {
     inline void drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, CRGB c, CRGB c2, int8_t rotate = 0) {}
     inline void wu_pixel(uint32_t x, uint32_t y, CRGB c) {}
   #endif
-  uint8_t * getAudioPalette(int pal); //WLEDMM netmindz ar palette
+  uint8_t * getAudioPalette(int pal)  const; //WLEDMM netmindz ar palette
 } segment;
 //static int segSize = sizeof(Segment);
 
@@ -915,64 +915,64 @@ class WS2812FX {  // 96 bytes
 
     bool
       checkSegmentAlignment(void),
-      hasRGBWBus(void),
-      hasCCTBus(void),
+      hasRGBWBus(void) const,
+      hasCCTBus(void) const,
       // return true if the strip is being sent pixel updates
-      isUpdating(void),
+      isUpdating(void) const,
       deserializeMap(uint8_t n=0),
       useLedsArray = false;
 
-    inline bool isServicing(void) { return _isServicing; }
-    inline bool hasWhiteChannel(void) {return _hasWhiteChannel;}
-    inline bool isOffRefreshRequired(void) {return _isOffRefreshRequired;}
+    inline bool isServicing(void)  const { return _isServicing; }
+    inline bool hasWhiteChannel(void)  const {return _hasWhiteChannel;}
+    inline bool isOffRefreshRequired(void)  const {return _isOffRefreshRequired;}
 
     uint8_t
       paletteFade,
       paletteBlend,
       milliampsPerLed,
       cctBlending,
-      getActiveSegmentsNum(void),
-      getFirstSelectedSegId(void),
-      getLastActiveSegmentId(void),
-      getActiveSegsLightCapabilities(bool selectedOnly = false),
+      getActiveSegmentsNum(void)  const,
+      getFirstSelectedSegId(void) __attribute__((pure)),
+      getLastActiveSegmentId(void) const,
+      getActiveSegsLightCapabilities(bool selectedOnly = false) __attribute__((pure)),
       setPixelSegment(uint8_t n);
 
-    inline uint8_t getBrightness(void) { return _brightness; }
-    inline uint8_t getMaxSegments(void) { return MAX_NUM_SEGMENTS; }  // returns maximum number of supported segments (fixed value)
-    inline uint8_t getSegmentsNum(void) { return _segments.size(); }  // returns currently present segments
-    inline uint8_t getCurrSegmentId(void) { return _segment_index; }
-    inline uint8_t getMainSegmentId(void) { return _mainSegment; }
-    inline uint8_t getPaletteCount() { return 13 + GRADIENT_PALETTE_COUNT; }  // will only return built-in palette count
-    inline uint8_t getTargetFps() { return _targetFps; }
-    inline uint8_t getModeCount() { return _modeCount; }
+    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; }
 
     uint16_t
       ablMilliampsMax,
       currentMilliamps,
-      getLengthPhysical(void),
-      __attribute__((pure)) getLengthTotal(void), // will include virtual/nonexistent pixels in matrix //WLEDMM attribute added
-      getFps();
+      getLengthPhysical(void) const,
+      __attribute__((pure)) getLengthTotal(void) const, // will include virtual/nonexistent pixels in matrix //WLEDMM attribute added
+      getFps() const;
 
-    inline uint16_t getFrameTime(void) { return _frametime; }
-    inline uint16_t getMinShowDelay(void) { return MIN_SHOW_DELAY; }
-    inline uint16_t getLength(void) { return _length; } // 2D matrix may have less pixels than W*H
-    inline uint16_t getTransition(void) { return _transitionDur; }
+    inline uint16_t getFrameTime(void)  const { return _frametime; }
+    inline uint16_t getMinShowDelay(void)  const { return MIN_SHOW_DELAY; }
+    inline uint16_t getLength(void)  const { return _length; } // 2D matrix may have less pixels than W*H
+    inline uint16_t getTransition(void)  const { return _transitionDur; }
 
     uint32_t
       now,
       timebase;
-    uint32_t __attribute__((pure)) getPixelColor(uint_fast16_t);   // WLEDMM attribute pure = does not have side-effects
+    uint32_t __attribute__((pure)) getPixelColor(uint_fast16_t)  const;   // WLEDMM attribute pure = does not have side-effects
 
-    inline uint32_t getLastShow(void) { return _lastShow; }
-    inline uint32_t segColor(uint8_t i) { return _colors_t[i]; }
+    inline uint32_t getLastShow(void)  const { return _lastShow; }
+    inline uint32_t segColor(uint8_t i)  const { return _colors_t[i]; }
 
     const char *
-      getModeData(uint8_t id = 0) { return (id && id<_modeCount) ? _modeData[id] : PSTR("Solid"); }
+      getModeData(uint8_t id = 0)  const { return (id && id<_modeCount) ? _modeData[id] : PSTR("Solid"); }
 
     const char **
       getModeDataSrc(void) { return &(_modeData[0]); } // vectors use arrays for underlying data
 
-    Segment&        getSegment(uint8_t id);
+    Segment&        getSegment(uint8_t id) __attribute__((pure));
     inline Segment& getFirstSelectedSeg(void) { return _segments[getFirstSelectedSegId()]; }
     inline Segment& getMainSegment(void)      { return _segments[getMainSegmentId()]; }
     inline Segment* getSegments(void)         { return &(_segments[0]); }
@@ -1039,7 +1039,7 @@ class WS2812FX {  // 96 bytes
     inline void setPixelColorXY(int x, int y, CRGB c)                             { setPixelColorXY(x, y, RGBW32(c.r,c.g,c.b,0)); }
 
     uint32_t
-      getPixelColorXY(uint16_t, uint16_t);
+      getPixelColorXY(uint16_t, uint16_t)  const;
 
   // end 2D support
 
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 71fb0cb2..e966381a 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -177,7 +177,7 @@ void WS2812FX::setUpMatrix() {
 }
 
 // absolute matrix version of setPixelColor(), without error checking
-void IRAM_ATTR WS2812FX::setPixelColorXY_fast(int x, int y, uint32_t col) //WLEDMM: IRAM_ATTR conditionally
+void IRAM_ATTR __attribute__((hot)) WS2812FX::setPixelColorXY_fast(int x, int y, uint32_t col) //WLEDMM: IRAM_ATTR conditionally
 {
   uint_fast16_t index = y * Segment::maxWidth + x;
   if (index < customMappingSize) index = customMappingTable[index];
@@ -200,7 +200,7 @@ void IRAM_ATTR_YN WS2812FX::setPixelColorXY(int x, int y, uint32_t col) //WLEDMM
 }
 
 // returns RGBW values of pixel
-uint32_t WS2812FX::getPixelColorXY(uint16_t x, uint16_t y) {
+uint32_t __attribute__((hot)) WS2812FX::getPixelColorXY(uint16_t x, uint16_t y) const {
 #ifndef WLED_DISABLE_2D
   uint_fast16_t index = (y * Segment::maxWidth + x); //WLEDMM: use fast types
 #else
@@ -239,7 +239,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 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) //WLEDMM
 {
   unsigned i = UINT_MAX;
   bool sameColor = false;
@@ -406,7 +406,7 @@ void Segment::setPixelColorXY(float x, float y, uint32_t col, bool aa, bool fast
 }
 
 // returns RGBW values of pixel
-uint32_t IRAM_ATTR_YN Segment::getPixelColorXY(int x, int y) {
+uint32_t IRAM_ATTR_YN Segment::getPixelColorXY(int x, int y) const {
   if (x<0 || y<0 || !isActive()) return 0; // not active or out-of range
   if (ledsrgb) {
     int i = XY(x,y);
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 0e63c853..8a9533cd 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -882,7 +882,7 @@ uint16_t Segment::virtualLength() const {
 }
 
 //WLEDMM used for M12_sBlock
-void xyFromBlock(uint16_t &x,uint16_t &y, uint16_t i, uint16_t vW, uint16_t vH, uint16_t vStrip) {
+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);
@@ -907,7 +907,7 @@ void xyFromBlock(uint16_t &x,uint16_t &y, uint16_t i, uint16_t vW, uint16_t vH,
 
 }
 
-void IRAM_ATTR_YN Segment::setPixelColor(int i, uint32_t col) //WLEDMM: IRAM_ATTR conditionally
+void IRAM_ATTR_YN __attribute__((hot)) Segment::setPixelColor(int i, uint32_t col) //WLEDMM: IRAM_ATTR conditionally
 {
   if (!isActive()) return; // not active
 #ifndef WLED_DISABLE_2D
@@ -1171,7 +1171,7 @@ void Segment::setPixelColor(float i, uint32_t col, bool aa)
   }
 }
 
-uint32_t Segment::getPixelColor(int i)
+uint32_t __attribute__((hot)) Segment::getPixelColor(int i) const
 {
   if (!isActive()) return 0; // not active
 #ifndef WLED_DISABLE_2D
@@ -1345,7 +1345,7 @@ void Segment::refreshLightCapabilities() {
 /*
  * Fills segment with color - WLEDMM using faster sPC if possible
  */
-void Segment::fill(uint32_t c) {
+void __attribute__((hot)) Segment::fill(uint32_t c) {
   if (!isActive()) return; // not active
   
   #if 0 && defined(WLED_ENABLE_HUB75MATRIX) && defined(WLEDMM_FASTPATH)
@@ -1457,7 +1457,7 @@ void Segment::fade_out(uint8_t rate) {
 }
 
 // fades all pixels to black using nscale8()
-void Segment::fadeToBlackBy(uint8_t fadeBy) {
+void __attribute__((hot)) Segment::fadeToBlackBy(uint8_t fadeBy) {
   if (!isActive() || fadeBy == 0) return;   // optimization - no scaling to apply
   const uint_fast16_t cols = is2D() ? virtualWidth() : virtualLength();      // WLEDMM use fast int types
   const uint_fast16_t rows = virtualHeight(); // will be 1 for 1D
@@ -1480,7 +1480,7 @@ void Segment::fadeToBlackBy(uint8_t fadeBy) {
 /*
  * blurs segment content, source: FastLED colorutils.cpp
  */
-void Segment::blur(uint8_t blur_amount, bool smear) {
+void __attribute__((hot)) Segment::blur(uint8_t blur_amount, bool smear) {
   if (!isActive() || blur_amount == 0) return; // optimization: 0 means "don't blur"
 #ifndef WLED_DISABLE_2D
   if (is2D()) {
@@ -1541,7 +1541,7 @@ uint32_t Segment::color_wheel(uint8_t pos) {
 /*
  * Returns a new, random wheel index with a minimum distance of 42 from pos.
  */
-uint8_t Segment::get_random_wheel_index(uint8_t pos) { // WLEDMM use fast int types, use native min/max
+uint8_t Segment::get_random_wheel_index(uint8_t pos) const { // WLEDMM use fast int types, use native min/max
   uint_fast8_t r = 0, x = 0, y = 0, d = 0;
 
   while(d < 42) {
@@ -1562,7 +1562,7 @@ uint8_t Segment::get_random_wheel_index(uint8_t pos) { // WLEDMM use fast int ty
  * @param pbri Value to scale the brightness of the returned color by. Default is 255. (no scaling)
  * @returns Single color from palette
  */
-uint32_t Segment::color_from_palette(uint_fast16_t i, bool mapping, bool wrap, uint8_t mcol, uint8_t pbri) // WLEDMM use fast int types
+uint32_t __attribute__((hot)) Segment::color_from_palette(uint_fast16_t i, bool mapping, bool wrap, uint8_t mcol, uint8_t pbri) // WLEDMM use fast int types
 {
   // default palette or no RGB support on segment
   if ((palette == 0 && mcol < NUM_COLORS) || !_isRGB) {
@@ -1582,7 +1582,7 @@ uint32_t Segment::color_from_palette(uint_fast16_t i, bool mapping, bool wrap, u
 }
 
  //WLEDMM netmindz ar palette
-uint8_t * Segment::getAudioPalette(int pal) {
+uint8_t * Segment::getAudioPalette(int pal) const {
   // https://forum.makerforums.info/t/hi-is-it-possible-to-define-a-gradient-palette-at-runtime-the-define-gradient-palette-uses-the/63339
   
   um_data_t *um_data;
@@ -1891,7 +1891,7 @@ void IRAM_ATTR WS2812FX::setPixelColor(int i, uint32_t col)
   busses.setPixelColor(i, col);
 }
 
-uint32_t WS2812FX::getPixelColor(uint_fast16_t i) // WLEDMM fast int types
+uint32_t WS2812FX::getPixelColor(uint_fast16_t i) const // WLEDMM fast int types
 {
   if (i < customMappingSize) i = customMappingTable[i];
   if (i >= _length) return 0;
@@ -2029,7 +2029,7 @@ void WS2812FX::show(void) {
  * Returns a true value if any of the strips are still being updated.
  * On some hardware (ESP32), strip updates are done asynchronously.
  */
-bool WS2812FX::isUpdating() {
+bool WS2812FX::isUpdating() const {
   return !busses.canAllShow();
 }
 
@@ -2037,7 +2037,7 @@ bool WS2812FX::isUpdating() {
  * Returns the refresh rate of the LED strip. Useful for finding out whether a given setup is fast enough.
  * Only updates on show() or is set to 0 fps if last show is more than 2 secs ago, so accuracy varies
  */
-uint16_t WS2812FX::getFps() {
+uint16_t WS2812FX::getFps() const {
   if (millis() - _lastShow > 2000) return 0;
 #ifdef ARDUINO_ARCH_ESP32
   return ((_cumulativeFps500 + 250) / 500);  // +250 for proper rounding
@@ -2128,14 +2128,14 @@ void WS2812FX::setMainSegmentId(uint8_t n) {
   return;
 }
 
-uint8_t WS2812FX::getLastActiveSegmentId(void) {
+uint8_t WS2812FX::getLastActiveSegmentId(void) const {
   for (size_t i = _segments.size() -1; i > 0; i--) {
     if (_segments[i].isActive()) return i;
   }
   return 0;
 }
 
-uint8_t WS2812FX::getActiveSegmentsNum(void) {
+uint8_t WS2812FX::getActiveSegmentsNum(void) const {
   uint8_t c = 0;
   for (size_t i = 0; i < _segments.size(); i++) {
     if (_segments[i].isActive()) c++;
@@ -2143,13 +2143,13 @@ uint8_t WS2812FX::getActiveSegmentsNum(void) {
   return c;
 }
 
-uint16_t WS2812FX::getLengthTotal(void) {  // WLEDMM fast int types
+uint16_t WS2812FX::getLengthTotal(void) const {  // WLEDMM fast int types
   uint_fast16_t len = Segment::maxWidth * Segment::maxHeight; // will be _length for 1D (see finalizeInit()) but should cover whole matrix for 2D
   if (isMatrix && _length > len) len = _length; // for 2D with trailing strip
   return len;
 }
 
-uint16_t WS2812FX::getLengthPhysical(void) {  // WLEDMM fast int types
+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);
@@ -2162,7 +2162,7 @@ uint16_t WS2812FX::getLengthPhysical(void) {  // WLEDMM fast int types
 //used for JSON API info.leds.rgbw. Little practical use, deprecate with info.leds.rgbw.
 //returns if there is an RGBW bus (supports RGB and White, not only white)
 //not influenced by auto-white mode, also true if white slider does not affect output white channel
-bool WS2812FX::hasRGBWBus(void) {
+bool WS2812FX::hasRGBWBus(void) const {
   for (unsigned b = 0; b < busses.getNumBusses(); b++) {    //  WLEDMM use native (fast) types
     Bus *bus = busses.getBus(b);
     if (bus == nullptr || bus->getLength()==0) break;
@@ -2171,7 +2171,7 @@ bool WS2812FX::hasRGBWBus(void) {
   return false;
 }
 
-bool WS2812FX::hasCCTBus(void) {
+bool WS2812FX::hasCCTBus(void) const {
   if (cctFromRgb && !correctWB) return false;
   for (unsigned b = 0; b < busses.getNumBusses(); b++) {    //  WLEDMM use native (fast) types
     Bus *bus = busses.getBus(b);
diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 604a92c5..c8e42c57 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -86,7 +86,7 @@ uint8_t IRAM_ATTR ColorOrderMap::getPixelColorOrder(uint16_t pix, uint8_t defaul
 }
 
 
-uint32_t Bus::autoWhiteCalc(uint32_t c) {
+uint32_t Bus::autoWhiteCalc(uint32_t c) const {
   uint8_t aWM = _autoWhiteMode;
   if (_gAWM != AW_GLOBAL_DISABLED) aWM = _gAWM;
   if (aWM == RGBW_MODE_MANUAL_ONLY) return c;
@@ -139,7 +139,7 @@ void BusDigital::show() {
   PolyBus::show(_busPtr, _iType);
 }
 
-bool BusDigital::canShow() {
+bool BusDigital::canShow() const {
   return PolyBus::canShow(_busPtr, _iType);
 }
 
@@ -182,7 +182,7 @@ void IRAM_ATTR BusDigital::setPixelColor(uint16_t pix, uint32_t c) {
   PolyBus::setPixelColor(_busPtr, _iType, pix, c, co);
 }
 
-uint32_t IRAM_ATTR_YN BusDigital::getPixelColor(uint16_t pix) {
+uint32_t IRAM_ATTR_YN BusDigital::getPixelColor(uint16_t pix) const {
   if (reversed) pix = _len - pix -1;
   else pix += _skip;
   uint8_t co = _colorOrderMap.getPixelColorOrder(pix+_start, _colorOrder);
@@ -200,7 +200,7 @@ uint32_t IRAM_ATTR_YN BusDigital::getPixelColor(uint16_t pix) {
   return PolyBus::getPixelColor(_busPtr, _iType, pix, co);
 }
 
-uint8_t BusDigital::getPins(uint8_t* pinArray) {
+uint8_t BusDigital::getPins(uint8_t* pinArray) const {
   uint8_t numPins = IS_2PIN(_type) ? 2 : 1;
   for (uint8_t i = 0; i < numPins; i++) pinArray[i] = _pins[i];
   return numPins;
@@ -317,7 +317,7 @@ void BusPwm::setPixelColor(uint16_t pix, uint32_t c) {
 }
 
 //does no index check
-uint32_t BusPwm::getPixelColor(uint16_t pix) {
+uint32_t BusPwm::getPixelColor(uint16_t pix) const {
   if (!_valid) return 0;
 #if 1
   // WLEDMM stick with the old code - we don't have cctICused
@@ -356,7 +356,7 @@ void BusPwm::show() {
   }
 }
 
-uint8_t BusPwm::getPins(uint8_t* pinArray) {
+uint8_t BusPwm::getPins(uint8_t* pinArray) const {
   if (!_valid) return 0;
   uint8_t numPins = NUM_PWM_PINS(_type);
   for (uint8_t i = 0; i < numPins; i++) {
@@ -408,7 +408,7 @@ void BusOnOff::setPixelColor(uint16_t pix, uint32_t c) {
   _data = bool(r|g|b|w) && bool(_bri) ? 0xFF : 0;
 }
 
-uint32_t BusOnOff::getPixelColor(uint16_t pix) {
+uint32_t BusOnOff::getPixelColor(uint16_t pix) const {
   if (!_valid) return 0;
   return RGBW32(_data, _data, _data, _data);
 }
@@ -418,7 +418,7 @@ void BusOnOff::show() {
   digitalWrite(_pin, reversed ? !(bool)_data : (bool)_data);
 }
 
-uint8_t BusOnOff::getPins(uint8_t* pinArray) {
+uint8_t BusOnOff::getPins(uint8_t* pinArray) const {
   if (!_valid) return 0;
   pinArray[0] = _pin;
   return 1;
@@ -467,7 +467,7 @@ void BusNetwork::setPixelColor(uint16_t pix, uint32_t c) {
   if (_rgbw) _data[offset+3] = W(c);
 }
 
-uint32_t BusNetwork::getPixelColor(uint16_t pix) {
+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);
@@ -480,7 +480,7 @@ void BusNetwork::show() {
   _broadcastLock = false;
 }
 
-uint8_t BusNetwork::getPins(uint8_t* pinArray) {
+uint8_t BusNetwork::getPins(uint8_t* pinArray) const {
   for (uint8_t i = 0; i < 4; i++) {
     pinArray[i] = _client[i];
   }
@@ -698,7 +698,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   USER_PRINTLN("MatrixPanel_I2S_DMA started");
 }
 
-void BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c) {
+void  __attribute__((hot)) BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c) {
   if (!_valid || pix >= _len) return;
 #ifndef NO_CIE1931
   c = unGamma24(c); // to use the driver linear brightness feature, we first need to undo WLED gamma correction
@@ -823,7 +823,7 @@ void BusManager::setStatusPixel(uint32_t c) {
   }
 }
 
-void IRAM_ATTR BusManager::setPixelColor(uint16_t pix, uint32_t c, int16_t cct) {
+void IRAM_ATTR __attribute__((hot)) BusManager::setPixelColor(uint16_t pix, uint32_t c, int16_t cct) {
   if ((pix >= laststart) && (pix < lastend ) && (lastBus != nullptr)) {
     // WLEDMM same bus as last time - no need to search again
     lastBus->setPixelColor(pix - laststart, c);
@@ -851,7 +851,7 @@ void BusManager::setBrightness(uint8_t b, bool immediate) {
   }
 }
 
-void BusManager::setSegmentCCT(int16_t cct, bool allowWBCorrection) {
+void __attribute__((cold)) BusManager::setSegmentCCT(int16_t cct, bool allowWBCorrection) {
   if (cct > 255) cct = 255;
   if (cct >= 0) {
     //if white balance correction allowed, save as kelvin value instead of 0-255
@@ -860,7 +860,7 @@ void BusManager::setSegmentCCT(int16_t cct, bool allowWBCorrection) {
   Bus::setCCT(cct);
 }
 
-uint32_t IRAM_ATTR BusManager::getPixelColor(uint_fast16_t pix) {     // WLEDMM use fast native types, IRAM_ATTR
+uint32_t IRAM_ATTR  __attribute__((hot)) BusManager::getPixelColor(uint_fast16_t pix) {     // WLEDMM use fast native types, IRAM_ATTR
   if ((pix >= laststart) && (pix < lastend ) && (lastBus != nullptr)) {
     // WLEDMM same bus as last time - no need to search again
     return lastBus->getPixelColor(pix - laststart);
@@ -881,20 +881,20 @@ uint32_t IRAM_ATTR BusManager::getPixelColor(uint_fast16_t pix) {     // WLEDMM
   return 0;
 }
 
-bool BusManager::canAllShow() {
+bool BusManager::canAllShow() const {
   for (uint8_t i = 0; i < numBusses; i++) {
     if (!busses[i]->canShow()) return false;
   }
   return true;
 }
 
-Bus* BusManager::getBus(uint8_t busNr) {
+Bus* BusManager::getBus(uint8_t busNr) const {
   if (busNr >= numBusses) return nullptr;
   return busses[busNr];
 }
 
 //semi-duplicate of strip.getLengthTotal() (though that just returns strip._length, calculated in finalizeInit())
-uint16_t BusManager::getTotalLength() {
+uint16_t BusManager::getTotalLength() const {
   uint_fast16_t len = 0;
   for (uint_fast8_t i=0; i<numBusses; i++) len += busses[i]->getLength();      // WLEDMM use fast native types
   return len;
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 40fc0061..18337026 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -113,35 +113,35 @@ class Bus {
     virtual bool     canShow() { return true; }
     virtual void     setStatusPixel(uint32_t c) {}
     virtual void     setPixelColor(uint16_t pix, uint32_t c) = 0;
-    virtual uint32_t getPixelColor(uint16_t pix) { return 0; }
+    virtual uint32_t getPixelColor(uint16_t pix) const { return 0; }
     virtual void     setBrightness(uint8_t b, bool immediate=false) { _bri = b; };
     virtual void     cleanup() = 0;
-    virtual uint8_t  getPins(uint8_t* pinArray) { return 0; }
-    virtual uint16_t getLength() { return _len; }
+    virtual uint8_t  getPins(uint8_t* pinArray) const { return 0; }
+    virtual uint16_t getLength() const { return _len; }
     virtual void     setColorOrder() {}
-    virtual uint8_t  getColorOrder() { return COL_ORDER_RGB; }
+    virtual uint8_t  getColorOrder() const { return COL_ORDER_RGB; }
     virtual uint8_t  skippedLeds() { return 0; }
-    virtual uint16_t getFrequency() { return 0U; }
-    inline  uint16_t getStart() { return _start; }
+    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() { return _type; }
-    inline  bool     isOk() { return _valid; }
-    inline  bool     isOffRefreshRequired() { return _needsRefresh; }
-            bool     containsPixel(uint16_t pix) { return pix >= _start && pix < _start+_len; }
-    virtual uint16_t getMaxPixels() { return MAX_LEDS_PER_BUS; };
+    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; };
 
-    virtual bool hasRGB() {
+    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;
       return true;
     }
-    virtual bool hasWhite() { return Bus::hasWhite(_type); }
+    virtual bool hasWhite() const { return Bus::hasWhite(_type); }
     static  bool hasWhite(uint8_t type) {
       if ((type >= TYPE_WS2812_1CH && type <= TYPE_WS2812_WWA) || type == TYPE_SK6812_RGBW || type == TYPE_TM1814 || type == TYPE_UCS8904) return true; // digital types with white channel
       if (type > TYPE_ONOFF && type <= TYPE_ANALOG_5CH && type != TYPE_ANALOG_3CH) return true; // analog types with white channel
       if (type == TYPE_NET_DDP_RGBW) return true; // network types with white channel
       return false;
     }
-    virtual bool hasCCT() {
+    virtual bool hasCCT() const {
       if (_type == TYPE_WS2812_2CH_X3 || _type == TYPE_WS2812_WWA ||
           _type == TYPE_ANALOG_2CH    || _type == TYPE_ANALOG_5CH) return true;
       return false;
@@ -158,7 +158,7 @@ class Bus {
       #endif
     }
     inline        void    setAutoWhiteMode(uint8_t m) { if (m < 5) _autoWhiteMode = m; }
-    inline        uint8_t getAutoWhiteMode()          { return _autoWhiteMode; }
+    inline        uint8_t getAutoWhiteMode()          const { return _autoWhiteMode; }
     inline static void    setGlobalAWMode(uint8_t m)  { if (m < 5) _gAWM = m; else _gAWM = AW_GLOBAL_DISABLED; }
     inline static uint8_t getGlobalAWMode()           { return _gAWM; }
 
@@ -176,7 +176,7 @@ class Bus {
     static int16_t _cct;
     static uint8_t _cctBlend;
 
-    uint32_t autoWhiteCalc(uint32_t c);
+    uint32_t autoWhiteCalc(uint32_t c) const;
 };
 
 
@@ -186,7 +186,7 @@ class BusDigital : public Bus {
 
     inline void show();
 
-    bool canShow();
+    bool canShow() const;
 
     void setBrightness(uint8_t b, bool immediate);
 
@@ -194,25 +194,25 @@ class BusDigital : public Bus {
 
     void setPixelColor(uint16_t pix, uint32_t c);
 
-    uint32_t getPixelColor(uint16_t pix);
+    uint32_t getPixelColor(uint16_t pix) const;
 
-    uint8_t getColorOrder() {
+    uint8_t getColorOrder() const {
       return _colorOrder;
     }
 
-    uint16_t getLength() {
+    uint16_t getLength() const {
       return _len - _skip;
     }
 
-    uint8_t getPins(uint8_t* pinArray);
+    uint8_t getPins(uint8_t* pinArray) const;
 
     void setColorOrder(uint8_t colorOrder);
 
-    uint8_t skippedLeds() {
+    uint8_t skippedLeds() const {
       return _skip;
     }
 
-    uint16_t getFrequency() { return _frequencykHz; }
+    uint16_t getFrequency() const { return _frequencykHz; }
 
     void reinit();
 
@@ -240,13 +240,13 @@ class BusPwm : public Bus {
     void setPixelColor(uint16_t pix, uint32_t c);
 
     //does no index check
-    uint32_t getPixelColor(uint16_t pix);
+    uint32_t getPixelColor(uint16_t pix) const;
 
     void show();
 
-    uint8_t getPins(uint8_t* pinArray);
+    uint8_t getPins(uint8_t* pinArray) const;
 
-    uint16_t getFrequency() { return _frequency; }
+    uint16_t getFrequency() const { return _frequency; }
 
     void cleanup() {
       deallocatePins();
@@ -274,11 +274,11 @@ class BusOnOff : public Bus {
 
     void setPixelColor(uint16_t pix, uint32_t c);
 
-    uint32_t getPixelColor(uint16_t pix);
+    uint32_t getPixelColor(uint16_t pix) const;
 
     void show();
 
-    uint8_t getPins(uint8_t* pinArray);
+    uint8_t getPins(uint8_t* pinArray)  const;
 
     void cleanup() {
       pinManager.deallocatePin(_pin, PinOwner::BusOnOff);
@@ -298,24 +298,24 @@ class BusNetwork : public Bus {
   public:
     BusNetwork(BusConfig &bc);
 
-    uint16_t getMaxPixels() override { return 4096; };
-    bool hasRGB() { return true; }
-    bool hasWhite() { return _rgbw; }
+    uint16_t getMaxPixels() const override { return 4096; };
+    bool hasRGB()  const { return true; }
+    bool hasWhite()  const { return _rgbw; }
 
     void setPixelColor(uint16_t pix, uint32_t c);
 
-    uint32_t __attribute__((pure)) getPixelColor(uint16_t pix);  // WLEDMM attribute added
+    uint32_t __attribute__((pure)) getPixelColor(uint16_t pix) const;  // WLEDMM attribute added
 
     void show();
 
-    bool canShow() {
+    bool canShow()  const {
       // this should be a return value from UDP routine if it is still sending data out
       return !_broadcastLock;
     }
 
-    uint8_t getPins(uint8_t* pinArray);
+    uint8_t getPins(uint8_t* pinArray)  const;
 
-    uint16_t getLength() {
+    uint16_t getLength()  const {
       return _len;
     }
 
@@ -339,10 +339,10 @@ class BusHub75Matrix : public Bus {
   public:
     BusHub75Matrix(BusConfig &bc);
 
-    uint16_t getMaxPixels() override { return 4096; };
+    uint16_t getMaxPixels() const override { return 4096; };
 
-    bool hasRGB() { return true; }
-    bool hasWhite() { return false; }
+    bool hasRGB() const { return true; }
+    bool hasWhite() const { return false; }
 
     void setPixelColor(uint16_t pix, uint32_t c);
 
@@ -356,7 +356,7 @@ class BusHub75Matrix : public Bus {
 
     void setBrightness(uint8_t b, bool immediate);
 
-    uint8_t getPins(uint8_t* pinArray) {
+    uint8_t getPins(uint8_t* pinArray) const {
       pinArray[0] = mxconfig.chain_length;
       return 1;
     } // Fake value due to keep finaliseInit happy
@@ -388,7 +388,7 @@ class BusManager {
     BusManager() {};
 
     //utility to get the approx. memory usage of a given BusConfig
-    static uint32_t memUsage(BusConfig &bc);
+    static uint32_t memUsage(BusConfig &bc)  __attribute__((pure));
 
     int add(BusConfig &bc);
 
@@ -407,12 +407,12 @@ class BusManager {
 
     uint32_t __attribute__((pure)) getPixelColor(uint_fast16_t pix); // WLEDMM attribute added
 
-    bool canAllShow();
+    bool canAllShow() const;
 
-    Bus* getBus(uint8_t busNr);
+    Bus* getBus(uint8_t busNr) const;
 
     //semi-duplicate of strip.getLengthTotal() (though that just returns strip._length, calculated in finalizeInit())
-    uint16_t getTotalLength();
+    uint16_t getTotalLength() const;
 
     inline void updateColorOrderMap(const ColorOrderMap &com) {
       memcpy(&colorOrderMap, &com, sizeof(ColorOrderMap));
@@ -422,7 +422,7 @@ class BusManager {
       return colorOrderMap;
     }
 
-    inline uint8_t getNumBusses() {
+    inline uint8_t getNumBusses() const {
       return numBusses;
     }
 
@@ -435,7 +435,7 @@ class BusManager {
     unsigned laststart = 0;
     unsigned lastend = 0;
 
-    inline uint8_t getNumVirtualBusses() {
+    inline uint8_t getNumVirtualBusses() const {
       int j = 0;
       for (int i=0; i<numBusses; i++) if (busses[i]->getType() >= TYPE_NET_DDP_RGB && busses[i]->getType() < 96) j++;
       return j;
diff --git a/wled00/colors.cpp b/wled00/colors.cpp
index f7751861..23cf2f13 100644
--- a/wled00/colors.cpp
+++ b/wled00/colors.cpp
@@ -7,7 +7,7 @@
 /*
  * color blend function
  */
-IRAM_ATTR_YN uint32_t color_blend(uint32_t color1, uint32_t color2, uint_fast16_t blend, bool b16) {
+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
   const uint_fast16_t blendmax = b16 ? 0xFFFF : 0xFF;
@@ -71,7 +71,7 @@ IRAM_ATTR_YN uint32_t color_add(uint32_t c1, uint32_t c2, bool fast)   // WLEDMM
  * if using "video" method the resulting color will never become black unless it is already black
  */
 
-IRAM_ATTR_YN uint32_t color_fade(uint32_t c1, uint8_t amount, bool video)
+IRAM_ATTR_YN __attribute__((hot)) uint32_t color_fade(uint32_t c1, uint8_t amount, bool video)
 {
   if (amount == 0) return 0; // WLEDMM shortcut
 
@@ -297,7 +297,7 @@ static float maxf (float v, float w)  // WLEDMM better use standard library fmax
 
 // adjust RGB values based on color temperature in K (range [2800-10200]) (https://en.wikipedia.org/wiki/Color_balance)
 // called from bus manager when color correction is enabled!
-uint32_t IRAM_ATTR_YN colorBalanceFromKelvin(uint16_t kelvin, uint32_t rgb)  // WLEDMM: IRAM_ATTR_YN
+uint32_t __attribute__((hot)) IRAM_ATTR_YN colorBalanceFromKelvin(uint16_t kelvin, uint32_t rgb)  // WLEDMM: IRAM_ATTR_YN
 {
   //remember so that slow colorKtoRGB() doesn't have to run for every setPixelColor()
   static byte correctionRGB[4] = {0,0,0,0};
@@ -406,7 +406,7 @@ static void calcInvGammaTable(float gamma)
     gammaTinv[i] = (int)(powf((float)i / 255.0f, gammaInv) * 255.0f + 0.5f);
   }
 }
-uint8_t unGamma8(uint8_t value) {
+uint8_t __attribute__((hot)) unGamma8(uint8_t value) {
   //if (!gammaCorrectCol || (value == 0) || (value == 255)) return value;
   if ((value == 0) || (value == 255)) return value;
   if ((gammaCorrectVal < 0.999f) || (gammaCorrectVal > 3.0f)) return value;
@@ -414,7 +414,7 @@ uint8_t unGamma8(uint8_t value) {
   return gammaTinv[value];
 }
 
-uint32_t unGamma24(uint32_t c) {
+uint32_t __attribute__((hot)) unGamma24(uint32_t c) {
   if ((gammaCorrectVal < 0.999f) || (gammaCorrectVal > 3.0f)) return c;
   if (gammaTinv[255] == 0) calcInvGammaTable(gammaCorrectVal);
   return RGBW32(gammaTinv[R(c)], gammaTinv[G(c)], gammaTinv[B(c)], W(c));
@@ -438,13 +438,13 @@ void calcGammaTable(float gamma)
 }
 
 // used for individual channel or brightness gamma correction
-IRAM_ATTR_YN uint8_t gamma8(uint8_t b)   // WLEDMM added IRAM_ATTR_YN
+IRAM_ATTR_YN __attribute__((hot)) uint8_t gamma8(uint8_t b)   // WLEDMM added IRAM_ATTR_YN
 {
   return gammaT[b];
 }
 
 // used for color gamma correction
-uint32_t gamma32(uint32_t color)
+uint32_t __attribute__((hot)) gamma32(uint32_t color)
 {
   if (!gammaCorrectCol) return color;
   uint8_t w = W(color);
diff --git a/wled00/fcn_declare.h b/wled00/fcn_declare.h
index a0713d0f..09f9724b 100644
--- a/wled00/fcn_declare.h
+++ b/wled00/fcn_declare.h
@@ -250,7 +250,7 @@ void refreshNodeList();
 void sendSysInfoUDP();
 
 //network.cpp
-int getSignalQuality(int rssi);
+int getSignalQuality(int rssi) __attribute__((const));
 void WiFiEvent(WiFiEvent_t event);
 
 //um_manager.cpp
@@ -369,7 +369,7 @@ bool oappendi(int i);          // append new number to temp buffer efficiently
 void sappend(char stype, const char* key, int val);
 void sappends(char stype, const char* key, char* val);
 void prepareHostname(char* hostname);
-bool isAsterisksOnly(const char* str, byte maxLen);
+bool isAsterisksOnly(const char* str, byte maxLen)  __attribute__((pure));
 bool requestJSONBufferLock(uint8_t module=255);
 void releaseJSONBufferLock();
 uint8_t extractModeName(uint8_t mode, const char *src, char *dest, uint8_t maxLen);
@@ -410,13 +410,14 @@ void clearEEPROM();
 //wled_math.cpp
 #ifndef WLED_USE_REAL_MATH
   template <typename T> T atan_t(T x);
-  float cos_t(float phi);
-  float sin_t(float x);
-  float tan_t(float 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 floor_t(float x);
-  float fmod_t(float num, float denom);
+  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
diff --git a/wled00/led.cpp b/wled00/led.cpp
index 70863396..74520147 100644
--- a/wled00/led.cpp
+++ b/wled00/led.cpp
@@ -68,7 +68,7 @@ void toggleOnOff()
 
 
 //scales the brightness with the briMultiplier factor
-IRAM_ATTR_YN byte scaledBri(byte in)  // WLEDMM added IRAM_ATTR_YN
+IRAM_ATTR_YN __attribute__((hot)) byte scaledBri(byte in)  // WLEDMM added IRAM_ATTR_YN
 {
   if (briMultiplier == 100) return(in); // WLEDMM shortcut
   uint_fast16_t val = ((uint_fast16_t)in*(uint_fast16_t)briMultiplier)/100; // WLEDMM
diff --git a/wled00/pin_manager.cpp b/wled00/pin_manager.cpp
index a9c31bde..d1e7a18b 100644
--- a/wled00/pin_manager.cpp
+++ b/wled00/pin_manager.cpp
@@ -723,7 +723,7 @@ bool PinManagerClass::joinWire(int8_t pinSDA, int8_t pinSCL) {
  */
 
 // Check if supplied GPIO is ok to use
-bool PinManagerClass::isPinOk(byte gpio, bool output)
+bool PinManagerClass::isPinOk(byte gpio, bool output) const
 {
 #ifdef ESP32
   if (digitalPinIsValid(gpio)) {
@@ -757,7 +757,7 @@ bool PinManagerClass::isPinOk(byte gpio, bool output)
   return false;
 }
 
-PinOwner PinManagerClass::getPinOwner(byte gpio) {
+PinOwner PinManagerClass::getPinOwner(byte gpio) const {
   if (gpio >= WLED_NUM_PINS) return PinOwner::None; // catch error case, to avoid array out-of-bounds access
   if (!isPinOk(gpio, false)) return PinOwner::None;
   return ownerTag[gpio];
diff --git a/wled00/pin_manager.h b/wled00/pin_manager.h
index cb107f49..23d8d951 100644
--- a/wled00/pin_manager.h
+++ b/wled00/pin_manager.h
@@ -125,9 +125,9 @@ class PinManagerClass {
   // will return true for reserved pins
   bool isPinAllocated(byte gpio, PinOwner tag = PinOwner::None);
   // will return false for reserved pins
-  bool isPinOk(byte gpio, bool output = true);
+  bool isPinOk(byte gpio, bool output = true) const;
 
-  PinOwner getPinOwner(byte gpio);
+  PinOwner getPinOwner(byte gpio) const;
 
   // WLEDMM begin
   String getOwnerText(PinOwner tag); // WLEDMM  - return PIN owner tag as text
diff --git a/wled00/src/dependencies/time/TimeLib.h b/wled00/src/dependencies/time/TimeLib.h
index 5004f071..a4388a03 100644
--- a/wled00/src/dependencies/time/TimeLib.h
+++ b/wled00/src/dependencies/time/TimeLib.h
@@ -116,7 +116,7 @@ char* dayShortStr(uint8_t day);
 
 /* low level functions to convert to and from system time */
 void breakTime(time_t time, tmElements_t &tm);  // break time_t into elements
-time_t makeTime(tmElements_t &tm);  // convert time elements into time_t
+time_t makeTime(tmElements_t &tm) __attribute__((pure));  // convert time elements into time_t
 
 } // extern "C++"
 #endif // __cplusplus
diff --git a/wled00/wled.h b/wled00/wled.h
index 34667df1..1ea73805 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2408060
+#define VERSION 2408070
 
 // 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_
@@ -928,9 +928,9 @@ public:
   }
 
   // boot starts here
-  void setup();
+  void setup() __attribute__((used));
 
-  void loop();
+  void loop()  __attribute__((used));
   void reset();
 
   void beginStrip();
diff --git a/wled00/wled00.ino b/wled00/wled00.ino
index 056d8f28..b19441a2 100644
--- a/wled00/wled00.ino
+++ b/wled00/wled00.ino
@@ -61,6 +61,7 @@ void esp_heap_trace_free_hook(void* ptr)
 unsigned long lastMillis = 0; //WLEDMM
 unsigned long loopCounter = 0; //WLEDMM
 
+void setup() __attribute__((used)); // needed for -flto
 void setup() {
   #ifdef WLED_DEBUG_HEAP
   esp_err_t error = heap_caps_register_failed_alloc_callback(heap_caps_alloc_failed_hook);
@@ -68,6 +69,7 @@ void setup() {
   WLED::instance().setup();
 }
 
+void loop() __attribute__((used)); // needed for -flto
 void loop() {
   //WLEDMM show loops per second
   loopCounter++;

From b2844645c6c3d4d505dcfe3429d26c623c786f71 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 7 Aug 2024 16:53:25 +0200
Subject: [PATCH 136/200] pinwheel mapping XXL - no holes at 64x64

---
 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 8a9533cd..35ed815e 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -812,10 +812,13 @@ constexpr int Pinwheel_Size_Medium  = 32;      // larger than this -> use "Big"
 constexpr int Pinwheel_Steps_Big = 304;        // no holes up to 50x50
 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 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 int Fixed_Scale = 512;               // fixpoint scaling factor (9bit for fraction)
 
@@ -825,8 +828,9 @@ static float getPinwheelAngle(int i, int vW, int vH) {
   if (maxXY <= Pinwheel_Size_Small)  return float(i) * Int_to_Rad_Small;
   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;
   // else
-  return float(i) * Int_to_Rad_XL;
+  return float(i) * Int_to_Rad_XXL;
 }
 // Pinwheel helper function: matrix dimensions to number of rays
 static int getPinwheelLength(int vW, int vH) {
@@ -834,8 +838,9 @@ static int getPinwheelLength(int vW, int vH) {
   if (maxXY <= Pinwheel_Size_Small)  return Pinwheel_Steps_Small;
   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;
   // else
-  return Pinwheel_Steps_XL;
+  return Pinwheel_Steps_XXL;
 }
 #endif
 

From fb2402fb9766665f5f75d4a249791609c39b5ec5 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 7 Aug 2024 17:02:46 +0200
Subject: [PATCH 137/200] HUB75 optimization (double buffer only)

In double duffer mode, the screen is blanked at each show(). So we can drop setPixelColor(BLACK) calls until we receive a pixel with different color.
---
 wled00/bus_manager.cpp | 6 +++++-
 wled00/bus_manager.h   | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index c8e42c57..0f892f5f 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -503,7 +503,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
   _valid = false;
   mxconfig.double_buff = false; // default to off, known to cause issue with some effects but needs more memory
-
+  isBlack = false;
 
   fourScanPanel = nullptr;
 
@@ -671,6 +671,8 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   }
   else {
     _valid = true;
+    display->clearScreen();   // initially clear the screen buffer
+    isBlack = true;
   }
   
   switch(bc.type) {
@@ -700,6 +702,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
 void  __attribute__((hot)) BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c) {
   if (!_valid || pix >= _len) return;
+  if (isBlack && (c == BLACK)) return;  // reject black pixels directly after clearScreen()
 #ifndef NO_CIE1931
   c = unGamma24(c); // to use the driver linear brightness feature, we first need to undo WLED gamma correction
 #endif
@@ -719,6 +722,7 @@ void  __attribute__((hot)) BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t
     int y = pix / pxwidth;
     display->drawPixelRGB888(int16_t(x), int16_t(y), r, g, b);
   }
+  isBlack = false;
 }
 
 void BusHub75Matrix::setBrightness(uint8_t b, bool immediate) {
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 18337026..cfea2674 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -351,6 +351,7 @@ class BusHub75Matrix : public Bus {
         display->flipDMABuffer(); // Show the back buffer, set currently 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
+        isBlack = true;
       }
     }
 
@@ -369,6 +370,7 @@ class BusHub75Matrix : public Bus {
       // delete fourScanPanel;
       delete display;
       _valid = false;
+      isBlack = false;
     }
 
     ~BusHub75Matrix() {
@@ -379,6 +381,7 @@ class BusHub75Matrix : public Bus {
     MatrixPanel_I2S_DMA *display = nullptr;
     VirtualMatrixPanel  *fourScanPanel = nullptr;
     HUB75_I2S_CFG mxconfig;
+    bool isBlack = false;
     
 };
 #endif

From 6e415dfbbeedc968eb47b678c130e1d4782cc5bd Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Wed, 7 Aug 2024 18:31:06 +0200
Subject: [PATCH 138/200] HUB75 hack

HUB75 is very memory hungry - this hack deletes the mapping table when its not needed --> frees 8Kb with a 64x64 panel.
---
 wled00/FX_2Dfcn.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index e966381a..9660df63 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -171,6 +171,24 @@ void WS2812FX::setUpMatrix() {
       //WLEDMM: no resetSegments here, only do it in set.cpp/handleSettingsSet - as we want t0 maintain the segment settings after setup has changed
     }
   }
+
+#ifdef WLED_ENABLE_HUB75MATRIX
+  // softhack007 hack: delete mapping table in case it only contains "identity"
+  if (customMappingTable != nullptr && customMappingTableSize > 0) {
+    bool isIdentity = true;
+    for (size_t i = 0; (i< customMappingSize) && isIdentity; i++) { //WLEDMM use customMappingTableSize
+      if (customMappingTable[i] != (uint16_t)i ) isIdentity = false;
+    }
+    if (isIdentity) {
+      free(customMappingTable); customMappingTable = nullptr;      
+      USER_PRINTF("!setupmatrix: customMappingTable is not needed. Dropping %d bytes.\n", customMappingTableSize * sizeof(uint16_t));
+      customMappingTableSize = 0;
+      customMappingSize = 0;
+      loadedLedmap = 0; //WLEDMM
+    }
+  }
+#endif
+
 #else
   isMatrix = false; // no matter what config says
 #endif

From 90dd04887848803cee976239e9fe94d57fa5c22a Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 8 Aug 2024 17:41:05 +0200
Subject: [PATCH 139/200] revert fadeToBlackBy optimization

causes problems with overlay text (scrolling text)
---
 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 35ed815e..0f6eb6da 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -1473,7 +1473,8 @@ void __attribute__((hot)) Segment::fadeToBlackBy(uint8_t fadeBy) {
     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
       uint32_t cc2 = color_fade(cc, scaledown);                      // fade
-      if (cc2 != cc) setPixelColorXY((uint16_t)x, (uint16_t)y, cc2); // WLEDMM only re-paint if faded color is different
+      //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);
     }
   } else {
     for (uint_fast16_t x = 0; x < cols; x++) {

From c66a8af85cfa91055be56802d1eed8865683943e Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 8 Aug 2024 17:44:13 +0200
Subject: [PATCH 140/200] reduce WiFi disconnects

HUB75 is very heap-hungry - use a more relaxed metric for triggering "low heap emergency" actions
---
 wled00/wled.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index 171be5c7..dfc7e75c 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -1220,7 +1220,7 @@ void WLED::handleConnection()
   #ifdef ARDUINO_ARCH_ESP32 
   // reconnect WiFi to clear stale allocations if heap gets too low
   if ((!strip.isUpdating()) && (now - heapTime > 5000)) { // WLEDMM: updated with better logic for small heap available by block, not total. // WLEDMM trying to use a moment when the strip is idle
-#if defined(ARDUINO_ARCH_ESP32S2)
+#if defined(ARDUINO_ARCH_ESP32S2) || defined(WLED_ENABLE_HUB75MATRIX)
     uint32_t heap = ESP.getFreeHeap(); // WLEDMM works better on -S2
 #else
     uint32_t heap = heap_caps_get_largest_free_block(0x1800); // WLEDMM: This is a better metric for free heap.

From 5b7345ef39e9a22c5429457b9927b254284e3e22 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 8 Aug 2024 18:48:49 +0200
Subject: [PATCH 141/200] HUB75 refactoring

* move HUB75 implementation into bus_manager.cpp
* add "override" keyword
* include FastLED.h if not included previously
* move RGB macros into bus_manager.h
---
 wled00/bus_manager.cpp | 30 +++++++++++++++++++++---------
 wled00/bus_manager.h   | 42 +++++++++++++++++++++---------------------
 2 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 0f892f5f..8ba2c6ca 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -49,13 +49,6 @@ uint8_t realtimeBroadcast(uint8_t type, IPAddress client, uint16_t length, byte
 #include "wled.h"
 #endif
 
-//color mangling macros
-#define RGBW32(r,g,b,w) (uint32_t((byte(w) << 24) | (byte(r) << 16) | (byte(g) << 8) | (byte(b))))
-#define R(c) (byte((c) >> 16))
-#define G(c) (byte((c) >> 8))
-#define B(c) (byte(c))
-#define W(c) (byte((c) >> 24))
-
 
 void ColorOrderMap::add(uint16_t start, uint16_t len, uint8_t colorOrder) {
   if (_count >= WLED_MAX_COLOR_ORDER_MAPPINGS) {
@@ -696,11 +689,12 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
       break;
   }  
 
+  USER_PRINT(F("MatrixPanel_I2S_DMA "));
+  USER_PRINTF("%sstarted.\n", _valid? "":"not ");
 
-  USER_PRINTLN("MatrixPanel_I2S_DMA started");
 }
 
-void  __attribute__((hot)) BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c) {
+void __attribute__((hot)) BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c) {
   if (!_valid || pix >= _len) return;
   if (isBlack && (c == BLACK)) return;  // reject black pixels directly after clearScreen()
 #ifndef NO_CIE1931
@@ -729,6 +723,24 @@ void BusHub75Matrix::setBrightness(uint8_t b, bool immediate) {
   this->display->setBrightness(b);
 }
 
+void __attribute__((hot)) BusHub75Matrix::show(void) {
+  if(mxconfig.double_buff) {
+    display->flipDMABuffer(); // Show the back buffer, set currently 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
+    isBlack = true;
+  }
+}
+
+void BusHub75Matrix::cleanup() {
+  deallocatePins();
+  fourScanPanel = nullptr;
+  // delete fourScanPanel;
+  delete display;
+  _valid = false;
+  isBlack = false;
+}
+
 void BusHub75Matrix::deallocatePins() {
 
   pinManager.deallocatePin(mxconfig.gpio.r1, PinOwner::HUB75);
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index cfea2674..b85bf5a6 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -12,6 +12,20 @@
 
 #include "const.h"
 
+#if !defined(FASTLED_VERSION) // only pull in FastLED if we don't have it yet
+  #define FASTLED_INTERNAL
+  #include <FastLED.h>
+#endif
+
+//color mangling macros
+#if !defined(RGBW32)
+  #define RGBW32(r,g,b,w) (uint32_t((byte(w) << 24) | (byte(r) << 16) | (byte(g) << 8) | (byte(b))))
+  #define R(c) (byte((c) >> 16))
+  #define G(c) (byte((c) >> 8))
+  #define B(c) (byte(c))
+  #define W(c) (byte((c) >> 24))
+#endif
+
 #define GET_BIT(var,bit)    (((var)>>(bit))&0x01)
 #define SET_BIT(var,bit)    ((var)|=(uint16_t)(0x0001<<(bit)))
 #define UNSET_BIT(var,bit)  ((var)&=(~(uint16_t)(0x0001<<(bit))))
@@ -341,37 +355,23 @@ class BusHub75Matrix : public Bus {
 
     uint16_t getMaxPixels() const override { return 4096; };
 
-    bool hasRGB() const { return true; }
-    bool hasWhite() const { return false; }
+    bool hasRGB() const override { return true; }
+    bool hasWhite() const override { return false; }
 
-    void setPixelColor(uint16_t pix, uint32_t c);
+    void setPixelColor(uint16_t pix, uint32_t c) override;
 
-    void show() {
-      if(mxconfig.double_buff) {
-        display->flipDMABuffer(); // Show the back buffer, set currently 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
-        isBlack = true;
-      }
-    }
+    void show(void) override;
 
-    void setBrightness(uint8_t b, bool immediate);
+    void setBrightness(uint8_t b, bool immediate) override;
 
-    uint8_t getPins(uint8_t* pinArray) const {
+    uint8_t getPins(uint8_t* pinArray) const override {
       pinArray[0] = mxconfig.chain_length;
       return 1;
     } // Fake value due to keep finaliseInit happy
 
     void deallocatePins();
 
-    void cleanup() {
-      deallocatePins();
-      fourScanPanel = nullptr;
-      // delete fourScanPanel;
-      delete display;
-      _valid = false;
-      isBlack = false;
-    }
+    void cleanup(void) override;
 
     ~BusHub75Matrix() {
       cleanup();

From b5d97cca9399cebb0646f163f8acafe574525c65 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 8 Aug 2024 18:56:12 +0200
Subject: [PATCH 142/200] HUB75 leds buffer with dirty bit acceleration

Instead of using the memory-hungry driver double buffer, this implements a LEDS buffer inside the BusHub75Matrix class.
--> up to 50% faster
--> uses one "dirty" bit per pixel, to only re-transmit pixels that changed after the last "show"
---
 wled00/bus_manager.cpp | 145 ++++++++++++++++++++++++++++++++++-------
 wled00/bus_manager.h   |  11 +++-
 2 files changed, 133 insertions(+), 23 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 8ba2c6ca..8fb12639 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -9,6 +9,36 @@
 #include "bus_wrapper.h"
 #include "bus_manager.h"
 
+// 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
+    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
+    if (byteArray == nullptr) return;
+    size_t byteIndex = position / 8;
+    unsigned bitIndex = position % 8;
+    if (value)
+        byteArray[byteIndex] |= (1 << bitIndex); 
+    else
+        byteArray[byteIndex] &= ~(1 << bitIndex);
+}
+
+size_t getBitArrayBytes(size_t num_bits) { // number of bytes needed for an array with num_bits bits
+  return (num_bits + 7) / 8; 
+}
+
+void setBitArray(uint8_t* byteArray, size_t numBits, bool value) {  // set all bits to same value
+  if (byteArray == nullptr) return;
+  size_t len =  getBitArrayBytes(numBits);
+  if (value) memset(byteArray, 0xFF, len);
+  else memset(byteArray, 0x00, len);
+}
+
 //WLEDMM: #define DEBUGOUT(x) netDebugEnabled?NetDebug.print(x):Serial.print(x) not supported in this file as netDebugEnabled not in scope
 #if 0
 //colors.cpp
@@ -665,6 +695,16 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   else {
     _valid = true;
     display->clearScreen();   // initially clear the screen buffer
+
+    if (_ledBuffer) free(_ledBuffer);                 // should not happen
+    if (_ledsDirty) free(_ledsDirty);                 // should not happen
+    if(mxconfig.double_buff == false) {
+      _ledBuffer = (CRGB*) calloc(_len, sizeof(CRGB));  // create LEDs buffer (initialized to BLACK)
+      _ledsDirty = (byte*) malloc(getBitArrayBytes(_len));  // create LEDs dirty bits
+      //_ledsDirty = nullptr;
+      setBitArray(_ledsDirty, _len, false);             // reset dirty bits
+    }
+
     isBlack = true;
   }
   
@@ -692,31 +732,58 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   USER_PRINT(F("MatrixPanel_I2S_DMA "));
   USER_PRINTF("%sstarted.\n", _valid? "":"not ");
 
+  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)) {
+    USER_PRINT(F("MatrixPanel_I2S_DMA LEDS buffer uses "));
+    USER_PRINT((_ledBuffer? _len*sizeof(CRGB) :0) + (_ledsDirty? getBitArrayBytes(_len) :0));
+    USER_PRINTLN(F(" bytes."));
+  }
 }
 
 void __attribute__((hot)) BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c) {
   if (!_valid || pix >= _len) return;
-  if (isBlack && (c == BLACK)) return;  // reject black pixels directly after clearScreen()
-#ifndef NO_CIE1931
-  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);
+  // if (_cct >= 1900) c = colorBalanceFromKelvin(_cct, c); //color correction from CCT
 
-  if(fourScanPanel != nullptr) {
-    int pxwidth = fourScanPanel->width();
-    int x = pix % pxwidth;
-    int y = pix / pxwidth;
-    fourScanPanel->drawPixelRGB888(int16_t(x), int16_t(y), r, g, b);
+  if (_ledBuffer) {
+    CRGB fastled_col = CRGB(c);
+    if (_ledBuffer[pix] != fastled_col) {
+      _ledBuffer[pix] = fastled_col;
+      setBitInArray(_ledsDirty, pix, true);  // flag pixel as "dirty"
+      isBlack = false;
+    }
   }
   else {
-    int pxwidth = display->width();
-    int x = pix % pxwidth;
-    int y = pix / pxwidth;
-    display->drawPixelRGB888(int16_t(x), int16_t(y), r, g, b);
+    //if (isBlack && (c == BLACK)) return;  // reject black pixels directly after clearScreen()
+    #ifndef NO_CIE1931
+    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);
+
+    if(fourScanPanel != nullptr) {
+      unsigned width = fourScanPanel->width();
+      int x = pix % width;
+      int y = pix / width;
+      fourScanPanel->drawPixelRGB888(int16_t(x), int16_t(y), r, g, b);
+    } else {
+      unsigned width = display->width();
+      int x = pix % width;
+      int y = pix / width;
+      display->drawPixelRGB888(int16_t(x), int16_t(y), r, g, b);
+    }
+    isBlack = false;
   }
-  isBlack = false;
+}
+
+uint32_t BusHub75Matrix::getPixelColor(uint16_t pix) const {
+  if (!_valid || pix >= _len) return BLACK;
+  if (_ledBuffer)
+    return uint32_t(_ledBuffer[pix]) & 0x00FFFFFF;
+  else
+    return BLACK;
 }
 
 void BusHub75Matrix::setBrightness(uint8_t b, bool immediate) {
@@ -724,8 +791,36 @@ void BusHub75Matrix::setBrightness(uint8_t b, bool immediate) {
 }
 
 void __attribute__((hot)) BusHub75Matrix::show(void) {
+  if (!_valid) return;
+  if (_ledBuffer) {
+    // write out buffered LEDs
+    bool haveDirtyBits = (_ledsDirty != nullptr);
+    bool isFourScan = (fourScanPanel != nullptr);
+    unsigned width  = isFourScan ? fourScanPanel->width()  : display->width();
+    unsigned height = isFourScan ? fourScanPanel->height() : display->height();
+
+    //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 ( !haveDirtyBits || (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
+        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);
+        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);
+      }
+      pix ++;
+    }
+    if (haveDirtyBits) setBitArray(_ledsDirty, _len, false);  // reset dirty bits
+  }
+
   if(mxconfig.double_buff) {
-    display->flipDMABuffer(); // Show the back buffer, set currently output buffer to the back (i.e. no longer being sent to LED panels)
+    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
     isBlack = true;
@@ -733,12 +828,18 @@ void __attribute__((hot)) BusHub75Matrix::show(void) {
 }
 
 void BusHub75Matrix::cleanup() {
-  deallocatePins();
-  fourScanPanel = nullptr;
-  // delete fourScanPanel;
-  delete display;
+  if (display && _valid) display->stopDMAoutput();  // terminate DMA driver (display goes black)
   _valid = false;
+  deallocatePins();
+  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;
+  display = nullptr;
+  fourScanPanel = nullptr;
   isBlack = false;
+  if (_ledBuffer != nullptr) free(_ledBuffer); _ledBuffer = nullptr;
+  if (_ledsDirty != nullptr) free(_ledsDirty); _ledsDirty = nullptr;      
 }
 
 void BusHub75Matrix::deallocatePins() {
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index b85bf5a6..93d5eb46 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -26,6 +26,13 @@
   #define W(c) (byte((c) >> 24))
 #endif
 
+// WLEDMM bitarray utilities
+void setBitInArray(uint8_t* byteArray, size_t position, bool value);  // set bit
+bool getBitFromArray(const uint8_t* byteArray, size_t position)  __attribute__((pure)); // get bit value
+size_t getBitArrayBytes(size_t num_bits) __attribute__((const)); // number of bytes needed for an array with num_bits bits
+void setBitArray(uint8_t* byteArray, size_t numBits, bool value);  // set all bits to same value
+
+
 #define GET_BIT(var,bit)    (((var)>>(bit))&0x01)
 #define SET_BIT(var,bit)    ((var)|=(uint16_t)(0x0001<<(bit)))
 #define UNSET_BIT(var,bit)  ((var)&=(~(uint16_t)(0x0001<<(bit))))
@@ -359,6 +366,7 @@ class BusHub75Matrix : public Bus {
     bool hasWhite() const override { return false; }
 
     void setPixelColor(uint16_t pix, uint32_t c) override;
+    uint32_t getPixelColor(uint16_t pix) const override;
 
     void show(void) override;
 
@@ -382,7 +390,8 @@ class BusHub75Matrix : public Bus {
     VirtualMatrixPanel  *fourScanPanel = nullptr;
     HUB75_I2S_CFG mxconfig;
     bool isBlack = false;
-    
+    CRGB *_ledBuffer = nullptr;
+    byte *_ledsDirty = nullptr;
 };
 #endif
 

From 1b098b9863b823cedc74eb0be33ec6dae8690fd4 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 8 Aug 2024 19:00:19 +0200
Subject: [PATCH 143/200] fixie

---
 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 8fb12639..183c89b8 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -755,7 +755,7 @@ void __attribute__((hot)) BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c
     }
   }
   else {
-    //if (isBlack && (c == BLACK)) return;  // reject black pixels directly after clearScreen()
+    if (isBlack && (c == BLACK)) return;  // reject black pixels directly after clearScreen()
     #ifndef NO_CIE1931
     c = unGamma24(c); // to use the driver linear brightness feature, we first need to undo WLED gamma correction
     #endif

From bad923570bc18a5bd9386375d535a8fe08ab8dd7 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 8 Aug 2024 19:04:10 +0200
Subject: [PATCH 144/200] double buffer off (MatrixPortal S3)

`mxconfig.double_buff = true` should not be necessary any more.
---
 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 183c89b8..08743552 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -570,7 +570,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
   USER_PRINTLN("MatrixPanel_I2S_DMA - Matrix Portal S3 config");
 
-  mxconfig.double_buff = true; // <------------- Turn on double buffer
+  //mxconfig.double_buff = true; // <------------- Turn on double buffer
 
   mxconfig.gpio.r1 = 42;
   mxconfig.gpio.g1 = 41;

From f8154a8c7870a06a12edefdf9137e9da7f40c250 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 8 Aug 2024 19:08:34 +0200
Subject: [PATCH 145/200] Update wled.h - build 2408080

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

diff --git a/wled00/wled.h b/wled00/wled.h
index 1ea73805..c1f56732 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2408070
+#define VERSION 2408080
 
 // 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 56e72ef22db4de414ae7bcf7dbf14d3a408ad1e7 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 8 Aug 2024 20:57:15 +0200
Subject: [PATCH 146/200] HUB75 live preview

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

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 08743552..ced434a4 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -695,6 +695,8 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   else {
     _valid = true;
     display->clearScreen();   // initially clear the screen buffer
+    display->setBrightness8(127);    // range is 0-255, 0 - 0%, 255 - 100%
+    _bri = 127;
 
     if (_ledBuffer) free(_ledBuffer);                 // should not happen
     if (_ledsDirty) free(_ledsDirty);                 // should not happen
@@ -781,13 +783,14 @@ 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]) & 0x00FFFFFF;
+    return uint32_t(_ledBuffer[pix].scale8(_bri)) & 0x00FFFFFF;  // scale8() is needed to mimic NeoPixelBus, which returns scaled-down colours
   else
     return BLACK;
 }
 
 void BusHub75Matrix::setBrightness(uint8_t b, bool immediate) {
   this->display->setBrightness(b);
+  _bri = b;
 }
 
 void __attribute__((hot)) BusHub75Matrix::show(void) {

From 28db9bfcfdb161b952fb9a1ece0c751e56f8f6c7 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 8 Aug 2024 22:03:49 +0200
Subject: [PATCH 147/200] waverly effect speedup

* faster math
* limit height to visible area
---
 wled00/FX.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index a9bfccbb..0f6653bd 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -6667,13 +6667,19 @@ uint16_t mode_2DWaverly(void) {
 
   long t = strip.now / 2;
   for (int i = 0; i < cols; i++) {
-    uint16_t thisVal = volumeSmth*SEGMENT.intensity/64 * inoise8(i * 45 , t , t)/64;      // WLEDMM back to SR code
-    uint16_t thisMax = map(thisVal, 0, 512, 0, rows);
+    //uint16_t thisVal = volumeSmth*SEGMENT.intensity/64 * inoise8(i * 45 , t , t)/64;      // WLEDMM back to SR code
+    unsigned thisVal = unsigned(volumeSmth*SEGMENT.intensity) * inoise8(i * 45 , t , t) / (64*64);      // WLEDMM same result but more accurate
 
-    for (int j = 0; j < thisMax; j++) {
+    //int thisMax = map(thisVal, 0, 512, 0, rows);
+    int thisMax = (thisVal * rows) / 512;     // WLEDMM same result, just faster
+    int thisMax2 = min(int(rows), thisMax);   // WLEDMM limit height to visible are
+
+    for (int j = 0; j < thisMax2; j++) {
+      //int jmap = map(j, 0, thisMax, 250, 0); 
+      int jmap = 250 - ((j * 250) / thisMax);    // WLEDMM same result, just faster
       if (!SEGENV.check1)
-        SEGMENT.addPixelColorXY(i, j, ColorFromPalette(SEGPALETTE, map(j, 0, thisMax, 250, 0), 255, LINEARBLEND));
-      SEGMENT.addPixelColorXY((cols - 1) - i, (rows - 1) - j, ColorFromPalette(SEGPALETTE, map(j, 0, thisMax, 250, 0), 255, LINEARBLEND));
+        SEGMENT.addPixelColorXY(i, j, ColorFromPalette(SEGPALETTE, jmap, 255, LINEARBLEND));
+      SEGMENT.addPixelColorXY((cols - 1) - i, (rows - 1) - j, ColorFromPalette(SEGPALETTE, jmap, 255, LINEARBLEND));
     }
   }
   SEGMENT.blur(16);

From d00b3147b463a3471ed18bb11970ad908c140943 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 8 Aug 2024 22:28:14 +0200
Subject: [PATCH 148/200] Waverly: better slider names

Slider names were misleading.
First slider: fade speed (low values means longer hold times)
Second slider: signal gain (i.e. amplification)
---
 wled00/FX.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 0f6653bd..a541983e 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -6686,7 +6686,7 @@ uint16_t mode_2DWaverly(void) {
 
   return FRAMETIME;
 } // mode_2DWaverly()
-static const char _data_FX_MODE_2DWAVERLY[] PROGMEM = "Waverly ☾@Amplification,Sensitivity,,,,No Clouds,Sound Pressure,AGC debug;;!;2v;ix=64,si=0"; // Beatsin
+static const char _data_FX_MODE_2DWAVERLY[] PROGMEM = "Waverly ☾@Fade Rate,Amplification,,,,No Clouds,Sound Pressure,AGC debug;;!;2v;ix=64,si=0"; // Beatsin
 
 #endif // WLED_DISABLE_2D
 

From 89412b999d74288cc6b5ecd1ddbfd5d2aa478c0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Kristan?= <blaz@kristan-sp.si>
Date: Mon, 29 Jul 2024 07:31:33 +0200
Subject: [PATCH 149/200] Merge pull request #4078 from
 apanteleev/fire-blur-control

Add a parameter for blur amount in the Fire 2012 effect
---
 wled00/FX.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index a541983e..bffcc455 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -2156,14 +2156,17 @@ uint16_t mode_fire_2012() {
   for (int stripNr=0; stripNr<strips; stripNr++)
     virtualStrip::runStrip(stripNr, &heat[stripNr * SEGLEN], it);
 
-  if (SEGMENT.is2D()) SEGMENT.blur(32);
+  if (SEGMENT.is2D()) {
+    uint8_t blurAmount = SEGMENT.custom2 >> 2;
+    SEGMENT.blur(blurAmount);
+  }
 
   if (it != SEGENV.step)
     SEGENV.step = it;
 
   return FRAMETIME;
 }
-static const char _data_FX_MODE_FIRE_2012[] PROGMEM = "Fire 2012@Cooling,Spark rate,,,Boost;;!;1.5d;sx=64,ix=160,m12=1"; // bars WLEDMM 1.5d, 
+static const char _data_FX_MODE_FIRE_2012[] PROGMEM = "Fire 2012@Cooling,Spark rate,,2D Blur,Boost;;!;1.5d;sx=64,ix=160,c2=128,m12=1"; // bars WLEDMM 1.5d, 
 
 
 // ColorWavesWithPalettes by Mark Kriegsman: https://gist.github.com/kriegsman/8281905786e8b2632aeb

From a44aa92c753013e28b01fa826608d2b1e14f6e44 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 9 Aug 2024 12:53:41 +0200
Subject: [PATCH 150/200] playing with Fire2012

* speedup: add functions to only blur rows or columns (50% faster)

* fire2012: tinkering with bur options. Vertical blur only when slider < 64 (faster); extra blur for  slider values >192 (bush burn)
---
 wled00/FX.cpp |  6 ++++--
 wled00/FX.h   | 10 ++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index bffcc455..3d00dbb8 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -2148,7 +2148,7 @@ uint16_t mode_fire_2012() {
 
       // Step 4.  Map from heat cells to LED colors
       for (int j = 0; j < SEGLEN; j++) {
-        SEGMENT.setPixelColor(indexToVStrip(j, stripNr), ColorFromPalette(SEGPALETTE, min(heat[j],byte(240)), 255, NOBLEND));
+        SEGMENT.setPixelColor(indexToVStrip(j, stripNr), ColorFromPalette(SEGPALETTE, min(heat[j], byte(240)), 255, NOBLEND));
       }
     }
   };
@@ -2158,7 +2158,9 @@ uint16_t mode_fire_2012() {
 
   if (SEGMENT.is2D()) {
     uint8_t blurAmount = SEGMENT.custom2 >> 2;
-    SEGMENT.blur(blurAmount);
+    if (blurAmount > 48) blurAmount += blurAmount-48;             // extra blur when slider > 192  (bush burn)
+    if (blurAmount < 16) SEGMENT.blurCols(SEGMENT.custom2 >> 1);  // no side-burn when slider < 64 (faster)
+    else SEGMENT.blur(blurAmount);
   }
 
   if (it != SEGENV.step)
diff --git a/wled00/FX.h b/wled00/FX.h
index 387b9e55..b61cdf72 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -656,6 +656,16 @@ typedef struct Segment {
 	  uint32_t __attribute__((pure)) color_from_palette(uint_fast16_t, bool mapping, bool wrap, uint8_t mcol, uint8_t pbri = 255);
     uint32_t __attribute__((pure)) color_wheel(uint8_t pos);
 
+    // 2D Blur: shortcuts for bluring columns or rows only (50% faster than full 2D blur)
+    inline void blurCols(fract8 blur_amount, bool smear = false) { // blur all columns
+      const unsigned cols = virtualWidth();
+      for (unsigned k = 0; k < cols; k++) blurCol(k, blur_amount, smear); 
+    }
+    inline void blurRows(fract8 blur_amount, bool smear = false) { // blur all rows
+      const unsigned rows = virtualHeight();
+      for ( unsigned i = 0; i < rows; i++) blurRow(i, blur_amount, smear); 
+    }
+
     // 2D matrix
 #ifndef WLEDMM_FASTPATH
     inline uint16_t virtualWidth() const {  // WLEDMM use fast types, and make function inline

From 2934739ebf3156eb69b4471adadd61d2cee52bd2 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 9 Aug 2024 17:46:14 +0200
Subject: [PATCH 151/200] HUB75 cleanup, double buffer improvement

* code cleanup, removing some unneeded sanity checks
* use dirty bits in double buffer mode, too -> only not-black pixels are drawn into the back-buffer (20%-30% faster)
---
 wled00/bus_manager.cpp | 39 +++++++++++++++++++++------------------
 wled00/bus_manager.h   |  1 -
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index ced434a4..f5ecb5d6 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -19,7 +19,7 @@ bool getBitFromArray(const uint8_t* byteArray, size_t position) { // get bit val
 }
 
 void setBitInArray(uint8_t* byteArray, size_t position, bool value) {  // set bit - with error handling for nullptr
-    if (byteArray == nullptr) return;
+    //if (byteArray == nullptr) return;
     size_t byteIndex = position / 8;
     unsigned bitIndex = position % 8;
     if (value)
@@ -526,7 +526,6 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
   _valid = false;
   mxconfig.double_buff = false; // default to off, known to cause issue with some effects but needs more memory
-  isBlack = false;
 
   fourScanPanel = nullptr;
 
@@ -700,14 +699,20 @@ 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(mxconfig.double_buff == false) {
-      _ledBuffer = (CRGB*) calloc(_len, sizeof(CRGB));  // create LEDs buffer (initialized to BLACK)
-      _ledsDirty = (byte*) malloc(getBitArrayBytes(_len));  // create LEDs dirty bits
-      //_ledsDirty = nullptr;
-      setBitArray(_ledsDirty, _len, false);             // reset dirty bits
-    }
+    _ledsDirty = (byte*) malloc(getBitArrayBytes(_len));  // create LEDs dirty bits
 
-    isBlack = true;
+    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!"));
+      return;  //  fail is we cannot get memory for the buffer
+    }
+    setBitArray(_ledsDirty, _len, false);             // reset dirty bits
+
+    if (mxconfig.double_buff == false) {
+      _ledBuffer = (CRGB*) calloc(_len, sizeof(CRGB));  // create LEDs buffer (initialized to BLACK)
+    }
   }
   
   switch(bc.type) {
@@ -753,11 +758,12 @@ void __attribute__((hot)) BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c
     if (_ledBuffer[pix] != fastled_col) {
       _ledBuffer[pix] = fastled_col;
       setBitInArray(_ledsDirty, pix, true);  // flag pixel as "dirty"
-      isBlack = false;
     }
   }
   else {
-    if (isBlack && (c == BLACK)) return;  // reject black pixels directly after clearScreen()
+    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"
+
     #ifndef NO_CIE1931
     c = unGamma24(c); // to use the driver linear brightness feature, we first need to undo WLED gamma correction
     #endif
@@ -776,7 +782,6 @@ void __attribute__((hot)) BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c
       int y = pix / width;
       display->drawPixelRGB888(int16_t(x), int16_t(y), r, g, b);
     }
-    isBlack = false;
   }
 }
 
@@ -785,7 +790,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 BLACK;
+    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) {
@@ -797,7 +802,6 @@ void __attribute__((hot)) BusHub75Matrix::show(void) {
   if (!_valid) return;
   if (_ledBuffer) {
     // write out buffered LEDs
-    bool haveDirtyBits = (_ledsDirty != nullptr);
     bool isFourScan = (fourScanPanel != nullptr);
     unsigned width  = isFourScan ? fourScanPanel->width()  : display->width();
     unsigned height = isFourScan ? fourScanPanel->height() : display->height();
@@ -806,7 +810,7 @@ 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 ( !haveDirtyBits || (getBitFromArray(_ledsDirty, pix) == true)) {  // only repaint the "dirty"  pixels
+      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
         c = unGamma24(c); // to use the driver linear brightness feature, we first need to undo WLED gamma correction
@@ -819,14 +823,14 @@ void __attribute__((hot)) BusHub75Matrix::show(void) {
       }
       pix ++;
     }
-    if (haveDirtyBits) setBitArray(_ledsDirty, _len, false);  // reset dirty bits
+    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
-    isBlack = true;
+    setBitArray(_ledsDirty, _len, false);  // dislay buffer is blank - reset all dirty bits
   }
 }
 
@@ -840,7 +844,6 @@ void BusHub75Matrix::cleanup() {
   delete display;
   display = nullptr;
   fourScanPanel = nullptr;
-  isBlack = false;
   if (_ledBuffer != nullptr) free(_ledBuffer); _ledBuffer = nullptr;
   if (_ledsDirty != nullptr) free(_ledsDirty); _ledsDirty = nullptr;      
 }
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 93d5eb46..96aba376 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -389,7 +389,6 @@ class BusHub75Matrix : public Bus {
     MatrixPanel_I2S_DMA *display = nullptr;
     VirtualMatrixPanel  *fourScanPanel = nullptr;
     HUB75_I2S_CFG mxconfig;
-    bool isBlack = false;
     CRGB *_ledBuffer = nullptr;
     byte *_ledsDirty = nullptr;
 };

From e90f8e7f0de268210f905194fc9530168d304656 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Tue, 30 Jul 2024 19:15:08 +0100
Subject: [PATCH 152/200] DMX Input - reinstate loggers for connection state
 change

---
 wled00/dmx_input.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/wled00/dmx_input.cpp b/wled00/dmx_input.cpp
index 821481e5..3be973cc 100644
--- a/wled00/dmx_input.cpp
+++ b/wled00/dmx_input.cpp
@@ -187,6 +187,9 @@ void DMXInput::updateInternal()
   unsigned long now = millis();
   if (dmx_receive(inputPortNum, &packet, DMX_TIMEOUT_TICK)) {
     if (!packet.err) {
+      if(!connected) {
+        USER_PRINTLN("DMX Input - connected");
+      }
       connected = true;
       identify = isIdentifyOn();
       if (!packet.is_rdm) {
@@ -199,6 +202,9 @@ void DMXInput::updateInternal()
     }
   }
   else {
+    if(connected) {
+      USER_PRINTLN("DMX Input - disconnected");
+    }
     connected = false;
   }
 }

From a257e49bb4430be72560425f37ac17439b9afa07 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 12 Aug 2024 12:20:15 +0200
Subject: [PATCH 153/200] HUB75 trying to reduce glitches

the HUB75 driver seems to randomly produce glitches, especially on hight contrast edges.

* roll back to HUB75 version 3.0.10 (known good)
* limit max brightness to 238 (=92%)
* add short delay after starting the driver
---
 platformio.ini         |  3 ++-
 wled00/bus_manager.cpp | 23 ++++++++++++++++-------
 wled00/bus_manager.h   |  1 +
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index ec1a387d..93ca4974 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1038,7 +1038,8 @@ HUB75_build_flags =
   -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#c4ecdcfeeb5aa668d92ddf3c3c74bc93316f6e10 ;;  3.0.11
+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_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 f5ecb5d6..189b779a 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -685,17 +685,18 @@ 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%
+  _bri = 25;
 
+  delay(24); // experimental
   // Allocate memory and start DMA display
   if( not display->begin() ) {
       USER_PRINTLN("****** MatrixPanel_I2S_DMA !KABOOM! I2S memory allocation failed ***********");
       return;
   }
   else {
+    delay(18);   // experiment - give the driver a moment (~ one full frame @ 60hz) to settle
     _valid = true;
     display->clearScreen();   // initially clear the screen buffer
-    display->setBrightness8(127);    // range is 0-255, 0 - 0%, 255 - 100%
-    _bri = 127;
 
     if (_ledBuffer) free(_ledBuffer);                 // should not happen
     if (_ledsDirty) free(_ledsDirty);                 // should not happen
@@ -736,8 +737,12 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
       break;
   }  
 
+  if (_valid) {
+    _panelWidth = fourScanPanel ? fourScanPanel->width() : display->width();  // cache width - it will never change
+  }
+
   USER_PRINT(F("MatrixPanel_I2S_DMA "));
-  USER_PRINTF("%sstarted.\n", _valid? "":"not ");
+  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."));
@@ -772,12 +777,12 @@ void __attribute__((hot)) BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c
     uint8_t b = B(c);
 
     if(fourScanPanel != nullptr) {
-      unsigned width = fourScanPanel->width();
+      int width = _panelWidth;
       int x = pix % width;
       int y = pix / width;
       fourScanPanel->drawPixelRGB888(int16_t(x), int16_t(y), r, g, b);
     } else {
-      unsigned width = display->width();
+      int width = _panelWidth;
       int x = pix % width;
       int y = pix / width;
       display->drawPixelRGB888(int16_t(x), int16_t(y), r, g, b);
@@ -794,16 +799,19 @@ uint32_t BusHub75Matrix::getPixelColor(uint16_t pix) const {
 }
 
 void BusHub75Matrix::setBrightness(uint8_t b, bool immediate) {
-  this->display->setBrightness(b);
   _bri = b;
+  if (_bri > 238) _bri=238;
+  display->setBrightness(_bri);
 }
 
 void __attribute__((hot)) BusHub75Matrix::show(void) {
   if (!_valid) return;
+  display->setBrightness(_bri);
+
   if (_ledBuffer) {
     // write out buffered LEDs
     bool isFourScan = (fourScanPanel != nullptr);
-    unsigned width  = isFourScan ? fourScanPanel->width()  : display->width();
+    //if (isFourScan) fourScanPanel->setRotation(0);
     unsigned height = isFourScan ? fourScanPanel->height() : display->height();
 
     //while(!previousBufferFree) delay(1);   // experimental - Wait before we allow any writing to the buffer. Stop flicker.
@@ -837,6 +845,7 @@ 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.");
 
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 96aba376..2379f430 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -389,6 +389,7 @@ class BusHub75Matrix : public Bus {
     MatrixPanel_I2S_DMA *display = nullptr;
     VirtualMatrixPanel  *fourScanPanel = nullptr;
     HUB75_I2S_CFG mxconfig;
+    unsigned _panelWidth = 0;
     CRGB *_ledBuffer = nullptr;
     byte *_ledsDirty = nullptr;
 };

From a77520aa05f7e18c10eea2eeab65ad1e860326fc Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Mon, 12 Aug 2024 12:36:45 +0200
Subject: [PATCH 154/200] bugfix

forgot to commit one line ...
---
 wled00/bus_manager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 189b779a..66cbd7f3 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -813,6 +813,7 @@ void __attribute__((hot)) BusHub75Matrix::show(void) {
     bool isFourScan = (fourScanPanel != nullptr);
     //if (isFourScan) fourScanPanel->setRotation(0);
     unsigned height = isFourScan ? fourScanPanel->height() : display->height();
+    unsigned width = _panelWidth;
 
     //while(!previousBufferFree) delay(1);   // experimental - Wait before we allow any writing to the buffer. Stop flicker.
 

From 5610548652505e289a1dadbd547465f6a8aa712c Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Tue, 13 Aug 2024 12:52:19 +0200
Subject: [PATCH 155/200] HUB75 clock phase

`mxconfig.clkphase = false;` seems to help reduce flicker on some panels.

@netmindz I think we should add a checkbox to the UI - something like "clocked on positive edge" (default = checked) which means clkphase = true. when unchecked, we set clkphase = false.
---
 wled00/bus_manager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 66cbd7f3..8783730e 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -623,6 +623,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   // 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.min_refresh_rate = 120;
+  // mxconfig.clkphase = false;  // can help in case that the leftmost column is invisible, or pixels on the right side "bleeds out" to the left.
 
 #else
   USER_PRINTLN("MatrixPanel_I2S_DMA - Default pins");

From 38d30723a067606f2e0aa75770d7cc297d4f1273 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Tue, 13 Aug 2024 12:09:10 -0400
Subject: [PATCH 156/200] 2D Audio Reactive Paintbrush Effect

---
 wled00/FX.cpp | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++
 wled00/FX.h   |  6 ++--
 2 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 4f89af77..9a6ba980 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8550,6 +8550,88 @@ static const char _data_FX_MODE_GEQLASER[] PROGMEM = "GEQ 3D ☾@Speed,Front Fil
 
 #endif // WLED_DISABLE_2D
 
+/* 
+   @title     MoonModules WLED - Painbrush Effect
+   @file      included in FX.cpp
+   @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/>.
+*/
+
+///////////////////////
+//   2D Paintbrush   //
+///////////////////////
+uint16_t mode_2DPaintbrush() {
+
+  // Author: @TroyHacks
+  // @license GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
+
+  if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+  const uint16_t cols = SEGMENT.virtualWidth();
+  const uint16_t rows = SEGMENT.virtualHeight();
+
+  if (!SEGENV.allocateData(4)) return mode_static(); //allocation failed
+
+  if (SEGENV.call == 0) {
+    SEGMENT.setUpLeds();
+    SEGMENT.fill(BLACK);
+    SEGENV.aux0 = 0;
+  }
+
+  bool phase_chaos = SEGMENT.check3;
+  bool soft = SEGMENT.check2;
+  bool color_chaos = SEGMENT.check1;
+  CRGB color;
+
+  byte numLines = map8(SEGMENT.intensity,1,16);
+
+  SEGENV.aux0++;  // hue
+  SEGMENT.fadeToBlackBy(map8(SEGENV.custom1,10,128));
+
+  um_data_t *um_data;
+  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
+    // add support for no audio
+    um_data = simulateSound(SEGMENT.soundSim);
+  }
+  uint8_t *fftResult = (uint8_t*)um_data->u_data[2];
+  
+  SEGENV.aux1 = phase_chaos?random8():0;
+
+  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);
+
+    int length = sqrt((x2-x1)*(x2-x1) + (y2-y1)*(y2-y1));
+    length = map8(fftResult[bin],0,length);
+
+    if (length > max(1,int(SEGMENT.custom3))) {
+      if (color_chaos) {
+        color = ColorFromPalette(SEGPALETTE, i * 255 / numLines + (SEGENV.aux0&0xFF), 255, LINEARBLEND);
+      } else {
+        uint16_t colorIndex = map(i,0,numLines,0,255);
+        color = SEGMENT.color_from_palette(colorIndex, false, PALETTE_SOLID_WRAP, 0);
+      }
+      SEGMENT.drawLine(x1,y1,x2,y2,color,soft,length);
+    }
+  }
+  return FRAMETIME;
+} // mode_2DPaintbrush()
+static const char _data_FX_MODE_2DPAINTBRUSH[] PROGMEM = "Paintbrush@Oscillator Offset,# of lines,Fade Rate,,Min Length,Color Chaos,Anti-aliasing,Phase Chaos;!,,Peaks;!;2f;sx=160,ix=255,c1=80,c2=255,c3=0,pal=11,o1=0,o2=1,o3=0";
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // mode data
@@ -8796,6 +8878,8 @@ void WS2812FX::setupEffectData() {
 
   addEffect(FX_MODE_GEQLASER, &mode_GEQLASER, _data_FX_MODE_GEQLASER); // audio
 
+  addEffect(FX_MODE_2DPAINTBRUSH, &mode_2DPaintbrush, _data_FX_MODE_2DPAINTBRUSH); // audio
+
 #endif // WLED_DISABLE_2D
 
 }
diff --git a/wled00/FX.h b/wled00/FX.h
index af707b41..c32c3b47 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -348,9 +348,9 @@ bool strip_uses_global_leds(void);              // WLEDMM implemented in FX_fcn.
 #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
-#define FX_MODE_GEQLASER                  195 // WLED-MM GEQ Laser
-
-#define MODE_COUNT                     196
+#define FX_MODE_GEQLASER               195 // WLED-MM GEQ Laser
+#define FX_MODE_2DPAINTBRUSH           196 // WLED-MM GEQ Laser
+#define MODE_COUNT                     197
 
 typedef enum mapping1D2D {
   M12_Pixels = 0,

From 9e65ab3be42cebb956d74ca8bb5801d7dc4380c2 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Wed, 14 Aug 2024 11:53:35 -0400
Subject: [PATCH 157/200] Stop issue playlist continuing when disabling
 AutoPlaylist

If you use the "music" playlist on boot, it'll keep it going even when you manually override to something else.  This seems to fix this condition.
---
 usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h | 1 +
 1 file changed, 1 insertion(+)

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 adb5b37e..4cc50671 100644
--- a/usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h
+++ b/usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h
@@ -303,6 +303,7 @@ class AutoPlaylistUsermod : public Usermod {
           #ifdef USERMOD_AUTO_PLAYLIST_DEBUG
           USER_PRINTF("AutoPlaylist: disable due to manual change of playlist from %u to %d, preset:%u\n", lastAutoPlaylist, currentPlaylist, currentPreset);
           #endif
+          suspendPlaylist();
           functionality_enabled = false;
         } else if (currentPlaylist == musicPlaylist) {
           #ifdef USERMOD_AUTO_PLAYLIST_DEBUG

From 3b551a40f3ea32bca5674b53f1028b14339edeb3 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Thu, 15 Aug 2024 09:08:57 +0100
Subject: [PATCH 158/200] Remove repeating code to fetch audio data

---
 wled00/FX.cpp         | 190 +++++++-----------------------------------
 wled00/fcn_declare.h  |   1 +
 wled00/um_manager.cpp |   8 ++
 3 files changed, 41 insertions(+), 158 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 3d00dbb8..b8edaf85 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -1994,11 +1994,7 @@ uint16_t mode_partyjerk() {
   * step: pos
   */
 
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   float   volumeSmth = *(float*)  um_data->u_data[0];
 
   SEGENV.aux0++;
@@ -6519,11 +6515,7 @@ uint16_t mode_ripplepeak(void) {                // * Ripple peak. By Andrew Tuli
   if (!SEGENV.allocateData(dataSize)) return mode_static(); //allocation failed
   Ripple* ripples = reinterpret_cast<Ripple*>(SEGENV.data);
 
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   uint8_t samplePeak    = *(uint8_t*)um_data->u_data[3];
   #ifdef ESP32
   float   FFT_MajorPeak = *(float*)  um_data->u_data[4];
@@ -6619,11 +6611,7 @@ uint16_t mode_2DSwirl(void) {
   uint8_t nj = (cols - 1) - j;
   uint16_t ms = strip.now;
 
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   float   volumeSmth  = *(float*)   um_data->u_data[0]; //ewowi: use instead of sampleAvg???
   int16_t volumeRaw   = *(int16_t*) um_data->u_data[1];
 
@@ -6656,11 +6644,7 @@ uint16_t mode_2DWaverly(void) {
     SEGMENT.fill(BLACK);
   }
 
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   float   volumeSmth  = *(float*)   um_data->u_data[0];
   float soundPressure = *(float*)   um_data->u_data[9];
   float agcSensitivity= *(float*)   um_data->u_data[10];
@@ -6714,11 +6698,7 @@ uint16_t mode_gravcenter(void) {                // Gravcenter. By Andrew Tuline.
     SEGMENT.fill(BLACK);
   }
 
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   float   volumeSmth  = *(float*)  um_data->u_data[0];
 
   //SEGMENT.fade_out(240);
@@ -6766,11 +6746,7 @@ uint16_t mode_gravcentric(void) {                     // Gravcentric. By Andrew
     SEGMENT.fill(BLACK);
   }
 
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   float   volumeSmth  = *(float*)  um_data->u_data[0];
 
   // printUmData();
@@ -6817,11 +6793,7 @@ uint16_t mode_gravimeter(void) {                // Gravmeter. By Andrew Tuline.
   if (!SEGENV.allocateData(dataSize)) return mode_static(); //allocation failed
   Gravity* gravcen = reinterpret_cast<Gravity*>(SEGENV.data);
 
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   float   volumeSmth  = *(float*)  um_data->u_data[0];
   // int16_t volumeRaw   = *(int16_t*)um_data->u_data[1]; //WLEDMM: this variable not used here
   float soundPressure = *(float*)  um_data->u_data[9];
@@ -6894,11 +6866,7 @@ static const char _data_FX_MODE_GRAVIMETER[] PROGMEM = "Gravimeter ☾@Rate of f
 //   * JUGGLES      //
 //////////////////////
 uint16_t mode_juggles(void) {                   // Juggles. By Andrew Tuline.
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   float   volumeSmth   = *(float*)  um_data->u_data[0];
   if (SEGENV.call == 0) {SEGENV.setUpLeds(); SEGMENT.fill(BLACK);}   // WLEDMM use lossless getPixelColor()
 
@@ -6921,11 +6889,7 @@ static const char _data_FX_MODE_JUGGLES[] PROGMEM = "Juggles@!,# of balls;!,!;!;
 uint16_t mode_matripix(void) {                  // Matripix. By Andrew Tuline. With some enhancements by @softhack007
   // even with 1D effect we have to take logic for 2D segments for allocation as fill_solid() fills whole segment
 
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   int16_t volumeRaw    = *(int16_t*)um_data->u_data[1];
   float volumeSmth     = *(float*)  um_data->u_data[0];
   float soundPressure  = *(float*)  um_data->u_data[9];
@@ -6977,11 +6941,7 @@ static const char _data_FX_MODE_MATRIPIX[] PROGMEM = "Matripix ☾@!,Brightness,
 uint16_t mode_midnoise(void) {                  // Midnoise. By Andrew Tuline.
 // Changing xdist to SEGENV.aux0 and ydist to SEGENV.aux1.
 
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   float   volumeSmth   = *(float*)  um_data->u_data[0];
 
   if (SEGENV.call == 0) {
@@ -7020,11 +6980,7 @@ uint16_t mode_noisefire(void) {                 // Noisefire. By Andrew Tuline.
                                       CRGB::DarkOrange, CRGB::DarkOrange, CRGB::Orange,  CRGB::Orange,
                                       CRGB::Yellow,     CRGB::Orange,     CRGB::Yellow,  CRGB::Yellow);
 
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   float   volumeSmth   = *(float*)  um_data->u_data[0];
 
   if (SEGENV.call == 0) SEGMENT.fill(BLACK);
@@ -7048,11 +7004,7 @@ static const char _data_FX_MODE_NOISEFIRE[] PROGMEM = "Noisefire@!,!;;;01v;m12=2
 ///////////////////////
 uint16_t mode_noisemeter(void) {                // Noisemeter. By Andrew Tuline.
 
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   float   volumeSmth   = *(float*)  um_data->u_data[0];
   int16_t volumeRaw    = *(int16_t*)um_data->u_data[1];
   if (SEGENV.call == 0) {SEGENV.setUpLeds(); SEGMENT.fill(BLACK);}   // WLEDMM use lossless getPixelColor()
@@ -7090,11 +7042,7 @@ uint16_t mode_pixelwave(void) {                 // Pixelwave. By Andrew Tuline.
     SEGMENT.fill(BLACK);
   }
 
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   int16_t volumeRaw    = *(int16_t*)um_data->u_data[1];
 
   uint8_t secondHand = micros()/(256-SEGMENT.speed)/500+1 % 16;
@@ -7128,11 +7076,7 @@ uint16_t mode_plasmoid(void) {                  // Plasmoid. By Andrew Tuline.
   if (!SEGENV.allocateData(sizeof(plasphase))) return mode_static(); //allocation failed
   Plasphase* plasmoip = reinterpret_cast<Plasphase*>(SEGENV.data);
 
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   float   volumeSmth   = *(float*)  um_data->u_data[0];
 
   if (SEGENV.call == 0) {
@@ -7171,11 +7115,7 @@ uint16_t mode_puddlepeak(void) {                // Puddlepeak. By Andrew Tuline.
   uint8_t fadeVal = map2(SEGMENT.speed,0,255, 224, 254);
   uint16_t pos = random16(SEGLEN);                        // Set a random starting position.
 
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   uint8_t samplePeak = *(uint8_t*)um_data->u_data[3];
   uint8_t *maxVol    =  (uint8_t*)um_data->u_data[6];
   uint8_t *binNum    =  (uint8_t*)um_data->u_data[7];
@@ -7223,11 +7163,7 @@ uint16_t mode_puddles(void) {                   // Puddles. By Andrew Tuline.
   }
   SEGMENT.fade_out(fadeVal);
 
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   int16_t volumeRaw    = *(int16_t*)um_data->u_data[1];
 
   if (volumeRaw > 1) {
@@ -7252,10 +7188,7 @@ uint16_t mode_pixels(void) {                    // Pixels. By Andrew Tuline.
   if (!SEGENV.allocateData(32*sizeof(uint8_t))) return mode_static(); //allocation failed
   uint8_t *myVals = reinterpret_cast<uint8_t*>(SEGENV.data); // Used to store a pile of samples because WLED frame rate and WLED sample rate are not synchronized. Frame rate is too low.
 
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   float   volumeSmth   = *(float*)  um_data->u_data[0];
   if (SEGENV.call == 0) {SEGENV.setUpLeds(); SEGMENT.fill(BLACK);}   // WLEDMM use lossless getPixelColor()
 
@@ -7285,11 +7218,7 @@ static const char _data_FX_MODE_PIXELS[] PROGMEM = "Pixels@Fade rate,# of pixels
 uint16_t mode_blurz(void) {                    // Blurz. By Andrew Tuline.
   // even with 1D effect we have to take logic for 2D segments for allocation as fill_solid() fills whole segment
 
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   uint8_t *fftResult = (uint8_t*)um_data->u_data[2];
 
   if (SEGENV.call == 0) {
@@ -7319,11 +7248,7 @@ static const char _data_FX_MODE_BLURZ[] PROGMEM = "Blurz@Fade rate,Blur;!,Color
 uint16_t mode_blurz(void) {                    // Blurz. By Andrew Tuline.
                                                // Hint: Looks best with segment brightness set to max (use global brightness to reduce brightness)
   // even with 1D effect we have to take logic for 2D segments for allocation as fill_solid() fills whole segment
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   uint8_t *fftResult = (uint8_t*)um_data->u_data[2];
   float volumeSmth   = *(float*)um_data->u_data[0];
 
@@ -7371,11 +7296,7 @@ uint16_t mode_DJLight(void) {                   // Written by Stefan Petrick, Ad
   // No need to prevent from executing on single led strips, only mid will be set (mid = 0)
   const int mid = SEGLEN / 2;
 
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   uint8_t *fftResult = (uint8_t*)um_data->u_data[2];
   float volumeSmth    = *(float*)um_data->u_data[0];
 
@@ -7441,11 +7362,7 @@ uint16_t mode_freqmap(void) {                   // Map FFT_MajorPeak to SEGLEN.
   // Start frequency = 60 Hz and log10(60) = 1.78
   // End frequency = MAX_FREQUENCY in Hz and lo10(MAX_FREQUENCY) = MAX_FREQ_LOG10
 
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   float FFT_MajorPeak = *(float*)um_data->u_data[SEGENV.check1 ? 8:4];              // WLEDMM may use FFT_MajorPeakSmth
   float my_magnitude  = *(float*)um_data->u_data[5] / 4.0f;
   if (FFT_MajorPeak < 1) FFT_MajorPeak = 1;                                         // log10(0) is "forbidden" (throws exception)
@@ -7486,11 +7403,7 @@ static const char _data_FX_MODE_FREQMAP[] PROGMEM = "Freqmap@Fade rate,Starting
 ///////////////////////
 uint16_t mode_freqmatrix(void) {                // Freqmatrix. By Andreas Pleschung.
   // No need to prevent from executing on single led strips, we simply change pixel 0 each time and avoid the shift
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   float FFT_MajorPeak = *(float*)um_data->u_data[4];
   float volumeSmth    = *(float*)um_data->u_data[0];
 
@@ -7545,11 +7458,7 @@ static const char _data_FX_MODE_FREQMATRIX[] PROGMEM = "Freqmatrix@Speed,Sound e
 //  SEGMENT.speed select faderate
 //  SEGMENT.intensity select colour index
 uint16_t mode_freqpixels(void) {                // Freqpixel. By Andrew Tuline.
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   float FFT_MajorPeak = *(float*)um_data->u_data[4];
   float my_magnitude  = *(float*)um_data->u_data[5] / 16.0f;
   if (FFT_MajorPeak < 1) FFT_MajorPeak = 1;                                         // log10(0) is "forbidden" (throws exception)
@@ -7592,11 +7501,7 @@ static const char _data_FX_MODE_FREQPIXELS[] PROGMEM = "Freqpixels@Fade rate,Sta
 // Depending on the music stream you have you might find it useful to change the frequency mapping.
 uint16_t mode_freqwave(void) {                  // Freqwave. By Andreas Pleschung. With some enhancements by @softhack007
   // As before, this effect can also work on single pixels, we just lose the shifting effect
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   float FFT_MajorPeak = *(float*)um_data->u_data[4];
   float volumeSmth    = *(float*)um_data->u_data[0];
 
@@ -7666,11 +7571,7 @@ uint16_t mode_gravfreq(void) {                  // Gravfreq. By Andrew Tuline.
   if (!SEGENV.allocateData(dataSize)) return mode_static(); //allocation failed
   Gravity* gravcen = reinterpret_cast<Gravity*>(SEGENV.data);
 
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   float   FFT_MajorPeak = *(float*)um_data->u_data[4];
   float   volumeSmth    = *(float*)um_data->u_data[0];
   if (FFT_MajorPeak < 1) FFT_MajorPeak = 1;                                         // log10(0) is "forbidden" (throws exception)
@@ -7719,11 +7620,7 @@ static const char _data_FX_MODE_GRAVFREQ[] PROGMEM = "Gravfreq ☾@Rate of fall,
 //   ** Noisemove   //
 //////////////////////
 uint16_t mode_noisemove(void) {                 // Noisemove.    By: Andrew Tuline
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   uint8_t fftResult[NUM_GEQ_CHANNELS] = {0};
   if (um_data->u_data != nullptr) memcpy(fftResult, um_data->u_data[2], sizeof(fftResult));  // WLEDMM buffer curent values
 
@@ -7752,11 +7649,7 @@ static const char _data_FX_MODE_NOISEMOVE[] PROGMEM = "Noisemove@Speed of perlin
 //   ** Rocktaves   //
 //////////////////////
 uint16_t mode_rocktaves(void) {                 // Rocktaves. Same note from each octave is same colour.    By: Andrew Tuline
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   float   FFT_MajorPeak = *(float*)  um_data->u_data[8];  // WLEDMM use FFT_MajorPeakSmth
   float   my_magnitude  = *(float*)   um_data->u_data[5] / 16.0f;
 
@@ -7800,11 +7693,7 @@ uint16_t mode_waterfall(void) {                   // Waterfall. By: Andrew Tulin
   // effect can work on single pixels, we just lose the shifting effect
 
   if (SEGENV.call == 0) SEGMENT.fill(BLACK);
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   uint8_t samplePeak    = *(uint8_t*)um_data->u_data[3];
   float   FFT_MajorPeak = *(float*)  um_data->u_data[4];
   uint8_t *maxVol       =  (uint8_t*)um_data->u_data[6];
@@ -7865,11 +7754,7 @@ uint16_t mode_2DGEQ(void) { // By Will Tatam. Code reduction by Ewoud Wijma.
   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
 
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   uint8_t fftResult[NUM_GEQ_CHANNELS] = {0};
   if (um_data->u_data != nullptr) memcpy(fftResult, um_data->u_data[2], sizeof(fftResult));  // WLEDMM buffer curent values
 
@@ -7976,11 +7861,7 @@ uint16_t mode_2DFunkyPlank(void) {              // Written by ??? Adapted by Wil
     bandInc = (NUMB_BANDS / cols);
   }
 
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   uint8_t fftResult[NUM_GEQ_CHANNELS] = {0};
   if (um_data->u_data != nullptr) memcpy(fftResult, um_data->u_data[2], sizeof(fftResult));  // WLEDMM buffer curent values
 
@@ -8069,10 +7950,7 @@ uint16_t mode_2DAkemi(void) {
   const float lightFactor  = 0.15f;
   const float normalFactor = 0.4f;
 
-  um_data_t *um_data = nullptr;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   uint8_t fftResult[NUM_GEQ_CHANNELS] = {0};
   if (um_data->u_data != nullptr) memcpy(fftResult, um_data->u_data[2], sizeof(fftResult));  // WLEDMM buffer curent values
   float base = fftResult[0]/255.0f;
@@ -8458,11 +8336,7 @@ uint16_t mode_GEQLASER(void) {
   uint16_t horizon    = map2(SEGMENT.custom1,0,255,rows-1,0); 
   uint8_t depth       = SEGMENT.custom2;  // depth of perspective. 255 = infinite ("laser")
 
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = usermods.getAudioData();
   uint8_t *fftResult = (uint8_t*)um_data->u_data[2];
 
   uint8_t heights[NUM_GEQ_CHANNELS] = { 0 };
diff --git a/wled00/fcn_declare.h b/wled00/fcn_declare.h
index 09f9724b..854fdb4e 100644
--- a/wled00/fcn_declare.h
+++ b/wled00/fcn_declare.h
@@ -332,6 +332,7 @@ class UsermodManager {
     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
+    um_data_t *getAudioData();
     void setup();
     void connected();
     // void appendConfigData(); //WLEDMM not used
diff --git a/wled00/um_manager.cpp b/wled00/um_manager.cpp
index 2fe44db9..8013433f 100644
--- a/wled00/um_manager.cpp
+++ b/wled00/um_manager.cpp
@@ -23,6 +23,14 @@ bool UsermodManager::getUMData(um_data_t **data, uint8_t mod_id) {
   }
   return false;
 }
+um_data_t* UsermodManager::getAudioData() {
+  um_data_t *um_data;
+  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
+    // add support for no audio
+    um_data = simulateSound(SEGMENT.soundSim);
+  }
+  return um_data;
+}
 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); }

From b0b3e75556c09fd72dd1fb2df692a504f57b7614 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Thu, 15 Aug 2024 16:22:24 +0100
Subject: [PATCH 159/200] Move getAudioData to static

---
 wled00/FX.cpp         | 72 ++++++++++++++++++++++++-------------------
 wled00/fcn_declare.h  |  1 -
 wled00/um_manager.cpp |  8 -----
 3 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index b8edaf85..a6ac03f7 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -98,6 +98,14 @@ static long map2(long x, long in_min, long in_max, long out_min, long out_max)
 }
 
 
+static um_data_t* getAudioData() {
+  um_data_t *um_data;
+  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
+    // add support for no audio
+    um_data = simulateSound(SEGMENT.soundSim);
+  }
+  return um_data;
+}
 // effect functions
 
 /*
@@ -1994,7 +2002,7 @@ uint16_t mode_partyjerk() {
   * step: pos
   */
 
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   float   volumeSmth = *(float*)  um_data->u_data[0];
 
   SEGENV.aux0++;
@@ -6515,7 +6523,7 @@ uint16_t mode_ripplepeak(void) {                // * Ripple peak. By Andrew Tuli
   if (!SEGENV.allocateData(dataSize)) return mode_static(); //allocation failed
   Ripple* ripples = reinterpret_cast<Ripple*>(SEGENV.data);
 
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   uint8_t samplePeak    = *(uint8_t*)um_data->u_data[3];
   #ifdef ESP32
   float   FFT_MajorPeak = *(float*)  um_data->u_data[4];
@@ -6611,7 +6619,7 @@ uint16_t mode_2DSwirl(void) {
   uint8_t nj = (cols - 1) - j;
   uint16_t ms = strip.now;
 
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   float   volumeSmth  = *(float*)   um_data->u_data[0]; //ewowi: use instead of sampleAvg???
   int16_t volumeRaw   = *(int16_t*) um_data->u_data[1];
 
@@ -6644,7 +6652,7 @@ uint16_t mode_2DWaverly(void) {
     SEGMENT.fill(BLACK);
   }
 
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   float   volumeSmth  = *(float*)   um_data->u_data[0];
   float soundPressure = *(float*)   um_data->u_data[9];
   float agcSensitivity= *(float*)   um_data->u_data[10];
@@ -6698,7 +6706,7 @@ uint16_t mode_gravcenter(void) {                // Gravcenter. By Andrew Tuline.
     SEGMENT.fill(BLACK);
   }
 
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   float   volumeSmth  = *(float*)  um_data->u_data[0];
 
   //SEGMENT.fade_out(240);
@@ -6746,7 +6754,7 @@ uint16_t mode_gravcentric(void) {                     // Gravcentric. By Andrew
     SEGMENT.fill(BLACK);
   }
 
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   float   volumeSmth  = *(float*)  um_data->u_data[0];
 
   // printUmData();
@@ -6793,7 +6801,7 @@ uint16_t mode_gravimeter(void) {                // Gravmeter. By Andrew Tuline.
   if (!SEGENV.allocateData(dataSize)) return mode_static(); //allocation failed
   Gravity* gravcen = reinterpret_cast<Gravity*>(SEGENV.data);
 
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   float   volumeSmth  = *(float*)  um_data->u_data[0];
   // int16_t volumeRaw   = *(int16_t*)um_data->u_data[1]; //WLEDMM: this variable not used here
   float soundPressure = *(float*)  um_data->u_data[9];
@@ -6866,7 +6874,7 @@ static const char _data_FX_MODE_GRAVIMETER[] PROGMEM = "Gravimeter ☾@Rate of f
 //   * JUGGLES      //
 //////////////////////
 uint16_t mode_juggles(void) {                   // Juggles. By Andrew Tuline.
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   float   volumeSmth   = *(float*)  um_data->u_data[0];
   if (SEGENV.call == 0) {SEGENV.setUpLeds(); SEGMENT.fill(BLACK);}   // WLEDMM use lossless getPixelColor()
 
@@ -6889,7 +6897,7 @@ static const char _data_FX_MODE_JUGGLES[] PROGMEM = "Juggles@!,# of balls;!,!;!;
 uint16_t mode_matripix(void) {                  // Matripix. By Andrew Tuline. With some enhancements by @softhack007
   // even with 1D effect we have to take logic for 2D segments for allocation as fill_solid() fills whole segment
 
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   int16_t volumeRaw    = *(int16_t*)um_data->u_data[1];
   float volumeSmth     = *(float*)  um_data->u_data[0];
   float soundPressure  = *(float*)  um_data->u_data[9];
@@ -6941,7 +6949,7 @@ static const char _data_FX_MODE_MATRIPIX[] PROGMEM = "Matripix ☾@!,Brightness,
 uint16_t mode_midnoise(void) {                  // Midnoise. By Andrew Tuline.
 // Changing xdist to SEGENV.aux0 and ydist to SEGENV.aux1.
 
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   float   volumeSmth   = *(float*)  um_data->u_data[0];
 
   if (SEGENV.call == 0) {
@@ -6980,7 +6988,7 @@ uint16_t mode_noisefire(void) {                 // Noisefire. By Andrew Tuline.
                                       CRGB::DarkOrange, CRGB::DarkOrange, CRGB::Orange,  CRGB::Orange,
                                       CRGB::Yellow,     CRGB::Orange,     CRGB::Yellow,  CRGB::Yellow);
 
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   float   volumeSmth   = *(float*)  um_data->u_data[0];
 
   if (SEGENV.call == 0) SEGMENT.fill(BLACK);
@@ -7004,7 +7012,7 @@ static const char _data_FX_MODE_NOISEFIRE[] PROGMEM = "Noisefire@!,!;;;01v;m12=2
 ///////////////////////
 uint16_t mode_noisemeter(void) {                // Noisemeter. By Andrew Tuline.
 
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   float   volumeSmth   = *(float*)  um_data->u_data[0];
   int16_t volumeRaw    = *(int16_t*)um_data->u_data[1];
   if (SEGENV.call == 0) {SEGENV.setUpLeds(); SEGMENT.fill(BLACK);}   // WLEDMM use lossless getPixelColor()
@@ -7042,7 +7050,7 @@ uint16_t mode_pixelwave(void) {                 // Pixelwave. By Andrew Tuline.
     SEGMENT.fill(BLACK);
   }
 
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   int16_t volumeRaw    = *(int16_t*)um_data->u_data[1];
 
   uint8_t secondHand = micros()/(256-SEGMENT.speed)/500+1 % 16;
@@ -7076,7 +7084,7 @@ uint16_t mode_plasmoid(void) {                  // Plasmoid. By Andrew Tuline.
   if (!SEGENV.allocateData(sizeof(plasphase))) return mode_static(); //allocation failed
   Plasphase* plasmoip = reinterpret_cast<Plasphase*>(SEGENV.data);
 
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   float   volumeSmth   = *(float*)  um_data->u_data[0];
 
   if (SEGENV.call == 0) {
@@ -7115,7 +7123,7 @@ uint16_t mode_puddlepeak(void) {                // Puddlepeak. By Andrew Tuline.
   uint8_t fadeVal = map2(SEGMENT.speed,0,255, 224, 254);
   uint16_t pos = random16(SEGLEN);                        // Set a random starting position.
 
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   uint8_t samplePeak = *(uint8_t*)um_data->u_data[3];
   uint8_t *maxVol    =  (uint8_t*)um_data->u_data[6];
   uint8_t *binNum    =  (uint8_t*)um_data->u_data[7];
@@ -7163,7 +7171,7 @@ uint16_t mode_puddles(void) {                   // Puddles. By Andrew Tuline.
   }
   SEGMENT.fade_out(fadeVal);
 
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   int16_t volumeRaw    = *(int16_t*)um_data->u_data[1];
 
   if (volumeRaw > 1) {
@@ -7188,7 +7196,7 @@ uint16_t mode_pixels(void) {                    // Pixels. By Andrew Tuline.
   if (!SEGENV.allocateData(32*sizeof(uint8_t))) return mode_static(); //allocation failed
   uint8_t *myVals = reinterpret_cast<uint8_t*>(SEGENV.data); // Used to store a pile of samples because WLED frame rate and WLED sample rate are not synchronized. Frame rate is too low.
 
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   float   volumeSmth   = *(float*)  um_data->u_data[0];
   if (SEGENV.call == 0) {SEGENV.setUpLeds(); SEGMENT.fill(BLACK);}   // WLEDMM use lossless getPixelColor()
 
@@ -7218,7 +7226,7 @@ static const char _data_FX_MODE_PIXELS[] PROGMEM = "Pixels@Fade rate,# of pixels
 uint16_t mode_blurz(void) {                    // Blurz. By Andrew Tuline.
   // even with 1D effect we have to take logic for 2D segments for allocation as fill_solid() fills whole segment
 
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   uint8_t *fftResult = (uint8_t*)um_data->u_data[2];
 
   if (SEGENV.call == 0) {
@@ -7248,7 +7256,7 @@ static const char _data_FX_MODE_BLURZ[] PROGMEM = "Blurz@Fade rate,Blur;!,Color
 uint16_t mode_blurz(void) {                    // Blurz. By Andrew Tuline.
                                                // Hint: Looks best with segment brightness set to max (use global brightness to reduce brightness)
   // even with 1D effect we have to take logic for 2D segments for allocation as fill_solid() fills whole segment
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   uint8_t *fftResult = (uint8_t*)um_data->u_data[2];
   float volumeSmth   = *(float*)um_data->u_data[0];
 
@@ -7296,7 +7304,7 @@ uint16_t mode_DJLight(void) {                   // Written by Stefan Petrick, Ad
   // No need to prevent from executing on single led strips, only mid will be set (mid = 0)
   const int mid = SEGLEN / 2;
 
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   uint8_t *fftResult = (uint8_t*)um_data->u_data[2];
   float volumeSmth    = *(float*)um_data->u_data[0];
 
@@ -7362,7 +7370,7 @@ uint16_t mode_freqmap(void) {                   // Map FFT_MajorPeak to SEGLEN.
   // Start frequency = 60 Hz and log10(60) = 1.78
   // End frequency = MAX_FREQUENCY in Hz and lo10(MAX_FREQUENCY) = MAX_FREQ_LOG10
 
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   float FFT_MajorPeak = *(float*)um_data->u_data[SEGENV.check1 ? 8:4];              // WLEDMM may use FFT_MajorPeakSmth
   float my_magnitude  = *(float*)um_data->u_data[5] / 4.0f;
   if (FFT_MajorPeak < 1) FFT_MajorPeak = 1;                                         // log10(0) is "forbidden" (throws exception)
@@ -7403,7 +7411,7 @@ static const char _data_FX_MODE_FREQMAP[] PROGMEM = "Freqmap@Fade rate,Starting
 ///////////////////////
 uint16_t mode_freqmatrix(void) {                // Freqmatrix. By Andreas Pleschung.
   // No need to prevent from executing on single led strips, we simply change pixel 0 each time and avoid the shift
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   float FFT_MajorPeak = *(float*)um_data->u_data[4];
   float volumeSmth    = *(float*)um_data->u_data[0];
 
@@ -7458,7 +7466,7 @@ static const char _data_FX_MODE_FREQMATRIX[] PROGMEM = "Freqmatrix@Speed,Sound e
 //  SEGMENT.speed select faderate
 //  SEGMENT.intensity select colour index
 uint16_t mode_freqpixels(void) {                // Freqpixel. By Andrew Tuline.
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   float FFT_MajorPeak = *(float*)um_data->u_data[4];
   float my_magnitude  = *(float*)um_data->u_data[5] / 16.0f;
   if (FFT_MajorPeak < 1) FFT_MajorPeak = 1;                                         // log10(0) is "forbidden" (throws exception)
@@ -7501,7 +7509,7 @@ static const char _data_FX_MODE_FREQPIXELS[] PROGMEM = "Freqpixels@Fade rate,Sta
 // Depending on the music stream you have you might find it useful to change the frequency mapping.
 uint16_t mode_freqwave(void) {                  // Freqwave. By Andreas Pleschung. With some enhancements by @softhack007
   // As before, this effect can also work on single pixels, we just lose the shifting effect
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   float FFT_MajorPeak = *(float*)um_data->u_data[4];
   float volumeSmth    = *(float*)um_data->u_data[0];
 
@@ -7571,7 +7579,7 @@ uint16_t mode_gravfreq(void) {                  // Gravfreq. By Andrew Tuline.
   if (!SEGENV.allocateData(dataSize)) return mode_static(); //allocation failed
   Gravity* gravcen = reinterpret_cast<Gravity*>(SEGENV.data);
 
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   float   FFT_MajorPeak = *(float*)um_data->u_data[4];
   float   volumeSmth    = *(float*)um_data->u_data[0];
   if (FFT_MajorPeak < 1) FFT_MajorPeak = 1;                                         // log10(0) is "forbidden" (throws exception)
@@ -7620,7 +7628,7 @@ static const char _data_FX_MODE_GRAVFREQ[] PROGMEM = "Gravfreq ☾@Rate of fall,
 //   ** Noisemove   //
 //////////////////////
 uint16_t mode_noisemove(void) {                 // Noisemove.    By: Andrew Tuline
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   uint8_t fftResult[NUM_GEQ_CHANNELS] = {0};
   if (um_data->u_data != nullptr) memcpy(fftResult, um_data->u_data[2], sizeof(fftResult));  // WLEDMM buffer curent values
 
@@ -7649,7 +7657,7 @@ static const char _data_FX_MODE_NOISEMOVE[] PROGMEM = "Noisemove@Speed of perlin
 //   ** Rocktaves   //
 //////////////////////
 uint16_t mode_rocktaves(void) {                 // Rocktaves. Same note from each octave is same colour.    By: Andrew Tuline
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   float   FFT_MajorPeak = *(float*)  um_data->u_data[8];  // WLEDMM use FFT_MajorPeakSmth
   float   my_magnitude  = *(float*)   um_data->u_data[5] / 16.0f;
 
@@ -7693,7 +7701,7 @@ uint16_t mode_waterfall(void) {                   // Waterfall. By: Andrew Tulin
   // effect can work on single pixels, we just lose the shifting effect
 
   if (SEGENV.call == 0) SEGMENT.fill(BLACK);
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   uint8_t samplePeak    = *(uint8_t*)um_data->u_data[3];
   float   FFT_MajorPeak = *(float*)  um_data->u_data[4];
   uint8_t *maxVol       =  (uint8_t*)um_data->u_data[6];
@@ -7754,7 +7762,7 @@ uint16_t mode_2DGEQ(void) { // By Will Tatam. Code reduction by Ewoud Wijma.
   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
 
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   uint8_t fftResult[NUM_GEQ_CHANNELS] = {0};
   if (um_data->u_data != nullptr) memcpy(fftResult, um_data->u_data[2], sizeof(fftResult));  // WLEDMM buffer curent values
 
@@ -7861,7 +7869,7 @@ uint16_t mode_2DFunkyPlank(void) {              // Written by ??? Adapted by Wil
     bandInc = (NUMB_BANDS / cols);
   }
 
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   uint8_t fftResult[NUM_GEQ_CHANNELS] = {0};
   if (um_data->u_data != nullptr) memcpy(fftResult, um_data->u_data[2], sizeof(fftResult));  // WLEDMM buffer curent values
 
@@ -7950,7 +7958,7 @@ uint16_t mode_2DAkemi(void) {
   const float lightFactor  = 0.15f;
   const float normalFactor = 0.4f;
 
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   uint8_t fftResult[NUM_GEQ_CHANNELS] = {0};
   if (um_data->u_data != nullptr) memcpy(fftResult, um_data->u_data[2], sizeof(fftResult));  // WLEDMM buffer curent values
   float base = fftResult[0]/255.0f;
@@ -8336,7 +8344,7 @@ uint16_t mode_GEQLASER(void) {
   uint16_t horizon    = map2(SEGMENT.custom1,0,255,rows-1,0); 
   uint8_t depth       = SEGMENT.custom2;  // depth of perspective. 255 = infinite ("laser")
 
-  um_data_t *um_data = usermods.getAudioData();
+  um_data_t *um_data = getAudioData();
   uint8_t *fftResult = (uint8_t*)um_data->u_data[2];
 
   uint8_t heights[NUM_GEQ_CHANNELS] = { 0 };
diff --git a/wled00/fcn_declare.h b/wled00/fcn_declare.h
index 854fdb4e..09f9724b 100644
--- a/wled00/fcn_declare.h
+++ b/wled00/fcn_declare.h
@@ -332,7 +332,6 @@ class UsermodManager {
     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
-    um_data_t *getAudioData();
     void setup();
     void connected();
     // void appendConfigData(); //WLEDMM not used
diff --git a/wled00/um_manager.cpp b/wled00/um_manager.cpp
index 8013433f..2fe44db9 100644
--- a/wled00/um_manager.cpp
+++ b/wled00/um_manager.cpp
@@ -23,14 +23,6 @@ bool UsermodManager::getUMData(um_data_t **data, uint8_t mod_id) {
   }
   return false;
 }
-um_data_t* UsermodManager::getAudioData() {
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
-  return um_data;
-}
 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); }

From f7e3f35c0c30f00e2350cab78348bdb90a75c456 Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Thu, 15 Aug 2024 20:35:16 +0200
Subject: [PATCH 160/200] my favourite HUB75 buildenv
 [env:esp32_4MB_V4_HUB75_forum]

---
 platformio.ini | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++
 wled00/FX.h    |  2 ++
 2 files changed, 66 insertions(+)

diff --git a/platformio.ini b/platformio.ini
index 93ca4974..94bb35e7 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -187,6 +187,7 @@ build_flags =
   -D DECODE_SONY=true
   -D DECODE_SAMSUNG=true
   -D DECODE_LG=true
+  -D FASTLED_NO_FASTLED
   ;-Dregister= # remove warnings in C++17 due to use of deprecated register keyword by the FastLED library ;; warning: this breaks framework code on ESP32-C3 and ESP32-S2
   -DWLED_USE_MY_CONFIG
   ; -D USERMOD_SENSORSTOMQTT
@@ -240,6 +241,8 @@ upload_speed = 115200
 lib_compat_mode = strict
 lib_deps =
     fastled/FastLED @ 3.6.0
+    ;; fastled/FastLED @ 3.7.1
+    ;; https://github.com/softhack007/FastLED.git#ESP32-C6 ;; patched version needed for -C6
     IRremoteESP8266 @ 2.8.2
     ;;makuna/NeoPixelBus @ 2.7.5 ;; WLEDMM will be added in board specific sections
     ;;https://github.com/Aircoookie/ESPAsyncWebServer.git @ ~2.0.7
@@ -1602,6 +1605,67 @@ lib_deps = ${esp32_4MB_V4_S_base.esp32_lib_deps}
 lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
  ; RAM:   [===       ]  28.1% (used 91960 bytes from 327680 bytes)
  ; Flash: [==========]  97.8% (used 1537777 bytes from 1572864 bytes)
+
+;; softhack007: my favourite HUB75 buildenv - fastest possible
+[env:esp32_4MB_V4_HUB75_forum]
+extends = esp32_4MB_V4_S_base
+platform_packages = ${esp32_4MB_V4_S_base.platform_packages}
+;;  toolchain-xtensa-esp32@~11.2 ;; for trying out newer gcc @11.2.0+2022r1       ;; 25fps -> 30fps;;  FastLED 3.7.1 required !!
+
+build_unflags = ${esp32_4MB_V4_S_base.build_unflags}
+  ${Speed_Flags.build_unflags}  ;; to override -Os
+  ;; -D WLED_ENABLE_DMX_INPUT
+  -DARDUINO_EVENT_RUNNING_CORE=1
+  ;;-DCORE_DEBUG_LEVEL=0
+  ;; -D NDEBUG
+  -D NO_CIE1931 ;; Do use LED brightness compensation described in CIE 1931
+
+build_flags = ${esp32_4MB_V4_S_base.esp32_build_flags}
+  ;; -Wsuggest-attribute=const -Wsuggest-attribute=pure
+  ;; -Wmissing-noreturn -Wmissing-return
+  ;; -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
+  ;; -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
+  -D WLEDMM_FASTPATH ; WLEDMM experimental option. Reduces audio lag (latency), and allows for faster LED framerates. May break compatibility with previous versions.
+  -D WLED_DISABLE_LOXONE
+  -D WLED_DISABLE_ALEXA
+  -D WLED_DISABLE_HUESYNC
+  -D WLED_DISABLE_MQTT
+  -D WLED_DISABLE_INFRARED
+  -D WLED_DISABLE_ADALIGHT
+  ;; -D WLED_DEBUG
+  ;; -D SR_DEBUG
+  -D WLED_BOOTUPDELAY=350
+  -D WLED_ENABLE_HUB75MATRIX -DESP32_FORUM_PINOUT 
+  ;; -D HUB75_NO_DOUBLEBUFFER ;; -D PIXEL_COLOUR_DEPTH_BITS=12
+  ${common_mm.animartrix_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
+  ;; -D CONFIG_ESP32_REV_MIN=3  ;;  disables PSRAM bug workarounds in the core, reducing the code size and improving overall performance.
+  -D JSON_BUFFER_SIZE=18432 -D MIN_HEAP_SIZE=6144
+  -D MAX_SEGMENT_DATA=40960  ;; default 32767
+  -D WLEDMM_SAVE_FLASH
+  -D WLED_DISABLE_BROWNOUT_DET
+  ;;-DCORE_DEBUG_LEVEL=1
+  ;;-D WLED_DISABLE_PARTICLESYSTEM1D
+  ;;-D WLED_DISABLE_PARTICLESYSTEM2D
+  ;;-D WLED_DISABLE_PARTICLESYSTEM_BUFFER
+
+lib_deps = ${esp32_4MB_V4_S_base.esp32_lib_deps}
+    ${common_mm.animartrix_lib_deps}
+lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
+  ;; ${common_mm.DMXin_lib_ignore}
+
+board_build.partitions = ${esp32.big_partitions}
+board_build.f_flash = 80000000L ; use full 80MHz speed for flash (default = 40Mhz) 
+board_build.flash_mode = qio ; (dio = dual i/o; more compatible than qio = quad i/o)
+
+
 ; compiled with ESP-IDF 4.4.1
 [env:esp32_4MB_V4_M]
 extends = esp32_4MB_V4_M_base
diff --git a/wled00/FX.h b/wled00/FX.h
index b61cdf72..a2f51cf4 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -87,11 +87,13 @@ bool strip_uses_global_leds(void) __attribute__((pure));  // WLEDMM implemented
   #ifndef MAX_NUM_SEGMENTS
     #define MAX_NUM_SEGMENTS  32
   #endif
+  #ifndef MAX_SEGMENT_DATA
   #if defined(ARDUINO_ARCH_ESP32S2)
     #define MAX_SEGMENT_DATA  24576
   #else
     #define MAX_SEGMENT_DATA  32767
   #endif
+  #endif
 #endif
 
 /* How much data bytes each segment should max allocate to leave enough space for other segments,

From f287143cc3bbc00664143a9b550af63fcdd40e04 Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Thu, 15 Aug 2024 20:36:09 +0200
Subject: [PATCH 161/200] build 2408150

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

diff --git a/wled00/wled.h b/wled00/wled.h
index c1f56732..c185bc46 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2408080
+#define VERSION 2408150
 
 // 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 030a7cee537e99f9b5db1e3f7bf69874f3908211 Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Fri, 16 Aug 2024 17:54:11 +0200
Subject: [PATCH 162/200] another small speedup, and segment stability
 improvement

* removed a few sanity check that are done again later in getPixelColor
* stability: prevent crashes when changing segments settings or effect options
---
 wled00/FX.h         |  1 +
 wled00/FX_2Dfcn.cpp | 18 +++++++++++-------
 wled00/FX_fcn.cpp   | 39 +++++++++++++++++++++++++++++++++++----
 wled00/wled.h       |  2 +-
 4 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/wled00/FX.h b/wled00/FX.h
index a2f51cf4..4ab04a9f 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -439,6 +439,7 @@ typedef struct Segment {
 #ifdef WLEDMM_FASTPATH
     // WLEDMM cache some values that won't change while drawing a frame
     bool _isSimpleSegment = false;
+    bool _isSuperSimpleSegment = false;
     bool _isValid2D = false;
     uint8_t _brightness = 255; // final pixel brightness - including transitions and segment opacity
     bool _firstFill = true;  // dirty HACK support
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 9660df63..b7e5357a 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -241,6 +241,7 @@ void Segment::startFrame(void) {
   _isValid2D  = isActive() && is2D();
   _brightness = currentBri(on ? opacity : 0);
   _isSimpleSegment = (grouping == 1) && (spacing == 0); // we can handle pixels faster when no grouping or spacing is involved
+  _isSuperSimpleSegment = !mirror && !mirror_y && (grouping == 1) && (spacing == 0); // fastest - we only draw one pixel per call
   // if (reverse_y) _isSimpleSegment = false; // for A/B testing
   _2dWidth    = is2D() ? calc_virtualWidth() : virtualLength();
   _2dHeight   = calc_virtualHeight();
@@ -279,7 +280,8 @@ void IRAM_ATTR __attribute__((hot)) Segment::setPixelColorXY_fast(int x, int y,
 
   // set the requested pixel
   strip.setPixelColorXY_fast(start + x, startY + y, scaled_col);
-  bool simpleSegment = !mirror && !mirror_y;
+  //bool simpleSegment = !mirror && !mirror_y;
+  bool simpleSegment = _isSuperSimpleSegment;
   if (simpleSegment) return;   // WLEDMM shortcut when no mirroring needed
 
   // handle mirroring
@@ -306,7 +308,7 @@ void IRAM_ATTR_YN Segment::setPixelColorXY_slow(int x, int y, uint32_t col) //WL
 void IRAM_ATTR_YN Segment::setPixelColorXY(int x, int y, uint32_t col) //WLEDMM: IRAM_ATTR conditionally
 #endif
 {
-  if (Segment::maxHeight==1) return; // not a matrix set-up
+  if ((Segment::maxHeight==1) || !isActive()) return; // not a matrix set-up
   const int_fast16_t cols = virtualWidth();  // WLEDMM optimization
   const int_fast16_t rows = virtualHeight();
 
@@ -335,7 +337,8 @@ void IRAM_ATTR_YN Segment::setPixelColorXY(int x, int y, uint32_t col) //WLEDMM:
   if (transpose) { uint16_t t = x; x = y; y = t; } // swap X & Y if segment transposed
 
   // WLEDMM shortcut when no grouping/spacing used
-  bool simpleSegment = !mirror && !mirror_y && (grouping == 1) && (spacing == 0);
+  //bool simpleSegment = !mirror && !mirror_y && (grouping == 1) && (spacing == 0);
+  bool simpleSegment = _isSuperSimpleSegment;
   if (simpleSegment) {
     strip.setPixelColorXY(start + x, startY + y, col);
     return;
@@ -441,20 +444,21 @@ uint32_t IRAM_ATTR_YN Segment::getPixelColorXY(int x, int y) const {
 
 // 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.
 void IRAM_ATTR_YN Segment::addPixelColorXY(int x, int y, uint32_t color, bool fast) {
-  if (!isActive()) return; // not active
-  if (x >= virtualWidth() || y >= virtualHeight() || x<0 || y<0) return;  // if pixel would fall out of virtual segment just exit
+  // 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);
 }
 
 void Segment::fadePixelColorXY(uint16_t x, uint16_t y, uint8_t fade) {
-  if (!isActive()) return; // not active
+  // 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);
 }
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 0f6eb6da..b5e84039 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -102,6 +102,12 @@ Segment::Segment(const Segment &orig) {
   DEBUG_PRINTLN(F("-- Copy segment constructor --"));
   memcpy((void*)this, (void*)&orig, sizeof(Segment)); //WLEDMM copy to this
   transitional = false; // copied segment cannot be in transition
+#ifdef WLEDMM_FASTPATH
+  // WLEDMM temporarily prevent any fast draw calls to the new segment
+  // _isValid2D = false;
+  _isSimpleSegment = false;
+  _isSuperSimpleSegment = false;
+#endif
   name = nullptr;
   data = nullptr;
   _dataLen = 0;
@@ -143,8 +149,17 @@ void Segment::allocLeds() {
 // move constructor --> moves everything (including buffer) from orig to this
 Segment::Segment(Segment &&orig) noexcept {
   DEBUG_PRINTLN(F("-- Move segment constructor --"));
+#ifdef WLEDMM_FASTPATH
+  // WLEDMM temporarily prevent any fast draw calls to old and new segment
+  orig._isSimpleSegment = false;
+  orig._isSuperSimpleSegment = false;
+#endif
   memcpy((void*)this, (void*)&orig, sizeof(Segment));
   orig.transitional = false; // old segment cannot be in transition any more
+#ifdef WLEDMM_FASTPATH
+  // WLEDMM prevent any draw calls to old segment
+  orig._isValid2D = false;
+#endif
   orig.name = nullptr;
   orig.data = nullptr;
   orig._dataLen = 0;
@@ -169,6 +184,12 @@ Segment& Segment::operator= (const Segment &orig) {
     // copy source
     memcpy((void*)this, (void*)&orig, sizeof(Segment));
     transitional = false;
+#ifdef WLEDMM_FASTPATH
+    // WLEDMM prevent any fast draw calls to this segment until the next frame starts
+    //_isValid2D = false;
+    _isSimpleSegment = false;
+    _isSuperSimpleSegment = false;
+#endif
     // erase pointers to allocated data
     name = nullptr;
     data = nullptr;
@@ -196,7 +217,16 @@ Segment& Segment::operator= (Segment &&orig) noexcept {
     deallocateData(); // free old runtime data
     if (_t) { delete _t; _t = nullptr; }
     if (ledsrgb && !Segment::_globalLeds) free(ledsrgb); //WLEDMM: not needed anymore as we will use leds from copy. no need to nullify ledsrgb as it gets new value in memcpy
+#ifdef WLEDMM_FASTPATH
+    // WLEDMM temporarily prevent any fast draw calls to old and new segment
+    orig._isSimpleSegment = false;
+    orig._isSuperSimpleSegment = false;
+#endif
     memcpy((void*)this, (void*)&orig, sizeof(Segment));
+#ifdef WLEDMM_FASTPATH
+    // WLEDMM temporarily prevent any draw calls to old segment
+    orig._isValid2D = false;
+#endif
     orig.name = nullptr;
     orig.data = nullptr;
     orig._dataLen = 0;
@@ -956,8 +986,8 @@ void IRAM_ATTR_YN __attribute__((hot)) Segment::setPixelColor(int i, uint32_t co
           float rad = 0.0f;
           for (unsigned count = 0; count < numSteps; count++) {
             // may want to try float version as well (with or without antialiasing)
-            int x = roundf(sinf(rad) * radius);
-            int y = roundf(cosf(rad) * radius);
+            int x = max(0, min(vW-1, (int)roundf(sinf(rad) * radius)));
+            int y = max(0, min(vH-1, (int)roundf(cosf(rad) * radius)));
             setPixelColorXY(x, y, col);
             if(useSymmetry) setPixelColorXY(y, x, col);// WLEDMM
             rad += step;
@@ -1388,7 +1418,8 @@ void __attribute__((hot)) 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.
@@ -1420,7 +1451,7 @@ void Segment::fadePixelColor(uint16_t n, uint8_t fade) {
 /*
  * fade out function, higher rate = quicker fade
  */
-void Segment::fade_out(uint8_t rate) {
+void __attribute__((hot)) Segment::fade_out(uint8_t rate) {
   if (!isActive()) return; // not active
   const uint_fast16_t cols = is2D() ? virtualWidth() : virtualLength();           // WLEDMM use fast int types
   const uint_fast16_t rows = virtualHeight(); // will be 1 for 1D
diff --git a/wled00/wled.h b/wled00/wled.h
index c185bc46..ed232910 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2408150
+#define VERSION 2408160
 
 // 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 b9007f2dc65f8c455d54f76645c48f23cd928afd Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Fri, 16 Aug 2024 18:02:25 +0200
Subject: [PATCH 163/200] bugfix

fix compiler error on non-fastpath builds
---
 wled00/FX_2Dfcn.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index b7e5357a..bb0b1861 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -280,8 +280,11 @@ void IRAM_ATTR __attribute__((hot)) Segment::setPixelColorXY_fast(int x, int y,
 
   // set the requested pixel
   strip.setPixelColorXY_fast(start + x, startY + y, scaled_col);
-  //bool simpleSegment = !mirror && !mirror_y;
+  #ifdef WLEDMM_FASTPATH
   bool simpleSegment = _isSuperSimpleSegment;
+  #else
+  bool simpleSegment = !mirror && !mirror_y;
+  #endif
   if (simpleSegment) return;   // WLEDMM shortcut when no mirroring needed
 
   // handle mirroring
@@ -337,8 +340,11 @@ void IRAM_ATTR_YN Segment::setPixelColorXY(int x, int y, uint32_t col) //WLEDMM:
   if (transpose) { uint16_t t = x; x = y; y = t; } // swap X & Y if segment transposed
 
   // WLEDMM shortcut when no grouping/spacing used
-  //bool simpleSegment = !mirror && !mirror_y && (grouping == 1) && (spacing == 0);
+  #ifdef WLEDMM_FASTPATH
   bool simpleSegment = _isSuperSimpleSegment;
+  #else
+  bool simpleSegment = !mirror && !mirror_y && (grouping == 1) && (spacing == 0);
+  #endif
   if (simpleSegment) {
     strip.setPixelColorXY(start + x, startY + y, col);
     return;

From 7bb351b185a8a38c13fa5fd4c01dc732023f4b19 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Sat, 17 Aug 2024 08:15:27 -0400
Subject: [PATCH 164/200] Minor updates to Paintbrush

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

diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index bd95e060..1fbc74e6 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8497,11 +8497,7 @@ uint16_t mode_2DPaintbrush() {
   SEGENV.aux0++;  // hue
   SEGMENT.fadeToBlackBy(map8(SEGENV.custom1,10,128));
 
-  um_data_t *um_data;
-  if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
-    // add support for no audio
-    um_data = simulateSound(SEGMENT.soundSim);
-  }
+  um_data_t *um_data = getAudioData();
   uint8_t *fftResult = (uint8_t*)um_data->u_data[2];
   
   SEGENV.aux1 = phase_chaos?random8():0;
@@ -8529,7 +8525,7 @@ uint16_t mode_2DPaintbrush() {
   }
   return FRAMETIME;
 } // mode_2DPaintbrush()
-static const char _data_FX_MODE_2DPAINTBRUSH[] PROGMEM = "Paintbrush@Oscillator Offset,# of lines,Fade Rate,,Min Length,Color Chaos,Anti-aliasing,Phase Chaos;!,,Peaks;!;2f;sx=160,ix=255,c1=80,c2=255,c3=0,pal=11,o1=0,o2=1,o3=0";
+static const char _data_FX_MODE_2DPAINTBRUSH[] PROGMEM = "Paintbrush ☾@Oscillator Offset,# of lines,Fade Rate,,Min Length,Color Chaos,Anti-aliasing,Phase Chaos;!,,Peaks;!;2f;sx=160,ix=255,c1=80,c2=255,c3=0,pal=72,o1=0,o2=1,o3=0";
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // mode data

From f23df9dfbc5bdc4bbc01d3a49df94a027a37f17f Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Sat, 17 Aug 2024 08:28:08 -0400
Subject: [PATCH 165/200] Revert functionality change to M12_pArc

Left the new code in for reference
---
 wled00/FX_fcn.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index b5e84039..9092e3f7 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -986,8 +986,10 @@ void IRAM_ATTR_YN __attribute__((hot)) Segment::setPixelColor(int i, uint32_t co
           float rad = 0.0f;
           for (unsigned count = 0; count < numSteps; count++) {
             // may want to try float version as well (with or without antialiasing)
-            int x = max(0, min(vW-1, (int)roundf(sinf(rad) * radius)));
-            int y = max(0, min(vH-1, (int)roundf(cosf(rad) * radius)));
+            // int x = max(0, min(vW-1, (int)roundf(sinf(rad) * radius)));
+            // int y = max(0, min(vH-1, (int)roundf(cosf(rad) * radius)));
+            int x = roundf(sinf(rad) * radius);
+            int y = roundf(cosf(rad) * radius);
             setPixelColorXY(x, y, col);
             if(useSymmetry) setPixelColorXY(y, x, col);// WLEDMM
             rad += step;

From 1ef13c207703dd32dc34f5472e87939759b9827b Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Sat, 17 Aug 2024 13:05:23 -0400
Subject: [PATCH 166/200] Arc 1D Expand uses drawArc if the segment is not
 "super simple"

WLEDMM: drawArc() is faster if it's NOT "super simple" as the regular M12_pArc code can do "useSymmetry" to speed things along on larger 2D layouts, but a more "complicated" segment likely uses mirroring which generates a symmetry speed-up, or other things which mean less pixels are calculated.
---
 wled00/FX_fcn.cpp | 77 ++++++++++++++++++++++++++---------------------
 1 file changed, 42 insertions(+), 35 deletions(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 9092e3f7..f8f2269e 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -971,44 +971,51 @@ void IRAM_ATTR_YN __attribute__((hot)) Segment::setPixelColor(int i, uint32_t co
         if (i==0)
           setPixelColorXY(0, 0, col);
         else {
-          //WLEDMM: drawArc(0, 0, i, col); could work as alternative
+          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
+            // uses mirroring which generates a symmetry speed-up, or other things which mean
+            // less pixels are calculated.
+            drawArc(0, 0, i, col); 
+          } else {
+            //WLEDMM: some optimizations for the drawing loop
+            //  pre-calculate loop limits, exploit symmetry at 45deg
+            float radius = float(i);
+            
+            // float step = HALF_PI / (2.85f * radius);  // upstream uses this
+            float step = HALF_PI / (M_PI * radius);      // WLEDMM we use the correct circumference
+            bool useSymmetry = (max(vH, vW) > 20);       // for segments wider than 20 pixels, we exploit symmetry
+            unsigned numSteps;
+            if (useSymmetry) numSteps = 1 + ((HALF_PI/2.0f + step/2.0f) / step); // with symmetry
+            else             numSteps = 1 + ((HALF_PI      + step/2.0f) / step); // without symmetry
 
-          //WLEDMM: some optimizations for the drawing loop
-          //  pre-calculate loop limits, exploit symmetry at 45deg
-          float radius = float(i);
-          // float step = HALF_PI / (2.85f * radius);  // upstream uses this
-          float step = HALF_PI / (M_PI * radius);      // WLEDMM we use the correct circumference
-          bool useSymmetry = (max(vH, vW) > 20);       // for segments wider than 20 pixels, we exploit symmetry
-          unsigned numSteps;
-          if (useSymmetry) numSteps = 1 + ((HALF_PI/2.0f + step/2.0f) / step); // with symmetry
-          else             numSteps = 1 + ((HALF_PI      + step/2.0f) / step); // without symmetry
+            float rad = 0.0f;
+            for (unsigned count = 0; count < numSteps; count++) {
+              // may want to try float version as well (with or without antialiasing)
+              // int x = max(0, min(vW-1, (int)roundf(sinf(rad) * radius)));
+              // int y = max(0, min(vH-1, (int)roundf(cosf(rad) * radius)));
+              int x = roundf(sinf(rad) * radius);
+              int y = roundf(cosf(rad) * radius);
+              setPixelColorXY(x, y, col);
+              if(useSymmetry) setPixelColorXY(y, x, col);// WLEDMM
+              rad += step;
+            }
 
-          float rad = 0.0f;
-          for (unsigned count = 0; count < numSteps; count++) {
-            // may want to try float version as well (with or without antialiasing)
-            // int x = max(0, min(vW-1, (int)roundf(sinf(rad) * radius)));
-            // int y = max(0, min(vH-1, (int)roundf(cosf(rad) * radius)));
-            int x = roundf(sinf(rad) * radius);
-            int y = roundf(cosf(rad) * radius);
-            setPixelColorXY(x, y, col);
-            if(useSymmetry) setPixelColorXY(y, x, col);// WLEDMM
-            rad += step;
+            // // Bresenham’s Algorithm (may not fill every pixel)
+            // int d = 3 - (2*i);
+            // int y = i, x = 0;
+            // while (y >= x) {
+            //  setPixelColorXY(x, y, col);
+            //  setPixelColorXY(y, x, col);
+            //  x++;
+            //  if (d > 0) {
+            //    y--;
+            //    d += 4 * (x - y) + 10;
+            //  } else {
+            //    d += 4 * x + 6;
+            //  }
+            // }
           }
-
-          // Bresenham’s Algorithm (may not fill every pixel)
-          //int d = 3 - (2*i);
-          //int y = i, x = 0;
-          //while (y >= x) {
-          //  setPixelColorXY(x, y, col);
-          //  setPixelColorXY(y, x, col);
-          //  x++;
-          //  if (d > 0) {
-          //    y--;
-          //    d += 4 * (x - y) + 10;
-          //  } else {
-          //    d += 4 * x + 6;
-          //  }
-          //}
         }
         break;
       case M12_pCorner: {

From b47c55db90e6c39fbbf103c51d64e0989c901200 Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Sun, 18 Aug 2024 13:21:55 +0200
Subject: [PATCH 167/200] fix 8266 builds

wled00/FX_fcn.cpp:974:16: error: '_isSuperSimpleSegment' was not declared in this scope
---
 wled00/FX.h         |  4 ++--
 wled00/FX_2Dfcn.cpp |  5 +++--
 wled00/FX_fcn.cpp   | 15 +++++++--------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/wled00/FX.h b/wled00/FX.h
index 546e8b98..17e70021 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -436,10 +436,10 @@ typedef struct Segment {
     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!!!
 
+    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
 #ifdef WLEDMM_FASTPATH
     // WLEDMM cache some values that won't change while drawing a frame
-    bool _isSimpleSegment = false;
-    bool _isSuperSimpleSegment = false;
     bool _isValid2D = false;
     uint8_t _brightness = 255; // final pixel brightness - including transitions and segment opacity
     bool _firstFill = true;  // dirty HACK support
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index bb0b1861..4518bdff 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -237,11 +237,12 @@ uint32_t __attribute__((hot)) WS2812FX::getPixelColorXY(uint16_t x, uint16_t y)
 
 // WLEDMM cache some values so we don't need to re-calc then for each pixel
 void Segment::startFrame(void) {
+  _isSimpleSegment = (grouping == 1) && (spacing == 0); // we can handle pixels faster when no grouping or spacing is involved
+  _isSuperSimpleSegment = !mirror && !mirror_y && (grouping == 1) && (spacing == 0); // fastest - we only draw one pixel per call
+
 #ifdef WLEDMM_FASTPATH
   _isValid2D  = isActive() && is2D();
   _brightness = currentBri(on ? opacity : 0);
-  _isSimpleSegment = (grouping == 1) && (spacing == 0); // we can handle pixels faster when no grouping or spacing is involved
-  _isSuperSimpleSegment = !mirror && !mirror_y && (grouping == 1) && (spacing == 0); // fastest - we only draw one pixel per call
   // if (reverse_y) _isSimpleSegment = false; // for A/B testing
   _2dWidth    = is2D() ? calc_virtualWidth() : virtualLength();
   _2dHeight   = calc_virtualHeight();
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index f8f2269e..c4b1a459 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -102,12 +102,11 @@ Segment::Segment(const Segment &orig) {
   DEBUG_PRINTLN(F("-- Copy segment constructor --"));
   memcpy((void*)this, (void*)&orig, sizeof(Segment)); //WLEDMM copy to this
   transitional = false; // copied segment cannot be in transition
-#ifdef WLEDMM_FASTPATH
   // WLEDMM temporarily prevent any fast draw calls to the new segment
   // _isValid2D = false;
   _isSimpleSegment = false;
   _isSuperSimpleSegment = false;
-#endif
+
   name = nullptr;
   data = nullptr;
   _dataLen = 0;
@@ -149,11 +148,11 @@ void Segment::allocLeds() {
 // move constructor --> moves everything (including buffer) from orig to this
 Segment::Segment(Segment &&orig) noexcept {
   DEBUG_PRINTLN(F("-- Move segment constructor --"));
-#ifdef WLEDMM_FASTPATH
+
   // WLEDMM temporarily prevent any fast draw calls to old and new segment
   orig._isSimpleSegment = false;
   orig._isSuperSimpleSegment = false;
-#endif
+
   memcpy((void*)this, (void*)&orig, sizeof(Segment));
   orig.transitional = false; // old segment cannot be in transition any more
 #ifdef WLEDMM_FASTPATH
@@ -184,12 +183,12 @@ Segment& Segment::operator= (const Segment &orig) {
     // copy source
     memcpy((void*)this, (void*)&orig, sizeof(Segment));
     transitional = false;
-#ifdef WLEDMM_FASTPATH
+
     // WLEDMM prevent any fast draw calls to this segment until the next frame starts
     //_isValid2D = false;
     _isSimpleSegment = false;
     _isSuperSimpleSegment = false;
-#endif
+
     // erase pointers to allocated data
     name = nullptr;
     data = nullptr;
@@ -217,11 +216,11 @@ Segment& Segment::operator= (Segment &&orig) noexcept {
     deallocateData(); // free old runtime data
     if (_t) { delete _t; _t = nullptr; }
     if (ledsrgb && !Segment::_globalLeds) free(ledsrgb); //WLEDMM: not needed anymore as we will use leds from copy. no need to nullify ledsrgb as it gets new value in memcpy
-#ifdef WLEDMM_FASTPATH
+
     // WLEDMM temporarily prevent any fast draw calls to old and new segment
     orig._isSimpleSegment = false;
     orig._isSuperSimpleSegment = false;
-#endif
+
     memcpy((void*)this, (void*)&orig, sizeof(Segment));
 #ifdef WLEDMM_FASTPATH
     // WLEDMM temporarily prevent any draw calls to old segment

From 9e24a634c2353e65920213c8540dfee78f8911ae Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Wed, 21 Aug 2024 13:43:59 -0400
Subject: [PATCH 168/200] ESP32 Dual Booting

---
 wled00/wled.cpp        |  5 +++--
 wled00/wled_serial.cpp | 25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index dfc7e75c..04f16bf8 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -2,7 +2,7 @@
 #include "wled.h"
 #include "wled_ethernet.h"
 #include <Arduino.h>
-
+#include "esp_ota_ops.h"
 #warning WLED-MM GPL-v3. By installing WLED MM you implicitly accept the terms!
 
 #if defined(ARDUINO_ARCH_ESP32) && defined(WLED_DISABLE_BROWNOUT_DET)
@@ -501,7 +501,8 @@ void WLED::setup()
   #ifdef WLED_RELEASE_NAME
   USER_PRINTF(" WLEDMM_%s %s, build %s.\n", versionString, releaseString, TOSTRING(VERSION)); // WLEDMM specific
   #endif
-
+  const esp_partition_t *boot_partition = esp_ota_get_running_partition();
+  USER_PRINTF("Booted from: %s which is %u bytes and type %u subtype %u at address %x\n",boot_partition->label,boot_partition->size,boot_partition->type,boot_partition->subtype,boot_partition->address);
 #ifdef ARDUINO_ARCH_ESP32
   DEBUG_PRINT(F("esp32 "));
   DEBUG_PRINTLN(ESP.getSdkVersion());
diff --git a/wled00/wled_serial.cpp b/wled00/wled_serial.cpp
index 9361891b..2e2165b1 100644
--- a/wled00/wled_serial.cpp
+++ b/wled00/wled_serial.cpp
@@ -1,4 +1,5 @@
 #include "wled.h"
+#include "esp_ota_ops.h"
 
 /*
  * Adalight and TPM2 handler
@@ -119,6 +120,30 @@ void handleSerial()
         } else if (next == 'v') {
           Serial.print("WLED"); Serial.write(' '); Serial.println(VERSION);
 
+        } else if (next == '^') {
+          esp_err_t err;
+          const esp_partition_t *boot_partition = esp_ota_get_boot_partition();
+          const esp_partition_t *running_partition = esp_ota_get_running_partition();
+          USER_PRINTF("Running on %s and we should have booted from %s. This %s\n",running_partition->label,boot_partition->label,(String(running_partition->label) == String(boot_partition->label))?"is what we expect.":"means OTA messed up!");
+          if (String(running_partition->label) == String(boot_partition->label)) {
+            esp_partition_iterator_t new_boot_partition_iterator = NULL;
+            if (boot_partition->subtype == ESP_PARTITION_SUBTYPE_APP_OTA_0) {
+              new_boot_partition_iterator = esp_partition_find(ESP_PARTITION_TYPE_APP,ESP_PARTITION_SUBTYPE_APP_OTA_1,"app1");
+            } else {
+              new_boot_partition_iterator = esp_partition_find(ESP_PARTITION_TYPE_APP,ESP_PARTITION_SUBTYPE_APP_OTA_0,"app0");
+            }
+            const esp_partition_t* new_boot_partition = esp_partition_get(new_boot_partition_iterator);
+            err = esp_ota_set_boot_partition(new_boot_partition);
+            if (err == ESP_OK) {
+              USER_PRINTF("Switching boot partitions from %s to %s in 3 seconds!\n",boot_partition->label,new_boot_partition->label);
+              delay(3000);
+              esp_restart();
+            } else {
+              USER_PRINTF("Looks like the other app partition (%s) is invalid. Ignoring.\n",new_boot_partition->label);
+            }
+          } else {
+            USER_PRINTF("Looks like the other partion is invalid as we exepected %s but we booted failsafe to %s. Ignoring boot change.\n",boot_partition->label,running_partition->label);
+          }
         } else if (next == 'X') {
           forceReconnect = true; // WLEDMM - force reconnect via Serial
         } else if (next == 0xB0) {updateBaudRate( 115200);

From 0a26aa918c7542fbeb5e6cb68ddbf293a8f21f4b Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Wed, 21 Aug 2024 13:51:58 -0400
Subject: [PATCH 169/200] Fixes for non-ESP32 boards

---
 wled00/wled.cpp        | 2 ++
 wled00/wled_serial.cpp | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index 04f16bf8..fd3b18f3 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -2,7 +2,9 @@
 #include "wled.h"
 #include "wled_ethernet.h"
 #include <Arduino.h>
+#ifdef ARDUINO_ARCH_ESP32
 #include "esp_ota_ops.h"
+#endif
 #warning WLED-MM GPL-v3. By installing WLED MM you implicitly accept the terms!
 
 #if defined(ARDUINO_ARCH_ESP32) && defined(WLED_DISABLE_BROWNOUT_DET)
diff --git a/wled00/wled_serial.cpp b/wled00/wled_serial.cpp
index 2e2165b1..91efb9c0 100644
--- a/wled00/wled_serial.cpp
+++ b/wled00/wled_serial.cpp
@@ -1,5 +1,7 @@
 #include "wled.h"
+#ifdef ARDUINO_ARCH_ESP32
 #include "esp_ota_ops.h"
+#endif
 
 /*
  * Adalight and TPM2 handler
@@ -121,6 +123,7 @@ void handleSerial()
           Serial.print("WLED"); Serial.write(' '); Serial.println(VERSION);
 
         } else if (next == '^') {
+          #ifdef ARDUINO_ARCH_ESP32
           esp_err_t err;
           const esp_partition_t *boot_partition = esp_ota_get_boot_partition();
           const esp_partition_t *running_partition = esp_ota_get_running_partition();
@@ -144,6 +147,9 @@ void handleSerial()
           } else {
             USER_PRINTF("Looks like the other partion is invalid as we exepected %s but we booted failsafe to %s. Ignoring boot change.\n",boot_partition->label,running_partition->label);
           }
+          #else
+            USER_PRINTLN("This function is only for ESP32 and newer boards.");
+          #endif
         } else if (next == 'X') {
           forceReconnect = true; // WLEDMM - force reconnect via Serial
         } else if (next == 0xB0) {updateBaudRate( 115200);

From ef6bedee766fccd68bfb09bc2f2f573175263af7 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Wed, 21 Aug 2024 13:53:14 -0400
Subject: [PATCH 170/200] Minor tidy

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

diff --git a/wled00/wled_serial.cpp b/wled00/wled_serial.cpp
index 91efb9c0..dfa0bba4 100644
--- a/wled00/wled_serial.cpp
+++ b/wled00/wled_serial.cpp
@@ -148,7 +148,7 @@ void handleSerial()
             USER_PRINTF("Looks like the other partion is invalid as we exepected %s but we booted failsafe to %s. Ignoring boot change.\n",boot_partition->label,running_partition->label);
           }
           #else
-            USER_PRINTLN("This function is only for ESP32 and newer boards.");
+          USER_PRINTLN("Boot partition switching is only available for ESP32 and newer boards.");
           #endif
         } else if (next == 'X') {
           forceReconnect = true; // WLEDMM - force reconnect via Serial

From 01e51e5751a074135be20028d5fc36a0c263e004 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Wed, 21 Aug 2024 13:57:58 -0400
Subject: [PATCH 171/200] More fixes for non-ESP32 boards

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

diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index fd3b18f3..688d5ec1 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -503,8 +503,10 @@ void WLED::setup()
   #ifdef WLED_RELEASE_NAME
   USER_PRINTF(" WLEDMM_%s %s, build %s.\n", versionString, releaseString, TOSTRING(VERSION)); // WLEDMM specific
   #endif
+  #ifdef ARDUINO_ARCH_ESP32
   const esp_partition_t *boot_partition = esp_ota_get_running_partition();
   USER_PRINTF("Booted from: %s which is %u bytes and type %u subtype %u at address %x\n",boot_partition->label,boot_partition->size,boot_partition->type,boot_partition->subtype,boot_partition->address);
+  #endif
 #ifdef ARDUINO_ARCH_ESP32
   DEBUG_PRINT(F("esp32 "));
   DEBUG_PRINTLN(ESP.getSdkVersion());

From b12b23d02c783c0038c9cd3083f5b11198163493 Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Wed, 21 Aug 2024 13:59:03 -0400
Subject: [PATCH 172/200] Boot log clarification.

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

diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index 688d5ec1..0922ec14 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -504,8 +504,8 @@ void WLED::setup()
   USER_PRINTF(" WLEDMM_%s %s, build %s.\n", versionString, releaseString, TOSTRING(VERSION)); // WLEDMM specific
   #endif
   #ifdef ARDUINO_ARCH_ESP32
-  const esp_partition_t *boot_partition = esp_ota_get_running_partition();
-  USER_PRINTF("Booted from: %s which is %u bytes and type %u subtype %u at address %x\n",boot_partition->label,boot_partition->size,boot_partition->type,boot_partition->subtype,boot_partition->address);
+  const esp_partition_t *running_partition = esp_ota_get_running_partition();
+  USER_PRINTF("Running from: %s which is %u bytes and type %u subtype %u at address %x\n",boot_partition->label,boot_partition->size,boot_partition->type,boot_partition->subtype,boot_partition->address);
   #endif
 #ifdef ARDUINO_ARCH_ESP32
   DEBUG_PRINT(F("esp32 "));

From aa38c113e3942a6c04a39302797830910deaedcd Mon Sep 17 00:00:00 2001
From: Troy <5659019+troyhacks@users.noreply.github.com>
Date: Wed, 21 Aug 2024 14:01:11 -0400
Subject: [PATCH 173/200] More boot log clarity

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

diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index 0922ec14..9d54631f 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -505,7 +505,7 @@ void WLED::setup()
   #endif
   #ifdef ARDUINO_ARCH_ESP32
   const esp_partition_t *running_partition = esp_ota_get_running_partition();
-  USER_PRINTF("Running from: %s which is %u bytes and type %u subtype %u at address %x\n",boot_partition->label,boot_partition->size,boot_partition->type,boot_partition->subtype,boot_partition->address);
+  USER_PRINTF("Running from: %s which is %u bytes and type %u subtype %u at address %x\n",running_partition->label,running_partition->size,running_partition->type,running_partition->subtype,running_partition->address);
   #endif
 #ifdef ARDUINO_ARCH_ESP32
   DEBUG_PRINT(F("esp32 "));

From 0d1182755285cfae7e1ac16fe86e38f438d65497 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Wed, 21 Aug 2024 22:40:40 +0100
Subject: [PATCH 174/200] Add pinout for HD-WF2

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

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 8783730e..ea48d6e6 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -588,6 +588,31 @@ 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) // ESP32-S3
+
+  // Huidu HD-WF2 ESP32-S3
+  // https://www.aliexpress.com/item/1005002258734810.html
+  // https://github.com/mrcodetastic/ESP32-HUB75-MatrixPanel-DMA/issues/433
+
+  USER_PRINTLN("MatrixPanel_I2S_DMA - HD-WF2 S3 config");
+
+  mxconfig.gpio.r1 = 2;
+  mxconfig.gpio.g1 = 6;
+  mxconfig.gpio.b1 = 10;
+  mxconfig.gpio.r2 = 3;
+  mxconfig.gpio.g2 = 7;
+  mxconfig.gpio.b2 = 11;
+
+  mxconfig.gpio.lat = 33;
+  mxconfig.gpio.oe  = 35;
+  mxconfig.gpio.clk = 34;
+
+  mxconfig.gpio.a = 39;
+  mxconfig.gpio.b = 38;
+  mxconfig.gpio.c = 37;
+  mxconfig.gpio.d = 36;
+  mxconfig.gpio.e = 21;
+
 #elif defined(ESP32_FORUM_PINOUT) // Common format for boards designed for SmartMatrix
 
   USER_PRINTLN("MatrixPanel_I2S_DMA - ESP32_FORUM_PINOUT");

From a5600950b569406904ba991a1a24ddc7b4ff99e6 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Wed, 21 Aug 2024 23:34:11 +0100
Subject: [PATCH 175/200] Enable HUB75 for the esp32S3_8MB_M for HD-WF2

---
 platformio.ini         | 3 +++
 wled00/bus_manager.cpp | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 94bb35e7..742b8f0d 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1866,6 +1866,7 @@ build_unflags =
 
 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 ;; un-comment in case your board supports PSRAM
   -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
@@ -1893,6 +1894,8 @@ 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
 board_build.flash_mode = qio
diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index ea48d6e6..a3174357 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -557,7 +557,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   }
 
   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")
+    USER_PRINT("WARNING, only single panel can be used of 64 pixel boards due to memory");
     mxconfig.chain_length = 1;
   }
 

From 1e693b5c9d090e0c05e99740610968ddfb93eca1 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Wed, 21 Aug 2024 23:35:36 +0100
Subject: [PATCH 176/200] Add new build esp32S3_4MB_S the Huidu HD-WF2 should
 be 8M, but formatting fails where as 4M works

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

diff --git a/platformio.ini b/platformio.ini
index 742b8f0d..cb24513a 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -72,6 +72,7 @@ default_envs =
   esp32_pico_4MB_M
   esp32_4MB_PSRAM_S
   ; esp32_4MB_PSRAM_REV3_S ;; experimental, optimized for WROVER-E with "revision3" chip
+  esp32S3_4MB_S
   esp32S3_8MB_S            ;; experimental, optimized for speed
   esp32S3_8MB_M
   esp32S3_4MB_PSRAM_S      ;; for lolin s3 mini, S3 zero, S3 super mini - optimized for speed
@@ -1852,6 +1853,37 @@ lib_deps = ${esp32_4MB_V4_M_base.esp32_lib_deps}
 # ------------------------------------------------------------------------------
 # esp32-S3 environments
 # ------------------------------------------------------------------------------
+[env:esp32S3_4MB_S]
+extends = esp32_4MB_V4_M_base
+board = esp32-s3-devkitc-1
+build_unflags = 
+  -D USERMOD_DALLASTEMPERATURE ;; disabled because it hangs during usermod setup on -S3 (autodetect broken?)
+  -D USE_ALT_DISPLAY ;; four line display seems to have problems with I2C - it hangs during usermod setup
+  -D USERMOD_FOUR_LINE_DISPLAY ;; see above
+  -D USERMOD_ROTARY_ENCODER_UI ;; see above
+  -D WLED_ENABLE_DMX ;; disabled because it does not work with ESP-IDF 4.4.x (buggy driver in SparkFunDMX)
+
+build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-indentation -Wno-format-truncation
+  ${common_mm.build_flags_S} 
+  ${common_mm.HUB75_build_flags}
+  ; -DBOARD_HAS_PSRAM -D WLED_USE_PSRAM_JSON -D WLED_USE_PSRAM ;; un-comment in case your board supports PSRAM
+  -D WLED_RELEASE_NAME=esp32S3_4MB_S 
+  -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)
+  -D WLED_WATCHDOG_TIMEOUT=0 -D CONFIG_ASYNC_TCP_USE_WDT=0
+  ; -D U8X8_HAVE_2ND_HW_I2C ;; experimental - tells U8g2 lib that a second HW I2C unit exists
+  -D WLED_DISABLE_LOXONE ; FLASH 1272 bytes
+  -D WLED_DISABLE_ALEXA ;  RAM 116 bytes; FLASH 13524 bytes
+  ; -D WLED_DISABLE_MQTT ;   RAM 216 bytes; FLASH 16496 bytes
+  ; -D WLED_DISABLE_HUESYNC ;RAM 122 bytes; FLASH 6308 bytes
+  ; -D WLED_DISABLE_INFRARED ;RAM 136 bytes; FLASH 24492 bytes
+  ;;-D WLEDMM_FASTPATH ; WLEDMM experimental option. Reduces audio lag (latency), and allows for faster LED framerates. May break compatibility with previous versions.
+  ; -D WLED_DEBUG
+  ; -D SR_DEBUG
+  ; -D MIC_LOGGER
+lib_deps = ${esp32s3.lib_deps} ${common_mm.lib_deps_S}
+    ${common_mm.HUB75_lib_deps}
 
 
 [env:esp32S3_8MB_M]

From 1e6cdc2c5bebe5bf9fb998b409d7e0eedc696da4 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Thu, 22 Aug 2024 20:41:23 +0100
Subject: [PATCH 177/200] HD-WF1 pinout

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

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index a3174357..5f10ec77 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -613,6 +613,30 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   mxconfig.gpio.d = 36;
   mxconfig.gpio.e = 21;
 
+#elif defined(CONFIG_IDF_TARGET_ESP32S2) // ESP32-S2
+
+  // Huidu HD-WF1 ESP32-S2
+  // https://github.com/mrcodetastic/ESP32-HUB75-MatrixPanel-DMA/issues/433
+
+  USER_PRINTLN("MatrixPanel_I2S_DMA - HD-WF1 S2 config");
+
+  mxconfig.gpio.r1 = 2;
+  mxconfig.gpio.g1 = 6;
+  mxconfig.gpio.b1 = 3;
+  mxconfig.gpio.r2 = 4;
+  mxconfig.gpio.g2 = 8;
+  mxconfig.gpio.b2 = 5;
+
+  mxconfig.gpio.lat = 33;
+  mxconfig.gpio.oe  = 35;
+  mxconfig.gpio.clk = 34;
+
+  mxconfig.gpio.a = 39;
+  mxconfig.gpio.b = 38;
+  mxconfig.gpio.c = 37;
+  mxconfig.gpio.d = 36;
+  mxconfig.gpio.e = 12;
+
 #elif defined(ESP32_FORUM_PINOUT) // Common format for boards designed for SmartMatrix
 
   USER_PRINTLN("MatrixPanel_I2S_DMA - ESP32_FORUM_PINOUT");

From 9c21d3fc7206641475211ffc30f502178a7f55ad Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Fri, 23 Aug 2024 12:22:01 +0100
Subject: [PATCH 178/200] Add *untested* HD-WF1 build

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

diff --git a/platformio.ini b/platformio.ini
index cb24513a..58961dfd 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -2208,6 +2208,44 @@ monitor_filters = esp32_exception_decoder
 ; RAM:   [==        ]  21.8% (used 71304 bytes from 327680 bytes)
 ; Flash: [========  ]  84.0% (used 1596970 bytes from 1900544 bytes)
 
+[env:HD-WF1]
+extends = esp32_4MB_V4_S_base
+platform = ${esp32s2.platform}                           ;; using 5.2.0, due to massive connectivity problems on -S2 with 5.3.0
+platform_packages = ${esp32s2.platform_packages}
+
+board = nodemcu-32s2
+upload_speed = 256000 ;; 921600
+build_unflags = ${common.build_unflags}
+  -DARDUINO_USB_CDC_ON_BOOT=1
+  -DARDUINO_USB_DFU_ON_BOOT=0
+  -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
+  -DBOARD_HAS_PSRAM
+build_flags = ${common.build_flags} ${esp32s2.build_flags} 
+  ;; ${Debug_Flags.build_flags}
+  -D WLED_WATCHDOG_TIMEOUT=0 -D CONFIG_ASYNC_TCP_USE_WDT=0
+  ${common_mm.build_flags_S} 
+  ${common_mm.HUB75_build_flags}
+  -Wno-misleading-indentation -Wno-format-truncation
+  -D WLED_RELEASE_NAME=esp32s2_HD_WF1_4MB_M
+  -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
+  -D WLED_DISABLE_INFRARED ;; save flash space
+  -D WLED_DISABLE_ALEXA    ;; save flash space
+  -D WLED_DISABLE_HUESYNC  ;; save flash space
+  -D WLED_DISABLE_LOXONE   ;; save flash space
+  -D WLEDMM_SAVE_FLASH
+
+lib_deps = ${esp32s2.lib_deps} ${common_mm.lib_deps_S}
+  ${common_mm.HUB75_lib_deps}
+
+lib_ignore = 
+  IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
+  OneWire         ; not needed as we don't include USERMOD_DALLASTEMPERATURE
+monitor_filters = esp32_exception_decoder
 
 # ------------------------------------------------------------------------------
 # esp32-C3 environments

From 818b3f192894f24e082e1ebad2a6690031253a94 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sun, 25 Aug 2024 16:40:15 +0100
Subject: [PATCH 179/200] Add animartrix to S3 builds with HUB75 support

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

diff --git a/platformio.ini b/platformio.ini
index 58961dfd..134429bb 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1866,6 +1866,7 @@ build_unflags =
 build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-indentation -Wno-format-truncation
   ${common_mm.build_flags_S} 
   ${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_RELEASE_NAME=esp32S3_4MB_S 
   -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
@@ -1884,6 +1885,7 @@ build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-inden
   ; -D MIC_LOGGER
 lib_deps = ${esp32s3.lib_deps} ${common_mm.lib_deps_S}
     ${common_mm.HUB75_lib_deps}
+    ${common_mm.animartrix_lib_deps}
 
 
 [env:esp32S3_8MB_M]
@@ -1899,6 +1901,7 @@ build_unflags =
 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}
+  ${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_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
@@ -1927,6 +1930,7 @@ build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-inden
   ; -D MIC_LOGGER
 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 = tools/WLED_ESP32_8MB.csv

From 69baef126f4bf11aa87a892743848d0e34e117ba Mon Sep 17 00:00:00 2001
From: Frank <frank.moehle@outlook.de>
Date: Sun, 25 Aug 2024 20:37:22 +0200
Subject: [PATCH 180/200] athom_music buildenv updates (solves #159)

disabled some usermods for athom, to bring back MQTT.
---
 platformio.ini | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 94bb35e7..967a9a19 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -2461,12 +2461,17 @@ board_build.partitions = tools/WLED_ESP32_16MB.csv         ;; WLED standard for
 ;https://www.athom.tech/blank-1/wled-esp32-music-addressable-led-strip-controller
 [env:athom_music_esp32_4MB_M]
 extends = esp32_4MB_M_base
+build_unflags = ${common.build_unflags}
+  -D USERMOD_ARTIFX ;; disabled to save some program space in flash
+  -D USERMOD_DALLASTEMPERATURE ;; disabled - flash space is too tight for this
+  -D USERMOD_ROTARY_ENCODER_UI ;; see above
 build_flags = ${esp32_4MB_M_base.build_flags} 
   ${Athom_PDMmic.build_flags}
   -D WLED_AP_SSID_UNIQUE
   -D WLED_RELEASE_NAME=athom_music_esp32_4MB_M
   -D ABL_MILLIAMPS_DEFAULT=14500 ; max 15A
-  -D WLED_DISABLE_MQTT -D WLED_DISABLE_LOXONE 
+  ; -D WLED_DISABLE_MQTT
+  -D WLED_DISABLE_LOXONE
   -D WLED_DISABLE_ADALIGHT ;to get 4ld working
   -D BTNPIN=0 -D RLYPIN=2 -D IRPIN=25 -D IRTYPE=9 -D LEDPIN=18
   -D AUDIOPIN=-1 
@@ -2478,8 +2483,9 @@ build_flags = ${esp32_4MB_M_base.build_flags}
   ; -D PIR_SENSOR_PIN=-1
   ; -D PWM_PIN=-1
   ; -D WLED_USE_MY_CONFIG
-; RAM:   [===       ]  25.9% (used 84948 bytes from 327680 bytes)
-; Flash: [==========]  95.9% (used 1509113 bytes from 1572864 bytes)
+  -D WLEDMM_SAVE_FLASH
+; RAM:   [===       ]  26.3% (used 86204 bytes from 327680 bytes)
+; Flash: [========= ]  93.6% (used 1471681 bytes from 1572864 bytes)
 
 ;https://shop.myhome-control.de/Elektronik/
 [env:abc_wled_controller_v43_S]

From c5aa6b963bf9bdcc85a4805e3d109e03174f962c Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Thu, 29 Aug 2024 21:13:54 +0100
Subject: [PATCH 181/200] Default to hub75 32x32

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

diff --git a/platformio.ini b/platformio.ini
index 134429bb..13cee381 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -2242,6 +2242,7 @@ build_flags = ${common.build_flags} ${esp32s2.build_flags}
   -D WLED_DISABLE_HUESYNC  ;; save flash space
   -D WLED_DISABLE_LOXONE   ;; save flash space
   -D WLEDMM_SAVE_FLASH
+  -D DEFAULT_LED_TYPE=101 ;; hub75 32x32
 
 lib_deps = ${esp32s2.lib_deps} ${common_mm.lib_deps_S}
   ${common_mm.HUB75_lib_deps}

From d1782519dbd780df692d06a6fb55e1bccc4c2b0c Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sat, 31 Aug 2024 17:06:39 +0100
Subject: [PATCH 182/200] HD-WF1 - too low memory to be of used for hub75

---
 platformio.ini | 40 ----------------------------------------
 1 file changed, 40 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 13cee381..16f758cb 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -2212,46 +2212,6 @@ monitor_filters = esp32_exception_decoder
 ; RAM:   [==        ]  21.8% (used 71304 bytes from 327680 bytes)
 ; Flash: [========  ]  84.0% (used 1596970 bytes from 1900544 bytes)
 
-[env:HD-WF1]
-extends = esp32_4MB_V4_S_base
-platform = ${esp32s2.platform}                           ;; using 5.2.0, due to massive connectivity problems on -S2 with 5.3.0
-platform_packages = ${esp32s2.platform_packages}
-
-board = nodemcu-32s2
-upload_speed = 256000 ;; 921600
-build_unflags = ${common.build_unflags}
-  -DARDUINO_USB_CDC_ON_BOOT=1
-  -DARDUINO_USB_DFU_ON_BOOT=0
-  -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
-  -DBOARD_HAS_PSRAM
-build_flags = ${common.build_flags} ${esp32s2.build_flags} 
-  ;; ${Debug_Flags.build_flags}
-  -D WLED_WATCHDOG_TIMEOUT=0 -D CONFIG_ASYNC_TCP_USE_WDT=0
-  ${common_mm.build_flags_S} 
-  ${common_mm.HUB75_build_flags}
-  -Wno-misleading-indentation -Wno-format-truncation
-  -D WLED_RELEASE_NAME=esp32s2_HD_WF1_4MB_M
-  -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
-  -D WLED_DISABLE_INFRARED ;; save flash space
-  -D WLED_DISABLE_ALEXA    ;; save flash space
-  -D WLED_DISABLE_HUESYNC  ;; save flash space
-  -D WLED_DISABLE_LOXONE   ;; save flash space
-  -D WLEDMM_SAVE_FLASH
-  -D DEFAULT_LED_TYPE=101 ;; hub75 32x32
-
-lib_deps = ${esp32s2.lib_deps} ${common_mm.lib_deps_S}
-  ${common_mm.HUB75_lib_deps}
-
-lib_ignore = 
-  IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
-  OneWire         ; not needed as we don't include USERMOD_DALLASTEMPERATURE
-monitor_filters = esp32_exception_decoder
-
 # ------------------------------------------------------------------------------
 # esp32-C3 environments
 # ------------------------------------------------------------------------------

From 6d83adae3c96b8b8c5e7dffd28f7aa1627555003 Mon Sep 17 00:00:00 2001
From: Blaz Kristan <blaz@kristan-sp.si>
Date: Wed, 4 Sep 2024 21:17:21 +0200
Subject: [PATCH 183/200] Mirroring bugfix.

---
 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 4518bdff..56d81443 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -300,7 +300,7 @@ void IRAM_ATTR __attribute__((hot)) Segment::setPixelColorXY_fast(int x, int y,
     else           strip.setPixelColorXY_fast(start + x, startY + hei_ - y - 1, scaled_col);
   }
   if (mirror_y && mirror) { //set the corresponding vertically AND horizontally mirrored pixel
-    strip.setPixelColorXY_fast(wid_ - x - 1, hei_ - y - 1, scaled_col);
+    strip.setPixelColorXY_fast(start + wid_ - x - 1, startY + hei_ - y - 1, scaled_col);
   }
 }
 
@@ -376,7 +376,7 @@ void IRAM_ATTR_YN Segment::setPixelColorXY(int x, int y, uint32_t col) //WLEDMM:
         else           strip.setPixelColorXY(start + xX, startY + hei_ - yY - 1, col);
       }
       if (mirror_y && mirror) { //set the corresponding vertically AND horizontally mirrored pixel
-        strip.setPixelColorXY(wid_ - xX - 1, hei_ - yY - 1, col);
+        strip.setPixelColorXY(start + wid_ - xX - 1, startY + hei_ - yY - 1, col);
       }
     }
   }

From bef964dcba7895f70b27913ee9a43c48bc2c4fbf Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 6 Sep 2024 12:54:27 +0200
Subject: [PATCH 184/200] bugfix: prevent clearing of  segment  settings when
 changing effects

in multi-segment setups, the segment options reverse, reverseY, mirror, and mirrorY were accidentally overwritten  when changing effects.
---
 wled00/FX_fcn.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index c4b1a459..a7b9b2eb 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -599,10 +599,6 @@ void Segment::setMode(uint8_t fx, bool loadDefaults) {
   static int16_t oldMap = -1;
   static int16_t oldSim = -1;
   static int16_t oldPalette = -1;
-  static byte oldReverse = -1;
-  static byte oldMirror = -1;
-  static byte oldReverse_y = -1;
-  static byte oldMirror_y = -1;
   // if we have a valid mode & is not reserved
   if (fx < strip.getModeCount() && strncmp_P("RSVD", strip.getModeData(fx), 4)) {
     if (fx != mode) {
@@ -624,10 +620,10 @@ void Segment::setMode(uint8_t fx, bool loadDefaults) {
         //WLEDMM: return to old setting if not explicitly set
         sOpt = extractModeDefaults(fx, "m12");  if (sOpt >= 0) {if (oldMap==-1) oldMap = map1D2D; map1D2D   = constrain(sOpt, 0, 7);} else {if (oldMap!=-1) map1D2D = oldMap; oldMap = -1;}
         sOpt = extractModeDefaults(fx, "si");   if (sOpt >= 0) {if (oldSim==-1) oldSim = soundSim; soundSim  = constrain(sOpt, 0, 1);} else {if (oldSim!=-1) soundSim = oldSim; oldSim = -1;}
-        sOpt = extractModeDefaults(fx, "rev");  if (sOpt >= 0) {if (oldReverse==-1) oldReverse = reverse; reverse   = (bool)sOpt;} else {if (oldReverse!=-1) reverse = oldReverse==1; oldReverse = -1;}
-        sOpt = extractModeDefaults(fx, "mi");   if (sOpt >= 0) {if (oldMirror==-1) oldMirror = mirror; mirror  = (bool)sOpt;} else {if (oldMirror!=-1) mirror = oldMirror==1; oldMirror = -1;} // NOTE: setting this option is a risky business
-        sOpt = extractModeDefaults(fx, "rY");   if (sOpt >= 0) {if (oldReverse_y==-1) oldReverse_y = reverse_y; reverse_y = (bool)sOpt;} else {if (oldReverse_y!=-1) reverse_y = oldReverse_y==1; oldReverse_y = -1;}
-        sOpt = extractModeDefaults(fx, "mY");   if (sOpt >= 0) {if (oldMirror_y==-1) oldMirror_y = mirror_y; mirror_y  = (bool)sOpt;} else {if (oldMirror_y!=-1) mirror_y = oldMirror_y==1; oldMirror_y = -1;} // NOTE: setting this option is a risky business
+        sOpt = extractModeDefaults(fx, "rev");  if (sOpt >= 0) reverse   = (bool)sOpt;
+        sOpt = extractModeDefaults(fx, "mi");   if (sOpt >= 0) mirror    = (bool)sOpt; // NOTE: setting this option is a risky business
+        sOpt = extractModeDefaults(fx, "rY");   if (sOpt >= 0) reverse_y = (bool)sOpt;
+        sOpt = extractModeDefaults(fx, "mY");   if (sOpt >= 0) mirror_y  = (bool)sOpt; // NOTE: setting this option is a risky business
         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)

From fc2e1263cbf4ee591faf9babafddccc496aca5ab Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 6 Sep 2024 13:06:28 +0200
Subject: [PATCH 185/200] new option don't use effect-specific palette or 
 mapping modes

* new setting in UI page: "Don't use effect palette and segment parameters" - only meaningful when "Use effect default parameters" is enabled, too.

--> effect slider defaults will still be applied, however palette, 1D2D mapping mode and other segment settings will not change.
---
 wled00/FX.h                 |  2 +-
 wled00/FX_fcn.cpp           | 20 +++++++++++---------
 wled00/data/index.js        |  4 ++--
 wled00/data/settings_ui.htm |  3 ++-
 wled00/data/simple.js       |  2 +-
 wled00/json.cpp             |  2 +-
 wled00/set.cpp              |  2 +-
 wled00/wled.h               |  2 +-
 8 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/wled00/FX.h b/wled00/FX.h
index 17e70021..a0f3e90f 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -594,7 +594,7 @@ typedef struct Segment {
     void    setCCT(uint16_t k);
     void    setOpacity(uint8_t o);
     void    setOption(uint8_t n, bool val);
-    void    setMode(uint8_t fx, bool loadDefaults = false);
+    void    setMode(uint8_t fx, bool loadDefaults = false, bool sliderDefaultsOnly = false);
     void    setPalette(uint8_t pal);
     uint8_t differs(Segment& b) const;
     void    refreshLightCapabilities(void);
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index a7b9b2eb..1f086fe0 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -594,7 +594,7 @@ void Segment::setOption(uint8_t n, bool val) {
   if (!(n == SEG_OPTION_SELECTED || n == SEG_OPTION_RESET || n == SEG_OPTION_TRANSITIONAL)) stateChanged = true; // send UDP/WS broadcast
 }
 
-void Segment::setMode(uint8_t fx, bool loadDefaults) {
+void Segment::setMode(uint8_t fx, bool loadDefaults, bool sliderDefaultsOnly) {
   //WLEDMM: return to old setting if not explicitly set
   static int16_t oldMap = -1;
   static int16_t oldSim = -1;
@@ -617,14 +617,16 @@ void Segment::setMode(uint8_t fx, bool loadDefaults) {
         sOpt = extractModeDefaults(fx, "o1");   check1    = (sOpt >= 0) ? (bool)sOpt : false;
         sOpt = extractModeDefaults(fx, "o2");   check2    = (sOpt >= 0) ? (bool)sOpt : false;
         sOpt = extractModeDefaults(fx, "o3");   check3    = (sOpt >= 0) ? (bool)sOpt : false;
-        //WLEDMM: return to old setting if not explicitly set
-        sOpt = extractModeDefaults(fx, "m12");  if (sOpt >= 0) {if (oldMap==-1) oldMap = map1D2D; map1D2D   = constrain(sOpt, 0, 7);} else {if (oldMap!=-1) map1D2D = oldMap; oldMap = -1;}
-        sOpt = extractModeDefaults(fx, "si");   if (sOpt >= 0) {if (oldSim==-1) oldSim = soundSim; soundSim  = constrain(sOpt, 0, 1);} else {if (oldSim!=-1) soundSim = oldSim; oldSim = -1;}
-        sOpt = extractModeDefaults(fx, "rev");  if (sOpt >= 0) reverse   = (bool)sOpt;
-        sOpt = extractModeDefaults(fx, "mi");   if (sOpt >= 0) mirror    = (bool)sOpt; // NOTE: setting this option is a risky business
-        sOpt = extractModeDefaults(fx, "rY");   if (sOpt >= 0) reverse_y = (bool)sOpt;
-        sOpt = extractModeDefaults(fx, "mY");   if (sOpt >= 0) mirror_y  = (bool)sOpt; // NOTE: setting this option is a risky business
-        sOpt = extractModeDefaults(fx, "pal");  if (sOpt >= 0) {if (oldPalette==-1) oldPalette = palette; setPalette(sOpt);} else {if (oldPalette!=-1) setPalette(oldPalette); oldPalette = -1;}
+        if (!sliderDefaultsOnly) {
+          //WLEDMM: return to old setting if not explicitly set
+          sOpt = extractModeDefaults(fx, "m12");  if (sOpt >= 0) {if (oldMap==-1) oldMap = map1D2D; map1D2D   = constrain(sOpt, 0, 7);} else {if (oldMap!=-1) map1D2D = oldMap; oldMap = -1;}
+          sOpt = extractModeDefaults(fx, "si");   if (sOpt >= 0) {if (oldSim==-1) oldSim = soundSim; soundSim  = constrain(sOpt, 0, 1);} else {if (oldSim!=-1) soundSim = oldSim; oldSim = -1;}
+          sOpt = extractModeDefaults(fx, "rev");  if (sOpt >= 0) reverse   = (bool)sOpt;
+          sOpt = extractModeDefaults(fx, "mi");   if (sOpt >= 0) mirror    = (bool)sOpt; // NOTE: setting this option is a risky business
+          sOpt = extractModeDefaults(fx, "rY");   if (sOpt >= 0) reverse_y = (bool)sOpt;
+          sOpt = extractModeDefaults(fx, "mY");   if (sOpt >= 0) mirror_y  = (bool)sOpt; // NOTE: setting this option is a risky business
+          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)
       stateChanged = true; // send UDP/WS broadcast
diff --git a/wled00/data/index.js b/wled00/data/index.js
index 61480d5e..1a6ba618 100644
--- a/wled00/data/index.js
+++ b/wled00/data/index.js
@@ -27,7 +27,7 @@ var cfg = {
 	theme:{base:"dark", bg:{url:""}, alpha:{bg:0.6,tab:0.8}, color:{bg:""}},
 	comp :{colors:{picker: true, rgb: false, quick: true, hex: false},
           labels:true, pcmbot:false, pid:true, seglen:false, segpwr:false, segexp:true, 
-          css:true, hdays:false, fxdef:true} //WLEDMM segexp true as default
+          css:true, hdays:false, fxdef:true, fxdef2:false} //WLEDMM segexp true as default, fxdef2 added
 };
 var hol = [
 	[0,11,24,4,"https://aircoookie.github.io/xmas.png"], // christmas
@@ -2856,7 +2856,7 @@ function setFX(ind = null)
 	} else {
 		d.querySelector(`#fxlist input[name="fx"][value="${ind}"]`).checked = true;
 	}
-	var obj = {"seg": {"fx": parseInt(ind), "fxdef": cfg.comp.fxdef}}; // fxdef sets effect parameters to default values
+	var obj = {"seg": {"fx": parseInt(ind), "fxdef": cfg.comp.fxdef, "fxdef2": cfg.comp.fxdef2}}; // fxdef sets effect parameters to default values; WLEDMM fxdef2 only set slider defaults
 	requestJson(obj);
 }
 
diff --git a/wled00/data/settings_ui.htm b/wled00/data/settings_ui.htm
index dfafb9d9..285632d3 100644
--- a/wled00/data/settings_ui.htm
+++ b/wled00/data/settings_ui.htm
@@ -26,7 +26,8 @@
 			"segexp" : "Always expand first segment",
 			"css": "Enable custom CSS",
 			"hdays": "Enable custom Holidays list",
-			"fxdef": "Use effect default parameters"
+			"fxdef": "Use effect default parameters",
+			"fxdef2": "Don't use effect palette and segment parameters"
 		},
 		"theme":{
 			"alpha": {
diff --git a/wled00/data/simple.js b/wled00/data/simple.js
index 8e3d2914..aa4fb22c 100644
--- a/wled00/data/simple.js
+++ b/wled00/data/simple.js
@@ -1135,7 +1135,7 @@ function setSegBri(s)
 function setEffect(ind = 0)
 {
 	tglFxDropdown();
-	var obj = {"seg": {"fx": parseInt(ind), "fxdef":true}}; // fxdef sets effect parameters to default values, TODO add client setting
+	var obj = {"seg": {"fx": parseInt(ind), "fxdef":true, "fxdef2":false}}; // fxdef sets effect parameters to default values, TODO add client setting
 	requestJson(obj);
 }
 
diff --git a/wled00/json.cpp b/wled00/json.cpp
index f672f53d..f0f189b2 100644
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@@ -302,7 +302,7 @@ bool deserializeSegment(JsonObject elem, byte it, byte presetId)
   // end fix
   if (getVal(elem["fx"], &fx, 0, last)) { //load effect ('r' random, '~' inc/dec, 0-255 exact value, 5~10r pick random between 5 & 10)
     if (!presetId && currentPlaylist>=0) unloadPlaylist();
-    if (fx != seg.mode) seg.setMode(fx, elem[F("fxdef")]);
+    if (fx != seg.mode) seg.setMode(fx, elem[F("fxdef")], elem[F("fxdef2")]); // WLEDMM fxdef2 added
   }
 
   //getVal also supports inc/decrementing and random
diff --git a/wled00/set.cpp b/wled00/set.cpp
index 044b6e77..6c9b57c2 100644
--- a/wled00/set.cpp
+++ b/wled00/set.cpp
@@ -1062,7 +1062,7 @@ bool handleSet(AsyncWebServerRequest *request, const String& req, bool apply)
   for (uint8_t i = 0; i < strip.getSegmentsNum(); i++) {
     Segment& seg = strip.getSegment(i);
     if (i != selectedSeg && (singleSegment || !seg.isActive() || !seg.isSelected())) continue; // skip non main segments if not applying to all
-    if (fxModeChanged)    seg.setMode(effectIn, req.indexOf(F("FXD="))>0);  // apply defaults if FXD= is specified
+    if (fxModeChanged)    seg.setMode(effectIn, req.indexOf(F("FXD="))>0, req.indexOf(F("FXD2="))>0);  // apply defaults if FXD= is specified
     if (speedChanged)     seg.speed     = speedIn;
     if (intensityChanged) seg.intensity = intensityIn;
     if (paletteChanged)   seg.setPalette(paletteIn);
diff --git a/wled00/wled.h b/wled00/wled.h
index ed232910..9bfd7dd1 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2408160
+#define VERSION 2409060
 
 // 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 eb3ae13fab304c52fdfc813a847e77848c7a824d Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 6 Sep 2024 15:35:00 +0200
Subject: [PATCH 186/200] 0.14.1-b32.41.dev -> "dev" for developer build

this is a valid "semantic version".
checked by https://jubianchi.github.io/semver-check/#/version/0.14.1-b32.41.dev
---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 wled00/improv.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dce951b8..aa060721 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "wled",
-  "version": "0.14.1-b32.41",
+  "version": "0.14.1-b32.41.dev",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "wled",
-      "version": "0.14.1-b32.41",
+      "version": "0.14.1-b32.41.dev",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "clean-css": "^4.2.3",
diff --git a/package.json b/package.json
index 2faab264..c73dd26f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wled",
-  "version": "0.14.1-b32.41",
+  "version": "0.14.1-b32.41.dev",
   "description": "Tools for WLED project",
   "main": "tools/cdata.js",
   "directories": {
diff --git a/wled00/improv.cpp b/wled00/improv.cpp
index d0b97182..afcbbbb2 100644
--- a/wled00/improv.cpp
+++ b/wled00/improv.cpp
@@ -211,7 +211,7 @@ void sendImprovInfoResponse() {
   //Use serverDescription if it has been changed from the default "WLED", else mDNS name
   bool useMdnsName = (strcmp(serverDescription, "WLED") == 0 && strlen(cmDNS) > 0);
   char vString[32];
-  snprintf_P(vString, sizeof(vString)-1, PSTR("0.14.1-b32.40/%i"),VERSION);
+  snprintf_P(vString, sizeof(vString)-1, PSTR("0.14.1-b32.41/%i"),VERSION);
   const char *str[4] = {"WLED", vString, bString, useMdnsName ? cmDNS : serverDescription};
 
   sendImprovRPCResult(ImprovRPCType::Request_Info, 4, str);

From dbb8683ad66ebb3a637ef962e904dff31d81c194 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 6 Sep 2024 15:59:55 +0200
Subject: [PATCH 187/200] Update index.js - shorten .bin name

---
 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 1a6ba618..05aaee05 100644
--- a/wled00/data/index.js
+++ b/wled00/data/index.js
@@ -696,7 +696,7 @@ function populateInfo(i)
 	if (i.ver.includes("0.14.0-b15.22")) vcn = "Lupo";
 	if (i.ver.includes("0.14.1-b3")) vcn = "Fried Chicken";  // final line of "One Vision" by Queen
 	if (i.ver.includes("0.14.3-b")) vcn = "Fried Chicken";
-	cn += `v${i.ver} &nbsp;<i>"${vcn}"</i><p>(WLEDMM_${i.ver} ${i.rel}.bin)</p><p><em>build ${i.vid}</em></p><table>
+	cn += `v${i.ver} &nbsp;<i>"${vcn}"</i><p>(WLEDMM ${i.rel}.bin)</p><p><em>build ${i.vid}</em></p><table>
 ${urows}
 ${urows===""?'':'<tr><td colspan=2><hr style="height:1px;border-width:0;color:SeaGreen;background-color:Seagreen"></td></tr>'}
 ${i.opt&0x100?inforow("Net Print ☾","<button class=\"btn btn-xs\" onclick=\"requestJson({'netDebug':"+(i.opt&0x0080?"false":"true")+"});\"><i class=\"icons "+(i.opt&0x0080?"on":"off")+"\">&#xe08f;</i></button>"):''}

From 37a3141f881312542c657596bd81fbafadb219e3 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sat, 7 Sep 2024 13:34:09 +0100
Subject: [PATCH 188/200] HD-WF2 tweaks

---
 platformio.ini         | 19 ++++++-------------
 wled00/bus_manager.cpp |  6 +++++-
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 69024166..b5b93187 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1042,8 +1042,8 @@ HUB75_build_flags =
   -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#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_ignore = ESP32 HUB75 LED MATRIX PANEL DMA Display ;; to remove the HUB75 lib dependancy (saves a few bytes)
 
 NetDebug_build_flags =
@@ -1853,7 +1853,7 @@ lib_deps = ${esp32_4MB_V4_M_base.esp32_lib_deps}
 # ------------------------------------------------------------------------------
 # esp32-S3 environments
 # ------------------------------------------------------------------------------
-[env:esp32S3_4MB_S]
+[env:esp32S3_4MB_S] ;; Use for HD-WF2
 extends = esp32_4MB_V4_M_base
 board = esp32-s3-devkitc-1
 build_unflags = 
@@ -1867,22 +1867,15 @@ build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-inden
   ${common_mm.build_flags_S} 
   ${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_RELEASE_NAME=esp32S3_4MB_S 
   -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)
+  -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)
   -D WLED_WATCHDOG_TIMEOUT=0 -D CONFIG_ASYNC_TCP_USE_WDT=0
-  ; -D U8X8_HAVE_2ND_HW_I2C ;; experimental - tells U8g2 lib that a second HW I2C unit exists
-  -D WLED_DISABLE_LOXONE ; FLASH 1272 bytes
-  -D WLED_DISABLE_ALEXA ;  RAM 116 bytes; FLASH 13524 bytes
-  ; -D WLED_DISABLE_MQTT ;   RAM 216 bytes; FLASH 16496 bytes
-  ; -D WLED_DISABLE_HUESYNC ;RAM 122 bytes; FLASH 6308 bytes
-  ; -D WLED_DISABLE_INFRARED ;RAM 136 bytes; FLASH 24492 bytes
-  ;;-D WLEDMM_FASTPATH ; WLEDMM experimental option. Reduces audio lag (latency), and allows for faster LED framerates. May break compatibility with previous versions.
+  ${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 WLED_DEBUG
   ; -D SR_DEBUG
-  ; -D MIC_LOGGER
 lib_deps = ${esp32s3.lib_deps} ${common_mm.lib_deps_S}
     ${common_mm.HUB75_lib_deps}
     ${common_mm.animartrix_lib_deps}
diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 5f10ec77..464dc29b 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -744,14 +744,18 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
       return;
   }
   else {
+    USER_PRINTLN("MatrixPanel_I2S_DMA begin ok");
     delay(18);   // experiment - give the driver a moment (~ one full frame @ 60hz) to settle
     _valid = true;
     display->clearScreen();   // initially clear the screen buffer
+    USER_PRINTLN("MatrixPanel_I2S_DMA clear ok");
 
     if (_ledBuffer) free(_ledBuffer);                 // should not happen
     if (_ledsDirty) free(_ledsDirty);                 // should not happen
+    USER_PRINTLN("MatrixPanel_I2S_DMA allocate memory");
     _ledsDirty = (byte*) malloc(getBitArrayBytes(_len));  // create LEDs dirty bits
-
+   USER_PRINTLN("MatrixPanel_I2S_DMA allocate memory ok");
+   
     if (_ledsDirty == nullptr) {
       display->stopDMAoutput();
       delete display; display = nullptr;

From 8c0fcaa0fd19bc0ea4b947b8fe5ec9e8b2f2fef4 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sat, 7 Sep 2024 17:19:46 +0100
Subject: [PATCH 189/200] hub75 - mxconfig.clkphase = false

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

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 464dc29b..9b228f00 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -666,14 +666,6 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   mxconfig.gpio.d = 21;
   mxconfig.gpio.e = 12;
 
-  // 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.min_refresh_rate = 120;
-  // mxconfig.clkphase = false;  // can help in case that the leftmost column is invisible, or pixels on the right side "bleeds out" to the left.
-
 #else
   USER_PRINTLN("MatrixPanel_I2S_DMA - Default pins");
   /*
@@ -704,6 +696,15 @@ 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.min_refresh_rate = 120;
+  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);

From cb9fb8ddd420ff793d9a1c3a25a11964787f7945 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sat, 7 Sep 2024 17:29:09 +0100
Subject: [PATCH 190/200] Update actions/upload-artifact

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

diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml
index d9933bd3..3ac09572 100644
--- a/.github/workflows/wled-ci.yml
+++ b/.github/workflows/wled-ci.yml
@@ -61,13 +61,13 @@ jobs:
       env:
         WLED_RELEASE: True
       run: pio run -e ${{ matrix.environment }}
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       with:
         name: firmware-${{ matrix.environment }}
         path: |
           build_output/firmware/*.bin
           build_output/firmware/*.gz
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       if: startsWith(github.ref, 'refs/tags/')
       with:
         name: firmware-release

From 908481a55ad054ffe54ce4a5db20ab61c32e6810 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sat, 7 Sep 2024 17:47:00 +0100
Subject: [PATCH 191/200] Tweak github caching

---
 .github/workflows/wled-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml
index 3ac09572..236c569d 100644
--- a/.github/workflows/wled-ci.yml
+++ b/.github/workflows/wled-ci.yml
@@ -51,6 +51,9 @@ jobs:
       with:
         path: ~/.platformio
         key: ${{ runner.os }}-${{ matrix.environment}}-${{ hashFiles('platformio.ini') }}
+        restore-keys: |
+          ${{ runner.os }}-${{ matrix.environment}}
+
     - name: Set up Python
       uses: actions/setup-python@v4
       with:

From fff7a47ab54d0fa17dc7ff79f31366913317ddc4 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sat, 7 Sep 2024 17:53:49 +0100
Subject: [PATCH 192/200] Update actions/checkout action

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

diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml
index 236c569d..bce567bc 100644
--- a/.github/workflows/wled-ci.yml
+++ b/.github/workflows/wled-ci.yml
@@ -8,7 +8,7 @@ jobs:
     name: Gather Environments
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Cache pip
       uses: actions/cache@v3
       with:
@@ -38,7 +38,7 @@ jobs:
       matrix:
         environment: ${{ fromJSON(needs.get_default_envs.outputs.environments) }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Cache pip
       uses: actions/cache@v3
       with:

From ebbd06800e335fa569ee05e95ccd855ec7d4a9d3 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sat, 7 Sep 2024 17:55:12 +0100
Subject: [PATCH 193/200] Update actions/setup-python action

---
 .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 bce567bc..c57a4d93 100644
--- a/.github/workflows/wled-ci.yml
+++ b/.github/workflows/wled-ci.yml
@@ -16,7 +16,7 @@ jobs:
         key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
         restore-keys: |
           ${{ runner.os }}-pip-
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.9'
     - name: Install PlatformIO

From dabda3a02c3994040cb46bd4e2c69f36b16ebef0 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sat, 7 Sep 2024 17:56:00 +0100
Subject: [PATCH 194/200] Update actions/cache action

---
 .github/workflows/wled-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml
index c57a4d93..b9b77423 100644
--- a/.github/workflows/wled-ci.yml
+++ b/.github/workflows/wled-ci.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Cache pip
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
@@ -40,14 +40,14 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Cache pip
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
         restore-keys: |
           ${{ runner.os }}-pip-
     - name: Cache PlatformIO
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.platformio
         key: ${{ runner.os }}-${{ matrix.environment}}-${{ hashFiles('platformio.ini') }}

From 1e04f4bdb793514bd54bd88cf5e484056eb64c72 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sat, 7 Sep 2024 17:59:53 +0100
Subject: [PATCH 195/200] Update actions/setup-python action

---
 .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 b9b77423..62cee507 100644
--- a/.github/workflows/wled-ci.yml
+++ b/.github/workflows/wled-ci.yml
@@ -55,7 +55,7 @@ jobs:
           ${{ runner.os }}-${{ matrix.environment}}
 
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
           python-version: '3.9'
     - name: Install PlatformIO

From d08b4a51fa842919e23328cc40b8150e371432bc Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sat, 7 Sep 2024 18:07:48 +0100
Subject: [PATCH 196/200] Fix artifact upload

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

diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml
index 62cee507..dcd92b6c 100644
--- a/.github/workflows/wled-ci.yml
+++ b/.github/workflows/wled-ci.yml
@@ -64,12 +64,13 @@ jobs:
       env:
         WLED_RELEASE: True
       run: pio run -e ${{ matrix.environment }}
+    - name: Rename Bin
+      run: mv .pio/build/${{ matrix.environment }}/firmware.bin firmware-${{ matrix.environment }}.bin
     - uses: actions/upload-artifact@v4
       with:
         name: firmware-${{ matrix.environment }}
         path: |
-          build_output/firmware/*.bin
-          build_output/firmware/*.gz
+          .pio/build/${{ matrix.environment }}/firmware.bin
     - uses: actions/upload-artifact@v4
       if: startsWith(github.ref, 'refs/tags/')
       with:

From 3f674aeaa352223d7b82028006948a3d259c1b8d Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sat, 7 Sep 2024 18:11:31 +0100
Subject: [PATCH 197/200] Fix artifact upload

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

diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml
index dcd92b6c..91f94d1b 100644
--- a/.github/workflows/wled-ci.yml
+++ b/.github/workflows/wled-ci.yml
@@ -65,12 +65,11 @@ jobs:
         WLED_RELEASE: True
       run: pio run -e ${{ matrix.environment }}
     - name: Rename Bin
-      run: mv .pio/build/${{ matrix.environment }}/firmware.bin firmware-${{ matrix.environment }}.bin
+      run: mv -v .pio/build/${{ matrix.environment }}/firmware.bin firmware-${{ matrix.environment }}.bin
     - uses: actions/upload-artifact@v4
       with:
         name: firmware-${{ matrix.environment }}
-        path: |
-          .pio/build/${{ matrix.environment }}/firmware.bin
+        path: firmware-${{ matrix.environment }}.bin
     - uses: actions/upload-artifact@v4
       if: startsWith(github.ref, 'refs/tags/')
       with:

From 678243f5ca904648cce5ffd0cdb18377cfbf540d Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sat, 7 Sep 2024 18:23:30 +0100
Subject: [PATCH 198/200] Fix artifact upload

---
 .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 91f94d1b..e78c1c73 100644
--- a/.github/workflows/wled-ci.yml
+++ b/.github/workflows/wled-ci.yml
@@ -73,7 +73,7 @@ jobs:
     - uses: actions/upload-artifact@v4
       if: startsWith(github.ref, 'refs/tags/')
       with:
-        name: firmware-release
+        name: firmware-release-${{ matrix.environment }}
         path: build_output/release/*.bin
   release:
     name: Create Release

From 163ba3aaf6a175e89c819c5d9e165787e7706a16 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sat, 7 Sep 2024 18:32:22 +0100
Subject: [PATCH 199/200] Update actions/download-artifct action

---
 .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 e78c1c73..829eeeca 100644
--- a/.github/workflows/wled-ci.yml
+++ b/.github/workflows/wled-ci.yml
@@ -81,7 +81,7 @@ jobs:
     needs: [get_default_envs, build]
     if: startsWith(github.ref, 'refs/tags/')
     steps:
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v4
       with:
         name: firmware-release
     - name: Create draft release

From 2276080c67d9ca705b2de0f87fd7c52f43077754 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sat, 7 Sep 2024 18:56:59 +0100
Subject: [PATCH 200/200] Fix artifact upload

---
 .github/workflows/wled-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml
index 829eeeca..e875ca18 100644
--- a/.github/workflows/wled-ci.yml
+++ b/.github/workflows/wled-ci.yml
@@ -83,7 +83,9 @@ jobs:
     steps:
     - uses: actions/download-artifact@v4
       with:
-        name: firmware-release
+        name: firmware-release-*
+    - name: List Artifacts
+      run: find ./
     - name: Create draft release
       uses: softprops/action-gh-release@v1
       with: