diff --git a/package.json b/package.json index 5b75307b2..df4d93e2a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wled", - "version": "0.12.0", + "version": "0.12.1-a0", "description": "Tools for WLED project", "main": "tools/cdata.js", "directories": { diff --git a/wled00/FX.cpp b/wled00/FX.cpp index 28c3be6b6..54698ed56 100644 --- a/wled00/FX.cpp +++ b/wled00/FX.cpp @@ -3075,7 +3075,7 @@ uint16_t WS2812FX::mode_drip(void) drops[j].vel += gravity; // gravity is negative for (uint8_t i=1;i<7-drops[j].colIndex;i++) { // some minor math so we don't expand bouncing droplets - setPixelColor(MIN(uint16_t(drops[j].pos)+i,SEGLEN-1),color_blend(BLACK,SEGCOLOR(0),drops[j].col/i)); //spread pixel with fade while falling + setPixelColor(constrain(uint16_t(drops[j].pos)+i,0,SEGLEN-1),color_blend(BLACK,SEGCOLOR(0),drops[j].col/i)); //spread pixel with fade while falling } if (drops[j].colIndex > 2) { // during bounce, some water is on the floor diff --git a/wled00/html_other.h b/wled00/html_other.h index 807c970a6..3866b5d62 100644 --- a/wled00/html_other.h +++ b/wled00/html_other.h @@ -42,7 +42,7 @@ function B(){window.history.back()}function U(){document.getElementById("uf").st .bt{background:#333;color:#fff;font-family:Verdana,sans-serif;border:.3ch solid #333;display:inline-block;font-size:20px;margin:8px;margin-top:12px}input[type=file]{font-size:16px}body{font-family:Verdana,sans-serif;text-align:center;background:#222;color:#fff;line-height:200%}#msg{display:none}

WLED Software Update

-Installed version: 0.12.0
Download the latest binary: Download the latest binary:

diff --git a/wled00/html_settings.h b/wled00/html_settings.h index c73b45942..9ad97fc96 100644 --- a/wled00/html_settings.h +++ b/wled00/html_settings.h @@ -379,7 +379,7 @@ HTTP traffic is unencrypted. An attacker in the same network can intercept form

Software Update


Enable ArduinoOTA:

About

WLED - version 0.12.0


Contributors, dependencies and special thanks
A huge thank you to everyone who helped me create WLED!

diff --git a/wled00/json.cpp b/wled00/json.cpp index 387efab62..ccad977a1 100644 --- a/wled00/json.cpp +++ b/wled00/json.cpp @@ -427,6 +427,14 @@ void serializeState(JsonObject root, bool forPreset, bool includeBri, bool segme root[F("mainseg")] = strip.getMainSegmentId(); + // the following is an UGLY construct that does the job + #ifdef ESP8266 + // use rev:2 API if more than 12 segments on ESP8266 + uint8_t tooMany = 0; + for(uint8_t i=0; i < strip.getMaxSegments(); i++) if ((strip.getSegment(i)).isActive()) tooMany++; + if (tooMany>12) + #endif + root.remove("rev"); // remove API revision if ESP32 or ESP8266 with less than 13 segments uint8_t versionAPI = root["rev"] | 1; JsonArray seg = root.createNestedArray("seg"); diff --git a/wled00/presets.cpp b/wled00/presets.cpp index 09ae901f0..a01104dea 100644 --- a/wled00/presets.cpp +++ b/wled00/presets.cpp @@ -46,15 +46,6 @@ void savePreset(byte index, bool persist, const char* pname, JsonObject saveobj) DynamicJsonDocument lDoc(JSON_BUFFER_SIZE); sObj = lDoc.to(); if (pname) sObj["n"] = pname; - - #ifdef ESP8266 - // use rev:2 API if more than 12 segments on ESP8266 - uint8_t tooMany = 0; - for(uint8_t i=0; i < strip.getMaxSegments(); i++) if ((strip.getSegment(i)).isActive()) tooMany++; - if (tooMany>12) - #endif - sObj.remove("rev"); - DEBUGFS_PRINTLN(F("Save current state")); serializeState(sObj, true); currentPreset = index; @@ -64,16 +55,6 @@ void savePreset(byte index, bool persist, const char* pname, JsonObject saveobj) DEBUGFS_PRINTLN(F("Reuse recv buffer")); sObj.remove(F("psave")); sObj.remove(F("v")); - - // the following is an UGLY construct that does the job - #ifdef ESP8266 - // use rev:2 API if more than 12 segments on ESP8266 - uint8_t tooMany = 0; - for(uint8_t i=0; i < strip.getMaxSegments(); i++) if ((strip.getSegment(i)).isActive()) tooMany++; - if (tooMany>12) - #endif - sObj.remove("rev"); - if (!sObj["o"]) { DEBUGFS_PRINTLN(F("Save current state")); serializeState(sObj, true, sObj["ib"], sObj["sb"]); diff --git a/wled00/wled.h b/wled00/wled.h index 284cedbd8..1d462e61d 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -8,7 +8,7 @@ */ // version code in format yymmddb (b = daily build) -#define VERSION 2104071 +#define VERSION 2104081 //uncomment this if you have a "my_config.h" file you'd like to use //#define WLED_USE_MY_CONFIG @@ -172,7 +172,7 @@ #endif // Global Variable definitions -WLED_GLOBAL char versionString[] _INIT("0.12.0"); +WLED_GLOBAL char versionString[] _INIT("0.12.1-a0"); #define WLED_CODENAME "Hikari" // AP and OTA default passwords (for maximum security change them!)