diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp index a9dabafe..95298c72 100644 --- a/wled00/FX_fcn.cpp +++ b/wled00/FX_fcn.cpp @@ -1181,12 +1181,12 @@ void WS2812FX::estimateCurrentAndLimitBri() { uint32_t powerSum = 0; - for (uint8_t b = 0; b < busses.getNumBusses(); b++) { - Bus *bus = busses.getBus(b); + for (uint_fast8_t bNum = 0; bNum < busses.getNumBusses(); bNum++) { + Bus *bus = busses.getBus(bNum); if (bus->getType() >= TYPE_NET_DDP_RGB) continue; //exclude non-physical network busses uint16_t len = bus->getLength(); uint32_t busPowerSum = 0; - for (uint16_t i = 0; i < len; i++) { //sum up the usage of each LED + for (uint_fast16_t i = 0; i < len; i++) { //sum up the usage of each LED uint32_t c = bus->getPixelColor(i); byte r = R(c), g = G(c), b = B(c), w = W(c); diff --git a/wled00/pin_manager.cpp b/wled00/pin_manager.cpp index c800c807..a1ac59ce 100644 --- a/wled00/pin_manager.cpp +++ b/wled00/pin_manager.cpp @@ -300,10 +300,10 @@ byte PinManagerClass::allocateLedc(byte channels) if (ca >= channels) { //enough free channels byte in = (i + 1) - ca; for (byte j = 0; j < ca; j++) { - byte b = in + j; - byte by = b >> 3; - byte bi = b - 8*by; - bitWrite(ledcAlloc[by], bi, true); + byte bChan = in + j; + byte byChan = bChan >> 3; + byte biChan = bChan - 8*byChan; + bitWrite(ledcAlloc[byChan], biChan, true); } return in; }