From 7ef84cfbfebfa8b0b291d261c2dc4a0870f0e5a1 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Mon, 26 Feb 2024 19:29:40 +0000
Subject: [PATCH 01/32] Add HUB75 support

---
 platformio.ini                |  15 +++
 wled00/bus_manager.cpp        | 186 ++++++++++++++++++++++++++++++++++
 wled00/bus_manager.h          |  49 +++++++++
 wled00/const.h                |   3 +
 wled00/data/settings_leds.htm |  16 +++
 wled00/pin_manager.h          |   1 +
 wled00/xml.cpp                |   4 +
 7 files changed, 274 insertions(+)

diff --git a/platformio.ini b/platformio.ini
index 7ad66723ed..d8ead51043 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -461,3 +461,18 @@ build_flags = ${common.build_flags} ${esp32s2.build_flags} -D WLED_RELEASE_NAME=
   -D HW_PIN_MISOSPI=9
 ;  -D STATUSLED=15
 lib_deps = ${esp32s2.lib_deps}
+
+
+[env:esp32dev_hub75]
+board = esp32dev
+upload_speed = 921600
+platform = ${esp32_idf_V4.platform}
+platform_packages = ${esp32_idf_V4.platform_packages}
+build_unflags = ${common.build_unflags}
+build_flags = ${common.build_flags_esp32_V4} -D WLED_RELEASE_NAME=ESP32_hub75
+  -D WLED_ENABLE_HUB75MATRIX -D NO_GFX
+lib_deps = ${esp32_idf_V4.lib_deps}
+  https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA.git @ 3.0.10
+
+monitor_filters = esp32_exception_decoder
+board_build.partitions = ${esp32.default_partitions}
diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 16701bbb78..ec731573f6 100755
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -605,6 +605,188 @@ void BusNetwork::cleanup() {
   freeData();
 }
 
+// ***************************************************************************
+
+#ifdef WLED_ENABLE_HUB75MATRIX
+
+BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWhite) {
+
+  mxconfig.double_buff = false; // <------------- Turn on double buffer
+
+  switch(bc.type) {
+    case 101:
+      mxconfig.mx_width = 32;
+      mxconfig.mx_height = 32;
+      break;
+    case 102:
+      mxconfig.mx_width = 64;
+      mxconfig.mx_height = 32;
+      break;
+    case 103:
+      mxconfig.mx_width = 64;
+      mxconfig.mx_height = 64;
+      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)) {
+    DEBUG_PRINTF("WARNING, only single panel can be used of 64 pixel boards due to memory")
+    mxconfig.chain_length = 1;
+  }
+
+  // mxconfig.driver   = HUB75_I2S_CFG::SHIFTREG;
+
+#if defined(ARDUINO_ADAFRUIT_MATRIXPORTAL_ESP32S3) // MatrixPortal ESP32-S3
+
+  // https://www.adafruit.com/product/5778
+
+  DEBUG_PRINTF("MatrixPanel_I2S_DMA - Matrix Portal S3 config");
+
+  mxconfig.gpio.r1 = 42;
+  mxconfig.gpio.g1 = 41;
+  mxconfig.gpio.b1 = 40;
+  mxconfig.gpio.r2 = 38;
+  mxconfig.gpio.g2 = 39;
+  mxconfig.gpio.b2 = 37; 
+
+  mxconfig.gpio.lat = 47;
+  mxconfig.gpio.oe  = 14;
+  mxconfig.gpio.clk = 2;
+
+  mxconfig.gpio.a = 45;
+  mxconfig.gpio.b = 36;
+  mxconfig.gpio.c = 48;
+  mxconfig.gpio.d = 35;
+  mxconfig.gpio.e = 21;
+
+#else
+
+/*
+
+    ESP32 with SmartMatrix's default pinout - ESP32_FORUM_PINOUT
+    
+    https://github.com/pixelmatix/SmartMatrix/blob/teensylc/src/MatrixHardware_ESP32_V0.h
+
+    Can use a board like https://github.com/rorosaurus/esp32-hub75-driver
+
+    #define R1_PIN  GPIO_NUM_2
+    #define G1_PIN  GPIO_NUM_15
+    #define B1_PIN  GPIO_NUM_4
+    #define R2_PIN  GPIO_NUM_16
+    #define G2_PIN  GPIO_NUM_27
+    #define B2_PIN  GPIO_NUM_17
+
+    #define A_PIN   GPIO_NUM_5
+    #define B_PIN   GPIO_NUM_18
+    #define C_PIN   GPIO_NUM_19
+    #define D_PIN   GPIO_NUM_21
+    #define E_PIN   GPIO_NUM_12
+    #define LAT_PIN GPIO_NUM_26
+    #define OE_PIN  GPIO_NUM_25
+
+    #define CLK_PIN GPIO_NUM_22
+*/
+
+  DEBUG_PRINTF("MatrixPanel_I2S_DMA - ESP32 config");
+
+  mxconfig.gpio.r1 = 2;
+  mxconfig.gpio.g1 = 15;
+  mxconfig.gpio.b1 = 4;
+  mxconfig.gpio.r2 = 16;
+  mxconfig.gpio.g2 = 27;
+  mxconfig.gpio.b2 = 17; 
+
+  mxconfig.gpio.lat = 26;
+  mxconfig.gpio.oe  = 25;
+  mxconfig.gpio.clk = 22;
+
+  mxconfig.gpio.a = 5;
+  mxconfig.gpio.b = 18;
+  mxconfig.gpio.c = 19;
+  mxconfig.gpio.d = 21;
+  mxconfig.gpio.e = 12;
+
+#endif
+
+
+  DEBUG_PRINTF("MatrixPanel_I2S_DMA config - %ux%u length: %u\n", mxconfig.mx_width, mxconfig.mx_height, mxconfig.chain_length);
+
+  // OK, now we can create our matrix object
+  display = new MatrixPanel_I2S_DMA(mxconfig);
+
+  this->_len = (display->width() * display->height());
+
+  pinManager.allocatePin(mxconfig.gpio.r1, true, PinOwner::HUB75);
+  pinManager.allocatePin(mxconfig.gpio.g1, true, PinOwner::HUB75);
+  pinManager.allocatePin(mxconfig.gpio.b1, true, PinOwner::HUB75);
+  pinManager.allocatePin(mxconfig.gpio.r2, true, PinOwner::HUB75);
+  pinManager.allocatePin(mxconfig.gpio.g2, true, PinOwner::HUB75);
+  pinManager.allocatePin(mxconfig.gpio.b2, true, PinOwner::HUB75);
+
+  pinManager.allocatePin(mxconfig.gpio.lat, true, PinOwner::HUB75);
+  pinManager.allocatePin(mxconfig.gpio.oe, true, PinOwner::HUB75);
+  pinManager.allocatePin(mxconfig.gpio.clk, true, PinOwner::HUB75);
+
+  pinManager.allocatePin(mxconfig.gpio.a, true, PinOwner::HUB75);
+  pinManager.allocatePin(mxconfig.gpio.b, true, PinOwner::HUB75);
+  pinManager.allocatePin(mxconfig.gpio.c, true, PinOwner::HUB75);
+  pinManager.allocatePin(mxconfig.gpio.d, true, PinOwner::HUB75);
+  pinManager.allocatePin(mxconfig.gpio.e, true, PinOwner::HUB75);
+
+  // display->setLatBlanking(4);
+
+  DEBUG_PRINTF("MatrixPanel_I2S_DMA created");
+  // let's adjust default brightness
+  display->setBrightness8(25);    // range is 0-255, 0 - 0%, 255 - 100%
+
+  // Allocate memory and start DMA display
+  if( not display->begin() ) {
+      DEBUG_PRINTF("****** MatrixPanel_I2S_DMA !KABOOM! I2S memory allocation failed ***********");
+      return;
+  }
+  else {
+    _valid = true;
+  }
+  
+  DEBUG_PRINTF("MatrixPanel_I2S_DMA started");
+}
+
+void BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c) {
+  r = R(c);
+  g = G(c);
+  b = B(c);
+  x = pix % display->width();
+  y = floor(pix / display->width());
+  display->drawPixelRGB888(x, y, r, g, b);
+}
+
+void BusHub75Matrix::setBrightness(uint8_t b, bool immediate) {
+  this->display->setBrightness(b);
+}
+
+void BusHub75Matrix::deallocatePins() {
+
+  pinManager.deallocatePin(mxconfig.gpio.r1, PinOwner::HUB75);
+  pinManager.deallocatePin(mxconfig.gpio.g1, PinOwner::HUB75);
+  pinManager.deallocatePin(mxconfig.gpio.b1, PinOwner::HUB75);
+  pinManager.deallocatePin(mxconfig.gpio.r2, PinOwner::HUB75);
+  pinManager.deallocatePin(mxconfig.gpio.g2, PinOwner::HUB75);
+  pinManager.deallocatePin(mxconfig.gpio.b2, PinOwner::HUB75);
+
+  pinManager.deallocatePin(mxconfig.gpio.lat, PinOwner::HUB75);
+  pinManager.deallocatePin(mxconfig.gpio.oe, PinOwner::HUB75);
+  pinManager.deallocatePin(mxconfig.gpio.clk, PinOwner::HUB75);
+
+  pinManager.deallocatePin(mxconfig.gpio.a, PinOwner::HUB75);
+  pinManager.deallocatePin(mxconfig.gpio.b, PinOwner::HUB75);
+  pinManager.deallocatePin(mxconfig.gpio.c, PinOwner::HUB75);
+  pinManager.deallocatePin(mxconfig.gpio.d, PinOwner::HUB75);
+  pinManager.deallocatePin(mxconfig.gpio.e, PinOwner::HUB75);
+
+}
+#endif
+// ***************************************************************************
 
 //utility to get the approx. memory usage of a given BusConfig
 uint32_t BusManager::memUsage(BusConfig &bc) {
@@ -637,6 +819,10 @@ int BusManager::add(BusConfig &bc) {
   if (getNumBusses() - getNumVirtualBusses() >= WLED_MAX_BUSSES) return -1;
   if (IS_VIRTUAL(bc.type)) {
     busses[numBusses] = new BusNetwork(bc);
+#ifdef WLED_ENABLE_HUB75MATRIX
+  } else if (bc.type >= TYPE_HUB75MATRIX && bc.type <= (TYPE_HUB75MATRIX + 10)) {
+    busses[numBusses] = new BusHub75Matrix(bc);
+#endif
   } else if (IS_DIGITAL(bc.type)) {
     busses[numBusses] = new BusDigital(bc, numBusses, colorOrderMap);
   } else if (bc.type == TYPE_ONOFF) {
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 6dd9c39c8e..24f469b341 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -1,6 +1,9 @@
 #ifndef BusManager_h
 #define BusManager_h
 
+#ifdef WLED_ENABLE_HUB75MATRIX
+#include <ESP32-HUB75-MatrixPanel-I2S-DMA.h>
+#endif
 /*
  * Class for addressing various light types
  */
@@ -56,6 +59,7 @@ struct BusConfig {
     if (type >= TYPE_NET_DDP_RGB && type < 96) nPins = 4; //virtual network bus. 4 "pins" store IP address
     else if (type > 47) nPins = 2;
     else if (type > 40 && type < 46) nPins = NUM_PWM_PINS(type);
+    else if (type >= TYPE_HUB75MATRIX && type <= (TYPE_HUB75MATRIX + 10)) nPins = 0;
     for (size_t i = 0; i < nPins; i++) pins[i] = ppins[i];
   }
 
@@ -313,6 +317,51 @@ class BusNetwork : public Bus {
     bool      _broadcastLock;
 };
 
+#ifdef WLED_ENABLE_HUB75MATRIX
+class BusHub75Matrix : public Bus {
+  public:
+    BusHub75Matrix(BusConfig &bc);
+
+    uint16_t getMaxPixels() override { return 4096; };
+
+    bool hasRGB() { return true; }
+    bool hasWhite() { return false; }
+
+    void setPixelColor(uint16_t pix, uint32_t c);
+
+    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)
+        display->clearScreen();   // Now clear the back-buffer
+      }
+    }
+
+    void setBrightness(uint8_t b, bool immediate);
+
+    uint8_t getPins(uint8_t* pinArray) {
+      pinArray[0] = mxconfig.chain_length;
+      return 1;
+    } // Fake value due to keep finaliseInit happy
+
+    void deallocatePins();
+
+    void cleanup() {
+      deallocatePins();
+      delete display;
+      _valid = false;
+    }
+
+    ~BusHub75Matrix() {
+      cleanup();
+    }
+
+  private:
+    MatrixPanel_I2S_DMA *display = nullptr;
+    HUB75_I2S_CFG mxconfig;
+    uint8_t r, g, b, x, y;
+    
+};
+#endif
 
 class BusManager {
   public:
diff --git a/wled00/const.h b/wled00/const.h
index da6fa85f60..af3e27a412 100644
--- a/wled00/const.h
+++ b/wled00/const.h
@@ -280,6 +280,9 @@
 #define TYPE_LPD8806             52
 #define TYPE_P9813               53
 #define TYPE_LPD6803             54
+
+#define TYPE_HUB75MATRIX         100 // 100 - 110
+
 //Network types (master broadcast) (80-95)
 #define TYPE_NET_DDP_RGB         80            //network DDP RGB bus (master broadcast bus)
 #define TYPE_NET_E131_RGB        81            //network E131 RGB bus (master broadcast bus, unused)
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 470d69d62e..796a5ef991 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -23,6 +23,19 @@
 		function isD2P(t) { return t > 47 && t < 64; }                      // is digital 2 pin type
 		function is16b(t) { return t == 26 || t == 29 }                     // is digital 16 bit type
 		function isVir(t) { return t >= 80 && t < 96; }                     // is virtual type
+		function hideHub75() {
+		var s = d.getElementsByTagName("select");
+			for (i=0; i<s.length; i++) {
+				// is the field a LED type?
+				if (s[i].name.substring(0,2)=="LT") {
+					var selectobject = s[i];
+					for (var j=(selectobject.length - 1); j > 0; j--) {
+						var t = parseInt(selectobject.options[j].value);
+						if(t >= 100 && t <= 110) selectobject.remove(j);
+					}
+				}
+			}
+		}
 		// https://www.educative.io/edpresso/how-to-dynamically-load-a-js-file-in-javascript
 		function loadJS(FILE_URL, async = true) {
 			let scE = d.createElement("script");
@@ -413,6 +426,9 @@
 <!--option value="81">E1.31 RGB (network)</option-->
 <option value="82">Art-Net RGB (network)</option>
 <option value="88">DDP RGBW (network)</option>
+<option value="101">Hub75Matrix 32x32</option>
+<option value="102">Hub75Matrix 64x32</option>
+<option value="103">Hub75Matrix 64x64</option>
 </select><br>
 <div id="abl${i}">
 mA/LED: <select name="LAsel${i}" onchange="enLA(this,${i});UI();">
diff --git a/wled00/pin_manager.h b/wled00/pin_manager.h
index 6a50df588e..2e5c89089f 100644
--- a/wled00/pin_manager.h
+++ b/wled00/pin_manager.h
@@ -35,6 +35,7 @@ enum struct PinOwner : uint8_t {
   DMX           = 0x8A,   // 'DMX'  == hard-coded to IO2
   HW_I2C        = 0x8B,   // 'I2C'  == hardware I2C pins (4&5 on ESP8266, 21&22 on ESP32)
   HW_SPI        = 0x8C,   // 'SPI'  == hardware (V)SPI pins (13,14&15 on ESP8266, 5,18&23 on ESP32)
+  HUB75         = 0x8E,   // 'Hub75' == Hub75 driver
   // Use UserMod IDs from const.h here
   UM_Unspecified       = USERMOD_ID_UNSPECIFIED,        // 0x01
   UM_Example           = USERMOD_ID_EXAMPLE,            // 0x02 // Usermod "usermod_v2_example.h"
diff --git a/wled00/xml.cpp b/wled00/xml.cpp
index 4c43912989..c22295dbd6 100755
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -770,5 +770,9 @@ void getSettingsJS(byte subPage, char* dest)
     #else
     oappend(SET_F("gId(\"somp\").remove(1);")); // remove 2D option from dropdown
     #endif
+    #ifndef WLED_ENABLE_HUB75MATRIX
+    oappend(SET_F("hideHub75();"));  // WLEDMM hide HUB75 LED types
+    #endif    
+
   }
 }

From 7603b5a56cd60acf0bc70c65ca138ed8dfd8df8e Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Mon, 26 Feb 2024 19:35:15 +0000
Subject: [PATCH 02/32] Remove getMaxPixels

---
 wled00/bus_manager.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 24f469b341..8ffc13c300 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -322,8 +322,6 @@ class BusHub75Matrix : public Bus {
   public:
     BusHub75Matrix(BusConfig &bc);
 
-    uint16_t getMaxPixels() override { return 4096; };
-
     bool hasRGB() { return true; }
     bool hasWhite() { return false; }
 

From 755f91f5abdf28135afc7d5b801d046ac2a9a6ac Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Mon, 26 Feb 2024 21:16:33 +0000
Subject: [PATCH 03/32] Remove referece to MM

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

diff --git a/wled00/xml.cpp b/wled00/xml.cpp
index c22295dbd6..ff3ba1f912 100755
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -771,7 +771,7 @@ void getSettingsJS(byte subPage, char* dest)
     oappend(SET_F("gId(\"somp\").remove(1);")); // remove 2D option from dropdown
     #endif
     #ifndef WLED_ENABLE_HUB75MATRIX
-    oappend(SET_F("hideHub75();"));  // WLEDMM hide HUB75 LED types
+    oappend(SET_F("hideHub75();"));  // hide HUB75 LED types
     #endif    
 
   }

From 2bd1e81917c296507e205541fc4d2a67900e4d43 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Mon, 26 Feb 2024 21:27:27 +0000
Subject: [PATCH 04/32] Default to mrfaptastic pinout

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

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index ec731573f6..905d78c3a3 100755
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -660,7 +660,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   mxconfig.gpio.d = 35;
   mxconfig.gpio.e = 21;
 
-#else
+#elif defined(ESP32_FORUM_PINOUT) // Common format for boards designed for SmartMatrix
 
 /*
 
@@ -707,6 +707,30 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   mxconfig.gpio.d = 21;
   mxconfig.gpio.e = 12;
 
+#else
+  // https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA?tab=readme-ov-file
+
+  // Boards
+  // https://esp32trinity.com/
+  // https://www.electrodragon.com/product/rgb-matrix-panel-drive-interface-board-for-esp32-dma/
+
+  mxconfig.gpio.r1 = 25;
+  mxconfig.gpio.g1 = 26;
+  mxconfig.gpio.b1 = 27;
+  mxconfig.gpio.r2 = 14;
+  mxconfig.gpio.g2 = 12;
+  mxconfig.gpio.b2 = 13;
+
+  mxconfig.gpio.lat = 4;
+  mxconfig.gpio.oe  = 15;
+  mxconfig.gpio.clk = 16;
+
+  mxconfig.gpio.a = 23;
+  mxconfig.gpio.b = 19;
+  mxconfig.gpio.c = 5;
+  mxconfig.gpio.d = 17;
+  mxconfig.gpio.e = 18;
+
 #endif
 
 

From 07a15883bd46a4ba18b7bb0f31e6c93e0d9ddfea Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Mon, 26 Feb 2024 22:47:33 +0000
Subject: [PATCH 05/32] Cleanup comments

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

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 905d78c3a3..ca0c6af99c 100755
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -662,34 +662,16 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
 #elif defined(ESP32_FORUM_PINOUT) // Common format for boards designed for SmartMatrix
 
-/*
+  USER_PRINTLN("MatrixPanel_I2S_DMA - ESP32_FORUM_PINOUT");
 
+/*
     ESP32 with SmartMatrix's default pinout - ESP32_FORUM_PINOUT
     
     https://github.com/pixelmatix/SmartMatrix/blob/teensylc/src/MatrixHardware_ESP32_V0.h
 
     Can use a board like https://github.com/rorosaurus/esp32-hub75-driver
-
-    #define R1_PIN  GPIO_NUM_2
-    #define G1_PIN  GPIO_NUM_15
-    #define B1_PIN  GPIO_NUM_4
-    #define R2_PIN  GPIO_NUM_16
-    #define G2_PIN  GPIO_NUM_27
-    #define B2_PIN  GPIO_NUM_17
-
-    #define A_PIN   GPIO_NUM_5
-    #define B_PIN   GPIO_NUM_18
-    #define C_PIN   GPIO_NUM_19
-    #define D_PIN   GPIO_NUM_21
-    #define E_PIN   GPIO_NUM_12
-    #define LAT_PIN GPIO_NUM_26
-    #define OE_PIN  GPIO_NUM_25
-
-    #define CLK_PIN GPIO_NUM_22
 */
 
-  DEBUG_PRINTF("MatrixPanel_I2S_DMA - ESP32 config");
-
   mxconfig.gpio.r1 = 2;
   mxconfig.gpio.g1 = 15;
   mxconfig.gpio.b1 = 4;
@@ -708,12 +690,16 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   mxconfig.gpio.e = 12;
 
 #else
-  // https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA?tab=readme-ov-file
+  USER_PRINTLN("MatrixPanel_I2S_DMA - Default pins");
+  /*
+   https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA?tab=readme-ov-file
 
-  // Boards
-  // https://esp32trinity.com/
-  // https://www.electrodragon.com/product/rgb-matrix-panel-drive-interface-board-for-esp32-dma/
+   Boards
 
+   https://esp32trinity.com/
+   https://www.electrodragon.com/product/rgb-matrix-panel-drive-interface-board-for-esp32-dma/
+   
+  */
   mxconfig.gpio.r1 = 25;
   mxconfig.gpio.g1 = 26;
   mxconfig.gpio.b1 = 27;

From ecd46f2f06724935db2d8d6034a56fbefde6be27 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sat, 7 Sep 2024 20:29:43 +0100
Subject: [PATCH 06/32] Swap to new way to have dynamic LED types list

---
 platformio.ini         |  3 ++-
 wled00/bus_manager.cpp | 28 +++++++++++++++++++++-------
 wled00/bus_manager.h   |  3 +++
 wled00/xml.cpp         |  3 ---
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index ecb118c1b0..40493545bc 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -525,7 +525,8 @@ upload_speed = 921600
 platform = ${esp32_idf_V4.platform}
 platform_packages = ${esp32_idf_V4.platform_packages}
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags_esp32_V4} -D WLED_RELEASE_NAME=ESP32_hub75
+build_flags = ${common.build_flags}
+  -D WLED_RELEASE_NAME=ESP32_hub75
   -D WLED_ENABLE_HUB75MATRIX -D NO_GFX
 lib_deps = ${esp32_idf_V4.lib_deps}
   https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA.git @ 3.0.10
diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index d2a65b6ee8..9f0de745b0 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -810,7 +810,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   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)) {
-    DEBUG_PRINTF("WARNING, only single panel can be used of 64 pixel boards due to memory")
+    DEBUG_PRINTLN("WARNING, only single panel can be used of 64 pixel boards due to memory")
     mxconfig.chain_length = 1;
   }
 
@@ -820,7 +820,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
   // https://www.adafruit.com/product/5778
 
-  DEBUG_PRINTF("MatrixPanel_I2S_DMA - Matrix Portal S3 config");
+  DEBUG_PRINTLN("MatrixPanel_I2S_DMA - Matrix Portal S3 config");
 
   mxconfig.gpio.r1 = 42;
   mxconfig.gpio.g1 = 41;
@@ -841,7 +841,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
 #elif defined(ESP32_FORUM_PINOUT) // Common format for boards designed for SmartMatrix
 
-  USER_PRINTLN("MatrixPanel_I2S_DMA - ESP32_FORUM_PINOUT");
+  DEBUG_PRINTLN("MatrixPanel_I2S_DMA - ESP32_FORUM_PINOUT");
 
 /*
     ESP32 with SmartMatrix's default pinout - ESP32_FORUM_PINOUT
@@ -869,7 +869,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   mxconfig.gpio.e = 12;
 
 #else
-  USER_PRINTLN("MatrixPanel_I2S_DMA - Default pins");
+  DEBUG_PRINTLN("MatrixPanel_I2S_DMA - Default pins");
   /*
    https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA?tab=readme-ov-file
 
@@ -925,20 +925,20 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
   // display->setLatBlanking(4);
 
-  DEBUG_PRINTF("MatrixPanel_I2S_DMA created");
+  DEBUG_PRINTLN("MatrixPanel_I2S_DMA created");
   // let's adjust default brightness
   display->setBrightness8(25);    // range is 0-255, 0 - 0%, 255 - 100%
 
   // Allocate memory and start DMA display
   if( not display->begin() ) {
-      DEBUG_PRINTF("****** MatrixPanel_I2S_DMA !KABOOM! I2S memory allocation failed ***********");
+      DEBUG_PRINTLN("****** MatrixPanel_I2S_DMA !KABOOM! I2S memory allocation failed ***********");
       return;
   }
   else {
     _valid = true;
   }
   
-  DEBUG_PRINTF("MatrixPanel_I2S_DMA started");
+  DEBUG_PRINTLN("MatrixPanel_I2S_DMA started");
 }
 
 void BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c) {
@@ -974,6 +974,16 @@ void BusHub75Matrix::deallocatePins() {
   pinManager.deallocatePin(mxconfig.gpio.e, PinOwner::HUB75);
 
 }
+
+std::vector<LEDType> BusHub75Matrix::getLEDTypes() {
+  return {
+    {TYPE_HUB75MATRIX + 1,     "H",     PSTR("HUB75 32x32")},
+    {TYPE_HUB75MATRIX + 2,     "H",     PSTR("HUB75 64x32")},
+    {TYPE_HUB75MATRIX + 3,     "H",     PSTR("HUB75 64x64")},
+  };
+}
+
+
 #endif
 // ***************************************************************************
 
@@ -1042,6 +1052,10 @@ String BusManager::getLEDTypesJSONString(void) {
   json += LEDTypesToJson(BusPwm::getLEDTypes());
   json += LEDTypesToJson(BusNetwork::getLEDTypes());
   //json += LEDTypesToJson(BusVirtual::getLEDTypes());
+  #ifdef WLED_ENABLE_HUB75MATRIX
+  json += LEDTypesToJson(BusHub75Matrix::getLEDTypes());
+  #endif
+
   json.setCharAt(json.length()-1, ']'); // replace last comma with bracket
   return json;
 }
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index df11cf4b8a..9bff166721 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -143,6 +143,7 @@ class Bus {
     static constexpr bool  isOnOff(uint8_t type)      { return (type == TYPE_ONOFF); }
     static constexpr bool  isPWM(uint8_t type)        { return (type >= TYPE_ANALOG_MIN && type <= TYPE_ANALOG_MAX); }
     static constexpr bool  isVirtual(uint8_t type)    { return (type >= TYPE_VIRTUAL_MIN && type <= TYPE_VIRTUAL_MAX); }
+    static constexpr bool  isHub75(uint8_t type)      { return (type >= TYPE_HUB75MATRIX); }
     static constexpr bool  is16bit(uint8_t type)      { return type == TYPE_UCS8903 || type == TYPE_UCS8904 || type == TYPE_SM16825; }
     static constexpr int   numPWMPins(uint8_t type)   { return (type - 40); }
 
@@ -349,6 +350,8 @@ class BusHub75Matrix : public Bus {
       cleanup();
     }
 
+    static std::vector<LEDType> getLEDTypes(void);
+
   private:
     MatrixPanel_I2S_DMA *display = nullptr;
     HUB75_I2S_CFG mxconfig;
diff --git a/wled00/xml.cpp b/wled00/xml.cpp
index 037354ca36..22d21d7708 100644
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -784,9 +784,6 @@ void getSettingsJS(byte subPage, char* dest)
     #else
     oappend(SET_F("gId(\"somp\").remove(1);")); // remove 2D option from dropdown
     #endif
-    #ifndef WLED_ENABLE_HUB75MATRIX
-    oappend(SET_F("hideHub75();"));  // hide HUB75 LED types
-    #endif    
 
   }
 }

From aae9446ce0e5ad61d4919bd44e2d29d79e6b709c Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sat, 7 Sep 2024 20:46:59 +0100
Subject: [PATCH 07/32] Add "old-style" changes to settings_led for hub75

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

diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 58bd842058..809623980e 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -26,6 +26,7 @@
 		function isD2P(t)  { return gT(t).t === "2P"; }             // is digital 2 pin type
 		function isNet(t)  { return gT(t).t === "N"; }              // is network type
 		function isVir(t)  { return gT(t).t === "V" || isNet(t); }  // is virtual type
+		function isHub75(t){ return gT(t).t === "H"; }              // is HUB75 type
 		function hasRGB(t) { return !!(gT(t).c & 0x01); }           // has RGB
 		function hasW(t)   { return !!(gT(t).c & 0x02); }           // has white channel
 		function hasCCT(t) { return !!(gT(t).c & 0x04); }           // is white CCT enabled
@@ -246,6 +247,9 @@
 					case 'V': // virtual/non-GPIO based
 						p0d = "Config:"
 						break;
+					case 'H': // HUB75
+						p0d = "Chin Length:"
+						break;
 				}
 				gId("p0d"+n).innerText = p0d;
 				gId("p1d"+n).innerText = p1d;
@@ -283,9 +287,9 @@
 				gId("dig"+n+"w").style.display = (isDig(t) && hasW(t)) ? "inline":"none";   // show swap channels dropdown
 				gId("dig"+n+"w").querySelector("[data-opt=CCT]").disabled = !hasCCT(t);     // disable WW/CW swapping	
 				if (!(isDig(t) && hasW(t))) d.Sf["WO"+n].value = 0;                         // reset swapping
-				gId("dig"+n+"c").style.display = (isAna(t)) ? "none":"inline";              // hide count for analog
-				gId("dig"+n+"r").style.display = (isVir(t)) ? "none":"inline";              // hide reversed for virtual
-				gId("dig"+n+"s").style.display = (isVir(t) || isAna(t)) ? "none":"inline";  // hide skip 1st for virtual & analog
+				gId("dig"+n+"c").style.display = (isAna(t) || isHub75(t)) ? "none":"inline";              // hide count for analog
+				gId("dig"+n+"r").style.display = (isVir(t) || isHub75(t)) ? "none":"inline";              // hide reversed for virtual
+				gId("dig"+n+"s").style.display = (isVir(t) || isAna(t) || isHub75(t)) ? "none":"inline";  // hide skip 1st for virtual & analog
 				gId("dig"+n+"f").style.display = (isDig(t) || (isPWM(t) && maxL>2048)) ? "inline":"none"; // hide refresh (PWM hijacks reffresh for dithering on ESP32)
 				gId("dig"+n+"a").style.display = (hasW(t)) ? "inline":"none";               // auto calculate white
 				gId("dig"+n+"l").style.display = (isD2P(t) || isPWM(t)) ? "inline":"none";  // bus clock speed / PWM speed (relative) (not On/Off)

From e94943d505c08c467479ada9416c487c1de39caf Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sun, 8 Sep 2024 13:05:20 +0100
Subject: [PATCH 08/32] Assign proper type ID for Hub75

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

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 9f0de745b0..0117c2aa70 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -977,9 +977,8 @@ void BusHub75Matrix::deallocatePins() {
 
 std::vector<LEDType> BusHub75Matrix::getLEDTypes() {
   return {
-    {TYPE_HUB75MATRIX + 1,     "H",     PSTR("HUB75 32x32")},
-    {TYPE_HUB75MATRIX + 2,     "H",     PSTR("HUB75 64x32")},
-    {TYPE_HUB75MATRIX + 3,     "H",     PSTR("HUB75 64x64")},
+    {TYPE_HUB75MATRIX_HS,     "H",     PSTR("HUB75 - Half Scan")},
+    // {TYPE_HUB75MATRIX_QS,     "H",     PSTR("HUB75 - Quarter Scan")},
   };
 }
 
diff --git a/wled00/const.h b/wled00/const.h
index 327facbc4f..d92d286a45 100644
--- a/wled00/const.h
+++ b/wled00/const.h
@@ -320,7 +320,10 @@
 #define TYPE_LPD6803             54
 #define TYPE_2PIN_MAX            63
 
-#define TYPE_HUB75MATRIX         100 // 100 - 110
+#define TYPE_HUB75MATRIX_MIN     64
+#define TYPE_HUB75MATRIX_HS      65
+#define TYPE_HUB75MATRIX_QS      66
+#define TYPE_HUB75MATRIX_MAX     71
 
 //Network types (master broadcast) (80-95)
 #define TYPE_VIRTUAL_MIN         80

From e066b502c3bf339a0ea4fb0e4dc3e02bf8d67e4e Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sun, 8 Sep 2024 13:33:34 +0100
Subject: [PATCH 09/32] hub75 - remove hard coded panel sizes

---
 platformio.ini                |  4 +++-
 wled00/bus_manager.cpp        | 25 +++++++++----------------
 wled00/bus_manager.h          |  2 +-
 wled00/data/settings_leds.htm | 14 ++++++++++----
 4 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 40493545bc..120ffe9915 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -519,6 +519,7 @@ build_flags = ${common.build_flags} ${esp32s2.build_flags} -D WLED_RELEASE_NAME=
 lib_deps = ${esp32s2.lib_deps}
   ${esp32.AR_lib_deps}
 
+;; TODO - move to sample ini
 [env:esp32dev_hub75]
 board = esp32dev
 upload_speed = 921600
@@ -528,8 +529,9 @@ build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags}
   -D WLED_RELEASE_NAME=ESP32_hub75
   -D WLED_ENABLE_HUB75MATRIX -D NO_GFX
+  -D WLED_DEBUG
 lib_deps = ${esp32_idf_V4.lib_deps}
-  https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA.git @ 3.0.10
+  https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA.git#3.0.11
 
 monitor_filters = esp32_exception_decoder
 board_build.partitions = ${esp32.default_partitions}
diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 0117c2aa70..a4d1b49962 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -790,31 +790,24 @@ void BusNetwork::cleanup(void) {
 
 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
 
   switch(bc.type) {
-    case 101:
-      mxconfig.mx_width = 32;
-      mxconfig.mx_height = 32;
-      break;
-    case 102:
-      mxconfig.mx_width = 64;
-      mxconfig.mx_height = 32;
-      break;
-    case 103:
-      mxconfig.mx_width = 64;
-      mxconfig.mx_height = 64;
+    case TYPE_HUB75MATRIX_HS:
+      mxconfig.mx_width = bc.pins[0];
+      mxconfig.mx_height = bc.pins[1];
       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
+  mxconfig.chain_length = max((u_int8_t) 1, min(bc.pins[2], (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[2] > 1)) {
     DEBUG_PRINTLN("WARNING, only single panel can be used of 64 pixel boards due to memory")
     mxconfig.chain_length = 1;
   }
 
   // mxconfig.driver   = HUB75_I2S_CFG::SHIFTREG;
+  mxconfig.clkphase = bc.reversed;
 
 #if defined(ARDUINO_ADAFRUIT_MATRIXPORTAL_ESP32S3) // MatrixPortal ESP32-S3
 
@@ -977,8 +970,8 @@ void BusHub75Matrix::deallocatePins() {
 
 std::vector<LEDType> BusHub75Matrix::getLEDTypes() {
   return {
-    {TYPE_HUB75MATRIX_HS,     "H",     PSTR("HUB75 - Half Scan")},
-    // {TYPE_HUB75MATRIX_QS,     "H",     PSTR("HUB75 - Quarter Scan")},
+    {TYPE_HUB75MATRIX_HS,     "H",     PSTR("HUB75 (Half Scan)")},
+    // {TYPE_HUB75MATRIX_QS,     "H",     PSTR("HUB75 (Quarter Scan)")},
   };
 }
 
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 9bff166721..97e6caffbf 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -143,7 +143,7 @@ class Bus {
     static constexpr bool  isOnOff(uint8_t type)      { return (type == TYPE_ONOFF); }
     static constexpr bool  isPWM(uint8_t type)        { return (type >= TYPE_ANALOG_MIN && type <= TYPE_ANALOG_MAX); }
     static constexpr bool  isVirtual(uint8_t type)    { return (type >= TYPE_VIRTUAL_MIN && type <= TYPE_VIRTUAL_MAX); }
-    static constexpr bool  isHub75(uint8_t type)      { return (type >= TYPE_HUB75MATRIX); }
+    static constexpr bool  isHub75(uint8_t type)      { return (type >= TYPE_HUB75MATRIX_MIN && type <= TYPE_HUB75MATRIX_MAX); }
     static constexpr bool  is16bit(uint8_t type)      { return type == TYPE_UCS8903 || type == TYPE_UCS8904 || type == TYPE_SM16825; }
     static constexpr int   numPWMPins(uint8_t type)   { return (type - 40); }
 
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 809623980e..a2f938aa88 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -248,14 +248,14 @@
 						p0d = "Config:"
 						break;
 					case 'H': // HUB75
-						p0d = "Chin Length:"
+						p0d = "Panel size (width x height):"
 						break;
 				}
 				gId("p0d"+n).innerText = p0d;
 				gId("p1d"+n).innerText = p1d;
 				gId("off"+n).innerText = off;
 				// secondary pins show/hide (type string length is equivalent to number of pins used; except for network and on/off)
-				let pins = Math.max(gT(t).t.length,1) + 3*isNet(t); // fixes network pins to 4
+				let pins = Math.max(gT(t).t.length,1) + 3*isNet(t) + 1*isHub75(t); // fixes network pins to 4
 				for (let p=1; p<5; p++) {
 					var LK = d.Sf["L"+p+n];
 					if (!LK) continue;
@@ -283,12 +283,12 @@
 				}
 				gId("rf"+n).onclick = (t == 31) ? (()=>{return false}) : (()=>{});          // prevent change for TM1814
 				gRGBW |= hasW(t);                                                           // RGBW checkbox
-				gId("co"+n).style.display = (isVir(t) || isAna(t)) ? "none":"inline";       // hide color order for PWM
+				gId("co"+n).style.display = (isVir(t) || isAna(t) || isHub75(t)) ? "none":"inline";       // hide color order for PWM
 				gId("dig"+n+"w").style.display = (isDig(t) && hasW(t)) ? "inline":"none";   // show swap channels dropdown
 				gId("dig"+n+"w").querySelector("[data-opt=CCT]").disabled = !hasCCT(t);     // disable WW/CW swapping	
 				if (!(isDig(t) && hasW(t))) d.Sf["WO"+n].value = 0;                         // reset swapping
 				gId("dig"+n+"c").style.display = (isAna(t) || isHub75(t)) ? "none":"inline";              // hide count for analog
-				gId("dig"+n+"r").style.display = (isVir(t) || isHub75(t)) ? "none":"inline";              // hide reversed for virtual
+				gId("dig"+n+"r").style.display = (isVir(t)) ? "none":"inline";              // hide reversed for virtual
 				gId("dig"+n+"s").style.display = (isVir(t) || isAna(t) || isHub75(t)) ? "none":"inline";  // hide skip 1st for virtual & analog
 				gId("dig"+n+"f").style.display = (isDig(t) || (isPWM(t) && maxL>2048)) ? "inline":"none"; // hide refresh (PWM hijacks reffresh for dithering on ESP32)
 				gId("dig"+n+"a").style.display = (hasW(t)) ? "inline":"none";               // auto calculate white
@@ -339,6 +339,12 @@
 						LC.min = 0;
 						LC.style.color="#fff";
 						return; // do not check conflicts
+					}
+					else if (isHub75(t)) {
+							LC.max = 128;
+							LC.min = 16;
+							LC.style.color="#fff";
+							return; // do not check conflicts
 					} else {
 						LC.max = d.max_gpio;
 						LC.min = -1;

From 78fb9dcc5969c50ca6a8bf1cb838a21d06e9e5f6 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sun, 8 Sep 2024 13:39:38 +0100
Subject: [PATCH 10/32] Cleanup mxconfig.chain_length

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

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index a4d1b49962..8a7d53cbd1 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -801,8 +801,8 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
   mxconfig.chain_length = max((u_int8_t) 1, min(bc.pins[2], (u_int8_t) 4)); // prevent bad data preventing boot due to low memory
 
-  if(mxconfig.mx_height >= 64 && (bc.pins[2] > 1)) {
-    DEBUG_PRINTLN("WARNING, only single panel can be used of 64 pixel boards due to memory")
+  if(mxconfig.mx_height >= 64 && (mxconfig.chain_length > 1)) {
+    DEBUG_PRINTLN("WARNING, only single panel can be used of 64 pixel boards due to memory");
     mxconfig.chain_length = 1;
   }
 

From e185f2eaf6239acbe1af0245b106e50fa6883ef5 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sun, 8 Sep 2024 14:11:34 +0100
Subject: [PATCH 11/32] Hub75 compact pin defintion

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

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 8a7d53cbd1..91a7e1ce4e 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -809,28 +809,16 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   // mxconfig.driver   = HUB75_I2S_CFG::SHIFTREG;
   mxconfig.clkphase = bc.reversed;
 
+//  HUB75_I2S_CFG::i2s_pins _pins={R1_PIN, G1_PIN, B1_PIN, R2_PIN, G2_PIN, B2_PIN, A_PIN, B_PIN, C_PIN, D_PIN, E_PIN, LAT_PIN, OE_PIN, CLK_PIN};
+
 #if defined(ARDUINO_ADAFRUIT_MATRIXPORTAL_ESP32S3) // MatrixPortal ESP32-S3
 
   // https://www.adafruit.com/product/5778
 
   DEBUG_PRINTLN("MatrixPanel_I2S_DMA - Matrix Portal S3 config");
 
-  mxconfig.gpio.r1 = 42;
-  mxconfig.gpio.g1 = 41;
-  mxconfig.gpio.b1 = 40;
-  mxconfig.gpio.r2 = 38;
-  mxconfig.gpio.g2 = 39;
-  mxconfig.gpio.b2 = 37; 
-
-  mxconfig.gpio.lat = 47;
-  mxconfig.gpio.oe  = 14;
-  mxconfig.gpio.clk = 2;
+  HUB75_I2S_CFG::i2s_pins _pins={ 42, 41, 40, 38, 39, 37,  45, 36, 48, 35, 21, 47, 14, 2 }; 
 
-  mxconfig.gpio.a = 45;
-  mxconfig.gpio.b = 36;
-  mxconfig.gpio.c = 48;
-  mxconfig.gpio.d = 35;
-  mxconfig.gpio.e = 21;
 
 #elif defined(ESP32_FORUM_PINOUT) // Common format for boards designed for SmartMatrix
 
@@ -844,22 +832,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
     Can use a board like https://github.com/rorosaurus/esp32-hub75-driver
 */
 
-  mxconfig.gpio.r1 = 2;
-  mxconfig.gpio.g1 = 15;
-  mxconfig.gpio.b1 = 4;
-  mxconfig.gpio.r2 = 16;
-  mxconfig.gpio.g2 = 27;
-  mxconfig.gpio.b2 = 17; 
-
-  mxconfig.gpio.lat = 26;
-  mxconfig.gpio.oe  = 25;
-  mxconfig.gpio.clk = 22;
-
-  mxconfig.gpio.a = 5;
-  mxconfig.gpio.b = 18;
-  mxconfig.gpio.c = 19;
-  mxconfig.gpio.d = 21;
-  mxconfig.gpio.e = 12;
+ HUB75_I2S_CFG::i2s_pins _pins={ 2, 15, 4, 16, 27, 17, 5, 18, 19, 21, 12, 26, 25, 22 }; 
 
 #else
   DEBUG_PRINTLN("MatrixPanel_I2S_DMA - Default pins");
@@ -872,25 +845,11 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
    https://www.electrodragon.com/product/rgb-matrix-panel-drive-interface-board-for-esp32-dma/
    
   */
-  mxconfig.gpio.r1 = 25;
-  mxconfig.gpio.g1 = 26;
-  mxconfig.gpio.b1 = 27;
-  mxconfig.gpio.r2 = 14;
-  mxconfig.gpio.g2 = 12;
-  mxconfig.gpio.b2 = 13;
-
-  mxconfig.gpio.lat = 4;
-  mxconfig.gpio.oe  = 15;
-  mxconfig.gpio.clk = 16;
-
-  mxconfig.gpio.a = 23;
-  mxconfig.gpio.b = 19;
-  mxconfig.gpio.c = 5;
-  mxconfig.gpio.d = 17;
-  mxconfig.gpio.e = 18;
+ HUB75_I2S_CFG::i2s_pins _pins={ 25, 26, 27, 14, 12, 13, 23, 9, 5, 17, 18, 4, 15, 16 }; 
 
 #endif
 
