lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bus manager cleanup & fixes.

Browse Source
This commit is contained in:
Blaž Kristan 2021-10-08 08:30:06 +02:00
parent 4fdf85bbdb
commit 2d8885cb0c
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wled00/bus_manager.h
View File

@ -157,8 +157,7 @@ class BusDigital : public Bus {
_needsRefresh = bc.refreshReq || bc.type == TYPE_TM1814;
_skip = bc.skipAmount; //sacrificial pixels
_len = bc.count + _skip;
_rgbw = Bus::isRgbw(bc.type);
_iType = PolyBus::getI(bc.type, _pins, nr, _rgbw);
_iType = PolyBus::getI(bc.type, _pins, nr);
if (_iType == I_NONE) return;
_busPtr = PolyBus::create(_iType, _pins, _len, nr);
_valid = (_busPtr != nullptr);
@ -217,7 +216,7 @@ class BusDigital : public Bus {
}
inline bool isRgbw() {
return (_rgbw || _type == TYPE_SK6812_RGBW || _type == TYPE_TM1814);
return Bus::isRgbw(_type);
}
inline uint8_t skippedLeds() {
@ -229,7 +228,7 @@ class BusDigital : public Bus {
}
void cleanup() {
DEBUG_PRINTLN(F("Digital Cleanup"));
DEBUG_PRINTLN(F("Digital Cleanup."));
PolyBus::cleanup(_busPtr, _iType);
_iType = I_NONE;
_valid = false;
@ -248,7 +247,6 @@ class BusDigital : public Bus {
uint8_t _iType = I_NONE;
uint16_t _len = 0;
uint8_t _skip = 0;
bool _rgbw = false;
void * _busPtr = nullptr;
};
@ -342,7 +340,7 @@ class BusPwm : public Bus {
}
bool isRgbw() {
return (_type > TYPE_ONOFF && _type <= TYPE_ANALOG_5CH && _type != TYPE_ANALOG_3CH);
return Bus::isRgbw(_type);
}
inline void cleanup() {
@ -529,7 +527,7 @@ class BusManager {
//do not call this method from system context (network callback)
void removeAll() {
//Serial.println("Removing all.");
DEBUG_PRINTLN(F("Removing all."));
//prevents crashes due to deleting busses while in use.
while (!canAllShow()) yield();
for (uint8_t i = 0; i < numBusses; i++) delete busses[i];
@ -589,11 +587,6 @@ class BusManager {
return len;
}
// a workaround
static inline bool isRgbw(uint8_t type) {
return Bus::isRgbw(type);
}
private:
uint8_t numBusses = 0;
Bus* busses[WLED_MAX_BUSSES];

10
wled00/bus_wrapper.h
View File

@ -623,7 +623,7 @@ class PolyBus {
}
//gives back the internal type index (I_XX_XXX_X above) for the input
static uint8_t getI(uint8_t busType, uint8_t* pins, uint8_t num = 0, bool isRGBW = false) {
static uint8_t getI(uint8_t busType, uint8_t* pins, uint8_t num = 0) {
if (!IS_DIGITAL(busType)) return I_NONE;
if (IS_2PIN(busType)) { //SPI LED chips
bool isHSPI = false;
@ -652,8 +652,9 @@ class PolyBus {
switch (busType) {
case TYPE_WS2812_RGB:
case TYPE_WS2812_WWA:
return I_8266_U0_NEO_3 + offset;
case TYPE_SK6812_RGBW:
return (isRGBW ? I_8266_U0_NEO_4 : I_8266_U0_NEO_3) + offset;
return I_8266_U0_NEO_4 + offset;
case TYPE_WS2811_400KHZ:
return I_8266_U0_400_3 + offset;
case TYPE_TM1814:
@ -671,10 +672,9 @@ class PolyBus {
switch (busType) {
case TYPE_WS2812_RGB:
case TYPE_WS2812_WWA:
// return I_32_RN_NEO_3 + offset;
return I_32_RN_NEO_3 + offset;
case TYPE_SK6812_RGBW:
// return I_32_RN_NEO_4 + offset;
return (isRGBW ? I_32_RN_NEO_4 : I_32_RN_NEO_3) + offset;
return I_32_RN_NEO_4 + offset;
case TYPE_WS2811_400KHZ:
return I_32_RN_400_3 + offset;
case TYPE_TM1814: