Skip to content

Commit 595fd93

Browse files
committed
Remove FS defines
Increase boot preset max. to 250 Update changelog Update readme
1 parent 76f4c49 commit 595fd93

File tree

10 files changed

+1732
-1715
lines changed

10 files changed

+1732
-1715
lines changed

CHANGELOG.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,32 @@
22

33
### Development versions after the 0.10.2 release
44

5+
#### Build 2011152
6+
7+
- Version bump to 0.11.0p "Mirai"
8+
- Increased max. num of segments to 12 (ESP8266) / 16 (ESP32)
9+
- Up to 250 presets stored in the `presets.json` file in filesystem
10+
- Complete overhaul of the Presets UI tab
11+
- Updated iro.js to v5 (fixes black color wheel)
12+
- Added white temperature slider to color wheel
13+
- Add JSON settings serialization/deserialization to cfg.json and wsec.json
14+
- Playlist support - JSON only for now
15+
- New v2 usermod methods `addToConfig()` and `readFromConfig()` (see EXAMPLE_v2 for doc)
16+
- Added Ethernet support for ESP32 (PR #1316)
17+
- IP addresses are now handled by the `Network` class
18+
- New `esp32_poe` PIO environment
19+
- Use EspAsyncWebserver Aircoookie fork v.2.0.0 (hiding wsec.json)
20+
- Removed `WLED_DISABLE_FILESYSTEM` and `WLED_ENABLE_FS_SERVING` defines as they are now required
21+
- Added pin manager
22+
- UI performance improvements (no drop shadows)
23+
- More explanatory error messages in UI
24+
- Improved candle brightness
25+
- Return remaining nightlight time `nl.rem` in JSON API (PR #1302)
26+
- Added gamma calculation (yet unused)
27+
- Added LED type definitions to const.h (yet unused)
28+
- Removed `NP` and `MS=` macro HTTP API commands
29+
- Removed macros from Time settings
30+
531
#### Build 2011120
632

733
- Added the ability for the /api MQTT topic to receive JSON API payloads

readme.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,20 @@ A fast and feature-rich implementation of an ESP8266/ESP32 webserver to control
2121
- Settings page - configuration over network
2222
- Access Point and station mode - automatic failsafe AP
2323
- Support for RGBW strips
24-
- 16 user presets to save and load colors/effects easily, supports cycling through them.
25-
- Macro functions to automatically execute API calls
24+
- Up to 250 user presets to save and load colors/effects easily, supports cycling through them.
25+
- Presets can be used to automatically execute API calls
2626
- Nightlight function (gradually dims down)
2727
- Full OTA software updatability (HTTP + ArduinoOTA), password protectable
2828
- Configurable analog clock + support for the Cronixie kit by Diamex
2929
- Configurable Auto Brightness limit for safer operation
30+
- Filesystem-based config for easier backup of presets and settings
3031

3132
## 💡 Supported light control interfaces
3233
- WLED app for [Android](https://play.google.com/store/apps/details?id=com.aircoookie.WLED) and [iOS](https://apps.apple.com/us/app/wled/id1475695033)
3334
- JSON and HTTP request APIs
3435
- MQTT
3536
- Blynk IoT
36-
- E1.31, Art-Net and TPM2.net
37+
- E1.31, Art-Net, DDP and TPM2.net
3738
- [Hyperion](https://github.com/hyperion-project/hyperion.ng)
3839
- UDP realtime
3940
- Alexa voice control (including dimming and color)

wled00/data/index.htm

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@
204204
.tab {
205205
background-color: transparent;
206206
color: var(--c-d);
207-
/*filter: drop-shadow(0px 0px 0px #111);*/
208207
}
209208

210209
.bot {
@@ -511,7 +510,6 @@
511510
#picker {
512511
margin: 10px auto;
513512
width: 260px;
514-
/*filter: drop-shadow(0px 0px 1px #000);*/
515513
}
516514

517515
#rgbwrap {
@@ -527,7 +525,6 @@
527525
color: var(--c-f);
528526
border: 0px solid white;
529527
border-radius: 25px;
530-
/*filter: drop-shadow(0px 0px 1px #000);*/
531528
transition-duration: 0.5s;
532529
-webkit-backface-visibility: hidden;
533530
-webkit-transform:translate3d(0,0,0);
@@ -838,7 +835,6 @@
838835
color: var(--c-f);
839836
border: 0px solid white;
840837
border-radius: 20px;
841-
/*filter: drop-shadow(0px 0px 1px #000);*/
842838
text-align: left;
843839
transition: background-color 0.5s;
844840
}
@@ -1367,7 +1363,8 @@
13671363
for (var key in pJson)
13681364
{
13691365
if (key == l) l++;
1370-
}
1366+
}
1367+
if (l > 250) l = 250;
13711368
return l;
13721369
}
13731370

@@ -2005,7 +2002,7 @@
20052002
<span class="checkmark schk"></span>
20062003
</label>
20072004
</div>
2008-
<div class="c">Save to ID <input class="noslide" id="p${i}id" type="number" oninput="checkUsed(${i})" min=1 value=${(i>0)?i:getLowestUnusedP()}></div>
2005+
<div class="c">Save to ID <input class="noslide" id="p${i}id" type="number" oninput="checkUsed(${i})" max=250 min=1 value=${(i>0)?i:getLowestUnusedP()}></div>
20092006
<div class="c">
20102007
<button class="btn btn-i btn-p" onclick="saveP(${i})"><i class="icons btn-icon">&#xe390;</i>${(i>0)?"Save changes":"Save preset"}</button>
20112008
${(i>0)?'<button class="btn btn-i btn-p" onclick="delP('+i+')"><i class="icons btn-icon">&#xe037;</i>Delete preset</button>':

wled00/data/settings_leds.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ <h2>LED setup</h2>
151151
<h3>Defaults</h3>
152152
Turn LEDs on after power up/reset: <input type="checkbox" name="BO"><br>
153153
Default brightness: <input name="CA" type="number" min="0" max="255" required> (0-255)<br><br>
154-
Apply preset <input name="BP" type="number" min="0" max="16" required> at boot (0 uses defaults)
154+
Apply preset <input name="BP" type="number" min="0" max="250" required> at boot (0 uses defaults)
155155
<br>- <i>or</i> -<br>
156156
Set current preset cycle setting as boot default: <input type="checkbox" name="PC"><br><br>
157157
Use Gamma correction for color: <input type="checkbox" name="GC"> (strongly recommended)<br>

wled00/file.cpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* Utility for SPIFFS filesystem
55
*/
66

7-
#ifndef WLED_DISABLE_FILESYSTEM
8-
97
#ifdef ARDUINO_ARCH_ESP32 //FS info bare IDF function until FS wrapper is available for ESP32
108
#if WLED_FS != LITTLEFS
119
#include "esp_spiffs.h"
@@ -375,9 +373,8 @@ void updateFSInfo() {
375373
fsBytesTotal = fsi.totalBytes;
376374
#endif
377375
}
378-
#endif
379376

380-
#if !defined WLED_DISABLE_FILESYSTEM && defined WLED_ENABLE_FS_SERVING
377+
381378
//Un-comment any file types you need
382379
String getContentType(AsyncWebServerRequest* request, String filename){
383380
if(request->hasArg("download")) return "application/octet-stream";
@@ -413,7 +410,3 @@ bool handleFileRead(AsyncWebServerRequest* request, String path){
413410
}
414411
return false;
415412
}
416-
417-
#else
418-
bool handleFileRead(AsyncWebServerRequest*, String path){return false;}
419-
#endif

wled00/html_settings.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ value="3">RBG</option><option value="4">BGR</option><option value="5">GBR
109109
</option></select><h3>Defaults</h3>Turn LEDs on after power up/reset: <input
110110
type="checkbox" name="BO"><br>Default brightness: <input name="CA"
111111
type="number" min="0" max="255" required> (0-255)<br><br>Apply preset <input
112-
name="BP" type="number" min="0" max="16" required> at boot (0 uses defaults)<br>
113-
- <i>or</i> -<br>Set current preset cycle setting as boot default: <input
112+
name="BP" type="number" min="0" max="250" required> at boot (0 uses defaults)
113+
<br>- <i>or</i> -<br>Set current preset cycle setting as boot default: <input
114114
type="checkbox" name="PC"><br><br>Use Gamma correction for color: <input
115115
type="checkbox" name="GC"> (strongly recommended)<br>
116116
Use Gamma correction for brightness: <input type="checkbox" name="GB">

0 commit comments

Comments
 (0)