+  mxconfig.gpio = _pins;
 
   DEBUG_PRINTF("MatrixPanel_I2S_DMA config - %ux%u length: %u\n", mxconfig.mx_width, mxconfig.mx_height, mxconfig.chain_length);
 
@@ -899,6 +858,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
   this->_len = (display->width() * display->height());
 
+  // TODO: try and swap _pins to a array so we can use allocateMultiplePins
   pinManager.allocatePin(mxconfig.gpio.r1, true, PinOwner::HUB75);
   pinManager.allocatePin(mxconfig.gpio.g1, true, PinOwner::HUB75);
   pinManager.allocatePin(mxconfig.gpio.b1, true, PinOwner::HUB75);

From f96acd62638269d1f43e470699a026530963e03e Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sun, 8 Sep 2024 17:06:04 +0100
Subject: [PATCH 12/32] Hub75 - Tweaks to webui

---
 wled00/bus_manager.h          | 10 ++++++----
 wled00/data/settings_leds.htm | 24 +++++++++++++++---------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 97e6caffbf..998b7b57fc 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -333,10 +333,12 @@ class BusHub75Matrix : public Bus {
 
     void setBrightness(uint8_t b, bool immediate);
 
-    uint8_t getPins(uint8_t* pinArray) {
-      pinArray[0] = mxconfig.chain_length;
-      return 1;
-    } // Fake value due to keep finaliseInit happy
+    uint8_t getPins(uint8_t* pinArray) const override {
+      pinArray[0] = mxconfig.mx_height;
+      pinArray[1] = mxconfig.mx_width;
+      pinArray[2] = mxconfig.chain_length;
+      return 3;
+    }
 
     void deallocatePins();
 
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index a2f938aa88..33be80065b 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -172,7 +172,7 @@
 			const t = parseInt(d.Sf["LT"+n].value); // LED type SELECT
 			gId('LAdis'+n).style.display = s.selectedIndex==5 ? "inline" : "none";
 			if (s.value!=="0") d.Sf["LA"+n].value = s.value;
-			d.Sf["LA"+n].min = (isVir(t) || isAna(t)) ? 0 : 1;
+			d.Sf["LA"+n].min = (isVir(t) || isAna(t) || isHub75(t)) ? 0 : 1;
 		}
 		function setABL()
 		{
@@ -248,14 +248,14 @@
 						p0d = "Config:"
 						break;
 					case 'H': // HUB75
-						p0d = "Panel size (width x height):"
+						p0d = "Panel size (width x height), Panel count:"
 						break;
 				}
 				gId("p0d"+n).innerText = p0d;
 				gId("p1d"+n).innerText = p1d;
 				gId("off"+n).innerText = off;
 				// secondary pins show/hide (type string length is equivalent to number of pins used; except for network and on/off)
-				let pins = Math.max(gT(t).t.length,1) + 3*isNet(t) + 1*isHub75(t); // fixes network pins to 4
+				let pins = Math.max(gT(t).t.length,1) + 3*isNet(t) + 2*isHub75(t); // fixes network pins to 4
 				for (let p=1; p<5; p++) {
 					var LK = d.Sf["L"+p+n];
 					if (!LK) continue;
@@ -339,17 +339,23 @@
 						LC.min = 0;
 						LC.style.color="#fff";
 						return; // do not check conflicts
-					}
-					else if (isHub75(t)) {
-							LC.max = 128;
-							LC.min = 16;
-							LC.style.color="#fff";
-							return; // do not check conflicts
 					} else {
 						LC.max = d.max_gpio;
 						LC.min = -1;
 					}
 				}
+				if (isHub75(t) && (nm=="L0" || nm=="L1")) {
+						LC.max = 16;
+						LC.min = 128;
+						LC.style.color="#fff";
+						return; // do not check conflicts
+				}
+				else if (isHub75(t) && nm=="L2") {
+					LC.max = 1;
+					LC.min = 4;
+					LC.style.color="#fff";
+					return; // do not check conflicts
+				}
 				// check for pin conflicts & color fields
 				if (nm=="L0" || nm=="L1" || nm=="L2" || nm=="L3" || nm=="L4")
 					if (LC.value!="" && LC.value!="-1") {

From e0d78d5328b914bb4e82907f374a41fdc8a74144 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sun, 8 Sep 2024 17:36:39 +0100
Subject: [PATCH 13/32] Porting latest BusHub75Matrix from MoonModules - Mostly
 authored by Frank - MIT licence granted for this copy

---
 wled00/bus_manager.cpp | 216 ++++++++++++++++++++++++++++++++++++++---
 wled00/bus_manager.h   |  31 +++---
 2 files changed, 214 insertions(+), 33 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 91a7e1ce4e..9399bead28 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -23,6 +23,27 @@
 
 extern bool cctICused;
 
+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);
+}
+
 //colors.cpp
 uint32_t colorBalanceFromKelvin(uint16_t kelvin, uint32_t rgb);
 
@@ -790,14 +811,45 @@ void BusNetwork::cleanup(void) {
 
 BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWhite) {
 
-  mxconfig.double_buff = true; // <------------- Turn on double buffer
+  _valid = false;
+  mxconfig.double_buff = false; // default to off, known to cause issue with some effects but needs more memory
+  // 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;
 
-  switch(bc.type) {
-    case TYPE_HUB75MATRIX_HS:
+  fourScanPanel = nullptr;
+
+  if(bc.type == TYPE_HUB75MATRIX_HS) {
       mxconfig.mx_width = bc.pins[0];
       mxconfig.mx_height = bc.pins[1];
-      break;
+  
+  }
+  else if(bc.type == TYPE_HUB75MATRIX_QS) {
+      fourScanPanel = new VirtualMatrixPanel((*display), 1, 1, bc.pins[0], bc.pins[1]);
+      fourScanPanel->setRotation(0);
+      switch(bc.pins[1]) {
+        case 16:
+          fourScanPanel->setPhysicalPanelScanRate(FOUR_SCAN_16PX_HIGH);
+          break;
+        case 32:
+          fourScanPanel->setPhysicalPanelScanRate(FOUR_SCAN_32PX_HIGH);
+          break;
+        case 64:
+          fourScanPanel->setPhysicalPanelScanRate(FOUR_SCAN_64PX_HIGH);
+          break;
+        default:
+          DEBUG_PRINTLN("Unsupported height");
+          return;
+      }
   }
+  else {
+    DEBUG_PRINTLN("Unknown type");
+    return;
+  }  
+
 
   mxconfig.chain_length = max((u_int8_t) 1, min(bc.pins[2], (u_int8_t) 4)); // prevent bad data preventing boot due to low memory
 
@@ -882,29 +934,159 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   // let's adjust default brightness
   display->setBrightness8(25);    // range is 0-255, 0 - 0%, 255 - 100%
 
+  delay(24); // experimental
   // Allocate memory and start DMA display
   if( not display->begin() ) {
       DEBUG_PRINTLN("****** MatrixPanel_I2S_DMA !KABOOM! I2S memory allocation failed ***********");
       return;
   }
   else {
+    DEBUG_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
+    DEBUG_PRINTLN("MatrixPanel_I2S_DMA clear ok");
+
+    if (_ledBuffer) free(_ledBuffer);                 // should not happen
+    if (_ledsDirty) free(_ledsDirty);                 // should not happen
+    DEBUG_PRINTLN("MatrixPanel_I2S_DMA allocate memory");
+    _ledsDirty = (byte*) malloc(getBitArrayBytes(_len));  // create LEDs dirty bits
+   DEBUG_PRINTLN("MatrixPanel_I2S_DMA allocate memory ok");
+   
+    if (_ledsDirty == nullptr) {
+      display->stopDMAoutput();
+      delete display; display = nullptr;
+      _valid = false;
+      DEBUG_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)
+    }
   }
   
-  DEBUG_PRINTLN("MatrixPanel_I2S_DMA started");
+
+  if (_valid) {
+    _panelWidth = fourScanPanel ? fourScanPanel->width() : display->width();  // cache width - it will never change
+  }
+
+  DEBUG_PRINT(F("MatrixPanel_I2S_DMA "));
+  DEBUG_PRINTF("%sstarted, width=%u, %u pixels.\n", _valid? "":"not ", _panelWidth, _len);
+
+  if (mxconfig.double_buff == true) DEBUG_PRINTLN(F("MatrixPanel_I2S_DMA driver native double-buffering enabled."));
+  if (_ledBuffer != nullptr) DEBUG_PRINTLN(F("MatrixPanel_I2S_DMA LEDS buffer enabled."));
+  if (_ledsDirty != nullptr) DEBUG_PRINTLN(F("MatrixPanel_I2S_DMA LEDS dirty bit optimization enabled."));
+  if ((_ledBuffer != nullptr) || (_ledsDirty != nullptr)) {
+    DEBUG_PRINT(F("MatrixPanel_I2S_DMA LEDS buffer uses "));
+    DEBUG_PRINT((_ledBuffer? _len*sizeof(CRGB) :0) + (_ledsDirty? getBitArrayBytes(_len) :0));
+    DEBUG_PRINTLN(F(" bytes."));
+  }
+}
+
+void __attribute__((hot)) BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c) {
+  if (!_valid || pix >= _len) return;
+  // if (_cct >= 1900) c = colorBalanceFromKelvin(_cct, c); //color correction from CCT
+
+  if (_ledBuffer) {
+    CRGB fastled_col = CRGB(c);
+    if (_ledBuffer[pix] != fastled_col) {
+      _ledBuffer[pix] = fastled_col;
+      setBitInArray(_ledsDirty, pix, true);  // flag pixel as "dirty"
+    }
+  }
+  else {
+    if ((c == BLACK) && (getBitFromArray(_ledsDirty, pix) == false)) return; // ignore black if pixel is already black
+    setBitInArray(_ledsDirty, pix, c != BLACK);                              // dirty = true means "color is not BLACK"
+
+    #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) {
+      int width = _panelWidth;
+      int x = pix % width;
+      int y = pix / width;
+      fourScanPanel->drawPixelRGB888(int16_t(x), int16_t(y), r, g, b);
+    } else {
+      int width = _panelWidth;
+      int x = pix % width;
+      int y = pix / width;
+      display->drawPixelRGB888(int16_t(x), int16_t(y), r, g, b);
+    }
+  }
 }
 
