From 4264c2a173a898ec7d913489f14824266281e204 Mon Sep 17 00:00:00 2001 From: cschwinne Date: Thu, 25 Mar 2021 20:00:31 +0100 Subject: [PATCH] Test for arcane curses --- CHANGELOG.md | 9 ++++++++- package.json | 2 +- wled00/html_other.h | 2 +- wled00/html_settings.h | 2 +- wled00/set.cpp | 5 ++++- wled00/wled.h | 6 +++--- wled00/xml.cpp | 3 +-- 7 files changed, 19 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c3f77633..2eb720819 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ ## WLED changelog -### Development versions after 0.11.1 release +### WLED release 0.12.0 + +#### Build 2103250 + +- Version bump to 0.12.0 "Hikari" +- Fixed RGBW mode disabled after LED settings saved + +### Development versions between 0.11.1 and 0.12.0 releases #### Build 2103230 diff --git a/package.json b/package.json index 3d32c8cfd..5b75307b2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wled", - "version": "0.12.0-b2", + "version": "0.12.0", "description": "Tools for WLED project", "main": "tools/cdata.js", "directories": { diff --git a/wled00/html_other.h b/wled00/html_other.h index 977d450e3..802e59e47 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-b2
Download the latest binary: Download the latest binary:

diff --git a/wled00/html_settings.h b/wled00/html_settings.h index 69a86881c..e974ef169 100644 --- a/wled00/html_settings.h +++ b/wled00/html_settings.h @@ -375,7 +375,7 @@ HTTP traffic is unencrypted. An attacker in the same network can intercept form

Software Update


Enable ArduinoOTA:

About

WLED - version 0.12.0-b2


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

diff --git a/wled00/set.cpp b/wled00/set.cpp index 109731696..f5ff02db0 100644 --- a/wled00/set.cpp +++ b/wled00/set.cpp @@ -88,6 +88,7 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage) uint8_t colorOrder, type; uint16_t length, start; uint8_t pins[5] = {255, 255, 255, 255, 255}; + useRGBW = false; for (uint8_t s = 0; s < WLED_MAX_BUSSES; s++) { char lp[4] = "L0"; lp[2] = 48+s; lp[3] = 0; //ascii 0-9 //strip data pin @@ -105,17 +106,20 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage) pins[i] = (request->arg(lp).length() > 0) ? request->arg(lp).toInt() : 255; } type = request->arg(lt).toInt(); + //if (BusManager::isRgbw(type)) useRGBW = true; //30fps if (request->hasArg(lc) && request->arg(lc).toInt() > 0) { length = request->arg(lc).toInt(); } else { break; // no parameter } + colorOrder = request->arg(co).toInt(); start = (request->hasArg(ls)) ? request->arg(ls).toInt() : 0; if (busConfigs[s] != nullptr) delete busConfigs[s]; busConfigs[s] = new BusConfig(type, pins, start, length, colorOrder, request->hasArg(cv)); + //if (BusManager::isRgbw(type)) useRGBW = true; //20fps doInitBusses = true; } @@ -158,7 +162,6 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage) strip.ablMilliampsMax = request->arg(F("MA")).toInt(); strip.milliampsPerLed = request->arg(F("LA")).toInt(); - useRGBW = request->hasArg(F("EW")); strip.rgbwMode = request->arg(F("AW")).toInt(); briS = request->arg(F("CA")).toInt(); diff --git a/wled00/wled.h b/wled00/wled.h index 9c1fc6fb9..c62678c4c 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -3,12 +3,12 @@ /* Main sketch, global variable declarations @title WLED project sketch - @version 0.12.0-b2 + @version 0.12.0 @author Christian Schwinne */ // version code in format yymmddb (b = daily build) -#define VERSION 2103230 +#define VERSION 2103250 //uncomment this if you have a "my_config.h" file you'd like to use //#define WLED_USE_MY_CONFIG @@ -174,7 +174,7 @@ #endif // Global Variable definitions -WLED_GLOBAL char versionString[] _INIT("0.12.0-b2"); +WLED_GLOBAL char versionString[] _INIT("0.12.0"); #define WLED_CODENAME "Hikari" // AP and OTA default passwords (for maximum security change them!) diff --git a/wled00/xml.cpp b/wled00/xml.cpp index 4d4c2d21b..4b5ee6530 100644 --- a/wled00/xml.cpp +++ b/wled00/xml.cpp @@ -318,8 +318,7 @@ void getSettingsJS(byte subPage, char* dest) } sappend('v',SET_F("CA"),briS); - //sappend('c',SET_F("EW"),useRGBW); - //sappend('i',SET_F("CO"),strip.getColorOrder()); + sappend('v',SET_F("AW"),strip.rgbwMode); sappend('c',SET_F("BO"),turnOnAtBoot);