From 46d66dded8b9ed1f4690c1220f6f959ceda0b51f Mon Sep 17 00:00:00 2001 From: cschwinne Date: Sat, 3 Apr 2021 00:15:28 +0200 Subject: [PATCH] Release of WLED v0.12.0 --- CHANGELOG.md | 10 +- readme.md | 1 + wled00/button.cpp | 27 - wled00/cfg.cpp | 3 - wled00/data/index.js | 1 + wled00/data/settings_leds.htm | 13 +- wled00/data/style.css | 1 + wled00/html_settings.h | 18 +- wled00/html_ui.h | 1249 +++++++++++++++++---------------- wled00/set.cpp | 17 - wled00/wled.h | 19 +- wled00/xml.cpp | 1 - 12 files changed, 657 insertions(+), 703 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ba8224e..a56fe813 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,13 +2,19 @@ ### WLED release 0.12.0 +#### Build 2104020 + +- Allow clearing button/IR/relay pin on platforms that don't support negative numbers +- Removed AUX pin +- Hid some easter eggs, only to be found at easter + +### Development versions between 0.11.1 and 0.12.0 releases + #### Build 2103310 - Version bump to 0.12.0 "Hikari" - Fixed LED settings submission in iOS app -### Development versions between 0.11.1 and 0.12.0 releases - #### Build 2103300 - Version bump to 0.12.0-b5 "Hikari" diff --git a/readme.md b/readme.md index 866db4aa..4aa96888 100644 --- a/readme.md +++ b/readme.md @@ -21,6 +21,7 @@ A fast and feature-rich implementation of an ESP8266/ESP32 webserver to control - Segments to set different effects and colors to parts of the LEDs - Settings page - configuration over network - Access Point and station mode - automatic failsafe AP +- Up to 10 LED outputs per instance - Support for RGBW strips - Up to 250 user presets to save and load colors/effects easily, supports cycling through them. - Presets can be used to automatically execute API calls diff --git a/wled00/button.cpp b/wled00/button.cpp index 458ff22a..22e71a69 100644 --- a/wled00/button.cpp +++ b/wled00/button.cpp @@ -105,31 +105,4 @@ void handleIO() } offMode = true; } - - //output - if (auxPin>=1 && (auxActive || auxActiveBefore)) - { - if (!auxActiveBefore) - { - auxActiveBefore = true; - switch (auxTriggeredState) - { - case 0: pinMode(auxPin, INPUT); break; - case 1: pinMode(auxPin, OUTPUT); digitalWrite(auxPin, HIGH); break; - case 2: pinMode(auxPin, OUTPUT); digitalWrite(auxPin, LOW); break; - } - auxStartTime = millis(); - } - if ((millis() - auxStartTime > auxTime*1000 && auxTime != 255) || !auxActive) - { - auxActive = false; - auxActiveBefore = false; - switch (auxDefaultState) - { - case 0: pinMode(auxPin, INPUT); break; - case 1: pinMode(auxPin, OUTPUT); digitalWrite(auxPin, HIGH); break; - case 2: pinMode(auxPin, OUTPUT); digitalWrite(auxPin, LOW); break; - } - } - } } diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp index 435ef438..12611409 100644 --- a/wled00/cfg.cpp +++ b/wled00/cfg.cpp @@ -500,9 +500,6 @@ void serializeConfig() { //JsonObject hw_status = hw.createNestedObject("status"); //hw_status["pin"] = -1; - JsonObject hw_aux = hw.createNestedObject("aux"); - hw_aux["pin"] = auxPin; - JsonObject light = doc.createNestedObject(F("light")); light[F("scale-bri")] = briMultiplier; light[F("pal-mode")] = strip.paletteBlend; diff --git a/wled00/data/index.js b/wled00/data/index.js index d6aacff7..0b62fcfe 100644 --- a/wled00/data/index.js +++ b/wled00/data/index.js @@ -156,6 +156,7 @@ function loadBg(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"; + else if (today.getMonth() == 3 && (today.getDate() > 3 && today.getDate() < 6)) img.src = "https://aircoookie.github.io/easter.png"; } img.addEventListener('load', (event) => { var a = parseFloat(cfg.theme.alpha.bg); diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm index f17981e5..fd830822 100644 --- a/wled00/data/settings_leds.htm +++ b/wled00/data/settings_leds.htm @@ -14,6 +14,9 @@ { window.open("/settings","_self"); } + function off(n){ + d.getElementsByName(n)[0].value = -1; + } function bLimits(b,p,m) { maxB = b; maxM = m; maxPB = p; } @@ -299,11 +302,11 @@
- Relay pin: Active high
- Button pin:
- IR pin:
- AUX pin: + + Button pin:  ×
+ IR pin:  ×
+ Relay pin:  ×
+ Active high

Defaults

Turn LEDs on after power up/reset:
Default brightness: (0-255)

diff --git a/wled00/data/style.css b/wled00/data/style.css index 41e4c1fe..83404355 100644 --- a/wled00/data/style.css +++ b/wled00/data/style.css @@ -18,6 +18,7 @@ button { font-size: 20px; margin: 8px; margin-top: 12px; + cursor: pointer; } .helpB { text-align: left; diff --git a/wled00/html_settings.h b/wled00/html_settings.h index 11341d27..34e5a318 100644 --- a/wled00/html_settings.h +++ b/wled00/html_settings.h @@ -6,7 +6,7 @@ */ // Autogenerated from wled00/data/style.css, do not edit!! -const char PAGE_settingsCss[] PROGMEM = R"=====()====="; +const char PAGE_settingsCss[] PROGMEM = R"=====()====="; // Autogenerated from wled00/data/settings.htm, do not edit!! @@ -72,7 +72,7 @@ Do not enable if WiFi is working correctly, increases power consumption.
LED Settings