lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A few small fixes

Browse Source
This commit is contained in:
cschwinne 2020-11-15 20:58:04 +01:00
parent f36073f5cd
commit 5236625485
10 changed files with 1568 additions and 1562 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -2,6 +2,11 @@
### Development versions after the 0.10.2 release ### Development versions after the 0.10.2 release
#### Build 2011153
- Fixed an ESP32 end-of-file issue
- Fixed useRGBW not read from cfg.json
#### Build 2011152 #### Build 2011152
- Version bump to 0.11.0p "Mirai" - Version bump to 0.11.0p "Mirai"

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "wled", "name": "wled",
"version": "0.10.2", "version": "0.11.0p",
"description": "Tools for WLED project", "description": "Tools for WLED project",
"main": "tools/cdata.js", "main": "tools/cdata.js",
"directories": { "directories": {

2
wled00/cfg.cpp
View File

@ -102,7 +102,7 @@ void deserializeConfig() {
strip.colorOrder = hw_led_ins_0[F("order")]; strip.colorOrder = hw_led_ins_0[F("order")];
//bool hw_led_ins_0_rev = hw_led_ins_0[F("rev")]; // false //bool hw_led_ins_0_rev = hw_led_ins_0[F("rev")]; // false
skipFirstLed = hw_led_ins_0[F("skip")]; // 0 skipFirstLed = hw_led_ins_0[F("skip")]; // 0
//int hw_led_ins_0_type = hw_led_ins_0[F("type")]; // 2*/ useRGBW = (hw_led_ins_0[F("type")] == TYPE_SK6812_RGBW);
JsonObject hw_btn_ins_0 = hw[F("btn")][F("ins")][0]; JsonObject hw_btn_ins_0 = hw[F("btn")][F("ins")][0];
buttonEnabled = hw_btn_ins_0[F("en")] | buttonEnabled; buttonEnabled = hw_btn_ins_0[F("en")] | buttonEnabled;

1
wled00/data/index.htm
View File

@ -838,6 +838,7 @@ input[type=number]::-webkit-outer-spin-button {
border-radius: 20px; border-radius: 20px;
text-align: left; text-align: left;
transition: background-color 0.5s; transition: background-color 0.5s;
filter: brightness(1);
} }
.pres { .pres {

5
wled00/file.cpp
View File

@ -221,8 +221,9 @@ bool appendObjectToFile(const char* key, JsonDocument* content, uint32_t s, uint
} }
//check if last character in file is '}' (typical) //check if last character in file is '}' (typical)
f.seek(1, SeekEnd); uint32_t eof = f.size() -1;
if (f.read() == '}') pos = f.size() -1; f.seek(eof, SeekSet);
if (f.read() == '}') pos = eof;
if (pos == 0) //not found if (pos == 0) //not found
{ {

2
wled00/html_other.h
View File

@ -39,7 +39,7 @@ const char PAGE_update[] PROGMEM = R"=====(<!DOCTYPE html><html><head><meta cont
<title>WLED Update</title><script>function B(){window.history.back()}</script> <title>WLED Update</title><script>function B(){window.history.back()}</script>
<style> <style>
.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%} .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%}
</style></head><body><h2>WLED Software Update</h2>Installed version: 0.10.2<br> </style></head><body><h2>WLED Software Update</h2>Installed version: 0.11.0p<br>
Download the latest binary: <a Download the latest binary: <a
href="https://github.com/Aircoookie/WLED/releases" target="_blank"><img href="https://github.com/Aircoookie/WLED/releases" target="_blank"><img
src="https://img.shields.io/github/release/Aircoookie/WLED.svg?style=flat-square"> src="https://img.shields.io/github/release/Aircoookie/WLED.svg?style=flat-square">

2
wled00/html_settings.h
View File

@ -356,7 +356,7 @@ HTTP traffic is unencrypted. An attacker in the same network can intercept form
<h3>Software Update</h3><button type="button" onclick="U()">Manual OTA Update <h3>Software Update</h3><button type="button" onclick="U()">Manual OTA Update
</button><br>Enable ArduinoOTA: <input type="checkbox" name="AO"><br><h3>About </button><br>Enable ArduinoOTA: <input type="checkbox" name="AO"><br><h3>About
</h3><a href="https://github.com/Aircoookie/WLED/" target="_blank">WLED</a> </h3><a href="https://github.com/Aircoookie/WLED/" target="_blank">WLED</a>
version 0.10.2<br><br><a version 0.11.0p<br><br><a
href="https://github.com/Aircoookie/WLED/wiki/Contributors-&-About" href="https://github.com/Aircoookie/WLED/wiki/Contributors-&-About"
target="_blank">Contributors, dependencies and special thanks</a><br> target="_blank">Contributors, dependencies and special thanks</a><br>
A huge thank you to everyone who helped me create WLED!<br><br> A huge thank you to everyone who helped me create WLED!<br><br>

3106
wled00/html_ui.h
View File

File diff suppressed because it is too large Load Diff

2
wled00/wled.h
View File

@ -8,7 +8,7 @@
*/ */
// version code in format yymmddb (b = daily build) // version code in format yymmddb (b = daily build)
#define VERSION 2011152 #define VERSION 2011153
// ESP8266-01 (blue) got too little storage space to work with WLED. 0.10.2 is the last release supporting this unit. // ESP8266-01 (blue) got too little storage space to work with WLED. 0.10.2 is the last release supporting this unit.

3
wled00/wled_eeprom.cpp
View File

@ -383,8 +383,7 @@ void deEEP() {
JsonObject pObj = sObj.createNestedObject(nbuf); JsonObject pObj = sObj.createNestedObject(nbuf);
pObj["q"] = nbuf; sprintf_P(nbuf, (char*)F("Preset %d"), index);
sprintf_P(nbuf, "Preset %d", index);
pObj["n"] = nbuf; pObj["n"] = nbuf;
pObj["bri"] = EEPROM.read(i+1); pObj["bri"] = EEPROM.read(i+1);