diff --git a/CHANGELOG.md b/CHANGELOG.md index bad6ac8a0..f3af30f52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,16 @@ ### Development versions after the 0.10.2 release +#### Build 2011154 + +- Fixed RGBW saved incorrectly +- Fixed pmt caching requesting /presets.json too often +- Fixed deEEP not copying the first segment of EEPROM preset 16 + #### Build 2011153 - Fixed an ESP32 end-of-file issue -- Fixed useRGBW not read from cfg.json +- Fixed useRGBW not read from cfg.json #### Build 2011152 @@ -16,6 +22,7 @@ - Updated iro.js to v5 (fixes black color wheel) - Added white temperature slider to color wheel - Add JSON settings serialization/deserialization to cfg.json and wsec.json +- Added deEEP to convert the EEPROM settings and presets to files - Playlist support - JSON only for now - New v2 usermod methods `addToConfig()` and `readFromConfig()` (see EXAMPLE_v2 for doc) - Added Ethernet support for ESP32 (PR #1316) diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp index 4543806dd..d7a253104 100644 --- a/wled00/cfg.cpp +++ b/wled00/cfg.cpp @@ -396,7 +396,7 @@ void serializeConfig() { //this is very crude and temporary byte ledType = TYPE_WS2812_RGB; - if (strip.rgbwMode) ledType = TYPE_SK6812_RGBW; + if (useRGBW) ledType = TYPE_SK6812_RGBW; #ifdef USE_WS2801 ledType = TYPE_WS2801; #endif diff --git a/wled00/data/index.htm b/wled00/data/index.htm index 9e9afd84a..beffff89f 100644 --- a/wled00/data/index.htm +++ b/wled00/data/index.htm @@ -1795,9 +1795,9 @@ function requestJson(command, rinfo = true, verbose = true) { pmt = json.info.fs.pmt; if (pmt != pmtLS || pmt == 0) { setTimeout(loadPresets,99); - pmtLast = pmt; } - else populatePresets(true); + else populatePresets(true); + pmtLast = pmt; var x='',y=''; json.effects.shift(); //remove solid for (i in json.effects) json.effects[i] = {id: parseInt(i)+1, name:json.effects[i]}; @@ -1827,7 +1827,7 @@ function requestJson(command, rinfo = true, verbose = true) { syncTglRecv = info.str; maxSeg = info.leds.maxseg; pmt = info.fs.pmt; - if (pmt != pmtLast) setTimeout(loadPresets,99); + if (!command && pmt != pmtLast) setTimeout(loadPresets,99); pmtLast = pmt; lastinfo = info; if (isInfo) populateInfo(info); diff --git a/wled00/data/settings_time.htm b/wled00/data/settings_time.htm index 46d853b85..c8c450e23 100644 --- a/wled00/data/settings_time.htm +++ b/wled00/data/settings_time.htm @@ -140,7 +140,7 @@ Just enter the preset id below! Use 0 for the default action instead of a preset
Alexa On/Off Preset:
- Button short press Preset: Macro:
+ Button short press Preset:
Long Press: Double press:
Countdown-Over Preset:
Timed-Light-Over Presets:
diff --git a/wled00/html_settings.h b/wled00/html_settings.h index 1e7acf497..03ce35b93 100644 --- a/wled00/html_settings.h +++ b/wled00/html_settings.h @@ -323,9 +323,9 @@ Presets now also can be used as macros to save both JSON and HTTP API commands.
Just enter the preset id below! Use 0 for the default action instead of a preset
Alexa On/Off Preset:
Button short press Preset: Macro: -
Long Press: Double press:
Button short press Preset:
Long Press: Double press:
Countdown-Over Preset:
Timed-Light-Over Presets: