Merge branch 'master' of https://github.com/Aircoookie/WLED into overlayum

2021-10-10 17:06:12 -08:00 · 2021-10-10 17:06:12 -08:00 · 303fc65a6a
commit 303fc65a6a
parent 445b6ee13f 8afaac1e30
7 changed files with 789 additions and 781 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,6 +2,13 @@

 ### Builds after release 0.12.0

+#### Build 2110110
+
+-   Version bump to 0.13.0-b4 "Toki"
+-   Added option for bus refresh if off (PR #2259)
+-   New auto segment logic
+-   Fixed current calculations for virtual or non-linear configs (PR #2262)
+
 #### Build 2110060

 -   Added virtual network DDP busses (PR #2245)
--- a/package-lock.json
+++ b/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "wled",
-  "version": "0.13.0-b3",
+  "version": "0.13.0-b4",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "wled",
-  "version": "0.13.0-b3",
+  "version": "0.13.0-b4",
  "description": "Tools for WLED project",
  "main": "tools/cdata.js",
  "directories": {
--- 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.13.0-b3<br>Download the latest binary: <a 
+Installed version: 0.13.0-b4<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" required><br><input 
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@ -426,7 +426,7 @@ onclick='uploadFile(d.Sf.data2,"/cfg.json")'><br></div><div style="color:#fa0">
 Incorrect configuration may require a factory reset or re-flashing of your ESP.
 </div>For security reasons, passwords are not backed up.<h3>About</h3><a 
 href="https://github.com/Aircoookie/WLED/" target="_blank">WLED</a>
- version 0.13.0-b3<br><br><a 
+ version 0.13.0-b4<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>
--- a/wled00/html_ui.h
+++ b/wled00/html_ui.h
--- a/wled00/wled.h
+++ b/wled00/wled.h
@ -3,12 +3,12 @@
 /*
   Main sketch, global variable declarations
   @title WLED project sketch
-   @version 0.13.0-b3
+   @version 0.13.0-b4
   @author Christian Schwinne
 */

 // version code in format yymmddb (b = daily build)
-#define VERSION 2110060
+#define VERSION 2110110

 //uncomment this if you have a "my_config.h" file you'd like to use
 //#define WLED_USE_MY_CONFIG