From 2dce4462a06005bbe8a0400cfd28df3626726ad6 Mon Sep 17 00:00:00 2001
From: Warren Spits <warren.spits@nab.com.au>
Date: Mon, 9 Dec 2019 23:16:16 +1100
Subject: [PATCH] Saving and loading of grouping and spacing.

---
 wled00/FX_fcn.cpp             |   2 ++
 wled00/data/settings_leds.htm | Bin 16312 -> 7982 bytes
 wled00/html_settings.h        |   5 +++--
 wled00/wled00.ino             |   1 +
 wled00/wled01_eeprom.ino      |   2 ++
 wled00/wled02_xml.ino         |   3 ++-
 wled00/wled03_set.ino         |   5 +++--
 wled00/wled05_init.ino        |   3 ++-
 wled00/wled19_json.ino        |  15 +++++++--------
 9 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 158a766c..3a39b01b 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -50,6 +50,8 @@ void WS2812FX::init(bool supportWhite, uint16_t countPixels, uint8_t group, uint
   _locked = new byte[_length];
   
   _segments[0].start = 0;
+  _segments[0].group = _group;
+  _segments[0].spacing = _spacing;
   _segments[0].stop = getUsableCount();
   _segments[0].rawLength = _length;
   
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 450512b0270776388ca3f5133829d469be188177..eb9774593584332f4a0e23e70d1617231e8f3041 100644
GIT binary patch
literal 7982
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
JKizBb{{UG%Wp@Ao

literal 16312
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
E2LcRZXaE2J

diff --git a/wled00/html_settings.h b/wled00/html_settings.h
index df1bd753..c0a4d644 100644
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@@ -151,8 +151,9 @@ Palette blending:
 </select><br>
 Reverse LED order (rotate 180): <input type=checkbox name=RV><br>
 Skip first LED: <input type=checkbox name=SL><br>
-Disable repeating N LEDs: <input type=number min=0 max=255 name=DL><br>
-(Turns off N LEDs between each lit one, spacing out effects)<hr>
+LED spacing: <input type=number min=0 max=255 name=SP><br>
+(Turns off N LEDs between each lit one, spacing out effects)<br>
+LED grouping: <input type=number min=1 max=255 name=GR><hr>
 <button type=button onclick=B()>Back</button><button type=submit>Save</button>
 </form></body></html>)=====";
 
diff --git a/wled00/wled00.ino b/wled00/wled00.ino
index 7052ee94..9e3d86cd 100644
--- a/wled00/wled00.ino
+++ b/wled00/wled00.ino
@@ -150,6 +150,7 @@ uint16_t transitionDelay = 750;               //default crossfade duration in ms
 //bool strip.reverseMode  = false;            //flip entire LED strip (reverses all effect directions) --> edit in WS2812FX.h
 bool skipFirstLed = false;                    //ignore first LED in strip (useful if you need the LED as signal repeater)
 uint8_t spacing = 0;                          //disables N LEDs between active nodes. (Useful for spacing out lights for more traditional christmas light look)
+uint8_t group = 1;                            //Group LEDs into one logical LED
 byte briMultiplier =  100;                    //% of brightness to set (to limit power, if you set it to 50 and set bri to 255, actual brightness will be 127)
 
 
diff --git a/wled00/wled01_eeprom.ino b/wled00/wled01_eeprom.ino
index 38ea7c41..1e3d26c8 100644
--- a/wled00/wled01_eeprom.ino
+++ b/wled00/wled01_eeprom.ino
@@ -230,6 +230,7 @@ void saveSettingsToEEPROM()
   }
 
   EEPROM.write(2213, spacing);
+  EEPROM.write(2214, group);
 
   writeStringToEEPROM(2220, blynkApiKey, 35);
 
@@ -481,6 +482,7 @@ void loadSettingsFromEEPROM(bool first)
   }
 
   spacing = EEPROM.read(2213);
+  group = max(1, EEPROM.read(2214));
 
   bootPreset = EEPROM.read(389);
   wifiLock = EEPROM.read(393);
diff --git a/wled00/wled02_xml.ino b/wled00/wled02_xml.ino
index 8303f7fd..5adbd900 100644
--- a/wled00/wled02_xml.ino
+++ b/wled00/wled02_xml.ino
@@ -237,7 +237,8 @@ void getSettingsJS(byte subPage, char* dest)
     sappend('i',"PB",strip.paletteBlend);
     sappend('c',"RV",strip.reverseMode);
     sappend('c',"SL",skipFirstLed);
