Skip to content

Commit 46d66dd

Browse files
committed
Release of WLED v0.12.0
1 parent de6f32e commit 46d66dd

File tree

12 files changed

+657
-703
lines changed

12 files changed

+657
-703
lines changed

CHANGELOG.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,19 @@
22

33
### WLED release 0.12.0
44

5+
#### Build 2104020
6+
7+
- Allow clearing button/IR/relay pin on platforms that don't support negative numbers
8+
- Removed AUX pin
9+
- Hid some easter eggs, only to be found at easter
10+
11+
### Development versions between 0.11.1 and 0.12.0 releases
12+
513
#### Build 2103310
614

715
- Version bump to 0.12.0 "Hikari"
816
- Fixed LED settings submission in iOS app
917

10-
### Development versions between 0.11.1 and 0.12.0 releases
11-
1218
#### Build 2103300
1319

1420
- Version bump to 0.12.0-b5 "Hikari"

readme.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ A fast and feature-rich implementation of an ESP8266/ESP32 webserver to control
2121
- Segments to set different effects and colors to parts of the LEDs
2222
- Settings page - configuration over network
2323
- Access Point and station mode - automatic failsafe AP
24+
- Up to 10 LED outputs per instance
2425
- Support for RGBW strips
2526
- Up to 250 user presets to save and load colors/effects easily, supports cycling through them.
2627
- Presets can be used to automatically execute API calls

wled00/button.cpp

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -105,31 +105,4 @@ void handleIO()
105105
}
106106
offMode = true;
107107
}
108-
109-
//output
110-
if (auxPin>=1 && (auxActive || auxActiveBefore))
111-
{
112-
if (!auxActiveBefore)
113-
{
114-
auxActiveBefore = true;
115-
switch (auxTriggeredState)
116-
{
117-
case 0: pinMode(auxPin, INPUT); break;
118-
case 1: pinMode(auxPin, OUTPUT); digitalWrite(auxPin, HIGH); break;
119-
case 2: pinMode(auxPin, OUTPUT); digitalWrite(auxPin, LOW); break;
120-
}
121-
auxStartTime = millis();
122-
}
123-
if ((millis() - auxStartTime > auxTime*1000 && auxTime != 255) || !auxActive)
124-
{
125-
auxActive = false;
126-
auxActiveBefore = false;
127-
switch (auxDefaultState)
128-
{
129-
case 0: pinMode(auxPin, INPUT); break;
130-
case 1: pinMode(auxPin, OUTPUT); digitalWrite(auxPin, HIGH); break;
131-
case 2: pinMode(auxPin, OUTPUT); digitalWrite(auxPin, LOW); break;
132-
}
133-
}
134-
}
135108
}

wled00/cfg.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -500,9 +500,6 @@ void serializeConfig() {
500500
//JsonObject hw_status = hw.createNestedObject("status");
501501
//hw_status["pin"] = -1;
502502

503-
JsonObject hw_aux = hw.createNestedObject("aux");
504-
hw_aux["pin"] = auxPin;
505-
506503
JsonObject light = doc.createNestedObject(F("light"));
507504
light[F("scale-bri")] = briMultiplier;
508505
light[F("pal-mode")] = strip.paletteBlend;

wled00/data/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ function loadBg(iUrl) {
156156
if (iUrl == "") {
157157
var today = new Date();
158158
if (today.getMonth() == 11 && (today.getDate() > 23 && today.getDate() < 28)) img.src = "https://aircoookie.github.io/xmas.png";
159+
else if (today.getMonth() == 3 && (today.getDate() > 3 && today.getDate() < 6)) img.src = "https://aircoookie.github.io/easter.png";
159160
}
160161
img.addEventListener('load', (event) => {
161162
var a = parseFloat(cfg.theme.alpha.bg);

wled00/data/settings_leds.htm

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
{
1515
window.open("/settings","_self");
1616
}
17+
function off(n){
18+
d.getElementsByName(n)[0].value = -1;
19+
}
1720
function bLimits(b,p,m) {
1821
maxB = b; maxM = m; maxPB = p;
1922
}
@@ -299,11 +302,11 @@ <h3>Hardware setup</h3>
299302
<div id="ledwarning" style="color: orange; display: none;">
300303
&#9888; You might run into stability or lag issues.<br>
301304
Use less than <span id="wreason">800 LEDs per pin</span> for the best experience!<br>
302-
</div><br>
303-
Relay pin: <input type="number" min="-1" max="40" name="RL" onchange="UI()"> Active high <input type="checkbox" name="RM"><br>
304-
Button pin: <input type="number" min="-1" max="40" name="BT" onchange="UI()"><br>
305-
IR pin: <input type="number" min="-1" max="40" name="IR" onchange="UI()"><br>
306-
AUX pin: <input type="number" min="-1" max="40" name="AX" onchange="UI()">
305+
</div>
306+
Button pin: <input type="number" min="-1" max="40" name="BT" onchange="UI()"><span style="cursor: pointer;" onclick="off('BT')">&nbsp;&#215;</span><br>
307+
IR pin: <input type="number" min="-1" max="40" name="IR" onchange="UI()"><span style="cursor: pointer;" onclick="off('IR')">&nbsp;&#215;</span><br>
308+
Relay pin: <input type="number" min="-1" max="40" name="RL" onchange="UI()"><span style="cursor: pointer;" onclick="off('RL')">&nbsp;&#215;</span><br>
309+
Active high <input type="checkbox" name="RM">
307310
<h3>Defaults</h3>
308311
Turn LEDs on after power up/reset: <input type="checkbox" name="BO"><br>
309312
Default brightness: <input name="CA" type="number" min="0" max="255" required> (0-255)<br><br>

wled00/data/style.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ button {
1818
font-size: 20px;
1919
margin: 8px;
2020
margin-top: 12px;
21+
cursor: pointer;
2122
}
2223
.helpB {
2324
text-align: left;

wled00/html_settings.h

Lines changed: 10 additions & 8 deletions
Large diffs are not rendered by default.

wled00/html_ui.h

Lines changed: 625 additions & 624 deletions
Large diffs are not rendered by default.

wled00/set.cpp

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,6 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
153153
btnPin = -1;
154154
}
155155

156-
int hw_aux_pin = request->arg(F("AX")).toInt();
157-
if (pinManager.allocatePin(hw_aux_pin,true)) {
158-
auxPin = hw_aux_pin;
159-
} else {
160-
auxPin = -1;
161-
}
162-
163156
strip.ablMilliampsMax = request->arg(F("MA")).toInt();
164157
strip.milliampsPerLed = request->arg(F("LA")).toInt();
165158

@@ -722,16 +715,6 @@ bool handleSet(AsyncWebServerRequest *request, const String& req, bool apply)
722715
}
723716
if (nightlightMode > NL_MODE_SUN) nightlightMode = NL_MODE_SUN;
724717

725-
//toggle general purpose output
726-
if (auxPin>=0) {
727-
pos = req.indexOf(F("AX="));
728-
if (pos > 0) {
729-
auxTime = getNumVal(&req, pos);
730-
auxActive = true;
731-
if (auxTime == 0) auxActive = false;
732-
}
733-
}
734-
735718
pos = req.indexOf(F("TT="));
736719
if (pos > 0) transitionDelay = getNumVal(&req, pos);
737720

0 commit comments

Comments
 (0)