diff --git a/package-lock.json b/package-lock.json index 0f71186a..9a2d44e6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "wled", - "version": "0.14.0-b15.22", + "version": "0.14.0-b15.23", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "wled", - "version": "0.14.0-b15.22", + "version": "0.14.0-b15.23", "license": "ISC", "dependencies": { "clean-css": "^4.2.3", diff --git a/package.json b/package.json index d2c526d1..87922f0b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wled", - "version": "0.14.0-b15.22", + "version": "0.14.0-b15.23", "description": "Tools for WLED project", "main": "tools/cdata.js", "directories": { diff --git a/wled00/FX.cpp b/wled00/FX.cpp index 848f9d57..9dbd1146 100644 --- a/wled00/FX.cpp +++ b/wled00/FX.cpp @@ -4655,8 +4655,8 @@ uint16_t mode_2DColoredBursts() { // By: ldirko https://editor.so byte ysteps = abs8(x2 - y2) + 1; byte steps = xsteps >= ysteps ? xsteps : ysteps; //Draw gradient line - for (size_t i = 1; i <= steps; i++) { - uint8_t rate = i * 255 / steps; + for (size_t j = 1; j <= steps; j++) { + uint8_t rate = j * 255 / steps; byte dx = lerp8by8(x1, y1, rate); byte dy = lerp8by8(x2, y2, rate); //SEGMENT.setPixelColorXY(dx, dy, grad ? color.nscale8_video(255-rate) : color); // use addPixelColorXY for different look diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp index c086809d..a44fc271 100644 --- a/wled00/FX_fcn.cpp +++ b/wled00/FX_fcn.cpp @@ -1570,12 +1570,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/bus_wrapper.h b/wled00/bus_wrapper.h index bbf38d2e..f2b364f6 100644 --- a/wled00/bus_wrapper.h +++ b/wled00/bus_wrapper.h @@ -186,7 +186,7 @@ // fix for #2542 (by @BlackBird77) #define B_HS_DOT_3 NeoPixelBrightnessBus //hardware HSPI with DMA (ESP32 only) #else -#define B_HS_DOT_3 NeoPixelBrightnessBus //hardware HSPI +#define B_HS_DOT_3 NeoPixelBrightnessBus //hardware VSPI #endif #define B_SS_DOT_3 NeoPixelBrightnessBus //soft SPI diff --git a/wled00/data/index.js b/wled00/data/index.js index 8a3b164a..63ed1ecd 100644 --- a/wled00/data/index.js +++ b/wled00/data/index.js @@ -670,7 +670,7 @@ function populateInfo(i) //WLEDMM: add total heap and total PSRAM, and build number, add bin name if (i.ver.includes("0.14.1")) vcn = "Sitting Ducks"; // easter egg if (i.ver.includes("0.14.0")) vcn = "Lupo"; // check for MM versioning scheme - if (i.ver.includes("0.14.0-b2.2")) vcn = "Sitting Ducks"; // early easter egg + if (i.ver.includes("0.14.0-b15.2")) vcn = "Sitting Ducks"; // late easter egg if (i.ver.includes("0.14.0-b15.22")) vcn = "Lupo"; cn += `v${i.ver}  "${vcn}"

(WLEDMM_${i.ver} ${i.rel}.bin)

build ${i.vid}

${urows} diff --git a/wled00/improv.cpp b/wled00/improv.cpp index 6bc6567b..cbd43f66 100644 --- a/wled00/improv.cpp +++ b/wled00/improv.cpp @@ -189,7 +189,7 @@ void sendImprovInfoResponse() { out[11] = 4; //Firmware len ("WLED") out[12] = 'W'; out[13] = 'L'; out[14] = 'E'; out[15] = 'D'; uint8_t lengthSum = 17; - uint8_t vlen = sprintf_P(out+lengthSum,PSTR("0.14.0-b15.22/%i"),VERSION); + uint8_t vlen = sprintf_P(out+lengthSum,PSTR("0.14.0-b15.23/%i"),VERSION); out[16] = vlen; lengthSum += vlen; uint8_t hlen = 7; #ifdef ESP8266 diff --git a/wled00/pin_manager.cpp b/wled00/pin_manager.cpp index 3f9b4a1f..899a6b7b 100644 --- a/wled00/pin_manager.cpp +++ b/wled00/pin_manager.cpp @@ -775,10 +775,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; } diff --git a/wled00/wled.h b/wled00/wled.h index cdb2b7bd..b5360a58 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -8,7 +8,7 @@ */ // version code in format yymmddb (b = daily build) -#define VERSION 2304140 +#define VERSION 2304141 //uncomment this if you have a "my_config.h" file you'd like to use //#define WLED_USE_MY_CONFIG