diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp index 58dd8e0c..799fd157 100644 --- a/wled00/FX_fcn.cpp +++ b/wled00/FX_fcn.cpp @@ -275,16 +275,17 @@ void WS2812FX::show(void) { for (uint16_t i = 0; i < _length; i++) //sum up the usage of each LED { - RgbwColor c = busses.getPixelColor(i); + uint32_t c = busses.getPixelColor(i); + byte r = c >> 16, g = c >> 8, b = c, w = c >> 24; if(useWackyWS2815PowerModel) { // ignore white component on WS2815 power calculation - powerSum += (MAX(MAX(c.R,c.G),c.B)) * 3; + powerSum += (MAX(MAX(r,g),b)) * 3; } else { - powerSum += (c.R + c.G + c.B + c.W); + powerSum += (r + g + b + w); } } diff --git a/wled00/wled.h b/wled00/wled.h index b0960f66..3b9c9a6e 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -8,7 +8,7 @@ */ // version code in format yymmddb (b = daily build) -#define VERSION 2103230 +#define VERSION 2103231 //uncomment this if you have a "my_config.h" file you'd like to use //#define WLED_USE_MY_CONFIG @@ -173,7 +173,7 @@ #endif // Global Variable definitions -WLED_GLOBAL char versionString[] _INIT("0.12.0-b2"); +WLED_GLOBAL char versionString[] _INIT("0.12.0-b3"); #define WLED_CODENAME "Hikari" // AP and OTA default passwords (for maximum security change them!)