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

Fixed current estimation

Browse Source
This commit is contained in:
cschwinne 2021-03-23 14:08:01 +01:00
parent bab4f9963f
commit 1f4a15ee6b
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -2,6 +2,10 @@
### Development versions after 0.11.1 release ### Development versions after 0.11.1 release
#### Build 2103230
- Fixed current estimation
#### Build 2103220 #### Build 2103220
- Version bump to 0.12.0-b2 "Hikari" - Version bump to 0.12.0-b2 "Hikari"

7
wled00/FX_fcn.cpp
View File

@ -263,16 +263,17 @@ void WS2812FX::show(void) {
for (uint16_t i = 0; i < _length; i++) //sum up the usage of each LED 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) if(useWackyWS2815PowerModel)
{ {
// ignore white component on WS2815 power calculation // 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 else
{ {
powerSum += (c.R + c.G + c.B + c.W); powerSum += (r + g + b + w);
} }
} }

2
wled00/wled.h
View File

@ -8,7 +8,7 @@
*/ */
// version code in format yymmddb (b = daily build) // version code in format yymmddb (b = daily build)
#define VERSION 2103220 #define VERSION 2103230
//uncomment this if you have a "my_config.h" file you'd like to use //uncomment this if you have a "my_config.h" file you'd like to use
//#define WLED_USE_MY_CONFIG //#define WLED_USE_MY_CONFIG