-void BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c) {
-  r = R(c);
-  g = G(c);
-  b = B(c);
-  x = pix % display->width();
-  y = floor(pix / display->width());
-  display->drawPixelRGB888(x, y, r, g, b);
+uint32_t BusHub75Matrix::getPixelColor(uint16_t pix) const {
+  if (!_valid || pix >= _len) return BLACK;
+  if (_ledBuffer)
+    return uint32_t(_ledBuffer[pix].scale8(_bri)) & 0x00FFFFFF;  // scale8() is needed to mimic NeoPixelBus, which returns scaled-down colours
+  else
+    return 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) {
-  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);
+    //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.
+
+    size_t pix = 0; // running pixel index
+    for (int y=0; y<height; y++) for (int x=0; x<width; x++) {
+      if (getBitFromArray(_ledsDirty, pix) == true) {        // only repaint the "dirty"  pixels
+        uint32_t c = uint32_t(_ledBuffer[pix]) & 0x00FFFFFF; // get RGB color, removing FastLED "alpha" component 
+        #ifndef NO_CIE1931
+        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 ++;
+    }
+    setBitArray(_ledsDirty, _len, false);  // buffer shown - reset all dirty bits
+  }
+
+  if(mxconfig.double_buff) {
+    display->flipDMABuffer(); // Show the back buffer, set current output buffer to the back (i.e. no longer being sent to LED panels)
+    // while(!previousBufferFree) delay(1);   // experimental - Wait before we allow any writing to the buffer. Stop flicker.
+    display->clearScreen();   // Now clear the back-buffer
+    setBitArray(_ledsDirty, _len, false);  // dislay buffer is blank - reset all dirty bits
+  }
+}
+
+void BusHub75Matrix::cleanup() {
+  if (display && _valid) display->stopDMAoutput();  // terminate DMA driver (display goes black)
+  _valid = false;
+  _panelWidth = 0;
+  deallocatePins();
+  DEBUG_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;
+  if (_ledBuffer != nullptr) free(_ledBuffer); _ledBuffer = nullptr;
+  if (_ledsDirty != nullptr) free(_ledsDirty); _ledsDirty = nullptr;      
 }
 
 void BusHub75Matrix::deallocatePins() {
@@ -931,10 +1113,16 @@ void BusHub75Matrix::deallocatePins() {
 std::vector<LEDType> BusHub75Matrix::getLEDTypes() {
   return {
     {TYPE_HUB75MATRIX_HS,     "H",     PSTR("HUB75 (Half Scan)")},
-    // {TYPE_HUB75MATRIX_QS,     "H",     PSTR("HUB75 (Quarter Scan)")},
+    {TYPE_HUB75MATRIX_QS,     "H",     PSTR("HUB75 (Quarter Scan)")},
   };
 }
 
+uint8_t BusHub75Matrix::getPins(uint8_t* pinArray) const {
+  pinArray[0] = mxconfig.mx_width;
+  pinArray[1] = mxconfig.mx_height;
+  pinArray[2] = mxconfig.chain_length;
+  return 3;
+}
 
 #endif
 // ***************************************************************************
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 998b7b57fc..37bfc25bd1 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -2,7 +2,11 @@
 #define BusManager_h
 
 #ifdef WLED_ENABLE_HUB75MATRIX
+
 #include <ESP32-HUB75-MatrixPanel-I2S-DMA.h>
+#include <ESP32-VirtualMatrixPanel-I2S-DMA.h>
+#include <FastLED.h>
+
 #endif
 /*
  * Class for addressing various light types
@@ -323,30 +327,17 @@ class BusHub75Matrix : public Bus {
     bool hasWhite() { return false; }
 
     void setPixelColor(uint16_t pix, uint32_t c);
+    uint32_t getPixelColor(uint16_t pix) const 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)
-        display->clearScreen();   // Now clear the back-buffer
-      }
-    }
+    void show() override;
 
     void setBrightness(uint8_t b, bool immediate);
 
-    uint8_t getPins(uint8_t* pinArray) const override {
-      pinArray[0] = mxconfig.mx_height;
-      pinArray[1] = mxconfig.mx_width;
-      pinArray[2] = mxconfig.chain_length;
-      return 3;
-    }
+    uint8_t getPins(uint8_t* pinArray) const override;
 
     void deallocatePins();
 
-    void cleanup() {
-      deallocatePins();
-      delete display;
-      _valid = false;
-    }
+    void cleanup();
 
     ~BusHub75Matrix() {
       cleanup();
@@ -356,9 +347,11 @@ class BusHub75Matrix : public Bus {
 
   private:
     MatrixPanel_I2S_DMA *display = nullptr;
+    VirtualMatrixPanel  *fourScanPanel = nullptr;
     HUB75_I2S_CFG mxconfig;
-    uint8_t r, g, b, x, y;
-    
+    unsigned _panelWidth = 0;
+    CRGB *_ledBuffer = nullptr;
+    byte *_ledsDirty = nullptr;    
 };
 #endif
 

From 21c582ee1a8b38f1c362f89b435b054d5262e9c3 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sun, 8 Sep 2024 17:45:28 +0100
Subject: [PATCH 14/32] Porting latest BusHub75Matrix from MoonModules - Mostly
 authored by Frank - MIT licence granted for this copy

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

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 9399bead28..4d6f93c055 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -21,6 +21,14 @@
 #include "bus_wrapper.h"
 #include "bus_manager.h"
 
+// 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;
+}
 extern bool cctICused;
 
 void setBitInArray(uint8_t* byteArray, size_t position, bool value) {  // set bit - with error handling for nullptr
@@ -824,10 +832,11 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
   if(bc.type == TYPE_HUB75MATRIX_HS) {
       mxconfig.mx_width = bc.pins[0];
-      mxconfig.mx_height = bc.pins[1];
-  
+      mxconfig.mx_height = bc.pins[1];  
   }
   else if(bc.type == TYPE_HUB75MATRIX_QS) {
+      mxconfig.mx_width = bc.pins[0] * 2;
+      mxconfig.mx_height = bc.pins[1] / 2;  
       fourScanPanel = new VirtualMatrixPanel((*display), 1, 1, bc.pins[0], bc.pins[1]);
       fourScanPanel->setRotation(0);
       switch(bc.pins[1]) {

From ad402adf7a199661400a80f36c4ef9d4a00bca9e Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sun, 8 Sep 2024 19:58:37 +0100
Subject: [PATCH 15/32] Hub75 - Misc fixes - WiP

---
 platformio.ini                |  3 ++-
 wled00/bus_manager.cpp        | 33 +++++++++++++++------------------
 wled00/bus_manager.h          |  5 ++++-
 wled00/data/settings_leds.htm | 17 +++++++++++------
 4 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 120ffe9915..e5cf681e0f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -528,7 +528,8 @@ platform_packages = ${esp32_idf_V4.platform_packages}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags}
   -D WLED_RELEASE_NAME=ESP32_hub75
-  -D WLED_ENABLE_HUB75MATRIX -D NO_GFX
+  -D WLED_ENABLE_HUB75MATRIX -D NO_GFX -D NO_CIE1931
+  -D ESP32_FORUM_PINOUT
   -D WLED_DEBUG
 lib_deps = ${esp32_idf_V4.lib_deps}
   https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA.git#3.0.11
diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 4d6f93c055..14688d823d 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -821,22 +821,22 @@ 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
-  // 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 = bc.reversed;
 
   fourScanPanel = nullptr;
 
   if(bc.type == TYPE_HUB75MATRIX_HS) {
-      mxconfig.mx_width = bc.pins[0];
-      mxconfig.mx_height = bc.pins[1];  
+      mxconfig.mx_width = min((u_int8_t) 64, bc.pins[0]);
+      mxconfig.mx_height = 32; // TODO - bad value bc.pins[1];  
   }
   else if(bc.type == TYPE_HUB75MATRIX_QS) {
-      mxconfig.mx_width = bc.pins[0] * 2;
-      mxconfig.mx_height = bc.pins[1] / 2;  
+      mxconfig.mx_width = min((u_int8_t) 64, bc.pins[0]) * 2;
+      mxconfig.mx_height = min((u_int8_t) 64, bc.pins[1]) / 2;  
       fourScanPanel = new VirtualMatrixPanel((*display), 1, 1, bc.pins[0], bc.pins[1]);
       fourScanPanel->setRotation(0);
       switch(bc.pins[1]) {
@@ -860,15 +860,13 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   }  
 
 
-  mxconfig.chain_length = max((u_int8_t) 1, min(bc.pins[2], (u_int8_t) 4)); // prevent bad data preventing boot due to low memory
+  mxconfig.chain_length = 1; //max((u_int8_t) 1, min(bc.pins[2], (u_int8_t) 4)); // prevent bad data preventing boot due to low memory
 
   if(mxconfig.mx_height >= 64 && (mxconfig.chain_length > 1)) {
     DEBUG_PRINTLN("WARNING, only single panel can be used of 64 pixel boards due to memory");
     mxconfig.chain_length = 1;
   }
 
-  // mxconfig.driver   = HUB75_I2S_CFG::SHIFTREG;
-  mxconfig.clkphase = bc.reversed;
 
 //  HUB75_I2S_CFG::i2s_pins _pins={R1_PIN, G1_PIN, B1_PIN, R2_PIN, G2_PIN, B2_PIN, A_PIN, B_PIN, C_PIN, D_PIN, E_PIN, LAT_PIN, OE_PIN, CLK_PIN};
 
@@ -918,6 +916,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   display = new MatrixPanel_I2S_DMA(mxconfig);
 
   this->_len = (display->width() * display->height());
+  DEBUG_PRINTF("Length: %u\n", _len);
 
   // TODO: try and swap _pins to a array so we can use allocateMultiplePins
   pinManager.allocatePin(mxconfig.gpio.r1, true, PinOwner::HUB75);
@@ -1006,8 +1005,8 @@ void __attribute__((hot)) BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c
     }
   }
   else {
-    if ((c == BLACK) && (getBitFromArray(_ledsDirty, pix) == false)) return; // ignore black if pixel is already black
-    setBitInArray(_ledsDirty, pix, c != BLACK);                              // dirty = true means "color is not BLACK"
+    if ((c == IS_BLACK) && (getBitFromArray(_ledsDirty, pix) == false)) return; // ignore black if pixel is already black
+    setBitInArray(_ledsDirty, pix, c != IS_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
@@ -1017,25 +1016,23 @@ void __attribute__((hot)) BusHub75Matrix::setPixelColor(uint16_t pix, uint32_t c
     uint8_t b = B(c);
 
     if(fourScanPanel != nullptr) {
-      int width = _panelWidth;
-      int x = pix % width;
-      int y = pix / width;
+      int x = pix % _panelWidth;
+      int y = pix / _panelWidth;
       fourScanPanel->drawPixelRGB888(int16_t(x), int16_t(y), r, g, b);
     } else {
-      int width = _panelWidth;
-      int x = pix % width;
-      int y = pix / width;
+      int x = pix % _panelWidth;
+      int y = pix / _panelWidth;
       display->drawPixelRGB888(int16_t(x), int16_t(y), r, g, b);
     }
   }
 }
 
 uint32_t BusHub75Matrix::getPixelColor(uint16_t pix) const {
-  if (!_valid || pix >= _len) return BLACK;
+  if (!_valid || pix >= _len) return IS_BLACK;
   if (_ledBuffer)
     return uint32_t(_ledBuffer[pix].scale8(_bri)) & 0x00FFFFFF;  // scale8() is needed to mimic NeoPixelBus, which returns scaled-down colours
   else
-    return getBitFromArray(_ledsDirty, pix) ? DARKGREY: BLACK;   // just a hack - we only know if the pixel is black or not
+    return getBitFromArray(_ledsDirty, pix) ? IS_DARKGREY: IS_BLACK;   // just a hack - we only know if the pixel is black or not
 }
 
 void BusHub75Matrix::setBrightness(uint8_t b, bool immediate) {
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 37bfc25bd1..67f2c6bfff 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -351,7 +351,10 @@ class BusHub75Matrix : public Bus {
     HUB75_I2S_CFG mxconfig;
     unsigned _panelWidth = 0;
     CRGB *_ledBuffer = nullptr;
-    byte *_ledsDirty = nullptr;    
+    byte *_ledsDirty = nullptr;
+    // workaround for missing constants on include path for non-MM   
+    uint32_t IS_BLACK = 0x000000;
+    uint32_t IS_DARKGREY = 0x333333;
 };
 #endif
 
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 33be80065b..0de8060414 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -82,6 +82,9 @@
 				let nm = LC.name.substring(0,2);
 				let n = LC.name.substring(2);
 				let t = parseInt(d.Sf["LT"+n].value, 10); // LED type SELECT
+				if(isHub75(t)) {
+					return;
+				}
 				// ignore IP address
 				if (nm=="L0" || nm=="L1" || nm=="L2" || nm=="L3") {
 					if (t>=80) return;
@@ -345,14 +348,16 @@
 					}
 				}
 				if (isHub75(t) && (nm=="L0" || nm=="L1")) {
-						LC.max = 16;
-						LC.min = 128;
-						LC.style.color="#fff";
-						return; // do not check conflicts
+					// Matrix width and height
+					LC.max = 128;
+					LC.min = 16;
+					LC.style.color="#fff";
+					return; // do not check conflicts
 				}
 				else if (isHub75(t) && nm=="L2") {
-					LC.max = 1;
-					LC.min = 4;
+					// Chain length aka Panel Count
+					LC.max = 4;
+					LC.min = 1;
 					LC.style.color="#fff";
 					return; // do not check conflicts
 				}

From 23e578bfbfc4bb24b22711faf8eebb276e7d4312 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sun, 22 Sep 2024 12:59:29 +0100
Subject: [PATCH 16/32] Swap BusHub75Matrix to use allocateMultiplePins

---
 wled00/bus_manager.cpp | 53 ++++++++++--------------------------------
 wled00/pin_manager.cpp |  6 +++++
 wled00/pin_manager.h   |  1 +
 3 files changed, 19 insertions(+), 41 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 14688d823d..c747811c07 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -876,8 +876,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
   DEBUG_PRINTLN("MatrixPanel_I2S_DMA - Matrix Portal S3 config");
 
-  HUB75_I2S_CFG::i2s_pins _pins={ 42, 41, 40, 38, 39, 37,  45, 36, 48, 35, 21, 47, 14, 2 }; 
-
+  mxconfig.gpio = { 42, 41, 40, 38, 39, 37,  45, 36, 48, 35, 21, 47, 14, 2 }; 
 
 #elif defined(ESP32_FORUM_PINOUT) // Common format for boards designed for SmartMatrix
 
@@ -891,7 +890,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
     Can use a board like https://github.com/rorosaurus/esp32-hub75-driver
 */
 
- HUB75_I2S_CFG::i2s_pins _pins={ 2, 15, 4, 16, 27, 17, 5, 18, 19, 21, 12, 26, 25, 22 }; 
+ mxconfig.gpio = { 2, 15, 4, 16, 27, 17, 5, 18, 19, 21, 12, 26, 25, 22 }; 
 
 #else
   DEBUG_PRINTLN("MatrixPanel_I2S_DMA - Default pins");
@@ -904,13 +903,18 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
    https://www.electrodragon.com/product/rgb-matrix-panel-drive-interface-board-for-esp32-dma/
    
   */
- HUB75_I2S_CFG::i2s_pins _pins={ 25, 26, 27, 14, 12, 13, 23, 9, 5, 17, 18, 4, 15, 16 }; 
+ mxconfig.gpio = { 25, 26, 27, 14, 12, 13, 23, 9, 5, 17, 18, 4, 15, 16 }; 
 
 #endif
 
-  mxconfig.gpio = _pins;
+  int8_t pins[14];
+  memcpy(pins, &mxconfig.gpio, sizeof(mxconfig.gpio));
+  pinManager.allocateMultiplePins(pins, 14, PinOwner::HUB75, true);
 
   DEBUG_PRINTF("MatrixPanel_I2S_DMA config - %ux%u length: %u\n", mxconfig.mx_width, mxconfig.mx_height, mxconfig.chain_length);
+  DEBUG_PRINTF("R1_PIN=%u, G1_PIN=%u, B1_PIN=%u, R2_PIN=%u, G2_PIN=%u, B2_PIN=%u, A_PIN=%u, B_PIN=%u, C_PIN=%u, D_PIN=%u, E_PIN=%u, LAT_PIN=%u, OE_PIN=%u, CLK_PIN=%u\n",
+                mxconfig.gpio.r1, mxconfig.gpio.g1, mxconfig.gpio.b1, mxconfig.gpio.r2, mxconfig.gpio.g2, mxconfig.gpio.b2,
+                mxconfig.gpio.a, mxconfig.gpio.b, mxconfig.gpio.c, mxconfig.gpio.d, mxconfig.gpio.e, mxconfig.gpio.lat, mxconfig.gpio.oe, mxconfig.gpio.clk);
 
   // OK, now we can create our matrix object
   display = new MatrixPanel_I2S_DMA(mxconfig);
@@ -918,24 +922,6 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   this->_len = (display->width() * display->height());
   DEBUG_PRINTF("Length: %u\n", _len);
 
-  // TODO: try and swap _pins to a array so we can use allocateMultiplePins
-  pinManager.allocatePin(mxconfig.gpio.r1, true, PinOwner::HUB75);
-  pinManager.allocatePin(mxconfig.gpio.g1, true, PinOwner::HUB75);
-  pinManager.allocatePin(mxconfig.gpio.b1, true, PinOwner::HUB75);
-  pinManager.allocatePin(mxconfig.gpio.r2, true, PinOwner::HUB75);
-  pinManager.allocatePin(mxconfig.gpio.g2, true, PinOwner::HUB75);
-  pinManager.allocatePin(mxconfig.gpio.b2, true, PinOwner::HUB75);
-
-  pinManager.allocatePin(mxconfig.gpio.lat, true, PinOwner::HUB75);
-  pinManager.allocatePin(mxconfig.gpio.oe, true, PinOwner::HUB75);
-  pinManager.allocatePin(mxconfig.gpio.clk, true, PinOwner::HUB75);
-
-  pinManager.allocatePin(mxconfig.gpio.a, true, PinOwner::HUB75);
-  pinManager.allocatePin(mxconfig.gpio.b, true, PinOwner::HUB75);
-  pinManager.allocatePin(mxconfig.gpio.c, true, PinOwner::HUB75);
-  pinManager.allocatePin(mxconfig.gpio.d, true, PinOwner::HUB75);
-  pinManager.allocatePin(mxconfig.gpio.e, true, PinOwner::HUB75);
-
   // display->setLatBlanking(4);
 
   DEBUG_PRINTLN("MatrixPanel_I2S_DMA created");
@@ -1096,24 +1082,9 @@ void BusHub75Matrix::cleanup() {
 }
 
 void BusHub75Matrix::deallocatePins() {
-
-  pinManager.deallocatePin(mxconfig.gpio.r1, PinOwner::HUB75);
-  pinManager.deallocatePin(mxconfig.gpio.g1, PinOwner::HUB75);
-  pinManager.deallocatePin(mxconfig.gpio.b1, PinOwner::HUB75);
-  pinManager.deallocatePin(mxconfig.gpio.r2, PinOwner::HUB75);
-  pinManager.deallocatePin(mxconfig.gpio.g2, PinOwner::HUB75);
-  pinManager.deallocatePin(mxconfig.gpio.b2, PinOwner::HUB75);
-
-  pinManager.deallocatePin(mxconfig.gpio.lat, PinOwner::HUB75);
-  pinManager.deallocatePin(mxconfig.gpio.oe, PinOwner::HUB75);
-  pinManager.deallocatePin(mxconfig.gpio.clk, PinOwner::HUB75);
-
-  pinManager.deallocatePin(mxconfig.gpio.a, PinOwner::HUB75);
-  pinManager.deallocatePin(mxconfig.gpio.b, PinOwner::HUB75);
-  pinManager.deallocatePin(mxconfig.gpio.c, PinOwner::HUB75);
-  pinManager.deallocatePin(mxconfig.gpio.d, PinOwner::HUB75);
-  pinManager.deallocatePin(mxconfig.gpio.e, PinOwner::HUB75);
-
+  uint8_t pins[14];
+  memcpy(pins, &mxconfig.gpio, sizeof(mxconfig.gpio));
+  pinManager.deallocateMultiplePins(pins, 14, PinOwner::HUB75);
 }
 
 std::vector<LEDType> BusHub75Matrix::getLEDTypes() {
diff --git a/wled00/pin_manager.cpp b/wled00/pin_manager.cpp
index 8db61361cc..aceeb5877b 100644
--- a/wled00/pin_manager.cpp
+++ b/wled00/pin_manager.cpp
@@ -157,6 +157,12 @@ bool PinManagerClass::allocateMultiplePins(const managed_pin_type * mptArray, by
   return true;
 }
 
+bool PinManagerClass::allocateMultiplePins(const int8_t * mptArray, byte arrayElementCount, PinOwner tag, boolean output) {
+  PinManagerPinType pins[arrayElementCount];
+  for (int i=0; i<arrayElementCount; i++) pins[i] = {mptArray[i], output};
+  return allocateMultiplePins(pins, arrayElementCount, tag);
+}
+
 bool PinManagerClass::allocatePin(byte gpio, bool output, PinOwner tag)
 {
   // HW I2C & SPI pins have to be allocated using allocateMultiplePins variant since there is always SCL/SDA pair
diff --git a/wled00/pin_manager.h b/wled00/pin_manager.h
index 9bbd56952e..4518ce9327 100644
--- a/wled00/pin_manager.h
+++ b/wled00/pin_manager.h
@@ -102,6 +102,7 @@ class PinManagerClass {
   // using more than one pin, such as I2C, SPI, rotary encoders,
   // ethernet, etc..
   bool allocateMultiplePins(const managed_pin_type * mptArray, byte arrayElementCount, PinOwner tag );
+  bool allocateMultiplePins(const int8_t * mptArray, byte arrayElementCount, PinOwner tag, boolean output);
 
   [[deprecated("Replaced by three-parameter allocatePin(gpio, output, ownerTag), for improved debugging")]]
   inline bool allocatePin(byte gpio, bool output = true) { return allocatePin(gpio, output, PinOwner::None); }

From 382d7e8ac37d074cbe33047809ded3ccbd0ed8ad Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sun, 22 Sep 2024 13:05:22 +0100
Subject: [PATCH 17/32] Remove stray whitespace from xml.cpp

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

diff --git a/wled00/xml.cpp b/wled00/xml.cpp
index 22d21d7708..c06b027686 100644
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -784,6 +784,5 @@ void getSettingsJS(byte subPage, char* dest)
     #else
     oappend(SET_F("gId(\"somp\").remove(1);")); // remove 2D option from dropdown
     #endif
-
   }
 }

From fc0739703b2160ae6a3b9f3984813093a9a6274d Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sun, 22 Sep 2024 13:14:26 +0100
Subject: [PATCH 18/32] cleanup hub75 comments

---
 wled00/bus_manager.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index c747811c07..95bd9cf8fc 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -873,20 +873,15 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 #if defined(ARDUINO_ADAFRUIT_MATRIXPORTAL_ESP32S3) // MatrixPortal ESP32-S3
 
   // https://www.adafruit.com/product/5778
-
   DEBUG_PRINTLN("MatrixPanel_I2S_DMA - Matrix Portal S3 config");
-
   mxconfig.gpio = { 42, 41, 40, 38, 39, 37,  45, 36, 48, 35, 21, 47, 14, 2 }; 
 
 #elif defined(ESP32_FORUM_PINOUT) // Common format for boards designed for SmartMatrix
 
   DEBUG_PRINTLN("MatrixPanel_I2S_DMA - ESP32_FORUM_PINOUT");
-
 /*
     ESP32 with SmartMatrix's default pinout - ESP32_FORUM_PINOUT
-    
     https://github.com/pixelmatix/SmartMatrix/blob/teensylc/src/MatrixHardware_ESP32_V0.h
-
     Can use a board like https://github.com/rorosaurus/esp32-hub75-driver
 */
 
@@ -922,8 +917,6 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   this->_len = (display->width() * display->height());
   DEBUG_PRINTF("Length: %u\n", _len);
 
-  // display->setLatBlanking(4);
-
   DEBUG_PRINTLN("MatrixPanel_I2S_DMA created");
   // let's adjust default brightness
   display->setBrightness8(25);    // range is 0-255, 0 - 0%, 255 - 100%

From b7aba15d5836dba1d7e3cc58d1a7493a45d4b31b Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sun, 22 Sep 2024 15:27:23 +0100
Subject: [PATCH 19/32] Always copy all the pin data

---
 usermods/rgb-rotary-encoder/rgb-rotary-encoder.h | 2 +-
 wled00/bus_manager.h                             | 2 +-
 wled00/cfg.cpp                                   | 2 +-
 wled00/set.cpp                                   | 2 +-
 wled00/wled_eeprom.cpp                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/usermods/rgb-rotary-encoder/rgb-rotary-encoder.h b/usermods/rgb-rotary-encoder/rgb-rotary-encoder.h
index 00fc227252..b06037f50b 100644
--- a/usermods/rgb-rotary-encoder/rgb-rotary-encoder.h
+++ b/usermods/rgb-rotary-encoder/rgb-rotary-encoder.h
@@ -56,7 +56,7 @@ class RgbRotaryEncoderUsermod : public Usermod
 
     void initLedBus()
     {
-      byte _pins[5] = {(byte)ledIo, 255, 255, 255, 255};
+      byte _pins[OUTPUT_MAX_PINS] = {(byte)ledIo, 255, 255, 255, 255};
       BusConfig busCfg = BusConfig(TYPE_WS2812_RGB, _pins, 0, numLeds, COL_ORDER_GRB, false, 0);
 
       ledBus = new BusDigital(busCfg, WLED_MAX_BUSSES - 1);
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 98408af36e..dc54b27b11 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -391,7 +391,7 @@ struct BusConfig {
   {
     refreshReq = (bool) GET_BIT(busType,7);
     type = busType & 0x7F;  // bit 7 may be/is hacked to include refresh info (1=refresh in off state, 0=no refresh)
-    size_t nPins = Bus::getNumberOfPins(type);
+    size_t nPins = OUTPUT_MAX_PINS;
     for (size_t i = 0; i < nPins; i++) pins[i] = ppins[i];
   }
 
diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp
index 3f6cfbacb6..e043c34351 100644
--- a/wled00/cfg.cpp
+++ b/wled00/cfg.cpp
@@ -193,7 +193,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
 
     for (JsonObject elm : ins) {
       if (s >= WLED_MAX_BUSSES+WLED_MIN_VIRTUAL_BUSSES) break;
-      uint8_t pins[5] = {255, 255, 255, 255, 255};
+      uint8_t pins[OUTPUT_MAX_PINS] = {255, 255, 255, 255, 255};
       JsonArray pinArr = elm["pin"];
       if (pinArr.size() == 0) continue;
       //pins[0] = pinArr[0];
diff --git a/wled00/set.cpp b/wled00/set.cpp
index 96eb3ed13b..47bb6482f3 100644
--- a/wled00/set.cpp
+++ b/wled00/set.cpp
@@ -125,7 +125,7 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
 
     unsigned colorOrder, type, skip, awmode, channelSwap, maPerLed;
     unsigned length, start, maMax;
-    uint8_t pins[5] = {255, 255, 255, 255, 255};
+    uint8_t pins[OUTPUT_MAX_PINS] = {255, 255, 255, 255, 255};
 
     unsigned ablMilliampsMax = request->arg(F("MA")).toInt();
     BusManager::setMilliampsMax(ablMilliampsMax);
diff --git a/wled00/wled_eeprom.cpp b/wled00/wled_eeprom.cpp
index 4f2c14d474..57d82f7e00 100755
--- a/wled00/wled_eeprom.cpp
+++ b/wled00/wled_eeprom.cpp
@@ -92,7 +92,7 @@ void loadSettingsFromEEPROM()
   if (apHide > 1) apHide = 1;
   uint16_t length = EEPROM.read(229) + ((EEPROM.read(398) << 8) & 0xFF00); //was ledCount
   if (length > MAX_LEDS || length == 0) length = 30;
-  uint8_t pins[5] = {2, 255, 255, 255, 255};
+  uint8_t pins[OUTPUT_MAX_PINS] = {2, 255, 255, 255, 255};
   uint8_t colorOrder = COL_ORDER_GRB;
   if (lastEEPROMversion > 9) colorOrder = EEPROM.read(383);
   if (colorOrder > COL_ORDER_GBR) colorOrder = COL_ORDER_GRB;

From e111b6e1b732a10fb7a794ebac4035c44dec092b Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sun, 22 Sep 2024 15:53:40 +0100
Subject: [PATCH 20/32] Hub75 - PIN_COUNT const

---
 wled00/bus_manager.cpp | 8 ++++----
 wled00/bus_manager.h   | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index a2670518d5..5413873f7f 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -902,9 +902,9 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
 #endif
 
-  int8_t pins[14];
+  int8_t pins[PIN_COUNT];
   memcpy(pins, &mxconfig.gpio, sizeof(mxconfig.gpio));
-  pinManager.allocateMultiplePins(pins, 14, PinOwner::HUB75, true);
+  PinManager::allocateMultiplePins(pins, PIN_COUNT, PinOwner::HUB75, true);
 
   DEBUG_PRINTF("MatrixPanel_I2S_DMA config - %ux%u length: %u\n", mxconfig.mx_width, mxconfig.mx_height, mxconfig.chain_length);
   DEBUG_PRINTF("R1_PIN=%u, G1_PIN=%u, B1_PIN=%u, R2_PIN=%u, G2_PIN=%u, B2_PIN=%u, A_PIN=%u, B_PIN=%u, C_PIN=%u, D_PIN=%u, E_PIN=%u, LAT_PIN=%u, OE_PIN=%u, CLK_PIN=%u\n",
@@ -1075,9 +1075,9 @@ void BusHub75Matrix::cleanup() {
 }
 
 void BusHub75Matrix::deallocatePins() {
-  uint8_t pins[14];
+  uint8_t pins[PIN_COUNT];
   memcpy(pins, &mxconfig.gpio, sizeof(mxconfig.gpio));
-  pinManager.deallocateMultiplePins(pins, 14, PinOwner::HUB75);
+  PinManager::deallocateMultiplePins(pins, PIN_COUNT, PinOwner::HUB75);
 }
 
 std::vector<LEDType> BusHub75Matrix::getLEDTypes() {
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index dc54b27b11..bc6a25dbb0 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -358,6 +358,7 @@ class BusHub75Matrix : public Bus {
     // workaround for missing constants on include path for non-MM   
     uint32_t IS_BLACK = 0x000000;
     uint32_t IS_DARKGREY = 0x333333;
+    const int PIN_COUNT = 14;
 };
 #endif
 

From 8632a0a6ecb1792f8632db4f15ee9811834be345 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sun, 22 Sep 2024 16:22:30 +0100
Subject: [PATCH 21/32] Hub75 - use actual panel config values

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

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 5413873f7f..5d44071981 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -832,7 +832,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
   if(bc.type == TYPE_HUB75MATRIX_HS) {
       mxconfig.mx_width = min((u_int8_t) 64, bc.pins[0]);
-      mxconfig.mx_height = 32; // TODO - bad value bc.pins[1];  
+      mxconfig.mx_height = min((u_int8_t) 64, bc.pins[1]);
   }
   else if(bc.type == TYPE_HUB75MATRIX_QS) {
       mxconfig.mx_width = min((u_int8_t) 64, bc.pins[0]) * 2;
@@ -860,7 +860,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   }  
 
 
-  mxconfig.chain_length = 1; //max((u_int8_t) 1, min(bc.pins[2], (u_int8_t) 4)); // prevent bad data preventing boot due to low memory
+  mxconfig.chain_length = max((u_int8_t) 1, min(bc.pins[2], (u_int8_t) 4)); // prevent bad data preventing boot due to low memory
 
   if(mxconfig.mx_height >= 64 && (mxconfig.chain_length > 1)) {
     DEBUG_PRINTLN("WARNING, only single panel can be used of 64 pixel boards due to memory");
@@ -916,6 +916,10 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
   this->_len = (display->width() * display->height());
   DEBUG_PRINTF("Length: %u\n", _len);
+  if(this->_len >= MAX_LEDS) {
+    DEBUG_PRINTLN("MatrixPanel_I2S_DMA Too many LEDS - playing safe");
+    return;
+  }
 
   DEBUG_PRINTLN("MatrixPanel_I2S_DMA created");
   // let's adjust default brightness
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 77159c99ad..393a362853 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -312,7 +312,13 @@
 				}
 				// do we have led pins for digital leds
 				if (nm=="L0" || nm=="L1") {
-					d.Sf["LC"+n].max = maxPB; // update max led count value
+					if (!isHub75(t)) {
+						d.Sf["LC"+n].max = maxPB; // update max led count value
+					}
+					else {
+						d.Sf["LC"+n].min = undefined;
+						d.Sf["LC"+n].max = undefined;
+					}
 				}
 				// ignore IP address (stored in pins for virtual busses)
 				if (nm=="L0" || nm=="L1" || nm=="L2" || nm=="L3") {

From 0a8d86cfc3bd678e10df97f823df01700370bec3 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sun, 22 Sep 2024 16:22:49 +0100
Subject: [PATCH 22/32] Always copy all the pin data

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

diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index bc6a25dbb0..a730a44e6b 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -372,7 +372,7 @@ struct BusConfig {
   uint8_t skipAmount;
   bool refreshReq;
   uint8_t autoWhite;
-  uint8_t pins[5] = {255, 255, 255, 255, 255};
+  uint8_t pins[OUTPUT_MAX_PINS] = {255, 255, 255, 255, 255};
   uint16_t frequency;
   bool doubleBuffer;
   uint8_t milliAmpsPerLed;
diff --git a/wled00/xml.cpp b/wled00/xml.cpp
index a9195a3090..2db92d1f52 100644
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -366,7 +366,7 @@ void getSettingsJS(byte subPage, char* dest)
       char la[4] = "LA"; la[2] = offset+s; la[3] = 0; //LED current
       char ma[4] = "MA"; ma[2] = offset+s; ma[3] = 0; //max per-port PSU current
       oappend(SET_F("addLEDs(1);"));
-      uint8_t pins[5];
+      uint8_t pins[OUTPUT_MAX_PINS];
       int nPins = bus->getPins(pins);
       for (int i = 0; i < nPins; i++) {
         lp[1] = offset+i;

From 9a9c65ac8e9513bd5777ff2164fc0bdb4a879097 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sun, 22 Sep 2024 16:29:52 +0100
Subject: [PATCH 23/32] Whitespace

---
 wled00/bus_manager.h | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index a730a44e6b..0f110dd6c3 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -325,23 +325,16 @@ class BusNetwork : public Bus {
 class BusHub75Matrix : public Bus {
   public:
     BusHub75Matrix(BusConfig &bc);
-
     bool hasRGB() { return true; }
     bool hasWhite() { return false; }
-
     void setPixelColor(uint16_t pix, uint32_t c);
     uint32_t getPixelColor(uint16_t pix) const override;
-
     void show() override;
-
     void setBrightness(uint8_t b, bool immediate);
-
     uint8_t getPins(uint8_t* pinArray) const override;
-
     void deallocatePins();
-
     void cleanup();
-
+    
     ~BusHub75Matrix() {
       cleanup();
     }

From fbeead0c741a323760912694e582635df905a52a Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sun, 22 Sep 2024 16:42:11 +0100
Subject: [PATCH 24/32] Exclude hub75 from pin validdation for xml.cpp

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

diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 0f110dd6c3..72f7851813 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -110,6 +110,7 @@ class Bus {
     inline  bool     isOnOff() const                           { return isOnOff(_type); }
     inline  bool     isPWM() const                             { return isPWM(_type); }
     inline  bool     isVirtual() const                         { return isVirtual(_type); }
+    inline  bool     isHub75() const                           { return isHub75(_type); }
     inline  bool     is16bit() const                           { return is16bit(_type); }
     inline  bool     mustRefresh() const                       { return mustRefresh(_type); }
     inline  void     setReversed(bool reversed)                { _reversed = reversed; }
diff --git a/wled00/xml.cpp b/wled00/xml.cpp
index 2db92d1f52..27c6b4ac9c 100644
--- a/wled00/xml.cpp
+++ b/wled00/xml.cpp
@@ -370,7 +370,7 @@ void getSettingsJS(byte subPage, char* dest)
       int nPins = bus->getPins(pins);
       for (int i = 0; i < nPins; i++) {
         lp[1] = offset+i;
-        if (PinManager::isPinOk(pins[i]) || bus->isVirtual()) sappend('v',lp,pins[i]);
+        if (PinManager::isPinOk(pins[i]) || bus->isVirtual() || bus->isHub75()) sappend('v',lp,pins[i]);
       }
       sappend('v',lc,bus->getLength());
       sappend('v',lt,bus->getType());

From e74eb7d3fcc2f89325c2ae7b478f79ffcb190a6c Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Sun, 22 Sep 2024 18:11:39 +0100
Subject: [PATCH 25/32] Move examples envs for hub75

---
 platformio.ini                 | 18 --------------
 platformio_override.sample.ini | 45 ++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index f557e717c7..4d30be322a 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -579,21 +579,3 @@ build_flags = ${common.build_flags} ${esp32s2.build_flags} -D WLED_RELEASE_NAME=
   ${esp32.AR_build_flags}
 lib_deps = ${esp32s2.lib_deps}
   ${esp32.AR_lib_deps}
-
-;; TODO - move to sample ini
-[env:esp32dev_hub75]
-board = esp32dev
-upload_speed = 921600
-platform = ${esp32_idf_V4.platform}
-platform_packages = ${esp32_idf_V4.platform_packages}
-build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags}
-  -D WLED_RELEASE_NAME=ESP32_hub75
-  -D WLED_ENABLE_HUB75MATRIX -D NO_GFX -D NO_CIE1931
-  -D ESP32_FORUM_PINOUT
-  -D WLED_DEBUG
-lib_deps = ${esp32_idf_V4.lib_deps}
-  https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA.git#3.0.11
-
-monitor_filters = esp32_exception_decoder
-board_build.partitions = ${esp32.default_partitions}
diff --git a/platformio_override.sample.ini b/platformio_override.sample.ini
index dedc8edf53..cf2ee024f4 100644
--- a/platformio_override.sample.ini
+++ b/platformio_override.sample.ini
@@ -517,3 +517,48 @@ lib_deps =
   ${esp32.lib_deps}
   TFT_eSPI @ ^2.3.70
 board_build.partitions = ${esp32.default_partitions}
+
+
+[env:esp32dev_hub75]
+board = esp32dev
+upload_speed = 921600
+platform = ${esp32_idf_V4.platform}
+platform_packages = ${esp32_idf_V4.platform_packages}
+build_unflags = ${common.build_unflags}
+build_flags = ${common.build_flags}
+  -D WLED_RELEASE_NAME=ESP32_hub75
+  -D WLED_ENABLE_HUB75MATRIX -D NO_GFX -D NO_CIE1931
+  -D ESP32_FORUM_PINOUT
+  -D WLED_DEBUG
+lib_deps = ${esp32_idf_V4.lib_deps}
+  https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA.git#3.0.11
+
+monitor_filters = esp32_exception_decoder
+board_build.partitions = ${esp32.default_partitions}
+
+
+[env:adafruit_matrixportal_esp32s3]
+; ESP32-S3 processor, 8 MB flash, 2 MB of PSRAM, dedicated driver pins for HUB75
+board = lolin_s3_mini
+platform = ${esp32s3.platform}
+platform_packages = ${esp32s3.platform_packages}
+upload_speed = 921600
+build_unflags = ${common.build_unflags}
+build_flags = ${common.build_flags} ${esp32s3.build_flags} -D WLED_RELEASE_NAME=ESP32-S3_4M_qspi
+  -DARDUINO_USB_CDC_ON_BOOT=1 -DARDUINO_USB_MODE=1      ;; for boards with USB-OTG connector only (USBCDC or "TinyUSB")
+  -DBOARD_HAS_PSRAM
+  -DLOLIN_WIFI_FIX ; seems to work much better with this
+  -D WLED_WATCHDOG_TIMEOUT=0
+  ${esp32.AR_build_flags}
+  -D WLED_ENABLE_HUB75MATRIX -D NO_GFX -D NO_CIE1931
+  -D S3_LCD_DIV_NUM=20 ;; Attempt to fix wifi performance issue when panel active with S3 chips
+  -D ARDUINO_ADAFRUIT_MATRIXPORTAL_ESP32S3
+
+lib_deps = ${esp32s3.lib_deps}
+  ${esp32.AR_lib_deps}
+  https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA.git#aa28e2a ;; S3_LCD_DIV_NUM fix
+
+board_build.partitions = ${esp32.default_partitions}
+board_build.f_flash = 80000000L
+board_build.flash_mode = qio
+monitor_filters = esp32_exception_decoder

From 5b86c67a98b76abd8d7d54b708333c64cf00929b Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Fri, 4 Oct 2024 18:57:59 +0100
Subject: [PATCH 26/32] Error for ESP8266 and hub75

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

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 5d44071981..d897100381 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -816,6 +816,9 @@ void BusNetwork::cleanup() {
 // ***************************************************************************
 
 #ifdef WLED_ENABLE_HUB75MATRIX
+#ifdef ESP8266
+#error ESP8266 does not support HUB75
+#endif 
 
 BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWhite) {
 

From 4276671538bde72bb8f0dcdab8ada266c3c753bc Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Fri, 4 Oct 2024 18:59:08 +0100
Subject: [PATCH 27/32] HUB75 - Remove hot from show

---
 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 d897100381..098935af84 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -1027,7 +1027,7 @@ void BusHub75Matrix::setBrightness(uint8_t b, bool immediate) {
   display->setBrightness(_bri);
 }
 
-void __attribute__((hot)) BusHub75Matrix::show(void) {
+void BusHub75Matrix::show(void) {
   if (!_valid) return;
   display->setBrightness(_bri);
 

From f7b8828debf97cee39c98748fce223f9bfa04e04 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Fri, 4 Oct 2024 19:01:27 +0100
Subject: [PATCH 28/32] HUB75 - code formatting

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

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 098935af84..52c8814b60 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -833,11 +833,10 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
   fourScanPanel = nullptr;
 
-  if(bc.type == TYPE_HUB75MATRIX_HS) {
+  if (bc.type == TYPE_HUB75MATRIX_HS) {
       mxconfig.mx_width = min((u_int8_t) 64, bc.pins[0]);
       mxconfig.mx_height = min((u_int8_t) 64, bc.pins[1]);
-  }
-  else if(bc.type == TYPE_HUB75MATRIX_QS) {
+  } else if (bc.type == TYPE_HUB75MATRIX_QS) {
       mxconfig.mx_width = min((u_int8_t) 64, bc.pins[0]) * 2;
       mxconfig.mx_height = min((u_int8_t) 64, bc.pins[1]) / 2;  
       fourScanPanel = new VirtualMatrixPanel((*display), 1, 1, bc.pins[0], bc.pins[1]);
@@ -856,8 +855,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
           DEBUG_PRINTLN("Unsupported height");
           return;
       }
-  }
-  else {
+  } else {
     DEBUG_PRINTLN("Unknown type");
     return;
   }  

From c356846d907ea5373285278ff1dd2200f1455d4e Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Fri, 4 Oct 2024 19:10:53 +0100
Subject: [PATCH 29/32] HUB75 - fix hasRGB and missing override

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

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 52c8814b60..778039c0c2 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -823,6 +823,9 @@ void BusNetwork::cleanup() {
 BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWhite) {
 
   _valid = false;
+  _hasRgb = true;
+  _hasWhite = false;
+
   mxconfig.double_buff = false; // default to off, known to cause issue with some effects but needs more memory
   // mxconfig.driver = HUB75_I2S_CFG::ICN2038S;  // experimental - use specific shift register driver
   //mxconfig.latch_blanking = 3;
@@ -1019,7 +1022,7 @@ uint32_t BusHub75Matrix::getPixelColor(uint16_t pix) const {
     return getBitFromArray(_ledsDirty, pix) ? IS_DARKGREY: IS_BLACK;   // just a hack - we only know if the pixel is black or not
 }
 
-void BusHub75Matrix::setBrightness(uint8_t b, bool immediate) {
+void BusHub75Matrix::setBrightness(uint8_t b) {
   _bri = b;
   if (_bri > 238) _bri=238;
   display->setBrightness(_bri);
diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h
index 72f7851813..8075897748 100644
--- a/wled00/bus_manager.h
+++ b/wled00/bus_manager.h
@@ -326,12 +326,10 @@ class BusNetwork : public Bus {
 class BusHub75Matrix : public Bus {
   public:
     BusHub75Matrix(BusConfig &bc);
-    bool hasRGB() { return true; }
-    bool hasWhite() { return false; }
-    void setPixelColor(uint16_t pix, uint32_t c);
+    void setPixelColor(uint16_t pix, uint32_t c) override;
     uint32_t getPixelColor(uint16_t pix) const override;
     void show() override;
-    void setBrightness(uint8_t b, bool immediate);
+    void setBrightness(uint8_t b) override;
     uint8_t getPins(uint8_t* pinArray) const override;
     void deallocatePins();
     void cleanup();

From 6f03854eda66619f7b8eb9da7fa2a361c03abc32 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Fri, 4 Oct 2024 19:20:00 +0100
Subject: [PATCH 30/32] HUB75 - add comments to example env

---
 platformio_override.sample.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platformio_override.sample.ini b/platformio_override.sample.ini
index 861d198bb6..a9a0c3d042 100644
--- a/platformio_override.sample.ini
+++ b/platformio_override.sample.ini
@@ -530,8 +530,8 @@ build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags}
   -D WLED_RELEASE_NAME=ESP32_hub75
   -D WLED_ENABLE_HUB75MATRIX -D NO_GFX -D NO_CIE1931
-  -D ESP32_FORUM_PINOUT
-  -D WLED_DEBUG
+  ; -D ESP32_FORUM_PINOUT ;; enable for SmartMatrix default pins
+  ; -D WLED_DEBUG
 lib_deps = ${esp32_idf_V4.lib_deps}
   https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-DMA.git#3.0.11
 

From f1b9952bf9ae92ce233c696fe7ef349ed518cdba Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Fri, 4 Oct 2024 20:21:30 +0100
Subject: [PATCH 31/32] HUB75 - Support BGR color order

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

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index 778039c0c2..cd728f9b56 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -910,6 +910,22 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   memcpy(pins, &mxconfig.gpio, sizeof(mxconfig.gpio));
   PinManager::allocateMultiplePins(pins, PIN_COUNT, PinOwner::HUB75, true);
 
+  if(bc.colorOrder == COL_ORDER_RGB) {
+    DEBUG_PRINTLN("MatrixPanel_I2S_DMA = Default color order (RGB)");
+  } else if(bc.colorOrder == COL_ORDER_BGR) {
+    DEBUG_PRINTLN("MatrixPanel_I2S_DMA = color order BGR");
+    uint8_t tmpPin;
+    tmpPin = mxconfig.gpio.r1;
+    mxconfig.gpio.r1 = mxconfig.gpio.b1;
+    mxconfig.gpio.b1 = tmpPin;
+    tmpPin = mxconfig.gpio.r2;
+    mxconfig.gpio.r2 = mxconfig.gpio.b2;
+    mxconfig.gpio.b2 = tmpPin;
+  }
+  else {
+    DEBUG_PRINTF("MatrixPanel_I2S_DMA = unsupported color order %u\n", bc.colorOrder);
+  }
+
   DEBUG_PRINTF("MatrixPanel_I2S_DMA config - %ux%u length: %u\n", mxconfig.mx_width, mxconfig.mx_height, mxconfig.chain_length);
   DEBUG_PRINTF("R1_PIN=%u, G1_PIN=%u, B1_PIN=%u, R2_PIN=%u, G2_PIN=%u, B2_PIN=%u, A_PIN=%u, B_PIN=%u, C_PIN=%u, D_PIN=%u, E_PIN=%u, LAT_PIN=%u, OE_PIN=%u, CLK_PIN=%u\n",
                 mxconfig.gpio.r1, mxconfig.gpio.g1, mxconfig.gpio.b1, mxconfig.gpio.r2, mxconfig.gpio.g2, mxconfig.gpio.b2,

From de8a3666ec2fd296a5dfc7dcf0bbd1a570aba3c9 Mon Sep 17 00:00:00 2001
From: Will Tatam <will@netmindz.net>
Date: Thu, 10 Oct 2024 22:27:41 +0100
Subject: [PATCH 32/32] HUB75 - lower color depth for larger panels

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

diff --git a/wled00/bus_manager.cpp b/wled00/bus_manager.cpp
index cd728f9b56..74b1c508d4 100644
--- a/wled00/bus_manager.cpp
+++ b/wled00/bus_manager.cpp
@@ -816,6 +816,7 @@ void BusNetwork::cleanup() {
 // ***************************************************************************
 
 #ifdef WLED_ENABLE_HUB75MATRIX
+#warning "HUB75 driver enabled (experimental)"
 #ifdef ESP8266
 #error ESP8266 does not support HUB75
 #endif 
@@ -826,9 +827,12 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   _hasRgb = true;
   _hasWhite = false;
 
-  mxconfig.double_buff = false; // default to off, known to cause issue with some effects but needs more memory
+  mxconfig.double_buff = false; // Use our own memory-optimised buffer rather than the driver's own double-buffer  
+
   // mxconfig.driver = HUB75_I2S_CFG::ICN2038S;  // experimental - use specific shift register driver
-  //mxconfig.latch_blanking = 3;
+  // mxconfig.driver = HUB75_I2S_CFG::FM6124;    // try this driver in case you panel stays dark, or when colors look too pastel
+
+  // mxconfig.latch_blanking = 3;
   // mxconfig.i2sspeed = HUB75_I2S_CFG::HZ_10M;  // experimental - 5MHZ should be enugh, but colours looks slightly better at 10MHz
   //mxconfig.min_refresh_rate = 90;
   //mxconfig.min_refresh_rate = 120;
@@ -863,6 +867,13 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
     return;
   }  
 
+#if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32S2)// classic esp32, or esp32-s2: reduce bitdepth for large panels
+  if (mxconfig.mx_height >= 64) {
+    if (mxconfig.chain_length * mxconfig.mx_width > 192) mxconfig.setPixelColorDepthBits(3);
+    else if (mxconfig.chain_length * mxconfig.mx_width > 64)  mxconfig.setPixelColorDepthBits(4);
+    else mxconfig.setPixelColorDepthBits(8);
+  } else mxconfig.setPixelColorDepthBits(8);
+#endif
 
   mxconfig.chain_length = max((u_int8_t) 1, min(bc.pins[2], (u_int8_t) 4)); // prevent bad data preventing boot due to low memory
 
@@ -878,7 +889,7 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
   // https://www.adafruit.com/product/5778
   DEBUG_PRINTLN("MatrixPanel_I2S_DMA - Matrix Portal S3 config");
-  mxconfig.gpio = { 42, 41, 40, 38, 39, 37,  45, 36, 48, 35, 21, 47, 14, 2 }; 
+  mxconfig.gpio = { 42, 41, 40, 38, 39, 37,  45, 36, 48, 35, 21, 47, 14, 2 };
 
 #elif defined(ESP32_FORUM_PINOUT) // Common format for boards designed for SmartMatrix
 
@@ -933,6 +944,11 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
 
   // OK, now we can create our matrix object
   display = new MatrixPanel_I2S_DMA(mxconfig);
+  if (display == nullptr) {
+      DEBUG_PRINTLN("****** MatrixPanel_I2S_DMA !KABOOM! driver allocation failed ***********");
+      DEBUG_PRINT(F("heap usage: ")); DEBUG_PRINTLN(lastHeap - ESP.getFreeHeap());
+      return;
+  }
 
   this->_len = (display->width() * display->height());
   DEBUG_PRINTF("Length: %u\n", _len);
@@ -946,13 +962,16 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
   display->setBrightness8(25);    // range is 0-255, 0 - 0%, 255 - 100%
 
   delay(24); // experimental
+  DEBUG_PRINT(F("heap usage: ")); DEBUG_PRINTLN(lastHeap - ESP.getFreeHeap());
   // Allocate memory and start DMA display
   if( not display->begin() ) {
       DEBUG_PRINTLN("****** MatrixPanel_I2S_DMA !KABOOM! I2S memory allocation failed ***********");
+      DEBUG_PRINT(F("heap usage: ")); DEBUG_PRINTLN(lastHeap - ESP.getFreeHeap());
       return;
   }
   else {
     DEBUG_PRINTLN("MatrixPanel_I2S_DMA begin ok");
+    DEBUG_PRINT(F("heap usage: ")); DEBUG_PRINTLN(lastHeap - ESP.getFreeHeap());
     delay(18);   // experiment - give the driver a moment (~ one full frame @ 60hz) to settle
     _valid = true;
     display->clearScreen();   // initially clear the screen buffer
@@ -962,13 +981,14 @@ BusHub75Matrix::BusHub75Matrix(BusConfig &bc) : Bus(bc.type, bc.start, bc.autoWh
     if (_ledsDirty) free(_ledsDirty);                 // should not happen
     DEBUG_PRINTLN("MatrixPanel_I2S_DMA allocate memory");
     _ledsDirty = (byte*) malloc(getBitArrayBytes(_len));  // create LEDs dirty bits
-   DEBUG_PRINTLN("MatrixPanel_I2S_DMA allocate memory ok");
+    DEBUG_PRINTLN("MatrixPanel_I2S_DMA allocate memory ok");
    
     if (_ledsDirty == nullptr) {
       display->stopDMAoutput();
       delete display; display = nullptr;
       _valid = false;
       DEBUG_PRINTLN(F("MatrixPanel_I2S_DMA not started - not enough memory for dirty bits!"));
+      DEBUG_PRINT(F("heap usage: ")); DEBUG_PRINTLN(lastHeap - ESP.getFreeHeap());
       return;  //  fail is we cannot get memory for the buffer
     }
     setBitArray(_ledsDirty, _len, false);             // reset dirty bits
@@ -1040,7 +1060,6 @@ uint32_t BusHub75Matrix::getPixelColor(uint16_t pix) const {
 
 void BusHub75Matrix::setBrightness(uint8_t b) {
   _bri = b;
-  if (_bri > 238) _bri=238;
   display->setBrightness(_bri);
 }