A few small fixes

Aircoookie · Aircoookie · commit 5236625485a9 · 2020-11-15T20:58:04.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ### 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
 
 -   Version bump to 0.11.0p "Mirai"
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wled",
-  "version": "0.10.2",
+  "version": "0.11.0p",
   "description": "Tools for WLED project",
   "main": "tools/cdata.js",
   "directories": {
diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp
@@ -102,7 +102,7 @@ void deserializeConfig() {
   strip.colorOrder = hw_led_ins_0[F("order")];
   //bool hw_led_ins_0_rev = hw_led_ins_0[F("rev")]; // false
   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];
   buttonEnabled = hw_btn_ins_0[F("en")] | buttonEnabled;
diff --git a/wled00/data/index.htm b/wled00/data/index.htm
@@ -838,6 +838,7 @@
 	border-radius: 20px;
 	text-align: left;
 	transition: background-color 0.5s;
+  filter: brightness(1);
 }
 
 .pres {
diff --git a/wled00/file.cpp b/wled00/file.cpp
@@ -221,8 +221,9 @@ bool appendObjectToFile(const char* key, JsonDocument* content, uint32_t s, uint
   }
   
   //check if last character in file is '}' (typical)
-  f.seek(1, SeekEnd);
-  if (f.read() == '}') pos = f.size() -1;
+  uint32_t eof = f.size() -1;
+  f.seek(eof, SeekSet);
+  if (f.read() == '}') pos = eof;
   
   if (pos == 0) //not found
   {
diff --git a/wled00/html_other.h b/wled00/html_other.h
@@ -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>
 <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%}
-</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 
 href="https://github.com/Aircoookie/WLED/releases" target="_blank"><img 
 src="https://img.shields.io/github/release/Aircoookie/WLED.svg?style=flat-square">
diff --git a/wled00/html_settings.h b/wled00/html_settings.h
@@ -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
 </button><br>Enable ArduinoOTA: <input type="checkbox" name="AO"><br><h3>About
 </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" 
 target="_blank">Contributors, dependencies and special thanks</a><br>
 A huge thank you to everyone who helped me create WLED!<br><br>
diff --git a/wled00/html_ui.h b/wled00/html_ui.h
diff --git a/wled00/wled.h b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // 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.
 
diff --git a/wled00/wled_eeprom.cpp b/wled00/wled_eeprom.cpp
@@ -383,8 +383,7 @@ void deEEP() {
 
       JsonObject pObj = sObj.createNestedObject(nbuf);
 
-      pObj["q"] = nbuf;
-      sprintf_P(nbuf, "Preset %d", index);
+      sprintf_P(nbuf, (char*)F("Preset %d"), index);
       pObj["n"] = nbuf;
 
       pObj["bri"] = EEPROM.read(i+1);

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "wled",`
`3`		`- "version": "0.10.2",`
	`3`	`+ "version": "0.11.0p",`
`4`	`4`	`"description": "Tools for WLED project",`
`5`	`5`	`"main": "tools/cdata.js",`
`6`	`6`	`"directories": {`
Original file line number	Diff line number	Diff line change
`@@ -838,6 +838,7 @@`
`838`	`838`	`border-radius: 20px;`
`839`	`839`	`text-align: left;`
`840`	`840`	`transition: background-color 0.5s;`
	`841`	`+ filter: brightness(1);`
`841`	`842`	`}`
`842`	`843`
`843`	`844`	`.pres {`
Original file line number	Diff line number	Diff line change
`@@ -221,8 +221,9 @@ bool appendObjectToFile(const char* key, JsonDocument* content, uint32_t s, uint`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`//check if last character in file is '}' (typical)`
`224`		`- f.seek(1, SeekEnd);`
`225`		`- if (f.read() == '}') pos = f.size() -1;`
	`224`	`+ uint32_t eof = f.size() -1;`
	`225`	`+ f.seek(eof, SeekSet);`
	`226`	`+ if (f.read() == '}') pos = eof;`
`226`	`227`
`227`	`228`	`if (pos == 0) //not found`
`228`	`229`	`{`