Skip to content

Commit f62e56b

Browse files
committed
Merge branch 'master' of https://github.com/Aircoookie/WLED
2 parents 2ac90bb + f85f2d5 commit f62e56b

File tree

9 files changed

+217
-207
lines changed

9 files changed

+217
-207
lines changed

readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ A fast and feature-rich implementation of an ESP8266/ESP32 webserver to control
4949

5050
## 📲 Quick start guide and documentation
5151

52-
See the [wiki](https://github.com/Aircoookie/WLED/wiki)!
52+
See the [documentation on our official site](https://kno.wled.ge)!
5353

5454
[On this page](https://github.com/Aircoookie/WLED/wiki/Learning-the-ropes) you can find excellent tutorials made by the community and helpful tools to help you get your new lamp up and running!
5555

tools/cdata.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ function writeHtmlGzipped(sourceFile, resultFile) {
9090
* Binary array for the Web UI.
9191
* gzip is used for smaller size and improved speeds.
9292
*
93-
* Please see https://github.com/Aircoookie/WLED/wiki/Add-own-functionality#web-ui
93+
* Please see https://kno.wled.ge/advanced/custom-features/#changing-web-ui
9494
* to find out how to easily modify the web UI source!
9595
*/
9696
@@ -175,7 +175,7 @@ function writeChunks(srcDir, specs, resultFile) {
175175
let src = `/*
176176
* More web UI HTML source arrays.
177177
* This file is auto generated, please don't make any changes manually.
178-
* Instead, see https://github.com/Aircoookie/WLED/wiki/Add-own-functionality#web-ui
178+
* Instead, see https://kno.wled.ge/advanced/custom-features/#changing-web-ui
179179
* to find out how to easily modify the web UI source!
180180
*/
181181
`;

wled00/data/index.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1612,9 +1612,8 @@ function setLor(i) {
16121612

16131613
function setPreset(i) {
16141614
var obj = {"ps": i};
1615-
1615+
if (isPlaylist(i)) obj.on = true; //force on
16161616
showToast("Loading preset " + pName(i) +" (" + i + ")");
1617-
16181617
requestJson(obj);
16191618
}
16201619

@@ -1647,6 +1646,7 @@ function saveP(i,pl) {
16471646
} else {
16481647
if (pl) {
16491648
obj.playlist = plJson[i];
1649+
obj.on = true;
16501650
obj.o = true;
16511651
} else {
16521652
obj.ib = d.getElementById(`p${i}ibtgl`).checked;
@@ -1662,10 +1662,10 @@ function saveP(i,pl) {
16621662
requestJson(obj);
16631663
if (obj.o) {
16641664
pJson[pI] = obj;
1665-
delete pJson[pI].psave;
1666-
delete pJson[pI].o;
1667-
delete pJson[pI].v;
1668-
delete pJson[pI].time;
1665+
delete pJson[pI].psave;
1666+
delete pJson[pI].o;
1667+
delete pJson[pI].v;
1668+
delete pJson[pI].time;
16691669
} else {
16701670
pJson[pI] = {"n":pN, "win":"Please refresh the page to see this newly saved command."};
16711671
if (obj.win) pJson[pI].win = obj.win;
@@ -1686,6 +1686,7 @@ function testPl(i,bt) {
16861686
bt.innerHTML = "<i class='icons btn-icon'>&#xe38f;</i>Stop";
16871687
var obj = {};
16881688
obj.playlist = plJson[i];
1689+
obj.on = true;
16891690
requestJson(obj);
16901691
}
16911692

wled00/data/settings_time.htm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ <h2>Time setup</h2>
128128
<option value="16">ACST</option>
129129
<option value="17">ACST/ACDT</option>
130130
<option value="18">HST (Hawaii)</option>
131+
<option value="19">NOVT (Novosibirsk)</option>
131132
</select><br>
132133
UTC offset: <input name="UO" type="number" min="-65500" max="65500" required> seconds (max. 18 hours)<br>
133134
Current local time is <span class="times">unknown</span>.<br>

wled00/html_other.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* More web UI HTML source arrays.
33
* This file is auto generated, please don't make any changes manually.
4-
* Instead, see https://github.com/Aircoookie/WLED/wiki/Add-own-functionality#web-ui
4+
* Instead, see https://kno.wled.ge/advanced/custom-features/#changing-web-ui
55
* to find out how to easily modify the web UI source!
66
*/
77

wled00/html_settings.h

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* More web UI HTML source arrays.
33
* This file is auto generated, please don't make any changes manually.
4-
* Instead, see https://github.com/Aircoookie/WLED/wiki/Add-own-functionality#web-ui
4+
* Instead, see https://kno.wled.ge/advanced/custom-features/#changing-web-ui
55
* to find out how to easily modify the web UI source!
66
*/
77

@@ -349,14 +349,15 @@ CST(AWST)</option><option value="10">JST(KST)</option><option value="11">
349349
AEST/AEDT</option><option value="12">NZST/NZDT</option><option value="13">
350350
North Korea</option><option value="14">IST (India)</option><option value="15">
351351
CA-Saskatchewan</option><option value="16">ACST</option><option value="17">
352-
ACST/ACDT</option><option value="18">HST (Hawaii)</option></select><br>
353-
UTC offset: <input name="UO" type="number" min="-65500" max="65500" required>
354-
seconds (max. 18 hours)<br>Current local time is <span class="times">unknown
355-
</span>.<br>Latitude (N): <input name="LT" type="number" min="-66.6" max="66.6"
356-
step="0.01"> Longitude (E): <input name="LN" type="number" min="-180" max="180"
357-
step="0.01"><div id="sun" class="times"></div><h3>Clock</h3>Clock Overlay:
358-
<select name="OL" onchange="Cs()"><option value="0" id="cn" selected="selected">
359-
None</option><option value="1" id="ca">Analog Clock</option><option value="2">
352+
ACST/ACDT</option><option value="18">HST (Hawaii)</option><option value="19">
353+
NOVT (Novosibirsk)</option></select><br>UTC offset: <input name="UO"
354+
type="number" min="-65500" max="65500" required> seconds (max. 18 hours)<br>
355+
Current local time is <span class="times">unknown</span>.<br>Latitude (N):
356+
<input name="LT" type="number" min="-66.6" max="66.6" step="0.01">
357+
Longitude (E): <input name="LN" type="number" min="-180" max="180" step="0.01">
358+
<div id="sun" class="times"></div><h3>Clock</h3>Clock Overlay: <select
359+
name="OL" onchange="Cs()"><option value="0" id="cn" selected="selected">None
360+
</option><option value="1" id="ca">Analog Clock</option><option value="2">
360361
Single Digit Clock</option><option value="3" id="cc">Cronixie Clock</option>
361362
</select><br><div id="coc">First LED: <input name="O1" type="number" min="0"
362363
max="255" required> Last LED: <input name="O2" type="number" min="0" max="255"

0 commit comments

Comments
 (0)