Skip to content

Commit b697df3

Browse files
committed
A few more small fixes
1 parent 5236625 commit b697df3

File tree

8 files changed

+531
-521
lines changed

8 files changed

+531
-521
lines changed

CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,16 @@
22

33
### Development versions after the 0.10.2 release
44

5+
#### Build 2011154
6+
7+
- Fixed RGBW saved incorrectly
8+
- Fixed pmt caching requesting /presets.json too often
9+
- Fixed deEEP not copying the first segment of EEPROM preset 16
10+
511
#### Build 2011153
612

713
- Fixed an ESP32 end-of-file issue
8-
- Fixed useRGBW not read from cfg.json
14+
- Fixed useRGBW not read from cfg.json
915

1016
#### Build 2011152
1117

@@ -16,6 +22,7 @@
1622
- Updated iro.js to v5 (fixes black color wheel)
1723
- Added white temperature slider to color wheel
1824
- Add JSON settings serialization/deserialization to cfg.json and wsec.json
25+
- Added deEEP to convert the EEPROM settings and presets to files
1926
- Playlist support - JSON only for now
2027
- New v2 usermod methods `addToConfig()` and `readFromConfig()` (see EXAMPLE_v2 for doc)
2128
- Added Ethernet support for ESP32 (PR #1316)

wled00/cfg.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ void serializeConfig() {
396396

397397
//this is very crude and temporary
398398
byte ledType = TYPE_WS2812_RGB;
399-
if (strip.rgbwMode) ledType = TYPE_SK6812_RGBW;
399+
if (useRGBW) ledType = TYPE_SK6812_RGBW;
400400
#ifdef USE_WS2801
401401
ledType = TYPE_WS2801;
402402
#endif

wled00/data/index.htm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1795,9 +1795,9 @@
17951795
pmt = json.info.fs.pmt;
17961796
if (pmt != pmtLS || pmt == 0) {
17971797
setTimeout(loadPresets,99);
1798-
pmtLast = pmt;
17991798
}
1800-
else populatePresets(true);
1799+
else populatePresets(true);
1800+
pmtLast = pmt;
18011801
var x='',y='<option value="0">Default</option>';
18021802
json.effects.shift(); //remove solid
18031803
for (i in json.effects) json.effects[i] = {id: parseInt(i)+1, name:json.effects[i]};
@@ -1827,7 +1827,7 @@
18271827
syncTglRecv = info.str;
18281828
maxSeg = info.leds.maxseg;
18291829
pmt = info.fs.pmt;
1830-
if (pmt != pmtLast) setTimeout(loadPresets,99);
1830+
if (!command && pmt != pmtLast) setTimeout(loadPresets,99);
18311831
pmtLast = pmt;
18321832
lastinfo = info;
18331833
if (isInfo) populateInfo(info);

wled00/data/settings_time.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ <h3>Macro presets</h3>
140140
Just enter the preset id below!</i>
141141
<i>Use 0 for the default action instead of a preset</i><br>
142142
Alexa On/Off Preset: <input name="A0" type="number" min="0" max="250" required> <input name="A1" type="number" min="0" max="250" required><br>
143-
Button short press Preset: Macro: <input name="MP" type="number" min="0" max="250" required><br>
143+
Button short press Preset: <input name="MP" type="number" min="0" max="250" required><br>
144144
Long Press: <input name="ML" type="number" min="0" max="250" required> Double press: <input name="MD" type="number" min="0" max="250" required><br>
145145
Countdown-Over Preset: <input name="MC" type="number" min="0" max="250" required><br>
146146
Timed-Light-Over Presets: <input name="MN" type="number" min="0" max="250" required><br>

wled00/html_settings.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,9 +323,9 @@ Presets now also can be used as macros to save both JSON and HTTP API commands.
323323
<br>Just enter the preset id below!</i> <i>
324324
Use 0 for the default action instead of a preset</i><br>Alexa On/Off Preset:
325325
<input name="A0" type="number" min="0" max="250" required> <input name="A1"
326-
type="number" min="0" max="250" required><br>Button short press Preset: Macro:
327-
<input name="MP" type="number" min="0" max="250" required><br>Long Press: <input
328-
name="ML" type="number" min="0" max="250" required> Double press: <input
326+
type="number" min="0" max="250" required><br>Button short press Preset: <input
327+
name="MP" type="number" min="0" max="250" required><br>Long Press: <input
328+
name="ML" type="number" min="0" max="250" required> Double press: <input
329329
name="MD" type="number" min="0" max="250" required><br>Countdown-Over Preset:
330330
<input name="MC" type="number" min="0" max="250" required><br>
331331
Timed-Light-Over Presets: <input name="MN" type="number" min="0" max="250"

wled00/html_ui.h

Lines changed: 512 additions & 511 deletions
Large diffs are not rendered by default.

wled00/wled.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
// version code in format yymmddb (b = daily build)
11-
#define VERSION 2011153
11+
#define VERSION 2011154
1212

1313
// ESP8266-01 (blue) got too little storage space to work with WLED. 0.10.2 is the last release supporting this unit.
1414

wled00/wled_eeprom.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,9 +418,11 @@ void deEEP() {
418418
strip.getSegment(j).setOption(SEG_OPTION_ON, 1);
419419
}
420420
}
421+
setValuesFromMainSeg();
421422
serializeState(pObj, true, false, true);
422423

423424
strip.resetSegments();
425+
setValuesFromMainSeg();
424426
}
425427
}
426428

0 commit comments

Comments
 (0)