-    sappend('v',"DL",spacing);
+    sappend('v',"SP",spacing);
+    sappend('v',"GR",group);
   }
 
   if (subPage == 3)
diff --git a/wled00/wled03_set.ino b/wled00/wled03_set.ino
index 21332ddd..9762ffba 100644
--- a/wled00/wled03_set.ino
+++ b/wled00/wled03_set.ino
@@ -93,7 +93,8 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
     if (t >= 0 && t < 4) strip.paletteBlend = t;
     strip.reverseMode = request->hasArg("RV");
     skipFirstLed = request->hasArg("SL");
-    spacing = request->arg("DL").toInt();
+    spacing = request->arg("SP").toInt();
+    group = request->arg("GR").toInt();
     t = request->arg("BF").toInt();
     if (t > 0) briMultiplier = t;
   }
@@ -274,7 +275,7 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
   }
   if (subPage != 6 || !doReboot) saveSettingsToEEPROM(); //do not save if factory reset
   if (subPage == 2) {
-    strip.init(useRGBW,ledCount,1,spacing,skipFirstLed);
+    strip.init(useRGBW,ledCount,group,spacing,skipFirstLed);
   }
   if (subPage == 4) alexaInit();
 }
diff --git a/wled00/wled05_init.ino b/wled00/wled05_init.ino
index 3559d7b6..32511be7 100644
--- a/wled00/wled05_init.ino
+++ b/wled00/wled05_init.ino
@@ -11,6 +11,7 @@ void wledInit()
   spacing = EEPROM.read(2213);
   //this was reading 255 after inital flash causing bootloop. Don't know why.
   spacing = spacing!= 255 ? spacing : 0;
+  group = max(1, EEPROM.read(2214));
 
   #ifdef ESP8266
   #if LEDPIN == 3
@@ -30,7 +31,7 @@ void wledInit()
   DEBUG_PRINT("heap ");
   DEBUG_PRINTLN(ESP.getFreeHeap());
 
-  strip.init(EEPROM.read(372),ledCount,1,spacing,EEPROM.read(2204)); //init LEDs quickly
+  strip.init(EEPROM.read(372),ledCount,group,spacing,EEPROM.read(2204)); //init LEDs quickly
   strip.setBrightness(0);
 
   DEBUG_PRINT("LEDs inited. heap usage ~");
diff --git a/wled00/wled19_json.ino b/wled00/wled19_json.ino
index 0d1b7d4b..cf3f6be8 100644
--- a/wled00/wled19_json.ino
+++ b/wled00/wled19_json.ino
@@ -8,14 +8,12 @@ void deserializeSegment(JsonObject elem, byte it)
   if (id < strip.getMaxSegments())
   {
     WS2812FX::Segment& seg = strip.getSegment(id);
-    uint16_t start = elem["start"] | seg.start;
-    int stop = elem["stop"] | -1;
+    uint16_t start = elem.containsKey("start") ? elem["start"] : seg.start;
+    uint16_t len = elem.containsKey("len") ? elem["len"] : seg.rawLength;
+    uint8_t group = max(1, elem["grp"] | seg.group);
+    uint8_t spacing = elem.containsKey("spc") ? elem["spc"] : seg.spacing;
 
-    if (stop < 0) {
-      uint16_t len = elem["len"];
-      stop = (len > 0) ? start + len : seg.stop;
-    }
-    strip.setSegment(id, start, stop, 1, 0);
+    strip.setSegment(id, start, len, group, spacing);
     
     JsonArray colarr = elem["col"];
     if (!colarr.isNull())
@@ -158,7 +156,7 @@ void serializeSegment(JsonObject& root, WS2812FX::Segment& seg, byte id)
 	root["id"] = id;
 	root["start"] = seg.start;
 	root["stop"] = seg.stop;
-	root["len"] = seg.stop - seg.start;
+	root["len"] = seg.rawLength;
 
 	JsonArray colarr = root.createNestedArray("col");
 
@@ -178,6 +176,7 @@ void serializeSegment(JsonObject& root, WS2812FX::Segment& seg, byte id)
 	root["pal"] = seg.palette;
 	root["sel"] = seg.isSelected();
   root["grp"] = seg.group;
+  root["spc"] = seg.spacing;
 	root["rev"] = seg.getOption(1);
 }