Version bump to 0.11.0 "Mirai"

Improved preset name sorting Fixed Preset cycle not working beyond preset 16
Prinnc3 · Nov 22, 2020 · 223bd96 · 223bd96
1 parent ae46eea
commit 223bd96
Show file tree

Hide file tree

Showing 8 changed files with 1,494 additions and 1,485 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 ## WLED changelog
 
-### Development versions after the 0.10.2 release
+### WLED version 0.11.0
+
+#### Build 2011230
+
+-   Version bump to 0.11.0 "Mirai"
+-   Improved preset name sorting
+-   Fixed Preset cycle not working beyond preset 16
+
+### Development versions between 0.10.2 and 0.11.0 releases
 
 #### Build 2011220
 

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

diff --git a/wled00/data/index.htm b/wled00/data/index.htm
@@ -1050,8 +1050,8 @@
 			<input type="checkbox" id="cyToggle" onchange="toggleCY()">
 			<span class="checkmark psv"></span>
 		</label><br>
-		First preset: <input id="cycs" class="noslide" type="number" min="1" max="14" value="1"><br>
-		Last preset: <input id="cyce" class="noslide" type="number" min="2" max="15" value="3"><br>
+		First preset: <input id="cycs" class="noslide" type="number" min="1" max="249" value="1"><br>
+		Last preset: <input id="cyce" class="noslide" type="number" min="2" max="250" value="3"><br>
 		Time per preset: <input id="cyct" class="noslide" type="number" min="0.2" max="6553.5" step="0.1" value="1.2">s<br>
 		Transition: <input id="cyctt" class="noslide" type="number" min="0" max="65.5" step="0.1" value="0.7">s
 	</div>
@@ -1755,7 +1755,7 @@
 }
 function cmpP(a, b) {
 	if (!a[1].n) return (a[0] > b[0]);
-	return a[1].n.localeCompare(b[1].n);
+  return a[1].n.localeCompare(b[1].n,undefined, {numeric: true});
 }
 
 var jsonTimeout;

diff --git a/wled00/html_other.h b/wled00/html_other.h
@@ -39,7 +39,7 @@ const char PAGE_update[] PROGMEM = R"=====(<!DOCTYPE html><html><head><meta cont
 <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.0p<br>
+</style></head><body><h2>WLED Software Update</h2>Installed version: 0.11.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">

diff --git a/wled00/html_settings.h b/wled00/html_settings.h
@@ -357,7 +357,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.0p<br><br><a 
+ version 0.11.0<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>

diff --git a/wled00/html_ui.h b/wled00/html_ui.h
diff --git a/wled00/led.cpp b/wled00/led.cpp
@@ -305,7 +305,7 @@ void handleNightlight()
     if (presetCycCurr < presetCycleMin || presetCycCurr > presetCycleMax) presetCycCurr = presetCycleMin;
     applyPreset(presetCycCurr);
     presetCycCurr++;
-    if (presetCycCurr > 16) presetCycCurr = 1;
+    if (presetCycCurr > 250) presetCycCurr = 1;
     colorUpdated(NOTIFIER_CALL_MODE_PRESET_CYCLE);
   }
 }

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.11.0p
+   @version 0.11.0
    @author Christian Schwinne
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2011220
+#define VERSION 2011230
 
 //uncomment this if you have a "my_config.h" file you'd like to use
 //#define WLED_USE_MY_CONFIG
@@ -173,7 +173,7 @@
 #endif
 
 // Global Variable definitions
-WLED_GLOBAL char versionString[] _INIT("0.11.0p");
+WLED_GLOBAL char versionString[] _INIT("0.11.0");
 #define WLED_CODENAME "Mirai"
 
 // AP and OTA default passwords (for maximum security change them!)