diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c25fc32..977a5d84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ ## WLED changelog +### Builds after release 0.13.1 + +#### Build 2203160 + +- Version bump to v0.13.2-a0 "Toki" +- Add ability to skip up to 255 LEDs +- Dependency version bumps + ### WLED release 0.13.1 #### Build 2203150 diff --git a/package-lock.json b/package-lock.json index 9b73790a..4c1e45e1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "wled", - "version": "0.13.1", + "version": "0.13.2-a0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index e60731b8..457c4b42 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wled", - "version": "0.13.1", + "version": "0.13.2-a0", "description": "Tools for WLED project", "main": "tools/cdata.js", "directories": { diff --git a/platformio.ini b/platformio.ini index 70ed4feb..93ff898b 100644 --- a/platformio.ini +++ b/platformio.ini @@ -199,9 +199,9 @@ build_flags = lib_deps = ${env.lib_deps} #https://github.com/lorol/LITTLEFS.git - # ESPAsyncTCP @ 1.2.0 + ESPAsyncTCP @ 1.2.2 ESPAsyncUDP - makuna/NeoPixelBus @ 2.6.7 # 2.6.5/2.6.6 and newer do not compile on ESP core < 3.0.0 + makuna/NeoPixelBus @ 2.6.9 [esp32] #platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.2.3/platform-espressif32-2.0.2.3.zip @@ -221,7 +221,7 @@ default_partitions = tools/WLED_ESP32_4MB_1MB_FS.csv lib_deps = ${env.lib_deps} https://github.com/lorol/LITTLEFS.git - makuna/NeoPixelBus @ 2.6.7 + makuna/NeoPixelBus @ 2.6.9 https://github.com/pbolduc/AsyncTCP.git @ 1.2.0 [esp32s2] @@ -234,7 +234,7 @@ build_flags = -g lib_deps = ${env.lib_deps} - makuna/NeoPixelBus @ 2.6.7 + makuna/NeoPixelBus @ 2.6.9 https://github.com/pbolduc/AsyncTCP.git @ 1.2.0 [esp32c3] @@ -247,7 +247,7 @@ build_flags = -g lib_deps = ${env.lib_deps} - makuna/NeoPixelBus @ 2.6.7 + makuna/NeoPixelBus @ 2.6.9 https://github.com/pbolduc/AsyncTCP.git @ 1.2.0 # ------------------------------------------------------------------------------ diff --git a/wled00/FX.h b/wled00/FX.h index bb53726c..381b2bcb 100644 --- a/wled00/FX.h +++ b/wled00/FX.h @@ -71,7 +71,6 @@ assuming each segment uses the same amount of data. 256 for ESP8266, 640 for ESP32. */ #define FAIR_DATA_PER_SEG (MAX_SEGMENT_DATA / MAX_NUM_SEGMENTS) -#define LED_SKIP_AMOUNT 1 #define MIN_SHOW_DELAY (_frametime < 16 ? 8 : 15) #define NUM_COLORS 3 /* number of colors per segment */ diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h index 4503a7da..612e2fce 100644 --- a/wled00/bus_manager.h +++ b/wled00/bus_manager.h @@ -588,7 +588,7 @@ class BusManager { //utility to get the approx. memory usage of a given BusConfig static uint32_t memUsage(BusConfig &bc) { uint8_t type = bc.type; - uint16_t len = bc.count; + uint16_t len = bc.count + bc.skipAmount; if (type > 15 && type < 32) { #ifdef ESP8266 if (bc.pins[0] == 3) { //8266 DMA uses 5x the mem diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm index 6b8d347f..605ee255 100644 --- a/wled00/data/settings_leds.htm +++ b/wled00/data/settings_leds.htm @@ -96,9 +96,11 @@ UI(); } //returns mem usage - function getMem(t, len, p0) { + function getMem(t, n) { + let len = parseInt(d.getElementsByName("LC"+n)[0].value); + len += parseInt(d.getElementsByName("SL"+n)[0].value); // skipped LEDs are allocated too if (t < 32) { - if (maxM < 10000 && p0==3) { //8266 DMA uses 5x the mem + if (maxM < 10000 && d.getElementsByName("L0"+n)[0].value == 3) { //8266 DMA uses 5x the mem if (t > 29) return len*20; //RGBW return len*15; } else if (maxM >= 10000) //ESP32 RMT uses double buffer? @@ -133,7 +135,7 @@ gId("p1d"+n).innerHTML = (t> 49 && t<64) ? "Clk GPIO:" : ""; var LK = d.getElementsByName("L1"+n)[0]; // clock pin - memu += getMem(t, d.getElementsByName("LC"+n)[0].value, d.getElementsByName("L0"+n)[0].value); // calc memory + memu += getMem(t, n); // calc memory // enumerate pins for (p=1; p<5; p++) { @@ -324,7 +326,7 @@ ${i+1}: