From 30b6fd8589a1cdcc89eaac8857f1dc6a54ec121e Mon Sep 17 00:00:00 2001
From: cschwinne <cschwinne@gmail.com>
Date: Mon, 18 Sep 2017 09:50:18 +0200
Subject: [PATCH] Added 5 new effects from current WS2812FX library

---
 wled00/WS2812FX.cpp | 222 ++++++++++++++++++++++++++++++++++++++++++++
 wled00/WS2812FX.h   |  29 ++++--
 wled00/htmls00.h    |   4 +-
 wled00/wled00.ino   |   2 +-
 4 files changed, 248 insertions(+), 9 deletions(-)

diff --git a/wled00/WS2812FX.cpp b/wled00/WS2812FX.cpp
index c32e02aad..f0f2fcd2b 100644
--- a/wled00/WS2812FX.cpp
+++ b/wled00/WS2812FX.cpp
@@ -1328,6 +1328,228 @@ void WS2812FX::mode_fade_down(void)
     _mode_delay = 100 + ((100 * (uint32_t)(SPEED_MAX - _speed)) / SPEED_MAX);
 }
 
+/*
+ * Lights all LEDs after each other up starting from the outer edges and
+ * finishing in the middle. Then turns them in reverse order off. Repeat.
+ */
+void WS2812FX::mode_dual_color_wipe_in_out(void) {
+  int end = _led_count - _counter_mode_step - 1;
+  bool odd = (_led_count % 2);
+  int mid = odd ? ((_led_count / 2) + 1) : (_led_count / 2);
+  if (_counter_mode_step < mid) {
+    if (!_locked[_counter_mode_step])
+    Adafruit_NeoPixel::setPixelColor(_counter_mode_step, _color);
+    if (!_locked[end])
+    Adafruit_NeoPixel::setPixelColor(end, _color);
+  }
+  else {
+    if (odd) {
+      // If odd, we need to 'double count' the center LED (once to turn it on,
+      // once to turn it off). So trail one behind after the middle LED.
+      if (!_locked[_counter_mode_step -1])
+      Adafruit_NeoPixel::setPixelColor(_counter_mode_step - 1, 0);
+      if (!_locked[end+1])
+      Adafruit_NeoPixel::setPixelColor(end + 1, 0);
+    } else {
+      if (!_locked[_counter_mode_step])
+      Adafruit_NeoPixel::setPixelColor(_counter_mode_step, 0);
+      if (!_locked[end])
+      Adafruit_NeoPixel::setPixelColor(end, 0);
+    }
+  }
+
+  _counter_mode_step++;
+  if (odd) {
+    if (_counter_mode_step > _led_count) {
+      _counter_mode_step = 0;
+    }
+  } else {
+    if (_counter_mode_step >= _led_count) {
+      _counter_mode_step = 0;
+    }
+  }
+
+  Adafruit_NeoPixel::show();
+
+  _mode_delay = 5 + ((50 * (uint32_t)(SPEED_MAX - _speed)) / _led_count);
+}
+
+/*
+ * Lights all LEDs after each other up starting from the outer edges and
+ * finishing in the middle. Then turns them in that order off. Repeat.
+ */
+void WS2812FX::mode_dual_color_wipe_in_in(void) {
+  bool odd = (_led_count % 2);
+  int mid = _led_count / 2;
+  if (odd) {
+    if (_counter_mode_step <= mid) {
+      if (!_locked[_counter_mode_step])
+      Adafruit_NeoPixel::setPixelColor(_counter_mode_step, _color);
+      if (!_locked[_led_count - _counter_mode_step - 1])
+      Adafruit_NeoPixel::setPixelColor(_led_count - _counter_mode_step - 1, _color);
+    } else {
+      int i = _counter_mode_step - mid;
+      if (!_locked[i-1])
+      Adafruit_NeoPixel::setPixelColor(i - 1, 0);
+      if (!_locked[_led_count - i])
+      Adafruit_NeoPixel::setPixelColor(_led_count - i, 0);
+    }
+  } else {
+    if (_counter_mode_step < mid) {
+      if (!_locked[_counter_mode_step])
+      Adafruit_NeoPixel::setPixelColor(_counter_mode_step, _color);
+      if (!_locked[_led_count - _counter_mode_step - 1])
+      Adafruit_NeoPixel::setPixelColor(_led_count - _counter_mode_step - 1, _color);
+    } else {
+      int i = _counter_mode_step - mid;
+      if (!_locked[i])
+      Adafruit_NeoPixel::setPixelColor(i, 0);
+      if (!_locked[_led_count - i -1])
+      Adafruit_NeoPixel::setPixelColor(_led_count - i - 1, 0);
+    }
+  }
+
+  _counter_mode_step++;
+  if (odd) {
+    if (_counter_mode_step > _led_count) {
+      _counter_mode_step = 0;
+    }
+  } else {
+    if (_counter_mode_step >= _led_count) {
+      _counter_mode_step = 0;
+    }
+  }
+
+  Adafruit_NeoPixel::show();
+
+  _mode_delay = 5 + ((50 * (uint32_t)(SPEED_MAX - _speed)) / _led_count);
+}
+
+/*
+ * Lights all LEDs after each other up starting from the middle and
+ * finishing at the edges. Then turns them in that order off. Repeat.
+ */
+void WS2812FX::mode_dual_color_wipe_out_out(void) {
+  int end = _led_count - _counter_mode_step - 1;
+  bool odd = (_led_count % 2);
+  int mid = _led_count / 2;
+
+  if (odd) {
+    if (_counter_mode_step <= mid) {
+      if (!_locked[mid + _counter_mode_step])
+      Adafruit_NeoPixel::setPixelColor(mid + _counter_mode_step, _color);
+      if (!_locked[mid - _counter_mode_step])
+      Adafruit_NeoPixel::setPixelColor(mid - _counter_mode_step, _color);
+    } else {
+      if (!_locked[_counter_mode_step -1])
+      Adafruit_NeoPixel::setPixelColor(_counter_mode_step - 1, 0);
+      if (!_locked[end +1])
+      Adafruit_NeoPixel::setPixelColor(end + 1, 0);
+    }
+  } else {
+    if (_counter_mode_step < mid) {
+      if (!_locked[mid - _counter_mode_step -1])
+      Adafruit_NeoPixel::setPixelColor(mid - _counter_mode_step - 1, _color);
+      if (!_locked[mid + _counter_mode_step])
+      Adafruit_NeoPixel::setPixelColor(mid + _counter_mode_step, _color);
+    } else {
+      if (!_locked[_counter_mode_step])
+      Adafruit_NeoPixel::setPixelColor(_counter_mode_step, 0);
+      if (!_locked[end])
+      Adafruit_NeoPixel::setPixelColor(end, 0);
+    }
+  }
+
+  _counter_mode_step++;
+  if (odd) {
+    if (_counter_mode_step > _led_count) {
+      _counter_mode_step = 0;
+    }
+  } else {
+    if (_counter_mode_step >= _led_count) {
+      _counter_mode_step = 0;
+    }
+  }
+
+  Adafruit_NeoPixel::show();
+
+  _mode_delay = 5 + ((50 * (uint32_t)(SPEED_MAX - _speed)) / _led_count);
+}
+
+/*
+ * Lights all LEDs after each other up starting from the middle and
+ * finishing at the edges. Then turns them in reverse order off. Repeat.
+ */
+void WS2812FX::mode_dual_color_wipe_out_in(void) {
+  bool odd = (_led_count % 2);
+  int mid = _led_count / 2;
+
+  if (odd) {
+    if (_counter_mode_step <= mid) {
+      if (!_locked[mid + _counter_mode_step])
+      Adafruit_NeoPixel::setPixelColor(mid + _counter_mode_step, _color);
+      if (!_locked[mid - _counter_mode_step])
+      Adafruit_NeoPixel::setPixelColor(mid - _counter_mode_step, _color);
+    } else {
+      int i = _counter_mode_step - mid;
+      if (!_locked[i -1])
+      Adafruit_NeoPixel::setPixelColor(i - 1, 0);
+      if (!_locked[_led_count - i])
+      Adafruit_NeoPixel::setPixelColor(_led_count - i, 0);
+    }
+  } else {
+    if (_counter_mode_step < mid) {
+      if (!_locked[mid - _counter_mode_step -1])
+      Adafruit_NeoPixel::setPixelColor(mid - _counter_mode_step - 1, _color);
+      if (!_locked[mid + _counter_mode_step])
+      Adafruit_NeoPixel::setPixelColor(mid + _counter_mode_step, _color);
+    } else {
+      int i = _counter_mode_step - mid;
+      if (!_locked[i])
+      Adafruit_NeoPixel::setPixelColor(i, 0);
+      if (!_locked[_led_count - i -1])
+      Adafruit_NeoPixel::setPixelColor(_led_count - i - 1, 0);
+    }
+  }
+
+  _counter_mode_step++;
+  if (odd) {
+    if (_counter_mode_step > _led_count) {
+      _counter_mode_step = 0;
+    }
+  } else {
+    if (_counter_mode_step >= _led_count) {
+      _counter_mode_step = 0;
+    }
+  }
+
+  Adafruit_NeoPixel::show();
+
+  _mode_delay = 5 + ((50 * (uint32_t)(SPEED_MAX - _speed)) / _led_count);
+}
+
+/*
+ * Alternating white/red/black pixels running.
+ */
+void WS2812FX::mode_circus_combustus(void) {
+  for(uint16_t i=0; i < _led_count; i++) {
+    if((i + _counter_mode_step) % 6 < 2) {
+      if (!_locked[i])
+      Adafruit_NeoPixel::setPixelColor(i, 255, 0, 0);
+    } else if((i + _counter_mode_step) % 6 < 4){
+      if (!_locked[i])
+      Adafruit_NeoPixel::setPixelColor(i, 255, 255, 255);
+    } else {
+      if (!_locked[i])
+      Adafruit_NeoPixel::setPixelColor(i, 0, 0, 0);
+    }
+  }
+  Adafruit_NeoPixel::show();
+
+  _counter_mode_step = (_counter_mode_step + 1) % 6;
+  _mode_delay = 100 + ((100 * (uint32_t)(SPEED_MAX - _speed)) / _led_count);
+}
+
 void WS2812FX::setIndividual(int i)
 {
   if (i >= 0 && i < _led_count)
diff --git a/wled00/WS2812FX.h b/wled00/WS2812FX.h
index 4aafb3018..886bff5d6 100644
--- a/wled00/WS2812FX.h
+++ b/wled00/WS2812FX.h
@@ -27,10 +27,7 @@
   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
-  CHANGELOG
-  2016-05-28   Initial beta release
-  2016-06-03   Code cleanup, minor improvements, new modes
-  2016-06-04   2 new fx, fixed setColor (now also resets _mode_color)
+  Modified to work with WLED - differs from Github WS2812FX
 */
 
 #ifndef WS2812FX_h
@@ -50,7 +47,7 @@
 #define BRIGHTNESS_MIN 0
 #define BRIGHTNESS_MAX 255
 
-#define MODE_COUNT 48
+#define MODE_COUNT 53
 
 #define FX_MODE_STATIC                   0
 #define FX_MODE_BLINK                    1
@@ -100,6 +97,11 @@
 #define FX_MODE_FIRE_FLICKER            45
 #define FX_MODE_FIRE_FLICKER_SOFT       46
 #define FX_MODE_FADE_DOWN               47
+#define FX_MODE_DUAL_COLOR_WIPE_IN_OUT  48
+#define FX_MODE_DUAL_COLOR_WIPE_IN_IN   49
+#define FX_MODE_DUAL_COLOR_WIPE_OUT_OUT 50
+#define FX_MODE_DUAL_COLOR_WIPE_OUT_IN  51
+#define FX_MODE_CIRCUS_COMBUSTUS        52
 
 class WS2812FX : public Adafruit_NeoPixel {
 
@@ -156,6 +158,11 @@ class WS2812FX : public Adafruit_NeoPixel {
       _mode[FX_MODE_FIRE_FLICKER]          = &WS2812FX::mode_fire_flicker;
       _mode[FX_MODE_FIRE_FLICKER_SOFT]     = &WS2812FX::mode_fire_flicker_soft;
       _mode[FX_MODE_FADE_DOWN]             = &WS2812FX::mode_fade_down;
+      _mode[FX_MODE_DUAL_COLOR_WIPE_IN_OUT]  = &WS2812FX::mode_dual_color_wipe_in_out;
+      _mode[FX_MODE_DUAL_COLOR_WIPE_IN_IN]   = &WS2812FX::mode_dual_color_wipe_in_in;
+      _mode[FX_MODE_DUAL_COLOR_WIPE_OUT_OUT] = &WS2812FX::mode_dual_color_wipe_out_out;
+      _mode[FX_MODE_DUAL_COLOR_WIPE_OUT_IN]  = &WS2812FX::mode_dual_color_wipe_out_in;
+      _mode[FX_MODE_CIRCUS_COMBUSTUS]        = &WS2812FX::mode_circus_combustus;
 
       _name[FX_MODE_STATIC]                = "Static";
       _name[FX_MODE_BLINK]                 = "Blink";
@@ -205,6 +212,11 @@ class WS2812FX : public Adafruit_NeoPixel {
       _name[FX_MODE_FIRE_FLICKER]          = "Fire Flicker";
       _name[FX_MODE_FIRE_FLICKER_SOFT]     = "Fire Flicker (soft)";
       _name[FX_MODE_FADE_DOWN]             = "Fade (Internal)";
+      _name[FX_MODE_DUAL_COLOR_WIPE_IN_OUT]    = "Dual Color Wipe In to Out";
+      _name[FX_MODE_DUAL_COLOR_WIPE_IN_IN]     = "Dual Color Wipe In to In";
+      _name[FX_MODE_DUAL_COLOR_WIPE_OUT_OUT]   = "Dual Color Wipe Out to Out";
+      _name[FX_MODE_DUAL_COLOR_WIPE_OUT_IN]    = "Dual Color Wipe Out to In";
+      _name[FX_MODE_CIRCUS_COMBUSTUS]          = "Circus Combustus";
 
       _mode_index = DEFAULT_MODE;
       _speed = DEFAULT_SPEED;
@@ -318,7 +330,12 @@ class WS2812FX : public Adafruit_NeoPixel {
       mode_fire_flicker(void),
       mode_fire_flicker_soft(void),
       mode_fire_flicker_int(int),
-      mode_fade_down(void);
+      mode_fade_down(void),
+      mode_dual_color_wipe_in_out(void),
+      mode_dual_color_wipe_in_in(void),
+      mode_dual_color_wipe_out_out(void),
+      mode_dual_color_wipe_out_in(void),
+      mode_circus_combustus(void);
 
     boolean
       _triggered,
diff --git a/wled00/htmls00.h b/wled00/htmls00.h
index 6339a7ebe..e7ffd017c 100644
--- a/wled00/htmls00.h
+++ b/wled00/htmls00.h
@@ -25,7 +25,7 @@ const char PAGE_index[] PROGMEM = R"=====(
 <html>
 <head><meta http-equiv=Content-Type content="text/html; charset=windows-1252">
 <title>WLED 0.3pd</title>
-<script>strA="";strR="";strG="";strB="";strNL="";strNR="";strNS="";strMD="";strFX="";strSX="";var nla=false;var nra=false;var nsa=false;var sto=false;var hsb=false;var fxa=false;var lastsx=0;function Startup(){document.getElementById("fxI").addEventListener("keypress",function(a){if(a.keyCode==13){a.preventDefault();GetFX()}});setInterval("GetArduinoIO()",5000);GetArduinoIO()}function GetArduinoIO(){nocache="&nocache="+Math.random()*1000000;var a=new XMLHttpRequest();a.onreadystatechange=function(){if(this.readyState==4){if(this.status==200){if(this.responseXML!=null){document.Ctrl_form.SA.value=this.responseXML.getElementsByTagName("act")[0].childNodes[0].nodeValue;document.Ctrl_form.SR.value=this.responseXML.getElementsByTagName("cl")[0].childNodes[0].nodeValue;document.Ctrl_form.SG.value=this.responseXML.getElementsByTagName("cl")[1].childNodes[0].nodeValue;document.Ctrl_form.SB.value=this.responseXML.getElementsByTagName("cl")[2].childNodes[0].nodeValue;if(document.activeElement!=document.getElementById("fxI")){document.Ctrl_form.TF.value=this.responseXML.getElementsByTagName("fx")[0].childNodes[0].nodeValue}document.Ctrl_form.SX.value=this.responseXML.getElementsByTagName("sx")[0].childNodes[0].nodeValue;nla=(this.responseXML.getElementsByTagName("nl")[0].innerHTML)!=0?true:false;nra=(this.responseXML.getElementsByTagName("nr")[0].innerHTML)!=0?true:false;nsa=(this.responseXML.getElementsByTagName("ns")[0].innerHTML)!=0?true:false;hsb=(this.responseXML.getElementsByTagName("md")[0].innerHTML)!=0?true:false;document.getElementsByClassName("desc")[0].innerHTML=this.responseXML.getElementsByTagName("desc")[0].innerHTML;UpdateVals()}}}};a.open("GET","win/"+strA+strR+strG+strB+strNL+strNR+strNS+strMD+strFX+strSX+nocache,true);a.send(null);strA="";strR="";strG="";strB="";strNL="";strNR="";strNS="";strMD="";strFX="";strSX=""}function GetCheck(){strA="&A="+Ctrl_form.SA.value;strR="&R="+Ctrl_form.SR.value;strG="&G="+Ctrl_form.SG.value;strB="&B="+Ctrl_form.SB.value;UpdateVals();GetArduinoIO()}function GetFX(){strFX="&FX="+Ctrl_form.TF.value;strSX="&SX="+Ctrl_form.SX.value;UpdateVals();GetArduinoIO()}function rgb2hex(d,c,a){var b=a|(c<<8)|(d<<16);return"#"+(16777216+b).toString(16).slice(1)}function lingrad(c,b,a){return"linear-gradient(white, "+rgb2hex(c,b,a)+")"}function UpdateVals(){document.body.style.background=lingrad(Ctrl_form.SR.value,Ctrl_form.SG.value,Ctrl_form.SB.value);setHS(Ctrl_form.SR.value,Ctrl_form.SG.value,Ctrl_form.SB.value);SetHSB();if(nla){nlb.style.fill="green"}else{nlb.style.fill="black"}if(nra){nrb.style.fill="green"}else{nrb.style.fill="black"}if(nsa){nsb.style.fill="green"}else{nsb.style.fill="black"}if(Ctrl_form.SA.value>0){tgb.style.fill="green"}else{tgb.style.fill="black"}}function ToggleT(){if(Ctrl_form.SA.value>0){strA="&T=0";Ctrl_form.SA.value=0}else{strA="&T=2"}UpdateVals();GetArduinoIO()}function ToggleFX(){fxa=!fxa;if(sto){CloseSettings()}SetFX()}function SwitchFX(a){document.Ctrl_form.TF.value=parseInt(document.Ctrl_form.TF.value)+a;if(document.Ctrl_form.TF.value<0){document.Ctrl_form.TF.value=0}if(document.Ctrl_form.TF.value>47){document.Ctrl_form.TF.value=47}GetFX()}function SetFX(){if(fxa){fxb.style.fill="green";document.getElementById("slA").style.display="none";document.getElementById("slR").style.display="none";document.getElementById("slG").style.display="none";document.getElementById("slB").style.display="none";document.getElementById("slH").style.display="none";document.getElementById("slS").style.display="none";document.getElementById("slX").style.display="block";document.getElementById("tlX").style.display="block"}else{fxb.style.fill="black";document.getElementById("slA").style.display="block";document.getElementById("slX").style.display="none";document.getElementById("tlX").style.display="none";SetHSB()}}function SetHSB(){if(fxa){return}if(hsb){document.getElementById("slR").style.display="none";document.getElementById("slG").style.display="none";document.getElementById("slB").style.display="none";document.getElementById("slH").style.display="block";document.getElementById("slS").style.display="block";mdb.style.fill="green"}else{document.getElementById("slR").style.display="block";document.getElementById("slG").style.display="block";document.getElementById("slB").style.display="block";document.getElementById("slH").style.display="none";document.getElementById("slS").style.display="none";mdb.style.fill="black"}}function ToggleHSB(){if(fxa){fxa=false;SetFX()}if(sto){CloseSettings()}hsb=!hsb;if(hsb){strMD="&MD=1"}else{strMD="&MD=0"}SetHSB()}function OpenSettings(){sto=true;stb.style.fill="green";cdB.style.display="none";stf.style.display="inline";stf.src="/settings"}function CloseSettings(){sto=false;stb.style.fill="black";cdB.style.display="inline";stf.style.display="none"}function ToggleSettings(){if(sto){CloseSettings()}else{OpenSettings()}}function ToggleNl(){nla=!nla;if(nla){strNL="&NL=1"}else{strNL="&NL=0"}UpdateVals();GetArduinoIO()}function ToggleNr(){nra=!nra;if(nra){strNR="&RN=1"}else{strNR="&RN=0"}UpdateVals();GetArduinoIO()}function ToggleNs(){nsa=!nsa;if(nsa){strNS="&SN=1"}else{strNS="&SN=0"}UpdateVals();GetArduinoIO()}function setHS(){var d,j,i,a=arguments[0]/255,f=arguments[1]/255,k=arguments[2]/255,e,n,m=Math.max(a,f,k),l=m-Math.min(a,f,k),c=function(b){return(m-b)/6/l+1/2};if(l==0){e=n=0}else{n=l/m;d=c(a);j=c(f);i=c(k);if(a===m){e=i-j}else{if(f===m){e=(1/3)+d-i}else{if(k===m){e=(2/3)+j-d}}}if(e<0){e+=1}else{if(e>1){e-=1}}}document.Ctrl_form.SH.value=e;document.Ctrl_form.SS.value=n}function GetRGB(){var a,k,m,e,l,d,c,o;var j=document.Ctrl_form.SH.value,u=document.Ctrl_form.SS.value,n=255;e=Math.floor(j*6);l=j*6-e;d=n*(1-u);c=n*(1-l*u);o=n*(1-(1-l)*u);switch(e%6){case 0:a=n,k=o,m=d;break;case 1:a=c,k=n,m=d;break;case 2:a=d,k=n,m=o;break;case 3:a=d,k=c,m=n;break;case 4:a=o,k=d,m=n;break;case 5:a=n,k=d,m=c;break}document.Ctrl_form.SR.value=a;document.Ctrl_form.SG.value=k;document.Ctrl_form.SB.value=m;GetCheck()};</script>
+<script>strA="";strR="";strG="";strB="";strNL="";strNR="";strNS="";strMD="";strFX="";strSX="";var nla=false;var nra=false;var nsa=false;var sto=false;var hsb=false;var fxa=false;var lastsx=0;function Startup(){document.getElementById("fxI").addEventListener("keypress",function(a){if(a.keyCode==13){a.preventDefault();GetFX()}});setInterval("GetArduinoIO()",5000);GetArduinoIO()}function GetArduinoIO(){nocache="&nocache="+Math.random()*1000000;var a=new XMLHttpRequest();a.onreadystatechange=function(){if(this.readyState==4){if(this.status==200){if(this.responseXML!=null){document.Ctrl_form.SA.value=this.responseXML.getElementsByTagName("act")[0].childNodes[0].nodeValue;document.Ctrl_form.SR.value=this.responseXML.getElementsByTagName("cl")[0].childNodes[0].nodeValue;document.Ctrl_form.SG.value=this.responseXML.getElementsByTagName("cl")[1].childNodes[0].nodeValue;document.Ctrl_form.SB.value=this.responseXML.getElementsByTagName("cl")[2].childNodes[0].nodeValue;if(document.activeElement!=document.getElementById("fxI")){document.Ctrl_form.TF.value=this.responseXML.getElementsByTagName("fx")[0].childNodes[0].nodeValue}document.Ctrl_form.SX.value=this.responseXML.getElementsByTagName("sx")[0].childNodes[0].nodeValue;nla=(this.responseXML.getElementsByTagName("nl")[0].innerHTML)!=0?true:false;nra=(this.responseXML.getElementsByTagName("nr")[0].innerHTML)!=0?true:false;nsa=(this.responseXML.getElementsByTagName("ns")[0].innerHTML)!=0?true:false;hsb=(this.responseXML.getElementsByTagName("md")[0].innerHTML)!=0?true:false;document.getElementsByClassName("desc")[0].innerHTML=this.responseXML.getElementsByTagName("desc")[0].innerHTML;UpdateVals()}}}};a.open("GET","win/"+strA+strR+strG+strB+strNL+strNR+strNS+strMD+strFX+strSX+nocache,true);a.send(null);strA="";strR="";strG="";strB="";strNL="";strNR="";strNS="";strMD="";strFX="";strSX=""}function GetCheck(){strA="&A="+Ctrl_form.SA.value;strR="&R="+Ctrl_form.SR.value;strG="&G="+Ctrl_form.SG.value;strB="&B="+Ctrl_form.SB.value;UpdateVals();GetArduinoIO()}function GetFX(){strFX="&FX="+Ctrl_form.TF.value;strSX="&SX="+Ctrl_form.SX.value;UpdateVals();GetArduinoIO()}function rgb2hex(d,c,a){var b=a|(c<<8)|(d<<16);return"#"+(16777216+b).toString(16).slice(1)}function lingrad(c,b,a){return"linear-gradient(white, "+rgb2hex(c,b,a)+")"}function UpdateVals(){document.body.style.background=lingrad(Ctrl_form.SR.value,Ctrl_form.SG.value,Ctrl_form.SB.value);setHS(Ctrl_form.SR.value,Ctrl_form.SG.value,Ctrl_form.SB.value);SetHSB();if(nla){nlb.style.fill="green"}else{nlb.style.fill="black"}if(nra){nrb.style.fill="green"}else{nrb.style.fill="black"}if(nsa){nsb.style.fill="green"}else{nsb.style.fill="black"}if(Ctrl_form.SA.value>0){tgb.style.fill="green"}else{tgb.style.fill="black"}}function ToggleT(){if(Ctrl_form.SA.value>0){strA="&T=0";Ctrl_form.SA.value=0}else{strA="&T=2"}UpdateVals();GetArduinoIO()}function ToggleFX(){fxa=!fxa;if(sto){CloseSettings()}SetFX()}function SwitchFX(a){document.Ctrl_form.TF.value=parseInt(document.Ctrl_form.TF.value)+a;if(document.Ctrl_form.TF.value<0){document.Ctrl_form.TF.value=0}if(document.Ctrl_form.TF.value>52){document.Ctrl_form.TF.value=52}GetFX()}function SetFX(){if(fxa){fxb.style.fill="green";document.getElementById("slA").style.display="none";document.getElementById("slR").style.display="none";document.getElementById("slG").style.display="none";document.getElementById("slB").style.display="none";document.getElementById("slH").style.display="none";document.getElementById("slS").style.display="none";document.getElementById("slX").style.display="block";document.getElementById("tlX").style.display="block"}else{fxb.style.fill="black";document.getElementById("slA").style.display="block";document.getElementById("slX").style.display="none";document.getElementById("tlX").style.display="none";SetHSB()}}function SetHSB(){if(fxa){return}if(hsb){document.getElementById("slR").style.display="none";document.getElementById("slG").style.display="none";document.getElementById("slB").style.display="none";document.getElementById("slH").style.display="block";document.getElementById("slS").style.display="block";mdb.style.fill="green"}else{document.getElementById("slR").style.display="block";document.getElementById("slG").style.display="block";document.getElementById("slB").style.display="block";document.getElementById("slH").style.display="none";document.getElementById("slS").style.display="none";mdb.style.fill="black"}}function ToggleHSB(){if(fxa){fxa=false;SetFX()}if(sto){CloseSettings()}hsb=!hsb;if(hsb){strMD="&MD=1"}else{strMD="&MD=0"}SetHSB()}function OpenSettings(){sto=true;stb.style.fill="green";cdB.style.display="none";stf.style.display="inline";stf.src="/settings"}function CloseSettings(){sto=false;stb.style.fill="black";cdB.style.display="inline";stf.style.display="none"}function ToggleSettings(){if(sto){CloseSettings()}else{OpenSettings()}}function ToggleNl(){nla=!nla;if(nla){strNL="&NL=1"}else{strNL="&NL=0"}UpdateVals();GetArduinoIO()}function ToggleNr(){nra=!nra;if(nra){strNR="&RN=1"}else{strNR="&RN=0"}UpdateVals();GetArduinoIO()}function ToggleNs(){nsa=!nsa;if(nsa){strNS="&SN=1"}else{strNS="&SN=0"}UpdateVals();GetArduinoIO()}function setHS(){var d,j,i,a=arguments[0]/255,f=arguments[1]/255,k=arguments[2]/255,e,n,m=Math.max(a,f,k),l=m-Math.min(a,f,k),c=function(b){return(m-b)/6/l+1/2};if(l==0){e=n=0}else{n=l/m;d=c(a);j=c(f);i=c(k);if(a===m){e=i-j}else{if(f===m){e=(1/3)+d-i}else{if(k===m){e=(2/3)+j-d}}}if(e<0){e+=1}else{if(e>1){e-=1}}}document.Ctrl_form.SH.value=e;document.Ctrl_form.SS.value=n}function GetRGB(){var a,k,m,e,l,d,c,o;var j=document.Ctrl_form.SH.value,u=document.Ctrl_form.SS.value,n=255;e=Math.floor(j*6);l=j*6-e;d=n*(1-u);c=n*(1-l*u);o=n*(1-(1-l)*u);switch(e%6){case 0:a=n,k=o,m=d;break;case 1:a=c,k=n,m=d;break;case 2:a=d,k=n,m=o;break;case 3:a=d,k=c,m=n;break;case 4:a=o,k=d,m=n;break;case 5:a=n,k=d,m=c;break}document.Ctrl_form.SR.value=a;document.Ctrl_form.SG.value=k;document.Ctrl_form.SB.value=m;GetCheck()};</script>
 <style>.ctrl_box{border:.3ch solid grey;margin:auto;width:80vw;background-color:#b9b9b9;position:absolute;top:60%;left:50%;transform:translate(-50%,-50%)}.sliders{width:100%;height:12vh;margin-top:2vh}.sliderA{margin-left:auto;margin-right:auto;width:77vw;background:linear-gradient(to right,black,yellow)}.sliderR{margin-left:auto;margin-right:auto;margin-top:2vh;width:77vw;background:linear-gradient(to right,black,red)}.sliderG{margin-left:auto;margin-right:auto;margin-top:2vh;width:77vw;background:linear-gradient(to right,black,green)}.sliderB{margin-left:auto;margin-right:auto;margin-top:2vh;width:77vw;background:linear-gradient(to right,black,blue)}.sliderH{display:none;margin-left:auto;margin-right:auto;margin-top:2vh;width:77vw;background:linear-gradient(to right,red,orange,yellow,green,cyan,blue,violet,red)}.sliderS{display:none;margin-left:auto;margin-right:auto;margin-top:2vh;width:77vw;background:linear-gradient(to right,grey,green)}.toolsFX{display:none;margin-left:auto;margin-right:auto;margin-top:2vh;width:77vw}.sliderX{display:none;margin-left:auto;margin-right:auto;margin-top:2vh;width:77vw;background:linear-gradient(to right,black,white)}body{text-align:center;background:linear-gradient(white,black);height:100%;margin:0;background-repeat:no-repeat;background-attachment:fixed}html{height:100%}iframe{display:none;margin:auto;width:80vw;height:50vh;position:absolute;top:60%;left:50%;transform:translate(-50%,-50%)}svg{width:12vw;height:10vmin}input[type=range]{-webkit-appearance:none;margin:-4px 0}input[type=range]:focus{outline:0}input[type=range]::-webkit-slider-runnable-track{width:100%;height:12vh;cursor:pointer;background:#ddd}input[type=range]::-webkit-slider-thumb{height:10vh;width:10vh;background:#fff;cursor:pointer;-webkit-appearance:none;margin-top:1vh}input[type=range]::-moz-range-track{width:100%;height:12vh;cursor:pointer;background:#ddd}input[type=range]::-moz-range-thumb{height:10vh;width:10vh;background:#fff;cursor:pointer;margin-top:1vh}input[type=range]::-ms-track{width:100%;height:12vh;cursor:pointer;background:transparent;border-color:transparent;color:transparent}input[type=range]::-ms-fill-lower{background:#ddd}input[type=range]::-ms-fill-upper{background:#ddd}input[type=range]::-ms-thumb{width:10vh;background:#fff;cursor:pointer;height:10vh}</style>
 <style id=holderjs-style type=text/css></style></head>
 <body onload=Startup() class=__plain_text_READY__>
@@ -98,7 +98,7 @@ const char PAGE_index[] PROGMEM = R"=====(
 <svg id=for onclick=SwitchFX(-1)><use xlink:href=#icon-circle-left></use></svg>
 <svg id=fmf onclick=SwitchFX(1)><use xlink:href=#icon-circle-right></use></svg>
 <svg id=fof onclick=SwitchFX(10)><use xlink:href=#icon-forward3></use></svg>
-<br><input id=fxI name=TF type=number value=0 min=0 max=47 step=1 onchange=GetFX()>
+<br><input id=fxI name=TF type=number value=0 min=0 max=52 step=1 onchange=GetFX()>
 </div>
 <div id=slX class=sliderX>
 <input type=range title="Effect Speed" class=sliders name=SX value=0 min=0 max=255 step=1 onchange=GetFX()> </div> <br>
diff --git a/wled00/wled00.ino b/wled00/wled00.ino
index dd9cec05b..3b1321a0a 100644
--- a/wled00/wled00.ino
+++ b/wled00/wled00.ino
@@ -20,7 +20,7 @@
 #include "CallbackFunction.h"
 
 //version in format yymmddb (b = daily build)
-#define VERSION 1706270
+#define VERSION 1709181
 
 //to toggle usb serial debug (un)comment following line
 //#define DEBUG