Release of WLED v0.11.1

Fixed AP hide not saving (fixes Aircoookie#1520) Fixed MQTT password re-transmitted to HTML Hide Update buttons while uploading, accept .bin Make sure AP password is at least 8 characters long
tpfeil · Dec 19, 2020 · 5d6b97a · 5d6b97a
1 parent c277ebb
commit 5d6b97a
Show file tree

Hide file tree

Showing 11 changed files with 845 additions and 814 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 ## WLED changelog
 
+### WLED release 0.11.1
+
+#### Build 2012180
+
+-   Release of WLED 0.11.1 "Mirai"
+-   Fixed AP hide not saving (fixes #1520)
+-   Fixed MQTT password re-transmitted to HTML
+-   Hide Update buttons while uploading, accept .bin
+-   Make sure AP password is at least 8 characters long
+
 ### Development versions after 0.11.0 release
 
 #### Build 2012160

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wled",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "Tools for WLED project",
   "main": "tools/cdata.js",
   "directories": {

diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp
@@ -366,6 +366,7 @@ void serializeConfig() {
   ap[F("ssid")] = apSSID;
   ap[F("pskl")] = strlen(apPass);
   ap[F("chan")] = apChannel;
+  ap[F("hide")] = apHide;
   ap[F("behav")] = apBehavior;
 
   JsonArray ap_ip = ap.createNestedArray("ip");

diff --git a/wled00/data/index.htm b/wled00/data/index.htm
@@ -1292,14 +1292,18 @@
 
 function loadBg(iUrl) {
 	let bg = document.getElementById('bg');
-	let img = document.createElement("img");
-	img.src = iUrl;
+  let img = document.createElement("img");
+  img.src = iUrl;
+  if (iUrl == "") {
+    var today = new Date();
+    if (today.getMonth() == 11 && (today.getDate() > 23 && today.getDate() < 28)) img.src = "https://aircoookie.github.io/xmas.png";
+  }
 	img.addEventListener('load', (event) => {
 		var a = parseFloat(cfg.theme.alpha.bg);
 		d.getElementById('staytop2').style.background = "transparent";
 		if (isNaN(a)) a = 0.6;
 		bg.style.opacity = a;
-		bg.style.backgroundImage = `url(${iUrl})`;
+		bg.style.backgroundImage = `url(${img.src})`;
 		img = null;
 	});
 }

diff --git a/wled00/data/settings_wifi.htm b/wled00/data/settings_wifi.htm
@@ -51,7 +51,7 @@ <h3>Connect to existing network</h3>
 		<h3>Configure Access Point</h3>
 		AP SSID (leave empty for no AP):<br> <input name="AS" maxlength="32"><br>
 		Hide AP name: <input type="checkbox" name="AH"><br>
-		AP password (leave empty for open):<br> <input type="password" name="AP" maxlength="63"><br>
+		AP password (leave empty for open):<br> <input type="password" name="AP" maxlength="63" pattern="(.{8,63})|()" title="Empty or min. 8 characters"><br>
 		Access Point WiFi channel: <input name="AC" type="number" min="1" max="13" required><br>
     AP opens:
     <select name="AB">

diff --git a/wled00/data/update.htm b/wled00/data/update.htm
@@ -4,40 +4,49 @@
 <head>
     <meta content='width=device-width' name='viewport'>
     <title>WLED Update</title>
-    <script>function B() { window.history.back() }</script>
+    <script>function B() { window.history.back() }
+    function U() {document.getElementById("uf").style.display="none";document.getElementById("msg").style.display="block";}
+    </script>
     <style>
-        .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
-        }
+      .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
-        }
+      input[type=file] {
+        font-size: 16px
+      }
 
-        body {
-            font-family: Verdana, sans-serif;
-            text-align: center;
-            background: #222;
-            color: #fff;
-            line-height: 200%
-        }
+      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>Installed version: ##VERSION##<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>
-    <form method='POST' action='/update' enctype='multipart/form-data'><input type='file' class="bt" name='update'
-            required><br><input type='submit' class="bt" value='Update!'></form><button type="button" class="bt"
-        onclick="B()">Back</button>
+    <h2>WLED Software Update</h2>
+    <form method='POST' action='/update' id='uf' enctype='multipart/form-data' onsubmit="U()">
+      Installed version: ##VERSION##<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>
+      <input type='submit' class="bt" value='Update!' ><br>
+      <button type="button" class="bt" onclick="B()">Back</button></form>
+    <div id="msg"><b>Updating...</b><br>Please do not close or refresh the page :)</div>
 </body>
 
 </html>
diff --git a/wled00/html_other.h b/wled00/html_other.h
@@ -36,17 +36,19 @@ const char PAGE_dmxmap[] PROGMEM = R"=====()=====";
 
 // Autogenerated from wled00/data/update.htm, do not edit!!
 const char PAGE_update[] PROGMEM = R"=====(<!DOCTYPE html><html><head><meta content="width=device-width" name="viewport">
-<title>WLED Update</title><script>function B(){window.history.back()}</script>
-<style>
-.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%}
-</style></head><body><h2>WLED Software Update</h2>Installed version: 0.11.0<br>
-Download the latest binary: <a 
+<title>WLED Update</title><script>
+function B(){window.history.back()}function U(){document.getElementById("uf").style.display="none",document.getElementById("msg").style.display="block"}
+</script><style>
+.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.11.1<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><form method="POST" action="/update" enctype="multipart/form-data">
-<input type="file" class="bt" name="update" required><br><input type="submit" 
-class="bt" value="Update!"></form><button type="button" class="bt" 
-onclick="B()">Back</button></body></html>)=====";
+</a><br><input type="file" class="bt" name="update" accept=".bin" required><br>
+<input type="submit" class="bt" value="Update!"><br><button type="button" 
+class="bt" onclick="B()">Back</button></form><div id="msg"><b>Updating...</b>
+<br>Please do not close or refresh the page :)</div></body></html>)=====";
 
 
 // Autogenerated from wled00/data/welcome.htm, do not edit!!

diff --git a/wled00/html_settings.h b/wled00/html_settings.h
@@ -53,8 +53,9 @@ maxlength="32"> .local<br>Client IP: <span class="sip">Not connected</span><br>
 <h3>Configure Access Point</h3>AP SSID (leave empty for no AP):<br><input 
 name="AS" maxlength="32"><br>Hide AP name: <input type="checkbox" name="AH"><br>
 AP password (leave empty for open):<br><input type="password" name="AP" 
-maxlength="63"><br>Access Point WiFi channel: <input name="AC" type="number" 
-min="1" max="13" required><br>AP opens: <select name="AB"><option value="0">
+maxlength="63" pattern="(.{8,63})|()" title="Empty or min. 8 characters"><br>
+Access Point WiFi channel: <input name="AC" type="number" min="1" max="13" 
+required><br>AP opens: <select name="AB"><option value="0">
 No connection after boot</option><option value="1">Disconnected</option><option 
 value="2">Always</option><option value="3">Never (not recommended)</option>
 </select><br>AP IP: <span class="sip">Not active</span><br><h3>Experimental</h3>
@@ -359,7 +360,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.11.0<br><br><a 
+ version 0.11.1<br><br><a 
 href="https://github.com/Aircoookie/WLED/wiki/Contributors-&-About" 
 target="_blank">Contributors, dependencies and special thanks</a><br>
 A huge thank you to everyone who helped me create WLED!<br><br>