Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-07-27 19:57:38 +00:00
Code Issues Releases Activity

[NeoPixelBus_wrapper] Correct class inheritance error

Browse Source
This commit is contained in:
Ton Huisman
2023-12-27 23:05:20 +01:00
parent f13190dda9
commit 9460992d94
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/NeoPixelBus_wrapper/src/NeoPixelBus_wrapper.cpp
+6 -9
View File
@@ -7,11 +7,11 @@ NeoPixelBus_wrapper::NeoPixelBus_wrapper(uint16_t _maxPixels,
neoPixelType _stripType)
#ifndef NEOPIXEL_WRAPPER_USE_ADAFRUIT
: numLEDs(_maxPixels)
#else // ifndef NEOPIXEL_WRAPPER_USE_ADAFRUIT
: Adafruit_NeoPixel(_maxPixels, _gpioPin, _stripType)
#endif // ifndef NEOPIXEL_WRAPPER_USE_ADAFRUIT
{
#ifdef NEOPIXEL_WRAPPER_USE_ADAFRUIT
neopixels = new (std::nothrow) Adafruit_NeoPixel(_maxPixels, _gpioPin, _stripType);
#else // ifdef NEOPIXEL_WRAPPER_USE_ADAFRUIT
#ifndef NEOPIXEL_WRAPPER_USE_ADAFRUIT
if (NEO_GRBW == (_stripType & NEO_GRBW)) {
# ifdef ESP8266
@@ -28,19 +28,16 @@ NeoPixelBus_wrapper::NeoPixelBus_wrapper(uint16_t _maxPixels,
neopixels_grb = new (std::nothrow) NEOPIXEL_LIB<NeoGrbFeature, METHOD>(_maxPixels, _gpioPin);
# endif // ifdef ESP32
}
#endif // ifdef NEOPIXEL_WRAPPER_USE_ADAFRUIT
#endif // ifndef NEOPIXEL_WRAPPER_USE_ADAFRUIT
}
NeoPixelBus_wrapper::~NeoPixelBus_wrapper() {
#ifdef NEOPIXEL_WRAPPER_USE_ADAFRUIT
delete neopixels;
neopixels = nullptr;
#else // ifdef NEOPIXEL_WRAPPER_USE_ADAFRUIT
#ifndef NEOPIXEL_WRAPPER_USE_ADAFRUIT
delete neopixels_grb;
neopixels_grb = nullptr;
delete neopixels_grbw;
neopixels_grbw = nullptr;
#endif // ifdef NEOPIXEL_WRAPPER_USE_ADAFRUIT
#endif // ifndef NEOPIXEL_WRAPPER_USE_ADAFRUIT
}
#ifndef NEOPIXEL_WRAPPER_USE_ADAFRUIT
lib/NeoPixelBus_wrapper/src/NeoPixelBus_wrapper.h
+1 -6
View File
@@ -76,14 +76,9 @@ public:
static_cast<uint32_t>(b);
}
#endif // ifndef NEOPIXEL_WRAPPER_USE_ADAFRUIT
private:
#ifdef NEOPIXEL_WRAPPER_USE_ADAFRUIT
Adafruit_NeoPixel *neopixels = nullptr;
#else // ifdef NEOPIXEL_WRAPPER_USE_ADAFRUIT
NEOPIXEL_LIB<NeoGrbFeature, METHOD> *neopixels_grb = nullptr;
NEOPIXEL_LIB<NeoGrbFeature, METHOD> *neopixels_grb = nullptr;
NEOPIXEL_LIB<NeoGrbwFeature, METHOD> *neopixels_grbw = nullptr;
uint16_t numLEDs = 0;
#endif // ifndef NEOPIXEL_WRAPPER_USE_ADAFRUIT