Skip to content

Commit 1f4a15e

Browse files
committed
Fixed current estimation
1 parent bab4f99 commit 1f4a15e

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
### Development versions after 0.11.1 release
44

5+
#### Build 2103230
6+
7+
- Fixed current estimation
8+
59
#### Build 2103220
610

711
- Version bump to 0.12.0-b2 "Hikari"

wled00/FX_fcn.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,16 +263,17 @@ void WS2812FX::show(void) {
263263

264264
for (uint16_t i = 0; i < _length; i++) //sum up the usage of each LED
265265
{
266-
RgbwColor c = busses.getPixelColor(i);
266+
uint32_t c = busses.getPixelColor(i);
267+
byte r = c >> 16, g = c >> 8, b = c, w = c >> 24;
267268

268269
if(useWackyWS2815PowerModel)
269270
{
270271
// ignore white component on WS2815 power calculation
271-
powerSum += (MAX(MAX(c.R,c.G),c.B)) * 3;
272+
powerSum += (MAX(MAX(r,g),b)) * 3;
272273
}
273274
else
274275
{
275-
powerSum += (c.R + c.G + c.B + c.W);
276+
powerSum += (r + g + b + w);
276277
}
277278
}
278279

wled00/wled.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
// version code in format yymmddb (b = daily build)
11-
#define VERSION 2103220
11+
#define VERSION 2103230
1212

1313
//uncomment this if you have a "my_config.h" file you'd like to use
1414
//#define WLED_USE_MY_CONFIG

0 commit comments

Comments
 (0)