From b97b6dc144207bce7d41392c0c198b25c59f3558 Mon Sep 17 00:00:00 2001
From: cschwinne <dev.aircoookie@gmail.com>
Date: Tue, 23 Nov 2021 13:17:33 +0100
Subject: [PATCH 1/4] Remove F macro for "ps"

---
 wled00/cfg.cpp  | 4 ++--
 wled00/json.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp
index 20bcdbd8..a72af85b 100644
--- a/wled00/cfg.cpp
+++ b/wled00/cfg.cpp
@@ -220,7 +220,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
   CJSON(macroNl, light_nl["macro"]);
 
   JsonObject def = doc[F("def")];
-  CJSON(bootPreset, def[F("ps")]);
+  CJSON(bootPreset, def["ps"]);
   CJSON(turnOnAtBoot, def["on"]); // true
   CJSON(briS, def["bri"]); // 128
 
@@ -593,7 +593,7 @@ void serializeConfig() {
   light_nl["macro"] = macroNl;
 
   JsonObject def = doc.createNestedObject("def");
-  def[F("ps")] = bootPreset;
+  def["ps"] = bootPreset;
   def["on"] = turnOnAtBoot;
   def["bri"] = briS;
 
diff --git a/wled00/json.cpp b/wled00/json.cpp
index de40f561..1a546c79 100644
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@@ -429,7 +429,7 @@ void serializeState(JsonObject root, bool forPreset, bool includeBri, bool segme
   if (!forPreset) {
     if (errorFlag) root[F("error")] = errorFlag;
 
-    root[F("ps")] = (currentPreset > 0) ? currentPreset : -1;
+    root["ps"] = (currentPreset > 0) ? currentPreset : -1;
     root[F("pl")] = currentPlaylist;
 
     usermods.addToJsonState(root);

From 97b3c3db7b26b766cf4860336c2b9384876627e0 Mon Sep 17 00:00:00 2001
From: Blaz Kristan <blaz@kristan-sp.si>
Date: Tue, 23 Nov 2021 20:05:51 +0100
Subject: [PATCH 2/4] Incrementing & random effects, palettes via JSON.

---
 wled00/json.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/wled00/json.cpp b/wled00/json.cpp
index 1a546c79..a30aa68b 100644
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@@ -148,21 +148,21 @@ void deserializeSegment(JsonObject elem, byte it, byte presetId)
 
   //temporary, strip object gets updated via colorUpdated()
   if (id == strip.getMainSegmentId()) {
-    byte effectPrev = effectCurrent;
-    effectCurrent = elem["fx"] | effectCurrent;
-    if (!presetId && effectCurrent != effectPrev) unloadPlaylist(); //stop playlist if active and FX changed manually
+    if (getVal(elem["fx"], &effectCurrent, 1, strip.getModeCount())) { //load effect ('r' random, '~' inc/dec, 1-255 exact value)
+      if (!presetId) unloadPlaylist(); //stop playlist if active and FX changed manually
+    }
     effectSpeed = elem[F("sx")] | effectSpeed;
     effectIntensity = elem[F("ix")] | effectIntensity;
-    effectPalette = elem["pal"] | effectPalette;
+    getVal(elem["pal"], &effectPalette, 1, strip.getPaletteCount());
   } else { //permanent
-    byte fx = elem["fx"] | seg.mode;
-    if (fx != seg.mode && fx < strip.getModeCount()) {
+    byte fx = seg.mode;
+    if (getVal(elem["fx"], &fx, 1, strip.getModeCount())) { //load effect ('r' random, '~' inc/dec, 1-255 exact value)
       strip.setMode(id, fx);
       if (!presetId) unloadPlaylist(); //stop playlist if active and FX changed manually
     }
     seg.speed = elem[F("sx")] | seg.speed;
     seg.intensity = elem[F("ix")] | seg.intensity;
-    seg.palette = elem["pal"] | seg.palette;
+    getVal(elem["pal"], &seg.palette, 1, strip.getPaletteCount());
   }
 
   JsonArray iarr = elem[F("i")]; //set individual LEDs

From 37bd525638b5926e175409265a8b0b3a19993402 Mon Sep 17 00:00:00 2001
From: cschwinne <dev.aircoookie@gmail.com>
Date: Wed, 24 Nov 2021 11:04:50 +0100
Subject: [PATCH 3/4] Improve link contrast

---
 wled00/data/style.css  | 4 ++++
 wled00/html_settings.h | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/wled00/data/style.css b/wled00/data/style.css
index 06c2e8a3..0f0370f0 100644
--- a/wled00/data/style.css
+++ b/wled00/data/style.css
@@ -9,6 +9,10 @@ body {
 hr {
   border-color: #666;
 }
+a {
+  color: #58a6ff;
+  text-decoration: none;
+}
 button, .btn {
   background: #333;
   color: #fff;
diff --git a/wled00/html_settings.h b/wled00/html_settings.h
index 6326886c..1516883f 100644
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@@ -6,7 +6,7 @@
  */ 
 
 // Autogenerated from wled00/data/style.css, do not edit!!
-const char PAGE_settingsCss[] PROGMEM = R"=====(<style>body{font-family:Verdana,sans-serif;text-align:center;background:#222;color:#fff;line-height:200%%;margin:0}hr{border-color:#666}.btn,button{background:#333;color:#fff;font-family:Verdana,sans-serif;border:.3ch solid #333;display:inline-block;font-size:20px;margin:12px 8px 8px;padding:1px 6px;cursor:pointer;text-decoration:none}.lnk{border:0}.helpB{text-align:left;position:absolute;width:60px}input{background:#333;color:#fff;font-family:Verdana,sans-serif;border:.5ch solid #333}input:disabled{color:#888}input[type=number]{width:4em;margin:2px}input[type=number].xxl{width:100px}input[type=number].xl{width:85px}input[type=number].l{width:63px}input[type=number].m{width:56px}input[type=number].s{width:49px}input[type=number].xs{width:42px}input[type=checkbox]{transform:scale(1.5);margin-right:10px}select{background:#333;color:#fff;font-family:Verdana,sans-serif;border:.5ch solid #333}td{padding:2px}.d5{width:4.5em!important}#toast{opacity:0;background-color:#444;border-radius:5px;bottom:64px;color:#fff;font-size:17px;padding:16px;pointer-events:none;position:fixed;text-align:center;z-index:5;transform:translateX(-50%%);max-width:90%%;left:50%%}#toast.show{opacity:1;background-color:#264;animation:fadein .5s,fadein .5s 2.5s reverse}#toast.error{opacity:1;background-color:#b21;animation:fadein .5s}</style>)=====";
+const char PAGE_settingsCss[] PROGMEM = R"=====(<style>body{font-family:Verdana,sans-serif;text-align:center;background:#222;color:#fff;line-height:200%%;margin:0}hr{border-color:#666}a{color:#58a6ff;text-decoration:none}.btn,button{background:#333;color:#fff;font-family:Verdana,sans-serif;border:.3ch solid #333;display:inline-block;font-size:20px;margin:12px 8px 8px;padding:1px 6px;cursor:pointer;text-decoration:none}.lnk{border:0}.helpB{text-align:left;position:absolute;width:60px}input{background:#333;color:#fff;font-family:Verdana,sans-serif;border:.5ch solid #333}input:disabled{color:#888}input[type=number]{width:4em;margin:2px}input[type=number].xxl{width:100px}input[type=number].xl{width:85px}input[type=number].l{width:63px}input[type=number].m{width:56px}input[type=number].s{width:49px}input[type=number].xs{width:42px}input[type=checkbox]{transform:scale(1.5);margin-right:10px}select{background:#333;color:#fff;font-family:Verdana,sans-serif;border:.5ch solid #333}td{padding:2px}.d5{width:4.5em!important}#toast{opacity:0;background-color:#444;border-radius:5px;bottom:64px;color:#fff;font-size:17px;padding:16px;pointer-events:none;position:fixed;text-align:center;z-index:5;transform:translateX(-50%%);max-width:90%%;left:50%%}#toast.show{opacity:1;background-color:#264;animation:fadein .5s,fadein .5s 2.5s reverse}#toast.error{opacity:1;background-color:#b21;animation:fadein .5s}</style>)=====";
 
 
 // Autogenerated from wled00/data/settings.htm, do not edit!!

From 02fb2550d0d7459563cd927857935df65c0a3e57 Mon Sep 17 00:00:00 2001
From: cschwinne <dev.aircoookie@gmail.com>
Date: Wed, 24 Nov 2021 12:38:54 +0100
Subject: [PATCH 4/4] Shorter link color

---
 wled00/data/style.css  | 2 +-
 wled00/html_settings.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wled00/data/style.css b/wled00/data/style.css
index 0f0370f0..879b19b3 100644
--- a/wled00/data/style.css
+++ b/wled00/data/style.css
@@ -10,7 +10,7 @@ hr {
   border-color: #666;
 }
 a {
-  color: #58a6ff;
+  color: #28f;
   text-decoration: none;
 }
 button, .btn {
diff --git a/wled00/html_settings.h b/wled00/html_settings.h
index 1516883f..3a6406b5 100644
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@@ -6,7 +6,7 @@
  */ 
 
 // Autogenerated from wled00/data/style.css, do not edit!!
-const char PAGE_settingsCss[] PROGMEM = R"=====(<style>body{font-family:Verdana,sans-serif;text-align:center;background:#222;color:#fff;line-height:200%%;margin:0}hr{border-color:#666}a{color:#58a6ff;text-decoration:none}.btn,button{background:#333;color:#fff;font-family:Verdana,sans-serif;border:.3ch solid #333;display:inline-block;font-size:20px;margin:12px 8px 8px;padding:1px 6px;cursor:pointer;text-decoration:none}.lnk{border:0}.helpB{text-align:left;position:absolute;width:60px}input{background:#333;color:#fff;font-family:Verdana,sans-serif;border:.5ch solid #333}input:disabled{color:#888}input[type=number]{width:4em;margin:2px}input[type=number].xxl{width:100px}input[type=number].xl{width:85px}input[type=number].l{width:63px}input[type=number].m{width:56px}input[type=number].s{width:49px}input[type=number].xs{width:42px}input[type=checkbox]{transform:scale(1.5);margin-right:10px}select{background:#333;color:#fff;font-family:Verdana,sans-serif;border:.5ch solid #333}td{padding:2px}.d5{width:4.5em!important}#toast{opacity:0;background-color:#444;border-radius:5px;bottom:64px;color:#fff;font-size:17px;padding:16px;pointer-events:none;position:fixed;text-align:center;z-index:5;transform:translateX(-50%%);max-width:90%%;left:50%%}#toast.show{opacity:1;background-color:#264;animation:fadein .5s,fadein .5s 2.5s reverse}#toast.error{opacity:1;background-color:#b21;animation:fadein .5s}</style>)=====";
+const char PAGE_settingsCss[] PROGMEM = R"=====(<style>body{font-family:Verdana,sans-serif;text-align:center;background:#222;color:#fff;line-height:200%%;margin:0}hr{border-color:#666}a{color:#28f;text-decoration:none}.btn,button{background:#333;color:#fff;font-family:Verdana,sans-serif;border:.3ch solid #333;display:inline-block;font-size:20px;margin:12px 8px 8px;padding:1px 6px;cursor:pointer;text-decoration:none}.lnk{border:0}.helpB{text-align:left;position:absolute;width:60px}input{background:#333;color:#fff;font-family:Verdana,sans-serif;border:.5ch solid #333}input:disabled{color:#888}input[type=number]{width:4em;margin:2px}input[type=number].xxl{width:100px}input[type=number].xl{width:85px}input[type=number].l{width:63px}input[type=number].m{width:56px}input[type=number].s{width:49px}input[type=number].xs{width:42px}input[type=checkbox]{transform:scale(1.5);margin-right:10px}select{background:#333;color:#fff;font-family:Verdana,sans-serif;border:.5ch solid #333}td{padding:2px}.d5{width:4.5em!important}#toast{opacity:0;background-color:#444;border-radius:5px;bottom:64px;color:#fff;font-size:17px;padding:16px;pointer-events:none;position:fixed;text-align:center;z-index:5;transform:translateX(-50%%);max-width:90%%;left:50%%}#toast.show{opacity:1;background-color:#264;animation:fadein .5s,fadein .5s 2.5s reverse}#toast.error{opacity:1;background-color:#b21;animation:fadein .5s}</style>)=====";
 
 
 // Autogenerated from wled00/data/settings.htm, do not edit!!