Merge branch 'mega' into reply_event

Author: chromoxdor

.github/workflows/build.yml

@@ -86,6 +86,7 @@ jobs:
           sudo apt-get update
           sudo apt install binutils build-essential libffi-dev libgit2-dev
           pip3 install --upgrade pip
+          pip install wheel
           pip install -r requirements.txt
           platformio update
       - name: Build and archive

lib/Adafruit_NeoMatrix/Adafruit_NeoMatrix.cpp

@@ -48,8 +48,7 @@
  */
 
 #include "gamma.h"
-#include <Adafruit_NeoMatrix.h>
-#include <Adafruit_NeoPixel.h>
+#include "Adafruit_NeoMatrix.h"
 #ifdef __AVR__
 #include <avr/pgmspace.h>
 #elif defined(ESP8266)
@@ -73,7 +72,7 @@
 // Constructor for single matrix:
 Adafruit_NeoMatrix::Adafruit_NeoMatrix(int w, int h, uint8_t pin,
                                        uint8_t matrixType, neoPixelType ledType)
-    : Adafruit_GFX(w, h), Adafruit_NeoPixel(w * h, pin, ledType),
+    : Adafruit_GFX(w, h), NeoPixelBus_wrapper(w * h, pin, ledType),
       type(matrixType), matrixWidth(w), matrixHeight(h), tilesX(0), tilesY(0),
       remapFn(NULL) {}
 
@@ -82,7 +81,7 @@ Adafruit_NeoMatrix::Adafruit_NeoMatrix(uint8_t mW, uint8_t mH, uint8_t tX,
                                        uint8_t tY, uint8_t pin,
                                        uint8_t matrixType, neoPixelType ledType)
     : Adafruit_GFX(mW * tX, mH * tY),
-      Adafruit_NeoPixel(mW * mH * tX * tY, pin, ledType), type(matrixType),
+      NeoPixelBus_wrapper(mW * mH * tX * tY, pin, ledType), type(matrixType),
       matrixWidth(mW), matrixHeight(mH), tilesX(tX), tilesY(tY), remapFn(NULL) {
 }
 

lib/Adafruit_NeoMatrix/Adafruit_NeoMatrix.h

@@ -40,7 +40,9 @@
 #include <pins_arduino.h>
 #endif
 #include <Adafruit_GFX.h>
-#include <Adafruit_NeoPixel.h>
+#include <NeoPixelBus_wrapper.h>
+
+// 2023-10-26 tonhuisman: Apply NeoPixelBus_wrapper as replacement for Adafruit_NeoPixel library
 
 // Matrix layout information is passed in the 'matrixType' parameter for
 // each constructor (the parameter immediately following is the LED type
@@ -79,7 +81,7 @@
 /**
  * @brief Class for using NeoPixel matrices with the GFX graphics library.
  */
-class Adafruit_NeoMatrix : public Adafruit_GFX, public Adafruit_NeoPixel {
+class Adafruit_NeoMatrix : public Adafruit_GFX, public NeoPixelBus_wrapper {
 
 public:
   /**

lib/Adafruit_NeoMatrix/library.properties

@@ -1,10 +1,10 @@
-name=Adafruit NeoMatrix
+name=Adafruit NeoMatrix via NeoPixelBus
 version=1.3.0
 author=Adafruit
 maintainer=Adafruit <[email protected]>
-sentence=Adafruit_GFX-compatible library for NeoPixel grids
-paragraph=Adafruit_GFX-compatible library for NeoPixel grids
+sentence=Adafruit_GFX-compatible library for NeoPixel grids, adjusted to use NeoPixelBus via NeoPixelBus_wrapper (ESPEasy specific)
+paragraph=Adafruit_GFX-compatible library for NeoPixel grids, adjusted to use NeoPixelBus via NeoPixelBus_wrapper (ESPEasy specific)
 category=Display
 url=https://github.com/adafruit/Adafruit_NeoMatrix
 architectures=*
-depends=Adafruit NeoPixel, Adafruit GFX Library
+depends=NeoPixelBus by Makuna, NeoPixelBus_wrapper, Adafruit GFX Library