Release of v0.6.3

Added Preset Cycle feature
Added Transition Time API call
Added Adalight serial ambilight protocol
Added DRGB and DRGBW UDP direct-drive protocols
Improved transition flickering
Easter eggs are eaten now

bin/readme.md

@@ -1,22 +1,7 @@
-### Where are the new binaries?
+## Where are the new binaries?
 
 From v0.5.0 on forward, the GitHub [releases](https://github.com/Aircoookie/WLED/releases) system will be used for binaries.
 
 ### What binary should I choose?
 
-Currently WLED supports the ESP8266 and a very early, experimental version of ESP32 support.
-Be sure to choose the correct binary for your platform and LED type.
-
-- Do you have a standard RGB WS2812B NeoPixel strip?
-	--> Use wled05dev_XXXXXXX_RGB_PLATFORM.bin
-	
-- Do you have an RGBW SK6812 strip (half of the LED is white)?
-	--> Use wled05dev_XXXXXXX_RGBW_PLATFORM.bin
-	
-- Do you have a Cronixie clock set by Diamex?
-	--> Use wled05dev_XXXXXXX_CRONIXIE_PLATFORM.bin
-	
-	
-### What about wled03 and wled04?
-
-These are legacy releases only for the ESP8266. They don't include the latest features and may have unfixed bugs - only use them if the new wled05dev test builds don't work for you!
+You should always try to use the binaries from the release page. This directory is for legacy purposes only!

readme.md

@@ -1,9 +1,8 @@
 ## Welcome to my project WLED!
 
-WLED is a fast and (relatively) secure implementation of an ESP8266 webserver to control NeoPixel (WS2812B) LEDs!
-Now also with experimental ESP32 support.
+WLED is a fast and (relatively) secure implementation of an ESP8266/ESP32 webserver to control NeoPixel (WS2812B) LEDs!
 
-### Features: (V0.6.0)
+### Features: (V0.6.3)
 - RGB, HSB, and brightness sliders
 - Settings page - configuration over network
 - Access Point and station mode - automatic failsafe AP
@@ -12,18 +11,19 @@ Now also with experimental ESP32 support.
 - Alexa smart home device server (including dimming)
 - Beta syncronization to Philips hue lights
 - Support for RGBW strips
-- 25 user presets! Save your favorite colors and effects and apply them easily!
+- 25 user presets! Save your favorite colors and effects and apply them easily! Now supports cycling through them.
 - HTTP request API for simple integration
 - Macro functions to automatically execute API calls
 - Nightlight function (gradually dims down)
 - Notifier function (multiple ESPs sync color via UDP broadcast)
 - Support for power pushbutton
 - Custom Theater Chase
+- Support for the Adalight serial ambilight protocol!
 - Full OTA software update capability (HTTP and ArduinoOTA)
 - Password protected OTA page for added security (OTA lock)
 - NTP and configurable analog clock function
 - Support for the Cronixie Clock kit by Diamex
-- Realtime UDP Packet Control (WARLS) possible
+- Realtime UDP Packet Control (WARLS, DRGB, DRGBW) possible
 - Client HTML UI controlled, customizable themes
 
 ### Quick start guide and documentation:

wled00/WS2812FX.cpp

@@ -66,6 +66,7 @@ void WS2812FX::start() {
   _counter_mode_step = 0;
   _mode_last_call_time = 0;
   _running = true;
+  show();
 }
 
 void WS2812FX::stop() {
@@ -79,16 +80,14 @@ void WS2812FX::setMode(byte m) {
   _mode_last_call_time = 0;
   _mode_index = constrain(m, 0, MODE_COUNT-1);
   _mode_color = _color;
+  _mode_var1 = 0;
   setBrightness(_brightness);
   strip_off_respectLock();
 }
 
 void WS2812FX::setSpeed(byte s) {
-  _counter_mode_call = 0;
-  _counter_mode_step = 0;
   _mode_last_call_time = 0;
   _speed = constrain(s, SPEED_MIN, SPEED_MAX);
-  strip_off_respectLock();
 }
 
 void WS2812FX::increaseSpeed(byte s) {
@@ -131,7 +130,6 @@ void WS2812FX::setColor(uint32_t c) {
 
 void WS2812FX::setSecondaryColor(uint32_t c) {
   _color_sec = c;
-  _mode_color_sec = _color;
   if (_cronixieMode) _cronixieSecMultiplier = getSafePowerMultiplier(900, 100, c, _brightness);
   setBrightness(_brightness);
 }
@@ -322,31 +320,35 @@ void WS2812FX::mode_random_color(void) {
 
 
 /*
- * Lights every LED in a random color. Changes one random LED after the other
- * to another random color.
+ * Lights some pastel colors
  */
-void WS2812FX::mode_single_dynamic(void) {
-  if(_counter_mode_call == 0) {
-    for(uint16_t i=0; i < _led_count; i++) {
-      if (!_locked[i])
-      setPixelColor(i, color_wheel(random(256)));
-    }
-  }
-  int ran = random(_led_count);
-  if (!_locked[ran])
-  setPixelColor(ran, color_wheel(random(256)));
-  show();
-  _mode_delay = 10 + ((5000 * (uint32_t)(SPEED_MAX - _speed)) / SPEED_MAX);
+void WS2812FX::mode_easter(void) {
+  //uint32_t cols[]{0x00F7ECC5,0x00F8D5C7,0x00F9E2E7,0x00BED9D4,0x00F7ECC5,0x00F8D5C7,0x00F9E2E7};
+  uint32_t cols[]{0x00FF8040,0x00E5D241,0x0077FF77,0x0077F0F0,0x00FF8040,0x00E5D241,0x0077FF77};
+  mode_colorful_internal(cols);
 }
 
 
 /*
  * Lights multiple random leds in a random color (higher intensity, more updates)
  */
-void WS2812FX::mode_multi_dynamic(void) {
-  for(uint16_t i=0; i < _led_count; i++) {
-    if (!_locked[i] && random(256)<=_intensity)
-    setPixelColor(i, color_wheel(random(256)));
+void WS2812FX::mode_dynamic(void) {
+  if(_counter_mode_call == 0) {
+    for(uint16_t i=0; i < _led_count; i++) {
+      if (!_locked[i])
+      setPixelColor(i, color_wheel(random(256)));
+    }
+  }
+  if (_intensity > 0) //multi dynamic
+  {
+    for(uint16_t i=0; i < _led_count; i++) {
+      if (!_locked[i] && random(256)<_intensity)
+      setPixelColor(i, color_wheel(random(256)));
+    }
+  } else { //single dynamic
+    int ran = random(_led_count);
+    if (!_locked[ran])
+    setPixelColor(ran, color_wheel(random(256)));
   }
   show();
   _mode_delay = 100 + ((5000 * (uint32_t)(SPEED_MAX - _speed)) / SPEED_MAX);
@@ -625,7 +627,7 @@ void WS2812FX::mode_twinkle_fade(void) {
     setPixelColor(i, px_r, px_g, px_b, px_w);
   }
 
-  if(random(3) == 0) {
+  if(random(256) < _intensity) {
     int ran = random(_led_count);
     if (!_locked[ran])
     setPixelColor(ran, _mode_color);
@@ -673,7 +675,7 @@ void WS2812FX::mode_flash_sparkle(void) {
     setPixelColor(i, _color);
   }
 
-  if(random(10) == 7) {
+  if(random(256) <= _intensity) {
     int ran = random(_led_count);
     if (!_locked[ran])
     setPixelColor(ran , _color_sec);
@@ -696,7 +698,7 @@ void WS2812FX::mode_hyper_sparkle(void) {
     setPixelColor(i, _color);
   }
 
-  if(random(10) < 4) {
+  if(random(256) <= _intensity) {
     for(uint16_t i=0; i < maxval(1, _led_count/3); i++) {
       int ran = random(_led_count);
       if (!_locked[ran])
@@ -802,9 +804,64 @@ void WS2812FX::mode_blink_rainbow(void) {
 
 
 /*
- * _color running on _color_sec.
+ * Android loading circle
  */
-void WS2812FX::mode_chase_white(void) {
+void WS2812FX::mode_android(void) {
+  if (_counter_mode_call == 0) _mode_color = 0; //we use modecolor as bool
+  for(uint16_t i=0; i < _led_count; i++) {
+    if (!_locked[i])
+    setPixelColor(i, _color_sec);
+  }
+
+  uint16_t a = _counter_mode_step;
+  if (_mode_var1 > ((float)_intensity/255.0)*(float)_led_count)
+  {
+    _mode_color = 1;
+  } else
+  {
+    if (_mode_var1 < 2) _mode_color = 0;
+  }
+  
+  if (_mode_color == 0)
+  {
+    if (_counter_mode_call %3 == 1) {a++;}
+    else {_mode_var1++;}
+  } else
+  {
+    a++;
+    if (_counter_mode_call %3 != 1) _mode_var1--;
+  }
+  
+  if (a >= _led_count) a = 0;
+
+  if (a +_mode_var1  <= _led_count)
+  {
+    for(int i = a; i < a+_mode_var1; i++) {
+      if (!_locked[i])
+      setPixelColor(i, _color);
+    }
+  } else
+  {
+    for(int i = a; i < _led_count; i++) {
+      if (!_locked[i])
+      setPixelColor(i, _color);
+    }
+    for(int i = 0; i < _mode_var1 - (_led_count - a); i++) {
+      if (!_locked[i])
+      setPixelColor(i, _color);
+    }
+  }
+  _counter_mode_step = a;
+  
+  show();
+  _mode_delay = 3 + ((8 * (uint32_t)(SPEED_MAX - _speed)) / _led_count);
+}
+
+
+/*
+ * _color_sec running on _color.
+ */
+void WS2812FX::mode_chase_color(void) {
   for(uint16_t i=0; i < _led_count; i++) {
     if (!_locked[i])
     setPixelColor(i, _color_sec);
@@ -823,28 +880,6 @@ void WS2812FX::mode_chase_white(void) {
 }
 
 
-/*
- * _color_sec running on _color.
- */
-void WS2812FX::mode_chase_color(void) {
-  for(uint16_t i=0; i < _led_count; i++) {
-    if (!_locked[i])
-    setPixelColor(i, _color);
-  }
-
-  uint16_t n = _counter_mode_step;
-  uint16_t m = (_counter_mode_step + 1) % _led_count;
-  if (!_locked[n])
-  setPixelColor(n, _color_sec);
-  if (!_locked[m])
-  setPixelColor(m, _color_sec);
-  show();
-
-  _counter_mode_step = (_counter_mode_step + 1) % _led_count;
-  _mode_delay = 10 + ((30 * (uint32_t)(SPEED_MAX - _speed)) / _led_count);
-}
-
-
 /*
  * color_sec running followed by random color.
  */
@@ -991,14 +1026,20 @@ void WS2812FX::mode_chase_rainbow_white(void) {
   _mode_delay = 10 + ((30 * (uint32_t)(SPEED_MAX - _speed)) / _led_count);
 }
 
-
 /*
  * Red - Amber - Green - Blue lights running
  */
 void WS2812FX::mode_colorful(void) {
   uint32_t cols[]{0x00FF0000,0x00EEBB00,0x0000EE00,0x000077CC,0x00FF0000,0x00EEBB00,0x0000EE00};
+  mode_colorful_internal(cols);
+}
+
+/*
+ * Common function for 4-color-running (Colorful, easter)
+ */
+void WS2812FX::mode_colorful_internal(uint32_t cols[]) {
   int i = 0;
-  for (i; i < _led_count-3 ; i+=4)
+  for (i; i < _led_count ; i+=4)
   {
     if(!_locked[i])setPixelColor(i, cols[_counter_mode_step]);
     if(!_locked[i+1])setPixelColor(i+1, cols[_counter_mode_step+1]);
@@ -1024,7 +1065,7 @@ void WS2812FX::mode_colorful(void) {
   show();
   if (_speed > SPEED_MIN) _counter_mode_step++; //static if lowest speed
   if (_counter_mode_step >3) _counter_mode_step = 0;
-  _mode_delay = 100 + (25 * (uint32_t)(SPEED_MAX - _speed));
+  _mode_delay = 50 + (15 * (uint32_t)(SPEED_MAX - _speed));
 }
 
 
@@ -1315,27 +1356,17 @@ void WS2812FX::mode_merry_christmas(void) {
   _mode_delay = 50 + ((75 * (uint32_t)(SPEED_MAX - _speed)) / _led_count);
 }
 
+
 /*
  * Random flickering.
  */
-void WS2812FX::mode_fire_flicker(void) {
-   mode_fire_flicker_int(3);
-}
-
-/*
- * Random flickering, less intesity.
- */
-void WS2812FX::mode_fire_flicker_soft(void) {
-   mode_fire_flicker_int(6);
-}
-
-void WS2812FX::mode_fire_flicker_int(int rev_intensity)
+void WS2812FX::mode_fire_flicker(void)
 {
     byte p_w = (_color & 0xFF000000) >> 24;
     byte p_r = (_color & 0x00FF0000) >> 16;
     byte p_g = (_color & 0x0000FF00) >>  8;
     byte p_b = (_color & 0x000000FF) >>  0;
-    byte flicker_val = maxval(p_r,maxval(p_g, maxval(p_b, p_w)))/rev_intensity;
+    byte flicker_val = maxval(p_r,maxval(p_g, maxval(p_b, p_w)))/(((256-_intensity)/16)+1);
     for(uint16_t i=0; i < _led_count; i++)
     {
       int flicker = random(0,flicker_val);
@@ -1351,30 +1382,90 @@ void WS2812FX::mode_fire_flicker_int(int rev_intensity)
       setPixelColor(i,r1,g1,b1,w1);
     }
     show();
-    _mode_delay = 10 + ((500 * (uint32_t)(SPEED_MAX - _speed)) / SPEED_MAX);
+    _mode_delay = 10 + ((400 * (uint32_t)(SPEED_MAX - _speed)) / SPEED_MAX);
 }
 
-void WS2812FX::mode_fade_down(void)
-{
-   for(uint16_t i=0; i < _led_count; i++) {
-      uint32_t px_rgb = getPixelColor(i);
+/*
+ * Gradient run
+ */
+void WS2812FX::mode_gradient(void) {
+   byte p_w = (_color & 0xFF000000) >> 24;
+   byte p_r = (_color & 0x00FF0000) >> 16;
+   byte p_g = (_color & 0x0000FF00) >>  8;
+   byte p_b = (_color & 0x000000FF) >>  0;
+   byte p_w2 = (_color_sec & 0xFF000000) >> 24;
+   byte p_r2 = (_color_sec & 0x00FF0000) >> 16;
+   byte p_g2 = (_color_sec & 0x0000FF00) >>  8;
+   byte p_b2 = (_color_sec & 0x000000FF) >>  0;
+   byte nw,nr,ng,nb;
+   float per,val; //0.0 = sec 1.0 = pri
+   float brd = _intensity/2; if (brd <1.0) brd = 1.0;
+   int pp = _counter_mode_step;
+   int p1 = pp-_led_count;
+   int p2 = pp+_led_count;
 
-      byte px_w = (px_rgb & 0xFF000000) >> 24;
-      byte px_r = (px_rgb & 0x00FF0000) >> 16;
-      byte px_g = (px_rgb & 0x0000FF00) >>  8;
-      byte px_b = (px_rgb & 0x000000FF) >>  0;
-  
-      // fade out (divide by 2)
-      px_w = px_w >> 1;
-      px_r = px_r >> 1;
-      px_g = px_g >> 1;
-      px_b = px_b >> 1;
-      if (!_locked[i])
-      setPixelColor(i, px_r, px_g, px_b, px_w);
-    } 
-    show();
+   for(uint16_t i=0; i < _led_count; i++)
+   {
+     if (!_locked[i])
+     {
+       val = minval(abs(pp-i),minval(abs(p1-i),abs(p2-i)));
+       per = val/brd;
+       if (per >1.0) per = 1.0;
+       nw = p_w+((p_w2 - p_w)*per);
+       nr = p_r+((p_r2 - p_r)*per);
+       ng = p_g+((p_g2 - p_g)*per);
+       nb = p_b+((p_b2 - p_b)*per);
+       setPixelColor(i,nr,ng,nb,nw);
+     }
+   }
 
-    _mode_delay = 100 + ((100 * (uint32_t)(SPEED_MAX - _speed)) / SPEED_MAX);
+   show();
+   _counter_mode_step++;
+   if (_counter_mode_step >= _led_count) _counter_mode_step = 0;
+   if (_speed == 0) _counter_mode_step = _led_count >> 1;
+   _mode_delay = 7 + ((25 * (uint32_t)(SPEED_MAX - _speed)) / _led_count);
+}
+
+/*
+ * Gradient run with hard transition
+ */
+void WS2812FX::mode_loading(void) {
+   byte p_w = (_color & 0xFF000000) >> 24;
+   byte p_r = (_color & 0x00FF0000) >> 16;
+   byte p_g = (_color & 0x0000FF00) >>  8;
+   byte p_b = (_color & 0x000000FF) >>  0;
+   byte p_w2 = (_color_sec & 0xFF000000) >> 24;
+   byte p_r2 = (_color_sec & 0x00FF0000) >> 16;
+   byte p_g2 = (_color_sec & 0x0000FF00) >>  8;
+   byte p_b2 = (_color_sec & 0x000000FF) >>  0;
+   byte nw,nr,ng,nb;
+   float per,val; //0.0 = sec 1.0 = pri
+   float brd = _intensity; if (brd <1.0) brd = 1.0;
+   int pp = _counter_mode_step;
+   int p1 = pp+_led_count;
+
+   for(uint16_t i=0; i < _led_count; i++)
+   {
+     if (!_locked[i])
+     {
+       pp = _counter_mode_step;
+       if (i > pp) pp+=_led_count;
+       val = abs(pp-i);
+       per = val/brd;
+       if (per >1.0) per = 1.0;
+       nw = p_w+((p_w2 - p_w)*per);
+       nr = p_r+((p_r2 - p_r)*per);
+       ng = p_g+((p_g2 - p_g)*per);
+       nb = p_b+((p_b2 - p_b)*per);
+       setPixelColor(i,nr,ng,nb,nw);
+     }
+   }
+
+   show();
+   _counter_mode_step++;
+   if (_counter_mode_step >= _led_count) _counter_mode_step = 0;
+   if (_speed == 0) _counter_mode_step = _led_count -1;
+   _mode_delay = 7 + ((25 * (uint32_t)(SPEED_MAX - _speed)) / _led_count);
 }
 
 /*
@@ -2034,7 +2125,7 @@ void WS2812FX::setBrightness(byte b)
 {
   _brightness = constrain(b, BRIGHTNESS_MIN, BRIGHTNESS_MAX);
   NeoPixelBrightnessBus::SetBrightness(_brightness);
-  show();
+  if (_mode_last_call_time + _mode_delay > millis()+50 || b == 0) show(); //only update right away if long time until next refresh
 }
 
 void WS2812FX::show()

wled00/WS2812FX.h

@@ -78,8 +78,8 @@
 #define FX_MODE_COLOR_WIPE               3
 #define FX_MODE_COLOR_WIPE_RANDOM        4
 #define FX_MODE_RANDOM_COLOR             5
-#define FX_MODE_SINGLE_DYNAMIC           6
-#define FX_MODE_MULTI_DYNAMIC            7
+#define FX_MODE_EASTER                   6
+#define FX_MODE_DYNAMIC                  7
 #define FX_MODE_RAINBOW                  8
 #define FX_MODE_RAINBOW_CYCLE            9
 #define FX_MODE_SCAN                    10
@@ -99,7 +99,7 @@
 #define FX_MODE_STROBE_RAINBOW          24
 #define FX_MODE_MULTI_STROBE            25
 #define FX_MODE_BLINK_RAINBOW           26
-#define FX_MODE_CHASE_WHITE             27
+#define FX_MODE_ANDROID                 27
 #define FX_MODE_CHASE_COLOR             28
 #define FX_MODE_CHASE_RANDOM            29
 #define FX_MODE_CHASE_RAINBOW           30
@@ -118,8 +118,8 @@
 #define FX_MODE_FIREWORKS_RANDOM        43
 #define FX_MODE_MERRY_CHRISTMAS         44
 #define FX_MODE_FIRE_FLICKER            45
-#define FX_MODE_FIRE_FLICKER_SOFT       46
-#define FX_MODE_FADE_DOWN               47
+#define FX_MODE_GRADIENT                46
+#define FX_MODE_LOADING                 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
@@ -143,8 +143,8 @@ class WS2812FX : public NeoPixelBrightnessBus<PIXELFEATURE, PIXELMETHOD> {
       _mode[FX_MODE_COLOR_WIPE]            = &WS2812FX::mode_color_wipe;
       _mode[FX_MODE_COLOR_WIPE_RANDOM]     = &WS2812FX::mode_color_wipe_random;
       _mode[FX_MODE_RANDOM_COLOR]          = &WS2812FX::mode_random_color;
-      _mode[FX_MODE_SINGLE_DYNAMIC]        = &WS2812FX::mode_single_dynamic;
-      _mode[FX_MODE_MULTI_DYNAMIC]         = &WS2812FX::mode_multi_dynamic;
+      _mode[FX_MODE_EASTER]                = &WS2812FX::mode_easter;
+      _mode[FX_MODE_DYNAMIC]               = &WS2812FX::mode_dynamic;
       _mode[FX_MODE_RAINBOW]               = &WS2812FX::mode_rainbow;
       _mode[FX_MODE_RAINBOW_CYCLE]         = &WS2812FX::mode_rainbow_cycle;
       _mode[FX_MODE_SCAN]                  = &WS2812FX::mode_scan;
@@ -164,7 +164,7 @@ class WS2812FX : public NeoPixelBrightnessBus<PIXELFEATURE, PIXELMETHOD> {
       _mode[FX_MODE_STROBE_RAINBOW]        = &WS2812FX::mode_strobe_rainbow;
       _mode[FX_MODE_MULTI_STROBE]          = &WS2812FX::mode_multi_strobe;
       _mode[FX_MODE_BLINK_RAINBOW]         = &WS2812FX::mode_blink_rainbow;
-      _mode[FX_MODE_CHASE_WHITE]           = &WS2812FX::mode_chase_white;
+      _mode[FX_MODE_ANDROID]               = &WS2812FX::mode_android;
       _mode[FX_MODE_CHASE_COLOR]           = &WS2812FX::mode_chase_color;
       _mode[FX_MODE_CHASE_RANDOM]          = &WS2812FX::mode_chase_random;
       _mode[FX_MODE_CHASE_RAINBOW]         = &WS2812FX::mode_chase_rainbow;
@@ -183,8 +183,8 @@ class WS2812FX : public NeoPixelBrightnessBus<PIXELFEATURE, PIXELMETHOD> {
       _mode[FX_MODE_FIREWORKS_RANDOM]      = &WS2812FX::mode_fireworks_random;
       _mode[FX_MODE_MERRY_CHRISTMAS]       = &WS2812FX::mode_merry_christmas;
       _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_GRADIENT]              = &WS2812FX::mode_gradient;
+      _mode[FX_MODE_LOADING]               = &WS2812FX::mode_loading;
       _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;
@@ -206,7 +206,7 @@ class WS2812FX : public NeoPixelBrightnessBus<PIXELFEATURE, PIXELMETHOD> {
       _color = DEFAULT_COLOR;
       _mode_color = DEFAULT_COLOR;
       _color_sec = 0;
-      _mode_color_sec = 0;
+      _mode_var1 = 0;
       _cc_fs = true;
       _cc_fe = false;
       _cc_is = 0;
@@ -227,6 +227,7 @@ class WS2812FX : public NeoPixelBrightnessBus<PIXELFEATURE, PIXELMETHOD> {
     void
       show(void),
       setPixelColor(uint16_t i, byte r, byte g, byte b),
+      setPixelColor(uint16_t i, byte r, byte g, byte b, byte w),
       init(void),
       service(void),
       start(void),
@@ -299,7 +300,6 @@ class WS2812FX : public NeoPixelBrightnessBus<PIXELFEATURE, PIXELMETHOD> {
       begin(void),
       clear(void),
       setPixelColor(uint16_t i, uint32_t c),
-      setPixelColor(uint16_t i, byte r, byte g, byte b, byte w),
       setPixelColorRaw(uint16_t i, byte r, byte g, byte b, byte w),
       dofade(void),
       strip_off(void),
@@ -309,8 +309,8 @@ class WS2812FX : public NeoPixelBrightnessBus<PIXELFEATURE, PIXELMETHOD> {
       mode_color_wipe(void),
       mode_color_wipe_random(void),
       mode_random_color(void),
-      mode_single_dynamic(void),
-      mode_multi_dynamic(void),
+      mode_easter(void),
+      mode_dynamic(void),
       mode_breath(void),
       mode_fade(void),
       mode_scan(void),
@@ -331,7 +331,7 @@ class WS2812FX : public NeoPixelBrightnessBus<PIXELFEATURE, PIXELMETHOD> {
       mode_strobe_rainbow(void),
       mode_multi_strobe(void),
       mode_blink_rainbow(void),
-      mode_chase_white(void),
+      mode_android(void),
       mode_chase_color(void),
       mode_chase_random(void),
       mode_chase_rainbow(void),
@@ -339,6 +339,7 @@ class WS2812FX : public NeoPixelBrightnessBus<PIXELFEATURE, PIXELMETHOD> {
       mode_chase_flash_random(void),
       mode_chase_rainbow_white(void),
       mode_colorful(void),
+      mode_colorful_internal(uint32_t*),
       mode_traffic_light(void),
       mode_color_sweep_random(void),
       mode_running_color(void),
@@ -350,9 +351,8 @@ class WS2812FX : public NeoPixelBrightnessBus<PIXELFEATURE, PIXELMETHOD> {
       mode_fireworks_random(void),
       mode_merry_christmas(void),
       mode_fire_flicker(void),
-      mode_fire_flicker_soft(void),
-      mode_fire_flicker_int(int),
-      mode_fade_down(void),
+      mode_gradient(void),
+      mode_loading(void),
       mode_dual_color_wipe_in_out(void),
       mode_dual_color_wipe_in_in(void),
       mode_dual_color_wipe_out_out(void),
@@ -405,8 +405,8 @@ class WS2812FX : public NeoPixelBrightnessBus<PIXELFEATURE, PIXELMETHOD> {
       _counter_mode_call,
       _counter_mode_step,
       _counter_ccStep,
+      _mode_var1,
       _mode_color,
-      _mode_color_sec,
       _mode_delay;
 
     double

wled00/data/index.htm

@@ -2,7 +2,7 @@
 <html>
 <head><meta charset="utf-8">
 	<link rel='shortcut icon' type='image/x-icon' href='/favicon.ico'/>
-	<title>WLED 0.5.0</title>
+	<title>WLED 0.6.3</title>
 	<script>
 		var d=document;
 		var w=window.getComputedStyle(d.querySelector("html"));
@@ -75,7 +75,7 @@
 					}
 				}
 			}
-			request.open("GET", "win/" +resp +nocache, true);
+			request.open("GET", "win" +resp +nocache, true);
 			request.send(null);
 			resp="";
 		}
@@ -214,8 +214,8 @@
 		function SwitchPS(x)
 		{
 			d.Cf.FF.value = parseInt(d.Cf.FF.value) +x;
-			if (d.Cf.FF.value < 0) d.Cf.FF.value = 0;
-			if (d.Cf.FF.value > 24) d.Cf.FF.value = 24;
+			if (d.Cf.FF.value < 1) d.Cf.FF.value = 1;
+			if (d.Cf.FF.value > 25) d.Cf.FF.value = 25;
 		}
 		function PSIO(sv)
 		{
@@ -335,6 +335,21 @@
 			}
 			GIO();
 		}
+		function uCY()
+		{
+			resp+=(d.Cf.CY.checked)?"&CY=1":"&CY=0";
+			resp+="&P1=" + Cf.P1.value;
+			resp+="&P2=" + Cf.P2.value;
+			resp+="&PT=" + Cf.PT.value;
+			if(d.Cf.BC.checked){resp+="&PA";}
+			if(d.Cf.CC.checked){resp+="&PC";}
+			if(d.Cf.FC.checked){resp+="&PX";}
+			GIO();
+		}
+		function R()
+		{
+			resp+="&PL=0";GIO();
+		}
 	</script>
 	<style>
 		:root {
@@ -581,8 +596,8 @@
 				<option value="3">Wipe (3)</option>
 				<option value="4">Wipe Random (4)</option>
 				<option value="5">Color R (5)</option>
-				<option value="6">Single Dynamic (6)</option>
-				<option value="7">All Dynamic (7)</option>
+				<option value="6">Easter (6)</option>
+				<option value="7">Dynamic (7)</option>
 				<option value="8">Colorloop (8)</option>
 				<option value="9">Rainbow (9)</option>
 				<option value="10">Scan (10)</option>
@@ -602,8 +617,8 @@
 				<option value="24">Strobe Cl (24)</option>
 				<option value="25">Strobe + (25)</option>
 				<option value="26">Blink Cl (26)</option>
-				<option value="27">Chase (27)</option>
-				<option value="28">Chase Inv (28)</option>
+				<option value="27">Android (27)</option>
+				<option value="28">Chase (28)</option>
 				<option value="29">Chase R (29)</option>
 				<option value="30">Chase Rainbow (30)</option>
 				<option value="31">Chase Flash (31)</option>
@@ -621,8 +636,8 @@
 				<option value="43">Fireworks R (43)</option>
 				<option value="44">Christmas (44)</option>
 				<option value="45">Fire Flicker (45)</option>
-				<option value="46">Unused (46)</option>
-				<option value="47">Internal (47)</option>
+				<option value="46">Gradient (46)</option>
+				<option value="47">Loading (47)</option>
 				<option value="48">Wipe IO (48)</option>
 				<option value="49">Wipe II (49)</option>
 				<option value="50">Wipe OO (50)</option>
@@ -659,9 +674,10 @@
 				<svg id="psp" onclick="SwitchPS(-1)"><use xlink:href="#lnr-arrow-left-circle"></use></svg>
 				<svg id="psn" onclick="SwitchPS(1)"><use xlink:href="#lnr-arrow-right-circle"></use></svg>
 				<svg id="pss" onclick="PSIO(true)"><use xlink:href="#lnr-arrow-down-circle"></use></svg>
-				<br><input id="psI" name = "FF" type="number" value="0" min="0" max="25" step="1"><br><br>
-				Click checkmark to apply <input type="checkbox" checked="true" name="BC"> brightness, <input type="checkbox" checked="true" name="CC"> color and <input type="checkbox" checked="true" name="FC"> effects.<br>
-				Effect 0 is the configuration when the light is powered up.
+				<br><input id="psI" name = "FF" type="number" value="1" min="1" max="25" step="1"><br><br>
+				Click checkmark to apply <input type="checkbox" checked="true" name="BC"> brightness, <input type="checkbox" checked="true" name="CC"> color and <input type="checkbox" checked="true" name="FC"> effects.<br><br>
+				Cycle through presets <input id="cy1" name="P1" type="number" value="1" min="1" max="25" step="1"> to <input id="cy2" name="P2" type="number" value="5" min="1" max="25" step="1">, keep each for <input id="cyT" name="PT" type="number" value="1250" min="50" max="65501" step="1">ms: <input type="checkbox" name="CY" onclick="uCY()"><br><br>
+				<button type="button" onclick="R()">Apply boot config</button><br>
 			</div>
 			<div id="tlN" class="tools">
 				Timed Light<br><br>

wled00/htmls01.h

@@ -110,7 +110,7 @@ Brightness factor: <input name="BF" type="number" min="0" max="255" required> %
 <h3>Transitions</h3>
 Fade: <input type="checkbox" name="TF"><br>
 Sweep: <input type="checkbox" name="TS">  Invert direction: <input type="checkbox" name="TI"><br>
-Transition Delay: <input name="TD" maxlength="5" size="2"> ms
+Transition Time: <input name="TD" maxlength="5" size="2"> ms
 <h3>Timed light</h3>
 Default Duration: <input name="TL" type="number" min="1" max="255" required> min<br>
 Default Target brightness: <input name="TB" type="number" min="0" max="255" required><br>
@@ -155,7 +155,7 @@ Color Theme:
 <option value="9">Nixie</option>
 <option value="10">Terminal</option>
 <option value="11">C64</option>
-<option value="12">Placeholder</option>
+<option value="12">Easter</option>
 <option value="13">Placeholder</option>
 <option value="14">The End</option>
 <option value="15" id="co">Custom</option>
@@ -248,6 +248,7 @@ Time zone:
 <option value="10">JST(KST)</option>
 <option value="11">AEST/AEDT</option>
 <option value="12">NZST/NZDT</option>
+<option value="13">North Korea</option>
 </select><br>
 UTC offset: <input name="UO" type="number" min="-65500" max="65500" required> seconds (max. 18 hours)<br>
 Current local time is <span class="times">unknown</span>.
@@ -335,7 +336,7 @@ HTTP traffic is unencrypted. An attacker in the same network can intercept form
 <button type="button" onclick="U()">Manual OTA Update</button><br>
 Enable ArduinoOTA: <input type="checkbox" name="AO"><br>
 <h3>About</h3>
-<a href="https://github.com/Aircoookie/WLED">WLED</a> version 0.6.0<br>
+<a href="https://github.com/Aircoookie/WLED">WLED</a> version 0.6.3<br>
 (c) 2016-2018 Christian Schwinne <br>
 <i>Licensed under the MIT license</i><br><br>
 <i>Uses libraries:</i><br>

wled00/wled00.ino

@@ -3,7 +3,7 @@
  */
 /*
  * @title WLED project sketch
- * @version 0.6.0
+ * @version 0.6.3
  * @author Christian Schwinne
  */
 
@@ -33,8 +33,8 @@
 #include "WS2812FX.h"
 
 //version in format yymmddb (b = daily build)
-#define VERSION 1803151
-const String versionString = "0.6.0";
+#define VERSION 1804111
+const String versionString = "0.6.3";
 
 //AP and OTA default passwords (change them!)
 String apPass = "wled1234";
@@ -72,7 +72,7 @@ IPAddress staticIP(0, 0, 0, 0);
 IPAddress staticGateway(0, 0, 0, 0);
 IPAddress staticSubnet(255, 255, 255, 0);
 IPAddress staticDNS(8, 8, 8, 8); //only for NTP
-bool useHSB = false, useHSBDefault = false;
+bool useHSB = true, useHSBDefault = true;
 bool turnOnAtBoot = true;
 bool initLedsLast = false;
 byte bootPreset = 0;
@@ -84,7 +84,7 @@ byte briS = 127;
 byte nightlightTargetBri = 0;
 bool fadeTransition = true;
 bool sweepTransition = false, sweepDirection = true;
-uint16_t transitionDelay = 1200;
+uint16_t transitionDelay = 1200, transitionDelayDefault = transitionDelay;
 bool reverseMode = false;
 bool otaLock = false, wifiLock = false;
 bool aOtaEnabled = true;
@@ -120,8 +120,6 @@ byte macroButton = 0, macroCountdown = 0, macroLongPress = 0;
 
 unsigned long countdownTime = 1514764800L;
 
-double transitionResolution = 0.011;
-
 //hue
 bool huePollingEnabled = false, hueAttempt = false;
 uint16_t huePollIntervalMs = 2500;
@@ -208,8 +206,15 @@ bool cronixieBacklight = true;
 bool countdownMode = false;
 bool cronixieInit = false;
 
+bool presetCyclingEnabled = false;
+byte presetCycleMin = 1, presetCycleMax = 5;
+uint16_t presetCycleTime = 1250;
+unsigned long presetCycledTime = 0; byte presetCycCurr = presetCycleMin;
+bool presetCycleBri, presetCycleCol, presetCycleFx;
+
 uint32_t arlsTimeoutMillis = 2500;
 bool arlsTimeout = false;
+bool receiveDirect = true;
 unsigned long arlsTimeoutTime;
 byte auxTime = 0;
 unsigned long auxStartTime;
@@ -314,6 +319,7 @@ void setup() {
 
 void loop() {
     server.handleClient();
+    handleSerial();
     handleNotifications();
     handleTransitions();
     userLoop();
@@ -323,7 +329,7 @@ void loop() {
     if (!otaLock && aOtaEnabled) ArduinoOTA.handle();
     handleAlexa();
     handleOverlays();
-    if (!arlsTimeout) //block stuff if WARLS is enabled
+    if (!arlsTimeout) //block stuff if WARLS/Adalight is enabled
     {
       if (dnsActive) dnsServer.processNextRequest();
       handleHue();

wled00/wled01_eeprom.ino

@@ -85,8 +85,8 @@ void saveSettingsToEEPROM()
   EEPROM.write(250, receiveNotificationBrightness);
   EEPROM.write(251, fadeTransition);
   EEPROM.write(252, reverseMode);
-  EEPROM.write(253, (transitionDelay >> 0) & 0xFF);
-  EEPROM.write(254, (transitionDelay >> 8) & 0xFF);
+  EEPROM.write(253, (transitionDelayDefault >> 0) & 0xFF);
+  EEPROM.write(254, (transitionDelayDefault >> 8) & 0xFF);
   EEPROM.write(255, briMultiplier);
   //255,250,231,230,226 notifier bytes
   for (int i = 256; i < 288; ++i)
@@ -286,7 +286,8 @@ void loadSettingsFromEEPROM(bool first)
   receiveNotificationBrightness = EEPROM.read(250);
   fadeTransition = EEPROM.read(251);
   reverseMode = EEPROM.read(252);
-  transitionDelay = ((EEPROM.read(253) << 0) & 0xFF) + ((EEPROM.read(254) << 8) & 0xFF00);
+  transitionDelayDefault = ((EEPROM.read(253) << 0) & 0xFF) + ((EEPROM.read(254) << 8) & 0xFF00);
+  transitionDelay = transitionDelayDefault;
   briMultiplier = EEPROM.read(255);
   otaPass = "";
   for (int i = 256; i < 288; ++i)
@@ -471,6 +472,7 @@ void applyPreset(byte index, bool loadBri, bool loadCol, bool loadFX)
   }
   if (loadFX)
   {
+    byte lastfx = effectCurrent;
     effectCurrent = EEPROM.read(i+10);
     effectSpeed = EEPROM.read(i+11);
     effectIntensity = EEPROM.read(i+16);
@@ -480,7 +482,7 @@ void applyPreset(byte index, bool loadBri, bool loadCol, bool loadFX)
     ccFromStart = (EEPROM.read(i+14)<2);
     ccStep = EEPROM.read(i+15);
     strip.setCustomChase(ccIndex1, ccIndex2, ccStart, ccNumPrimary, ccNumSecondary, ccStep, ccFromStart, ccFromEnd);
-    strip.setMode(effectCurrent);
+    if (lastfx != effectCurrent) strip.setMode(effectCurrent);
     strip.setSpeed(effectSpeed);
     strip.setIntensity(effectIntensity);
   }

wled00/wled03_set.ino

@@ -651,7 +651,7 @@ bool handleSet(String req)
         bri = briT;
       } else {
         nightlightActive = true;
-        nightlightDelayMins = req.substring(pos + 3).toInt();
+        if (req.indexOf("&ND") <= 0) nightlightDelayMins = req.substring(pos + 3).toInt();
         nightlightStartTime = millis();
       }
    }
@@ -679,6 +679,10 @@ bool handleSet(String req)
       auxActive = true;
       if (auxTime == 0) auxActive = false;
    }
+   pos = req.indexOf("TT=");
+   if (pos > 0) {
+      transitionDelay = req.substring(pos + 3).toInt();
+   }
    //main toggle on/off
    pos = req.indexOf("&T=");
    if (pos > 0) {
@@ -721,6 +725,47 @@ bool handleSet(String req)
    if (_cc_updated) strip.setCustomChase(ccIndex1, ccIndex2, ccStart, ccNumPrimary, ccNumSecondary, ccStep, ccFromStart, ccFromEnd);
    
    //set presets
+   if (req.indexOf("CY=") > 0) //preset cycle
+   {
+      presetCyclingEnabled = true;
+      if (req.indexOf("CY=0") > 0)
+      {
+        presetCyclingEnabled = false;
+      }
+      bool all = true;
+      if (req.indexOf("&PA") > 0)
+      {
+        presetCycleBri = true;
+        all = false;
+      }
+      if (req.indexOf("&PC") > 0)
+      {
+        presetCycleCol = true;
+        all = false;
+      }
+      if (req.indexOf("&PX") > 0)
+      {
+        presetCycleFx = true;
+        all = false;
+      }
+      if (all)
+      {
+        presetCycleBri = true;
+        presetCycleCol = true;
+        presetCycleFx = true;
+      }
+   }
+   pos = req.indexOf("PT="); //sets cycle time in ms
+   if (pos > 0) {
+      int v = req.substring(pos + 3).toInt();
+      if (v > 49) presetCycleTime = v;
+   }
+   pos = req.indexOf("P1="); //sets first preset for cycle
+   if (pos > 0) presetCycleMin = req.substring(pos + 3).toInt();
+
+   pos = req.indexOf("P2="); //sets last preset for cycle
+   if (pos > 0) presetCycleMax = req.substring(pos + 3).toInt();
+   
    pos = req.indexOf("PS="); //saves current in preset
    if (pos > 0) {
       savePreset(req.substring(pos + 3).toInt());

wled00/wled04_file.ino

@@ -1,6 +1,46 @@
 /*
- * Utility for SPIFFS filesystem
+ * Utility for SPIFFS filesystem & Serial console
  */
+void handleSerial()
+{
+  if (Serial.available() > 0) //support for Adalight protocol to high-speed control LEDs over serial (gamma correction done by PC)
+  {
+    if (Serial.find("Ada"))
+    {
+      if (!arlsTimeout){
+        if (bri == 0) strip.setBrightness(briLast);
+        strip.setRange(0, ledCount-1, 0);
+        strip.setMode(0);
+      }
+      arlsTimeout = true;
+      arlsTimeoutTime = millis() + 4900;
+      delay(1);
+      byte hi = Serial.read();
+      byte ledc = Serial.read();
+      byte chk = Serial.read();
+      if(chk != (hi ^ ledc ^ 0x55)) return;
+      if (ledCount < ledc) ledc = ledCount;
+      byte sc[3]; int t =-1; int to = 0;
+      for (int i=0; i < ledc; i++)
+      {
+        for (byte j=0; j<3; j++)
+        {
+          while (Serial.peek()<0) //no data yet available
+          {
+            delay(1);
+            to++;
+            if (to>5) {strip.show(); return;} //unexpected end of transmission
+          }
+          to = 0;
+          sc[j] = Serial.read();
+        }
+        strip.setPixelColor(i,sc[0],sc[1],sc[2],0);
+      }
+      strip.show();
+    }
+  }
+}
+
 #ifdef USEFS
 
 String formatBytes(size_t bytes){

wled00/wled05_init.ino

@@ -8,6 +8,7 @@ void wledInit()
   if (!EEPROM.read(397)) strip.init(); //quick init
   
   Serial.begin(115200);
+  Serial.setTimeout(50);
   
   #ifdef USEFS
   SPIFFS.begin();
@@ -16,32 +17,11 @@ void wledInit()
   DEBUG_PRINTLN("Load EEPROM");
   loadSettingsFromEEPROM(true);
   if (!initLedsLast) initStrip();
-  DEBUG_PRINT("C-SSID: ");
+  DEBUG_PRINT("CSSID: ");
   DEBUG_PRINT(clientSSID);
   buildCssColorString();
   userBeginPreConnection();
 
-  WiFi.disconnect(); //close old connections
-
-  if (staticIP[0] != 0)
-  {
-    WiFi.config(staticIP, staticGateway, staticSubnet, staticDNS);
-  } else
-  {
-    WiFi.config(0U, 0U, 0U);
-  }
-
-  if (apSSID.length()>0)
-  {
-    DEBUG_PRINT("USING AP");
-    DEBUG_PRINTLN(apSSID.length());
-    initAP();
-  } else
-  {
-    DEBUG_PRINTLN("NO AP");
-    WiFi.softAPdisconnect(true);
-  }
-
   initCon();
 
   DEBUG_PRINTLN("");
@@ -76,7 +56,7 @@ void wledInit()
     dnsServer.start(53, "*", WiFi.softAPIP());
     dnsActive = true;
   }
-
+  if (!initLedsLast) strip.service();
   //SERVER INIT
   //settings page
   server.on("/settings", HTTP_GET, [](){
@@ -185,6 +165,10 @@ void wledInit()
   server.on("/freeheap", HTTP_GET, [](){
     server.send(200, "text/plain", (String)ESP.getFreeHeap());
     });
+
+  server.on("/pdebug", HTTP_GET, [](){
+    server.send(200, "text/plain", (String)presetCycleTime);
+    });
     
   server.on("/power", HTTP_GET, [](){
     String val = (String)(int)strip.getPowerEstimate(ledCount,strip.getColor(),strip.getBrightness());
@@ -197,38 +181,7 @@ void wledInit()
     });
     
   server.on("/build", HTTP_GET, [](){
-    String info = "hard-coded build info:\r\n\n";
-    #ifdef ARDUINO_ARCH_ESP32
-    info += "platform: esp32\r\n";
-    #else
-    info += "platform: esp8266\r\n";
-    #endif
-    info += "version: " + versionString + "\r\n";
-    info += "build: " + (String)VERSION + "\r\n";
-    info += "eepver: " + String(EEPVER) + "\r\n";
-    #ifdef RGBW
-    info += "rgbw: true\r\n";
-    #else
-    info += "rgbw: false\r\n";
-    #endif
-    info += "max-leds: " + (String)LEDCOUNT + "\r\n";
-    #ifdef USEFS
-    info += "spiffs: true\r\n";
-    #else
-    info += "spiffs: false\r\n";
-    #endif
-    #ifdef DEBUG
-    info += "debug: true\r\n";
-    #else
-    info += "debug: false\r\n";
-    #endif
-    info += "button-pin: gpio" + String(buttonPin) + "\r\n";
-    #ifdef ARDUINO_ARCH_ESP32
-    info += "strip-pin: gpio" + String(PIN) + "\r\n";
-    #else
-    info += "strip-pin: gpio2\r\n";
-    #endif
-    server.send(200, "text/plain", info);
+    server.send(200, "text/plain", getBuildInfo());
     });
   //if OTA is allowed
   if (!otaLock){
@@ -273,6 +226,7 @@ void wledInit()
       server.send(404, "text/plain", "Not Found");
     }
   });
+  if (!initLedsLast) strip.service();
   //init Alexa hue emulation
   if (alexaEnabled) alexaInit();
 
@@ -296,6 +250,7 @@ void wledInit()
   if (initLedsLast) initStrip();
   userBegin();
   if (macroBoot>0) applyMacro(macroBoot);
+  Serial.println("Ada");
 }
 
 void initStrip()
@@ -324,6 +279,26 @@ void initAP(){
 
 void initCon()
 {
+  WiFi.disconnect(); //close old connections
+
+  if (staticIP[0] != 0)
+  {
+    WiFi.config(staticIP, staticGateway, staticSubnet, staticDNS);
+  } else
+  {
+    WiFi.config(0U, 0U, 0U);
+  }
+
+  if (apSSID.length()>0)
+  {
+    DEBUG_PRINT("USING AP");
+    DEBUG_PRINTLN(apSSID.length());
+    initAP();
+  } else
+  {
+    DEBUG_PRINTLN("NO AP");
+    WiFi.softAPdisconnect(true);
+  }
   int fail_count = 0;
   if (clientSSID.length() <1 || clientSSID.equals("Your_Network")) fail_count = apWaitTimeSecs*2;
   WiFi.begin(clientSSID.c_str(), clientPass.c_str());
@@ -341,7 +316,6 @@ void initCon()
     }
     if (millis()-lastTry > 499) {
       con = (WiFi.status() == WL_CONNECTED);
-      if (con) DEBUG_PRINTLN("rofl");
       lastTry = millis();
       DEBUG_PRINTLN("C_NC");
       if (!recoveryAPDisabled && fail_count > apWaitTimeSecs*2)
@@ -374,6 +348,7 @@ void buildCssColorString()
     case 9: cs[0]="f70"; cs[1]="421"; cs[2]="221"; cs[3]="a50"; cs[4]="f70"; cs[5]="f70"; break;//nixie
     case 10: cs[0]="2d2"; cs[1]="010"; cs[2]="121"; cs[3]="060"; cs[4]="040"; cs[5]="3f3"; break; //terminal
     case 11: cs[0]="867ADE"; cs[1]="4033A3"; cs[2]="483AAA"; cs[3]="483AAA"; cs[4]=""; cs[5]="867ADE"; break; //c64
+    case 12: cs[0]="fbe8a6"; cs[1]="d2fdff"; cs[2]="b4dfe5"; cs[3]="f4976c"; cs[4]=""; cs[5]="303c6c"; break; //c64
     case 14: cs[0]="fc7"; cs[1]="49274a"; cs[2]="94618e"; cs[3]="f4decb"; cs[4]="0008"; cs[5]="f4decb"; break; //end
     case 15: for (int i=0;i<6;i++)cs[i]=cssCol[i];//custom
   }
@@ -508,6 +483,42 @@ void serveSettings(byte subPage)
     }
 }
 
+String getBuildInfo()
+{
+  String info = "hard-coded build info:\r\n\n";
+  #ifdef ARDUINO_ARCH_ESP32
+  info += "platform: esp32\r\n";
+  #else
+  info += "platform: esp8266\r\n";
+  #endif
+  info += "version: " + versionString + "\r\n";
+  info += "build: " + (String)VERSION + "\r\n";
+  info += "eepver: " + String(EEPVER) + "\r\n";
+  #ifdef RGBW
+  info += "rgbw: true\r\n";
+  #else
+  info += "rgbw: false\r\n";
+  #endif
+  info += "max-leds: " + (String)LEDCOUNT + "\r\n";
+  #ifdef USEFS
+  info += "spiffs: true\r\n";
+  #else
+  info += "spiffs: false\r\n";
+  #endif
+  #ifdef DEBUG
+  info += "debug: true\r\n";
+  #else
+  info += "debug: false\r\n";
+  #endif
+  info += "button-pin: gpio" + String(buttonPin) + "\r\n";
+  #ifdef ARDUINO_ARCH_ESP32
+  info += "strip-pin: gpio" + String(PIN) + "\r\n";
+  #else
+  info += "strip-pin: gpio2\r\n";
+  #endif
+  info += "build-type: src\r\n";
+  return info;
+}
 
 
 

wled00/wled07_notify.ino

@@ -9,11 +9,13 @@ void notify(byte callMode, bool followUp=false)
   if (!udpConnected) return;
   switch (callMode)
   {
+    case 0: return;
     case 1: if (!notifyDirect) return; break;
     case 2: if (!notifyButton) return; break;
     case 4: if (!notifyDirect) return; break;
     case 6: if (!notifyDirect) return; break; //fx change
     case 7: if (!notifyHue) return; break;
+    case 8: if (!notifyDirect) return; break;
     default: return;
   }
   byte udpOut[WLEDPACKETSIZE];
@@ -54,14 +56,14 @@ void handleNotifications()
     notify(notificationSentCallMode,true);
   }
   
-  if(udpConnected && receiveNotifications){
+  if(udpConnected && (receiveNotifications || receiveDirect)){
     uint16_t packetSize = notifierUdp.parsePacket();
     if (packetSize > 1026) return;
     if(packetSize && notifierUdp.remoteIP() != WiFi.localIP()) //don't process broadcasts we send ourselves
     {
       byte udpIn[packetSize];
       notifierUdp.read(udpIn, packetSize);
-      if (udpIn[0] == 0 && !arlsTimeout) //wled notifier, block if realtime packets active
+      if (udpIn[0] == 0 && !arlsTimeout && receiveNotifications) //wled notifier, block if realtime packets active
       {
         if (receiveNotificationColor)
         {
@@ -105,7 +107,7 @@ void handleNotifications()
           if (receiveNotificationBrightness) bri = udpIn[2];
           colorUpdated(3);
         }
-      }  else if (udpIn[0] == 1) //warls
+      }  else if (udpIn[0] > 0 && udpIn[0] < 4) //1 warls //2 drgb //3 drgbw
       {
         if (packetSize > 1) {
           if (udpIn[1] == 0)
@@ -119,26 +121,56 @@ void handleNotifications()
             arlsTimeout = true;
             arlsTimeoutTime = millis() + 1000*udpIn[1];
           }
-          for (int i = 2; i < packetSize -3; i += 4)
+          if (udpIn[0] == 1) //warls
           {
-            if (udpIn[i] + arlsOffset < ledCount && udpIn[i] + arlsOffset >= 0)
-            if (useGammaCorrectionRGB)
+            for (int i = 2; i < packetSize -3; i += 4)
             {
-              strip.setPixelColor(udpIn[i] + arlsOffset, gamma8[udpIn[i+1]], gamma8[udpIn[i+2]], gamma8[udpIn[i+3]]);
-            } else {
-              strip.setPixelColor(udpIn[i] + arlsOffset, udpIn[i+1], udpIn[i+2], udpIn[i+3]);
+              if (udpIn[i] + arlsOffset < ledCount && udpIn[i] + arlsOffset >= 0)
+              if (useGammaCorrectionRGB)
+              {
+                strip.setPixelColor(udpIn[i] + arlsOffset, gamma8[udpIn[i+1]], gamma8[udpIn[i+2]], gamma8[udpIn[i+3]]);
+              } else {
+                strip.setPixelColor(udpIn[i] + arlsOffset, udpIn[i+1], udpIn[i+2], udpIn[i+3]);
+              }
+            }
+          } else if (udpIn[0] == 2 && receiveDirect) //drgb
+          {
+            int id = 0;
+            for (int i = 2; i < packetSize -2; i += 3)
+            {
+              if (useGammaCorrectionRGB)
+              {
+                strip.setPixelColor(id, gamma8[udpIn[i]], gamma8[udpIn[i+1]], gamma8[udpIn[i+2]]);
+              } else {
+                strip.setPixelColor(id, udpIn[i+0], udpIn[i+1], udpIn[i+2]);
+              }
+              id++; if (id >= ledCount) break;
+            }
+          } else if (udpIn[0] == 3 && receiveDirect) //drgbw
+          {
+            int id = 0;
+            for (int i = 2; i < packetSize -3; i += 4)
+            {
+              if (useGammaCorrectionRGB)
+              {
+                strip.setPixelColor(id, gamma8[udpIn[i]], gamma8[udpIn[i+1]], gamma8[udpIn[i+2]], gamma8[udpIn[i+3]]);
+              } else {
+                strip.setPixelColor(id, udpIn[i+0], udpIn[i+1], udpIn[i+2], udpIn[i+3]);
+              }
+              id++; if (id >= ledCount) break;
             }
           }
           strip.show();
         }
       }
     }
-    if (arlsTimeout && millis() > arlsTimeoutTime)
-    {
-      strip.unlockAll();
-      arlsTimeout = false;
-      strip.setMode(effectCurrent);
-    }
+  }
+  if (arlsTimeout && millis() > arlsTimeoutTime)
+  {
+    strip.unlockAll();
+    if (bri == 0) strip.setBrightness(0);
+    arlsTimeout = false;
+    strip.setMode(effectCurrent);
   }
 }
 

wled00/wled08_led.ino

@@ -51,7 +51,7 @@ bool colorChanged()
 
 void colorUpdated(int callMode)
 {
-  //call for notifier -> 0: init 1: direct change 2: button 3: notification 4: nightlight 5: other (NN)6: fx changed 7: hue
+  //call for notifier -> 0: init 1: direct change 2: button 3: notification 4: nightlight 5: other (NN)6: fx changed 7: hue 8: preset cycle
   if (!colorChanged())
   {
     if (callMode == 6) notify(6);
@@ -78,6 +78,7 @@ void colorUpdated(int callMode)
   {
     //set correct delay if not using notification delay
     if (callMode != 3) transitionDelayTemp = transitionDelay;
+    if (transitionDelayTemp == 0) {setLedsStandard();strip.trigger();return;}
     
     if (transitionActive)
     {
@@ -112,7 +113,7 @@ void handleTransitions()
       strip.setFastUpdateMode(false);
       return;
     }
-    if (tper - tperLast < transitionResolution)
+    if (tper - tperLast < 0.004)
     {
       return;
     }
@@ -176,4 +177,14 @@ void handleNightlight()
   {
     nightlightActiveOld = false;
   }
+
+  //also handle preset cycle here
+  if (presetCyclingEnabled && (millis() - presetCycledTime > presetCycleTime))
+  {
+    applyPreset(presetCycCurr,presetCycleBri,presetCycleCol,presetCycleFx);
+    presetCycCurr++; if (presetCycCurr > presetCycleMax) presetCycCurr = presetCycleMin;
+    if (presetCycCurr > 25) presetCycCurr = 1;
+    colorUpdated(8);
+    presetCycledTime = millis();
+  }
 }

wled00/wled10_ntp.ino

@@ -49,7 +49,10 @@ TimeChangeRule NZDT = {Second, Sun, Sep, 2, 780 };    //Daylight time = UTC + 13
 TimeChangeRule NZST = {First, Sun, Apr, 3, 720 };     //Standard time = UTC + 12 hours
 Timezone tzNZ(NZDT, NZST);
 
-Timezone* timezones[] = { &tzUTC, &tzUK, &tzEUCentral, &tzEUEastern, &tzUSEastern, &tzUSCentral, &tzUSMountain, &tzUSArizona, &tzUSPacific, &tzChina, &tzJapan, &tzAUEastern, &tzNZ};  
+TimeChangeRule NKST = {Last, Sun, Mar, 1, 510};     //Pyongyang Time = UTC + 8.5 hours
+Timezone tzNK(NKST, NKST);
+
+Timezone* timezones[] = {&tzUTC, &tzUK, &tzEUCentral, &tzEUEastern, &tzUSEastern, &tzUSCentral, &tzUSMountain, &tzUSArizona, &tzUSPacific, &tzChina, &tzJapan, &tzAUEastern, &tzNZ, &tzNK};  
 
 void handleNetworkTime()
 {
@@ -106,7 +109,7 @@ bool checkNTPResponse()
     unsigned long secsSince1900 = highWord << 16 | lowWord;
  
     DEBUG_PRINT("Unix time = ");
-    unsigned long epoch = secsSince1900 - 2208988800UL; //subtract 70 years
+    unsigned long epoch = secsSince1900 - 2208988799UL; //subtract 70 years -1sec (on avg. more precision)
     setTime(epoch);
     DEBUG_PRINTLN(epoch);
     if (countdownTime - now() > 0) countdownOverTriggered = false;

wled00/wled15_hue.ino

@@ -161,7 +161,6 @@ bool handleHueResponse(String hueResp, bool isAuth)
   //applying vals
   if (hueBri != hueBriLast)
   {
-    bri = hueBri;
     if (hueApplyOnOff)
     {
       if (hueBri==0) {bri = 0;}