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

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

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