A few more small fixes

Author: Aircoookie

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)

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

wled00/data/index.htm

@@ -1795,9 +1795,9 @@
 		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='<option value="0">Default</option>';
 		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 @@
 			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);

wled00/data/settings_time.htm

@@ -140,7 +140,7 @@ <h3>Macro presets</h3>
     Just enter the preset id below!</i>
 		<i>Use 0 for the default action instead of a preset</i><br>
 		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>
-		Button short press Preset: Macro: <input name="MP" type="number" min="0" max="250" required><br>
+		Button short press Preset: <input name="MP" type="number" min="0" max="250" required><br>
     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>	
 		Countdown-Over Preset: <input name="MC" type="number" min="0" max="250" required><br>
 		Timed-Light-Over Presets: <input name="MN" type="number" min="0" max="250" required><br>

wled00/html_settings.h

@@ -323,9 +323,9 @@ Presets now also can be used as macros to save both JSON and HTTP API commands.
 <br>Just enter the preset id below!</i> <i>
 Use 0 for the default action instead of a preset</i><br>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>Button short press Preset: Macro: 
-<input name="MP" type="number" min="0" max="250" required><br>Long Press: <input
- name="ML" type="number" min="0" max="250" required> Double press: <input 
+type="number" min="0" max="250" required><br>Button short press Preset: <input 
+name="MP" type="number" min="0" max="250" required><br>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>Countdown-Over Preset: 
 <input name="MC" type="number" min="0" max="250" required><br>
 Timed-Light-Over Presets: <input name="MN" type="number" min="0" max="250" 

wled00/html_ui.h

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

wled00/wled.h

@@ -418,9 +418,11 @@ void deEEP() {
             strip.getSegment(j).setOption(SEG_OPTION_ON, 1);
           }
         }
+        setValuesFromMainSeg();
         serializeState(pObj, true, false, true);
 
         strip.resetSegments();
+        setValuesFromMainSeg();
       }
     }