Test for arcane curses

Aircoookie · Aircoookie · commit 4264c2a173a8 · 2021-03-25T20:00:31.000+01:00
diff --git 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
@@ -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
@@ -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}
 </style></head><body><h2>WLED Software Update</h2><form method="POST" 
 action="/update" id="uf" enctype="multipart/form-data" onsubmit="U()">
-Installed version: 0.12.0-b2<br>Download the latest binary: <a 
+Installed version: 0.12.0<br>Download the latest binary: <a 
 href="https://github.com/Aircoookie/WLED/releases" target="_blank"><img 
 src="https://img.shields.io/github/release/Aircoookie/WLED.svg?style=flat-square">
 </a><br><input type="file" class="bt" name="update" accept=".bin" required><br>
diff --git 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
 <h3>Software Update</h3><button type="button" onclick="U()">Manual OTA Update
 </button><br>Enable ArduinoOTA: <input type="checkbox" name="AO"><br><h3>About
 </h3><a href="https://github.com/Aircoookie/WLED/" target="_blank">WLED</a>
- version 0.12.0-b2<br><br><a 
+ version 0.12.0<br><br><a 
 href="https://github.com/Aircoookie/WLED/wiki/Contributors-and-credits" 
 target="_blank">Contributors, dependencies and special thanks</a><br>
 A huge thank you to everyone who helped me create WLED!<br><br>
diff --git 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
@@ -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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "wled",`
`3`		`- "version": "0.12.0-b2",`
	`3`	`+ "version": "0.12.0",`
`4`	`4`	`"description": "Tools for WLED project",`
`5`	`5`	`"main": "tools/cdata.js",`
`6`	`6`	`"directories": {`
Original file line number	Diff line number	Diff line change
`@@ -318,8 +318,7 @@ void getSettingsJS(byte subPage, char* dest)`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`sappend('v',SET_F("CA"),briS);`
`321`		`- //sappend('c',SET_F("EW"),useRGBW);`
`322`		`- //sappend('i',SET_F("CO"),strip.getColorOrder());`
	`321`	`+`
`323`	`322`	`sappend('v',SET_F("AW"),strip.rgbwMode);`
`324`	`323`
`325`	`324`	`sappend('c',SET_F("BO"),turnOnAtBoot);`