Merge pull request #57 from Aircoookie/development

Release of v0.8.0

bin/readme.md

@@ -1,22 +0,0 @@
-### 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!

readme.md

@@ -1,27 +1,34 @@
-## Welcome to my project WLED!
+![WLED logo](https://raw.githubusercontent.com/Aircoookie/WLED/development/wled_logo.png)
 
-WLED is a fast and (relatively) secure implementation of an ESP8266 webserver to control NeoPixel (WS2812B) LEDs!
-Now also with experimental ESP32 support.
+## Welcome to my project WLED! (v0.8.0)
 
-### Features: (V0.5.0)
-- RGB, HSB, and brightness sliders
+A fast and feature-rich implementation of an ESP8266/ESP32 webserver to control NeoPixel (WS2812B) LEDs!
+
+### Features:
+- WS2812FX library integrated for over 70 special effects
+- FastLED noise effects and palettes
+- Customizable Mobile and desktop UI with color and effect controls
 - Settings page - configuration over network
 - Access Point and station mode - automatic failsafe AP
-- WS2812FX library integrated for over 50 special effects!
-- Secondary color support lets you use even more effect combinations
 - Support for RGBW strips
-- 25 user presets! Save your favorite colors and effects and apply them easily!
+- 25 user presets to save and load colors/effects easily, supports cycling through them.
+- 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
-- Full OTA software update capability (HTTP and ArduinoOTA)
-- Password protected OTA page for added security (OTA lock)
-- Alexa smart home device server (including dimming)
-- NTP and experimental analog clock function
-- Support for the Cronixie Clock kit by Diamex
-- Realtime UDP Packet Control (WARLS) possible
-- Client HTML UI controlled, customizable themes
+- Full OTA software updatability (HTTP + ArduinoOTA), password protectable
+- Configurable analog clock + support for the Cronixie kit by Diamex
+
+### Supported light control interfaces:
+- HTTP request API
+- Blynk IoT
+- MQTT
+- E1.31
+- Hyperion
+- UDP realtime
+- Alexa smart device (including dimming)
+- Sync to Philips hue lights
+- Adalight (PC ambilight via serial)
+- Sync color of multiple WLED devices (UDP notifier)
+- Simple timers/schedules (time from NTP, timezones/DST supported)
 
 ### Quick start guide and documentation:
 
@@ -29,16 +36,14 @@ See the [wiki](https://github.com/Aircoookie/WLED/wiki)!
 
 ### Other
 
-Licensed under the MIT license 
-Uses libraries: 
-ESP8266/ESP32 Arduino Core
-NeoPixelBus by Makuna
-[WS2812FX](https://github.com/kitesurfer1404/WS2812FX) by kitesurfer1404 (Aircoookie fork)
-Time library
-Timezone library by JChristensen
-Alexa code based on arduino-esp8266-alexa-multiple-wemo-switch by kakopappa
+Licensed under the MIT license  
+Credits in About page!
 
-Uses Linearicons by Perxis! (link in settings page)
+Uses Linearicons by Perxis!
+
+Join the Discord [server](https://discord.gg/KuqP7NE) to discuss everything about WLED!  
+You can also send me mails to [dev.aircoookie@gmail.com](mailto:dev.aircoookie@gmail.com).  
+If you insist that you just love WLED too much, you can [send me a gift](https://paypal.me/aircoookie)!
 
 
 

wled00/NpbWrapper.h

@@ -0,0 +1,184 @@
+//this code is a modified version of https://github.com/Makuna/NeoPixelBus/issues/103
+#ifndef NpbWrapper_h
+#define NpbWrapper_h
+
+//#define WORKAROUND_ESP32_BITBANG
+//see https://github.com/Aircoookie/WLED/issues/2 for flicker free ESP32 support
+
+#define LEDPIN 2 //strip pin. Only effective for ESP32, ESP8266 must use gpio2
+
+//uncomment this if red and green are swapped
+//#define SWAPRG
+
+//automatically uses the right driver method for each platform
+#ifdef ARDUINO_ARCH_ESP32
+#ifdef WORKAROUND_ESP32_BITBANG
+#define PIXELMETHOD NeoEsp32BitBangWs2813Method
+#else
+#define PIXELMETHOD NeoEsp32RmtWS2813_V3Method
+#endif
+#else //esp8266
+//you may change to DMA method on pin GPIO3 here
+#define PIXELMETHOD NeoEsp8266Uart800KbpsMethod
+//#define PIXELMETHOD NeoEsp8266Dma800KbpsMethod
+#endif
+
+//handle swapping Red and Green automatically
+#ifdef SWAPRG
+#define PIXELFEATURE3 NeoRgbFeature
+#define PIXELFEATURE4 NeoRgbwFeature
+#else
+#define PIXELFEATURE3 NeoGrbFeature
+#define PIXELFEATURE4 NeoGrbwFeature
+#endif
+
+#include <NeoPixelBrightnessBus.h>
+
+enum NeoPixelType
+{
+  NeoPixelType_None = 0,
+  NeoPixelType_Grb  = 1,
+  NeoPixelType_Grbw = 2,
+  NeoPixelType_End  = 3
+};
+
+class NeoPixelWrapper
+{
+public:
+  NeoPixelWrapper() :
+      // initialize each member to null
+      _pGrb(NULL),
+      _pGrbw(NULL),
+      _type(NeoPixelType_None)
+  {
+
+  }
+
+  ~NeoPixelWrapper()
+  {
+    cleanup();
+  }
+
+  void Begin(NeoPixelType type, uint16_t countPixels)
+  {
+    cleanup();
+    _type = type;
+
+    switch (_type) {
+
+      case NeoPixelType_Grb:
+        _pGrb = new NeoPixelBrightnessBus<PIXELFEATURE3,PIXELMETHOD>(countPixels, LEDPIN);
+        _pGrb->Begin();
+      break;
+
+      case NeoPixelType_Grbw:
+        _pGrbw = new NeoPixelBrightnessBus<PIXELFEATURE4,PIXELMETHOD>(countPixels, LEDPIN);
+        _pGrbw->Begin();
+      break;
+    }
+  }
+
+  void Show()
+  {
+    #ifdef ARDUINO_ARCH_ESP32
+    #ifdef WORKAROUND_ESP32_BITBANG
+    delay(1);
+    portDISABLE_INTERRUPTS(); //this is a workaround to prevent flickering (see https://github.com/adafruit/Adafruit_NeoPixel/issues/139)
+    #endif
+    #endif
+    
+    switch (_type) {
+      case NeoPixelType_Grb:  _pGrb->Show();   break;
+      case NeoPixelType_Grbw: _pGrbw->Show();  break;
+    }
+    
+    #ifdef ARDUINO_ARCH_ESP32
+    #ifdef WORKAROUND_ESP32_BITBANG
+    portENABLE_INTERRUPTS();
+    #endif
+    #endif
+  }
+  bool CanShow() const
+  {
+    switch (_type) {
+      case NeoPixelType_Grb:  _pGrb->CanShow();  break;
+      case NeoPixelType_Grbw: _pGrbw->CanShow(); break;
+    }
+  }
+
+    void SetPixelColor(uint16_t indexPixel, RgbColor color)
+    {
+      switch (_type) {
+        case NeoPixelType_Grb: _pGrb->SetPixelColor(indexPixel, color);   break;
+        case NeoPixelType_Grbw:_pGrbw->SetPixelColor(indexPixel, color);  break;
+      }
+    }
+
+    void SetPixelColor(uint16_t indexPixel, RgbwColor color)
+    {
+      switch (_type) {
+        case NeoPixelType_Grb:  _pGrb->SetPixelColor(indexPixel, RgbColor(color.R,color.G,color.B));   break;
+        case NeoPixelType_Grbw: _pGrbw->SetPixelColor(indexPixel, color);   break;
+      }
+    }
+
+    void SetBrightness(byte b)
+    {
+      switch (_type) {
+        case NeoPixelType_Grb: _pGrb->SetBrightness(b);   break;
+        case NeoPixelType_Grbw:_pGrbw->SetBrightness(b);  break;
+      }
+    }
+
+    RgbColor GetPixelColor(uint16_t indexPixel) const
+    {
+      switch (_type) {
+        case NeoPixelType_Grb:  return _pGrb->GetPixelColor(indexPixel);     break;
+        case NeoPixelType_Grbw: /*doesn't support it so we don't return it*/ break;
+      }
+      return 0;
+    }
+
+// NOTE:  Due to feature differences, some support RGBW but the method name
+// here needs to be unique, thus GetPixeColorRgbw
+    RgbwColor GetPixelColorRgbw(uint16_t indexPixel) const
+    {
+      switch (_type) {
+        case NeoPixelType_Grb:  return _pGrb->GetPixelColor(indexPixel);  break;
+        case NeoPixelType_Grbw: return _pGrbw->GetPixelColor(indexPixel); break;
+      }
+      return 0;
+    }
+
+    void ClearTo(RgbColor color)
+    {
+      switch (_type) {
+        case NeoPixelType_Grb: _pGrb->ClearTo(color);   break;
+        case NeoPixelType_Grbw:_pGrbw->ClearTo(color);  break;
+      }
+    }
+
+    void ClearTo(RgbwColor color)
+    {
+      switch (_type) {
+        case NeoPixelType_Grb:    break;
+        case NeoPixelType_Grbw:_pGrbw->ClearTo(color);  break;
+      }
+    }
+
+private:
+  NeoPixelType _type;
+
+  // have a member for every possible type
+  NeoPixelBrightnessBus<PIXELFEATURE3,PIXELMETHOD>*  _pGrb;
+  NeoPixelBrightnessBus<PIXELFEATURE4,PIXELMETHOD>* _pGrbw;
+
+  void cleanup()
+  {
+    switch (_type) {
+      case NeoPixelType_Grb:  delete _pGrb ; _pGrb  = NULL; break;
+      case NeoPixelType_Grbw: delete _pGrbw; _pGrbw = NULL; break;
+    }
+  }
+};
+#endif

wled00/WS2812FX.h

@@ -1,34 +1,18 @@
-//#define RGBW
-#define PIN 2 //strip pin. Only change for ESP32
-
-//automatically uses the right driver method for each platform
-#ifdef ARDUINO_ARCH_ESP32
-#define PIXELMETHOD NeoEsp32BitBangWs2813Method
-#else
-#define PIXELMETHOD NeoEsp8266Uart800KbpsMethod
-#endif
-
-//selects correct feature for RGB/RGBW
-#ifdef RGBW
-#define PIXELFEATURE NeoGrbwFeature
-#else
-#define PIXELFEATURE NeoGrbFeature
-#endif
+//pixelmethod now in NpbWrapper.h
 
 /*
   WS2812FX.h - Library for WS2812 LED effects.
-  
   Harm Aldick - 2016
   www.aldick.org
   FEATURES
     * A lot of blinken modes and counting
-    * WS2812FX can be used as drop-in replacement for Adafruit Neopixel Library
+    * WS2812FX can be used as drop-in replacement for Adafruit NeoPixel Library
   NOTES
-    * Uses the Adafruit Neopixel library. Get it here: 
+    * Uses the Adafruit NeoPixel library. Get it here:
       https://github.com/adafruit/Adafruit_NeoPixel
   LICENSE
   The MIT License (MIT)
-  Copyright (c) 2016  Harm Aldick 
+  Copyright (c) 2016  Harm Aldick
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
   in the Software without restriction, including without limitation the rights
@@ -44,27 +28,61 @@
   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.
-  Modified to work with WLED - differs from Github WS2812FX
+  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)
+  2017-02-02   added external trigger functionality (e.g. for sound-to-light)
+  Modified for WLED
 */
 
 #ifndef WS2812FX_h
 #define WS2812FX_h
 
-#include "Arduino.h"
-#include <NeoPixelBrightnessBus.h>
+#include "NpbWrapper.h"
 
-#define DEFAULT_BRIGHTNESS 50
-#define DEFAULT_MODE 0
-#define DEFAULT_SPEED 150
-#define DEFAULT_COLOR 0xFFAA00
+#define DEFAULT_BRIGHTNESS (uint8_t)50
+#define DEFAULT_MODE       (uint8_t)0
+#define DEFAULT_SPEED      (uint16_t)1000
+#define DEFAULT_COLOR      (uint32_t)0xFF0000
 
-#define SPEED_MIN 0
-#define SPEED_MAX 255
+#define min(a,b) ((a)<(b)?(a):(b))
+#define max(a,b) ((a)>(b)?(a):(b))
 
-#define BRIGHTNESS_MIN 0
-#define BRIGHTNESS_MAX 255
+/* each segment uses 38 bytes of SRAM memory, so if you're application fails because of
+  insufficient memory, decreasing MAX_NUM_SEGMENTS may help */
+#define MAX_NUM_SEGMENTS 10
+#define NUM_COLORS        3 /* number of colors per segment */
+#define SEGMENT          _segments[_segment_index]
+#define SEGMENT_RUNTIME  _segment_runtimes[_segment_index]
+#define SEGMENT_LENGTH   (SEGMENT.stop - SEGMENT.start + 1)
+#define SPEED_FORMULA_L  5 + (50*(255 - SEGMENT.speed))/SEGMENT_LENGTH
+#define RESET_RUNTIME    memset(_segment_runtimes, 0, sizeof(_segment_runtimes))
 
-#define MODE_COUNT 58
+// some common colors
+#define RED        (uint32_t)0xFF0000
+#define GREEN      (uint32_t)0x00FF00
+#define BLUE       (uint32_t)0x0000FF
+#define WHITE      (uint32_t)0xFFFFFF
+#define BLACK      (uint32_t)0x000000
+#define YELLOW     (uint32_t)0xFFFF00
+#define CYAN       (uint32_t)0x00FFFF
+#define MAGENTA    (uint32_t)0xFF00FF
+#define PURPLE     (uint32_t)0x400080
+#define ORANGE     (uint32_t)0xFF3000
+#define PINK       (uint32_t)0xFF1493
+#define ULTRAWHITE (uint32_t)0xFFFFFFFF
+
+// options
+// bit    8: reverse animation
+// bits 5-7: fade rate (0-7)
+// bit    4: gamma correction
+// bits 1-3: TBD
+#define NO_OPTIONS   (uint8_t)0x00
+#define REVERSE      (uint8_t)0x80
+#define IS_REVERSE   ((SEGMENT.options & REVERSE) == REVERSE)
+
+#define MODE_COUNT  74
 
 #define FX_MODE_STATIC                   0
 #define FX_MODE_BLINK                    1
@@ -72,8 +90,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_COLOR_SWEEP              6
+#define FX_MODE_DYNAMIC                  7
 #define FX_MODE_RAINBOW                  8
 #define FX_MODE_RAINBOW_CYCLE            9
 #define FX_MODE_SCAN                    10
@@ -93,7 +111,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
@@ -112,197 +130,245 @@
 #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
 #define FX_MODE_DUAL_COLOR_WIPE_OUT_IN  51
 #define FX_MODE_CIRCUS_COMBUSTUS        52
-#define FX_MODE_CUSTOM_CHASE            53
-#define FX_MODE_CC_ON_RAINBOW           54
-#define FX_MODE_CC_ON_RAINBOW_CYCLE     55
-#define FX_MODE_CC_BLINK                56
-#define FX_MODE_CC_RANDOM               57
+#define FX_MODE_HALLOWEEN               53
+#define FX_MODE_TRICOLOR_CHASE          54
+#define FX_MODE_TRICOLOR_WIPE           55
+#define FX_MODE_TRICOLOR_FADE           56
+#define FX_MODE_LIGHTNING               57
+#define FX_MODE_ICU                     58
+#define FX_MODE_MULTI_COMET             59
+#define FX_MODE_DUAL_LARSON_SCANNER     60
+#define FX_MODE_RANDOM_CHASE            61
+#define FX_MODE_OSCILLATE               62
+//Modes that use FastLED -->
+#define FX_MODE_PRIDE_2015              63
+#define FX_MODE_JUGGLE                  64
+#define FX_MODE_PALETTE                 65
+#define FX_MODE_FIRE_2012               66
+#define FX_MODE_COLORWAVES              67
+#define FX_MODE_BPM                     68
+#define FX_MODE_FILLNOISE8              69
+#define FX_MODE_NOISE16_1               70
+#define FX_MODE_NOISE16_2               71
+#define FX_MODE_NOISE16_3               72
+#define FX_MODE_NOISE16_4               73
 
-
-class WS2812FX : public NeoPixelBrightnessBus<PIXELFEATURE, PIXELMETHOD> {
-  typedef void (WS2812FX::*mode_ptr)(void);
+class WS2812FX {
+  typedef uint16_t (WS2812FX::*mode_ptr)(void);
+  
+  // segment parameters
   public:
-    WS2812FX(uint16_t n) : NeoPixelBrightnessBus<PIXELFEATURE, PIXELMETHOD>(n,PIN) {
+    typedef struct Segment { // 21 bytes
+      uint16_t start;
+      uint16_t stop;
+      uint8_t speed;
+      uint8_t intensity;
+      uint8_t palette;
+      uint8_t  mode;
+      uint8_t  options;
+      uint32_t colors[NUM_COLORS];
+    } segment;
 
-      _mode[FX_MODE_STATIC]                = &WS2812FX::mode_static;
-      _mode[FX_MODE_BLINK]                 = &WS2812FX::mode_blink;
-      _mode[FX_MODE_BREATH]                = &WS2812FX::mode_breath;
-      _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_RAINBOW]               = &WS2812FX::mode_rainbow;
-      _mode[FX_MODE_RAINBOW_CYCLE]         = &WS2812FX::mode_rainbow_cycle;
-      _mode[FX_MODE_SCAN]                  = &WS2812FX::mode_scan;
-      _mode[FX_MODE_DUAL_SCAN]             = &WS2812FX::mode_dual_scan;
-      _mode[FX_MODE_FADE]                  = &WS2812FX::mode_fade;
-      _mode[FX_MODE_THEATER_CHASE]         = &WS2812FX::mode_theater_chase;
-      _mode[FX_MODE_THEATER_CHASE_RAINBOW] = &WS2812FX::mode_theater_chase_rainbow;
-      _mode[FX_MODE_RUNNING_LIGHTS]        = &WS2812FX::mode_running_lights;
-      _mode[FX_MODE_TWINKLE]               = &WS2812FX::mode_twinkle;
-      _mode[FX_MODE_TWINKLE_RANDOM]        = &WS2812FX::mode_twinkle_random;
-      _mode[FX_MODE_TWINKLE_FADE]          = &WS2812FX::mode_twinkle_fade;
-      _mode[FX_MODE_TWINKLE_FADE_RANDOM]   = &WS2812FX::mode_twinkle_fade_random;
-      _mode[FX_MODE_SPARKLE]               = &WS2812FX::mode_sparkle;
-      _mode[FX_MODE_FLASH_SPARKLE]         = &WS2812FX::mode_flash_sparkle;
-      _mode[FX_MODE_HYPER_SPARKLE]         = &WS2812FX::mode_hyper_sparkle;
-      _mode[FX_MODE_STROBE]                = &WS2812FX::mode_strobe;
-      _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_CHASE_COLOR]           = &WS2812FX::mode_chase_color;
-      _mode[FX_MODE_CHASE_RANDOM]          = &WS2812FX::mode_chase_random;
-      _mode[FX_MODE_CHASE_RAINBOW]         = &WS2812FX::mode_chase_rainbow;
-      _mode[FX_MODE_CHASE_FLASH]           = &WS2812FX::mode_chase_flash;
-      _mode[FX_MODE_CHASE_FLASH_RANDOM]    = &WS2812FX::mode_chase_flash_random;
-      _mode[FX_MODE_CHASE_RAINBOW_WHITE]   = &WS2812FX::mode_chase_rainbow_white;
-      _mode[FX_MODE_COLORFUL]              = &WS2812FX::mode_colorful;
-      _mode[FX_MODE_TRAFFIC_LIGHT]         = &WS2812FX::mode_traffic_light;
-      _mode[FX_MODE_COLOR_SWEEP_RANDOM]    = &WS2812FX::mode_color_sweep_random;
-      _mode[FX_MODE_RUNNING_COLOR]         = &WS2812FX::mode_running_color;
-      _mode[FX_MODE_RUNNING_RED_BLUE]      = &WS2812FX::mode_running_red_blue;
-      _mode[FX_MODE_RUNNING_RANDOM]        = &WS2812FX::mode_running_random;
-      _mode[FX_MODE_LARSON_SCANNER]        = &WS2812FX::mode_larson_scanner;
-      _mode[FX_MODE_COMET]                 = &WS2812FX::mode_comet;
-      _mode[FX_MODE_FIREWORKS]             = &WS2812FX::mode_fireworks;
-      _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;
+  // segment runtime parameters
+    typedef struct Segment_runtime { // 17 bytes
+      unsigned long next_time;
+      uint32_t counter_mode_step;
+      uint32_t counter_mode_call;
+      uint16_t aux_param;
+      uint16_t aux_param2;
+      uint8_t trans_act;
+    } segment_runtime;
+
+    WS2812FX() {
+      _mode[FX_MODE_STATIC]                  = &WS2812FX::mode_static;
+      _mode[FX_MODE_BLINK]                   = &WS2812FX::mode_blink;
+      _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_COLOR_SWEEP]             = &WS2812FX::mode_color_sweep;
+      _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;
+      _mode[FX_MODE_DUAL_SCAN]               = &WS2812FX::mode_dual_scan;
+      _mode[FX_MODE_FADE]                    = &WS2812FX::mode_fade;
+      _mode[FX_MODE_THEATER_CHASE]           = &WS2812FX::mode_theater_chase;
+      _mode[FX_MODE_THEATER_CHASE_RAINBOW]   = &WS2812FX::mode_theater_chase_rainbow;
+      _mode[FX_MODE_TWINKLE]                 = &WS2812FX::mode_twinkle;
+      _mode[FX_MODE_TWINKLE_RANDOM]          = &WS2812FX::mode_twinkle_random;
+      _mode[FX_MODE_TWINKLE_FADE]            = &WS2812FX::mode_twinkle_fade;
+      _mode[FX_MODE_TWINKLE_FADE_RANDOM]     = &WS2812FX::mode_twinkle_fade_random;
+      _mode[FX_MODE_SPARKLE]                 = &WS2812FX::mode_sparkle;
+      _mode[FX_MODE_FLASH_SPARKLE]           = &WS2812FX::mode_flash_sparkle;
+      _mode[FX_MODE_HYPER_SPARKLE]           = &WS2812FX::mode_hyper_sparkle;
+      _mode[FX_MODE_STROBE]                  = &WS2812FX::mode_strobe;
+      _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_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;
+      _mode[FX_MODE_CHASE_FLASH]             = &WS2812FX::mode_chase_flash;
+      _mode[FX_MODE_CHASE_FLASH_RANDOM]      = &WS2812FX::mode_chase_flash_random;
+      _mode[FX_MODE_CHASE_RAINBOW_WHITE]     = &WS2812FX::mode_chase_rainbow_white;
+      _mode[FX_MODE_COLORFUL]                = &WS2812FX::mode_colorful;
+      _mode[FX_MODE_TRAFFIC_LIGHT]           = &WS2812FX::mode_traffic_light;
+      _mode[FX_MODE_COLOR_SWEEP_RANDOM]      = &WS2812FX::mode_color_sweep_random;
+      _mode[FX_MODE_RUNNING_COLOR]           = &WS2812FX::mode_running_color;
+      _mode[FX_MODE_RUNNING_RED_BLUE]        = &WS2812FX::mode_running_red_blue;
+      _mode[FX_MODE_RUNNING_RANDOM]          = &WS2812FX::mode_running_random;
+      _mode[FX_MODE_LARSON_SCANNER]          = &WS2812FX::mode_larson_scanner;
+      _mode[FX_MODE_COMET]                   = &WS2812FX::mode_comet;
+      _mode[FX_MODE_FIREWORKS]               = &WS2812FX::mode_fireworks;
+      _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_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;
       _mode[FX_MODE_DUAL_COLOR_WIPE_OUT_IN]  = &WS2812FX::mode_dual_color_wipe_out_in;
       _mode[FX_MODE_CIRCUS_COMBUSTUS]        = &WS2812FX::mode_circus_combustus;
-      _mode[FX_MODE_CUSTOM_CHASE]            = &WS2812FX::mode_cc_standard;
-      _mode[FX_MODE_CC_ON_RAINBOW]           = &WS2812FX::mode_cc_rainbow;
-      _mode[FX_MODE_CC_ON_RAINBOW_CYCLE]     = &WS2812FX::mode_cc_cycle;
-      _mode[FX_MODE_CC_BLINK]                = &WS2812FX::mode_cc_blink;
-      _mode[FX_MODE_CC_RANDOM]               = &WS2812FX::mode_cc_random;
+      _mode[FX_MODE_HALLOWEEN]               = &WS2812FX::mode_halloween;
+      _mode[FX_MODE_TRICOLOR_CHASE]          = &WS2812FX::mode_tricolor_chase;
+      _mode[FX_MODE_TRICOLOR_WIPE]           = &WS2812FX::mode_tricolor_wipe;
+      _mode[FX_MODE_TRICOLOR_FADE]           = &WS2812FX::mode_tricolor_fade;
+      _mode[FX_MODE_BREATH]                  = &WS2812FX::mode_breath;
+      _mode[FX_MODE_RUNNING_LIGHTS]          = &WS2812FX::mode_running_lights;
+      _mode[FX_MODE_LIGHTNING]               = &WS2812FX::mode_lightning;
+      _mode[FX_MODE_ICU]                     = &WS2812FX::mode_icu;
+      _mode[FX_MODE_MULTI_COMET]             = &WS2812FX::mode_multi_comet;
+      _mode[FX_MODE_DUAL_LARSON_SCANNER]     = &WS2812FX::mode_dual_larson_scanner;
+      _mode[FX_MODE_RANDOM_CHASE]            = &WS2812FX::mode_random_chase;
+      _mode[FX_MODE_OSCILLATE]               = &WS2812FX::mode_oscillate;
+      _mode[FX_MODE_FIRE_2012]               = &WS2812FX::mode_fire_2012;
+      _mode[FX_MODE_PRIDE_2015]              = &WS2812FX::mode_pride_2015;
+      _mode[FX_MODE_BPM]                     = &WS2812FX::mode_bpm;
+      _mode[FX_MODE_JUGGLE]                  = &WS2812FX::mode_juggle;
+      _mode[FX_MODE_PALETTE]                 = &WS2812FX::mode_palette;
+      _mode[FX_MODE_COLORWAVES]              = &WS2812FX::mode_colorwaves;
+      _mode[FX_MODE_FILLNOISE8]              = &WS2812FX::mode_fillnoise8;
+      _mode[FX_MODE_NOISE16_1]               = &WS2812FX::mode_noise16_1;
+      _mode[FX_MODE_NOISE16_2]               = &WS2812FX::mode_noise16_2;
+      _mode[FX_MODE_NOISE16_3]               = &WS2812FX::mode_noise16_3;
+      _mode[FX_MODE_NOISE16_4]               = &WS2812FX::mode_noise16_4;
 
-      _mode_index = DEFAULT_MODE;
-      _speed = DEFAULT_SPEED;
       _brightness = DEFAULT_BRIGHTNESS;
       _running = false;
-      _led_count = n;
-      _mode_last_call_time = 0;
-      _mode_delay = 0;
-      _color = DEFAULT_COLOR;
-      _mode_color = DEFAULT_COLOR;
-      _color_sec = 0;
-      _mode_color_sec = 0;
-      _cc_fs = true;
-      _cc_fe = false;
-      _cc_is = 0;
-      _cc_i1 = 0;
-      _cc_i2 = n-1;
-      _cc_num1 = 5;
-      _cc_num2 = 5;
-      _cc_step = 1;
-      _counter_mode_call = 0;
-      _counter_mode_step = 0;
-      _counter_cc_step = 0;
-      _fastStandard = false;
-      _locked = new boolean[n];
-      _cronixieDigits = new uint8_t[6];
+      _num_segments = 1;
+      _segments[0].mode = DEFAULT_MODE;
+      _segments[0].colors[0] = DEFAULT_COLOR;
+      _segments[0].start = 0;
+      _segments[0].speed = DEFAULT_SPEED;
+      _reverseMode = false;
+      _skipFirstMode = false;
+      paletteFade = 0;
+      paletteBlend = 0;
+      _locked = NULL;
+      _cronixieDigits = new byte[6];
+      bus = new NeoPixelWrapper();
+      RESET_RUNTIME;
     }
 
     void
-      show(void),
-      setPixelColor(uint16_t i, uint8_t r, uint8_t g, uint8_t b),
-      init(void),
+      init(bool supportWhite, uint16_t countPixels, bool skipFirst),
       service(void),
-      start(void),
-      stop(void),
+      clear(void),
+      strip_off(void),
+      fade_out(uint8_t r),
       setMode(uint8_t m),
-      setCustomChase(uint8_t i1, uint8_t i2, uint8_t is, uint8_t np, uint8_t ns, uint8_t stp, bool fs, bool fe),
-      setCCIndex1(uint8_t i1),
-      setCCIndex2(uint8_t i2),
-      setCCStart(uint8_t is),
-      setCCNum1(uint8_t np),
-      setCCNum2(uint8_t ns),
-      setCCStep(uint8_t stp),
-      setCCFS(bool fs),
-      setCCFE(bool fe),
       setSpeed(uint8_t s),
-      setIntensity(uint8_t in),
-      increaseSpeed(uint8_t s),
-      decreaseSpeed(uint8_t s),
-      setColor(uint8_t r, uint8_t g, uint8_t b),
-      setColor(uint8_t r, uint8_t g, uint8_t b, uint8_t w),
+      setIntensity(uint8_t i),
+      setPalette(uint8_t p),
+      setColor(uint8_t r, uint8_t g, uint8_t b, uint8_t w = 0),
+      setSecondaryColor(uint8_t r, uint8_t g, uint8_t b, uint8_t w = 0),
       setColor(uint32_t c),
-      setSecondaryColor(uint8_t r, uint8_t g, uint8_t b),
-      setSecondaryColor(uint8_t r, uint8_t g, uint8_t b, uint8_t w),
       setSecondaryColor(uint32_t c),
       setBrightness(uint8_t b),
-      increaseBrightness(uint8_t s),
-      decreaseBrightness(uint8_t s),
+      setReverseMode(bool b),
       driverModeCronixie(bool b),
-      setCronixieDigits(uint8_t* d),
+      setCronixieDigits(byte* d),
       setCronixieBacklight(bool b),
-      setIndividual(int i),
-      setIndividual(int i, uint32_t col),
-      setRange(int i, int i2),
-      setRange(int i, int i2, uint32_t col),
-      lock(int i),
-      lockRange(int i, int i2),
-      lockAll(void),
-      unlock(int i),
-      unlockRange(int i, int i2),
+      setIndividual(uint16_t i, uint32_t col),
+      setRange(uint16_t i, uint16_t i2, uint32_t col),
+      lock(uint16_t i),
+      lockRange(uint16_t i, uint16_t i2),
+      unlock(uint16_t i),
+      unlockRange(uint16_t i, uint16_t i2),
       unlockAll(void),
-      setFastUpdateMode(bool b),
+      setTransitionMode(bool t),
       trigger(void),
-      setLedCount(uint16_t i),
-      setFade(int sp);
-
-    boolean 
-      isRunning(void),
-      isLocked(int i);
+      setNumSegments(uint8_t n),
+      setSegment(uint8_t n, uint16_t start, uint16_t stop, uint8_t mode, uint32_t color,   uint8_t speed, uint8_t intensity, bool reverse),
+      setSegment(uint8_t n, uint16_t start, uint16_t stop, uint8_t mode, const uint32_t colors[], uint8_t speed, uint8_t intensity, bool reverse),
+      setSegment(uint8_t n, uint16_t start, uint16_t stop, uint8_t mode, const uint32_t colors[], uint8_t speed, uint8_t intensity, uint8_t options),
+      resetSegments(),
+      setPixelColor(uint16_t n, uint32_t c),
+      setPixelColor(uint16_t n, uint8_t r, uint8_t g, uint8_t b, uint8_t w = 0),
+      show(void);
 
     uint8_t
-      get_random_wheel_index(uint8_t),
+      paletteFade,
+      paletteBlend,
+      getBrightness(void),
       getMode(void),
       getSpeed(void),
-      getIntensity(void),
-      getBrightness(void),
-      getModeCount(void);
+      getNumSegments(void),
+      get_random_wheel_index(uint8_t);
 
     uint32_t
       color_wheel(uint8_t),
+      color_blend(uint32_t,uint32_t,uint8_t),
+      getPixelColor(uint16_t),
       getColor(void);
 
     double
-      getPowerEstimate(uint8_t leds, uint32_t c, uint8_t b),
-      getSafePowerMultiplier(double safeMilliAmps, uint8_t leds, uint32_t c, uint8_t b);
+      getPowerEstimate(uint16_t leds, uint32_t c, byte b),
+      getSafePowerMultiplier(double safeMilliAmps, uint16_t leds, uint32_t c, byte b);
 
-  private:
+    WS2812FX::Segment
+      getSegment(void);
 
-    void
-      begin(void),
-      clear(void),
-      setPixelColor(uint16_t i, uint32_t c),
-      setPixelColor(uint16_t i, uint8_t r, uint8_t g, uint8_t b, uint8_t w),
-      setPixelColorRaw(uint16_t i, uint8_t r, uint8_t g, uint8_t b, uint8_t w),
-      dofade(void),
-      strip_off(void),
-      strip_off_respectLock(void),
+    WS2812FX::Segment_runtime
+      getSegmentRuntime(void);
+
+    WS2812FX::Segment*
+      getSegments(void);
+
+    // mode helper functions
+    uint16_t
+      blink(uint32_t, uint32_t, bool strobe),
+      color_wipe(uint32_t, uint32_t, bool),
+      theater_chase(uint32_t, uint32_t),
+      twinkle(uint32_t),
+      twinkle_fade(uint32_t),
+      chase(uint32_t, uint32_t, uint32_t),
+      running(uint32_t, uint32_t),
+      fireworks(uint32_t),
+      tricolor_chase(uint32_t, uint32_t, uint32_t);
+
+    // builtin modes
+    uint16_t
       mode_static(void),
       mode_blink(void),
+      mode_blink_rainbow(void),
+      mode_strobe(void),
+      mode_strobe_rainbow(void),
       mode_color_wipe(void),
+      mode_color_sweep(void),
       mode_color_wipe_random(void),
+      mode_color_sweep_random(void),
       mode_random_color(void),
-      mode_single_dynamic(void),
-      mode_multi_dynamic(void),
+      mode_dynamic(void),
       mode_breath(void),
       mode_fade(void),
       mode_scan(void),
@@ -319,11 +385,8 @@ class WS2812FX : public NeoPixelBrightnessBus<PIXELFEATURE, PIXELMETHOD> {
       mode_sparkle(void),
       mode_flash_sparkle(void),
       mode_hyper_sparkle(void),
-      mode_strobe(void),
-      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),
@@ -332,7 +395,6 @@ class WS2812FX : public NeoPixelBrightnessBus<PIXELFEATURE, PIXELMETHOD> {
       mode_chase_rainbow_white(void),
       mode_colorful(void),
       mode_traffic_light(void),
-      mode_color_sweep_random(void),
       mode_running_color(void),
       mode_running_red_blue(void),
       mode_running_random(void),
@@ -341,73 +403,74 @@ class WS2812FX : public NeoPixelBrightnessBus<PIXELFEATURE, PIXELMETHOD> {
       mode_fireworks(void),
       mode_fireworks_random(void),
       mode_merry_christmas(void),
+      mode_halloween(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),
       mode_dual_color_wipe_out_in(void),
       mode_circus_combustus(void),
-      mode_cc_core(void),
-      mode_cc_standard(void),
-      mode_cc_rainbow(void),
-      mode_cc_cycle(void),
-      mode_cc_blink(void),
-      mode_cc_random(void);
+      mode_bicolor_chase(void),
+      mode_tricolor_chase(void),
+      mode_tricolor_wipe(void),
+      mode_tricolor_fade(void),
+      mode_icu(void),
+      mode_multi_comet(void),
+      mode_dual_larson_scanner(void),
+      mode_random_chase(void),
+      mode_oscillate(void),
+      mode_fire_2012(void),
+      mode_pride_2015(void),
+      mode_bpm(void),
+      mode_juggle(void),
+      mode_palette(void),
+      mode_colorwaves(void),
+      mode_fillnoise8(void),
+      mode_noise16_1(void),
+      mode_noise16_2(void),
+      mode_noise16_3(void),
+      mode_noise16_4(void),
+      mode_lightning(void);
 
-    boolean
-      _triggered,
-      _fastStandard,
-      _cronixieMode,
-      _cronixieBacklightEnabled,
-      _cc_fs,
-      _cc_fe,
-      _running;
+  private:
+    NeoPixelWrapper *bus;
+  
+    uint16_t _length;
+    uint16_t _rand16seed;
+    uint8_t _brightness;
 
-    boolean*
-      _locked;
-
-    uint8_t
-      minval(uint8_t v, uint8_t w),
-      maxval(uint8_t v, uint8_t w),
-      _mode_index,
-      _speed,
-      _intensity,
-      _cc_i1,
-      _cc_i2,
-      _cc_is,
-      _cc_num1,
-      _cc_num2,
-      _cc_step,
-      _brightness;
-
-    uint8_t*
-      _cronixieDigits;
-
-    uint16_t
-      _led_count;
-
-    uint32_t
-      getPixelColor(uint16_t i),
-      _color,
-      _color_sec,
-      _counter_mode_call,
-      _counter_mode_step,
-      _counter_cc_step,
-      _mode_color,
-      _mode_color_sec,
-      _mode_delay;
+    void handle_palette(void);
 
     double
       _cronixieSecMultiplier;
 
-    unsigned long
-      _mode_last_call_time;
+    boolean
+      _running,
+      _rgbwMode,
+      _reverseMode,
+      _cronixieMode,
+      _cronixieBacklightEnabled,
+      _skipFirstMode,
+      _triggered;
 
-    mode_ptr
-      _mode[MODE_COUNT];
+    byte* _locked;
+    byte* _cronixieDigits;
+
+    mode_ptr _mode[MODE_COUNT]; // SRAM footprint: 4 bytes per element
+
+    
+    uint32_t _lastPaletteChange = 0;
+    
+    uint8_t _segment_index = 0;
+    uint8_t _segment_index_palette_last = 99;
+    uint8_t _num_segments = 1;
+    segment _segments[MAX_NUM_SEGMENTS] = { // SRAM footprint: 20 bytes per element
+      // start, stop, speed, intensity, mode, options, color[]
+      { 0, 7, DEFAULT_SPEED, 128, FX_MODE_STATIC, NO_OPTIONS, {DEFAULT_COLOR}}
+    };
+    segment_runtime _segment_runtimes[MAX_NUM_SEGMENTS]; // SRAM footprint: 17 bytes per element
 };
 
 #endif

wled00/data/index.htm

@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
-<head><meta charset="utf-8">
+<head><meta charset="utf-8"><meta name="theme-color" content="#fff">
 	<link rel='shortcut icon' type='image/x-icon' href='/favicon.ico'/>
-	<title>WLED 0.5.0</title>
+	<title>WLED 0.8.0</title>
 	<script>
 		var d=document;
 		var w=window.getComputedStyle(d.querySelector("html"));
@@ -33,6 +33,7 @@
 			aC = w.getPropertyValue("--aCol");
 			bC = w.getPropertyValue("--bCol");
 			dC = w.getPropertyValue("--dCol");
+			d.querySelector("meta[name=theme-color]").setAttribute("content",bC);
 			CV(0);
 			setInterval('GIO()', 5000);
 			GIO();
@@ -46,7 +47,7 @@
 				if (this.readyState == 4) {
 					if (this.status == 200) {
 						if (this.responseXML != null) {
-							d.Cf.SA.value = this.responseXML.getElementsByTagName('act')[0].childNodes[0].nodeValue;
+							d.Cf.SA.value = this.responseXML.getElementsByTagName('ac')[0].childNodes[0].nodeValue;
 							d.Cf.SR.value = this.responseXML.getElementsByTagName('cl')[0].childNodes[0].nodeValue;
 							d.Cf.SG.value = this.responseXML.getElementsByTagName('cl')[1].childNodes[0].nodeValue;
 							d.Cf.SB.value = this.responseXML.getElementsByTagName('cl')[2].childNodes[0].nodeValue;
@@ -57,6 +58,7 @@
 								uwv = false;
 							}
 							Cf.TX.selectedIndex = this.responseXML.getElementsByTagName('fx')[0].childNodes[0].nodeValue;
+							Cf.FP.selectedIndex = this.responseXML.getElementsByTagName('fp')[0].childNodes[0].nodeValue;
 							d.Cf.SX.value = this.responseXML.getElementsByTagName('sx')[0].childNodes[0].nodeValue;
 							d.Cf.IX.value = this.responseXML.getElementsByTagName('ix')[0].childNodes[0].nodeValue;
 							nla = (this.responseXML.getElementsByTagName('nl')[0].innerHTML)!=0?true:false;
@@ -69,13 +71,13 @@
 							nState = 0;
 							nState = (this.responseXML.getElementsByTagName('nr')[0].innerHTML)!=0?1:0;
 							nState += (this.responseXML.getElementsByTagName('ns')[0].innerHTML)!=0?2:0;
-							d.getElementsByClassName("desc")[0].innerHTML = this.responseXML.getElementsByTagName('desc')[0].innerHTML;
+							d.getElementsByClassName("desc")[0].innerHTML = this.responseXML.getElementsByTagName('ds')[0].innerHTML;
 							UV();
 						}
 					}
 				}
 			}
-			request.open("GET", "win/" +resp +nocache, true);
+			request.open("GET", "win" +resp +nocache, true);
 			request.send(null);
 			resp="";
 		}
@@ -119,16 +121,9 @@
 			d.Cf.SB.value=b;
 			GC();
 		}
-		function GetCC()
+		function GP()
 		{
-			resp+="&CP=";
-			resp+=d.Cf.PF.value;
-			resp+="&CS=";
-			resp+=d.Cf.SF.value;
-			resp+="&CM=";
-			resp+=d.Cf.HF.value;
-			resp+=(d.Cf.SC.checked)?"&CF=1":"&CF=0";
-			resp+=(d.Cf.EC.checked)?"&CE=1":"&CE=0";
+			resp+= "&FP=" + Cf.FP.selectedIndex;
 			GIO();
 		}
 		function CV(v)
@@ -177,8 +172,8 @@
 				case 3: gId("path1").style.fill = aC; gId("path2").style.fill = aC;
 			}
 			tgb.style.fill=(Cf.SA.value>0)?aC:dC;
-			ccX.style.display=(Cf.TX.selectedIndex>52)?"block":"none";
-			fof.style.fill=(Cf.TX.selectedIndex>52)?aC:dC;
+			fpX.style.display=(Cf.TX.selectedIndex>64)?"block":"none";
+			fof.style.fill=(Cf.TX.selectedIndex>64)?aC:dC;
 			fmr.style.fill=(Cf.TX.selectedIndex<1)?aC:dC;
 		}
 		function TgT()
@@ -197,9 +192,10 @@
 		function SwFX(s)
 		{
 			var n=Cf.TX.selectedIndex+s;
+			if (n==-1||n==74) return;
 			Cf.TX.selectedIndex =n;
 			if (n < 0) Cf.TX.selectedIndex = 0;
-			if (n > 57) Cf.TX.selectedIndex = 53;
+			if (n > 73) Cf.TX.selectedIndex = 65;
 			GX();
 		}
 		function TgHSB()
@@ -214,24 +210,25 @@
 		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 PAt()
+		{
+			resp+=(d.Cf.BC.checked)?"&PA=1":"&PA=0";
+			resp+=(d.Cf.CC.checked)?"&PC=1":"&PC=0";
+			resp+=(d.Cf.FC.checked)?"&PX=1":"&PX=0";
 		}
 		function PSIO(sv)
 		{
+			PAt();
 			if(sv)
 			{
 				resp+="&PS=";
 				resp+=d.Cf.FF.value;
 			} else
 			{
-				if (d.Cf.BC.checked&&d.Cf.CC.checked&&d.Cf.FC.checked)
-				{resp+="&PL=";resp+=d.Cf.FF.value;}
-				else {
-					if(d.Cf.BC.checked){resp+="&PA=";resp+=d.Cf.FF.value;}
-					if(d.Cf.CC.checked){resp+="&PC=";resp+=d.Cf.FF.value;}
-					if(d.Cf.FC.checked){resp+="&PX=";resp+=d.Cf.FF.value;}
-				}
+				resp+="&PL=";resp+=d.Cf.FF.value;
 			}
 			GIO();
 		}
@@ -335,14 +332,28 @@
 			}
 			GIO();
 		}
+		function uCY()
+		{
+			PAt();
+			resp+=(d.Cf.CY.checked)?"&CY=1":"&CY=0";
+			resp+="&P1=" + Cf.P1.value;
+			resp+="&P2=" + Cf.P2.value;
+			resp+="&PT=" + Cf.PT.value;
+			GIO();
+		}
+		function R()
+		{
+			resp+="&PL=0";GIO();
+		}
 	</script>
 	<style>
 		:root {
-			--aCol: #0ac;
-			--bCol: #124;
-			--cCol: #334;
-			--dCol: #288;
-			--sCol: #FF00FF;
+			--aCol: #D9B310;
+			--bCol: #0B3C5D;
+			--cCol: #1D2731;
+			--dCol: #328CC1;
+			--sCol: #000;
+			--tCol: #328CC1;
 			--cFn: Verdana;
 		}
 		.ctrl_box {
@@ -575,14 +586,14 @@
 			<svg id="fmf" onclick="SwFX(1)"><use xlink:href="#lnr-arrow-right-circle"></use></svg>
 			<svg id="fof" onclick="SwFX(99)"><use xlink:href="#lnr-rocket"></use></svg><br><br>
 			<select name="TX" onchange="GX()">
-				<option value="0" selected>Static (0)</option>
+				<option value="0" selected>Solid (0)</option>
 				<option value="1">Blink (1)</option>
 				<option value="2">Breath (2)</option>
 				<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">Sweep (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 +613,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,18 +632,34 @@
 				<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>
 				<option value="51">Wipe OI (51)</option>
 				<option value="52">Circus (52)</option>
-				<option value="53">Custom Chase (53)</option>
-				<option value="54">CC Colorloop (54)</option>
-				<option value="55">CC Rainbow (55)</option>
-				<option value="56">CC Blink (56)</option>
-				<option value="57">CC Random (57)</option>
+				<option value="53">Halloween (53)</option>
+				<option value="54">Tricolor Chase (54)</option>
+				<option value="55">Tricolor Wipe (55)</option>
+				<option value="56">Tricolor Fade (56)</option>
+				<option value="57">Lighting (57)</option>
+				<option value="58">ICU (58)</option>
+				<option value="59">Multi Comet (59)</option>
+				<option value="60">Scanner x2 (60)</option>
+				<option value="61">Random Chase (61)</option>
+				<option value="62">Oscillate (62)</option>
+				<option value="63">Pride 2015 (63)</option>
+				<option value="64">Juggle (64)</option>
+				<option value="65">Palette (65)</option>
+				<option value="66">Fire 2012 (66)</option>
+				<option value="67">Colorwaves (67)</option>
+				<option value="68">BPM (68)</option>
+				<option value="69">Fill Noise 8 (69)</option>
+				<option value="70">Noise 16 1 (70)</option>
+				<option value="71">Noise 16 2 (71)</option>
+				<option value="72">Noise 16 3 (72)</option>
+				<option value="73">Noise 16 4 (73)</option>
 			</select><br><br>
 			Set secondary color to 
 			<button type="button" onclick="CS(0)">White</button>
@@ -641,12 +668,55 @@
 			<button type="button" onclick="CS(3)">Primary</button>
 			<button type="button" onclick="CS(4)">Swap P/S</button>
 			or <button type="button" onclick="CS(5)">Set Primary to Random</button>
-				<div id="ccX">
-				<br>Custom Theater Chase<br>
-				using <input id="ccP" name="PF" type="number" value="2" min="0" max="255" step="1" onchange="GetCC()"> primary and 
-				<input id="ccS" name ="SF" type="number" value="4" min="0" max="255" step="1" onchange="GetCC()"> secondary color LEDs,<br>
-				doing <input id="ccH" name="HF" type="number" value="1" min="0" max="255" step="1" onchange="GetCC()"> steps per tick,
-				from <input type="checkbox" onchange="GetCC()" name="SC"> start and <input type="checkbox" onchange="GetCC()" name="EC"> end.
+				<div id="fpX">
+				<br>FastLED Palette<br><br>
+				<select name="FP" onchange="GP()">
+					<option value="0" selected>Default</option>
+					<option value="1">Random Cycle</option>
+					<option value="2">Primary Color Only</option>
+					<option value="3">Based on Primary</option>
+					<option value="4">Set Colors Only</option>
+					<option value="5">Based on Set Colors</option>
+					<option value="6">Party</option>
+					<option value="7">Cloud</option>
+					<option value="8">Lava</option>
+					<option value="9">Ocean</option>
+					<option value="10">Forest</option>
+					<option value="11">Rainbow</option>
+					<option value="12">Rainbow Stripe</option>
+					<option value="13">Sunset</option>
+					<option value="14">Rivendell</option>
+					<option value="15">Breeze</option>
+					<option value="16">Red & Blue</option>
+					<option value="17">Yellowout</option>
+					<option value="18">Analogous</option>
+					<option value="19">Splash</option>
+					<option value="20">Pastel</option>
+					<option value="21">Sunset2</option>
+					<option value="22">Beech</option>
+					<option value="23">Vintage</option>
+					<option value="24">Departure</option>
+					<option value="25">Landscape</option>
+					<option value="26">Beach</option>
+					<option value="27">Sherbet</option>
+					<option value="28">Hult</option>
+					<option value="29">Hult64</option>
+					<option value="30">Drywet</option>
+					<option value="31">Jul</option>
+					<option value="32">Grintage</option>
+					<option value="33">Rewhi</option>
+					<option value="34">Tertiary</option>
+					<option value="35">Fire</option>
+					<option value="36">Icefire</option>
+					<option value="37">Cyane</option>
+					<option value="38">Light Pink</option>
+					<option value="39">Autumn</option>
+					<option value="40">Magenta</option>
+					<option value="41">Magred</option>
+					<option value="42">Yelmag</option>
+					<option value="43">Yelblu</option>
+					<option value="44">Orange & Teal</option>
+				</select>
 				</div>
 				<div id="slX" class="sl">
 				<input type="range" title="Effect Speed" class="sds" name="SX" value="0" min="0" max="255" step="1" onchange="GX()"></div>
@@ -659,9 +729,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/data/msg.htm

@@ -9,7 +9,7 @@
 		window.location = "/settings";
 	}
 	function RP() {
-		top.location.href=top.location.href;
+		top.location.href="/";
 	}
 	</script>
 	<style>

wled00/data/settings.htm

@@ -19,6 +19,9 @@
 			margin: 0;
 			background-attachment: fixed;
 		}
+		html {
+			--h:11.55vh;
+		}
 		button {
 			background: var(--bCol);
 			color: var(--tCol);
@@ -27,13 +30,23 @@
 			display: inline-block;
 			filter: drop-shadow( -5px -5px 5px var(--sCol) );
 			font-size: 8vmin;
-			height:13.86vh;
+			height:var(--h);
 			width: 95%;
 			margin-top: 2.4vh;
 		}
 	</style>
+	<script>
+	function BB()
+	{
+		if (window.frameElement) {
+			document.getElementById("b").style.display = "none";
+			document.documentElement.style.setProperty('--h',"13.86vh");
+		}
+	}
+	</script>
 </head>
-<body>
+<body onload="BB()">
+<form action="/"><button type=submit id="b">Back</button></form>
 <form action="/settings/wifi"><button type="submit">WiFi Setup</button></form>
 <form action="/settings/leds"><button type="submit">LED Preferences</button></form>
 <form action="/settings/ui"><button type="submit">User Interface</button></form>

wled00/htmls01.h

@@ -1,21 +1,25 @@
 /*
  * Settings html
  */
+ 
+//common CSS of settings pages
 const char PAGE_settingsCss[] PROGMEM = R"=====(
 body{font-family:var(--cFn),sans-serif;text-align:center;background:var(--cCol);color:var(--tCol);line-height:200%;margin:0;background-attachment:fixed}hr{border-color:var(--dCol);filter:drop-shadow(-5px -5px 5px var(--sCol))}button{background:var(--bCol);color:var(--tCol);font-family:var(--cFn),sans-serif;border:.3ch solid var(--bCol);display:inline-block;filter:drop-shadow(-5px -5px 5px var(--sCol));font-size:20px;margin:8px;margin-top:12px}.helpB{text-align:left;position:absolute;width:60px}input{background:var(--bCol);color:var(--tCol);font-family:var(--cFn),sans-serif;border:.5ch solid var(--bCol);filter:drop-shadow(-5px -5px 5px var(--sCol))}input[type=number]{width:3em}select{background:var(--bCol);color:var(--tCol);font-family:var(--cFn),sans-serif;border:0.5ch solid var(--bCol);filter:drop-shadow( -5px -5px 5px var(--sCol) );}</style>
 )=====";
 
+
+//settings menu
 const char PAGE_settings0[] PROGMEM = R"=====(
 <!DOCTYPE html>
-<html>
-<head>
-<title>WLED Settings</title>
+<html><head><title>WLED Settings</title>
 )=====";
 
 const char PAGE_settings1[] PROGMEM = R"=====(
-body{text-align:center;background:var(--cCol);height:100%;margin:0;background-attachment:fixed}button{background:var(--bCol);color:var(--tCol);font-family:var(--cFn),sans-serif;border:.3ch solid var(--bCol);display:inline-block;filter:drop-shadow(-5px -5px 5px var(--sCol));font-size:8vmin;height:13.86vh;width:95%;margin-top:2.4vh}</style>
+body{text-align:center;background:var(--cCol);height:100%;margin:0;background-attachment:fixed}html{--h:11.55vh}button{background:var(--bCol);color:var(--tCol);font-family:var(--cFn),Helvetica,sans-serif;border:.3ch solid var(--bCol);display:inline-block;filter:drop-shadow(-5px -5px 5px var(--sCol));font-size:8vmin;height:var(--h);width:95%;margin-top:2.4vh}</style>
+<script>function BB(){if(window.frameElement){document.getElementById("b").style.display="none";document.documentElement.style.setProperty("--h","13.86vh")}};</script>
 </head>
-<body>
+<body onload=BB()>
+<form action=/><button type=submit id=b>Back</button></form>
 <form action=/settings/wifi><button type=submit>WiFi Setup</button></form>
 <form action=/settings/leds><button type=submit>LED Preferences</button></form>
 <form action=/settings/ui><button type=submit>User Interface</button></form>
@@ -26,123 +30,151 @@ body{text-align:center;background:var(--cCol);height:100%;margin:0;background-at
 </html>
 )=====";
 
+
+//wifi settings
 const char PAGE_settings_wifi0[] PROGMEM = R"=====(
 <!DOCTYPE html>
-<html>
-<head>
+<html><head>
 <title>WiFi Settings</title><script>function H(){window.open("https://github.com/Aircoookie/WLED/wiki/Settings#wifi-settings");}function B(){window.history.back();}function GetV(){var d = document;
 )=====";
+
 const char PAGE_settings_wifi1[] PROGMEM = R"=====(
 </head>
 <body onload="GetV()">
 <form id="form_s" name="Sf" method="post">
 <div class="helpB"><button type="button" onclick="H()">?</button></div>
-<button type="button" onclick="B()">Back</button><button type="submit" name="SUBM">Save & Reboot</button><hr>
+<button type="button" onclick="B()">Back</button><button type="submit">Save & Reboot</button><hr>
 <h2>WiFi setup</h2>
 <h3>Connect to existing network</h3>
-Network name (SSID, empty to not connect): <br><input name="CSSID" maxlength="32"> <br>
-Network password: <br> <input type="password" name="CPASS" maxlength="63"> <br>
-Static IP (leave at 0.0.0.0 for DHCP): <br>
-<input name="CSIP0" type="number" min="0" max="255" required> .
-<input name="CSIP1" type="number" min="0" max="255" required> .
-<input name="CSIP2" type="number" min="0" max="255" required> .
-<input name="CSIP3" type="number" min="0" max="255" required> <br>
-Static gateway: <br>
-<input name="CSGW0" type="number" min="0" max="255" required> .
-<input name="CSGW1" type="number" min="0" max="255" required> .
-<input name="CSGW2" type="number" min="0" max="255" required> .
-<input name="CSGW3" type="number" min="0" max="255" required> <br>
-Static subnet mask: <br>
-<input name="CSSN0" type="number" min="0" max="255" required> .
-<input name="CSSN1" type="number" min="0" max="255" required> .
-<input name="CSSN2" type="number" min="0" max="255" required> .
-<input name="CSSN3" type="number" min="0" max="255" required> <br>
-mDNS address (leave empty for no mDNS): <br/>
-http:// <input name="CMDNS" maxlength="32"> .local <br>
-Try connecting before opening AP for: <input name="APWTM" type="number" min="0" max="255" required> s <br>
-Client IP: <span class="sip"> Not connected </span> <br>
+Network name (SSID, empty to not connect): <br><input name="CS" maxlength="32"><br>
+Network password: <br> <input type="password" name="CP" maxlength="63"><br>
+Static IP (leave at 0.0.0.0 for DHCP):<br>
+<input name="I0" type="number" min="0" max="255" required> .
+<input name="I1" type="number" min="0" max="255" required> .
+<input name="I2" type="number" min="0" max="255" required> .
+<input name="I3" type="number" min="0" max="255" required><br>
+Static gateway:<br>
+<input name="G0" type="number" min="0" max="255" required> .
+<input name="G1" type="number" min="0" max="255" required> .
+<input name="G2" type="number" min="0" max="255" required> .
+<input name="G3" type="number" min="0" max="255" required><br>
+Static subnet mask:<br>
+<input name="S0" type="number" min="0" max="255" required> .
+<input name="S1" type="number" min="0" max="255" required> .
+<input name="S2" type="number" min="0" max="255" required> .
+<input name="S3" type="number" min="0" max="255" required><br>
+mDNS address (leave empty for no mDNS):<br/>
+http:// <input name="CM" maxlength="32"> .local<br>
+Try connecting before opening AP for: <input name="AT" type="number" min="0" max="255" required> s <br>
+Client IP: <span class="sip"> Not connected </span><br>
 <h3>Configure Access Point</h3>
-AP SSID (leave empty for no AP): <br> <input name="APSSID" maxlength="32"> <br>
-Hide AP name: <input type="checkbox" name="APHSSID"> <br>
-AP password (leave empty for open): <br> <input type="password" name="APPASS" maxlength="63"> <br>
-Access Point WiFi channel: <input name="APCHAN" type="number" min="1" max="13" required> <br>
-AP IP: <span class="sip"> Not active </span> <hr>
-<button type="button" onclick="B()">Back</button><button type="submit" name="SUBM">Save & Reboot</button>
+AP SSID (leave empty for no AP):<br> <input name="AS" maxlength="32"><br>
+Hide AP name: <input type="checkbox" name="AH"><br>
+AP password (leave empty for open):<br> <input type="password" name="AP" maxlength="63"> <br>
+Access Point WiFi channel: <input name="AC" type="number" min="1" max="13" required><br>
+AP IP: <span class="sip"> Not active </span><hr>
+<button type="button" onclick="B()">Back</button><button type="submit">Save & Reboot</button>
 </form>
 </body>
 </html>
 )=====";
 
+
+//LED settings
 const char PAGE_settings_leds0[] PROGMEM = R"=====(
 <!DOCTYPE html>
 <html><head>
 <title>LED Settings</title><script>function H(){window.open("https://github.com/Aircoookie/WLED/wiki/Settings#led-settings");}function B(){window.history.back();}function GetV(){var d = document;
 )=====";
+
 const char PAGE_settings_leds1[] PROGMEM = R"=====(
 </head>
 <body onload="GetV()">
 <form id="form_s" name="Sf" method="post">
 <div class="helpB"><button type="button" onclick="H()">?</button></div>
-<button type="button" onclick="B()">Back</button><button type="submit" name="SUBM">Save</button><hr>
+<button type="button" onclick="B()">Back</button><button type="submit">Save</button><hr>
 <h2>LED setup</h2>
-LED count (max. 255): <input name="LEDCN" type="number" min="1" max="255" required> <br>
-<i>The default boot color is always saved in preset slot 0.</i><br>
-Alternatively, apply preset <input name="BOOTP" type="number" min="0" max="25" required> at boot<br>
+LED count: <input name="LC" type="number" min="1" max="1200" required><br>
+LEDs are 4-channel type (RGBW): <input type="checkbox" name="EW"><br>
+<br>
+Apply preset <input name="BP" type="number" min="0" max="25" required> at boot (0 uses defaults)<br>
+Turn on after power up/reset: <input type="checkbox" name="BO"><br>
+<br>
 Default RGB color:
-<input name="CLDFR" type="number" min="0" max="255" required>
-<input name="CLDFG" type="number" min="0" max="255" required>
-<input name="CLDFB" type="number" min="0" max="255" required> <br>
-Default brightness: <input name="CLDFA" type="number" min="0" max="255" required> (0-255) <br>
-Default white value (only RGBW, -1 to disable): <input name="CLDFW" type="number" min="-1" max="255" required> <br>
-Default effect ID: <input name="FXDEF" type="number" min="0" max="57" required> <br>
-Default effect speed: <input name="SXDEF" type="number" min="0" max="255" required> <br>
-Default effect intensity: <input name="IXDEF" type="number" min="0" max="255" required> <br>
+<input name="CR" type="number" min="0" max="255" required>
+<input name="CG" type="number" min="0" max="255" required>
+<input name="CB" type="number" min="0" max="255" required><br>
+Default white value (only RGBW): <input name="CW" type="number" min="0" max="255" required><br>
+Auto-calculate white from RGB instead: <input type="checkbox" name="AW"><br>
+Default brightness: <input name="CA" type="number" min="0" max="255" required> (0-255)<br>
+Default effect ID: <input name="FX" type="number" min="0" max="57" required><br>
+Default effect speed: <input name="SX" type="number" min="0" max="255" required><br>
+Default effect intensity: <input name="IX" type="number" min="0" max="255" required><br>
+Default effect palette: <input name="FP" type="number" min="0" max="255" required><br>
 Default secondary RGB(W):<br>
-<input name="CSECR" type="number" min="0" max="255" required>
-<input name="CSECG" type="number" min="0" max="255" required>
-<input name="CSECB" type="number" min="0" max="255" required>
-<input name="CSECW" type="number" min="0" max="255" required><br>
-Ignore and use current color, brightness and effects: <input type="checkbox" name="CBEOR"> <br>
-Turn on after power up/reset: <input type="checkbox" name="BOOTN"> <br>
-Use Gamma correction for brightness: <input type="checkbox" name="GCBRI"> <br>
-Use Gamma correction for color: <input type="checkbox" name="GCRGB"> <br>
-Brightness factor: <input name="NRBRI" type="number" min="0" max="255" required> %
+<input name="SR" type="number" min="0" max="255" required>
+<input name="SG" type="number" min="0" max="255" required>
+<input name="SB" type="number" min="0" max="255" required>
+<input name="SW" type="number" min="0" max="255" required><br>
+Ignore and use current color, brightness and effects: <input type="checkbox" name="IS"><br>
+Save current preset cycle configuration as boot default: <input type="checkbox" name="PC"><br>
+<br>
+Use Gamma correction for color: <input type="checkbox" name="GC"> (strongly recommended)<br>
+Use Gamma correction for brightness: <input type="checkbox" name="GB"> (not recommended)<br>
+Brightness factor: <input name="BF" type="number" min="0" max="255" required> %
 <h3>Transitions</h3>
-Fade: <input type="checkbox" name="TFADE"><br>
-Sweep: <input type="checkbox" name="TSWEE">  Invert direction: <input type="checkbox" name="TSDIR"><br>
-Transition Delay: <input name="TDLAY" maxlength="5" size="2"> ms
+Crossfade: <input type="checkbox" name="TF"><br>
+Transition Time: <input name="TD" maxlength="5" size="2"> ms<br>
+Enable transition for secondary color: <input type="checkbox" name="T2"><br>
+Enable Palette transitions: <input type="checkbox" name="PF">
 <h3>Timed light</h3>
-Default Duration: <input name="TLDUR" type="number" min="1" max="255" required> min<br>
-Default Target brightness: <input name="TLBRI" type="number" min="0" max="255" required><br>
-Fade down: <input type="checkbox" name="TLFDE"><br>
+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>
+Fade down: <input type="checkbox" name="TW"><br>
 <h3>Advanced</h3>
-Default overlay ID: <input name="OLDEF" type="number" min="0" max="255" required> <br>
-WARLS offset: <input name="WOFFS" type="number" min="-255" max="255" required><hr>
-<button type="button" onclick="B()">Back</button><button type="submit" name="SUBM">Save</button>
+Palette blending:
+<select name="PB">
+<option value="0">Linear (wrap if moving)</option>
+<option value="1">Linear (always wrap)</option>
+<option value="2">Linear (never wrap)</option>
+<option value="3">None (not recommended)</option>
+</select><br>
+Reverse LED order (rotate 180): <input type="checkbox" name="RV"><br>
+Init LEDs after WiFi: <input type="checkbox" name="EI"><br>
+Skip first LED: <input type="checkbox" name="SL"><hr>
+<button type="button" onclick="B()">Back</button><button type="submit">Save</button>
 </form>
 </body>
 </html>
-
 )=====";
 
+
+//User Interface settings
 const char PAGE_settings_ui0[] PROGMEM = R"=====(
 <!DOCTYPE html>
-<html>
-<head>
+<html><head>
 <title>UI Settings</title><script>
 function gId(s){return document.getElementById(s);}function S(){GetV();Ct();}function H(){window.open("https://github.com/Aircoookie/WLED/wiki/Settings#user-interface-settings");}function B(){window.history.back();}function Ct(){if (gId("co").selected){gId("cth").style.display="block";}else{gId("cth").style.display="none";}}function GetV(){var d = document;
 )=====";
+
 const char PAGE_settings_ui1[] PROGMEM = R"=====(
 </head>
 <body onload="S()">
 <form id="form_s" name="Sf" method="post">
 <div class="helpB"><button type="button" onclick="H()">?</button></div>
-<button type="button" onclick="B()">Back</button><button type="submit" name="SUBM">Save</button><hr>
+<button type="button" onclick="B()">Back</button><button type="submit">Save</button><hr>
 <h2>Web Setup</h2>
-Server description: <input name="DESC" maxlength="32"><br>
-Use HSB sliders instead of RGB by default: <input type="checkbox" name="COLMD"><br>
+User Interface Mode:
+<select name="UI">
+<option value="0" selected>Auto</option>
+<option value="1">Classic</option>
+<option value="2">Mobile</option>
+</select><br>
+Server description: <input name="DS" maxlength="32"><br><br>
+<i>The following options are for the classic UI!</i><br>
+Use HSB sliders instead of RGB by default: <input type="checkbox" name="MD"><br>
 Color Theme:
-<select name="THEME" onchange="Ct()">
+<select name="TH" onchange="Ct()">
 <option value="0" selected>Night</option>
 <option value="1">Modern</option>
 <option value="2">Bright</option>
@@ -154,197 +186,251 @@ Color Theme:
 <option value="8">Air</option>
 <option value="9">Nixie</option>
 <option value="10">Terminal</option>
-<option value="11">Placeholder</option>
-<option value="12">Placeholder</option>
+<option value="11">C64</option>
+<option value="12">Easter</option>
 <option value="13">Placeholder</option>
 <option value="14">The End</option>
 <option value="15" id="co">Custom</option>
 </select><br>
 <div id="cth">
 Please specify your custom hex colors (e.g. FF0000 for red)<br>
-Custom accent color: <input maxlength=9 name="CCOL0"><br>
-Custom background: <input maxlength=9 name="CCOL1"><br>
-Custom panel color: <input maxlength=9 name="CCOL2"><br>
-Custom icon color: <input maxlength=9 name="CCOL3"><br>
-Custom shadow: <input maxlength=9 name="CCOL4"><br>
-Custom text color: <input maxlength=9 name="CCOL5"><br></div>
-Use font: <input maxlength=32 name="CFONT"><br>
+Custom accent color: <input maxlength=9 name="C0"><br>
+Custom background: <input maxlength=9 name="C1"><br>
+Custom panel color: <input maxlength=9 name="C2"><br>
+Custom icon color: <input maxlength=9 name="C3"><br>
+Custom shadow: <input maxlength=9 name="C4"><br>
+Custom text color: <input maxlength=9 name="C5"><br></div>
+Use font: <input maxlength=32 name="CF"><br>
 Make sure the font you use is installed on your system!<br>
-<hr><button type="button" onclick="B()">Back</button><button type="submit" name="SUBM">Save</button>
+<hr><button type="button" onclick="B()">Back</button><button type="submit">Save</button>
 </form>
 </body>
 </html>
 )=====";
 
+
+//sync settings
 const char PAGE_settings_sync0[] PROGMEM = R"=====(
 <!DOCTYPE html>
 <html><head><title>Sync Settings</title>
 <script>function H(){window.open("https://github.com/Aircoookie/WLED/wiki/Settings#sync-settings");}function B(){window.open("/settings","_self");}function GetV(){var d = document;
 )=====";
+
 const char PAGE_settings_sync1[] PROGMEM = R"=====(
 </head>
 <body onload="GetV()">
 <form id="form_s" name="Sf" method="post">
 <div class="helpB"><button type="button" onclick="H()">?</button></div>
-<button type="button" onclick="B()">Back</button><button type="submit" name="SUBM">Save</button><hr>
+<button type="button" onclick="B()">Back</button><button type="submit">Save</button><hr>
 <h2>Sync setup</h2>
 <h3>Button setup</h3>
-On/Off button enabled: <input type="checkbox" name="BTNON">
+On/Off button enabled: <input type="checkbox" name="BT">
 <h3>WLED Broadcast</h3>
-UDP Port: <input name="NUDPP" maxlength="5" size="4"><br>
-Receive <input type="checkbox" name="NRCBR">Brightness, <input type="checkbox" name="NRCCL">Color, and <input type="checkbox" name="NRCFX">Effects<br>
-Send notifications on direct change: <input type="checkbox" name="NSDIR"> <br>
-Send notifications on button press: <input type="checkbox" name="NSBTN"> <br>
-Send Alexa notifications: <input type="checkbox" name="NSALX"> <br>
-<!--Send Philips Hue change notifications: <input type="checkbox" name="NSHUE">-->
+UDP Port: <input name="UP" maxlength="5" size="4"><br>
+Receive <input type="checkbox" name="RB">Brightness, <input type="checkbox" name="RC">Color, and <input type="checkbox" name="RX">Effects<br>
+Send notifications on direct change: <input type="checkbox" name="SD"><br>
+Send notifications on button press: <input type="checkbox" name="SB"><br>
+Send Alexa notifications: <input type="checkbox" name="SA"><br>
+Send Philips Hue change notifications: <input type="checkbox" name="SH"><br>
+Send notifications twice: <input type="checkbox" name="S2"><br>
+<h3>Realtime</h3>
+Receive UDP realtime: <input type="checkbox" name="RD"><br><br>
+<i>E1.31 (sACN)</i><br>
+Use E1.31 multicast: <input type="checkbox" name="EM"><br>
+E1.31 universe: <input name="EU" type="number" min="1" max="63999" required><br>
+<i>Reboot required.</i> Check out <a href="https://github.com/ahodges9/LedFx" target="_blank">LedFx</a>!<br><br>
+Timeout: <input name="ET" type="number" min="1" max="65000" required> ms<br>
+Force max brightness: <input type="checkbox" name="FB"><br>
+Disable realtime gamma correction: <input type="checkbox" name="RG"><br>
+Realtime LED offset: <input name="WO" type="number" min="-255" max="255" required><br>
+Enable UI access during realtime: <input type="checkbox" name="RU"> (can cause issues)
 <h3>Alexa Voice Assistant</h3>
-Emulate Alexa device: <input type="checkbox" name="ALEXA"> <br>
-Alexa invocation name: <input name="AINVN" maxlength="32"><br>
+Emulate Alexa device: <input type="checkbox" name="AL"><br>
+Alexa invocation name: <input name="AI" maxlength="32">
+<h3>Blynk</h3>
+Device Auth token: <input name="BK" maxlength="33"><br>
+<i>Clear the token field to disable. </i><a href="https://github.com/Aircoookie/WLED/wiki/Blynk" target="_blank">Setup info</a>
+<h3>MQTT</h3>
+Broker: <input name="MS" maxlength="32"><br>
+Device Topic: <input name="MD" maxlength="32"><br>
+Group Topic: <input name="MG" maxlength="32"><br>
+<i>Reboot required to apply changes. </i><a href="https://github.com/Aircoookie/WLED/wiki/MQTT" target="_blank">MQTT info</a>
 <h3>Philips Hue</h3>
-Coming soon! Not yet implemented!
-<!--<i>You can find the bridge IP and the light number in the 'About' section of the hue app.</i><br>
+<i>You can find the bridge IP and the light number in the 'About' section of the hue app.</i><br>
+Poll Hue light <input name="HL" type="number" min="1" max="99" required> every <input name="HI" type="number" min="100" max="65000" required> ms: <input type="checkbox" name="HP"><br>
+Then, receive <input type="checkbox" name="HO"> On/Off, <input type="checkbox" name="HB"> Brightness, and <input type="checkbox" name="HC"> Color<br>
 Hue Bridge IP:<br>
-<input name="HUIP0" type="number" min="0" max="255" required> .
-<input name="HUIP1" type="number" min="0" max="255" required> .
-<input name="HUIP2" type="number" min="0" max="255" required> .
-<input name="HUIP3" type="number" min="0" max="255" required> <br>
-<b>For successful pairing, press the pushlink button on the bridge, then save this page!</b><br>
+<input name="H0" type="number" min="0" max="255" required> .
+<input name="H1" type="number" min="0" max="255" required> .
+<input name="H2" type="number" min="0" max="255" required> .
+<input name="H3" type="number" min="0" max="255" required><br>
+<b>Press the pushlink button on the bridge, after that save this page!</b><br>
 (when first connecting)<br>
-<i> Use 0 for group and light to turn off sending/receiving </i><br>
-Update Hue group <input name="HUEGR" type="number" min="0" max="99" required> <br>
-Send <input type="checkbox" name="HUEIO"> On/Off, <input type="checkbox" name="HUEBR"> Brightness, and <input type="checkbox" name="HUECL"> Color<br>
-Poll Hue light <input name="HUELI" type="number" min="0" max="99" required> every <input name="HUEPL" type="number" min="100" max="62000" required> ms<br>
-Then, receive <input type="checkbox" name="HURIO"> On/Off, <input type="checkbox" name="HURBR"> Brightness, and <input type="checkbox" name="HURCL"> Color<br>
-After device color update, ignore Hue updates for <input name="HUELI" type="number" min="0" max="255" required> minutes<br>
-Hue status: <span class="hms"> Internal ESP error! </span>-->
-<hr>
-<button type="button" onclick="B()">Back</button><button type="submit" name="SUBM">Save</button>
+Hue status: <span class="hms"> Internal ESP Error! </span><hr>
+<button type="button" onclick="B()">Back</button><button type="submit">Save</button>
 </form>
 </body>
 </html>
 )=====";
 
+
+//time and macro settings
 const char PAGE_settings_time0[] PROGMEM = R"=====(
 <!DOCTYPE html>
 <html><head><title>Time Settings</title>
-<script>function H(){window.open("https://github.com/Aircoookie/WLED/wiki/Settings#time-settings");}function B(){window.open("/settings","_self");}function GetV(){var d = document;
+<script>function H(){window.open("https://github.com/Aircoookie/WLED/wiki/Settings#time-settings");}function B(){window.open("/settings","_self");}function S(){GetV();Cs();}function gId(s){return document.getElementById(s);}function Cs(){gId("cac").style.display="none";gId("coc").style.display="block";gId("ccc").style.display="none";if (gId("ca").selected){gId("cac").style.display="block";}if (gId("cc").selected){gId("coc").style.display="none";gId("ccc").style.display="block";}if (gId("cn").selected){gId("coc").style.display="none";}}function GetV(){var d = document;
 )=====";
+
 const char PAGE_settings_time1[] PROGMEM = R"=====(
 </head>
-<body onload="GetV()">
+<body onload="S()">
 <form id="form_s" name="Sf" method="post">
 <div class="helpB"><button type="button" onclick="H()">?</button></div>
-<button type="button" onclick="B()">Back</button><button type="submit" name="SUBM">Save</button><hr>
+<button type="button" onclick="B()">Back</button><button type="submit">Save</button><hr>
 <h2>Time setup</h2>
-Get time from NTP server: <input type="checkbox" name="NTPON"><br>
-<!--NTP server: <input name="NTPSR" maxlength="32"><br>
+Get time from NTP server: <input type="checkbox" name="NT"><br>
+Use 24h format: <input type="checkbox" name="CF"><br>
 Time zone: 
-<select name="TZONE">
-<option value="1" selected>GMT(UTC)</option>
-<option value="2">GMT/BST</option>
-<option value="3">CET/CEST</option>
-<option value="4">EET/EEST</option>
-<option value="5">US-EST/EDT</option>
-<option value="6">US-CST/CDT</option>
-<option value="7">US-MST/MDT</option>
-<option value="8">US-AZ</option>
-<option value="9">US-PST/PDT</option>
-<option value="10">CST(AWST)</option>
-<option value="11">JST(KST)</option>
-<option value="12">AEST/AEDT</option>
-<option value="13">NZST/NZDT</option>
+<select name="TZ">
+<option value="0" selected>GMT(UTC)</option>
+<option value="1">GMT/BST</option>
+<option value="2">CET/CEST</option>
+<option value="3">EET/EEST</option>
+<option value="4">US-EST/EDT</option>
+<option value="5">US-CST/CDT</option>
+<option value="6">US-MST/MDT</option>
+<option value="7">US-AZ</option>
+<option value="8">US-PST/PDT</option>
+<option value="9">CST(AWST)</option>
+<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>
-Hour/Min offset: <input name="TOFSH" type="number" min="-255" max="255" required> <input name="TOFSM" type="number" min="-255" max="255" required><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>.
-<h3>Weather</h3>
-Coming soon! Not yet implemented!
-<!--Get yours on open weather API.<br>
-City code: <input name="WCITY" maxlength="32"><br>
-Change color depending on weather: <input type="checkbox" name="WCCOL"><br>
-Daylight Emulation: <input type="checkbox" name="WDAYL"><br>
-Reverse (turns on at sunset): <input type="checkbox" name="WREVL"><br>
-Fade duration: <input name="WSDUR" type="number" min="0" max="255" required><br> 
-Sunrise/Sunset Offset: <input name="WSOFS" type="number" min="-255" max="255" required>-->
+<h3>Clock</h3>
+Clock Overlay:
+<select name="OL" onchange="Cs()">
+<option value="0" id="cn" selected>None</option>
+<option value="1" id="ca">Analog Clock</option>
+<option value="2">Single Digit Clock</option>
+<option value="3" id="cc">Cronixie Clock</option>
+</select><br>
+<div id="coc">
+First LED: <input name="O1" type="number" min="0" max="255" required> Last LED: <input name="O2" type="number" min="0" max="255" required><br>
+<div id="cac">
+12h LED: <input name="OM" type="number" min="0" max="255" required><br>
+Show 5min marks: <input type="checkbox" name="O5"><br></div>
+Seconds (as trail): <input type="checkbox" name="OS"><br>
+</div>
+<div id="ccc">
+Cronixie Display: <input name="CX" maxlength="6"><br>
+Cronixie Backlight: <input type="checkbox" name="CB"><br>
+</div>
+Countdown Mode: <input type="checkbox" name="CE"><br>
+Countdown Goal: Year: 20 <input name="CY" type="number" min="0" max="99" required> Month: <input name="CI" type="number" min="1" max="12" required> Day: <input name="CD" type="number" min="1" max="31" required><br>
+Hour: <input name="CH" type="number" min="0" max="23" required> Minute: <input name="CM" type="number" min="0" max="59" required> Second: <input name="CS" type="number" min="0" max="59" required><br>
 <h3>Advanced Macros</h3>
-Coming soon! Not yet implemented!
-<!--Define API macros here:<br>
-0: <input name="MCR00" maxlength="64"><br>
-1: <input name="MCR01" maxlength="64"><br>
-2: <input name="MCR02" maxlength="64"><br>
-3: <input name="MCR03" maxlength="64"><br>
-4: <input name="MCR04" maxlength="64"><br>
-5: <input name="MCR05" maxlength="64"><br>
-6: <input name="MCR06" maxlength="64"><br>
-7: <input name="MCR07" maxlength="64"><br>
-8: <input name="MCR08" maxlength="64"><br>
-9: <input name="MCR09" maxlength="64"><br>
-10: <input name="MCR10" maxlength="64"><br>
-11: <input name="MCR11" maxlength="64"><br>
-12: <input name="MCR12" maxlength="64"><br>
-13: <input name="MCR13" maxlength="64"><br>
-14: <input name="MCR14" maxlength="64"><br>
-15: <input name="MCR15" maxlength="64"><br>
-<br>
-<i>Use -1 to use the default action instead of a macro</i><br>
-<--1st Time-Controlled Macro:
-Alexa On/Off Macros: <input name="MCA0I" type="number" min="-1" max="15" required> <input name="MCA0O" type="number" min="-1" max="15" required><br>
-<--Emulate 2nd Alexa device:
-
-Emulate 3rd Alexa device:
-Button Macro: <input name="MCBT0" type="number" min="-1" max="15" required><br>
-Button Long Press Macro: <input name="MCBT1" type="number" min="-1" max="15" required><br>
-<--Sunrise Macro
-Sunset Macro
-Countdown-Over Macro: <input name="MCNTD" type="number" min="-1" max="15" required><br>-->
-<hr>
-<button type="button" onclick="B()">Back</button><button type="submit" name="SUBM">Save</button>
+Define API macros here:<br>
+1: <input name="M1" maxlength="64"><br>
+2: <input name="M2" maxlength="64"><br>
+3: <input name="M3" maxlength="64"><br>
+4: <input name="M4" maxlength="64"><br>
+5: <input name="M5" maxlength="64"><br>
+6: <input name="M6" maxlength="64"><br>
+7: <input name="M7" maxlength="64"><br>
+8: <input name="M8" maxlength="64"><br>
+9: <input name="M9" maxlength="64"><br>
+10: <input name="M10" maxlength="64"><br>
+11: <input name="M11" maxlength="64"><br>
+12: <input name="M12" maxlength="64"><br>
+13: <input name="M13" maxlength="64"><br>
+14: <input name="M14" maxlength="64"><br>
+15: <input name="M15" maxlength="64"><br>
+16: <input name="M16" maxlength="64"><br><br>
+<i>Use 0 for the default action instead of a macro</i><br>
+Boot Macro: <input name="MB" type="number" min="0" max="16" required><br>
+Alexa On/Off Macros: <input name="A0" type="number" min="0" max="16" required> <input name="A1" type="number" min="0" max="16" required><br>
+Button Macro: <input name="MP" type="number" min="0" max="16" required> Long Press: <input name="ML" type="number" min="0" max="16" required><br>
+Countdown-Over Macro: <input name="MC" type="number" min="0" max="16" required><br>
+Timed-Light-Over Macro: <input name="MN" type="number" min="0" max="16" required><br>
+Time-Controlled Macros (Hours/Minutes &gt; Macro):<br>
+<input name="H0" type="number" min="0" max="24"> <input name="N0" type="number" min="0" max="59">
+&gt; <input name="T0" type="number" min="0" max="16"><br>
+<input name="H1" type="number" min="0" max="24"> <input name="N1" type="number" min="0" max="59">
+&gt; <input name="T1" type="number" min="0" max="16"><br>
+<input name="H2" type="number" min="0" max="24"> <input name="N2" type="number" min="0" max="59">
+&gt; <input name="T2" type="number" min="0" max="16"><br>
+<input name="H3" type="number" min="0" max="24"> <input name="N3" type="number" min="0" max="59">
+&gt; <input name="T3" type="number" min="0" max="16"><br>
+<input name="H4" type="number" min="0" max="24"> <input name="N4" type="number" min="0" max="59">
+&gt; <input name="T4" type="number" min="0" max="16"><br>
+<input name="H5" type="number" min="0" max="24"> <input name="N5" type="number" min="0" max="59">
+&gt; <input name="T5" type="number" min="0" max="16"><br>
+<input name="H6" type="number" min="0" max="24"> <input name="N6" type="number" min="0" max="59">
+&gt; <input name="T6" type="number" min="0" max="16"><br>
+<input name="H7" type="number" min="0" max="24"> <input name="N7" type="number" min="0" max="59">
+&gt; <input name="T7" type="number" min="0" max="16"><hr>
+<button type="button" onclick="B()">Back</button><button type="submit">Save</button>
 </form>
 </body>
 </html>
 )=====";
 
+
+//security settings and about
 const char PAGE_settings_sec0[] PROGMEM = R"=====(
 <!DOCTYPE html>
 <html><head>
 <title>Misc Settings</title>
 <script>function H(){window.open("https://github.com/Aircoookie/WLED/wiki/Settings#security-settings");}function B(){window.open("/settings","_self");}function U(){window.open("/update","_self");}function GetV(){var d = document;
 )=====";
+
 const char PAGE_settings_sec1[] PROGMEM = R"=====(
 </head>
 <body onload="GetV()">
 <form id="form_s" name="Sf" method="post">
 <div class="helpB"><button type="button" onclick="H()">?</button></div>
-<button type="button" onclick="B()">Back</button><button type="submit" name="SUBM">Save & Reboot</button><hr>
+<button type="button" onclick="B()">Back</button><button type="submit">Save & Reboot</button><hr>
 <h2>Security & Update setup</h2>
-Enable OTA lock: <input type="checkbox" name="NOOTA"><br>
-Passphrase: <input type="password" name="OPASS" maxlength="32"><br>
+Lock wireless (OTA) software update: <input type="checkbox" name="NO"><br>
+Passphrase: <input type="password" name="OP" maxlength="32"><br>
 To enable OTA, for security reasons you need to also enter the correct password!<br>
-The password may/should be changed when OTA is enabled.<br>
-<b>Disable OTA when not in use, otherwise an attacker could reflash device software!</b><br>
+The password should be changed when OTA is enabled.<br>
+<b>Disable OTA when not in use, otherwise an attacker can reflash device software!</b><br>
 <i>Settings on this page are only changable if OTA lock is disabled!</i><br>
-Deny access to WiFi settings if locked: <input type="checkbox" name="OWIFI"><br><br>
-Disable recovery AP: <input type="checkbox" name="NORAP"><br>
-In case of a connection error there will be no wireless recovery possible!<br>
+Deny access to WiFi settings if locked: <input type="checkbox" name="OW"><br><br>
+Disable recovery AP: <input type="checkbox" name="NA"><br>
+In case of an error there will be no wireless recovery possible!<br>
 Completely disables all Access Point functions.<br><br>
-Factory reset: <input type="checkbox" name="RESET"><br>
+Factory reset: <input type="checkbox" name="RS"><br>
 All EEPROM content (settings) will be erased.<br><br>
-HTTP traffic is not encrypted. An attacker in the same network could intercept form data!
+HTTP traffic is unencrypted. An attacker in the same network can intercept form data!
 <h3>Software Update</h3>
 <button type="button" onclick="U()">Manual OTA Update</button><br>
-Enable ArduinoOTA: <input type="checkbox" name="AROTA"><br>
+Enable ArduinoOTA: <input type="checkbox" name="AO"><br>
 <h3>About</h3>
-<a href="https://github.com/Aircoookie/WLED">WLED</a> version 0.5.0<br>
+<a href="https://github.com/Aircoookie/WLED" target="_blank">WLED</a> version 0.8.0<br><br>
+<b>Contributors:</b><br>
+StormPie <i>(Mobile HTML UI)</i><br><br>
+Thank you so much!<br><br>
 (c) 2016-2018 Christian Schwinne <br>
 <i>Licensed under the MIT license</i><br><br>
-<i>Uses libraries:</i><br>
+<b>Uses libraries:</b><br>
 <i>ESP8266/ESP32 Arduino Core</i><br>
-<i>(ESP32) <a href="https://github.com/bbx10/WebServer_tng">WebServer_tng</a> by bbx10</i><br>
-<i><a href="https://github.com/kitesurfer1404/WS2812FX">WS2812FX</a> by kitesurfer1404 (modified)</i><br>
-<i><a href="https://github.com/JChristensen/Timezone">Timezone</a> library by JChristensen</i><br>
-<i><a href="https://github.com/Aircoookie/Espalexa">Espalexa</a> by Aircoookie (modified)</i><br><br>
-<i>UI icons by <a href="https://linearicons.com">Linearicons</a> created by <a href="https://perxis.com">Perxis</a>! (CC-BY-SA 4.0)</i> <br><br>
+<i><a href="https://github.com/svenihoney/NeoPixelBus" target="_blank">NeoPixelBus</a> by Makuna (svenihoney fork)</i><br>
+<i><a href="https://github.com/FastLED/FastLED/" target="_blank">FastLED</a> library</i><br>
+<i>(ESP32) <a href="https://github.com/bbx10/WebServer_tng" target="_blank">WebServer_tng</a> by bbx10</i><br>
+<i><a href="https://github.com/kitesurfer1404/WS2812FX" target="_blank">WS2812FX</a> by kitesurfer1404 (modified)</i><br>
+<i><a href="https://github.com/JChristensen/Timezone" target="_blank">Timezone</a> library by JChristensen</i><br>
+<i><a href="https://github.com/blynkkk/blynk-library" target="_blank">Blynk</a> library (compacted)</i><br>
+<i><a href="https://github.com/forkineye/E131" target="_blank">E1.31</a> library by forkineye (modified)</i><br>
+<i><a href="https://github.com/knolleary/pubsubclient" target="_blank">PubSubClient</a> by knolleary (modified)</i><br>
+<i><a href="https://github.com/Aircoookie/Espalexa" target="_blank">Espalexa</a> by Aircoookie (modified)</i><br><br>
+<i>UI icons by <a href="https://linearicons.com" target="_blank">Linearicons</a> created by <a href="https://perxis.com" target="_blank">Perxis</a>! (CC-BY-SA 4.0)</i> <br><br>
 Server message: <span class="msg"> Response error! </span><hr>
-<button type="button" onclick="B()">Back</button><button type="submit" name="SUBM">Save & Reboot</button>
+<button type="button" onclick="B()">Back</button><button type="submit">Save & Reboot</button>
 </form>
 </body>
 </html>

wled00/htmls02.h

@@ -1,23 +1,36 @@
 /*
- * Various
+ * Various pages
  */
+
+//USER HTML HERE (/u subpage)
+const char PAGE_usermod[] PROGMEM = R"=====(
+<html><body>There is no usermod installed or it doesn't specify a custom web page.</body></html>
+)=====";
+
+
+//server message
 const char PAGE_msg0[] PROGMEM = R"=====(
 <!DOCTYPE html>
 <html><head>
 <title>WLED Message</title>
-<script>function B(){window.history.back()};function RS(){window.location = "/settings";}function RP(){top.location.href=top.location.href;}</script>
+<script>function B(){window.history.back()};function RS(){window.location = "/settings";}function RP(){top.location.href="/";}</script>
 )=====";
+
 const char PAGE_msg1[] PROGMEM = R"=====(
 button{background:var(--bCol);color:var(--tCol);font-family:var(--cFn),sans-serif;border:.3ch solid var(--bCol);display:inline-block;filter:drop-shadow(-5px -5px 5px var(--sCol));font-size:20px;margin:8px;margin-top:12px}body{font-family:var(--cFn),sans-serif;text-align:center;background:var(--cCol);color:var(--tCol);line-height:200%;margin:0;background-attachment:fixed}</style>
 </head>
 <body>
 )=====";
 
+
+//new user welcome page
+#ifndef WLED_FLASH_512K_MODE
 const char PAGE_welcome0[] PROGMEM = R"=====(
 <!DOCTYPE html>
 <html><head>
 <title>WLED Welcome!</title>
 )=====";
+
 const char PAGE_welcome1[] PROGMEM = R"=====(
 body{font-family:var(--cFn),sans-serif;text-align:center;background:linear-gradient(var(--bCol),black);height:100%;margin:0;background-repeat:no-repeat;background-attachment: fixed;color: var(--tCol);}svg {fill: var(--dCol);}
 </style></head>
@@ -37,6 +50,11 @@ Connect the module to your local WiFi <a href="/settings/wifi">here</a>!<br><br>
 <i>Just trying this out in AP mode?</i> <a href="/sliders">Here are the controls.</a><br>
 </body></html>
 )=====";
+#else
+const char PAGE_welcome0[] PROGMEM = "";
+const char PAGE_welcome1[] PROGMEM = "";
+#endif
+
 
 /*
  * SPIFFS editor html
@@ -50,6 +68,8 @@ eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a
 #else
 const char PAGE_edit[] PROGMEM = R"=====(SPIFFS disabled)=====";
 #endif
+
+
 /*
  * favicon
  */

wled00/palettes.h

@@ -0,0 +1,555 @@
+/*
+ * Color palettes for FastLED effects (65-73).
+ */
+
+// From ColorWavesWithPalettes by Mark Kriegsman: https://gist.github.com/kriegsman/8281905786e8b2632aeb
+// Unfortunaltely, these are stored in RAM!
+
+// Gradient palette "ib_jul01_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/ing/xmas/tn/ib_jul01.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 16 bytes of program space.
+
+#ifndef PalettesWLED_h
+#define PalettesWLED_h
+
+DEFINE_GRADIENT_PALETTE( ib_jul01_gp ) {
+    0, 194,  1,  1,
+   94,   1, 29, 18,
+  132,  57,131, 28,
+  255, 113,  1,  1};
+
+// Gradient palette "es_vintage_57_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/es/vintage/tn/es_vintage_57.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 20 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( es_vintage_57_gp ) {
+    0,   2,  1,  1,
+   53,  18,  1,  0,
+  104,  69, 29,  1,
+  153, 167,135, 10,
+  255,  46, 56,  4};
+
+
+// Gradient palette "es_vintage_01_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/es/vintage/tn/es_vintage_01.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 32 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( es_vintage_01_gp ) {
+    0,   4,  1,  1,
+   51,  16,  0,  1,
+   76,  97,104,  3,
+  101, 255,131, 19,
+  127,  67,  9,  4,
+  153,  16,  0,  1,
+  229,   4,  1,  1,
+  255,   4,  1,  1};
+
+
+// Gradient palette "es_rivendell_15_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/es/rivendell/tn/es_rivendell_15.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 20 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( es_rivendell_15_gp ) {
+    0,   1, 14,  5,
+  101,  16, 36, 14,
+  165,  56, 68, 30,
+  242, 150,156, 99,
+  255, 150,156, 99};
+
+
+// Gradient palette "rgi_15_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/ds/rgi/tn/rgi_15.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 36 bytes of program space.
+// Edited to be brighter
+
+DEFINE_GRADIENT_PALETTE( rgi_15_gp ) {
+    0,   4,  1, 70,
+   31,  55,  1, 30,
+   63, 255,  4,  7,
+   95,  59,  2, 29,
+  127,  11,  3, 50,
+  159,  39,  8, 60,
+  191, 112, 19, 40,
+  223,  78, 11, 39,
+  255,  29,  8, 59};
+
+
+// Gradient palette "retro2_16_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/ma/retro2/tn/retro2_16.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 8 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( retro2_16_gp ) {
+    0, 188,135,  1,
+  255,  46,  7,  1};
+
+
+// Gradient palette "Analogous_1_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/nd/red/tn/Analogous_1.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 20 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( Analogous_1_gp ) {
+    0,   3,  0,255,
+   63,  23,  0,255,
+  127,  67,  0,255,
+  191, 142,  0, 45,
+  255, 255,  0,  0};
+
+
+// Gradient palette "es_pinksplash_08_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/es/pink_splash/tn/es_pinksplash_08.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 20 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( es_pinksplash_08_gp ) {
+    0, 126, 11,255,
+  127, 197,  1, 22,
+  175, 210,157,172,
+  221, 157,  3,112,
+  255, 157,  3,112};
+
+
+// Gradient palette "es_ocean_breeze_036_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/es/ocean_breeze/tn/es_ocean_breeze_036.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 16 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( es_ocean_breeze_036_gp ) {
+    0,   1,  6,  7,
+   89,   1, 99,111,
+  153, 144,209,255,
+  255,   0, 73, 82};
+
+
+// Gradient palette "departure_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/mjf/tn/departure.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 88 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( departure_gp ) {
+    0,   8,  3,  0,
+   42,  23,  7,  0,
+   63,  75, 38,  6,
+   84, 169, 99, 38,
+  106, 213,169,119,
+  116, 255,255,255,
+  138, 135,255,138,
+  148,  22,255, 24,
+  170,   0,255,  0,
+  191,   0,136,  0,
+  212,   0, 55,  0,
+  255,   0, 55,  0};
+
+
+// Gradient palette "es_landscape_64_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/es/landscape/tn/es_landscape_64.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 36 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( es_landscape_64_gp ) {
+    0,   0,  0,  0,
+   37,   2, 25,  1,
+   76,  15,115,  5,
+  127,  79,213,  1,
+  128, 126,211, 47,
+  130, 188,209,247,
+  153, 144,182,205,
+  204,  59,117,250,
+  255,   1, 37,192};
+
+
+// Gradient palette "es_landscape_33_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/es/landscape/tn/es_landscape_33.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 24 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( es_landscape_33_gp ) {
+    0,   1,  5,  0,
+   19,  32, 23,  1,
+   38, 161, 55,  1,
+   63, 229,144,  1,
+   66,  39,142, 74,
+  255,   1,  4,  1};
+
+
+// Gradient palette "rainbowsherbet_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/ma/icecream/tn/rainbowsherbet.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 28 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( rainbowsherbet_gp ) {
+    0, 255, 33,  4,
+   43, 255, 68, 25,
+   86, 255,  7, 25,
+  127, 255, 82,103,
+  170, 255,255,242,
+  209,  42,255, 22,
+  255,  87,255, 65};
+
+
+// Gradient palette "gr65_hult_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/hult/tn/gr65_hult.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 24 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( gr65_hult_gp ) {
+    0, 247,176,247,
+   48, 255,136,255,
+   89, 220, 29,226,
+  160,   7, 82,178,
+  216,   1,124,109,
+  255,   1,124,109};
+
+
+// Gradient palette "gr64_hult_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/hult/tn/gr64_hult.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 32 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( gr64_hult_gp ) {
+    0,   1,124,109,
+   66,   1, 93, 79,
+  104,  52, 65,  1,
+  130, 115,127,  1,
+  150,  52, 65,  1,
+  201,   1, 86, 72,
+  239,   0, 55, 45,
+  255,   0, 55, 45};
+
+
+// Gradient palette "GMT_drywet_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/gmt/tn/GMT_drywet.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 28 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( GMT_drywet_gp ) {
+    0,  47, 30,  2,
+   42, 213,147, 24,
+   84, 103,219, 52,
+  127,   3,219,207,
+  170,   1, 48,214,
+  212,   1,  1,111,
+  255,   1,  7, 33};
+
+
+// Gradient palette "ib15_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/ing/general/tn/ib15.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 24 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( ib15_gp ) {
+    0, 113, 91,147,
+   72, 157, 88, 78,
+   89, 208, 85, 33,
+  107, 255, 29, 11,
+  141, 137, 31, 39,
+  255,  59, 33, 89};
+
+
+// Gradient palette "Tertiary_01_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/nd/vermillion/tn/Tertiary_01.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 20 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( Tertiary_01_gp ) {
+    0,   0,  1,255,
+   63,   3, 68, 45,
+  127,  23,255,  0,
+  191, 100, 68,  1,
+  255, 255,  1,  4};
+
+
+// Gradient palette "lava_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/neota/elem/tn/lava.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 52 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( lava_gp ) {
+    0,   0,  0,  0,
+   46,  18,  0,  0,
+   96, 113,  0,  0,
+  108, 142,  3,  1,
+  119, 175, 17,  1,
+  146, 213, 44,  2,
+  174, 255, 82,  4,
+  188, 255,115,  4,
+  202, 255,156,  4,
+  218, 255,203,  4,
+  234, 255,255,  4,
+  244, 255,255, 71,
+  255, 255,255,255};
+
+
+// Gradient palette "fierce_ice_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/neota/elem/tn/fierce-ice.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 28 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( fierce_ice_gp ) {
+    0,   0,  0,  0,
+   59,   0,  9, 45,
+  119,   0, 38,255,
+  149,   3,100,255,
+  180,  23,199,255,
+  217, 100,235,255,
+  255, 255,255,255};
+
+
+// Gradient palette "Colorfull_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/nd/atmospheric/tn/Colorfull.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 44 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( Colorfull_gp ) {
+    0,  10, 85,  5,
+   25,  29,109, 18,
+   60,  59,138, 42,
+   93,  83, 99, 52,
+  106, 110, 66, 64,
+  109, 123, 49, 65,
+  113, 139, 35, 66,
+  116, 192,117, 98,
+  124, 255,255,137,
+  168, 100,180,155,
+  255,  22,121,174};
+
+
+// Gradient palette "Pink_Purple_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/nd/atmospheric/tn/Pink_Purple.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 44 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( Pink_Purple_gp ) {
+    0,  19,  2, 39,
+   25,  26,  4, 45,
+   51,  33,  6, 52,
+   76,  68, 62,125,
+  102, 118,187,240,
+  109, 163,215,247,
+  114, 217,244,255,
+  122, 159,149,221,
+  149, 113, 78,188,
+  183, 128, 57,155,
+  255, 146, 40,123};
+
+
+// Gradient palette "Sunset_Real_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/nd/atmospheric/tn/Sunset_Real.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 28 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( Sunset_Real_gp ) {
+    0, 120,  0,  0,
+   22, 179, 22,  0,
+   51, 255,104,  0,
+   85, 167, 22, 18,
+  135, 100,  0,103,
+  198,  16,  0,130,
+  255,   0,  0,160};
+
+
+// Gradient palette "Sunset_Yellow_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/nd/atmospheric/tn/Sunset_Yellow.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 44 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( Sunset_Yellow_gp ) {
+    0,  10, 62,123,
+   36,  56,130,103,
+   87, 153,225, 85,
+  100, 199,217, 68,
+  107, 255,207, 54,
+  115, 247,152, 57,
+  120, 239,107, 61,
+  128, 247,152, 57,
+  180, 255,207, 54,
+  223, 255,227, 48,
+  255, 255,248, 42};
+
+
+// Gradient palette "Beech_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/nd/atmospheric/tn/Beech.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 60 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( Beech_gp ) {
+    0, 255,252,214,
+   12, 255,252,214,
+   22, 255,252,214,
+   26, 190,191,115,
+   28, 137,141, 52,
+   28, 112,255,205,
+   50,  51,246,214,
+   71,  17,235,226,
+   93,   2,193,199,
+  120,   0,156,174,
+  133,   1,101,115,
+  136,   1, 59, 71,
+  136,   7,131,170,
+  208,   1, 90,151,
+  255,   0, 56,133};
+
+
+// Gradient palette "Another_Sunset_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/nd/atmospheric/tn/Another_Sunset.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 32 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( Another_Sunset_gp ) {
+    0, 110, 49, 11,
+   29,  55, 34, 10,
+   68,  22, 22,  9,
+   68, 239,124,  8,
+   97, 220,156, 27,
+  124, 203,193, 61,
+  178,  33, 53, 56,
+  255,   0,  1, 52};
+
+
+
+
+
+// Gradient palette "es_autumn_19_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/es/autumn/tn/es_autumn_19.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 52 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( es_autumn_19_gp ) {
+    0,  26,  1,  1,
+   51,  67,  4,  1,
+   84, 118, 14,  1,
+  104, 137,152, 52,
+  112, 113, 65,  1,
+  122, 133,149, 59,
+  124, 137,152, 52,
+  135, 113, 65,  1,
+  142, 139,154, 46,
+  163, 113, 13,  1,
+  204,  55,  3,  1,
+  249,  17,  1,  1,
+  255,  17,  1,  1};
+
+
+// Gradient palette "BlacK_Blue_Magenta_White_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/nd/basic/tn/BlacK_Blue_Magenta_White.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 28 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( BlacK_Blue_Magenta_White_gp ) {
+    0,   0,  0,  0,
+   42,   0,  0, 45,
+   84,   0,  0,255,
+  127,  42,  0,255,
+  170, 255,  0,255,
+  212, 255, 55,255,
+  255, 255,255,255};
+
+
+// Gradient palette "BlacK_Magenta_Red_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/nd/basic/tn/BlacK_Magenta_Red.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 20 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( BlacK_Magenta_Red_gp ) {
+    0,   0,  0,  0,
+   63,  42,  0, 45,
+  127, 255,  0,255,
+  191, 255,  0, 45,
+  255, 255,  0,  0};
+
+
+// Gradient palette "BlacK_Red_Magenta_Yellow_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/nd/basic/tn/BlacK_Red_Magenta_Yellow.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 28 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( BlacK_Red_Magenta_Yellow_gp ) {
+    0,   0,  0,  0,
+   42,  42,  0,  0,
+   84, 255,  0,  0,
+  127, 255,  0, 45,
+  170, 255,  0,255,
+  212, 255, 55, 45,
+  255, 255,255,  0};
+
+
+// Gradient palette "Blue_Cyan_Yellow_gp", originally from
+// http://soliton.vm.bytemark.co.uk/pub/cpt-city/nd/basic/tn/Blue_Cyan_Yellow.png.index.html
+// converted for FastLED with gammas (2.6, 2.2, 2.5)
+// Size: 20 bytes of program space.
+
+DEFINE_GRADIENT_PALETTE( Blue_Cyan_Yellow_gp ) {
+    0,   0,  0,255,
+   63,   0, 55,255,
+  127,   0,255,255,
+  191,  42,255, 45,
+  255, 255,255,  0};
+
+
+//Custom palette by Aircoookie
+
+DEFINE_GRADIENT_PALETTE( Orange_Teal_gp ) {
+    0,   0,150, 92,
+   55,   0,150, 92,
+  200, 255, 72,  0,
+  255, 255, 72,  0};
+
+
+// Single array of defined cpt-city color palettes.
+// This will let us programmatically choose one based on
+// a number, rather than having to activate each explicitly
+// by name every time.
+// Since it is const, this array could also be moved
+// into PROGMEM to save SRAM, but for simplicity of illustration
+// we'll keep it in a regular SRAM array.
+//
+// This list of color palettes acts as a "playlist"; you can
+// add or delete, or re-arrange as you wish.
+const TProgmemRGBGradientPalettePtr gGradientPalettes[] = {
+  Sunset_Real_gp,               //13-00 Sunset
+  es_rivendell_15_gp,           //14-01 Rivendell
+  es_ocean_breeze_036_gp,       //15-02 Breeze
+  rgi_15_gp,                    //16-03 Red & Blue
+  retro2_16_gp,                 //17-04 Yellowout
+  Analogous_1_gp,               //18-05 Analogous
+  es_pinksplash_08_gp,          //19-06 Splash
+  Sunset_Yellow_gp,             //20-07 Pastel
+  Another_Sunset_gp,            //21-08 Sunset2
+  Beech_gp,                     //22-09 Beech
+  es_vintage_01_gp,             //23-10 Vintage
+  departure_gp,                 //24-11 Departure
+  es_landscape_64_gp,           //25-12 Landscape
+  es_landscape_33_gp,           //26-13 Beach
+  rainbowsherbet_gp,            //27-14 Sherbet
+  gr65_hult_gp,                 //28-15 Hult
+  gr64_hult_gp,                 //29-16 Hult64
+  GMT_drywet_gp,                //30-17 Drywet
+  ib_jul01_gp,                  //31-18 Jul
+  es_vintage_57_gp,             //32-19 Grintage
+  ib15_gp,                      //33-20 Rewhi
+  Tertiary_01_gp,               //34-21 Tertiary
+  lava_gp,                      //35-22 Fire
+  fierce_ice_gp,                //36-23 Icefire
+  Colorfull_gp,                 //37-24 Cyane
+  Pink_Purple_gp,               //38-25 Light Pink
+  es_autumn_19_gp,              //39-26 Autumn
+  BlacK_Blue_Magenta_White_gp,  //40-27 Magenta
+  BlacK_Magenta_Red_gp,         //41-28 Magred
+  BlacK_Red_Magenta_Yellow_gp,  //42-29 Yelmag
+  Blue_Cyan_Yellow_gp,          //43-30 Yelblu
+  Orange_Teal_gp                //44-31 Orange & Teal
+  };
+
+
+// Count of how many cpt-city gradients are defined:
+const uint8_t gGradientPaletteCount =
+  sizeof( gGradientPalettes) / sizeof( TProgmemRGBGradientPalettePtr );
+
+#endif
+

wled00/src/dependencies/blynk/Blynk/BlynkApi.h

@@ -0,0 +1,321 @@
+/**
+ * @file       BlynkApi.h
+ * @author     Volodymyr Shymanskyy
+ * @license    This project is released under the MIT License (MIT)
+ * @copyright  Copyright (c) 2015 Volodymyr Shymanskyy
+ * @date       Jan 2015
+ * @brief      High-level functions
+ *
+ */
+
+#ifndef BlynkApi_h
+#define BlynkApi_h
+
+#include "BlynkConfig.h"
+#include "BlynkDebug.h"
+#include "BlynkParam.h"
+#include "BlynkTimer.h"
+#include "BlynkHandlers.h"
+#include "BlynkProtocolDefs.h"
+
+#if defined(BLYNK_EXPERIMENTAL)
+    #include <Blynk/BlynkEveryN.h>
+#endif
+
+/**
+ * Represents high-level functions of Blynk
+ */
+template <class Proto>
+class BlynkApi
+{
+public:
+    BlynkApi() {
+    }
+
+#ifdef DOXYGEN // These API here are only for the documentation
+
+    /**
+     * Connects to the server.
+     * Blocks until connected or timeout happens.
+     * May take less or more then timeout value.
+     *
+     * @param timeout    Connection timeout
+     * @returns          True if connected to the server
+     */
+    bool connect(unsigned long timeout = BLYNK_TIMEOUT_MS*3);
+
+    /**
+     * Disconnects from the server.
+     * It will not try to reconnect, until connect() is called
+     */
+    void disconnect();
+
+    /**
+     * @returns          True if connected to the server
+     */
+    bool connected();
+
+    /**
+     * Performs Blynk-related housekeeping
+     * and processes incoming commands
+     *
+     * @param available  True if there is incoming data to process
+     *                   Only used when user manages connection manually.
+     */
+    bool run(bool available = false);
+
+#endif // DOXYGEN
+
+    /**
+     * Sends value to a Virtual Pin
+     *
+     * @param pin  Virtual Pin number
+     * @param data Value to be sent
+     */
+    template <typename... Args>
+    void virtualWrite(int pin, Args... values) {
+        char mem[BLYNK_MAX_SENDBYTES];
+        BlynkParam cmd(mem, 0, sizeof(mem));
+        cmd.add("vw");
+        cmd.add(pin);
+        cmd.add_multi(values...);
+        static_cast<Proto*>(this)->sendCmd(BLYNK_CMD_HARDWARE, 0, cmd.getBuffer(), cmd.getLength()-1);
+    }
+
+    /**
+     * Sends buffer to a Virtual Pin
+     *
+     * @param pin  Virtual Pin number
+     * @param buff Data buffer
+     * @param len  Length of data
+     */
+    void virtualWriteBinary(int pin, const void* buff, size_t len) {
+        char mem[8];
+        BlynkParam cmd(mem, 0, sizeof(mem));
+        cmd.add("vw");
+        cmd.add(pin);
+        static_cast<Proto*>(this)->sendCmd(BLYNK_CMD_HARDWARE, 0, cmd.getBuffer(), cmd.getLength(), buff, len);
+    }
+
+    /**
+     * Sends BlynkParam to a Virtual Pin
+     *
+     * @param pin  Virtual Pin number
+     * @param param
+     */
+    void virtualWrite(int pin, const BlynkParam& param) {
+        virtualWriteBinary(pin, param.getBuffer(), param.getLength());
+    }
+
+    void virtualWrite(int pin, const BlynkParamAllocated& param) {
+        virtualWriteBinary(pin, param.getBuffer(), param.getLength());
+    }
+
+    /**
+     * Requests Server to re-send current values for all widgets.
+     */
+    void syncAll() {
+        static_cast<Proto*>(this)->sendCmd(BLYNK_CMD_HARDWARE_SYNC);
+    }
+
+    /**
+     * Sends internal command
+     */
+    template <typename... Args>
+    void sendInternal(Args... params) {
+        char mem[BLYNK_MAX_SENDBYTES];
+        BlynkParam cmd(mem, 0, sizeof(mem));
+        cmd.add_multi(params...);
+        static_cast<Proto*>(this)->sendCmd(BLYNK_CMD_INTERNAL, 0, cmd.getBuffer(), cmd.getLength()-1);
+    }
+
+    /**
+     * Requests App or Server to re-send current value of a Virtual Pin.
+     * This will probably cause user-defined BLYNK_WRITE handler to be called.
+     *
+     * @param pin Virtual Pin number
+     */
+    template <typename... Args>
+    void syncVirtual(Args... pins) {
+        char mem[BLYNK_MAX_SENDBYTES];
+        BlynkParam cmd(mem, 0, sizeof(mem));
+        cmd.add("vr");
+        cmd.add_multi(pins...);
+        static_cast<Proto*>(this)->sendCmd(BLYNK_CMD_HARDWARE_SYNC, 0, cmd.getBuffer(), cmd.getLength()-1);
+    }
+
+    /**
+     * Tweets a message
+     *
+     * @param msg Text of the message
+     */
+    template<typename T>
+    void tweet(const T& msg) {
+        char mem[BLYNK_MAX_SENDBYTES];
+        BlynkParam cmd(mem, 0, sizeof(mem));
+        cmd.add(msg);
+        static_cast<Proto*>(this)->sendCmd(BLYNK_CMD_TWEET, 0, cmd.getBuffer(), cmd.getLength()-1);
+    }
+
+    /**
+     * Sends a push notification to the App
+     *
+     * @param msg Text of the message
+     */
+    template<typename T>
+    void notify(const T& msg) {
+        char mem[BLYNK_MAX_SENDBYTES];
+        BlynkParam cmd(mem, 0, sizeof(mem));
+        cmd.add(msg);
+        static_cast<Proto*>(this)->sendCmd(BLYNK_CMD_NOTIFY, 0, cmd.getBuffer(), cmd.getLength()-1);
+    }
+
+    /**
+     * Sends an SMS
+     *
+     * @param msg Text of the message
+     */
+    template<typename T>
+    void sms(const T& msg) {
+        char mem[BLYNK_MAX_SENDBYTES];
+        BlynkParam cmd(mem, 0, sizeof(mem));
+        cmd.add(msg);
+        static_cast<Proto*>(this)->sendCmd(BLYNK_CMD_SMS, 0, cmd.getBuffer(), cmd.getLength()-1);
+    }
+
+    /**
+     * Sends an email message
+     *
+     * @param email   Email to send to
+     * @param subject Subject of message
+     * @param msg     Text of the message
+     */
+    template <typename T1, typename T2>
+    void email(const char* email, const T1& subject, const T2& msg) {
+        char mem[BLYNK_MAX_SENDBYTES];
+        BlynkParam cmd(mem, 0, sizeof(mem));
+        cmd.add(email);
+        cmd.add(subject);
+        cmd.add(msg);
+        static_cast<Proto*>(this)->sendCmd(BLYNK_CMD_EMAIL, 0, cmd.getBuffer(), cmd.getLength()-1);
+    }
+
+    /**
+     * Sends an email message
+     *
+     * @param subject Subject of message
+     * @param msg     Text of the message
+     */
+    template <typename T1, typename T2>
+    void email(const T1& subject, const T2& msg) {
+        char mem[BLYNK_MAX_SENDBYTES];
+        BlynkParam cmd(mem, 0, sizeof(mem));
+        cmd.add(subject);
+        cmd.add(msg);
+        static_cast<Proto*>(this)->sendCmd(BLYNK_CMD_EMAIL, 0, cmd.getBuffer(), cmd.getLength()-1);
+    }
+
+    /**
+     * Sets property of a Widget
+     *
+     * @experimental
+     *
+     * @param pin      Virtual Pin number
+     * @param property Property name ("label", "labels", "color", ...)
+     * @param value    Property value
+     */
+    template <typename T, typename... Args>
+    void setProperty(int pin, const T& property, Args... values) {
+        char mem[BLYNK_MAX_SENDBYTES];
+        BlynkParam cmd(mem, 0, sizeof(mem));
+        cmd.add(pin);
+        cmd.add(property);
+        cmd.add_multi(values...);
+        static_cast<Proto*>(this)->sendCmd(BLYNK_CMD_PROPERTY, 0, cmd.getBuffer(), cmd.getLength()-1);
+    }
+
+    template <typename T>
+    void setProperty(int pin, const T& property, const BlynkParam& param) {
+        char mem[32];
+        BlynkParam cmd(mem, 0, sizeof(mem));
+        cmd.add(pin);
+        cmd.add(property);
+        static_cast<Proto*>(this)->sendCmd(BLYNK_CMD_PROPERTY, 0, cmd.getBuffer(), cmd.getLength(), param.getBuffer(), param.getLength());
+    }
+
+    template <typename T>
+    void setProperty(int pin, const T& property, const BlynkParamAllocated& param) {
+        char mem[32];
+        BlynkParam cmd(mem, 0, sizeof(mem));
+        cmd.add(pin);
+        cmd.add(property);
+        static_cast<Proto*>(this)->sendCmd(BLYNK_CMD_PROPERTY, 0, cmd.getBuffer(), cmd.getLength(), param.getBuffer(), param.getLength());
+    }
+
+    template <typename NAME>
+    void logEvent(const NAME& event_name) {
+        char mem[BLYNK_MAX_SENDBYTES];
+        BlynkParam cmd(mem, 0, sizeof(mem));
+        cmd.add(event_name);
+        static_cast<Proto*>(this)->sendCmd(BLYNK_CMD_EVENT_LOG, 0, cmd.getBuffer(), cmd.getLength());
+    }
+
+    template <typename NAME, typename DESCR>
+    void logEvent(const NAME& event_name, const DESCR& description) {
+        char mem[BLYNK_MAX_SENDBYTES];
+        BlynkParam cmd(mem, 0, sizeof(mem));
+        cmd.add(event_name);
+        cmd.add(description);
+        static_cast<Proto*>(this)->sendCmd(BLYNK_CMD_EVENT_LOG, 0, cmd.getBuffer(), cmd.getLength());
+    }
+
+#if defined(BLYNK_EXPERIMENTAL)
+    // Attention!
+    // Every function in this section may be changed, removed or renamed.
+
+    /**
+     * Refreshes value of a widget by running
+     * user-defined BLYNK_READ handler of a pin.
+     *
+     * @experimental
+     *
+     * @param pin Virtual Pin number
+     */
+    void refresh(int pin) {
+        if (WidgetReadHandler handler = GetReadHandler(pin)) {
+            BlynkReq req = { 0, BLYNK_SUCCESS, (uint8_t)pin };
+            handler(req);
+        }
+    }
+
+    /**
+     * Delays for N milliseconds, handling server communication in background.
+     *
+     * @experimental
+     * @warning Should be used very carefully, especially on platforms with small RAM.
+     *
+     * @param ms Milliseconds to wait
+     */
+    void delay(unsigned long ms) {
+        uint16_t start = (uint16_t)micros();
+        while (ms > 0) {
+            static_cast<Proto*>(this)->run();
+#if !defined(BLYNK_NO_YIELD)
+            yield();
+#endif
+            if (((uint16_t)micros() - start) >= 1000) {
+                ms--;
+                start += 1000;
+            }
+        }
+    }
+
+#endif
+
+protected:
+    void processCmd(const void* buff, size_t len);
+    void sendInfo();
+};
+
+
+#endif

wled00/src/dependencies/blynk/Blynk/BlynkApiArduino.h

@@ -0,0 +1,199 @@
+/**
+ * @file       BlynkApiArduino.h
+ * @author     Volodymyr Shymanskyy
+ * @license    This project is released under the MIT License (MIT)
+ * @copyright  Copyright (c) 2015 Volodymyr Shymanskyy
+ * @date       Mar 2015
+ * @brief
+ *
+ */
+
+#ifndef BlynkApiArduino_h
+#define BlynkApiArduino_h
+
+#include "BlynkApi.h"
+#include <Arduino.h>
+
+#ifdef BLYNK_NO_INFO
+
+template<class Proto>
+BLYNK_FORCE_INLINE
+void BlynkApi<Proto>::sendInfo() {}
+
+#else
+
+template<class Proto>
+BLYNK_FORCE_INLINE
+void BlynkApi<Proto>::sendInfo()
+{
+    static const char profile[] BLYNK_PROGMEM = "blnkinf\0"
+#ifdef BOARD_FIRMWARE_VERSION
+        BLYNK_PARAM_KV("ver"    , BOARD_FIRMWARE_VERSION)
+        BLYNK_PARAM_KV("blynk"  , BLYNK_VERSION)
+#else
+        BLYNK_PARAM_KV("ver"    , BLYNK_VERSION)
+#endif
+#ifdef BOARD_TEMPLATE_ID
+        BLYNK_PARAM_KV("tmpl"   , BOARD_TEMPLATE_ID)
+#endif
+        BLYNK_PARAM_KV("h-beat" , BLYNK_TOSTRING(BLYNK_HEARTBEAT))
+        BLYNK_PARAM_KV("buff-in", BLYNK_TOSTRING(BLYNK_MAX_READBYTES))
+#ifdef BLYNK_INFO_DEVICE
+        BLYNK_PARAM_KV("dev"    , BLYNK_INFO_DEVICE)
+#endif
+#ifdef BLYNK_INFO_CPU
+        BLYNK_PARAM_KV("cpu"    , BLYNK_INFO_CPU)
+#endif
+#ifdef BLYNK_INFO_CONNECTION
+        BLYNK_PARAM_KV("con"    , BLYNK_INFO_CONNECTION)
+#endif
+        BLYNK_PARAM_KV("build"  , __DATE__ " " __TIME__)
+        "\0"
+    ;
+    const size_t profile_len = sizeof(profile)-8-2;
+
+#ifdef BLYNK_HAS_PROGMEM
+    char mem[profile_len];
+    memcpy_P(mem, profile+8, profile_len);
+    static_cast<Proto*>(this)->sendCmd(BLYNK_CMD_INTERNAL, 0, mem, profile_len);
+#else
+    static_cast<Proto*>(this)->sendCmd(BLYNK_CMD_INTERNAL, 0, profile+8, profile_len);
+#endif
+    return;
+}
+
+#endif
+
+
+// Check if analog pins can be referenced by name on this device
+#if defined(analogInputToDigitalPin)
+    #define BLYNK_DECODE_PIN(it) (((it).asStr()[0] == 'A') ? analogInputToDigitalPin(atoi((it).asStr()+1)) : (it).asInt())
+#else
+    #define BLYNK_DECODE_PIN(it) ((it).asInt())
+
+    #if defined(BLYNK_DEBUG_ALL)
+        #pragma message "analogInputToDigitalPin not defined"
+    #endif
+#endif
+
+template<class Proto>
+BLYNK_FORCE_INLINE
+void BlynkApi<Proto>::processCmd(const void* buff, size_t len)
+{
+    BlynkParam param((void*)buff, len);
+    BlynkParam::iterator it = param.begin();
+    if (it >= param.end())
+        return;
+    const char* cmd = it.asStr();
+    uint16_t cmd16;
+    memcpy(&cmd16, cmd, sizeof(cmd16));
+    if (++it >= param.end())
+        return;
+
+    uint8_t pin = BLYNK_DECODE_PIN(it);
+
+    switch(cmd16) {
+
+#ifndef BLYNK_NO_BUILTIN
+
+    case BLYNK_HW_PM: {
+        while (it < param.end()) {
+            pin = BLYNK_DECODE_PIN(it);
+            ++it;
+            if (!strcmp(it.asStr(), "in")) {
+                pinMode(pin, INPUT);
+            } else if (!strcmp(it.asStr(), "out") || !strcmp(it.asStr(), "pwm")) {
+                pinMode(pin, OUTPUT);
+#ifdef INPUT_PULLUP
+            } else if (!strcmp(it.asStr(), "pu")) {
+                pinMode(pin, INPUT_PULLUP);
+#endif
+#ifdef INPUT_PULLDOWN
+            } else if (!strcmp(it.asStr(), "pd")) {
+                pinMode(pin, INPUT_PULLDOWN);
+#endif
+            } else {
+#ifdef BLYNK_DEBUG
+                BLYNK_LOG4(BLYNK_F("Invalid pin "), pin, BLYNK_F(" mode "), it.asStr());
+#endif
+            }
+            ++it;
+        }
+    } break;
+    case BLYNK_HW_DR: {
+        char mem[16];
+        BlynkParam rsp(mem, 0, sizeof(mem));
+        rsp.add("dw");
+        rsp.add(pin);
+        rsp.add(digitalRead(pin));
+        static_cast<Proto*>(this)->sendCmd(BLYNK_CMD_HARDWARE, 0, rsp.getBuffer(), rsp.getLength()-1);
+    } break;
+    case BLYNK_HW_DW: {
+        // Should be 1 parameter (value)
+        if (++it >= param.end())
+            return;
+
+#ifdef ESP8266
+        // Disable PWM...
+        analogWrite(pin, 0);
+#endif
+#ifndef BLYNK_MINIMIZE_PINMODE_USAGE
+        pinMode(pin, OUTPUT);
+#endif
+        digitalWrite(pin, it.asInt() ? HIGH : LOW);
+    } break;
+    case BLYNK_HW_AR: {
+        char mem[16];
+        BlynkParam rsp(mem, 0, sizeof(mem));
+        rsp.add("aw");
+        rsp.add(pin);
+        rsp.add(analogRead(pin));
+        static_cast<Proto*>(this)->sendCmd(BLYNK_CMD_HARDWARE, 0, rsp.getBuffer(), rsp.getLength()-1);
+    } break;
+
+// TODO: Remove workaround for ESP32
+#if !defined(ESP32)
+
+    case BLYNK_HW_AW: {
+        // Should be 1 parameter (value)
+        if (++it >= param.end())
+            return;
+
+#ifndef BLYNK_MINIMIZE_PINMODE_USAGE
+        pinMode(pin, OUTPUT);
+#endif
+        analogWrite(pin, it.asInt());
+    } break;
+
+#endif // TODO: Remove workaround for ESP32
+
+#endif
+
+    case BLYNK_HW_VR: {
+        BlynkReq req = { pin };
+        WidgetReadHandler handler = GetReadHandler(pin);
+        if (handler && (handler != BlynkWidgetRead)) {
+            handler(req);
+        } else {
+            BlynkWidgetReadDefault(req);
+        }
+    } break;
+    case BLYNK_HW_VW: {
+        ++it;
+        char* start = (char*)it.asStr();
+        BlynkParam param2(start, len - (start - (char*)buff));
+        BlynkReq req = { pin };
+        WidgetWriteHandler handler = GetWriteHandler(pin);
+        if (handler && (handler != BlynkWidgetWrite)) {
+            handler(req, param2);
+        } else {
+            BlynkWidgetWriteDefault(req, param2);
+        }
+    } break;
+    default:
+        BLYNK_LOG2(BLYNK_F("Invalid HW cmd: "), cmd);
+        static_cast<Proto*>(this)->sendCmd(BLYNK_CMD_RESPONSE, static_cast<Proto*>(this)->msgIdOutOverride, NULL, BLYNK_ILLEGAL_COMMAND);
+    }
+}
+
+#endif

wled00/src/dependencies/blynk/Blynk/BlynkArduinoClient.h

@@ -0,0 +1,128 @@
+/**
+ * @file       BlynkParam.h
+ * @author     Volodymyr Shymanskyy
+ * @license    This project is released under the MIT License (MIT)
+ * @copyright  Copyright (c) 2015 Volodymyr Shymanskyy
+ * @date       Jan 2015
+ * @brief
+ *
+ */
+
+#ifndef BlynkArduinoClient_h
+#define BlynkArduinoClient_h
+
+#include "BlynkApiArduino.h"
+#include "BlynkDebug.h"
+#include <Client.h>
+
+#if defined(ESP8266) && !defined(BLYNK_NO_YIELD)
+    #define YIELD_FIX() BLYNK_RUN_YIELD();
+#else
+    #define YIELD_FIX()
+#endif
+
+template <typename Client>
+class BlynkArduinoClientGen
+{
+public:
+    BlynkArduinoClientGen(Client& c)
+        : client(NULL), domain(NULL), port(0), isConn(false)
+    {
+        setClient(&c);
+    }
+
+    BlynkArduinoClientGen()
+        : client(NULL), domain(NULL), port(0), isConn(false)
+    {}
+
+    void setClient(Client* c) {
+        client = c;
+        client->setTimeout(BLYNK_TIMEOUT_MS);
+    }
+
+    void begin(IPAddress a, uint16_t p) {
+        domain = NULL;
+        port = p;
+        addr = a;
+    }
+
+    void begin(const char* d, uint16_t p) {
+        domain = d;
+        port = p;
+    }
+
+    bool connect() {
+        if (domain) {
+            BLYNK_LOG4(BLYNK_F("Connecting to "), domain, ':', port);
+
+            isConn = (1 == client->connect(domain, port));
+            return isConn;
+        } else { //if (uint32_t(addr) != 0) {
+            BLYNK_LOG_IP("Connecting to ", addr);
+            isConn = (1 == client->connect(addr, port));
+            return isConn;
+        }
+        return false;
+    }
+
+    void disconnect() { isConn = false; client->stop(); }
+
+#ifdef BLYNK_ENC28J60_FIX
+    size_t read(void* buf, size_t len) {
+        while (client->available() < len) { BLYNK_RUN_YIELD(); }
+        return client->read((uint8_t*)buf, len);
+    }
+#else
+    size_t read(void* buf, size_t len) {
+        size_t res = client->readBytes((char*)buf, len);
+        YIELD_FIX();
+        return res;
+    }
+#endif
+
+#ifdef BLYNK_RETRY_SEND
+    size_t write(const void* buf, size_t len) {
+        size_t sent = 0;
+        int retry = 0;
+        while (sent < len && ++retry < 10) {
+            size_t w = client->write((const uint8_t*)buf+sent, len-sent);
+            if (w != 0 && w != -1) {
+                sent += w;
+            } else {
+                BlynkDelay(50);
+#if defined(BLYNK_DEBUG) && defined(BLYNK_PRINT)
+                BLYNK_PRINT_TIME();
+                BLYNK_PRINT.print(BLYNK_F("Retry "));
+                BLYNK_PRINT.print(retry);
+                BLYNK_PRINT.print(BLYNK_F(" send: "));
+                BLYNK_PRINT.print(sent);
+                BLYNK_PRINT.print('/');
+                BLYNK_PRINT.println(len);
+#endif
+            }
+        }
+        return sent;
+    }
+#else
+    size_t write(const void* buf, size_t len) {
+        YIELD_FIX();
+        size_t res = client->write((const uint8_t*)buf, len);
+        YIELD_FIX();
+        return res;
+    }
+#endif
+
+    bool connected() { YIELD_FIX(); return isConn && client->connected(); }
+    int available() {  YIELD_FIX(); return client->available(); }
+
+protected:
+    Client*     client;
+    IPAddress   addr;
+    const char* domain;
+    uint16_t    port;
+    bool        isConn;
+};
+
+typedef BlynkArduinoClientGen<Client> BlynkArduinoClient;
+
+#endif

wled00/src/dependencies/blynk/Blynk/BlynkConfig.h

@@ -0,0 +1,95 @@
+/**
+ * @file       BlynkConfig.h
+ * @author     Volodymyr Shymanskyy
+ * @license    This project is released under the MIT License (MIT)
+ * @copyright  Copyright (c) 2015 Volodymyr Shymanskyy
+ * @date       Jan 2015
+ * @brief      Configuration of different aspects of library
+ *
+ */
+
+#ifndef BlynkConfig_h
+#define BlynkConfig_h
+
+#include "BlynkDetectDevice.h"
+
+/***************************************************
+ * Change these settings to match your need
+ ***************************************************/
+
+#define BLYNK_DEFAULT_DOMAIN     "blynk-cloud.com"
+#define BLYNK_DEFAULT_PORT       80
+#define BLYNK_DEFAULT_PORT_SSL   8441
+
+/***************************************************
+ * Professional settings
+ ***************************************************/
+// Library version.
+#define BLYNK_VERSION        "0.5.3"
+
+// Heartbeat period in seconds.
+#ifndef BLYNK_HEARTBEAT
+#define BLYNK_HEARTBEAT      10
+#endif
+
+// Network timeout in milliseconds.
+#ifndef BLYNK_TIMEOUT_MS
+#define BLYNK_TIMEOUT_MS     2000UL
+#endif
+
+// Limit the amount of outgoing commands per second.
+#ifndef BLYNK_MSG_LIMIT
+#define BLYNK_MSG_LIMIT      15
+#endif
+
+// Limit the incoming command length.
+#ifndef BLYNK_MAX_READBYTES
+#define BLYNK_MAX_READBYTES  256
+#endif
+
+// Limit the outgoing command length.
+#ifndef BLYNK_MAX_SENDBYTES
+#define BLYNK_MAX_SENDBYTES  128
+#endif
+
+// Uncomment to use Let's Encrypt Root CA
+//#define BLYNK_SSL_USE_LETSENCRYPT
+
+// Uncomment to disable built-in analog and digital operations.
+//#define BLYNK_NO_BUILTIN
+
+// Uncomment to disable providing info about device to the server.
+//#define BLYNK_NO_INFO
+
+// Uncomment to enable debug prints.
+//#define BLYNK_DEBUG
+
+// Uncomment to force-enable 128 virtual pins
+//#define BLYNK_USE_128_VPINS
+
+// Uncomment to disable fancy logo
+//#define BLYNK_NO_FANCY_LOGO
+
+// Uncomment to enable 3D fancy logo
+//#define BLYNK_FANCY_LOGO_3D
+
+// Uncomment to enable experimental functions.
+//#define BLYNK_EXPERIMENTAL
+
+// Uncomment to disable all float/double usage
+//#define BLYNK_NO_FLOAT
+
+// Uncomment to switch to direct-connect mode
+//#define BLYNK_USE_DIRECT_CONNECT
+
+
+// Uncomment to append command body to header (uses more RAM)
+//#define BLYNK_SEND_ATOMIC
+
+// Split whole command into chunks (in bytes)
+//#define BLYNK_SEND_CHUNK 64
+
+// Wait after sending each chunk (in milliseconds)
+//#define BLYNK_SEND_THROTTLE 10
+
+#endif

wled00/src/dependencies/blynk/Blynk/BlynkDateTime.h

@@ -0,0 +1,173 @@
+/**
+ * @file       BlynkDateTime.h
+ * @author     Volodymyr Shymanskyy
+ * @license    This project is released under the MIT License (MIT)
+ * @copyright  Copyright (c) 2016 Volodymyr Shymanskyy
+ * @date       Aug 2016
+ * @brief      DateTime implementation
+ *
+ */
+
+#ifndef BlynkDateTime_h
+#define BlynkDateTime_h
+
+typedef long blynk_time_t;
+
+struct blynk_tm *blynk_gmtime_r(const blynk_time_t *time, struct blynk_tm *tm);
+blynk_time_t blynk_mk_gmtime(struct blynk_tm *tm);
+
+struct blynk_tm {
+    int8_t          tm_sec;
+    int8_t          tm_min;
+    int8_t          tm_hour;
+    int8_t          tm_mday;
+    int8_t          tm_wday;
+    int8_t          tm_mon;
+    int16_t         tm_year;
+    int16_t         tm_yday;
+    int16_t         tm_isdst;
+};
+
+class BlynkTime {
+
+public:
+    static const uint32_t MAX_TIME = 86400L;
+
+    BlynkTime() : mTime(-1) {}
+
+    BlynkTime(const BlynkTime& t) : mTime(t.mTime) {}
+
+    BlynkTime(long seconds) : mTime(seconds % MAX_TIME) {}
+
+    BlynkTime(int hour, int minute, int second)
+    {
+        mTime = (hour * 3600 + minute * 60 + second) % MAX_TIME;
+    }
+
+    int second() const { return mTime % 60; }
+    int minute() const { return (mTime / 60) % 60; }
+    int hour()   const { return mTime / 3600; }
+
+    int hour12() const {
+        int h = hour();
+        if (h == 0)
+            return 12; // 12 midnight
+        else if (h > 12)
+            return h - 12;
+        return h;
+    }
+
+    bool isAM() const { return !isPM(); }
+    bool isPM() const { return (hour() >= 12); }
+
+    void adjustSeconds(int sec) {
+        if (isValid()) {
+            mTime = (mTime + sec) % MAX_TIME;
+        }
+    }
+
+    blynk_time_t getUnixOffset() const { return mTime; }
+
+    bool isValid()  const { return mTime < MAX_TIME; }
+    operator bool() const { return isValid(); }
+
+    bool operator == (const BlynkTime& t) const { return mTime == t.mTime; }
+    bool operator >= (const BlynkTime& t) const { return mTime >= t.mTime; }
+    bool operator <= (const BlynkTime& t) const { return mTime <= t.mTime; }
+    bool operator >  (const BlynkTime& t) const { return mTime >  t.mTime; }
+    bool operator <  (const BlynkTime& t) const { return mTime <  t.mTime; }
+
+private:
+    uint32_t mTime;
+};
+
+class BlynkDateTime {
+
+public:
+    BlynkDateTime() : mTime(0) {}
+
+    BlynkDateTime(const BlynkDateTime& t)
+    {
+        mTime = t.mTime;
+        blynk_gmtime_r(&mTime, &mTm);
+    }
+
+    BlynkDateTime(blynk_time_t t)
+    {
+        mTime = t;
+        blynk_gmtime_r(&mTime, &mTm);
+    }
+
+    BlynkDateTime(int hour, int minute, int second, int day, int month, int year)
+    {
+        mTm.tm_hour = hour;
+        mTm.tm_min  = minute;
+        mTm.tm_sec  = second;
+
+        mTm.tm_mday = day;
+        mTm.tm_mon  = month - 1;
+        mTm.tm_year = year - 1900;
+
+        mTm.tm_isdst = 0;
+
+        mTime = blynk_mk_gmtime(&mTm);
+    }
+
+    int second() const { return mTm.tm_sec; }
+    int minute() const { return mTm.tm_min; }
+    int hour()   const { return mTm.tm_hour; }
+    int day()    const { return mTm.tm_mday; }
+    int month()  const { return 1 + mTm.tm_mon; }
+    int year()   const { return 1900 + mTm.tm_year; }
+
+    int day_of_year() const { return 1 + mTm.tm_yday; }
+    int day_of_week() const { return mTm.tm_wday == 0 ? 7 : mTm.tm_wday; }
+
+    /*int weak_of_year() const {
+        int julian = day_of_year();
+        int dow = day_of_week();
+        int dowJan1 = BlynkDateTime(0,0,0, 1,1,year()).day_of_week();
+        int weekNum = ((julian + 6) / 7);
+        if (dow < dowJan1)
+            ++weekNum;
+        return (weekNum);
+    }*/
+
+    int hour12() const {
+        int h = hour();
+        if (h == 0)
+            return 12; // 12 midnight
+        else if (h > 12)
+            return h - 12;
+        return h;
+    }
+
+    bool isAM() const { return !isPM(); }
+    bool isPM() const { return (hour() >= 12); }
+
+    void adjustSeconds(int sec) {
+        if (isValid()) {
+            mTime += sec;
+            blynk_gmtime_r(&mTime, &mTm);
+        }
+    }
+
+    //tm& getTm() { return mTm; }
+    blynk_time_t getUnix() const { return mTime; }
+
+    bool isValid()  const { return mTime != 0; }
+    operator bool() const { return isValid(); }
+
+    bool operator == (const BlynkDateTime& t) const { return mTime == t.mTime; }
+    bool operator >= (const BlynkDateTime& t) const { return mTime >= t.mTime; }
+    bool operator <= (const BlynkDateTime& t) const { return mTime <= t.mTime; }
+    bool operator >  (const BlynkDateTime& t) const { return mTime >  t.mTime; }
+    bool operator <  (const BlynkDateTime& t) const { return mTime <  t.mTime; }
+
+private:
+    blynk_tm mTm;
+    blynk_time_t mTime;
+};
+
+
+#endif

wled00/src/dependencies/blynk/Blynk/BlynkDebug.cpp

@@ -0,0 +1,278 @@
+/**
+ * @file       BlynkDebug.cpp
+ * @author     Volodymyr Shymanskyy
+ * @license    This project is released under the MIT License (MIT)
+ * @copyright  Copyright (c) 2015 Volodymyr Shymanskyy
+ * @date       Jan 2015
+ * @brief      Debug utilities for Arduino
+ */
+#include "BlynkDebug.h"
+
+#if defined(ARDUINO) && defined(__AVR__) && defined(BLYNK_USE_AVR_WDT)
+
+    #include <Arduino.h>
+    #include <avr/wdt.h>
+
+    BLYNK_CONSTRUCTOR
+    static void BlynkSystemInit()
+    {
+        MCUSR = 0;
+        wdt_disable();
+    }
+
+    void BlynkReset()
+    {
+        wdt_enable(WDTO_15MS);
+        delay(50);
+        void(*resetFunc)(void) = 0;
+        resetFunc();
+        for(;;) {} // To make compiler happy
+    }
+
+    size_t BlynkFreeRam()
+    {
+        extern int __heap_start, *__brkval;
+        int v;
+        return (int) &v - (__brkval == 0 ? (int) &__heap_start : (int) __brkval);
+    }
+
+    #define _BLYNK_USE_DEFAULT_MILLIS
+    #define _BLYNK_USE_DEFAULT_DELAY
+
+#elif defined(ARDUINO) && defined(__AVR__)
+
+    #include <Arduino.h>
+
+    void BlynkReset()
+    {
+        void(*resetFunc)(void) = 0;
+        resetFunc();
+        for(;;) {}
+    }
+
+    size_t BlynkFreeRam()
+    {
+        extern int __heap_start, *__brkval;
+        int v;
+        return (int) &v - (__brkval == 0 ? (int) &__heap_start : (int) __brkval);
+    }
+
+    #define _BLYNK_USE_DEFAULT_MILLIS
+    #define _BLYNK_USE_DEFAULT_DELAY
+
+#elif defined(ARDUINO) && defined(ESP8266)
+
+    #include <Arduino.h>
+
+    size_t BlynkFreeRam()
+    {
+        return ESP.getFreeHeap();
+    }
+
+    void BlynkReset()
+    {
+        ESP.restart();
+        for(;;) {}
+    }
+
+    #define _BLYNK_USE_DEFAULT_MILLIS
+    #define _BLYNK_USE_DEFAULT_DELAY
+
+#elif defined(ARDUINO_ARCH_SAMD) || defined(ARDUINO_ARCH_SAM)
+
+    #include <Arduino.h>
+
+    size_t BlynkFreeRam()
+    {
+        return 0;
+    }
+
+    void BlynkReset()
+    {
+        NVIC_SystemReset();
+        for(;;) {}
+    }
+
+    #define _BLYNK_USE_DEFAULT_MILLIS
+    #define _BLYNK_USE_DEFAULT_DELAY
+
+#elif defined (ARDUINO_ARCH_ARC32)
+
+    millis_time_t BlynkMillis()
+    {
+        // TODO: Remove workaround for Intel Curie
+        // https://forum.arduino.cc/index.php?topic=391836.0
+        noInterrupts();
+        uint64_t t = millis();
+        interrupts();
+        return t;
+    }
+
+    #define _BLYNK_USE_DEFAULT_FREE_RAM
+    #define _BLYNK_USE_DEFAULT_RESET
+    #define _BLYNK_USE_DEFAULT_DELAY
+
+#elif defined(ARDUINO) && (defined(__STM32F1__) || defined(__STM32F3__))
+
+    #include <Arduino.h>
+    #include <libmaple/nvic.h>
+
+    void BlynkReset()
+    {
+        nvic_sys_reset();
+        for(;;) {}
+    }
+
+    #define _BLYNK_USE_DEFAULT_FREE_RAM
+    #define _BLYNK_USE_DEFAULT_MILLIS
+    #define _BLYNK_USE_DEFAULT_DELAY
+
+#elif defined (PARTICLE) || defined(SPARK)
+
+    #include "application.h"
+
+    void BlynkReset()
+    {
+        System.reset();
+        for(;;) {} // To make compiler happy
+    }
+
+    #define _BLYNK_USE_DEFAULT_FREE_RAM
+    #define _BLYNK_USE_DEFAULT_MILLIS
+    #define _BLYNK_USE_DEFAULT_DELAY
+
+#elif defined(__MBED__)
+
+    #include "mbed.h"
+
+    static Timer  blynk_millis_timer;
+    static Ticker blynk_waker;
+
+    static
+    void blynk_wake() {
+        //pc.puts("(...)");
+    }
+
+    BLYNK_CONSTRUCTOR
+    static void BlynkSystemInit()
+    {
+        blynk_waker.attach(&blynk_wake, 2.0);
+        blynk_millis_timer.start();
+    }
+
+    void BlynkDelay(millis_time_t ms)
+    {
+        wait_ms(ms);
+    }
+
+    millis_time_t BlynkMillis()
+    {
+        return blynk_millis_timer.read_ms();
+    }
+
+    #define _BLYNK_USE_DEFAULT_FREE_RAM
+    #define _BLYNK_USE_DEFAULT_RESET
+
+#elif defined(LINUX) && defined(RASPBERRY)
+
+    #include <stdlib.h>
+    #include <wiringPi.h>
+
+    BLYNK_CONSTRUCTOR
+    static void BlynkSystemInit()
+    {
+        wiringPiSetupGpio();
+    }
+
+    void BlynkReset()
+    {
+        exit(1);
+        for(;;) {} // To make compiler happy
+    }
+
+    #define _BLYNK_USE_DEFAULT_FREE_RAM
+    #define _BLYNK_USE_DEFAULT_MILLIS
+    #define _BLYNK_USE_DEFAULT_DELAY
+
+#elif defined(LINUX)
+
+    #define _POSIX_C_SOURCE 200809L
+    #include <stdlib.h>
+    #include <time.h>
+    #include <unistd.h>
+
+    static millis_time_t blynk_startup_time = 0;
+
+    BLYNK_CONSTRUCTOR
+    static void BlynkSystemInit()
+    {
+        blynk_startup_time = BlynkMillis();
+    }
+
+    void BlynkReset()
+    {
+        exit(1);
+        for(;;) {} // To make compiler happy
+    }
+
+    void BlynkDelay(millis_time_t ms)
+    {
+        usleep(ms * 1000);
+    }
+
+    millis_time_t BlynkMillis()
+    {
+        struct timespec ts;
+        clock_gettime(CLOCK_MONOTONIC, &ts );
+        return ( ts.tv_sec * 1000 + ts.tv_nsec / 1000000L ) - blynk_startup_time;
+    }
+
+    #define _BLYNK_USE_DEFAULT_FREE_RAM
+
+#else
+
+    #if defined(BLYNK_DEBUG_ALL)
+        #warning "Need to implement board-specific utilities"
+    #endif
+
+    #define _BLYNK_USE_DEFAULT_FREE_RAM
+    #define _BLYNK_USE_DEFAULT_RESET
+    #define _BLYNK_USE_DEFAULT_MILLIS
+    #define _BLYNK_USE_DEFAULT_DELAY
+
+#endif
+
+#ifdef _BLYNK_USE_DEFAULT_DELAY
+    void BlynkDelay(millis_time_t ms)
+    {
+        return delay(ms);
+    }
+#endif
+
+#ifdef _BLYNK_USE_DEFAULT_MILLIS
+    millis_time_t BlynkMillis()
+    {
+        return millis();
+    }
+#endif
+
+#ifdef _BLYNK_USE_DEFAULT_FREE_RAM
+    size_t BlynkFreeRam()
+    {
+        return 0;
+    }
+#endif
+
+#ifdef _BLYNK_USE_DEFAULT_RESET
+    void BlynkReset()
+    {
+        for(;;) {} // To make compiler happy
+    }
+#endif
+
+void BlynkFatal()
+{
+    BlynkDelay(10000L);
+    BlynkReset();
+}
+

wled00/src/dependencies/blynk/Blynk/BlynkDebug.h

@@ -0,0 +1,305 @@
+/**
+ * @file       BlynkDebug.h
+ * @author     Volodymyr Shymanskyy
+ * @license    This project is released under the MIT License (MIT)
+ * @copyright  Copyright (c) 2015 Volodymyr Shymanskyy
+ * @date       Jan 2015
+ * @brief      Debug utilities
+ *
+ */
+
+#ifndef BlynkDebug_h
+#define BlynkDebug_h
+
+#include "BlynkConfig.h"
+
+#include <stddef.h>
+#ifdef ESP8266
+    extern "C" {
+    #include "ets_sys.h"
+    #include "os_type.h"
+    #include "mem.h"
+    }
+#else
+    #include <inttypes.h>
+#endif
+
+#if defined(ARDUINO_ARCH_ARC32)
+    typedef uint64_t millis_time_t;
+#else
+    typedef uint32_t millis_time_t;
+#endif
+
+void            BlynkDelay(millis_time_t ms);
+millis_time_t   BlynkMillis();
+size_t          BlynkFreeRam();
+void            BlynkReset() BLYNK_NORETURN;
+void            BlynkFatal() BLYNK_NORETURN;
+
+
+#if defined(SPARK) || defined(PARTICLE)
+    #include "application.h"
+#endif
+
+#if defined(ARDUINO)
+    #if ARDUINO >= 100
+        #include <Arduino.h>
+    #else
+        #include <WProgram.h>
+    #endif
+#endif
+
+#if defined(LINUX)
+    #if defined(RASPBERRY)
+        #include <wiringPi.h>
+    #endif
+#endif
+
+#if !defined(BLYNK_RUN_YIELD)
+    #if defined(BLYNK_NO_YIELD)
+        #define BLYNK_RUN_YIELD() {}
+    #elif defined(SPARK) || defined(PARTICLE)
+        #define BLYNK_RUN_YIELD() { Particle.process(); }
+    #elif !defined(ARDUINO) || (ARDUINO < 151)
+        #define BLYNK_RUN_YIELD() {}
+    #else
+        #define BLYNK_RUN_YIELD() { BlynkDelay(0); }
+    #endif
+#endif
+
+#if defined(__AVR__)
+    #include <avr/pgmspace.h>
+    #define BLYNK_HAS_PROGMEM
+    #define BLYNK_PROGMEM PROGMEM
+    #define BLYNK_F(s) F(s)
+    #define BLYNK_PSTR(s) PSTR(s)
+#else
+    #define BLYNK_PROGMEM
+    #define BLYNK_F(s) s
+    #define BLYNK_PSTR(s) s
+#endif
+
+#ifdef ARDUINO_AVR_DIGISPARK
+    typedef fstr_t __FlashStringHelper;
+#endif
+
+#if defined(BLYNK_DEBUG_ALL) && !(__cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__))
+    #warning "Compiler features not enabled -> please contact yor board vendor to enable c++0x"
+#endif
+
+// Diagnostic defines
+
+#define BLYNK_FATAL(msg)     { BLYNK_LOG1(msg); BlynkFatal(); }
+#define BLYNK_LOG_RAM()      { BLYNK_LOG2(BLYNK_F("Free RAM: "), BlynkFreeRam()); }
+#define BLYNK_LOG_FN()       BLYNK_LOG3(BLYNK_F(__FUNCTION__), '@', __LINE__);
+#define BLYNK_LOG_TROUBLE(t) BLYNK_LOG2(BLYNK_F("Trouble detected: http://docs.blynk.cc/#troubleshooting-"), t)
+
+#ifndef BLYNK_PRINT
+#undef BLYNK_DEBUG
+#endif
+
+#ifdef BLYNK_DEBUG_ALL
+#define BLYNK_DEBUG
+#endif
+
+#ifdef BLYNK_PRINT
+
+    #if defined(ARDUINO) || defined(SPARK) || defined(PARTICLE)
+
+#if defined(ARDUINO_ARCH_ARC32)
+        // This will cause error - on purpose
+        #define BLYNK_LOG(msg, ...)  BLYNK_LOG_UNAVAILABLE(msg, ##__VA_ARGS__)
+#else
+        #define BLYNK_LOG(msg, ...)  blynk_dbg_print(BLYNK_PSTR(msg), ##__VA_ARGS__)
+#endif
+
+        #define BLYNK_LOG1(p1)            { BLYNK_LOG_TIME(); BLYNK_PRINT.println(p1); }
+        #define BLYNK_LOG2(p1,p2)         { BLYNK_LOG_TIME(); BLYNK_PRINT.print(p1); BLYNK_PRINT.println(p2); }
+        #define BLYNK_LOG3(p1,p2,p3)      { BLYNK_LOG_TIME(); BLYNK_PRINT.print(p1); BLYNK_PRINT.print(p2); BLYNK_PRINT.println(p3); }
+        #define BLYNK_LOG4(p1,p2,p3,p4)   { BLYNK_LOG_TIME(); BLYNK_PRINT.print(p1); BLYNK_PRINT.print(p2); BLYNK_PRINT.print(p3); BLYNK_PRINT.println(p4); }
+        #define BLYNK_LOG6(p1,p2,p3,p4,p5,p6) { BLYNK_LOG_TIME(); BLYNK_PRINT.print(p1); BLYNK_PRINT.print(p2); BLYNK_PRINT.print(p3); BLYNK_PRINT.print(p4); BLYNK_PRINT.print(p5); BLYNK_PRINT.println(p6); }
+        #define BLYNK_LOG_IP(msg, ip)     { BLYNK_LOG_TIME(); BLYNK_PRINT.print(BLYNK_F(msg)); \
+                                            BLYNK_PRINT.print(ip[0]); BLYNK_PRINT.print('.');  \
+                                            BLYNK_PRINT.print(ip[1]); BLYNK_PRINT.print('.');  \
+                                            BLYNK_PRINT.print(ip[2]); BLYNK_PRINT.print('.');  \
+                                            BLYNK_PRINT.println(ip[3]); }
+        #define BLYNK_LOG_IP_REV(msg, ip) { BLYNK_LOG_TIME(); BLYNK_PRINT.print(BLYNK_F(msg)); \
+                                            BLYNK_PRINT.print(ip[3]); BLYNK_PRINT.print('.');  \
+                                            BLYNK_PRINT.print(ip[2]); BLYNK_PRINT.print('.');  \
+                                            BLYNK_PRINT.print(ip[1]); BLYNK_PRINT.print('.');  \
+                                            BLYNK_PRINT.println(ip[0]); }
+
+        static
+        void BLYNK_LOG_TIME() {
+            BLYNK_PRINT.print('[');
+            BLYNK_PRINT.print(BlynkMillis());
+            BLYNK_PRINT.print(BLYNK_F("] "));
+        }
+
+#ifdef BLYNK_DEBUG
+        #include <ctype.h>
+        #define BLYNK_DBG_BREAK()    { for(;;); }
+        #define BLYNK_ASSERT(expr)   { if(!(expr)) { BLYNK_LOG2(BLYNK_F("Assertion failed: "), BLYNK_F(#expr)); BLYNK_DBG_BREAK() } }
+
+        static
+        void BLYNK_DBG_DUMP(const char* msg, const void* addr, size_t len) {
+            if (len) {
+                BLYNK_LOG_TIME();
+                BLYNK_PRINT.print(msg);
+                int l2 = len;
+                const uint8_t* octets = (const uint8_t*)addr;
+                bool prev_print = true;
+                while (l2--) {
+                    const uint8_t c = *octets++ & 0xFF;
+                    if (c >= 32 && c < 127) {
+                        if (!prev_print) { BLYNK_PRINT.print(']'); }
+                        BLYNK_PRINT.print((char)c);
+                        prev_print = true;
+                    } else {
+                        BLYNK_PRINT.print(prev_print?'[':'|');
+                        if (c < 0x10) { BLYNK_PRINT.print('0'); }
+                        BLYNK_PRINT.print(c, HEX);
+                        prev_print = false;
+                    }
+                }
+                if (!prev_print) {
+                    BLYNK_PRINT.print(']');
+                }
+                BLYNK_PRINT.println();
+            }
+        }
+#endif
+
+        #if !defined(ARDUINO_ARCH_ARC32)
+        #include <stdio.h>
+        #include <stdarg.h>
+
+        BLYNK_UNUSED
+        void blynk_dbg_print(const char* BLYNK_PROGMEM fmt, ...)
+        {
+            va_list ap;
+            va_start(ap, fmt);
+            char buff[128];
+            BLYNK_PRINT.print('[');
+            BLYNK_PRINT.print(BlynkMillis());
+            BLYNK_PRINT.print(BLYNK_F("] "));
+#if defined(__AVR__)
+            vsnprintf_P(buff, sizeof(buff), fmt, ap);
+#else
+            vsnprintf(buff, sizeof(buff), fmt, ap);
+#endif
+            BLYNK_PRINT.println(buff);
+            va_end(ap);
+        }
+        #endif // ARDUINO_ARCH_ARC32
+
+    #elif defined(__MBED__)
+
+        #define BLYNK_LOG(msg, ...)       { BLYNK_PRINT.printf("[%ld] " msg "\n", BlynkMillis(), ##__VA_ARGS__); }
+        #define BLYNK_LOG1(p1)            { BLYNK_LOG(p1);}
+        #define BLYNK_LOG2(p1,p2)         { BLYNK_LOG(p1,p2);}
+        #define BLYNK_LOG3(p1,p2,p3)      { BLYNK_LOG(p1,p2,p3);}
+        #define BLYNK_LOG4(p1,p2,p3,p4)   { BLYNK_LOG(p1,p2,p3,p4);}
+        #define BLYNK_LOG6(p1,p2,p3,p4,p5,p6)   { BLYNK_LOG(p1,p2,p3,p4,p5,p6);}
+
+        #define BLYNK_LOG_TIME() BLYNK_PRINT.printf("[%ld]", BlynkMillis());
+
+#ifdef BLYNK_DEBUG
+        #define BLYNK_DBG_BREAK()    raise(SIGTRAP);
+        #define BLYNK_ASSERT(expr)   assert(expr)
+
+        static
+        void BLYNK_DBG_DUMP(const char* msg, const void* addr, size_t len) {
+            BLYNK_LOG_TIME();
+            BLYNK_PRINT.printf(msg);
+            int l2 = len;
+            const uint8_t* octets = (const uint8_t*)addr;
+            bool prev_print = true;
+            while (l2--) {
+                const uint8_t c = *octets++ & 0xFF;
+                if (c >= 32 && c < 127) {
+                    if (!prev_print) { BLYNK_PRINT.putc(']'); }
+                    BLYNK_PRINT.putc((char)c);
+                    prev_print = true;
+                } else {
+                    BLYNK_PRINT.putc(prev_print?'[':'|');
+                    BLYNK_PRINT.printf("%02x", c);
+                    prev_print = false;
+                }
+            }
+            BLYNK_PRINT.printf("%s\n", prev_print?"":"]");
+        }
+#endif
+
+    #elif defined(LINUX)
+
+        #include <assert.h>
+        #include <stdio.h>
+        #include <string.h>
+        #include <errno.h>
+        #include <signal.h>
+
+        #include <iostream>
+        using namespace std;
+        #define BLYNK_LOG(msg, ...)       { fprintf(BLYNK_PRINT, "[%ld] " msg "\n", BlynkMillis(), ##__VA_ARGS__); }
+        #define BLYNK_LOG1(p1)            { BLYNK_LOG_TIME(); cout << p1 << endl; }
+        #define BLYNK_LOG2(p1,p2)         { BLYNK_LOG_TIME(); cout << p1 << p2 << endl; }
+        #define BLYNK_LOG3(p1,p2,p3)      { BLYNK_LOG_TIME(); cout << p1 << p2 << p3 << endl; }
+        #define BLYNK_LOG4(p1,p2,p3,p4)   { BLYNK_LOG_TIME(); cout << p1 << p2 << p3 << p4 << endl; }
+        #define BLYNK_LOG6(p1,p2,p3,p4,p5,p6)   { BLYNK_LOG_TIME(); cout << p1 << p2 << p3 << p4 << p5 << p6 << endl; }
+
+        #define BLYNK_LOG_TIME() cout << '[' << BlynkMillis() << "] ";
+
+#ifdef BLYNK_DEBUG
+        #define BLYNK_DBG_BREAK()    raise(SIGTRAP);
+        #define BLYNK_ASSERT(expr)   assert(expr)
+
+        static
+        void BLYNK_DBG_DUMP(const char* msg, const void* addr, size_t len) {
+            BLYNK_LOG_TIME();
+            fprintf(BLYNK_PRINT, "%s", msg);
+            int l2 = len;
+            const uint8_t* octets = (const uint8_t*)addr;
+            bool prev_print = true;
+            while (l2--) {
+                const uint8_t c = *octets++ & 0xFF;
+                if (c >= 32 && c < 127) {
+                    if (!prev_print) { fputc(']', BLYNK_PRINT); }
+                    fputc((char)c, BLYNK_PRINT);
+                    prev_print = true;
+                } else {
+                    fputc(prev_print?'[':'|', BLYNK_PRINT);
+                    fprintf(BLYNK_PRINT, "%02x", c);
+                    prev_print = false;
+                }
+            }
+            fprintf(BLYNK_PRINT, "%s\n", prev_print?"":"]");
+        }
+#endif
+
+    #else
+
+        #warning "Cannot detect platform"
+
+    #endif
+
+#endif
+
+#ifndef BLYNK_LOG
+    #define BLYNK_LOG(...)
+    #define BLYNK_LOG1(p1)
+    #define BLYNK_LOG2(p1,p2)
+    #define BLYNK_LOG3(p1,p2,p3)
+    #define BLYNK_LOG4(p1,p2,p3,p4)
+    #define BLYNK_LOG6(p1,p2,p3,p4,p5,p6)
+    #define BLYNK_LOG_IP(msg, ip)
+    #define BLYNK_LOG_IP_REV(msg, ip)
+#endif
+
+#ifndef BLYNK_DBG_BREAK
+    #define BLYNK_DBG_BREAK()
+    #define BLYNK_ASSERT(expr)
+    #define BLYNK_DBG_DUMP(msg, addr, len)
+#endif
+
+#endif

wled00/src/dependencies/blynk/Blynk/BlynkDetectDevice.h

@@ -0,0 +1,268 @@
+/**
+ * @file       BlynkDetectDevice.h
+ * @author     Volodymyr Shymanskyy
+ * @license    This project is released under the MIT License (MIT)
+ * @copyright  Copyright (c) 2016 Volodymyr Shymanskyy
+ * @date       May 2016
+ * @brief
+ *
+ */
+
+#ifndef BlynkDetectDevice_h
+#define BlynkDetectDevice_h
+
+// General defines
+
+#define BLYNK_NEWLINE "\r\n"
+
+#define BLYNK_CONCAT(a, b) a ## b
+#define BLYNK_CONCAT2(a, b) BLYNK_CONCAT(a, b)
+
+#define BLYNK_STRINGIFY(x) #x
+#define BLYNK_TOSTRING(x) BLYNK_STRINGIFY(x)
+
+#define BLYNK_COUNT_OF(x) ((sizeof(x)/sizeof(0[x])) / ((size_t)(!(sizeof(x) % sizeof(0[x])))))
+
+#define BLYNK_ATTR_PACKED __attribute__ ((__packed__))
+#define BLYNK_NORETURN __attribute__ ((noreturn))
+#define BLYNK_UNUSED __attribute__((__unused__))
+#define BLYNK_DEPRECATED __attribute__ ((deprecated))
+#define BLYNK_CONSTRUCTOR __attribute__((constructor))
+
+// Causes problems on some platforms
+#define BLYNK_FORCE_INLINE inline //__attribute__((always_inline))
+
+#ifndef BLYNK_INFO_CPU
+    #if   defined(__AVR_ATmega168__)
+    #define BLYNK_INFO_CPU      "ATmega168"
+    #endif
+#endif
+
+#ifndef BLYNK_INFO_DEVICE
+
+    #if   defined(ENERGIA)
+
+        #define BLYNK_NO_YIELD
+        #define BLYNK_USE_128_VPINS
+
+        #if   defined(ENERGIA_ARCH_MSP430)
+            #define BLYNK_INFO_DEVICE  "LaunchPad MSP430"
+            #define BLYNK_INFO_CPU     "MSP430"
+            #define BLYNK_NO_FLOAT
+        #elif defined(ENERGIA_ARCH_MSP432)
+            #define BLYNK_INFO_DEVICE  "LaunchPad MSP432"
+            #define BLYNK_INFO_CPU     "MSP432"
+        #elif defined(ENERGIA_ARCH_TIVAC)
+            #define BLYNK_INFO_DEVICE  "LaunchPad"
+
+        #elif defined(ENERGIA_ARCH_CC3200EMT) || defined(ENERGIA_ARCH_CC3200)
+            #define BLYNK_INFO_CONNECTION  "CC3200"
+            #define BLYNK_SEND_CHUNK 64
+            #define BLYNK_BUFFERS_SIZE 1024
+
+            #if   defined(ENERGIA_CC3200_LAUNCHXL) //TODO: This is a bug in Energia IDE
+            #define BLYNK_INFO_DEVICE  "CC3200 LaunchXL"
+            #elif defined(ENERGIA_RedBearLab_CC3200)
+            #define BLYNK_INFO_DEVICE  "RBL CC3200"
+            #elif defined(ENERGIA_RedBearLab_WiFiMini)
+            #define BLYNK_INFO_DEVICE  "RBL WiFi Mini"
+            #elif defined(ENERGIA_RedBearLab_WiFiMicro)
+            #define BLYNK_INFO_DEVICE  "RBL WiFi Micro"
+            #endif
+        #elif defined(ENERGIA_ARCH_CC3220EMT) || defined(ENERGIA_ARCH_CC3220)
+            #define BLYNK_INFO_CONNECTION  "CC3220"
+            #define BLYNK_SEND_CHUNK 64
+            #define BLYNK_BUFFERS_SIZE 1024
+
+            #define BLYNK_USE_INTERNAL_DTOSTRF
+
+            #define BLYNK_INFO_DEVICE  "CC3220"
+            #define BLYNK_INFO_CPU     "CC3220"
+        #endif
+
+        #if !defined(BLYNK_INFO_DEVICE)
+        #define BLYNK_INFO_DEVICE  "Energia"
+        #endif
+
+    #elif defined(LINUX)
+
+        #define BLYNK_INFO_DEVICE  "Linux"
+        #define BLYNK_USE_128_VPINS
+        #define BLYNK_BUFFERS_SIZE 4096
+
+    #elif defined(SPARK) || defined(PARTICLE)
+
+        #define BLYNK_USE_128_VPINS
+        #define BLYNK_BUFFERS_SIZE 1024
+
+        #if PLATFORM_ID==0
+        #define BLYNK_INFO_DEVICE  "Particle Core"
+        #undef BLYNK_BUFFERS_SIZE // Use default on Core
+        #elif PLATFORM_ID==6
+        #define BLYNK_INFO_DEVICE  "Particle Photon"
+        #elif PLATFORM_ID==8
+        #define BLYNK_INFO_DEVICE  "Particle P1"
+        #elif PLATFORM_ID==9
+        #define BLYNK_INFO_DEVICE  "Particle Ethernet"
+        #elif PLATFORM_ID==10
+        #define BLYNK_INFO_DEVICE  "Particle Electron"
+        #elif PLATFORM_ID==31
+        #define BLYNK_INFO_DEVICE  "Particle RPi"
+        #elif PLATFORM_ID==82
+        #define BLYNK_INFO_DEVICE  "Digistump Oak"
+        #elif PLATFORM_ID==88
+        #define BLYNK_INFO_DEVICE  "RedBear Duo"
+        #elif PLATFORM_ID==103
+        #define BLYNK_INFO_DEVICE  "Bluz"
+        #else
+        #if defined(BLYNK_DEBUG_ALL)
+            #warning "Cannot detect board type"
+        #endif
+        #define BLYNK_INFO_DEVICE  "Particle"
+        #endif
+
+    #elif defined(__MBED__)
+
+        #define BLYNK_INFO_DEVICE  "MBED"
+        #define BLYNK_USE_128_VPINS
+        #define BLYNK_BUFFERS_SIZE 512
+        #define noInterrupts() __disable_irq()
+        #define interrupts()   __enable_irq()
+
+    #elif defined(ARDUINO) && defined(MPIDE)
+        #define BLYNK_NO_YIELD
+
+        #if   defined(_BOARD_UNO_)
+        #define BLYNK_INFO_DEVICE  "chipKIT Uno32"
+        #else
+        #define BLYNK_INFO_DEVICE  "chipKIT"
+        #endif
+
+    #elif defined(ARDUINO) && defined(ARDUINO_AMEBA)
+        #if defined(BOARD_RTL8710)
+        #define BLYNK_INFO_DEVICE  "RTL8710"
+        #define BLYNK_USE_128_VPINS
+        #define BLYNK_BUFFERS_SIZE 1024
+        #elif defined(BOARD_RTL8711AM)
+        #define BLYNK_INFO_DEVICE  "RTL8711AM"
+        #define BLYNK_USE_128_VPINS
+        #define BLYNK_BUFFERS_SIZE 1024
+        #elif defined(BOARD_RTL8195A)
+        #define BLYNK_INFO_DEVICE  "RTL8195A"
+        #define BLYNK_USE_128_VPINS
+        #define BLYNK_BUFFERS_SIZE 1024
+        #else
+        #define BLYNK_INFO_DEVICE  "Ameba"
+        #endif
+
+    #elif defined(ARDUINO) && defined(TEENSYDUINO)
+
+        #if   defined(__MK66FX1M0__)
+        #define BLYNK_INFO_DEVICE  "Teensy 3.6"
+        #define BLYNK_USE_128_VPINS
+        #define BLYNK_BUFFERS_SIZE 1024
+        #elif defined(__MK64FX512__)
+        #define BLYNK_INFO_DEVICE  "Teensy 3.5"
+        #define BLYNK_USE_128_VPINS
+        #define BLYNK_BUFFERS_SIZE 1024
+        #elif defined(__MK20DX256__)
+        #define BLYNK_INFO_DEVICE  "Teensy 3.2/3.1"
+        #define BLYNK_USE_128_VPINS
+        #define BLYNK_BUFFERS_SIZE 1024
+        #elif   defined(__MK20DX128__)
+        #define BLYNK_INFO_DEVICE  "Teensy 3.0"
+        #define BLYNK_USE_128_VPINS
+        #define BLYNK_BUFFERS_SIZE 1024
+        #elif   defined(__MKL26Z64__)
+        #define BLYNK_INFO_DEVICE  "Teensy LC"
+        #define BLYNK_BUFFERS_SIZE 512
+        #elif   defined(ARDUINO_ARCH_AVR)
+        #define BLYNK_INFO_DEVICE  "Teensy 2.0"
+        #else
+        #define BLYNK_INFO_DEVICE  "Teensy"
+        #endif
+
+    #elif defined(ARDUINO)
+
+        #if defined(ARDUINO_ARCH_SAMD) || defined(ESP32) || defined(ESP8266)
+            #define BLYNK_USE_128_VPINS
+            #define BLYNK_BUFFERS_SIZE 1024
+        #endif
+
+        /* Arduino AVR */
+        #if   defined(ARDUINO_AVR_NANO)
+        #define BLYNK_INFO_DEVICE  "Arduino Nano"
+
+        /* ESP8266 */
+        #elif defined(ARDUINO_ESP8266_ESP01)
+        #define BLYNK_INFO_DEVICE  "ESP8266"
+        #elif defined(ARDUINO_ESP8266_ESP12)
+        #define BLYNK_INFO_DEVICE  "ESP-12"
+        #elif defined(ARDUINO_ESP8266_NODEMCU)
+        #define BLYNK_INFO_DEVICE  "NodeMCU"
+        #elif defined(ARDUINO_ESP8266_THING)
+        #define BLYNK_INFO_DEVICE  "Esp Thing"
+        #elif defined(ARDUINO_ESP8266_THING_DEV)
+        #define BLYNK_INFO_DEVICE  "Esp Thing Dev"
+
+        /* ESP32 */
+        #elif defined(ARDUINO_ESP32_DEV)
+        #define BLYNK_INFO_DEVICE  "ESP32"
+        #elif defined(ARDUINO_ESP320)
+        #define BLYNK_INFO_DEVICE  "SweetPeas ESP320"
+        #elif defined(ARDUINO_NANO32)
+        #define BLYNK_INFO_DEVICE  "ESP32 Nano32"
+        #elif defined(ARDUINO_LoLin32)
+        #define BLYNK_INFO_DEVICE  "LoLin32"
+        #elif defined(ARDUINO_ESPea32)
+        #define BLYNK_INFO_DEVICE  "ESPea32"
+        #elif defined(ARDUINO_QUANTUM)
+        #define BLYNK_INFO_DEVICE  "Noduino Quantum"
+
+        #else
+        #if defined(BLYNK_DEBUG_ALL)
+            #warning "Cannot detect board type"
+        #endif
+        #define BLYNK_INFO_DEVICE  "Arduino"
+        #endif
+
+    #elif defined(TI_CC3220)
+        #define BLYNK_INFO_DEVICE  "TI CC3220"
+        #define BLYNK_USE_128_VPINS
+        #define BLYNK_BUFFERS_SIZE 1024
+
+        #define BLYNK_USE_INTERNAL_DTOSTRF
+
+    #else
+
+        #define BLYNK_INFO_DEVICE  "Custom platform"
+
+    #endif
+
+    #if !defined(BLYNK_MAX_READBYTES) && defined(BLYNK_BUFFERS_SIZE)
+    #define BLYNK_MAX_READBYTES  BLYNK_BUFFERS_SIZE
+    #endif
+
+    #if !defined(BLYNK_MAX_SENDBYTES) && defined(BLYNK_BUFFERS_SIZE)
+    #define BLYNK_MAX_SENDBYTES  BLYNK_BUFFERS_SIZE
+    #endif
+
+    // Print diagnostics
+
+    #if defined(BLYNK_DEBUG_ALL)
+        #if defined(BLYNK_INFO_DEVICE)
+        #pragma message ("BLYNK_INFO_DEVICE=" BLYNK_TOSTRING(BLYNK_INFO_DEVICE))
+        #endif
+
+        #if defined(BLYNK_INFO_CPU)
+        #pragma message ("BLYNK_INFO_CPU="    BLYNK_TOSTRING(BLYNK_INFO_CPU))
+        #endif
+
+        #if defined(BLYNK_BUFFERS_SIZE)
+        #pragma message ("BLYNK_BUFFERS_SIZE=" BLYNK_TOSTRING(BLYNK_BUFFERS_SIZE))
+        #endif
+    #endif
+
+#endif
+
+#endif

wled00/src/dependencies/blynk/Blynk/BlynkEveryN.h

@@ -0,0 +1,69 @@
+
+#ifndef BLYNKEVERYN_H
+#define BLYNKEVERYN_H
+
+#include "BlynkDebug.h"
+
+millis_time_t blynk_count_millis() {
+    const millis_time_t ms = BlynkMillis();
+    return ms;
+}
+
+uint16_t blynk_count_seconds16() {
+    const millis_time_t ms = BlynkMillis();
+    return (ms / 1000);
+}
+
+uint16_t blynk_count_minutes16()
+{
+    const millis_time_t ms = BlynkMillis();
+    return (ms / (60000L)) & 0xFFFF;
+}
+
+uint8_t blynk_count_hours8()
+{
+    const millis_time_t ms = BlynkMillis();
+    return (ms / (3600000L)) & 0xFF;
+}
+
+template<typename T, T (*timeGetter)()>
+class BlynkPeriodic {
+public:
+    T mPrev;
+    T mPeriod;
+
+    BlynkPeriodic()           { reset(); mPeriod = 1; };
+    BlynkPeriodic(T period)   { reset(); setPeriod(period); };
+    void setPeriod( T period) { mPeriod = period; };
+    T getTime()               { return (T)(timeGetter()); };
+    T getPeriod()             { return mPeriod; };
+    T getElapsed()            { return getTime() - mPrev; }
+    T getRemaining()          { return mPeriod - getElapsed(); }
+    T getLastTriggerTime()    { return mPrev; }
+    bool ready() {
+        bool isReady = (getElapsed() >= mPeriod);
+        if( isReady ) { reset(); }
+        return isReady;
+    }
+    void reset()              { mPrev = getTime(); };
+    void trigger()            { mPrev = getTime() - mPeriod; };
+
+    operator bool()           { return ready(); }
+};
+
+typedef BlynkPeriodic<millis_time_t,blynk_count_millis> BlynkEveryNMillis;
+typedef BlynkPeriodic<uint16_t,blynk_count_seconds16>   BlynkEveryNSeconds;
+typedef BlynkPeriodic<uint16_t,blynk_count_minutes16>   BlynkEveryNMinutes;
+typedef BlynkPeriodic<uint8_t,blynk_count_hours8>       BlynkEveryNHours;
+
+#define BLYNK_EVERY_N_MILLIS_I(NAME,N)  static BlynkEveryNMillis NAME(N); if(NAME)
+#define BLYNK_EVERY_N_SECONDS_I(NAME,N) static BlynkEveryNSeconds NAME(N); if(NAME)
+#define BLYNK_EVERY_N_MINUTES_I(NAME,N) static BlynkEveryNMinutes NAME(N); if(NAME)
+#define BLYNK_EVERY_N_HOURS_I(NAME,N)   static BlynkEveryNHours NAME(N); if(NAME)
+
+#define BLYNK_EVERY_N_MILLIS(N)  BLYNK_EVERY_N_MILLIS_I(BLYNK_CONCAT2(PER, __COUNTER__),N)
+#define BLYNK_EVERY_N_SECONDS(N) BLYNK_EVERY_N_SECONDS_I(BLYNK_CONCAT2(PER, __COUNTER__),N)
+#define BLYNK_EVERY_N_MINUTES(N) BLYNK_EVERY_N_MINUTES_I(BLYNK_CONCAT2(PER, __COUNTER__),N)
+#define BLYNK_EVERY_N_HOURS(N)   BLYNK_EVERY_N_HOURS_I(BLYNK_CONCAT2(PER, __COUNTER__),N)
+
+#endif

wled00/src/dependencies/blynk/Blynk/BlynkFifo.h

@@ -0,0 +1,158 @@
+/**
+ * @file       BlynkFifo.h
+ * @author     Volodymyr Shymanskyy
+ * @license    This project is released under the MIT License (MIT)
+ * @copyright  Copyright (c) 2015 Volodymyr Shymanskyy
+ * @date       Feb 2015
+ * @brief      FIFO implementation
+ *
+ */
+
+#ifndef BlynkFifo_h
+#define BlynkFifo_h
+
+#include "BlynkUtility.h"
+
+template <class T, unsigned N>
+class BlynkFifo
+{
+public:
+    BlynkFifo()
+    {
+        clear();
+    }
+
+    void clear()
+    {
+        _r = 0;
+        _w = 0;
+    }
+
+    ~BlynkFifo(void)
+    {}
+
+    // writing thread/context API
+    //-------------------------------------------------------------
+
+    bool writeable(void)
+    {
+        return free() > 0;
+    }
+
+    int free(void)
+    {
+        int s = _r - _w;
+        if (s <= 0)
+            s += N;
+        return s - 1;
+    }
+
+    T put(const T& c)
+    {
+        int i = _w;
+        int j = i;
+        i = _inc(i);
+        while (i == _r) // = !writeable()
+            /* nothing / just wait */;
+        _b[j] = c;
+        _w = i;
+        return c;
+    }
+
+    int put(const T* p, int n, bool blocking = false)
+    {
+        int c = n;
+        while (c)
+        {
+            int f;
+            while ((f = free()) == 0) // wait for space
+            {
+                if (!blocking) return n - c; // no more space and not blocking
+                /* nothing / just wait */;
+            }
+            // check free space
+            if (c < f) f = c;
+            int w = _w;
+            int m = N - w;
+            // check wrap
+            if (f > m) f = m;
+            memcpy(&_b[w], p, f);
+            _w = _inc(w, f);
+            c -= f;
+            p += f;
+        }
+        return n - c;
+    }
+
+    // reading thread/context API
+    // --------------------------------------------------------
+
+    bool readable(void)
+    {
+        return (_r != _w);
+    }
+
+    size_t size(void)
+    {
+        int s = _w - _r;
+        if (s < 0)
+            s += N;
+        return s;
+    }
+
+    T get(void)
+    {
+        int r = _r;
+        while (r == _w) // = !readable()
+            /* nothing / just wait */;
+        T t = _b[r];
+        _r = _inc(r);
+        return t;
+    }
+
+    T peek(void)
+    {
+        int r = _r;
+        while (r == _w);
+        return _b[r];
+    }
+
+    int get(T* p, int n, bool blocking = false)
+    {
+        int c = n;
+        while (c)
+        {
+            int f;
+            for (;;) // wait for data
+            {
+                f = size();
+                if (f)  break;        // free space
+                if (!blocking) return n - c; // no space and not blocking
+                /* nothing / just wait */;
+            }
+            // check available data
+            if (c < f) f = c;
+            int r = _r;
+            int m = N - r;
+            // check wrap
+            if (f > m) f = m;
+            memcpy(p, &_b[r], f);
+            _r = _inc(r, f);
+            c -= f;
+            p += f;
+        }
+        return n - c;
+    }
+
+private:
+    int _inc(int i, int n = 1)
+    {
+        return (i + n) % N;
+    }
+
+    T             _b[N];
+    volatile int  _w;
+    volatile int  _r;
+};
+
+#endif

wled00/src/dependencies/blynk/Blynk/BlynkHandlers.cpp

@@ -0,0 +1,402 @@
+/**
+ * @file       BlynkHandlers.cpp
+ * @author     Volodymyr Shymanskyy
+ * @license    This project is released under the MIT License (MIT)
+ * @copyright  Copyright (c) 2015 Volodymyr Shymanskyy
+ * @date       Jan 2015
+ * @brief      Virtual pin utilities
+ */
+
+#include "BlynkConfig.h"
+#include "BlynkHandlers.h"
+#include "BlynkDebug.h"
+
+void BlynkNoOpCbk()
+{}
+
+void BlynkWidgetRead(BlynkReq BLYNK_UNUSED &request)
+{
+    BLYNK_LOG2(BLYNK_F("No handler for reading from pin "), request.pin);
+}
+
+void BlynkWidgetWrite(BlynkReq BLYNK_UNUSED &request, const BlynkParam BLYNK_UNUSED &param)
+{
+    BLYNK_LOG2(BLYNK_F("No handler for writing to pin "), request.pin);
+}
+
+#define BLYNK_ON_READ_IMPL(pin)  void BlynkWidgetRead  ## pin (BlynkReq BLYNK_UNUSED &req) \
+          __attribute__((weak, alias("BlynkWidgetRead")))
+
+#define BLYNK_ON_WRITE_IMPL(pin) void BlynkWidgetWrite ## pin (BlynkReq BLYNK_UNUSED &req, const BlynkParam BLYNK_UNUSED &param) \
+          __attribute__((weak, alias("BlynkWidgetWrite")))
+
+BLYNK_CONNECTED() __attribute__((weak, alias("BlynkNoOpCbk")));
+BLYNK_DISCONNECTED() __attribute__((weak, alias("BlynkNoOpCbk")));
+
+// Internal Virtual Pins
+BLYNK_ON_WRITE_IMPL(InternalPinACON);
+BLYNK_ON_WRITE_IMPL(InternalPinADIS);
+BLYNK_ON_WRITE_IMPL(InternalPinRTC);
+BLYNK_ON_WRITE_IMPL(InternalPinOTA);
+
+// Regular Virtual Pins
+BLYNK_ON_READ_IMPL(Default);
+BLYNK_ON_WRITE_IMPL(Default);
+
+BLYNK_ON_READ_IMPL(0 );
+BLYNK_ON_READ_IMPL(1 );
+BLYNK_ON_READ_IMPL(2 );
+BLYNK_ON_READ_IMPL(3 );
+BLYNK_ON_READ_IMPL(4 );
+BLYNK_ON_READ_IMPL(5 );
+BLYNK_ON_READ_IMPL(6 );
+BLYNK_ON_READ_IMPL(7 );
+BLYNK_ON_READ_IMPL(8 );
+BLYNK_ON_READ_IMPL(9 );
+BLYNK_ON_READ_IMPL(10);
+BLYNK_ON_READ_IMPL(11);
+BLYNK_ON_READ_IMPL(12);
+BLYNK_ON_READ_IMPL(13);
+BLYNK_ON_READ_IMPL(14);
+BLYNK_ON_READ_IMPL(15);
+BLYNK_ON_READ_IMPL(16);
+BLYNK_ON_READ_IMPL(17);
+BLYNK_ON_READ_IMPL(18);
+BLYNK_ON_READ_IMPL(19);
+BLYNK_ON_READ_IMPL(20);
+BLYNK_ON_READ_IMPL(21);
+BLYNK_ON_READ_IMPL(22);
+BLYNK_ON_READ_IMPL(23);
+BLYNK_ON_READ_IMPL(24);
+BLYNK_ON_READ_IMPL(25);
+BLYNK_ON_READ_IMPL(26);
+BLYNK_ON_READ_IMPL(27);
+BLYNK_ON_READ_IMPL(28);
+BLYNK_ON_READ_IMPL(29);
+BLYNK_ON_READ_IMPL(30);
+BLYNK_ON_READ_IMPL(31);
+#ifdef BLYNK_USE_128_VPINS
+  BLYNK_ON_READ_IMPL(32);
+  BLYNK_ON_READ_IMPL(33);
+  BLYNK_ON_READ_IMPL(34);
+  BLYNK_ON_READ_IMPL(35);
+  BLYNK_ON_READ_IMPL(36);
+  BLYNK_ON_READ_IMPL(37);
+  BLYNK_ON_READ_IMPL(38);
+  BLYNK_ON_READ_IMPL(39);
+  BLYNK_ON_READ_IMPL(40);
+  BLYNK_ON_READ_IMPL(41);
+  BLYNK_ON_READ_IMPL(42);
+  BLYNK_ON_READ_IMPL(43);
+  BLYNK_ON_READ_IMPL(44);
+  BLYNK_ON_READ_IMPL(45);
+  BLYNK_ON_READ_IMPL(46);
+  BLYNK_ON_READ_IMPL(47);
+  BLYNK_ON_READ_IMPL(48);
+  BLYNK_ON_READ_IMPL(49);
+  BLYNK_ON_READ_IMPL(50);
+  BLYNK_ON_READ_IMPL(51);
+  BLYNK_ON_READ_IMPL(52);
+  BLYNK_ON_READ_IMPL(53);
+  BLYNK_ON_READ_IMPL(54);
+  BLYNK_ON_READ_IMPL(55);
+  BLYNK_ON_READ_IMPL(56);
+  BLYNK_ON_READ_IMPL(57);
+  BLYNK_ON_READ_IMPL(58);
+  BLYNK_ON_READ_IMPL(59);
+  BLYNK_ON_READ_IMPL(60);
+  BLYNK_ON_READ_IMPL(61);
+  BLYNK_ON_READ_IMPL(62);
+  BLYNK_ON_READ_IMPL(63);
+  BLYNK_ON_READ_IMPL(64);
+  BLYNK_ON_READ_IMPL(65);
+  BLYNK_ON_READ_IMPL(66);
+  BLYNK_ON_READ_IMPL(67);
+  BLYNK_ON_READ_IMPL(68);
+  BLYNK_ON_READ_IMPL(69);
+  BLYNK_ON_READ_IMPL(70);
+  BLYNK_ON_READ_IMPL(71);
+  BLYNK_ON_READ_IMPL(72);
+  BLYNK_ON_READ_IMPL(73);
+  BLYNK_ON_READ_IMPL(74);
+  BLYNK_ON_READ_IMPL(75);
+  BLYNK_ON_READ_IMPL(76);
+  BLYNK_ON_READ_IMPL(77);
+  BLYNK_ON_READ_IMPL(78);
+  BLYNK_ON_READ_IMPL(79);
+  BLYNK_ON_READ_IMPL(80);
+  BLYNK_ON_READ_IMPL(81);
+  BLYNK_ON_READ_IMPL(82);
+  BLYNK_ON_READ_IMPL(83);
+  BLYNK_ON_READ_IMPL(84);
+  BLYNK_ON_READ_IMPL(85);
+  BLYNK_ON_READ_IMPL(86);
+  BLYNK_ON_READ_IMPL(87);
+  BLYNK_ON_READ_IMPL(88);
+  BLYNK_ON_READ_IMPL(89);
+  BLYNK_ON_READ_IMPL(90);
+  BLYNK_ON_READ_IMPL(91);
+  BLYNK_ON_READ_IMPL(92);
+  BLYNK_ON_READ_IMPL(93);
+  BLYNK_ON_READ_IMPL(94);
+  BLYNK_ON_READ_IMPL(95);
+  BLYNK_ON_READ_IMPL(96);
+  BLYNK_ON_READ_IMPL(97);
+  BLYNK_ON_READ_IMPL(98);
+  BLYNK_ON_READ_IMPL(99);
+  BLYNK_ON_READ_IMPL(100);
+  BLYNK_ON_READ_IMPL(101);
+  BLYNK_ON_READ_IMPL(102);
+  BLYNK_ON_READ_IMPL(103);
+  BLYNK_ON_READ_IMPL(104);
+  BLYNK_ON_READ_IMPL(105);
+  BLYNK_ON_READ_IMPL(106);
+  BLYNK_ON_READ_IMPL(107);
+  BLYNK_ON_READ_IMPL(108);
+  BLYNK_ON_READ_IMPL(109);
+  BLYNK_ON_READ_IMPL(110);
+  BLYNK_ON_READ_IMPL(111);
+  BLYNK_ON_READ_IMPL(112);
+  BLYNK_ON_READ_IMPL(113);
+  BLYNK_ON_READ_IMPL(114);
+  BLYNK_ON_READ_IMPL(115);
+  BLYNK_ON_READ_IMPL(116);
+  BLYNK_ON_READ_IMPL(117);
+  BLYNK_ON_READ_IMPL(118);
+  BLYNK_ON_READ_IMPL(119);
+  BLYNK_ON_READ_IMPL(120);
+  BLYNK_ON_READ_IMPL(121);
+  BLYNK_ON_READ_IMPL(122);
+  BLYNK_ON_READ_IMPL(123);
+  BLYNK_ON_READ_IMPL(124);
+  BLYNK_ON_READ_IMPL(125);
+  BLYNK_ON_READ_IMPL(126);
+  BLYNK_ON_READ_IMPL(127);
+#endif
+
+BLYNK_ON_WRITE_IMPL(0 );
+BLYNK_ON_WRITE_IMPL(1 );
+BLYNK_ON_WRITE_IMPL(2 );
+BLYNK_ON_WRITE_IMPL(3 );
+BLYNK_ON_WRITE_IMPL(4 );
+BLYNK_ON_WRITE_IMPL(5 );
+BLYNK_ON_WRITE_IMPL(6 );
+BLYNK_ON_WRITE_IMPL(7 );
+BLYNK_ON_WRITE_IMPL(8 );
+BLYNK_ON_WRITE_IMPL(9 );
+BLYNK_ON_WRITE_IMPL(10);
+BLYNK_ON_WRITE_IMPL(11);
+BLYNK_ON_WRITE_IMPL(12);
+BLYNK_ON_WRITE_IMPL(13);
+BLYNK_ON_WRITE_IMPL(14);
+BLYNK_ON_WRITE_IMPL(15);
+BLYNK_ON_WRITE_IMPL(16);
+BLYNK_ON_WRITE_IMPL(17);
+BLYNK_ON_WRITE_IMPL(18);
+BLYNK_ON_WRITE_IMPL(19);
+BLYNK_ON_WRITE_IMPL(20);
+BLYNK_ON_WRITE_IMPL(21);
+BLYNK_ON_WRITE_IMPL(22);
+BLYNK_ON_WRITE_IMPL(23);
+BLYNK_ON_WRITE_IMPL(24);
+BLYNK_ON_WRITE_IMPL(25);
+BLYNK_ON_WRITE_IMPL(26);
+BLYNK_ON_WRITE_IMPL(27);
+BLYNK_ON_WRITE_IMPL(28);
+BLYNK_ON_WRITE_IMPL(29);
+BLYNK_ON_WRITE_IMPL(30);
+BLYNK_ON_WRITE_IMPL(31);
+#ifdef BLYNK_USE_128_VPINS
+  BLYNK_ON_WRITE_IMPL(32);
+  BLYNK_ON_WRITE_IMPL(33);
+  BLYNK_ON_WRITE_IMPL(34);
+  BLYNK_ON_WRITE_IMPL(35);
+  BLYNK_ON_WRITE_IMPL(36);
+  BLYNK_ON_WRITE_IMPL(37);
+  BLYNK_ON_WRITE_IMPL(38);
+  BLYNK_ON_WRITE_IMPL(39);
+  BLYNK_ON_WRITE_IMPL(40);
+  BLYNK_ON_WRITE_IMPL(41);
+  BLYNK_ON_WRITE_IMPL(42);
+  BLYNK_ON_WRITE_IMPL(43);
+  BLYNK_ON_WRITE_IMPL(44);
+  BLYNK_ON_WRITE_IMPL(45);
+  BLYNK_ON_WRITE_IMPL(46);
+  BLYNK_ON_WRITE_IMPL(47);
+  BLYNK_ON_WRITE_IMPL(48);
+  BLYNK_ON_WRITE_IMPL(49);
+  BLYNK_ON_WRITE_IMPL(50);
+  BLYNK_ON_WRITE_IMPL(51);
+  BLYNK_ON_WRITE_IMPL(52);
+  BLYNK_ON_WRITE_IMPL(53);
+  BLYNK_ON_WRITE_IMPL(54);
+  BLYNK_ON_WRITE_IMPL(55);
+  BLYNK_ON_WRITE_IMPL(56);
+  BLYNK_ON_WRITE_IMPL(57);
+  BLYNK_ON_WRITE_IMPL(58);
+  BLYNK_ON_WRITE_IMPL(59);
+  BLYNK_ON_WRITE_IMPL(60);
+  BLYNK_ON_WRITE_IMPL(61);
+  BLYNK_ON_WRITE_IMPL(62);
+  BLYNK_ON_WRITE_IMPL(63);
+  BLYNK_ON_WRITE_IMPL(64);
+  BLYNK_ON_WRITE_IMPL(65);
+  BLYNK_ON_WRITE_IMPL(66);
+  BLYNK_ON_WRITE_IMPL(67);
+  BLYNK_ON_WRITE_IMPL(68);
+  BLYNK_ON_WRITE_IMPL(69);
+  BLYNK_ON_WRITE_IMPL(70);
+  BLYNK_ON_WRITE_IMPL(71);
+  BLYNK_ON_WRITE_IMPL(72);
+  BLYNK_ON_WRITE_IMPL(73);
+  BLYNK_ON_WRITE_IMPL(74);
+  BLYNK_ON_WRITE_IMPL(75);
+  BLYNK_ON_WRITE_IMPL(76);
+  BLYNK_ON_WRITE_IMPL(77);
+  BLYNK_ON_WRITE_IMPL(78);
+  BLYNK_ON_WRITE_IMPL(79);
+  BLYNK_ON_WRITE_IMPL(80);
+  BLYNK_ON_WRITE_IMPL(81);
+  BLYNK_ON_WRITE_IMPL(82);
+  BLYNK_ON_WRITE_IMPL(83);
+  BLYNK_ON_WRITE_IMPL(84);
+  BLYNK_ON_WRITE_IMPL(85);
+  BLYNK_ON_WRITE_IMPL(86);
+  BLYNK_ON_WRITE_IMPL(87);
+  BLYNK_ON_WRITE_IMPL(88);
+  BLYNK_ON_WRITE_IMPL(89);
+  BLYNK_ON_WRITE_IMPL(90);
+  BLYNK_ON_WRITE_IMPL(91);
+  BLYNK_ON_WRITE_IMPL(92);
+  BLYNK_ON_WRITE_IMPL(93);
+  BLYNK_ON_WRITE_IMPL(94);
+  BLYNK_ON_WRITE_IMPL(95);
+  BLYNK_ON_WRITE_IMPL(96);
+  BLYNK_ON_WRITE_IMPL(97);
+  BLYNK_ON_WRITE_IMPL(98);
+  BLYNK_ON_WRITE_IMPL(99);
+  BLYNK_ON_WRITE_IMPL(100);
+  BLYNK_ON_WRITE_IMPL(101);
+  BLYNK_ON_WRITE_IMPL(102);
+  BLYNK_ON_WRITE_IMPL(103);
+  BLYNK_ON_WRITE_IMPL(104);
+  BLYNK_ON_WRITE_IMPL(105);
+  BLYNK_ON_WRITE_IMPL(106);
+  BLYNK_ON_WRITE_IMPL(107);
+  BLYNK_ON_WRITE_IMPL(108);
+  BLYNK_ON_WRITE_IMPL(109);
+  BLYNK_ON_WRITE_IMPL(110);
+  BLYNK_ON_WRITE_IMPL(111);
+  BLYNK_ON_WRITE_IMPL(112);
+  BLYNK_ON_WRITE_IMPL(113);
+  BLYNK_ON_WRITE_IMPL(114);
+  BLYNK_ON_WRITE_IMPL(115);
+  BLYNK_ON_WRITE_IMPL(116);
+  BLYNK_ON_WRITE_IMPL(117);
+  BLYNK_ON_WRITE_IMPL(118);
+  BLYNK_ON_WRITE_IMPL(119);
+  BLYNK_ON_WRITE_IMPL(120);
+  BLYNK_ON_WRITE_IMPL(121);
+  BLYNK_ON_WRITE_IMPL(122);
+  BLYNK_ON_WRITE_IMPL(123);
+  BLYNK_ON_WRITE_IMPL(124);
+  BLYNK_ON_WRITE_IMPL(125);
+  BLYNK_ON_WRITE_IMPL(126);
+  BLYNK_ON_WRITE_IMPL(127);
+#endif
+
+static const WidgetReadHandler BlynkReadHandlerVector[] BLYNK_PROGMEM = {
+    BlynkWidgetRead0,   BlynkWidgetRead1,   BlynkWidgetRead2,   BlynkWidgetRead3,
+    BlynkWidgetRead4,   BlynkWidgetRead5,   BlynkWidgetRead6,   BlynkWidgetRead7,
+    BlynkWidgetRead8,   BlynkWidgetRead9,   BlynkWidgetRead10,  BlynkWidgetRead11,
+    BlynkWidgetRead12,  BlynkWidgetRead13,  BlynkWidgetRead14,  BlynkWidgetRead15,
+    BlynkWidgetRead16,  BlynkWidgetRead17,  BlynkWidgetRead18,  BlynkWidgetRead19,
+    BlynkWidgetRead20,  BlynkWidgetRead21,  BlynkWidgetRead22,  BlynkWidgetRead23,
+    BlynkWidgetRead24,  BlynkWidgetRead25,  BlynkWidgetRead26,  BlynkWidgetRead27,
+    BlynkWidgetRead28,  BlynkWidgetRead29,  BlynkWidgetRead30,  BlynkWidgetRead31,
+#ifdef BLYNK_USE_128_VPINS
+    BlynkWidgetRead32,  BlynkWidgetRead33,  BlynkWidgetRead34,  BlynkWidgetRead35,
+    BlynkWidgetRead36,  BlynkWidgetRead37,  BlynkWidgetRead38,  BlynkWidgetRead39,
+    BlynkWidgetRead40,  BlynkWidgetRead41,  BlynkWidgetRead42,  BlynkWidgetRead43,
+    BlynkWidgetRead44,  BlynkWidgetRead45,  BlynkWidgetRead46,  BlynkWidgetRead47,
+    BlynkWidgetRead48,  BlynkWidgetRead49,  BlynkWidgetRead50,  BlynkWidgetRead51,
+    BlynkWidgetRead52,  BlynkWidgetRead53,  BlynkWidgetRead54,  BlynkWidgetRead55,
+    BlynkWidgetRead56,  BlynkWidgetRead57,  BlynkWidgetRead58,  BlynkWidgetRead59,
+    BlynkWidgetRead60,  BlynkWidgetRead61,  BlynkWidgetRead62,  BlynkWidgetRead63,
+    BlynkWidgetRead64,  BlynkWidgetRead65,  BlynkWidgetRead66,  BlynkWidgetRead67,
+    BlynkWidgetRead68,  BlynkWidgetRead69,  BlynkWidgetRead70,  BlynkWidgetRead71,
+    BlynkWidgetRead72,  BlynkWidgetRead73,  BlynkWidgetRead74,  BlynkWidgetRead75,
+    BlynkWidgetRead76,  BlynkWidgetRead77,  BlynkWidgetRead78,  BlynkWidgetRead79,
+    BlynkWidgetRead80,  BlynkWidgetRead81,  BlynkWidgetRead82,  BlynkWidgetRead83,
+    BlynkWidgetRead84,  BlynkWidgetRead85,  BlynkWidgetRead86,  BlynkWidgetRead87,
+    BlynkWidgetRead88,  BlynkWidgetRead89,  BlynkWidgetRead90,  BlynkWidgetRead91,
+    BlynkWidgetRead92,  BlynkWidgetRead93,  BlynkWidgetRead94,  BlynkWidgetRead95,
+    BlynkWidgetRead96,  BlynkWidgetRead97,  BlynkWidgetRead98,  BlynkWidgetRead99,
+    BlynkWidgetRead100,  BlynkWidgetRead101,  BlynkWidgetRead102,  BlynkWidgetRead103,
+    BlynkWidgetRead104,  BlynkWidgetRead105,  BlynkWidgetRead106,  BlynkWidgetRead107,
+    BlynkWidgetRead108,  BlynkWidgetRead109,  BlynkWidgetRead110,  BlynkWidgetRead111,
+    BlynkWidgetRead112,  BlynkWidgetRead113,  BlynkWidgetRead114,  BlynkWidgetRead115,
+    BlynkWidgetRead116,  BlynkWidgetRead117,  BlynkWidgetRead118,  BlynkWidgetRead119,
+    BlynkWidgetRead120,  BlynkWidgetRead121,  BlynkWidgetRead122,  BlynkWidgetRead123,
+    BlynkWidgetRead124,  BlynkWidgetRead125,  BlynkWidgetRead126,  BlynkWidgetRead127,
+#endif
+};
+
+static const WidgetWriteHandler BlynkWriteHandlerVector[] BLYNK_PROGMEM = {
+    BlynkWidgetWrite0,  BlynkWidgetWrite1,  BlynkWidgetWrite2,  BlynkWidgetWrite3,
+    BlynkWidgetWrite4,  BlynkWidgetWrite5,  BlynkWidgetWrite6,  BlynkWidgetWrite7,
+    BlynkWidgetWrite8,  BlynkWidgetWrite9,  BlynkWidgetWrite10, BlynkWidgetWrite11,
+    BlynkWidgetWrite12, BlynkWidgetWrite13, BlynkWidgetWrite14, BlynkWidgetWrite15,
+    BlynkWidgetWrite16, BlynkWidgetWrite17, BlynkWidgetWrite18, BlynkWidgetWrite19,
+    BlynkWidgetWrite20, BlynkWidgetWrite21, BlynkWidgetWrite22, BlynkWidgetWrite23,
+    BlynkWidgetWrite24, BlynkWidgetWrite25, BlynkWidgetWrite26, BlynkWidgetWrite27,
+    BlynkWidgetWrite28, BlynkWidgetWrite29, BlynkWidgetWrite30, BlynkWidgetWrite31,
+#ifdef BLYNK_USE_128_VPINS
+    BlynkWidgetWrite32,  BlynkWidgetWrite33,  BlynkWidgetWrite34,  BlynkWidgetWrite35,
+    BlynkWidgetWrite36,  BlynkWidgetWrite37,  BlynkWidgetWrite38,  BlynkWidgetWrite39,
+    BlynkWidgetWrite40,  BlynkWidgetWrite41,  BlynkWidgetWrite42,  BlynkWidgetWrite43,
+    BlynkWidgetWrite44,  BlynkWidgetWrite45,  BlynkWidgetWrite46,  BlynkWidgetWrite47,
+    BlynkWidgetWrite48,  BlynkWidgetWrite49,  BlynkWidgetWrite50,  BlynkWidgetWrite51,
+    BlynkWidgetWrite52,  BlynkWidgetWrite53,  BlynkWidgetWrite54,  BlynkWidgetWrite55,
+    BlynkWidgetWrite56,  BlynkWidgetWrite57,  BlynkWidgetWrite58,  BlynkWidgetWrite59,
+    BlynkWidgetWrite60,  BlynkWidgetWrite61,  BlynkWidgetWrite62,  BlynkWidgetWrite63,
+    BlynkWidgetWrite64,  BlynkWidgetWrite65,  BlynkWidgetWrite66,  BlynkWidgetWrite67,
+    BlynkWidgetWrite68,  BlynkWidgetWrite69,  BlynkWidgetWrite70,  BlynkWidgetWrite71,
+    BlynkWidgetWrite72,  BlynkWidgetWrite73,  BlynkWidgetWrite74,  BlynkWidgetWrite75,
+    BlynkWidgetWrite76,  BlynkWidgetWrite77,  BlynkWidgetWrite78,  BlynkWidgetWrite79,
+    BlynkWidgetWrite80,  BlynkWidgetWrite81,  BlynkWidgetWrite82,  BlynkWidgetWrite83,
+    BlynkWidgetWrite84,  BlynkWidgetWrite85,  BlynkWidgetWrite86,  BlynkWidgetWrite87,
+    BlynkWidgetWrite88,  BlynkWidgetWrite89,  BlynkWidgetWrite90,  BlynkWidgetWrite91,
+    BlynkWidgetWrite92,  BlynkWidgetWrite93,  BlynkWidgetWrite94,  BlynkWidgetWrite95,
+    BlynkWidgetWrite96,  BlynkWidgetWrite97,  BlynkWidgetWrite98,  BlynkWidgetWrite99,
+    BlynkWidgetWrite100,  BlynkWidgetWrite101,  BlynkWidgetWrite102,  BlynkWidgetWrite103,
+    BlynkWidgetWrite104,  BlynkWidgetWrite105,  BlynkWidgetWrite106,  BlynkWidgetWrite107,
+    BlynkWidgetWrite108,  BlynkWidgetWrite109,  BlynkWidgetWrite110,  BlynkWidgetWrite111,
+    BlynkWidgetWrite112,  BlynkWidgetWrite113,  BlynkWidgetWrite114,  BlynkWidgetWrite115,
+    BlynkWidgetWrite116,  BlynkWidgetWrite117,  BlynkWidgetWrite118,  BlynkWidgetWrite119,
+    BlynkWidgetWrite120,  BlynkWidgetWrite121,  BlynkWidgetWrite122,  BlynkWidgetWrite123,
+    BlynkWidgetWrite124,  BlynkWidgetWrite125,  BlynkWidgetWrite126,  BlynkWidgetWrite127,
+#endif
+};
+
+WidgetReadHandler GetReadHandler(uint8_t pin)
+{
+    if (pin >= BLYNK_COUNT_OF(BlynkReadHandlerVector))
+        return NULL;
+#ifdef BLYNK_HAS_PROGMEM
+    return (WidgetReadHandler)pgm_read_word(&BlynkReadHandlerVector[pin]);
+#else
+    return BlynkReadHandlerVector[pin];
+#endif
+}
+
+WidgetWriteHandler GetWriteHandler(uint8_t pin)
+{
+    if (pin >= BLYNK_COUNT_OF(BlynkWriteHandlerVector))
+        return NULL;
+#ifdef BLYNK_HAS_PROGMEM
+    return (WidgetWriteHandler)pgm_read_word(&BlynkWriteHandlerVector[pin]);
+#else
+    return BlynkWriteHandlerVector[pin];
+#endif
+}

wled00/src/dependencies/blynk/Blynk/BlynkHandlers.h

@@ -0,0 +1,511 @@
+/**
+ * @file       BlynkHandlers.h
+ * @author     Volodymyr Shymanskyy
+ * @license    This project is released under the MIT License (MIT)
+ * @copyright  Copyright (c) 2015 Volodymyr Shymanskyy
+ * @date       Jan 2015
+ * @brief      Handlers for virtual pin operations
+ *
+ */
+
+#ifndef BlynkHandlers_h
+#define BlynkHandlers_h
+
+#include "BlynkConfig.h"
+#include "BlynkParam.h"
+
+// Helper macro
+
+#define V0  0
+#define V1  1
+#define V2  2
+#define V3  3
+#define V4  4
+#define V5  5
+#define V6  6
+#define V7  7
+#define V8  8
+#define V9  9
+#define V10 10
+#define V11 11
+#define V12 12
+#define V13 13
+#define V14 14
+#define V15 15
+#define V16 16
+#define V17 17
+#define V18 18
+#define V19 19
+#define V20 20
+#define V21 21
+#define V22 22
+#define V23 23
+#define V24 24
+#define V25 25
+#define V26 26
+#define V27 27
+#define V28 28
+#define V29 29
+#define V30 30
+#define V31 31
+#ifdef BLYNK_USE_128_VPINS
+  #define V32 32
+  #define V33 33
+  #define V34 34
+  #define V35 35
+  #define V36 36
+  #define V37 37
+  #define V38 38
+  #define V39 39
+  #define V40 40
+  #define V41 41
+  #define V42 42
+  #define V43 43
+  #define V44 44
+  #define V45 45
+  #define V46 46
+  #define V47 47
+  #define V48 48
+  #define V49 49
+  #define V50 50
+  #define V51 51
+  #define V52 52
+  #define V53 53
+  #define V54 54
+  #define V55 55
+  #define V56 56
+  #define V57 57
+  #define V58 58
+  #define V59 59
+  #define V60 60
+  #define V61 61
+  #define V62 62
+  #define V63 63
+  #define V64 64
+  #define V65 65
+  #define V66 66
+  #define V67 67
+  #define V68 68
+  #define V69 69
+  #define V70 70
+  #define V71 71
+  #define V72 72
+  #define V73 73
+  #define V74 74
+  #define V75 75
+  #define V76 76
+  #define V77 77
+  #define V78 78
+  #define V79 79
+  #define V80 80
+  #define V81 81
+  #define V82 82
+  #define V83 83
+  #define V84 84
+  #define V85 85
+  #define V86 86
+  #define V87 87
+  #define V88 88
+  #define V89 89
+  #define V90 90
+  #define V91 91
+  #define V92 92
+  #define V93 93
+  #define V94 94
+  #define V95 95
+  #define V96 96
+  #define V97 97
+  #define V98 98
+  #define V99 99
+  #define V100 100
+  #define V101 101
+  #define V102 102
+  #define V103 103
+  #define V104 104
+  #define V105 105
+  #define V106 106
+  #define V107 107
+  #define V108 108
+  #define V109 109
+  #define V110 110
+  #define V111 111
+  #define V112 112
+  #define V113 113
+  #define V114 114
+  #define V115 115
+  #define V116 116
+  #define V117 117
+  #define V118 118
+  #define V119 119
+  #define V120 120
+  #define V121 121
+  #define V122 122
+  #define V123 123
+  #define V124 124
+  #define V125 125
+  #define V126 126
+  #define V127 127
+#endif
+
+// Initial syntax:
+#define BLYNK_WRITE_2(pin) \
+    void BlynkWidgetWrite ## pin (BlynkReq BLYNK_UNUSED &request, const BlynkParam BLYNK_UNUSED &param)
+
+#define BLYNK_READ_2(pin)  \
+    void BlynkWidgetRead ## pin  (BlynkReq BLYNK_UNUSED &request)
+
+#define BLYNK_WRITE_DEFAULT() BLYNK_WRITE_2(Default)
+#define BLYNK_READ_DEFAULT()  BLYNK_READ_2(Default)
+
+#define BLYNK_WRITE(pin)      BLYNK_WRITE_2(pin)
+#define BLYNK_READ(pin)       BLYNK_READ_2(pin)
+
+// New, more readable syntax:
+#define BLYNK_IN_2(pin)  \
+    void BlynkWidgetWrite ## pin (BlynkReq BLYNK_UNUSED &request, const BlynkParam BLYNK_UNUSED &getValue)
+
+#define BLYNK_OUT_2(pin) \
+    void BlynkWidgetRead ## pin  (BlynkReq BLYNK_UNUSED &request)
+
+#define BLYNK_INPUT_DEFAULT()   BLYNK_IN_2(Default)
+#define BLYNK_OUTPUT_DEFAULT()  BLYNK_OUT_2(Default)
+
+#define BLYNK_INPUT(pin)        BLYNK_IN_2(pin)
+#define BLYNK_OUTPUT(pin)       BLYNK_OUT_2(pin)
+
+// Additional handlers
+#define BLYNK_CONNECTED()    void BlynkOnConnected()
+#define BLYNK_DISCONNECTED() void BlynkOnDisconnected()
+
+// Advanced functions
+
+#define BLYNK_VAR_INT(name, pin) \
+    int name;  \
+    BLYNK_WRITE(pin) { name = param.asInt(); } \
+    BLYNK_READ(pin)  { Blynk.virtualWrite(pin, name); }
+
+#define BLYNK_VAR_LONG(name, pin) \
+    long name;  \
+    BLYNK_WRITE(pin) { name = param.asLong(); } \
+    BLYNK_READ(pin)  { Blynk.virtualWrite(pin, name); }
+
+#ifndef BLYNK_NO_FLOAT
+#define BLYNK_VAR_DOUBLE(name, pin) \
+    double name;  \
+    BLYNK_WRITE(pin) { name = param.asDouble(); } \
+    BLYNK_READ(pin)  { Blynk.virtualWrite(pin, name); }
+#endif
+
+#ifdef ARDUINO
+#define BLYNK_VAR_STRING(name, pin) \
+    String name;  \
+    BLYNK_WRITE(pin) { name = param.asStr(); } \
+    BLYNK_READ(pin)  { Blynk.virtualWrite(pin, name); }
+#endif
+
+// Default read/write handlers (you can redefine them in your code)
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct BlynkReq
+{
+    uint8_t pin;
+};
+
+typedef void (*WidgetReadHandler)(BlynkReq BLYNK_UNUSED &request);
+typedef void (*WidgetWriteHandler)(BlynkReq BLYNK_UNUSED &request, const BlynkParam BLYNK_UNUSED &param);
+
+WidgetReadHandler GetReadHandler(uint8_t pin);
+WidgetWriteHandler GetWriteHandler(uint8_t pin);
+
+// Declare placeholders
+BLYNK_READ();
+BLYNK_WRITE();
+void BlynkNoOpCbk();
+
+// Declare all pin handlers (you can redefine them in your code)
+BLYNK_CONNECTED();
+BLYNK_DISCONNECTED();
+
+// Internal Virtual Pins
+BLYNK_WRITE(InternalPinACON);
+BLYNK_WRITE(InternalPinADIS);
+BLYNK_WRITE(InternalPinRTC);
+BLYNK_WRITE(InternalPinOTA);
+
+// Aliases
+#define BLYNK_APP_CONNECTED()    BLYNK_WRITE(InternalPinACON)
+#define BLYNK_APP_DISCONNECTED() BLYNK_WRITE(InternalPinADIS)
+
+// Regular Virtual Pins
+BLYNK_READ_DEFAULT();
+BLYNK_WRITE_DEFAULT();
+
+BLYNK_READ(0 );
+BLYNK_READ(1 );
+BLYNK_READ(2 );
+BLYNK_READ(3 );
+BLYNK_READ(4 );
+BLYNK_READ(5 );
+BLYNK_READ(6 );
+BLYNK_READ(7 );
+BLYNK_READ(8 );
+BLYNK_READ(9 );
+BLYNK_READ(10);
+BLYNK_READ(11);
+BLYNK_READ(12);
+BLYNK_READ(13);
+BLYNK_READ(14);
+BLYNK_READ(15);
+BLYNK_READ(16);
+BLYNK_READ(17);
+BLYNK_READ(18);
+BLYNK_READ(19);
+BLYNK_READ(20);
+BLYNK_READ(21);
+BLYNK_READ(22);
+BLYNK_READ(23);
+BLYNK_READ(24);
+BLYNK_READ(25);
+BLYNK_READ(26);
+BLYNK_READ(27);
+BLYNK_READ(28);
+BLYNK_READ(29);
+BLYNK_READ(30);
+BLYNK_READ(31);
+#ifdef BLYNK_USE_128_VPINS
+  BLYNK_READ(32);
+  BLYNK_READ(33);
+  BLYNK_READ(34);
+  BLYNK_READ(35);
+  BLYNK_READ(36);
+  BLYNK_READ(37);
+  BLYNK_READ(38);
+  BLYNK_READ(39);
+  BLYNK_READ(40);
+  BLYNK_READ(41);
+  BLYNK_READ(42);
+  BLYNK_READ(43);
+  BLYNK_READ(44);
+  BLYNK_READ(45);
+  BLYNK_READ(46);
+  BLYNK_READ(47);
+  BLYNK_READ(48);
+  BLYNK_READ(49);
+  BLYNK_READ(50);
+  BLYNK_READ(51);
+  BLYNK_READ(52);
+  BLYNK_READ(53);
+  BLYNK_READ(54);
+  BLYNK_READ(55);
+  BLYNK_READ(56);
+  BLYNK_READ(57);
+  BLYNK_READ(58);
+  BLYNK_READ(59);
+  BLYNK_READ(60);
+  BLYNK_READ(61);
+  BLYNK_READ(62);
+  BLYNK_READ(63);
+  BLYNK_READ(64);
+  BLYNK_READ(65);
+  BLYNK_READ(66);
+  BLYNK_READ(67);
+  BLYNK_READ(68);
+  BLYNK_READ(69);
+  BLYNK_READ(70);
+  BLYNK_READ(71);
+  BLYNK_READ(72);
+  BLYNK_READ(73);
+  BLYNK_READ(74);
+  BLYNK_READ(75);
+  BLYNK_READ(76);
+  BLYNK_READ(77);
+  BLYNK_READ(78);
+  BLYNK_READ(79);
+  BLYNK_READ(80);
+  BLYNK_READ(81);
+  BLYNK_READ(82);
+  BLYNK_READ(83);
+  BLYNK_READ(84);
+  BLYNK_READ(85);
+  BLYNK_READ(86);
+  BLYNK_READ(87);
+  BLYNK_READ(88);
+  BLYNK_READ(89);
+  BLYNK_READ(90);
+  BLYNK_READ(91);
+  BLYNK_READ(92);
+  BLYNK_READ(93);
+  BLYNK_READ(94);
+  BLYNK_READ(95);
+  BLYNK_READ(96);
+  BLYNK_READ(97);
+  BLYNK_READ(98);
+  BLYNK_READ(99);
+  BLYNK_READ(100);
+  BLYNK_READ(101);
+  BLYNK_READ(102);
+  BLYNK_READ(103);
+  BLYNK_READ(104);
+  BLYNK_READ(105);
+  BLYNK_READ(106);
+  BLYNK_READ(107);
+  BLYNK_READ(108);
+  BLYNK_READ(109);
+  BLYNK_READ(110);
+  BLYNK_READ(111);
+  BLYNK_READ(112);
+  BLYNK_READ(113);
+  BLYNK_READ(114);
+  BLYNK_READ(115);
+  BLYNK_READ(116);
+  BLYNK_READ(117);
+  BLYNK_READ(118);
+  BLYNK_READ(119);
+  BLYNK_READ(120);
+  BLYNK_READ(121);
+  BLYNK_READ(122);
+  BLYNK_READ(123);
+  BLYNK_READ(124);
+  BLYNK_READ(125);
+  BLYNK_READ(126);
+  BLYNK_READ(127);
+#endif
+
+BLYNK_WRITE(0 );
+BLYNK_WRITE(1 );
+BLYNK_WRITE(2 );
+BLYNK_WRITE(3 );
+BLYNK_WRITE(4 );
+BLYNK_WRITE(5 );
+BLYNK_WRITE(6 );
+BLYNK_WRITE(7 );
+BLYNK_WRITE(8 );
+BLYNK_WRITE(9 );
+BLYNK_WRITE(10);
+BLYNK_WRITE(11);
+BLYNK_WRITE(12);
+BLYNK_WRITE(13);
+BLYNK_WRITE(14);
+BLYNK_WRITE(15);
+BLYNK_WRITE(16);
+BLYNK_WRITE(17);
+BLYNK_WRITE(18);
+BLYNK_WRITE(19);
+BLYNK_WRITE(20);
+BLYNK_WRITE(21);
+BLYNK_WRITE(22);
+BLYNK_WRITE(23);
+BLYNK_WRITE(24);
+BLYNK_WRITE(25);
+BLYNK_WRITE(26);
+BLYNK_WRITE(27);
+BLYNK_WRITE(28);
+BLYNK_WRITE(29);
+BLYNK_WRITE(30);
+BLYNK_WRITE(31);
+#ifdef BLYNK_USE_128_VPINS
+  BLYNK_WRITE(32);
+  BLYNK_WRITE(33);
+  BLYNK_WRITE(34);
+  BLYNK_WRITE(35);
+  BLYNK_WRITE(36);
+  BLYNK_WRITE(37);
+  BLYNK_WRITE(38);
+  BLYNK_WRITE(39);
+  BLYNK_WRITE(40);
+  BLYNK_WRITE(41);
+  BLYNK_WRITE(42);
+  BLYNK_WRITE(43);
+  BLYNK_WRITE(44);
+  BLYNK_WRITE(45);
+  BLYNK_WRITE(46);
+  BLYNK_WRITE(47);
+  BLYNK_WRITE(48);
+  BLYNK_WRITE(49);
+  BLYNK_WRITE(50);
+  BLYNK_WRITE(51);
+  BLYNK_WRITE(52);
+  BLYNK_WRITE(53);
+  BLYNK_WRITE(54);
+  BLYNK_WRITE(55);
+  BLYNK_WRITE(56);
+  BLYNK_WRITE(57);
+  BLYNK_WRITE(58);
+  BLYNK_WRITE(59);
+  BLYNK_WRITE(60);
+  BLYNK_WRITE(61);
+  BLYNK_WRITE(62);
+  BLYNK_WRITE(63);
+  BLYNK_WRITE(64);
+  BLYNK_WRITE(65);
+  BLYNK_WRITE(66);
+  BLYNK_WRITE(67);
+  BLYNK_WRITE(68);
+  BLYNK_WRITE(69);
+  BLYNK_WRITE(70);
+  BLYNK_WRITE(71);
+  BLYNK_WRITE(72);
+  BLYNK_WRITE(73);
+  BLYNK_WRITE(74);
+  BLYNK_WRITE(75);
+  BLYNK_WRITE(76);
+  BLYNK_WRITE(77);
+  BLYNK_WRITE(78);
+  BLYNK_WRITE(79);
+  BLYNK_WRITE(80);
+  BLYNK_WRITE(81);
+  BLYNK_WRITE(82);
+  BLYNK_WRITE(83);
+  BLYNK_WRITE(84);
+  BLYNK_WRITE(85);
+  BLYNK_WRITE(86);
+  BLYNK_WRITE(87);
+  BLYNK_WRITE(88);
+  BLYNK_WRITE(89);
+  BLYNK_WRITE(90);
+  BLYNK_WRITE(91);
+  BLYNK_WRITE(92);
+  BLYNK_WRITE(93);
+  BLYNK_WRITE(94);
+  BLYNK_WRITE(95);
+  BLYNK_WRITE(96);
+  BLYNK_WRITE(97);
+  BLYNK_WRITE(98);
+  BLYNK_WRITE(99);
+  BLYNK_WRITE(100);
+  BLYNK_WRITE(101);
+  BLYNK_WRITE(102);
+  BLYNK_WRITE(103);
+  BLYNK_WRITE(104);
+  BLYNK_WRITE(105);
+  BLYNK_WRITE(106);
+  BLYNK_WRITE(107);
+  BLYNK_WRITE(108);
+  BLYNK_WRITE(109);
+  BLYNK_WRITE(110);
+  BLYNK_WRITE(111);
+  BLYNK_WRITE(112);
+  BLYNK_WRITE(113);
+  BLYNK_WRITE(114);
+  BLYNK_WRITE(115);
+  BLYNK_WRITE(116);
+  BLYNK_WRITE(117);
+  BLYNK_WRITE(118);
+  BLYNK_WRITE(119);
+  BLYNK_WRITE(120);
+  BLYNK_WRITE(121);
+  BLYNK_WRITE(122);
+  BLYNK_WRITE(123);
+  BLYNK_WRITE(124);
+  BLYNK_WRITE(125);
+  BLYNK_WRITE(126);
+  BLYNK_WRITE(127);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

wled00/src/dependencies/blynk/Blynk/BlynkParam.h

@@ -0,0 +1,379 @@
+/**
+ * @file       BlynkParam.h
+ * @author     Volodymyr Shymanskyy
+ * @license    This project is released under the MIT License (MIT)
+ * @copyright  Copyright (c) 2015 Volodymyr Shymanskyy
+ * @date       Jan 2015
+ * @brief      Container for handler parameters
+ *
+ */
+
+#ifndef BlynkParam_h
+#define BlynkParam_h
+
+#include <string.h>
+#include <stdlib.h>
+#include "BlynkConfig.h"
+#include "BlynkDebug.h"
+
+#define BLYNK_PARAM_KV(k, v) k "\0" v "\0"
+
+class BlynkParam
+{
+public:
+    class iterator
+    {
+    public:
+        iterator(const char* c, const char* l) : ptr(c), limit(l) {}
+        static iterator invalid() { return iterator(NULL, NULL); }
+
+        operator const char* () const   { return asStr(); }
+        operator int () const           { return asInt(); }
+        const char* asStr() const       { return ptr; }
+        const char* asString() const    { return ptr; }
+        int         asInt() const       { if(!isValid()) return 0; return atoi(ptr); }
+        long        asLong() const      { if(!isValid()) return 0; return atol(ptr); }
+        //long long   asLongLong() const  { return atoll(ptr); }
+#ifndef BLYNK_NO_FLOAT
+        double      asDouble() const    { if(!isValid()) return 0; return atof(ptr); }
+        float       asFloat() const     { if(!isValid()) return 0; return atof(ptr); }
+#endif
+        bool isValid() const            { return ptr != NULL && ptr < limit; }
+        bool isEmpty() const            { if(!isValid()) return true; return *ptr == '\0'; }
+
+        bool operator <  (const iterator& it) const { return ptr < it.ptr; }
+        bool operator >= (const iterator& it) const { return ptr >= it.ptr; }
+
+        iterator& operator ++() {
+            if(isValid()) {
+                ptr += strlen(ptr) + 1;
+            }
+            return *this;
+        }
+    private:
+        const char* ptr;
+        const char* limit;
+    };
+
+public:
+    explicit
+    BlynkParam(void* addr, size_t length)
+        : buff((char*)addr), len(length), buff_size(length)
+    {}
+
+    explicit
+    BlynkParam(void* addr, size_t length, size_t buffsize)
+        : buff((char*)addr), len(length), buff_size(buffsize)
+    {}
+
+    const char* asStr() const       { return buff; }
+    const char* asString() const    { return buff; }
+    int         asInt() const       { return atoi(buff); }
+    long        asLong() const      { return atol(buff); }
+    //long long   asLongLong() const  { return atoll(buff); }
+#ifndef BLYNK_NO_FLOAT
+    double      asDouble() const    { return atof(buff); }
+    float       asFloat() const     { return atof(buff); }
+#endif
+    bool isEmpty() const            { return *buff == '\0'; }
+
+    iterator begin() const { return iterator(buff, buff+len); }
+    iterator end() const   { return iterator(buff+len, buff+len); }
+
+    iterator operator[](int index) const;
+    iterator operator[](const char* key) const;
+
+    void*  getBuffer() const { return (void*)buff; }
+    size_t getLength() const { return len; }
+
+    // Modification
+    void add(int value);
+    void add(unsigned int value);
+    void add(long value);
+    void add(unsigned long value);
+    void add(long long value);
+    void add(unsigned long long value);
+#ifndef BLYNK_NO_FLOAT
+    void add(float value);
+    void add(double value);
+#endif
+    void add(const char* str);
+    void add(const void* b, size_t l);
+#if defined(ARDUINO) || defined(SPARK) || defined(PARTICLE)
+    void add(const String& str);
+#if defined(BLYNK_HAS_PROGMEM)
+    void add(const __FlashStringHelper* str);
+#endif
+#endif
+
+    template<typename T, typename... Args>
+    void add_multi(T last) {
+        add(last);
+    }
+
+    template<typename T, typename... Args>
+    void add_multi(T head, Args... tail) {
+        add(head);
+        add_multi(tail...);
+    }
+
+    template <typename TV>
+    void add_key(const char* key, const TV& val) {
+        add(key);
+        add(val);
+    }
+
+protected:
+    char*    buff;
+    size_t   len;
+    size_t   buff_size;
+};
+
+
+class BlynkParamAllocated
+    : public BlynkParam
+{
+public:
+    BlynkParamAllocated(size_t size)
+        : BlynkParam(malloc(size), 0, size)
+    {}
+    ~BlynkParamAllocated() {
+        free(buff);
+    }
+};
+
+inline
+BlynkParam::iterator BlynkParam::operator[](int index) const
+{
+    const iterator e = end();
+    for (iterator it = begin(); it < e; ++it) {
+        if (!index--) {
+            return it;
+        }
+    }
+    return iterator::invalid();
+}
+
+inline
+BlynkParam::iterator BlynkParam::operator[](const char* key) const
+{
+    const iterator e = end();
+    for (iterator it = begin(); it < e; ++it) {
+        if (!strcmp(it.asStr(), key)) {
+            return ++it;
+        }
+        ++it;
+        if (it >= e) break;
+    }
+    return iterator::invalid();
+}
+
+inline
+void BlynkParam::add(const void* b, size_t l)
+{
+    if (len + l > buff_size)
+        return;
+    memcpy(buff+len, b, l);
+    len += l;
+}
+
+inline
+void BlynkParam::add(const char* str)
+{
+    if (str == NULL) {
+        buff[len++] = '\0';
+        return;
+    }
+    add(str, strlen(str)+1);
+}
+
+#if defined(ARDUINO) || defined(SPARK) || defined(PARTICLE)
+inline
+void BlynkParam::add(const String& str)
+{
+#if defined(ARDUINO_AVR_DIGISPARK) \
+    || defined(__ARDUINO_X86__) \
+    || defined(__RFduino__)
+
+    size_t len = str.length()+1;
+    char buff[len];
+    const_cast<String&>(str).toCharArray(buff, len);
+    add(buff, len);
+#else
+    add(str.c_str());
+#endif
+}
+
+#if defined(BLYNK_HAS_PROGMEM)
+
+inline
+void BlynkParam::add(const __FlashStringHelper* ifsh)
+{
+    PGM_P p = reinterpret_cast<PGM_P>(ifsh);
+    size_t l = strlen_P(p) + 1;
+    if (len + l > buff_size)
+        return;
+    memcpy_P(buff+len, p, l);
+    len += l;
+    buff[len] = '\0';
+}
+
+#endif
+
+#endif
+
+#if defined(__AVR__) || defined (ARDUINO_ARCH_ARC32)
+
+    #include <stdlib.h>
+
+    inline
+    void BlynkParam::add(int value)
+    {
+        char str[2 + 8 * sizeof(value)];
+        itoa(value, str, 10);
+        add(str);
+    }
+
+    inline
+    void BlynkParam::add(unsigned int value)
+    {
+        char str[1 + 8 * sizeof(value)];
+        utoa(value, str, 10);
+        add(str);
+    }
+
+    inline
+    void BlynkParam::add(long value)
+    {
+        char str[2 + 8 * sizeof(value)];
+        ltoa(value, str, 10);
+        add(str);
+    }
+
+    inline
+    void BlynkParam::add(unsigned long value)
+    {
+        char str[1 + 8 * sizeof(value)];
+        ultoa(value, str, 10);
+        add(str);
+    }
+
+    inline
+    void BlynkParam::add(long long value)  // TODO: this currently adds just a long
+    {
+        char str[2 + 8 * sizeof(value)];
+        ltoa(value, str, 10);
+        add(str);
+    }
+
+    inline
+    void BlynkParam::add(unsigned long long value) // TODO: this currently adds just a long
+    {
+        char str[1 + 8 * sizeof(value)];
+        ultoa(value, str, 10);
+        add(str);
+    }
+
+#ifndef BLYNK_NO_FLOAT
+
+    inline
+    void BlynkParam::add(float value)
+    {
+        char str[33];
+        dtostrf(value, 5, 3, str);
+        add(str);
+    }
+
+    inline
+    void BlynkParam::add(double value)
+    {
+        char str[33];
+        dtostrf(value, 5, 7, str);
+        add(str);
+    }
+#endif
+
+#else
+
+    #include <stdio.h>
+
+    inline
+    void BlynkParam::add(int value)
+    {
+        len += snprintf(buff+len, buff_size-len, "%i", value)+1;
+    }
+
+    inline
+    void BlynkParam::add(unsigned int value)
+    {
+        len += snprintf(buff+len, buff_size-len, "%u", value)+1;
+    }
+
+    inline
+    void BlynkParam::add(long value)
+    {
+        len += snprintf(buff+len, buff_size-len, "%li", value)+1;
+    }
+
+    inline
+    void BlynkParam::add(unsigned long value)
+    {
+        len += snprintf(buff+len, buff_size-len, "%lu", value)+1;
+    }
+
+    inline
+    void BlynkParam::add(long long value)
+    {
+        len += snprintf(buff+len, buff_size-len, "%lli", value)+1;
+    }
+
+    inline
+    void BlynkParam::add(unsigned long long value)
+    {
+        len += snprintf(buff+len, buff_size-len, "%llu", value)+1;
+    }
+
+#ifndef BLYNK_NO_FLOAT
+
+#if defined(BLYNK_USE_INTERNAL_DTOSTRF)
+
+    extern char* dtostrf_internal(double number, signed char width, unsigned char prec, char *s);
+
+    inline
+    void BlynkParam::add(float value)
+    {
+        char str[33];
+        dtostrf_internal(value, 5, 3, str);
+        add(str);
+    }
+
+    inline
+    void BlynkParam::add(double value)
+    {
+        char str[33];
+        dtostrf_internal(value, 5, 7, str);
+        add(str);
+    }
+
+#else
+
+    inline
+    void BlynkParam::add(float value)
+    {
+        len += snprintf(buff+len, buff_size-len, "%2.3f", value)+1;
+    }
+
+    inline
+    void BlynkParam::add(double value)
+    {
+        len += snprintf(buff+len, buff_size-len, "%2.7f", value)+1;
+    }
+
+#endif
+
+#endif
+
+#endif
+
+
+#endif

wled00/src/dependencies/blynk/Blynk/BlynkProtocol.h

@@ -0,0 +1,535 @@
+/**
+ * @file       BlynkProtocol.h
+ * @author     Volodymyr Shymanskyy
+ * @license    This project is released under the MIT License (MIT)
+ * @copyright  Copyright (c) 2015 Volodymyr Shymanskyy
+ * @date       Jan 2015
+ * @brief      Blynk protocol implementation
+ *
+ */
+
+#ifndef BlynkProtocol_h
+#define BlynkProtocol_h
+
+#include <string.h>
+#include <stdlib.h>
+#include "BlynkDebug.h"
+#include "BlynkProtocolDefs.h"
+#include "BlynkApi.h"
+#include "BlynkUtility.h"
+
+template <class Transp>
+class BlynkProtocol
+    : public BlynkApi< BlynkProtocol<Transp> >
+{
+    friend class BlynkApi< BlynkProtocol<Transp> >;
+public:
+    enum BlynkState {
+        CONNECTING,
+        CONNECTED,
+        DISCONNECTED,
+    };
+
+    BlynkProtocol(Transp& transp)
+        : conn(transp)
+        , authkey(NULL)
+        , redir_serv(NULL)
+        , lastActivityIn(0)
+        , lastActivityOut(0)
+        , lastHeartbeat(0)
+        , msgIdOut(0)
+        , msgIdOutOverride(0)
+        , nesting(0)
+        , state(CONNECTING)
+    {}
+
+    bool connected() { return state == CONNECTED; }
+
+    bool connect(uint32_t timeout = BLYNK_TIMEOUT_MS*3) {
+        conn.disconnect();
+        state = CONNECTING;
+        millis_time_t started = BlynkMillis();
+        while ((state != CONNECTED) &&
+               (BlynkMillis() - started < timeout))
+        {
+            run();
+        }
+        return state == CONNECTED;
+    }
+
+    void disconnect() {
+        conn.disconnect();
+        state = DISCONNECTED;
+        BLYNK_LOG1(BLYNK_F("Disconnected"));
+    }
+
+    bool run(bool avail = false);
+
+    // TODO: Fixme
+    void startSession() {
+        conn.connect();
+        state = CONNECTING;
+        msgIdOut = 0;
+        lastHeartbeat = lastActivityIn = lastActivityOut = (BlynkMillis() - 5000UL);
+    }
+
+    void sendCmd(uint8_t cmd, uint16_t id = 0, const void* data = NULL, size_t length = 0, const void* data2 = NULL, size_t length2 = 0);
+
+private:
+
+    void internalReconnect() {
+        state = CONNECTING;
+        conn.disconnect();
+        BlynkOnDisconnected();
+    }
+
+    int readHeader(BlynkHeader& hdr);
+    uint16_t getNextMsgId();
+
+protected:
+    void begin(const char* auth) {
+        this->authkey = auth;
+        lastHeartbeat = lastActivityIn = lastActivityOut = (BlynkMillis() - 5000UL);
+
+#if defined(BLYNK_NO_FANCY_LOGO)
+        BLYNK_LOG1(BLYNK_F("Blynk v" BLYNK_VERSION " on " BLYNK_INFO_DEVICE));
+#else
+        BLYNK_LOG1(BLYNK_F(BLYNK_NEWLINE
+            "    ___  __          __" BLYNK_NEWLINE
+            "   / _ )/ /_ _____  / /__" BLYNK_NEWLINE
+            "  / _  / / // / _ \\/  '_/" BLYNK_NEWLINE
+            " /____/_/\\_, /_//_/_/\\_\\" BLYNK_NEWLINE
+            "        /___/ v" BLYNK_VERSION " on " BLYNK_INFO_DEVICE BLYNK_NEWLINE
+            BLYNK_NEWLINE
+            "  Give Blynk a Github star! => https://github.com/blynkkk/blynk-library" BLYNK_NEWLINE
+        ));
+#endif
+    }
+    bool processInput(void);
+
+    Transp& conn;
+
+private:
+    const char* authkey;
+    char*       redir_serv;
+    millis_time_t lastActivityIn;
+    millis_time_t lastActivityOut;
+    union {
+        millis_time_t lastHeartbeat;
+        millis_time_t lastLogin;
+    };
+    uint16_t msgIdOut;
+    uint16_t msgIdOutOverride;
+    uint8_t  nesting;
+protected:
+    BlynkState state;
+};
+
+template <class Transp>
+bool BlynkProtocol<Transp>::run(bool avail)
+{
+    BLYNK_RUN_YIELD();
+
+    if (state == DISCONNECTED) {
+        return false;
+    }
+
+    // Detect nesting
+    BlynkHelperAutoInc guard(nesting);
+    if (msgIdOutOverride || nesting > 2) {
+      //BLYNK_LOG1(BLYNK_F("Nested run() skipped"));
+      return true;
+    }
+
+    if (conn.connected()) {
+        while (avail || conn.available() > 0) {
+            //BLYNK_LOG2(BLYNK_F("Available: "), conn.available());
+            //const unsigned long t = micros();
+            if (!processInput()) {
+                conn.disconnect();
+// TODO: Only when in direct mode?
+#ifdef BLYNK_USE_DIRECT_CONNECT
+                state = CONNECTING;
+#endif
+                BlynkOnDisconnected();
+                return false;
+            }
+            avail = false;
+            //BLYNK_LOG2(BLYNK_F("Proc time: "), micros() - t);
+        }
+    }
+
+    const millis_time_t t = BlynkMillis();
+
+    // Update connection status after running commands
+    const bool tconn = conn.connected();
+
+    if (state == CONNECTED) {
+        if (!tconn) {
+            lastHeartbeat = t;
+            internalReconnect();
+            return false;
+        }
+
+        if (t - lastActivityIn > (1000UL * BLYNK_HEARTBEAT + BLYNK_TIMEOUT_MS*3)) {
+#ifdef BLYNK_DEBUG
+            BLYNK_LOG6(BLYNK_F("Heartbeat timeout: "), t, BLYNK_F(", "), lastActivityIn, BLYNK_F(", "), lastHeartbeat);
+#else
+            BLYNK_LOG1(BLYNK_F("Heartbeat timeout"));
+#endif
+            internalReconnect();
+            return false;
+        } else if ((t - lastActivityIn  > 1000UL * BLYNK_HEARTBEAT ||
+                    t - lastActivityOut > 1000UL * BLYNK_HEARTBEAT) &&
+                    t - lastHeartbeat   > BLYNK_TIMEOUT_MS)
+        {
+            // Send ping if we didn't either send or receive something
+            // for BLYNK_HEARTBEAT seconds
+            sendCmd(BLYNK_CMD_PING);
+            lastHeartbeat = t;
+        }
+    } else if (state == CONNECTING) {
+#ifdef BLYNK_USE_DIRECT_CONNECT
+        if (!tconn)
+            conn.connect();
+#else
+        if (tconn && (t - lastLogin > BLYNK_TIMEOUT_MS)) {
+            BLYNK_LOG1(BLYNK_F("Login timeout"));
+            conn.disconnect();
+            state = CONNECTING;
+            return false;
+        } else if (!tconn && (t - lastLogin > 5000UL)) {
+            conn.disconnect();
+            if (!conn.connect()) {
+                lastLogin = t;
+                return false;
+            }
+
+            msgIdOut = 1;
+            sendCmd(BLYNK_CMD_LOGIN, 1, authkey, strlen(authkey));
+            lastLogin = lastActivityOut;
+            return true;
+        }
+#endif
+    }
+    return true;
+}
+
+template <class Transp>
+BLYNK_FORCE_INLINE
+bool BlynkProtocol<Transp>::processInput(void)
+{
+    BlynkHeader hdr;
+    const int ret = readHeader(hdr);
+
+    if (ret == 0) {
+        return true; // Considered OK (no data on input)
+    }
+
+    if (ret < 0 || hdr.msg_id == 0) {
+#ifdef BLYNK_DEBUG
+        BLYNK_LOG2(BLYNK_F("Bad hdr len: "), ret);
+#endif
+        return false;
+    }
+
+    if (hdr.type == BLYNK_CMD_RESPONSE) {
+        lastActivityIn = BlynkMillis();
+
+#ifndef BLYNK_USE_DIRECT_CONNECT
+        if (state == CONNECTING && (1 == hdr.msg_id)) {
+            switch (hdr.length) {
+            case BLYNK_SUCCESS:
+            case BLYNK_ALREADY_REGISTERED:
+                BLYNK_LOG3(BLYNK_F("Ready (ping: "), lastActivityIn-lastHeartbeat, BLYNK_F("ms)."));
+                lastHeartbeat = lastActivityIn;
+                state = CONNECTED;
+#ifdef BLYNK_DEBUG
+                if (size_t ram = BlynkFreeRam()) {
+                    BLYNK_LOG2(BLYNK_F("Free RAM: "), ram);
+                }
+#endif
+                this->sendInfo();
+                BLYNK_RUN_YIELD();
+                BlynkOnConnected();
+                return true;
+            case BLYNK_INVALID_TOKEN:
+                BLYNK_LOG1(BLYNK_F("Invalid auth token"));
+                break;
+            default:
+                BLYNK_LOG2(BLYNK_F("Connect failed. code: "), hdr.length);
+            }
+            return false;
+        }
+        if (BLYNK_NOT_AUTHENTICATED == hdr.length) {
+            return false;
+        }
+#endif
+        // TODO: return code may indicate App presence
+        return true;
+    }
+
+    if (hdr.length > BLYNK_MAX_READBYTES) {
+        BLYNK_LOG2(BLYNK_F("Packet too big: "), hdr.length);
+        // TODO: Flush
+        internalReconnect();
+        return true;
+    }
+
+    uint8_t inputBuffer[hdr.length+1]; // Add 1 to zero-terminate
+    if (hdr.length != conn.read(inputBuffer, hdr.length)) {
+#ifdef BLYNK_DEBUG
+        BLYNK_LOG1(BLYNK_F("Can't read body"));
+#endif
+        return false;
+    }
+    inputBuffer[hdr.length] = '\0';
+
+    BLYNK_DBG_DUMP(">", inputBuffer, hdr.length);
+
+    lastActivityIn = BlynkMillis();
+
+    switch (hdr.type)
+    {
+    case BLYNK_CMD_LOGIN: {
+#ifdef BLYNK_USE_DIRECT_CONNECT
+        if (strncmp(authkey, (char*)inputBuffer, 32)) {
+            BLYNK_LOG1(BLYNK_F("Invalid token"));
+            sendCmd(BLYNK_CMD_RESPONSE, hdr.msg_id, NULL, BLYNK_INVALID_TOKEN);
+            break;
+        }
+#endif
+        if (state == CONNECTING) {
+            BLYNK_LOG1(BLYNK_F("Ready"));
+            state = CONNECTED;
+#ifdef BLYNK_DEBUG
+            if (size_t ram = BlynkFreeRam()) {
+                BLYNK_LOG2(BLYNK_F("Free RAM: "), ram);
+            }
+#endif
+            this->sendInfo();
+            BLYNK_RUN_YIELD();
+            BlynkOnConnected();
+        }
+        sendCmd(BLYNK_CMD_RESPONSE, hdr.msg_id, NULL, BLYNK_SUCCESS);
+    } break;
+    case BLYNK_CMD_PING: {
+        sendCmd(BLYNK_CMD_RESPONSE, hdr.msg_id, NULL, BLYNK_SUCCESS);
+    } break;
+    case BLYNK_CMD_REDIRECT: {
+        if (!redir_serv) {
+             redir_serv = (char*)malloc(32);
+        }
+        BlynkParam param(inputBuffer, hdr.length);
+        uint16_t redir_port = BLYNK_DEFAULT_PORT; // TODO: Fixit
+
+        BlynkParam::iterator it = param.begin();
+        if (it >= param.end())
+            return false;
+        strncpy(redir_serv, it.asStr(), 32);
+        if (++it < param.end())
+            redir_port = it.asLong();
+        BLYNK_LOG4(BLYNK_F("Redirecting to "), redir_serv, ':', redir_port);
+        conn.disconnect();
+        conn.begin(redir_serv, redir_port);
+        state = CONNECTING;
+        lastHeartbeat = lastActivityIn = lastActivityOut = (BlynkMillis() - 5000UL);
+    } break;
+    case BLYNK_CMD_HARDWARE:
+    case BLYNK_CMD_BRIDGE: {
+        msgIdOutOverride = hdr.msg_id;
+        this->processCmd(inputBuffer, hdr.length);
+        msgIdOutOverride = 0;
+    } break;
+    case BLYNK_CMD_INTERNAL: {
+        BlynkReq req = { 0 };
+        BlynkParam param(inputBuffer, hdr.length);
+        BlynkParam::iterator it = param.begin();
+        if (it >= param.end())
+            return true;
+
+        uint32_t cmd32;
+        memcpy(&cmd32, it.asStr(), sizeof(cmd32));
+
+        ++it;
+        char* start = (char*)(it).asStr();
+        unsigned length = hdr.length - (start - (char*)inputBuffer);
+        BlynkParam param2(start, length);
+
+        switch (cmd32) {
+        case BLYNK_INT_RTC:  BlynkWidgetWriteInternalPinRTC(req, param2);    break;
+        case BLYNK_INT_OTA:  BlynkWidgetWriteInternalPinOTA(req, param2);    break;
+        case BLYNK_INT_ACON: BlynkWidgetWriteInternalPinACON(req, param2);   break;
+        case BLYNK_INT_ADIS: BlynkWidgetWriteInternalPinADIS(req, param2);   break;
+#ifdef BLYNK_DEBUG
+        default:             BLYNK_LOG2(BLYNK_F("Invalid internal cmd:"), param.asStr());
+#endif
+        }
+    } break;
+    case BLYNK_CMD_DEBUG_PRINT: {
+        if (hdr.length) {
+            BLYNK_LOG2(BLYNK_F("Server: "), (char*)inputBuffer);
+        }
+    } break;
+    default: {
+#ifdef BLYNK_DEBUG
+        BLYNK_LOG2(BLYNK_F("Invalid header type: "), hdr.type);
+#endif
+        // TODO: Flush
+        internalReconnect();
+    } break;
+    }
+
+    return true;
+}
+
+template <class Transp>
+int BlynkProtocol<Transp>::readHeader(BlynkHeader& hdr)
+{
+    size_t rlen = conn.read(&hdr, sizeof(hdr));
+    if (rlen == 0) {
+        return 0;
+    }
+
+    if (sizeof(hdr) != rlen) {
+        return -1;
+    }
+
+    BLYNK_DBG_DUMP(">", &hdr, sizeof(BlynkHeader));
+
+    hdr.msg_id = ntohs(hdr.msg_id);
+    hdr.length = ntohs(hdr.length);
+
+    return rlen;
+}
+
+#ifndef BLYNK_SEND_THROTTLE
+#define BLYNK_SEND_THROTTLE 0
+#endif
+
+#ifndef BLYNK_SEND_CHUNK
+#define BLYNK_SEND_CHUNK 1024 // Just a big number
+#endif
+
+template <class Transp>
+void BlynkProtocol<Transp>::sendCmd(uint8_t cmd, uint16_t id, const void* data, size_t length, const void* data2, size_t length2)
+{
+    if (!conn.connected() || (cmd != BLYNK_CMD_RESPONSE && cmd != BLYNK_CMD_PING && cmd != BLYNK_CMD_LOGIN && state != CONNECTED) ) {
+#ifdef BLYNK_DEBUG_ALL
+        BLYNK_LOG2(BLYNK_F("Cmd skipped:"), cmd);
+#endif
+        return;
+    }
+
+    if (0 == id) {
+        id = getNextMsgId();
+    }
+
+#if defined(BLYNK_MSG_LIMIT) && BLYNK_MSG_LIMIT > 0
+    if (cmd >= BLYNK_CMD_TWEET && cmd <= BLYNK_CMD_HARDWARE) {
+        const millis_time_t allowed_time = BlynkMax(lastActivityOut, lastActivityIn) + 1000/BLYNK_MSG_LIMIT;
+        int32_t wait_time = allowed_time - BlynkMillis();
+        if (wait_time >= 0) {
+#ifdef BLYNK_DEBUG_ALL
+            BLYNK_LOG2(BLYNK_F("Waiting:"), wait_time);
+#endif
+            while (wait_time >= 0) {
+                run();
+                wait_time = allowed_time - BlynkMillis();
+            }
+        } else if (nesting == 0) {
+            run();
+        }
+    }
+#endif
+
+    const size_t full_length = (sizeof(BlynkHeader)) +
+                               (data  ? length  : 0) +
+                               (data2 ? length2 : 0);
+
+#if defined(BLYNK_SEND_ATOMIC) || defined(ESP8266) || defined(ESP32) || defined(SPARK) || defined(PARTICLE) || defined(ENERGIA)
+    // Those have more RAM and like single write at a time...
+
+    uint8_t buff[full_length];
+
+    BlynkHeader* hdr = (BlynkHeader*)buff;
+    hdr->type = cmd;
+    hdr->msg_id = htons(id);
+    hdr->length = htons(length+length2);
+
+    size_t pos = sizeof(BlynkHeader);
+    if (data && length) {
+        memcpy(buff + pos, data, length);
+        pos += length;
+    }
+    if (data2 && length2) {
+        memcpy(buff + pos, data2, length2);
+    }
+
+    size_t wlen = 0;
+    while (wlen < full_length) {
+        const size_t chunk = BlynkMin(size_t(BLYNK_SEND_CHUNK), full_length - wlen);
+        BLYNK_DBG_DUMP("<", buff + wlen, chunk);
+        const size_t w = conn.write(buff + wlen, chunk);
+        BlynkDelay(BLYNK_SEND_THROTTLE);
+        if (w == 0) {
+#ifdef BLYNK_DEBUG
+            BLYNK_LOG1(BLYNK_F("Cmd error"));
+#endif
+            conn.disconnect();
+            state = CONNECTING;
+            BlynkOnDisconnected();
+            return;
+        }
+        wlen += w;
+    }
+
+#else
+
+    BlynkHeader hdr;
+    hdr.type = cmd;
+    hdr.msg_id = htons(id);
+    hdr.length = htons(length+length2);
+
+    BLYNK_DBG_DUMP("<", &hdr, sizeof(hdr));
+    size_t wlen = conn.write(&hdr, sizeof(hdr));
+    BlynkDelay(BLYNK_SEND_THROTTLE);
+
+    if (cmd != BLYNK_CMD_RESPONSE) {
+        if (length) {
+            BLYNK_DBG_DUMP("<", data, length);
+            wlen += conn.write(data, length);
+            BlynkDelay(BLYNK_SEND_THROTTLE);
+        }
+        if (length2) {
+            BLYNK_DBG_DUMP("<", data2, length2);
+            wlen += conn.write(data2, length2);
+            BlynkDelay(BLYNK_SEND_THROTTLE);
+        }
+    }
+
+#endif
+
+    if (wlen != full_length) {
+#ifdef BLYNK_DEBUG
+        BLYNK_LOG4(BLYNK_F("Sent "), wlen, '/', full_length);
+#endif
+        internalReconnect();
+        return;
+    }
+
+    lastActivityOut = BlynkMillis();
+
+}
+
+template <class Transp>
+uint16_t BlynkProtocol<Transp>::getNextMsgId()
+{
+    if (msgIdOutOverride != 0)
+        return msgIdOutOverride;
+    if (++msgIdOut == 0)
+        msgIdOut = 1;
+    return msgIdOut;
+}
+
+#endif

wled00/src/dependencies/blynk/Blynk/BlynkProtocolDefs.h

@@ -0,0 +1,138 @@
+/**
+ * @file       BlynkProtocolDefs.h
+ * @author     Volodymyr Shymanskyy
+ * @license    This project is released under the MIT License (MIT)
+ * @copyright  Copyright (c) 2015 Volodymyr Shymanskyy
+ * @date       Jan 2015
+ * @brief      Blynk protocol definitions
+ *
+ */
+
+#ifndef BlynkProtocolDefs_h
+#define BlynkProtocolDefs_h
+
+enum BlynkCmd
+{
+    BLYNK_CMD_RESPONSE       = 0,
+    BLYNK_CMD_REGISTER       = 1,
+    BLYNK_CMD_LOGIN          = 2,
+    BLYNK_CMD_SAVE_PROF      = 3,
+    BLYNK_CMD_LOAD_PROF      = 4,
+    BLYNK_CMD_GET_TOKEN      = 5,
+    BLYNK_CMD_PING           = 6,
+    BLYNK_CMD_ACTIVATE       = 7,
+    BLYNK_CMD_DEACTIVATE     = 8,
+    BLYNK_CMD_REFRESH        = 9,
+    BLYNK_CMD_GET_GRAPH_DATA = 10,
+    BLYNK_CMD_GET_GRAPH_DATA_RESPONSE = 11,
+
+    BLYNK_CMD_TWEET          = 12,
+    BLYNK_CMD_EMAIL          = 13,
+    BLYNK_CMD_NOTIFY         = 14,
+    BLYNK_CMD_BRIDGE         = 15,
+    BLYNK_CMD_HARDWARE_SYNC  = 16,
+    BLYNK_CMD_INTERNAL       = 17,
+    BLYNK_CMD_SMS            = 18,
+    BLYNK_CMD_PROPERTY       = 19,
+    BLYNK_CMD_HARDWARE       = 20,
+
+    BLYNK_CMD_CREATE_DASH    = 21,
+    BLYNK_CMD_SAVE_DASH      = 22,
+    BLYNK_CMD_DELETE_DASH    = 23,
+    BLYNK_CMD_LOAD_PROF_GZ   = 24,
+    BLYNK_CMD_SYNC           = 25,
+    BLYNK_CMD_SHARING        = 26,
+    BLYNK_CMD_ADD_PUSH_TOKEN = 27,
+
+    //sharing commands
+    BLYNK_CMD_GET_SHARED_DASH = 29,
+    BLYNK_CMD_GET_SHARE_TOKEN = 30,
+    BLYNK_CMD_REFRESH_SHARE_TOKEN = 31,
+    BLYNK_CMD_SHARE_LOGIN     = 32,
+
+    BLYNK_CMD_REDIRECT        = 41,
+
+    BLYNK_CMD_DEBUG_PRINT     = 55,
+
+    BLYNK_CMD_EVENT_LOG       = 64
+};
+
+enum BlynkStatus
+{
+    BLYNK_SUCCESS                = 200,
+    BLYNK_QUOTA_LIMIT_EXCEPTION  = 1,
+    BLYNK_ILLEGAL_COMMAND        = 2,
+    BLYNK_NOT_REGISTERED         = 3,
+    BLYNK_ALREADY_REGISTERED     = 4,
+    BLYNK_NOT_AUTHENTICATED      = 5,
+    BLYNK_NOT_ALLOWED            = 6,
+    BLYNK_DEVICE_NOT_IN_NETWORK  = 7,
+    BLYNK_NO_ACTIVE_DASHBOARD    = 8,
+    BLYNK_INVALID_TOKEN          = 9,
+    BLYNK_ILLEGAL_COMMAND_BODY   = 11,
+    BLYNK_GET_GRAPH_DATA_EXCEPTION = 12,
+    BLYNK_NO_DATA_EXCEPTION      = 17,
+    BLYNK_DEVICE_WENT_OFFLINE    = 18,
+    BLYNK_SERVER_EXCEPTION       = 19,
+
+    BLYNK_NTF_INVALID_BODY       = 13,
+    BLYNK_NTF_NOT_AUTHORIZED     = 14,
+    BLYNK_NTF_ECXEPTION          = 15,
+
+    BLYNK_TIMEOUT                = 16,
+
+    BLYNK_NOT_SUPPORTED_VERSION  = 20,
+    BLYNK_ENERGY_LIMIT           = 21
+};
+
+struct BlynkHeader
+{
+    uint8_t  type;
+    uint16_t msg_id;
+    uint16_t length;
+}
+BLYNK_ATTR_PACKED;
+
+#if !defined(htons) && (defined(ARDUINO) || defined(ESP8266) || defined(PARTICLE) || defined(__MBED__))
+    #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+        #define htons(x) ( ((x)<<8) | (((x)>>8)&0xFF) )
+        #define htonl(x) ( ((x)<<24 & 0xFF000000UL) | \
+                           ((x)<< 8 & 0x00FF0000UL) | \
+                           ((x)>> 8 & 0x0000FF00UL) | \
+                           ((x)>>24 & 0x000000FFUL) )
+        #define ntohs(x) htons(x)
+        #define ntohl(x) htonl(x)
+    #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+        #define htons(x) (x)
+        #define htonl(x) (x)
+        #define ntohs(x) (x)
+        #define ntohl(x) (x)
+    #else
+        #error byte order problem
+    #endif
+#endif
+
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+    #define BLYNK_STR_16(a,b)     ((uint16_t(a) << 0) | (uint16_t(b) << 8))
+    #define BLYNK_STR_32(a,b,c,d) ((uint32_t(a) << 0) | (uint32_t(b) << 8) | (uint32_t(c) << 16) | (uint32_t(d) << 24))
+#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+    #define BLYNK_STR_16(a,b)     ((uint16_t(b) << 0) | (uint16_t(a) << 8))
+    #define BLYNK_STR_32(a,b,c,d) ((uint32_t(d) << 0) | (uint32_t(c) << 8) | (uint32_t(b) << 16) | (uint32_t(a) << 24))
+#else
+    #error byte order problem
+#endif
+
+#define BLYNK_HW_PM BLYNK_STR_16('p','m')
+#define BLYNK_HW_DW BLYNK_STR_16('d','w')
+#define BLYNK_HW_DR BLYNK_STR_16('d','r')
+#define BLYNK_HW_AW BLYNK_STR_16('a','w')
+#define BLYNK_HW_AR BLYNK_STR_16('a','r')
+#define BLYNK_HW_VW BLYNK_STR_16('v','w')
+#define BLYNK_HW_VR BLYNK_STR_16('v','r')
+
+#define BLYNK_INT_RTC  BLYNK_STR_32('r','t','c',0)
+#define BLYNK_INT_OTA  BLYNK_STR_32('o','t','a',0)
+#define BLYNK_INT_ACON BLYNK_STR_32('a','c','o','n')
+#define BLYNK_INT_ADIS BLYNK_STR_32('a','d','i','s')
+
+#endif

wled00/src/dependencies/blynk/Blynk/BlynkTemplates.h

@@ -0,0 +1,47 @@
+class BlynkStackOnly
+{
+protected:
+  BlynkStackOnly() {}
+  ~BlynkStackOnly() {}
+
+private:
+  /// @brief Declared as private to prevent usage of dynamic memory
+  void* operator new(size_t size);
+  /// @brief Declared as private to prevent usage of dynamic memory
+  void operator delete(void *p);
+};
+
+class BlynkNonCopyable
+{
+protected:
+  BlynkNonCopyable(){}
+  ~BlynkNonCopyable(){}
+
+private:
+  /// @brief Declared as private to prevent usage of copy constructor
+  BlynkNonCopyable(const BlynkNonCopyable&);
+  /// @brief Declared as private to prevent usage of assignment operator
+  BlynkNonCopyable& operator=(const BlynkNonCopyable&);
+};
+
+template<typename T>
+class BlynkSingleton
+  : public BlynkNonCopyable
+{
+public:
+  /** @brief Returns the instance of the singleton type
+   When called for the first time, the singleton instance will be
+   created. All subsequent calls will return a reference to the
+   previously created instance.
+   @return The singleton instance
+   */
+  static T* instance()
+  {
+    static T instance;
+    return &instance;
+  }
+protected:
+  BlynkSingleton() {}
+  ~BlynkSingleton() {}
+};
+

wled00/src/dependencies/blynk/Blynk/BlynkTimer.cpp

@@ -0,0 +1,291 @@
+/*
+ * SimpleTimer.cpp
+ *
+ * SimpleTimer - A timer library for Arduino.
+ * Author: mromani@ottotecnica.com
+ * Copyright (c) 2010 OTTOTECNICA Italy
+ *
+ * Callback function parameters added & compiler warnings
+ * removed by Bill Knight <billk@rosw.com> 20March2017
+ *
+ * This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser
+ * General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at
+ * your option) any later version.
+ *
+ * This library is distributed in the hope that it will
+ * be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser
+ * General Public License along with this library; if not,
+ * write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+#include "BlynkTimer.h"
+#include <string.h>
+
+// Select time function:
+//static inline unsigned long elapsed() { return micros(); }
+static inline unsigned long elapsed() { return BlynkMillis(); }
+
+
+SimpleTimer::SimpleTimer()
+    : numTimers (-1)
+{
+}
+
+void SimpleTimer::init() {
+    unsigned long current_millis = elapsed();
+
+    for (int i = 0; i < MAX_TIMERS; i++) {
+        memset(&timer[i], 0, sizeof (timer_t));
+        timer[i].prev_millis = current_millis;
+    }
+
+    numTimers = 0;
+}
+
+
+void SimpleTimer::run() {
+    int i;
+    unsigned long current_millis;
+
+    // get current time
+    current_millis = elapsed();
+
+    for (i = 0; i < MAX_TIMERS; i++) {
+
+        timer[i].toBeCalled = DEFCALL_DONTRUN;
+
+        // no callback == no timer, i.e. jump over empty slots
+        if (timer[i].callback != NULL) {
+
+            // is it time to process this timer ?
+            // see http://arduino.cc/forum/index.php/topic,124048.msg932592.html#msg932592
+
+            if ((current_millis - timer[i].prev_millis) >= timer[i].delay) {
+
+                unsigned long skipTimes = (current_millis - timer[i].prev_millis) / timer[i].delay;
+                // update time
+                timer[i].prev_millis += timer[i].delay * skipTimes;
+
+                // check if the timer callback has to be executed
+                if (timer[i].enabled) {
+
+                    // "run forever" timers must always be executed
+                    if (timer[i].maxNumRuns == RUN_FOREVER) {
+                        timer[i].toBeCalled = DEFCALL_RUNONLY;
+                    }
+                    // other timers get executed the specified number of times
+                    else if (timer[i].numRuns < timer[i].maxNumRuns) {
+                        timer[i].toBeCalled = DEFCALL_RUNONLY;
+                        timer[i].numRuns++;
+
+                        // after the last run, delete the timer
+                        if (timer[i].numRuns >= timer[i].maxNumRuns) {
+                            timer[i].toBeCalled = DEFCALL_RUNANDDEL;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    for (i = 0; i < MAX_TIMERS; i++) {
+        if (timer[i].toBeCalled == DEFCALL_DONTRUN)
+            continue;
+
+        if (timer[i].hasParam)
+            (*(timer_callback_p)timer[i].callback)(timer[i].param);
+        else
+            (*(timer_callback)timer[i].callback)();
+
+        if (timer[i].toBeCalled == DEFCALL_RUNANDDEL)
+            deleteTimer(i);
+    }
+}
+
+
+// find the first available slot
+// return -1 if none found
+int SimpleTimer::findFirstFreeSlot() {
+    // all slots are used
+    if (numTimers >= MAX_TIMERS) {
+        return -1;
+    }
+
+    // return the first slot with no callback (i.e. free)
+    for (int i = 0; i < MAX_TIMERS; i++) {
+        if (timer[i].callback == NULL) {
+            return i;
+        }
+    }
+
+    // no free slots found
+    return -1;
+}
+
+
+int SimpleTimer::setupTimer(unsigned long d, void* f, void* p, bool h, unsigned n) {
+    int freeTimer;
+
+    if (numTimers < 0) {
+        init();
+    }
+
+    freeTimer = findFirstFreeSlot();
+    if (freeTimer < 0) {
+        return -1;
+    }
+
+    if (f == NULL) {
+        return -1;
+    }
+
+    timer[freeTimer].delay = d;
+    timer[freeTimer].callback = f;
+    timer[freeTimer].param = p;
+    timer[freeTimer].hasParam = h;
+    timer[freeTimer].maxNumRuns = n;
+    timer[freeTimer].enabled = true;
+    timer[freeTimer].prev_millis = elapsed();
+
+    numTimers++;
+
+    return freeTimer;
+}
+
+
+int SimpleTimer::setTimer(unsigned long d, timer_callback f, unsigned n) {
+  return setupTimer(d, (void *)f, NULL, false, n);
+}
+
+int SimpleTimer::setTimer(unsigned long d, timer_callback_p f, void* p, unsigned n) {
+  return setupTimer(d, (void *)f, p, true, n);
+}
+
+int SimpleTimer::setInterval(unsigned long d, timer_callback f) {
+    return setupTimer(d, (void *)f, NULL, false, RUN_FOREVER);
+}
+
+int SimpleTimer::setInterval(unsigned long d, timer_callback_p f, void* p) {
+  return setupTimer(d, (void *)f, p, true, RUN_FOREVER);
+}
+
+int SimpleTimer::setTimeout(unsigned long d, timer_callback f) {
+    return setupTimer(d, (void *)f, NULL, false, RUN_ONCE);
+}
+
+int SimpleTimer::setTimeout(unsigned long d, timer_callback_p f, void* p) {
+  return setupTimer(d, (void *)f, p, true, RUN_ONCE);
+}
+
+bool SimpleTimer::changeInterval(unsigned numTimer, unsigned long d) {
+    if (numTimer >= MAX_TIMERS) {
+        return false;
+    }
+
+    // Updates interval of existing specified timer
+    if (timer[numTimer].callback != NULL) {
+        timer[numTimer].delay = d;
+        timer[numTimer].prev_millis = elapsed();
+        return true;
+    }
+    // false return for non-used numTimer, no callback
+    return false;
+}
+
+void SimpleTimer::deleteTimer(unsigned timerId) {
+    if (timerId >= MAX_TIMERS) {
+        return;
+    }
+
+    // nothing to delete if no timers are in use
+    if (numTimers == 0) {
+        return;
+    }
+
+    // don't decrease the number of timers if the
+    // specified slot is already empty
+    if (timer[timerId].callback != NULL) {
+        memset(&timer[timerId], 0, sizeof (timer_t));
+        timer[timerId].prev_millis = elapsed();
+
+        // update number of timers
+        numTimers--;
+    }
+}
+
+
+// function contributed by code@rowansimms.com
+void SimpleTimer::restartTimer(unsigned numTimer) {
+    if (numTimer >= MAX_TIMERS) {
+        return;
+    }
+
+    timer[numTimer].prev_millis = elapsed();
+}
+
+
+bool SimpleTimer::isEnabled(unsigned numTimer) {
+    if (numTimer >= MAX_TIMERS) {
+        return false;
+    }
+
+    return timer[numTimer].enabled;
+}
+
+
+void SimpleTimer::enable(unsigned numTimer) {
+    if (numTimer >= MAX_TIMERS) {
+        return;
+    }
+
+    timer[numTimer].enabled = true;
+}
+
+
+void SimpleTimer::disable(unsigned numTimer) {
+    if (numTimer >= MAX_TIMERS) {
+        return;
+    }
+
+    timer[numTimer].enabled = false;
+}
+
+void SimpleTimer::enableAll() {
+    // Enable all timers with a callback assigned (used)
+    for (int i = 0; i < MAX_TIMERS; i++) {
+        if (timer[i].callback != NULL && timer[i].numRuns == RUN_FOREVER) {
+            timer[i].enabled = true;
+        }
+    }
+}
+
+void SimpleTimer::disableAll() {
+    // Disable all timers with a callback assigned (used)
+    for (int i = 0; i < MAX_TIMERS; i++) {
+        if (timer[i].callback != NULL && timer[i].numRuns == RUN_FOREVER) {
+            timer[i].enabled = false;
+        }
+    }
+}
+
+void SimpleTimer::toggle(unsigned numTimer) {
+    if (numTimer >= MAX_TIMERS) {
+        return;
+    }
+
+    timer[numTimer].enabled = !timer[numTimer].enabled;
+}
+
+
+unsigned SimpleTimer::getNumTimers() {
+    return numTimers;
+}

wled00/src/dependencies/blynk/Blynk/BlynkTimer.h

@@ -0,0 +1,155 @@
+/*
+ * SimpleTimer.h
+ *
+ * SimpleTimer - A timer library for Arduino.
+ * Author: mromani@ottotecnica.com
+ * Copyright (c) 2010 OTTOTECNICA Italy
+ *
+ * Modifications by Bill Knight <billk@rosw.com> 18March2017
+ *
+ * This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser
+ * General Public License as published by the Free Software
+ * Foundation; either version 2.1 of the License, or (at
+ * your option) any later version.
+ *
+ * This library is distributed in the hope that it will
+ * be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser
+ * General Public License along with this library; if not,
+ * write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#ifndef BLYNKTIMER_H
+#define BLYNKTIMER_H
+
+#include "BlynkDebug.h"
+
+// Replace SimpleTimer
+#define SIMPLETIMER_H
+#define SimpleTimer BlynkTimer
+
+typedef void (*timer_callback)(void);
+typedef void (*timer_callback_p)(void *);
+
+class SimpleTimer {
+
+public:
+    // maximum number of timers
+    const static int MAX_TIMERS = 16;
+
+    // setTimer() constants
+    const static int RUN_FOREVER = 0;
+    const static int RUN_ONCE = 1;
+
+    // constructor
+    SimpleTimer();
+
+    void init();
+
+    // this function must be called inside loop()
+    void run();
+
+    // Timer will call function 'f' every 'd' milliseconds forever
+    // returns the timer number (numTimer) on success or
+    // -1 on failure (f == NULL) or no free timers
+    int setInterval(unsigned long d, timer_callback f);
+
+    // Timer will call function 'f' with parameter 'p' every 'd' milliseconds forever
+    // returns the timer number (numTimer) on success or
+    // -1 on failure (f == NULL) or no free timers
+    int setInterval(unsigned long d, timer_callback_p f, void* p);
+
+    // Timer will call function 'f' after 'd' milliseconds one time
+    // returns the timer number (numTimer) on success or
+    // -1 on failure (f == NULL) or no free timers
+    int setTimeout(unsigned long d, timer_callback f);
+
+    // Timer will call function 'f' with parameter 'p' after 'd' milliseconds one time
+    // returns the timer number (numTimer) on success or
+    // -1 on failure (f == NULL) or no free timers
+    int setTimeout(unsigned long d, timer_callback_p f, void* p);
+
+    // Timer will call function 'f' every 'd' milliseconds 'n' times
+    // returns the timer number (numTimer) on success or
+    // -1 on failure (f == NULL) or no free timers
+    int setTimer(unsigned long d, timer_callback f, unsigned n);
+
+    // Timer will call function 'f' with parameter 'p' every 'd' milliseconds 'n' times
+    // returns the timer number (numTimer) on success or
+    // -1 on failure (f == NULL) or no free timers
+    int setTimer(unsigned long d, timer_callback_p f, void* p, unsigned n);
+
+    // updates interval of the specified timer
+    bool changeInterval(unsigned numTimer, unsigned long d);
+
+    // destroy the specified timer
+    void deleteTimer(unsigned numTimer);
+
+    // restart the specified timer
+    void restartTimer(unsigned numTimer);
+
+    // returns true if the specified timer is enabled
+    bool isEnabled(unsigned numTimer);
+
+    // enables the specified timer
+    void enable(unsigned numTimer);
+
+    // disables the specified timer
+    void disable(unsigned numTimer);
+
+    // enables all timers
+    void enableAll();
+
+    // disables all timers
+    void disableAll();
+
+    // enables the specified timer if it's currently disabled,
+    // and vice-versa
+    void toggle(unsigned numTimer);
+
+    // returns the number of used timers
+    unsigned getNumTimers();
+
+    // returns the number of available timers
+    unsigned getNumAvailableTimers() { return MAX_TIMERS - numTimers; };
+
+private:
+    // deferred call constants
+    const static int DEFCALL_DONTRUN = 0;       // don't call the callback function
+    const static int DEFCALL_RUNONLY = 1;       // call the callback function but don't delete the timer
+    const static int DEFCALL_RUNANDDEL = 2;     // call the callback function and delete the timer
+
+    // low level function to initialize and enable a new timer
+    // returns the timer number (numTimer) on success or
+    // -1 on failure (f == NULL) or no free timers
+    int setupTimer(unsigned long d, void* f, void* p, bool h, unsigned n);
+
+    // find the first available slot
+    int findFirstFreeSlot();
+
+    typedef struct {
+      unsigned long prev_millis;        // value returned by the millis() function in the previous run() call
+      void* callback;                   // pointer to the callback function
+      void* param;                      // function parameter
+      bool hasParam;                 // true if callback takes a parameter
+      unsigned long delay;              // delay value
+      unsigned maxNumRuns;              // number of runs to be executed
+      unsigned numRuns;                 // number of executed runs
+      bool enabled;                  // true if enabled
+      unsigned toBeCalled;              // deferred function call (sort of) - N.B.: only used in run()
+    } timer_t;
+
+    timer_t timer[MAX_TIMERS];
+
+    // actual number of timers in use (-1 means uninitialized)
+    int numTimers;
+};
+
+#endif

wled00/src/dependencies/blynk/Blynk/BlynkUtility.h

@@ -0,0 +1,64 @@
+/**
+ * @file       BlynkUtility.h
+ * @author     Volodymyr Shymanskyy
+ * @license    This project is released under the MIT License (MIT)
+ * @copyright  Copyright (c) 2015 Volodymyr Shymanskyy
+ * @date       Jun 2015
+ * @brief      Utility functions
+ *
+ */
+
+#ifndef BlynkUtility_h
+#define BlynkUtility_h
+
+template<class T>
+const T& BlynkMin(const T& a, const T& b)
+{
+    return (b < a) ? b : a;
+}
+
+template<class T>
+const T& BlynkMax(const T& a, const T& b)
+{
+    return (b < a) ? a : b;
+}
+
+
+template <class T>
+T BlynkMathMap(T x, T in_min, T in_max, T out_min, T out_max)
+{
+  return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
+}
+
+template <class T>
+T BlynkMathClamp(T val, T low, T high)
+{
+  return (val < low) ? low : ((val > high) ? high : val);
+}
+
+
+template <unsigned WSIZE, typename T>
+void BlynkAverageSample (T& avg, const T& input) {
+    avg -= avg/WSIZE;
+    const T add = input/WSIZE;
+    // Fix for shorter delays
+    if (add > 0)
+      avg += add;
+    else
+      avg -= 1;
+}
+
+class BlynkHelperAutoInc {
+public:
+    BlynkHelperAutoInc(uint8_t& counter) : c(counter) { ++c; }
+    ~BlynkHelperAutoInc() { --c; }
+private:
+    uint8_t& c;
+};
+
+#define BlynkBitSet(value, bit)   ((value) |= (1UL << (bit)))
+#define BlynkBitClear(value, bit) ((value) &= ~(1UL << (bit)))
+#define BlynkBitRead(value, bit)  (((value) >> (bit)) & 0x01)
+#define BlynkBitWrite(value, bit, bitvalue) (bitvalue ? bitSet(value, bit) : bitClear(value, bit))
+
+#endif

wled00/src/dependencies/blynk/Blynk/BlynkWiFiCommon.h

@@ -0,0 +1,102 @@
+/**
+ * @file       BlynkWiFiCommon.h
+ * @author     Volodymyr Shymanskyy
+ * @license    This project is released under the MIT License (MIT)
+ * @copyright  Copyright (c) 2015 Volodymyr Shymanskyy
+ * @date       Jan 2015
+ * @brief
+ *
+ */
+
+#ifndef BlynkWiFiCommon_h
+#define BlynkWiFiCommon_h
+
+#ifndef BLYNK_INFO_CONNECTION
+#define BLYNK_INFO_CONNECTION "WiFi"
+#endif
+
+#include "BlynkApiArduino.h"
+#include "BlynkProtocol.h"
+#include "BlynkArduinoClient.h"
+
+class BlynkWifiCommon
+    : public BlynkProtocol<BlynkArduinoClient>
+{
+    typedef BlynkProtocol<BlynkArduinoClient> Base;
+public:
+    BlynkWifiCommon(BlynkArduinoClient& transp)
+        : Base(transp)
+    {}
+
+    void connectWiFi(const char* ssid, const char* pass)
+    {
+        int status = WL_IDLE_STATUS;
+        // check for the presence of the shield:
+        if (WiFi.status() == WL_NO_SHIELD) {
+            BLYNK_FATAL("WiFi shield not present");
+        }
+
+#ifdef BLYNK_DEBUG
+        BLYNK_LOG2(BLYNK_F("WiFi firmware: "), WiFi.firmwareVersion());
+#endif
+
+        // attempt to connect to Wifi network:
+        while (true) {
+            BLYNK_LOG2(BLYNK_F("Connecting to "), ssid);
+            if (pass && strlen(pass)) {
+                status = WiFi.begin((char*)ssid, (char*)pass);
+            } else {
+                status = WiFi.begin((char*)ssid);
+            }
+            if (status == WL_CONNECTED) {
+                break;
+            } else {
+                BlynkDelay(5000);
+            }
+        }
+
+        IPAddress myip = WiFi.localIP();
+        BLYNK_LOG_IP("IP: ", myip);
+    }
+
+    void config(const char* auth,
+                const char* domain = BLYNK_DEFAULT_DOMAIN,
+                uint16_t    port   = BLYNK_DEFAULT_PORT)
+    {
+        Base::begin(auth);
+        this->conn.begin(domain, port);
+    }
+
+    void config(const char* auth,
+                IPAddress   ip,
+                uint16_t    port = BLYNK_DEFAULT_PORT)
+    {
+        Base::begin(auth);
+        this->conn.begin(ip, port);
+    }
+
+    void begin(const char* auth,
+               const char* ssid,
+               const char* pass,
+               const char* domain = BLYNK_DEFAULT_DOMAIN,
+               uint16_t    port   = BLYNK_DEFAULT_PORT)
+    {
+        connectWiFi(ssid, pass);
+        config(auth, domain, port);
+        while(this->connect() != true) {}
+    }
+
+    void begin(const char* auth,
+               const char* ssid,
+               const char* pass,
+               IPAddress   ip,
+               uint16_t    port   = BLYNK_DEFAULT_PORT)
+    {
+        connectWiFi(ssid, pass);
+        config(auth, ip, port);
+        while(this->connect() != true) {}
+    }
+
+};
+
+#endif

wled00/src/dependencies/blynk/Blynk/BlynkWidgetBase.h

@@ -0,0 +1,62 @@
+/**
+ * @file       BlynkWidgetBase.h
+ * @author     Volodymyr Shymanskyy
+ * @license    This project is released under the MIT License (MIT)
+ * @copyright  Copyright (c) 2016 Volodymyr Shymanskyy
+ * @date       Nov 2016
+ * @brief
+ */
+
+#ifndef BlynkWidgetBase_h
+#define BlynkWidgetBase_h
+
+#include "BlynkApi.h"
+
+class BlynkWidgetBase
+{
+public:
+    BlynkWidgetBase(uint8_t vPin) : mPin(vPin) {}
+    void setVPin(uint8_t vPin) { mPin = vPin; }
+
+    void onWrite(BlynkReq BLYNK_UNUSED &request, const BlynkParam BLYNK_UNUSED &param) {
+        BLYNK_LOG1(BLYNK_F("BlynkWidgetBase::onWrite should not be called"));
+    }
+
+    template<typename... Args>
+    void setLabel(Args... args) {
+        Blynk.setProperty(mPin, "label", args...);
+    }
+
+    template<typename... Args>
+    void setColor(Args... args) {
+        Blynk.setProperty(mPin, "color", args...);
+    }
+
+    template<typename... Args>
+    void setMin(Args... args) {
+        Blynk.setProperty(mPin, "min", args...);
+    }
+
+    template<typename... Args>
+    void setMax(Args... args) {
+        Blynk.setProperty(mPin, "max", args...);
+    }
+
+protected:
+    uint8_t mPin;
+};
+
+class BlynkAttachWidgetHelper {
+public:
+    template<typename T>
+    explicit BlynkAttachWidgetHelper(T& widget, uint8_t vPin) {
+        widget.setVPin(vPin);
+    }
+};
+
+// Could use __attribute__ ((constructor)), but hope for better portability
+#define BLYNK_ATTACH_WIDGET(widget, pin) \
+    BlynkAttachWidgetHelper BLYNK_CONCAT2(blnk_widget_helper_, __COUNTER__)((widget), (pin)); \
+    BLYNK_WRITE(pin) { (widget).onWrite(request, param); }
+
+#endif

wled00/src/dependencies/blynk/Blynk/utility.cpp

@@ -0,0 +1,198 @@
+#include "BlynkDebug.h"
+#include "BlynkDateTime.h"
+
+#if !defined(BLYNK_NO_FLOAT) && defined(BLYNK_USE_INTERNAL_DTOSTRF)
+
+#include <string.h>
+#include <math.h>
+#include <stdio.h>
+
+char* dtostrf_internal(double number, signed char BLYNK_UNUSED width, unsigned char prec, char *s) {
+    if(isnan(number)) {
+        strcpy(s, "nan");
+        return s;
+    }
+    if(isinf(number)) {
+        strcpy(s, "inf");
+        return s;
+    }
+
+    if(number > 4294967040.0 || number < -4294967040.0) {
+        strcpy(s, "ovf");
+        return s;
+    }
+    char* out = s;
+    // Handle negative numbers
+    if(number < 0.0) {
+        *out = '-';
+        ++out;
+        number = -number;
+    }
+
+    // Round correctly so that print(1.999, 2) prints as "2.00"
+    double rounding = 0.5;
+    for(uint8_t i = 0; i < prec; ++i) {
+        rounding /= 10.0;
+    }
+
+    number += rounding;
+
+    // Extract the integer part of the number and print it
+    unsigned long int_part = (unsigned long) number;
+    double remainder = number - (double) int_part;
+    out += sprintf(out, "%lu", int_part);
+
+    // Print the decimal point, but only if there are digits beyond
+    if(prec > 0) {
+        *out = '.';
+        ++out;
+    }
+
+    while(prec-- > 0) {
+        remainder *= 10.0;
+        if((int)remainder == 0) {
+            *out = '0';
+            ++out;
+        }
+    }
+    sprintf(out, "%d", (int) remainder);
+
+    return s;
+}
+
+#endif
+
+#define YEAR_0                  1900
+#define YEAR_EPOCH              1970
+#define SECS_IN_DAY             (24L * 60L * 60L)
+#define IS_LEAP_YEAR(year)      (!((year) % 4) && (((year) % 100) || !((year) % 400)))
+#define YEAR_DAYS(year)         (IS_LEAP_YEAR(year) ? 366 : 365)
+
+#define TIME_MAX                2147483647L
+
+static const int month_tab[2][12] = {
+    { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
+    { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
+};
+
+struct blynk_tm* blynk_gmtime_r(const blynk_time_t* t, struct blynk_tm *tm) {
+    blynk_time_t time = *t;
+    unsigned long dayclock, dayno;
+    int year = YEAR_EPOCH;
+
+    dayclock = (unsigned long) time % SECS_IN_DAY;
+    dayno = (unsigned long) time / SECS_IN_DAY;
+
+    tm->tm_sec = dayclock % 60;
+    tm->tm_min = (dayclock % 3600) / 60;
+    tm->tm_hour = dayclock / 3600;
+    tm->tm_wday = (dayno + 4) % 7;
+    while (dayno >= (unsigned long) YEAR_DAYS(year)) {
+        dayno -= YEAR_DAYS(year);
+        year++;
+    }
+    tm->tm_year = year - YEAR_0;
+    tm->tm_yday = dayno;
+    tm->tm_mon = 0;
+    while (dayno >= (unsigned long) month_tab[IS_LEAP_YEAR(year)][tm->tm_mon]) {
+        dayno -= month_tab[IS_LEAP_YEAR(year)][tm->tm_mon];
+        tm->tm_mon++;
+    }
+    tm->tm_mday = dayno + 1;
+    tm->tm_isdst = 0;
+    return tm;
+}
+
+blynk_time_t blynk_mk_gmtime(struct blynk_tm *tm) {
+    long day, year;
+    int tm_year;
+    int yday, month;
+    long seconds;
+    int overflow;
+
+    tm->tm_min += tm->tm_sec / 60;
+    tm->tm_sec %= 60;
+    if (tm->tm_sec < 0) {
+        tm->tm_sec += 60;
+        tm->tm_min--;
+    }
+    tm->tm_hour += tm->tm_min / 60;
+    tm->tm_min = tm->tm_min % 60;
+    if (tm->tm_min < 0) {
+        tm->tm_min += 60;
+        tm->tm_hour--;
+    }
+    day = tm->tm_hour / 24;
+    tm->tm_hour = tm->tm_hour % 24;
+    if (tm->tm_hour < 0) {
+        tm->tm_hour += 24;
+        day--;
+    }
+    tm->tm_year += tm->tm_mon / 12;
+    tm->tm_mon %= 12;
+    if (tm->tm_mon < 0) {
+        tm->tm_mon += 12;
+        tm->tm_year--;
+    }
+    day += (tm->tm_mday - 1);
+    while (day < 0) {
+        if (--tm->tm_mon < 0) {
+            tm->tm_year--;
+            tm->tm_mon = 11;
+        }
+        day += month_tab[IS_LEAP_YEAR(YEAR_0 + tm->tm_year)][tm->tm_mon];
+    }
+    while (day >= month_tab[IS_LEAP_YEAR(YEAR_0 + tm->tm_year)][tm->tm_mon]) {
+        day -= month_tab[IS_LEAP_YEAR(YEAR_0 + tm->tm_year)][tm->tm_mon];
+        if (++(tm->tm_mon) == 12) {
+            tm->tm_mon = 0;
+            tm->tm_year++;
+        }
+    }
+    tm->tm_mday = day + 1;
+    year = YEAR_EPOCH;
+    if (tm->tm_year < year - YEAR_0)
+        return (blynk_time_t) -1;
+    seconds = 0;
+    day = 0;
+    overflow = 0;
+
+    tm_year = tm->tm_year + YEAR_0;
+
+    if (TIME_MAX / 365 < tm_year - year)
+        overflow++;
+    day = (tm_year - year) * 365;
+    if (TIME_MAX - day < (tm_year - year) / 4 + 1)
+        overflow++;
+    day += (tm_year - year) / 4 + ((tm_year % 4) && tm_year % 4 < year % 4);
+    day -= (tm_year - year) / 100
+            + ((tm_year % 100) && tm_year % 100 < year % 100);
+    day += (tm_year - year) / 400
+            + ((tm_year % 400) && tm_year % 400 < year % 400);
+
+    yday = month = 0;
+    while (month < tm->tm_mon) {
+        yday += month_tab[IS_LEAP_YEAR(tm_year)][month];
+        month++;
+    }
+    yday += (tm->tm_mday - 1);
+    if (day + yday < 0)
+        overflow++;
+    day += yday;
+
+    tm->tm_yday = yday;
+    tm->tm_wday = (day + 4) % 7;
+
+    seconds = ((tm->tm_hour * 60L) + tm->tm_min) * 60L + tm->tm_sec;
+
+    if ((TIME_MAX - seconds) / SECS_IN_DAY < day)
+        overflow++;
+    seconds += day * SECS_IN_DAY;
+
+    if (overflow)
+        return (blynk_time_t) -1;
+
+    if ((blynk_time_t) seconds != seconds)
+        return (blynk_time_t) -1;
+    return (blynk_time_t) seconds;
+}

wled00/src/dependencies/blynk/BlynkSimpleEsp.h

@@ -0,0 +1,96 @@
+/**
+ * @file       BlynkSimpleEsp32.h
+ * @author     Volodymyr Shymanskyy
+ * @license    This project is released under the MIT License (MIT)
+ * @copyright  Copyright (c) 2015 Volodymyr Shymanskyy
+ * @date       Oct 2016
+ * @brief
+ *
+ */
+
+#ifndef BlynkSimpleEsp_h
+#define BlynkSimpleEsp_h
+
+#define BLYNK_SEND_ATOMIC
+
+#include "Blynk/BlynkApiArduino.h"
+#include "Blynk/BlynkProtocol.h"
+#include "Blynk/BlynkArduinoClient.h"
+#ifdef ARDUINO_ARCH_ESP32
+#include <WiFi.h>
+#else
+#include <ESP8266WiFi.h>
+#endif
+
+class BlynkWifi
+    : public BlynkProtocol<BlynkArduinoClient>
+{
+    typedef BlynkProtocol<BlynkArduinoClient> Base;
+public:
+    BlynkWifi(BlynkArduinoClient& transp)
+        : Base(transp)
+    {}
+
+    void connectWiFi(const char* ssid, const char* pass)
+    {
+        BLYNK_LOG2(BLYNK_F("Connecting to "), ssid);
+        WiFi.mode(WIFI_STA);
+        if (pass && strlen(pass)) {
+            WiFi.begin(ssid, pass);
+        } else {
+            WiFi.begin(ssid);
+        }
+        while (WiFi.status() != WL_CONNECTED) {
+            BlynkDelay(500);
+        }
+        BLYNK_LOG1(BLYNK_F("Connected to WiFi"));
+
+        IPAddress myip = WiFi.localIP();
+        BLYNK_LOG_IP("IP: ", myip);
+    }
+
+    void config(const char* auth,
+                const char* domain = BLYNK_DEFAULT_DOMAIN,
+                uint16_t    port   = BLYNK_DEFAULT_PORT)
+    {
+        Base::begin(auth);
+        this->conn.begin(domain, port);
+    }
+
+    void config(const char* auth,
+                IPAddress   ip,
+                uint16_t    port = BLYNK_DEFAULT_PORT)
+    {
+        Base::begin(auth);
+        this->conn.begin(ip, port);
+    }
+
+    void begin(const char* auth,
+               const char* ssid,
+               const char* pass,
+               const char* domain = BLYNK_DEFAULT_DOMAIN,
+               uint16_t    port   = BLYNK_DEFAULT_PORT)
+    {
+        connectWiFi(ssid, pass);
+        config(auth, domain, port);
+        while(this->connect() != true) {}
+    }
+
+    void begin(const char* auth,
+               const char* ssid,
+               const char* pass,
+               IPAddress   ip,
+               uint16_t    port   = BLYNK_DEFAULT_PORT)
+    {
+        connectWiFi(ssid, pass);
+        config(auth, ip, port);
+        while(this->connect() != true) {}
+    }
+
+};
+
+static WiFiClient _blynkWifiClient;
+static BlynkArduinoClient _blynkTransport(_blynkWifiClient);
+BlynkWifi Blynk(_blynkTransport);
+
+#endif

wled00/src/dependencies/blynk/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Volodymyr Shymanskyy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+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.

wled00/src/dependencies/e131/E131.cpp

@@ -0,0 +1,82 @@
+/*
+* E131.cpp
+*
+* Project: E131 - E.131 (sACN) library for Arduino
+* Copyright (c) 2015 Shelby Merrick
+* http://www.forkineye.com
+*
+*  This program is provided free for you to use in any way that you wish,
+*  subject to the laws and regulations where you are using it.  Due diligence
+*  is strongly suggested before using this code.  Please give credit where due.
+*
+*  The Author makes no warranty of any kind, express or implied, with regard
+*  to this program or the documentation contained in this document.  The
+*  Author shall not be liable in any event for incidental or consequential
+*  damages in connection with, or arising out of, the furnishing, performance
+*  or use of these programs.
+*
+*/
+
+#include "E131.h"
+#include <string.h>
+
+/* E1.17 ACN Packet Identifier */
+const byte E131::ACN_ID[12] = { 0x41, 0x53, 0x43, 0x2d, 0x45, 0x31, 0x2e, 0x31, 0x37, 0x00, 0x00, 0x00 };
+
+/* Constructor */
+E131::E131() {
+#ifdef NO_DOUBLE_BUFFER
+    memset(pbuff1.raw, 0, sizeof(pbuff1.raw));
+    packet = &pbuff1;
+    pwbuff = packet;
+#else
+    memset(pbuff1.raw, 0, sizeof(pbuff1.raw));
+    memset(pbuff2.raw, 0, sizeof(pbuff2.raw));
+    packet = &pbuff1;
+    pwbuff = &pbuff2;
+#endif
+
+    stats.num_packets = 0;
+    stats.packet_errors = 0;
+}
+
+void E131::initUnicast() {
+    udp.begin(E131_DEFAULT_PORT);
+}
+
+void E131::initMulticast(uint16_t universe, uint8_t n) {
+    IPAddress address = IPAddress(239, 255, ((universe >> 8) & 0xff),
+            ((universe >> 0) & 0xff));
+	#ifdef ARDUINO_ARCH_ESP32
+		ip4_addr_t ifaddr;
+		ip4_addr_t multicast_addr;
+
+		ifaddr.addr = static_cast<uint32_t>(WiFi.localIP());
+		for (uint8_t i = 1; i < n; i++) {
+			multicast_addr.addr = static_cast<uint32_t>(IPAddress(239, 255,
+					(((universe + i) >> 8) & 0xff), (((universe + i) >> 0)
+					& 0xff)));
+			igmp_joingroup(&ifaddr, &multicast_addr);
+		}
+		udp.beginMulticast(address, E131_DEFAULT_PORT);
+	#else
+		ip_addr_t ifaddr;
+		ip_addr_t multicast_addr;
+
+		ifaddr.addr = static_cast<uint32_t>(WiFi.localIP());
+		for (uint8_t i = 1; i < n; i++) {
+			multicast_addr.addr = static_cast<uint32_t>(IPAddress(239, 255,
+					(((universe + i) >> 8) & 0xff), (((universe + i) >> 0)
+					& 0xff)));
+			igmp_joingroup(&ifaddr, &multicast_addr);
+		}
+	  udp.beginMulticast(WiFi.localIP(), address, E131_DEFAULT_PORT);
+	#endif
+}
+
+void E131::begin(e131_listen_t type, uint16_t universe, uint8_t n) {
+    if (type == E131_UNICAST)
+        initUnicast();
+    if (type == E131_MULTICAST)
+        initMulticast(universe, n);
+}

wled00/src/dependencies/e131/E131.h

@@ -0,0 +1,196 @@
+/*
+* E131.h
+*
+* Project: E131 - E.131 (sACN) library for Arduino
+* Copyright (c) 2015 Shelby Merrick
+* http://www.forkineye.com
+*
+*  This program is provided free for you to use in any way that you wish,
+*  subject to the laws and regulations where you are using it.  Due diligence
+*  is strongly suggested before using this code.  Please give credit where due.
+*
+*  The Author makes no warranty of any kind, express or implied, with regard
+*  to this program or the documentation contained in this document.  The
+*  Author shall not be liable in any event for incidental or consequential
+*  damages in connection with, or arising out of, the furnishing, performance
+*  or use of these programs.
+*
+*/
+
+#ifndef E131_H_
+#define E131_H_
+
+#include "Arduino.h"
+
+/* Network interface detection.  WiFi for ESP8266 and Ethernet for AVR */
+#if defined (ARDUINO_ARCH_ESP8266)
+#   include <ESP8266WiFi.h>
+#   define NO_DOUBLE_BUFFER
+#elif defined (ARDUINO_ARCH_ESP32)
+#   include <WiFi.h>
+#endif
+#   include <WiFiUdp.h>
+#   include <lwip/ip_addr.h>
+#   include <lwip/igmp.h>
+#   define _UDP WiFiUDP
+
+/* Defaults */
+#define E131_DEFAULT_PORT 5568
+
+/* E1.31 Packet Offsets */
+#define E131_ROOT_PREAMBLE_SIZE 0
+#define E131_ROOT_POSTAMBLE_SIZE 2
+#define E131_ROOT_ID 4
+#define E131_ROOT_FLENGTH 16
+#define E131_ROOT_VECTOR 18
+#define E131_ROOT_CID 22
+
+#define E131_FRAME_FLENGTH 38
+#define E131_FRAME_VECTOR 40
+#define E131_FRAME_SOURCE 44
+#define E131_FRAME_PRIORITY 108
+#define E131_FRAME_RESERVED 109
+#define E131_FRAME_SEQ 111
+#define E131_FRAME_OPT 112
+#define E131_FRAME_UNIVERSE 113
+
+#define E131_DMP_FLENGTH 115
+#define E131_DMP_VECTOR 117
+#define E131_DMP_TYPE 118
+#define E131_DMP_ADDR_FIRST 119
+#define E131_DMP_ADDR_INC 121
+#define E131_DMP_COUNT 123
+#define E131_DMP_DATA 125
+
+/* E1.31 Packet Structure */
+typedef union {
+    struct {
+        /* Root Layer */
+        uint16_t preamble_size;
+        uint16_t postamble_size;
+        uint8_t  acn_id[12];
+        uint16_t root_flength;
+        uint32_t root_vector;
+        uint8_t  cid[16];
+
+        /* Frame Layer */
+        uint16_t frame_flength;
+        uint32_t frame_vector;
+        uint8_t  source_name[64];
+        uint8_t  priority;
+        uint16_t reserved;
+        uint8_t  sequence_number;
+        uint8_t  options;
+        uint16_t universe;
+
+        /* DMP Layer */
+        uint16_t dmp_flength;
+        uint8_t  dmp_vector;
+        uint8_t  type;
+        uint16_t first_address;
+        uint16_t address_increment;
+        uint16_t property_value_count;
+        uint8_t  property_values[513];
+    } __attribute__((packed));
+
+    uint8_t raw[638];
+} e131_packet_t;
+
+/* Error Types */
+typedef enum {
+    ERROR_NONE,
+    ERROR_IGNORE,
+    ERROR_ACN_ID,
+    ERROR_PACKET_SIZE,
+    ERROR_VECTOR_ROOT,
+    ERROR_VECTOR_FRAME,
+    ERROR_VECTOR_DMP
+} e131_error_t;
+
+/* E1.31 Listener Types */
+typedef enum {
+    E131_UNICAST,
+    E131_MULTICAST
+} e131_listen_t;
+
+/* Status structure */
+typedef struct {
+    uint32_t    num_packets;
+    uint32_t    packet_errors;
+    IPAddress   last_clientIP;
+    uint16_t    last_clientPort;
+} e131_stats_t;
+
+class E131 {
+ private:
+    /* Constants for packet validation */
+    static const uint8_t ACN_ID[];
+    static const uint32_t VECTOR_ROOT = 4;
+    static const uint32_t VECTOR_FRAME = 2;
+    static const uint8_t VECTOR_DMP = 2;
+
+    e131_packet_t   pbuff1;     /* Packet buffer */
+#ifndef NO_DOUBLE_BUFFER
+    e131_packet_t   pbuff2;     /* Double buffer */
+#endif
+    e131_packet_t   *pwbuff;    /* Pointer to working packet buffer */
+    _UDP            udp;        /* UDP handle */
+
+    /* Internal Initializers */
+    void initUnicast();
+    void initMulticast(uint16_t universe, uint8_t n = 1);
+
+ public:
+    uint8_t       *data;                /* Pointer to DMX channel data */
+    uint16_t      universe;             /* DMX Universe of last valid packet */
+    e131_packet_t *packet;              /* Pointer to last valid packet */
+    e131_stats_t  stats;                /* Statistics tracker */
+
+    E131();
+
+    /* Generic UDP listener, no physical or IP configuration */
+    void begin(e131_listen_t type, uint16_t universe = 1, uint8_t n = 1);
+
+    /* Main packet parser */
+    inline uint16_t parsePacket() {
+        e131_error_t error;
+        uint16_t retval = 0;
+
+        int size = udp.parsePacket();
+        if (size) {
+            udp.readBytes(pwbuff->raw, size);
+            error = validate();
+            if (!error) {
+#ifndef NO_DOUBLE_BUFFER
+                e131_packet_t *swap = packet;
+                packet = pwbuff;
+                pwbuff = swap;
+#endif
+                universe = htons(packet->universe);
+                data = packet->property_values + 1;
+                retval = htons(packet->property_value_count) - 1;
+                stats.num_packets++;
+                stats.last_clientIP = udp.remoteIP();
+                stats.last_clientPort = udp.remotePort();
+            }
+        }
+        return retval;
+    }
+
+    /* Packet validater */
+    inline e131_error_t validate() {
+        if (memcmp(pwbuff->acn_id, ACN_ID, sizeof(pwbuff->acn_id)))
+            return ERROR_ACN_ID;
+        if (htonl(pwbuff->root_vector) != VECTOR_ROOT)
+            return ERROR_VECTOR_ROOT;
+        if (htonl(pwbuff->frame_vector) != VECTOR_FRAME)
+            return ERROR_VECTOR_FRAME;
+        if (pwbuff->dmp_vector != VECTOR_DMP)
+            return ERROR_VECTOR_DMP;
+        if (pwbuff->property_values[0] != 0)
+            return ERROR_IGNORE;
+        return ERROR_NONE;
+    }
+};
+
+#endif /* E131_H_ */

wled00/src/dependencies/pubsubclient/LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright (c) 2008-2015 Nicholas O'Leary
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.

wled00/src/dependencies/pubsubclient/PubSubClient.cpp

@@ -0,0 +1,601 @@
+/*
+  PubSubClient.cpp - A simple client for MQTT.
+  Nick O'Leary
+  http://knolleary.net
+*/
+
+#include "PubSubClient.h"
+#include "Arduino.h"
+
+PubSubClient::PubSubClient() {
+    this->_state = MQTT_DISCONNECTED;
+    this->_client = NULL;
+    this->stream = NULL;
+    setCallback(NULL);
+}
+
+PubSubClient::PubSubClient(Client& client) {
+    this->_state = MQTT_DISCONNECTED;
+    setClient(client);
+    this->stream = NULL;
+}
+
+PubSubClient::PubSubClient(IPAddress addr, uint16_t port, Client& client) {
+    this->_state = MQTT_DISCONNECTED;
+    setServer(addr, port);
+    setClient(client);
+    this->stream = NULL;
+}
+PubSubClient::PubSubClient(IPAddress addr, uint16_t port, Client& client, Stream& stream) {
+    this->_state = MQTT_DISCONNECTED;
+    setServer(addr,port);
+    setClient(client);
+    setStream(stream);
+}
+PubSubClient::PubSubClient(IPAddress addr, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client) {
+    this->_state = MQTT_DISCONNECTED;
+    setServer(addr, port);
+    setCallback(callback);
+    setClient(client);
+    this->stream = NULL;
+}
+PubSubClient::PubSubClient(IPAddress addr, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client, Stream& stream) {
+    this->_state = MQTT_DISCONNECTED;
+    setServer(addr,port);
+    setCallback(callback);
+    setClient(client);
+    setStream(stream);
+}
+
+PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, Client& client) {
+    this->_state = MQTT_DISCONNECTED;
+    setServer(ip, port);
+    setClient(client);
+    this->stream = NULL;
+}
+PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, Client& client, Stream& stream) {
+    this->_state = MQTT_DISCONNECTED;
+    setServer(ip,port);
+    setClient(client);
+    setStream(stream);
+}
+PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client) {
+    this->_state = MQTT_DISCONNECTED;
+    setServer(ip, port);
+    setCallback(callback);
+    setClient(client);
+    this->stream = NULL;
+}
+PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client, Stream& stream) {
+    this->_state = MQTT_DISCONNECTED;
+    setServer(ip,port);
+    setCallback(callback);
+    setClient(client);
+    setStream(stream);
+}
+
+PubSubClient::PubSubClient(const char* domain, uint16_t port, Client& client) {
+    this->_state = MQTT_DISCONNECTED;
+    setServer(domain,port);
+    setClient(client);
+    this->stream = NULL;
+}
+PubSubClient::PubSubClient(const char* domain, uint16_t port, Client& client, Stream& stream) {
+    this->_state = MQTT_DISCONNECTED;
+    setServer(domain,port);
+    setClient(client);
+    setStream(stream);
+}
+PubSubClient::PubSubClient(const char* domain, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client) {
+    this->_state = MQTT_DISCONNECTED;
+    setServer(domain,port);
+    setCallback(callback);
+    setClient(client);
+    this->stream = NULL;
+}
+PubSubClient::PubSubClient(const char* domain, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client, Stream& stream) {
+    this->_state = MQTT_DISCONNECTED;
+    setServer(domain,port);
+    setCallback(callback);
+    setClient(client);
+    setStream(stream);
+}
+
+boolean PubSubClient::connect(const char *id) {
+    return connect(id,NULL,NULL,0,0,0,0);
+}
+
+boolean PubSubClient::connect(const char *id, const char *user, const char *pass) {
+    return connect(id,user,pass,0,0,0,0);
+}
+
+boolean PubSubClient::connect(const char *id, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage) {
+    return connect(id,NULL,NULL,willTopic,willQos,willRetain,willMessage);
+}
+
+boolean PubSubClient::connect(const char *id, const char *user, const char *pass, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage) {
+    if (!connected()) {
+        int result = 0;
+
+        if (domain != NULL) {
+            result = _client->connect(this->domain, this->port);
+        } else {
+            result = _client->connect(this->ip, this->port);
+        }
+        if (result == 1) {
+            nextMsgId = 1;
+            // Leave room in the buffer for header and variable length field
+            uint16_t length = 5;
+            unsigned int j;
+
+#if MQTT_VERSION == MQTT_VERSION_3_1
+            uint8_t d[9] = {0x00,0x06,'M','Q','I','s','d','p', MQTT_VERSION};
+#define MQTT_HEADER_VERSION_LENGTH 9
+#elif MQTT_VERSION == MQTT_VERSION_3_1_1
+            uint8_t d[7] = {0x00,0x04,'M','Q','T','T',MQTT_VERSION};
+#define MQTT_HEADER_VERSION_LENGTH 7
+#endif
+            for (j = 0;j<MQTT_HEADER_VERSION_LENGTH;j++) {
+                buffer[length++] = d[j];
+            }
+
+            uint8_t v;
+            if (willTopic) {
+                v = 0x06|(willQos<<3)|(willRetain<<5);
+            } else {
+                v = 0x02;
+            }
+
+            if(user != NULL) {
+                v = v|0x80;
+
+                if(pass != NULL) {
+                    v = v|(0x80>>1);
+                }
+            }
+
+            buffer[length++] = v;
+
+            buffer[length++] = ((MQTT_KEEPALIVE) >> 8);
+            buffer[length++] = ((MQTT_KEEPALIVE) & 0xFF);
+            length = writeString(id,buffer,length);
+            if (willTopic) {
+                length = writeString(willTopic,buffer,length);
+                length = writeString(willMessage,buffer,length);
+            }
+
+            if(user != NULL) {
+                length = writeString(user,buffer,length);
+                if(pass != NULL) {
+                    length = writeString(pass,buffer,length);
+                }
+            }
+
+            write(MQTTCONNECT,buffer,length-5);
+
+            lastInActivity = lastOutActivity = millis();
+
+            while (!_client->available()) {
+                unsigned long t = millis();
+                if (t-lastInActivity >= ((int32_t) MQTT_SOCKET_TIMEOUT*1000UL)) {
+                    _state = MQTT_CONNECTION_TIMEOUT;
+                    _client->stop();
+                    return false;
+                }
+            }
+            uint8_t llen;
+            uint16_t len = readPacket(&llen);
+
+            if (len == 4) {
+                if (buffer[3] == 0) {
+                    lastInActivity = millis();
+                    pingOutstanding = false;
+                    _state = MQTT_CONNECTED;
+                    return true;
+                } else {
+                    _state = buffer[3];
+                }
+            }
+            _client->stop();
+        } else {
+            _state = MQTT_CONNECT_FAILED;
+        }
+        return false;
+    }
+    return true;
+}
+
+// reads a byte into result
+boolean PubSubClient::readByte(uint8_t * result) {
+   uint32_t previousMillis = millis();
+   while(!_client->available()) {
+     uint32_t currentMillis = millis();
+     if(currentMillis - previousMillis >= ((int32_t) MQTT_SOCKET_TIMEOUT * 1000)){
+       return false;
+     }
+   }
+   *result = _client->read();
+   return true;
+}
+
+// reads a byte into result[*index] and increments index
+boolean PubSubClient::readByte(uint8_t * result, uint16_t * index){
+  uint16_t current_index = *index;
+  uint8_t * write_address = &(result[current_index]);
+  if(readByte(write_address)){
+    *index = current_index + 1;
+    return true;
+  }
+  return false;
+}
+
+uint16_t PubSubClient::readPacket(uint8_t* lengthLength) {
+    uint16_t len = 0;
+    if(!readByte(buffer, &len)) return 0;
+    bool isPublish = (buffer[0]&0xF0) == MQTTPUBLISH;
+    uint32_t multiplier = 1;
+    uint16_t length = 0;
+    uint8_t digit = 0;
+    uint16_t skip = 0;
+    uint8_t start = 0;
+
+    do {
+        if (len == 6) {
+            // Invalid remaining length encoding - kill the connection
+            _state = MQTT_DISCONNECTED;
+            _client->stop();
+            return 0;
+        }
+        if(!readByte(&digit)) return 0;
+        buffer[len++] = digit;
+        length += (digit & 127) * multiplier;
+        multiplier *= 128;
+    } while ((digit & 128) != 0);
+    *lengthLength = len-1;
+
+    if (isPublish) {
+        // Read in topic length to calculate bytes to skip over for Stream writing
+        if(!readByte(buffer, &len)) return 0;
+        if(!readByte(buffer, &len)) return 0;
+        skip = (buffer[*lengthLength+1]<<8)+buffer[*lengthLength+2];
+        start = 2;
+        if (buffer[0]&MQTTQOS1) {
+            // skip message id
+            skip += 2;
+        }
+    }
+
+    for (uint16_t i = start;i<length;i++) {
+        if(!readByte(&digit)) return 0;
+        if (this->stream) {
+            if (isPublish && len-*lengthLength-2>skip) {
+                this->stream->write(digit);
+            }
+        }
+        if (len < MQTT_MAX_PACKET_SIZE) {
+            buffer[len] = digit;
+        }
+        len++;
+    }
+
+    if (!this->stream && len > MQTT_MAX_PACKET_SIZE) {
+        len = 0; // This will cause the packet to be ignored.
+    }
+
+    return len;
+}
+
+boolean PubSubClient::loop() {
+    if (connected()) {
+        unsigned long t = millis();
+        if ((t - lastInActivity > MQTT_KEEPALIVE*1000UL) || (t - lastOutActivity > MQTT_KEEPALIVE*1000UL)) {
+            if (pingOutstanding) {
+                this->_state = MQTT_CONNECTION_TIMEOUT;
+                _client->stop();
+                return false;
+            } else {
+                buffer[0] = MQTTPINGREQ;
+                buffer[1] = 0;
+                _client->write(buffer,2);
+                lastOutActivity = t;
+                lastInActivity = t;
+                pingOutstanding = true;
+            }
+        }
+        if (_client->available()) {
+            uint8_t llen;
+            uint16_t len = readPacket(&llen);
+            uint16_t msgId = 0;
+            uint8_t *payload;
+            if (len > 0) {
+                lastInActivity = t;
+                uint8_t type = buffer[0]&0xF0;
+                if (type == MQTTPUBLISH) {
+                    if (callback) {
+                        uint16_t tl = (buffer[llen+1]<<8)+buffer[llen+2]; /* topic length in bytes */
+                        memmove(buffer+llen+2,buffer+llen+3,tl); /* move topic inside buffer 1 byte to front */
+                        buffer[llen+2+tl] = 0; /* end the topic as a 'C' string with \x00 */
+                        char *topic = (char*) buffer+llen+2;
+						
+                        // make sure payload can be interpreted as 'C' string
+						buffer[(len < MQTT_MAX_PACKET_SIZE) ? len : MQTT_MAX_PACKET_SIZE -1] = 0;
+						
+						// msgId only present for QOS>0
+                        if ((buffer[0]&0x06) == MQTTQOS1) {
+                            msgId = (buffer[llen+3+tl]<<8)+buffer[llen+3+tl+1];
+                            payload = buffer+llen+3+tl+2;
+                            callback(topic,payload,len-llen-3-tl-2);
+
+                            buffer[0] = MQTTPUBACK;
+                            buffer[1] = 2;
+                            buffer[2] = (msgId >> 8);
+                            buffer[3] = (msgId & 0xFF);
+                            _client->write(buffer,4);
+                            lastOutActivity = t;
+
+                        } else {
+                            payload = buffer+llen+3+tl;
+                            callback(topic,payload,len-llen-3-tl);
+                        }
+                    }
+                } else if (type == MQTTPINGREQ) {
+                    buffer[0] = MQTTPINGRESP;
+                    buffer[1] = 0;
+                    _client->write(buffer,2);
+                } else if (type == MQTTPINGRESP) {
+                    pingOutstanding = false;
+                }
+            } else if (!connected()) {
+                // readPacket has closed the connection
+                return false;
+            }
+        }
+        return true;
+    }
+    return false;
+}
+
+boolean PubSubClient::publish(const char* topic, const char* payload) {
+    return publish(topic,(const uint8_t*)payload,strlen(payload),false);
+}
+
+boolean PubSubClient::publish(const char* topic, const char* payload, boolean retained) {
+    return publish(topic,(const uint8_t*)payload,strlen(payload),retained);
+}
+
+boolean PubSubClient::publish(const char* topic, const uint8_t* payload, unsigned int plength) {
+    return publish(topic, payload, plength, false);
+}
+
+boolean PubSubClient::publish(const char* topic, const uint8_t* payload, unsigned int plength, boolean retained) {
+    if (connected()) {
+        if (MQTT_MAX_PACKET_SIZE < 5 + 2+strlen(topic) + plength) {
+            // Too long
+            return false;
+        }
+        // Leave room in the buffer for header and variable length field
+        uint16_t length = 5;
+        length = writeString(topic,buffer,length);
+        uint16_t i;
+        for (i=0;i<plength;i++) {
+            buffer[length++] = payload[i];
+        }
+        uint8_t header = MQTTPUBLISH;
+        if (retained) {
+            header |= 1;
+        }
+        return write(header,buffer,length-5);
+    }
+    return false;
+}
+
+boolean PubSubClient::publish_P(const char* topic, const uint8_t* payload, unsigned int plength, boolean retained) {
+    uint8_t llen = 0;
+    uint8_t digit;
+    unsigned int rc = 0;
+    uint16_t tlen;
+    unsigned int pos = 0;
+    unsigned int i;
+    uint8_t header;
+    unsigned int len;
+
+    if (!connected()) {
+        return false;
+    }
+
+    tlen = strlen(topic);
+
+    header = MQTTPUBLISH;
+    if (retained) {
+        header |= 1;
+    }
+    buffer[pos++] = header;
+    len = plength + 2 + tlen;
+    do {
+        digit = len % 128;
+        len = len / 128;
+        if (len > 0) {
+            digit |= 0x80;
+        }
+        buffer[pos++] = digit;
+        llen++;
+    } while(len>0);
+
+    pos = writeString(topic,buffer,pos);
+
+    rc += _client->write(buffer,pos);
+
+    for (i=0;i<plength;i++) {
+        rc += _client->write((char)pgm_read_byte_near(payload + i));
+    }
+
+    lastOutActivity = millis();
+
+    return rc == tlen + 4 + plength;
+}
+
+boolean PubSubClient::write(uint8_t header, uint8_t* buf, uint16_t length) {
+    uint8_t lenBuf[4];
+    uint8_t llen = 0;
+    uint8_t digit;
+    uint8_t pos = 0;
+    uint16_t rc;
+    uint16_t len = length;
+    do {
+        digit = len % 128;
+        len = len / 128;
+        if (len > 0) {
+            digit |= 0x80;
+        }
+        lenBuf[pos++] = digit;
+        llen++;
+    } while(len>0);
+
+    buf[4-llen] = header;
+    for (int i=0;i<llen;i++) {
+        buf[5-llen+i] = lenBuf[i];
+    }
+
+#ifdef MQTT_MAX_TRANSFER_SIZE
+    uint8_t* writeBuf = buf+(4-llen);
+    uint16_t bytesRemaining = length+1+llen;  //Match the length type
+    uint8_t bytesToWrite;
+    boolean result = true;
+    while((bytesRemaining > 0) && result) {
+        bytesToWrite = (bytesRemaining > MQTT_MAX_TRANSFER_SIZE)?MQTT_MAX_TRANSFER_SIZE:bytesRemaining;
+        rc = _client->write(writeBuf,bytesToWrite);
+        result = (rc == bytesToWrite);
+        bytesRemaining -= rc;
+        writeBuf += rc;
+    }
+    return result;
+#else
+    rc = _client->write(buf+(4-llen),length+1+llen);
+    lastOutActivity = millis();
+    return (rc == 1+llen+length);
+#endif
+}
+
+boolean PubSubClient::subscribe(const char* topic) {
+    return subscribe(topic, 0);
+}
+
+boolean PubSubClient::subscribe(const char* topic, uint8_t qos) {
+    if (qos > 1) {
+        return false;
+    }
+    if (MQTT_MAX_PACKET_SIZE < 9 + strlen(topic)) {
+        // Too long
+        return false;
+    }
+    if (connected()) {
+        // Leave room in the buffer for header and variable length field
+        uint16_t length = 5;
+        nextMsgId++;
+        if (nextMsgId == 0) {
+            nextMsgId = 1;
+        }
+        buffer[length++] = (nextMsgId >> 8);
+        buffer[length++] = (nextMsgId & 0xFF);
+        length = writeString((char*)topic, buffer,length);
+        buffer[length++] = qos;
+        return write(MQTTSUBSCRIBE|MQTTQOS1,buffer,length-5);
+    }
+    return false;
+}
+
+boolean PubSubClient::unsubscribe(const char* topic) {
+    if (MQTT_MAX_PACKET_SIZE < 9 + strlen(topic)) {
+        // Too long
+        return false;
+    }
+    if (connected()) {
+        uint16_t length = 5;
+        nextMsgId++;
+        if (nextMsgId == 0) {
+            nextMsgId = 1;
+        }
+        buffer[length++] = (nextMsgId >> 8);
+        buffer[length++] = (nextMsgId & 0xFF);
+        length = writeString(topic, buffer,length);
+        return write(MQTTUNSUBSCRIBE|MQTTQOS1,buffer,length-5);
+    }
+    return false;
+}
+
+void PubSubClient::disconnect() {
+    buffer[0] = MQTTDISCONNECT;
+    buffer[1] = 0;
+    _client->write(buffer,2);
+    _state = MQTT_DISCONNECTED;
+    _client->stop();
+    lastInActivity = lastOutActivity = millis();
+}
+
+uint16_t PubSubClient::writeString(const char* string, uint8_t* buf, uint16_t pos) {
+    const char* idp = string;
+    uint16_t i = 0;
+    pos += 2;
+    while (*idp) {
+        buf[pos++] = *idp++;
+        i++;
+    }
+    buf[pos-i-2] = (i >> 8);
+    buf[pos-i-1] = (i & 0xFF);
+    return pos;
+}
+
+
+boolean PubSubClient::connected() {
+    boolean rc;
+    if (_client == NULL ) {
+        rc = false;
+    } else {
+        rc = (int)_client->connected();
+        if (!rc) {
+            if (this->_state == MQTT_CONNECTED) {
+                this->_state = MQTT_CONNECTION_LOST;
+                _client->flush();
+                _client->stop();
+            }
+        }
+    }
+    return rc;
+}
+
+PubSubClient& PubSubClient::setServer(uint8_t * ip, uint16_t port) {
+    IPAddress addr(ip[0],ip[1],ip[2],ip[3]);
+    return setServer(addr,port);
+}
+
+PubSubClient& PubSubClient::setServer(IPAddress ip, uint16_t port) {
+    this->ip = ip;
+    this->port = port;
+    this->domain = NULL;
+    return *this;
+}
+
+PubSubClient& PubSubClient::setServer(const char * domain, uint16_t port) {
+    this->domain = domain;
+    this->port = port;
+    return *this;
+}
+
+PubSubClient& PubSubClient::setCallback(MQTT_CALLBACK_SIGNATURE) {
+    this->callback = callback;
+    return *this;
+}
+
+PubSubClient& PubSubClient::setClient(Client& client){
+    this->_client = &client;
+    return *this;
+}
+
+PubSubClient& PubSubClient::setStream(Stream& stream){
+    this->stream = &stream;
+    return *this;
+}
+
+int PubSubClient::state() {
+    return this->_state;
+}

wled00/src/dependencies/pubsubclient/PubSubClient.h

@@ -0,0 +1,144 @@
+/*
+ PubSubClient.h - A simple client for MQTT.
+  Nick O'Leary
+  http://knolleary.net
+*/
+
+#ifndef PubSubClient_h
+#define PubSubClient_h
+
+#include <Arduino.h>
+#include "IPAddress.h"
+#include "Client.h"
+#include "Stream.h"
+
+#define MQTT_VERSION_3_1      3
+#define MQTT_VERSION_3_1_1    4
+
+// MQTT_VERSION : Pick the version
+//#define MQTT_VERSION MQTT_VERSION_3_1
+#ifndef MQTT_VERSION
+#define MQTT_VERSION MQTT_VERSION_3_1_1
+#endif
+
+// MQTT_MAX_PACKET_SIZE : Maximum packet size
+#ifndef MQTT_MAX_PACKET_SIZE
+#define MQTT_MAX_PACKET_SIZE 128
+#endif
+
+// MQTT_KEEPALIVE : keepAlive interval in Seconds
+#ifndef MQTT_KEEPALIVE
+#define MQTT_KEEPALIVE 60
+#endif
+
+// MQTT_SOCKET_TIMEOUT: socket timeout interval in Seconds
+#ifndef MQTT_SOCKET_TIMEOUT
+#define MQTT_SOCKET_TIMEOUT 62
+#endif
+
+// MQTT_MAX_TRANSFER_SIZE : limit how much data is passed to the network client
+//  in each write call. Needed for the Arduino Wifi Shield. Leave undefined to
+//  pass the entire MQTT packet in each write call.
+//#define MQTT_MAX_TRANSFER_SIZE 80
+
+// Possible values for client.state()
+#define MQTT_CONNECTION_TIMEOUT     -4
+#define MQTT_CONNECTION_LOST        -3
+#define MQTT_CONNECT_FAILED         -2
+#define MQTT_DISCONNECTED           -1
+#define MQTT_CONNECTED               0
+#define MQTT_CONNECT_BAD_PROTOCOL    1
+#define MQTT_CONNECT_BAD_CLIENT_ID   2
+#define MQTT_CONNECT_UNAVAILABLE     3
+#define MQTT_CONNECT_BAD_CREDENTIALS 4
+#define MQTT_CONNECT_UNAUTHORIZED    5
+
+#define MQTTCONNECT     1 << 4  // Client request to connect to Server
+#define MQTTCONNACK     2 << 4  // Connect Acknowledgment
+#define MQTTPUBLISH     3 << 4  // Publish message
+#define MQTTPUBACK      4 << 4  // Publish Acknowledgment
+#define MQTTPUBREC      5 << 4  // Publish Received (assured delivery part 1)
+#define MQTTPUBREL      6 << 4  // Publish Release (assured delivery part 2)
+#define MQTTPUBCOMP     7 << 4  // Publish Complete (assured delivery part 3)
+#define MQTTSUBSCRIBE   8 << 4  // Client Subscribe request
+#define MQTTSUBACK      9 << 4  // Subscribe Acknowledgment
+#define MQTTUNSUBSCRIBE 10 << 4 // Client Unsubscribe request
+#define MQTTUNSUBACK    11 << 4 // Unsubscribe Acknowledgment
+#define MQTTPINGREQ     12 << 4 // PING Request
+#define MQTTPINGRESP    13 << 4 // PING Response
+#define MQTTDISCONNECT  14 << 4 // Client is Disconnecting
+#define MQTTReserved    15 << 4 // Reserved
+
+#define MQTTQOS0        (0 << 1)
+#define MQTTQOS1        (1 << 1)
+#define MQTTQOS2        (2 << 1)
+
+#ifdef ESP8266
+#include <functional>
+#define MQTT_CALLBACK_SIGNATURE std::function<void(char*, uint8_t*, unsigned int)> callback
+#else
+#define MQTT_CALLBACK_SIGNATURE void (*callback)(char*, uint8_t*, unsigned int)
+#endif
+
+class PubSubClient {
+private:
+   Client* _client;
+   uint8_t buffer[MQTT_MAX_PACKET_SIZE];
+   uint16_t nextMsgId;
+   unsigned long lastOutActivity;
+   unsigned long lastInActivity;
+   bool pingOutstanding;
+   MQTT_CALLBACK_SIGNATURE;
+   uint16_t readPacket(uint8_t*);
+   boolean readByte(uint8_t * result);
+   boolean readByte(uint8_t * result, uint16_t * index);
+   boolean write(uint8_t header, uint8_t* buf, uint16_t length);
+   uint16_t writeString(const char* string, uint8_t* buf, uint16_t pos);
+   IPAddress ip;
+   const char* domain;
+   uint16_t port;
+   Stream* stream;
+   int _state;
+public:
+   PubSubClient();
+   PubSubClient(Client& client);
+   PubSubClient(IPAddress, uint16_t, Client& client);
+   PubSubClient(IPAddress, uint16_t, Client& client, Stream&);
+   PubSubClient(IPAddress, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client);
+   PubSubClient(IPAddress, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client, Stream&);
+   PubSubClient(uint8_t *, uint16_t, Client& client);
+   PubSubClient(uint8_t *, uint16_t, Client& client, Stream&);
+   PubSubClient(uint8_t *, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client);
+   PubSubClient(uint8_t *, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client, Stream&);
+   PubSubClient(const char*, uint16_t, Client& client);
+   PubSubClient(const char*, uint16_t, Client& client, Stream&);
+   PubSubClient(const char*, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client);
+   PubSubClient(const char*, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client, Stream&);
+
+   PubSubClient& setServer(IPAddress ip, uint16_t port);
+   PubSubClient& setServer(uint8_t * ip, uint16_t port);
+   PubSubClient& setServer(const char * domain, uint16_t port);
+   PubSubClient& setCallback(MQTT_CALLBACK_SIGNATURE);
+   PubSubClient& setClient(Client& client);
+   PubSubClient& setStream(Stream& stream);
+
+   boolean connect(const char* id);
+   boolean connect(const char* id, const char* user, const char* pass);
+   boolean connect(const char* id, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage);
+   boolean connect(const char* id, const char* user, const char* pass, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage);
+   void disconnect();
+   boolean publish(const char* topic, const char* payload);
+   boolean publish(const char* topic, const char* payload, boolean retained);
+   boolean publish(const char* topic, const uint8_t * payload, unsigned int plength);
+   boolean publish(const char* topic, const uint8_t * payload, unsigned int plength, boolean retained);
+   boolean publish_P(const char* topic, const uint8_t * payload, unsigned int plength, boolean retained);
+   boolean subscribe(const char* topic);
+   boolean subscribe(const char* topic, uint8_t qos);
+   boolean unsubscribe(const char* topic);
+   boolean loop();
+   boolean connected();
+   int state();
+};
+
+
+#endif

wled00/src/dependencies/time/Time.cpp

@@ -281,9 +281,9 @@ void setTime(time_t t) {
   nextSyncTime = (uint32_t)t + syncInterval;
   Status = timeSet;
   prevMillis = millis();  // restart counting from now (thanks to Korman for this fix)
-} 
+}
 
-void setTime(int hr,int min,int sec,int dy, int mnth, int yr){
+time_t getUnixTime(int hr,int min,int sec,int dy, int mnth, int yr){
  // year can be given as full four digit year or two digts (2010 or 10 for 2010);  
  //it is converted to years since 1970
   if( yr > 99)
@@ -296,7 +296,11 @@ void setTime(int hr,int min,int sec,int dy, int mnth, int yr){
   tm.Hour = hr;
   tm.Minute = min;
   tm.Second = sec;
-  setTime(makeTime(tm));
+  return makeTime(tm);
+}
+
+void setTime(int hr,int min,int sec,int dy, int mnth, int yr){
+ setTime(getUnixTime(hr,min,sec,dy,mnth,yr));
 }
 
 void adjustTime(long adjustment) {

wled00/src/dependencies/time/TimeLib.h

@@ -120,6 +120,7 @@ int     year(time_t t);    // the year for the given time
 time_t now();              // return the current time as seconds since Jan 1 1970 
 void    setTime(time_t t);
 void    setTime(int hr,int min,int sec,int day, int month, int yr);
+time_t	getUnixTime(int hr,int min,int sec,int day, int month, int yr); //added by Aircoookie to get epoch time
 void    adjustTime(long adjustment);
 
 /* date strings */ 

wled00/src/dependencies/timezone/Timezone.h

@@ -27,12 +27,11 @@ enum month_t {Jan=1, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec};
 //or when standard time begins.
 struct TimeChangeRule
 {
-    char abbrev[6];    //five chars max
     uint8_t week;      //First, Second, Third, Fourth, or Last week of the month
     uint8_t dow;       //day of week, 1=Sun, 2=Mon, ... 7=Sat
     uint8_t month;     //1=Jan, 2=Feb, ... 12=Dec
     uint8_t hour;      //0-23
-    int offset;        //offset from UTC in minutes
+    int16_t offset;        //offset from UTC in minutes
 };
         
 class Timezone

wled00/src/dependencies/webserver/ESP8266HTTPUpdateServer.cpp

@@ -15,7 +15,7 @@ const char* ESP8266HTTPUpdateServer::_serverIndex =
 R"(<html><head><script>function B(){window.history.back()}</script></head><body><h2>WLED Software Update</h2><br>Get the latest binaries on the <a href="https://github.com/Aircoookie/WLED/tree/master/bin">project GitHub page</a>!<br>
 <i>Unsure which binary is correct? Go to the <a href="./build">/build subpage</a> for the details of this version.</i><br>
 <b>Be sure to upload a valid .bin file for your ESP! Otherwise you'll need USB recovery!</b><br>
-<br><br><button onclick="B()\">Back</button><br><br>
+<br><br><button onclick='B()'>Back</button><br><br>
 <form method='POST' action='' enctype='multipart/form-data'>
 <input type='file' name='update'>
 <input type='submit' value='Update!'>

wled00/src/dependencies/webserver/WebServer.cpp

@@ -90,8 +90,8 @@ WebServer::~WebServer() {
 void WebServer::begin() {
   _currentStatus = HC_NONE;
   _server.begin();
-  if(!_headerKeysCount)
-    collectHeaders(0, 0);
+  //if(!_headerKeysCount)
+    //collectHeaders(0, 0);
 }
 
 bool WebServer::authenticate(const char * username, const char * password){
@@ -408,15 +408,13 @@ String WebServer::header(String name) {
   return String();
 }
 
-void WebServer::collectHeaders(const char* headerKeys[], const size_t headerKeysCount) {
-  _headerKeysCount = headerKeysCount + 1;
-  if (_currentHeaders)
-     delete[]_currentHeaders;
-  _currentHeaders = new RequestArgument[_headerKeysCount];
+//Modified by Aircoookie to work for WLED
+void WebServer::collectHeaders(String headerKey) {
+  _headerKeysCount = 2;
+  if (_currentHeaders) delete[]_currentHeaders;
+  _currentHeaders = new RequestArgument[2];
   _currentHeaders[0].key = AUTHORIZATION_HEADER;
-  for (int i = 1; i < _headerKeysCount; i++){
-    _currentHeaders[i].key = headerKeys[i-1];
-  }
+  _currentHeaders[1].key = headerKey;
 }
 
 String WebServer::header(int i) {

wled00/src/dependencies/webserver/WebServer.h

@@ -105,7 +105,7 @@ public:
   String argName(int i);          // get request argument name by number
   int args();                     // get arguments count
   bool hasArg(String name);       // check if argument exists
-  void collectHeaders(const char* headerKeys[], const size_t headerKeysCount); // set the request headers to collect
+  void collectHeaders(String headerKey); // set the request headers to collect
   String header(String name);      // get request header value by name
   String header(int i);              // get request header value by number
   String headerName(int i);          // get request header name by number

wled00/wled00.ino

@@ -1,282 +1,412 @@
 /*
- * Main sketch
+ * Main sketch, global variable declarations
  */
 /*
  * @title WLED project sketch
- * @version 0.5.0
+ * @version 0.8.0
  * @author Christian Schwinne
  */
 
+//ESP8266-01 got too little storage space to work with all features of WLED. To use it, you must use ESP8266 Arduino Core v2.3.0 and the setting 512K(64K SPIFFS).
+//Uncomment the following line to disable some features (currently Mobile UI, welcome page and single digit + cronixie overlays) to compile for ESP8266-01
+//#define WLED_FLASH_512K_MODE
+//CURRENTLY NOT WORKING
+
+
+//library inclusions
 #include <Arduino.h>
 #ifdef ARDUINO_ARCH_ESP32
 #include <WiFi.h>
 #include <ESPmDNS.h>
 #include "src/dependencies/webserver/WebServer.h"
+#include <HTTPClient.h>
 #else
 #include <ESP8266WiFi.h>
 #include <ESP8266mDNS.h>
 #include <ESP8266WebServer.h>
+#include <ESP8266HTTPClient.h>
 #endif
+
 #include <EEPROM.h>
 #include <ArduinoOTA.h>
 #include <WiFiUDP.h>
+#include <DNSServer.h>
 #include "src/dependencies/webserver/ESP8266HTTPUpdateServer.h"
 #include "src/dependencies/time/Time.h"
 #include "src/dependencies/time/TimeLib.h"
 #include "src/dependencies/timezone/Timezone.h"
+#include "src/dependencies/blynk/BlynkSimpleEsp.h"
+#include "src/dependencies/e131/E131.h"
+#include "src/dependencies/pubsubclient/PubSubClient.h"
 #include "htmls00.h"
 #include "htmls01.h"
 #include "htmls02.h"
 #include "WS2812FX.h"
 
-//version in format yymmddb (b = daily build)
-#define VERSION 1802222
-const String versionString = "0.5.0";
 
-//AP and OTA default passwords (change them!)
-String appass = "wled1234";
-String otapass = "wledota";
+//version code in format yymmddb (b = daily build)
+#define VERSION 1810151
+char versionString[] = "0.8.0";
 
-//If you have an RGBW strip, also uncomment first line in WS2812FX.h!
-bool useRGBW = false;
 
-//overlays, needed for clocks etc.
-#define USEOVERLAYS
+//AP and OTA default passwords (for maximum change them!)
+char apPass[65] = "wled1234";
+char otaPass[33] = "wledota";
+
+
+//to toggle usb serial debug (un)comment following line(s)
+//#define DEBUG
 
-//support for the CRONIXIE clock by Diamex (disable overlays!)
-//#define CRONIXIE
 
 //spiffs FS only useful for debug (only ESP8266)
 //#define USEFS
 
-//to toggle usb serial debug (un)comment following line
-//#define DEBUG
 
-//Hardware-settings (only changeble via code)
-#define LEDCOUNT 255 //maximum, exact count set-able via settings
-uint8_t buttonPin = 0; //needs pull-up
-uint8_t auxPin = 15; //use e.g. for external relay
-uint8_t auxDefaultState = 0; //0: input 1: high 2: low
-uint8_t auxTriggeredState = 0; //0: input 1: high 2: low
+//Hardware CONFIG (only changeble HERE, not at runtime)
+//LED strip pin changeable in NpbWrapper.h. Only change for ESP32
+byte buttonPin = 0;                           //needs pull-up
+byte auxPin = 15;                             //debug feature, use e.g. for external relay with API call AX=
+byte auxDefaultState   = 0;                   //0: input 1: high 2: low
+byte auxTriggeredState = 0;                   //0: input 1: high 2: low
+char ntpServerName[] = "0.wled.pool.ntp.org"; //NTP server to use
 
-TimeChangeRule CEST = {"CEST", Last, Sun, Mar, 2, 120};     //Central European Summer Time
-TimeChangeRule CET = {"CET ", Last, Sun, Oct, 3, 60};       //Central European Standard Time
-Timezone TZ(CEST, CET);
-TimeChangeRule *tcr;        //pointer to the time change rule, use to get the TZ abbrev
-time_t local;
 
-//cronixie defaults
-#ifdef CRONIXIE
-#undef LEDCOUNT
-#define LEDCOUNT 60
-uint8_t ledcount = 6;
-String apssid = "CRONIXIE-AP";
-String alexaInvocationName = "Clock";
-char cronixieDefault[] = "HHMMSS";
-long cronixieRefreshMs = 497;
-unsigned long cronixieRefreshedTime;
-byte dP[]{0,0,0,0,0,0};
-bool cronixieUseAMPM = false;
-bool cronixieBacklight = true;
-bool cronixieCountdown = false;
-bool ntpEnabled = true;
-#endif
+//WiFi CONFIG (all these can be changed via web UI, no need to set them here)
+char clientSSID[33] = "Your_Network";
+char clientPass[65] = "";
+char cmDNS[33] = "led";                       //mDNS address (x.local), only for Apple and Windows, if Bonjour installed
+char apSSID[65] = "";                         //AP off by default (unless setup)
+byte apChannel = 1;                           //2.4GHz WiFi AP channel (1-13)
+byte apHide = 0;                              //hidden AP SSID
+byte apWaitTimeSecs = 32;                     //time to wait for connection before opening AP
+bool recoveryAPDisabled = false;              //never open AP (not recommended)
+IPAddress staticIP(0, 0, 0, 0);               //static IP of ESP
+IPAddress staticGateway(0, 0, 0, 0);          //gateway (router) IP
+IPAddress staticSubnet(255, 255, 255, 0);     //most common subnet in home networks
+IPAddress staticDNS(8, 8, 8, 8);              //only for NTP, google DNS server
 
-//Default CONFIG
-String serverDescription = versionString;
-uint8_t currentTheme = 0;
-String clientssid = "Your_Network_Here";
-String clientpass = "Dummy_Pass";
-String cmdns = "led";
-#ifndef CRONIXIE
-uint8_t ledcount = 100;
-String apssid = "WLED-AP";
-#endif
-uint8_t apchannel = 1;
-uint8_t aphide = 0;
-uint8_t apWaitTimeSecs = 32;
-boolean recoveryAPDisabled = false;
-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 turnOnAtBoot = true;
-uint8_t bootPreset = 0;
-byte col_s[]{255, 159, 0};
-byte col_sec_s[]{0, 0, 0};
-byte white_s = 0;
-byte white_sec_s = 0;
-byte bri_s = 127;
-uint8_t nightlightTargetBri = 0, bri_nl_t;
-bool fadeTransition = true;
-bool sweepTransition = false, sweepDirection = true;
-uint16_t transitionDelay = 1200;
-bool otaLock = false, wifiLock = false;
-bool aOtaEnabled = true;
-bool onlyAP = false;
+
+//LED CONFIG
+uint16_t ledCount = 10;                       //lowered to prevent accidental overcurrent                      
+bool useRGBW = false;                         //SK6812 strips can contain an extra White channel
+bool autoRGBtoRGBW = false;                   //if RGBW enabled, calculate White channel from RGB
+bool turnOnAtBoot  = true;                    //turn on LEDs at power-up
+byte bootPreset = 0;                          //save preset to load after power-up
+
+byte colS[]{255, 159, 0};                     //default RGB color
+byte colSecS[]{0, 0, 0};                      //default RGB secondary color
+byte whiteS = 0;                              //default White channel
+byte whiteSecS = 0;                           //default secondary White channel
+byte briS = 127;                              //default brightness
+byte effectDefault = 0;                   
+byte effectSpeedDefault = 75;
+byte effectIntensityDefault = 128;            //intensity is supported on some effects as an additional parameter (e.g. for blink you can change the duty cycle)
+byte effectPaletteDefault = 0;                //palette is supported on the FastLED effects, otherwise it has no effect
+
+bool useGammaCorrectionBri = false;           //gamma correct brightness (not recommended)
+bool useGammaCorrectionRGB = true;            //gamma correct colors (strongly recommended)
+
+byte nightlightTargetBri = 0;                 //brightness after nightlight is over
+byte nightlightDelayMins = 60;
+bool nightlightFade = true;                   //if enabled, light will gradually dim towards the target bri. Otherwise, it will instantly set after delay over
+bool fadeTransition = true;                   //enable crossfading color transition
+bool enableSecTransition = true;              //also enable transition for secondary color
+uint16_t transitionDelay = 900;              //default crossfade duration in ms
+
+bool reverseMode  = false;                    //flip entire LED strip (reverses all effect directions)
+bool initLedsLast = false;                    //turn on LEDs only after WiFi connected/AP open
+bool skipFirstLed = false;                    //ignore first LED in strip (useful if you need the LED as signal repeater)
+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)
+
+
+//User Interface CONFIG
+char serverDescription[33] = "WLED Light";    //Name of module
+byte currentTheme = 0;                        //UI theme index for settings and classic UI
+byte uiConfiguration = 0;                     //0: automatic (depends on user-agent) 1: classic UI 2: mobile UI
+bool useHSB = true;                           //classic UI: use HSB sliders instead of RGB by default
+char cssFont[33] = "Verdana";                 //font to use in classic UI
+
+bool useHSBDefault = useHSB;
+
+
+//Sync CONFIG
 bool buttonEnabled = true;
-bool notifyDirect = true, notifyButton = true, notifyDirectDefault = true, alexaNotify = false, macroNotify = false;
-bool receiveNotifications = true, receiveNotificationBrightness = true, receiveNotificationColor = true, receiveNotificationEffects = true;
-uint8_t briMultiplier = 100;
-uint8_t nightlightDelayMins = 60;
-bool nightlightFade = true;
-uint16_t udpPort = 21324;
-uint8_t effectDefault = 0;
-uint8_t effectSpeedDefault = 75;
-uint8_t effectIntensityDefault = 128;
-//NTP stuff
-#ifndef CRONIXIE
-boolean ntpEnabled = false;
-#endif
-IPAddress ntpServerIP;
-const char* ntpServerName = "pool.ntp.org";
-//custom chase
-uint8_t cc_numPrimary = 2;
-uint8_t cc_numSecondary = 4;
-uint8_t cc_index1 = 0;
-uint8_t cc_index2 = ledcount -1;
-bool cc_fromStart = true, cc_fromEnd = false;
-uint8_t cc_step = 1;
-uint8_t cc_start = 0;
 
-//alexa
-boolean alexaEnabled = true;
-#ifndef CRONIXIE
-String alexaInvocationName = "Light";
-#endif
-uint8_t alexaOnMacro = 255, alexaOffMacro = 255;
-uint8_t buttonMacro = 255, countdownMacro = 255;
+uint16_t udpPort    = 21324;                  //WLED notifier default port
+uint16_t udpRgbPort = 19446;                  //Hyperion port
 
-unsigned long countdownTime = 1514764800L;
+bool receiveNotificationBrightness = true;    //apply brightness from incoming notifications
+bool receiveNotificationColor      = true;    //apply color
+bool receiveNotificationEffects    = true;    //apply effects setup
+bool notifyDirect =  true;                    //send notification if change via UI or HTTP API
+bool notifyButton =  true;                     
+bool notifyAlexa  = false;                    //send notification if updated via Alexa
+bool notifyMacro  = false;                    //send notification for macro
+bool notifyHue    =  true;                    //send notification if Hue light changes
+bool notifyTwice  = false;                    //notifications use UDP: enable if devices don't sync reliably
 
-double transitionResolution = 0.011;
+bool alexaEnabled = true;                     //enable device discovery by Amazon Echo
+char alexaInvocationName[33] = "Light";       //speech control name of device. Choose something voice-to-text can understand
 
-//Internal vars
-byte col[]{0, 0, 0};
-byte col_old[]{0, 0, 0};
-byte col_t[]{0, 0, 0};
-byte col_it[]{0, 0, 0};
-byte col_sec[]{0, 0, 0};
-byte col_sec_it[]{0, 0, 0};
-byte white, white_old, white_t, white_it;
-byte white_sec, white_sec_it;
-uint8_t lastRandomIndex = 0;
+char blynkApiKey[36] = "";                    //Auth token for Blynk server. If empty, no connection will be made
+
+uint16_t realtimeTimeoutMs = 2500;            //ms timeout of realtime mode before returning to normal mode
+int  arlsOffset = 0;                          //realtime LED offset
+bool receiveDirect    =  true;                //receive UDP realtime
+bool enableRealtimeUI = false;                //web UI accessible during realtime mode (works on ESP32, lags out ESP8266)
+bool arlsDisableGammaCorrection = true;       //activate if gamma correction is handled by the source
+bool arlsForceMaxBri = false;                 //enable to force max brightness if source has very dark colors that would be black
+
+bool e131Enabled = true;                      //settings for E1.31 (sACN) protocol
+uint16_t e131Universe = 1;
+bool e131Multicast = false;
+
+char mqttDeviceTopic[33] = "";                //main MQTT topic (individual per device, default is wled/mac)
+char mqttGroupTopic[33] = "wled/all";         //second MQTT topic (for example to group devices)
+char mqttServer[33] = "";                     //both domains and IPs should work (no SSL)
+
+bool huePollingEnabled = false;               //poll hue bridge for light state
+uint16_t huePollIntervalMs = 2500;            //low values (< 1sec) may cause lag but offer quicker response
+char hueApiKey[47] = "api";                   //key token will be obtained from bridge
+byte huePollLightId = 1;                      //ID of hue lamp to sync to. Find the ID in the hue app ("about" section)
+IPAddress hueIP = (0,0,0,0);                  //IP address of the bridge
+bool hueApplyOnOff = true;
+bool hueApplyBri   = true;
+bool hueApplyColor = true;
+
+
+//Time CONFIG
+bool ntpEnabled = false;                      //get internet time. Only required if you use clock overlays or time-activated macros
+bool useAMPM = false;                         //12h/24h clock format
+byte currentTimezone = 0;                     //Timezone ID. Refer to timezones array in wled10_ntp.ino
+int  utcOffsetSecs   = 0;                     //Seconds to offset from UTC before timzone calculation
+
+byte overlayDefault = 0;                      //0: no overlay 1: analog clock 2: single-digit clocl 3: cronixie
+byte overlayMin = 0, overlayMax = ledCount-1; //boundaries of overlay mode
+
+byte analogClock12pixel = 0;                  //The pixel in your strip where "midnight" would be
+bool analogClockSecondsTrail = false;         //Display seconds as trail of LEDs instead of a single pixel
+bool analogClock5MinuteMarks = false;         //Light pixels at every 5-minute position
+
+char cronixieDisplay[7] = "HHMMSS";           //Cronixie Display mask. See wled13_cronixie.ino
+bool cronixieBacklight = true;                //Allow digits to be back-illuminated
+
+bool countdownMode = false;                   //Clock will count down towards date
+byte countdownYear = 19, countdownMonth = 1;  //Countdown target date, year is last two digits
+byte countdownDay  =  1, countdownHour  = 0;
+byte countdownMin  =  0, countdownSec   = 0;
+
+
+byte macroBoot = 0;                           //macro loaded after startup
+byte macroNl = 0;                             //after nightlight delay over
+byte macroCountdown = 0;                      
+byte macroAlexaOn = 0, macroAlexaOff = 0;
+byte macroButton = 0, macroLongPress = 0;
+
+
+//Security CONFIG
+bool otaLock = false;                         //prevents OTA firmware updates without password. ALWAYS enable if system exposed to any public networks
+bool wifiLock = false;                        //prevents access to WiFi settings when OTA lock is enabled
+bool aOtaEnabled = true;                      //ArduinoOTA allows easy updates directly from the IDE. Careful, it does not auto-disable when OTA lock is on
+
+
+uint16_t userVar0 = 0, userVar1 = 0;
+
+
+
+//internal global variable declarations
+//color
+byte col[]{255, 159, 0};                      //target RGB color
+byte colOld[]{0, 0, 0};                       //color before transition
+byte colT[]{0, 0, 0};                         //current color
+byte colIT[]{0, 0, 0};                        //color that was last sent to LEDs
+byte colSec[]{0, 0, 0};
+byte colSecT[]{0, 0, 0};
+byte colSecOld[]{0, 0, 0};
+byte colSecIT[]{0, 0, 0};
+byte white = whiteS, whiteOld, whiteT, whiteIT;
+byte whiteSec = whiteSecS, whiteSecOld, whiteSecT, whiteSecIT;
+
+byte lastRandomIndex = 0;                     //used to save last random color so the new one is not the same
+
+//transitions
+bool transitionActive = false;
+uint16_t transitionDelayDefault = transitionDelay;
+uint16_t transitionDelayTemp = transitionDelay;
 unsigned long transitionStartTime;
-unsigned long nightlightStartTime;
-float tper_last = 0;
-byte bri = 0;
-byte bri_old = 0;
-byte bri_t = 0;
-byte bri_it = 0;
-byte bri_last = 127;
-boolean transitionActive = false;
-boolean buttonPressedBefore = false;
-long buttonPressedTime = 0;
-boolean nightlightActive = false;
-boolean nightlightActive_old = false;
-int nightlightDelayMs;
-uint8_t effectCurrent = 0;
-uint8_t effectSpeed = 75;
-uint8_t effectIntensity = 128;
-boolean udpConnected = false;
-byte udpIn[1026];
-String cssCol[]={"","","","","",""};
-String cssFont="Verdana";
-String cssColorString="";
-//NTP stuff
-boolean ntpConnected = false;
-unsigned int ntpLocalPort = 2390;
-const int NTP_PACKET_SIZE = 48; 
-byte ntpPacketBuffer[NTP_PACKET_SIZE];
-unsigned long ntpLastSyncTime = 999000000L;
-unsigned long ntpPacketSentTime = 999000000L;
-const unsigned long seventyYears = 2208988800UL;
+float tperLast = 0;                           //crossfade transition progress, 0.0f - 1.0f
 
-//overlay stuff
-uint8_t overlayDefault = 0;
-uint8_t overlayCurrent = 0;
-#ifdef USEOVERLAYS
-int overlayMin = 0, overlayMax = 79; //bb: 35, 46, t: 0, 79
-int analogClock12pixel = 25; //bb: 41, t: 25
-bool overlayDimBg = true;
-boolean analogClockSecondsTrail = false;
-boolean analogClock5MinuteMarks = false;
-boolean nixieClockDisplaySeconds = false;
-boolean nixieClock12HourFormat = false;
-boolean overlayReverse = true;
-uint8_t overlaySpeed = 200;
-long overlayRefreshMs = 200;
+//nightlight
+bool nightlightActive = false;
+bool nightlightActiveOld = false;
+uint32_t nightlightDelayMs = 10;
+unsigned long nightlightStartTime;
+byte briNlT = 0;                              //current nightlight brightness
+
+//brightness
+byte bri = briS;
+byte briOld = 0;
+byte briT = 0;
+byte briIT = 0;
+byte briLast = 127;                           //brightness before turned off. Used for toggle function
+
+//button
+bool buttonPressedBefore = false;
+unsigned long buttonPressedTime = 0;
+
+//notifications
+bool notifyDirectDefault = notifyDirect;
+bool receiveNotifications = true;
+unsigned long notificationSentTime = 0;
+byte notificationSentCallMode = 0;
+bool notificationTwoRequired = false;
+
+//effects
+byte effectCurrent = effectDefault;
+byte effectSpeed = effectSpeedDefault;
+byte effectIntensity = effectIntensityDefault;
+byte effectPalette = effectPaletteDefault;
+
+//network
+bool onlyAP = false;                          //only Access Point active, no connection to home network
+bool udpConnected = false, udpRgbConnected = false;
+
+//ui style
+char cssCol[6][9]={"","","","","",""};
+String cssColorString="";
+bool showWelcomePage = false;
+
+//hue
+char hueError[25] = "Inactive";
+uint16_t hueFailCount = 0;
+float hueXLast=0, hueYLast=0;
+uint16_t hueHueLast=0, hueCtLast=0;
+byte hueSatLast=0, hueBriLast=0;
+unsigned long hueLastRequestSent = 0;
+unsigned long huePollIntervalMsTemp = huePollIntervalMs;
+bool hueAttempt = false;
+
+//overlays
+byte overlayCurrent = overlayDefault;
+byte overlaySpeed = 200;
+unsigned long overlayRefreshMs = 200;
 unsigned long overlayRefreshedTime;
 int overlayArr[6];
-int overlayDur[6];
-int overlayPauseDur[6];
+uint16_t overlayDur[6];
+uint16_t overlayPauseDur[6];
 int nixieClockI = -1;
-boolean nixiePause;
-#endif
+bool nixiePause = false;
+
+//cronixie
+byte dP[]{0,0,0,0,0,0};
+bool cronixieInit = false;
+
+//countdown
+unsigned long countdownTime = 1514764800L;
 bool countdownOverTriggered = true;
 
-int arlsTimeoutMillis = 2500;
-boolean arlsTimeout = false;
-long arlsTimeoutTime;
-boolean arlsSign = true;
-uint8_t auxTime = 0;
-unsigned long auxStartTime;
-boolean auxActive, auxActiveBefore;
-boolean showWelcomePage = false;
+//timer
+byte lastTimerMinute = 0;
+byte timerHours[]   = {0,0,0,0,0,0,0,0};
+byte timerMinutes[] = {0,0,0,0,0,0,0,0};
+byte timerMacro[]   = {0,0,0,0,0,0,0,0};
+byte timerWeekday[] = {255,255,255,255,255,255,255,255}; //weekdays to activate on
+//bit pattern of arr elem: 0b11111111: sat,fri,thu,wed,tue,mon,sun,validity
 
-boolean useGammaCorrectionBri = false;
-boolean useGammaCorrectionRGB = true;
-int arlsOffset = -22; //10: -22 assuming arls52
+//blynk
+bool blynkEnabled = false;
+
+//preset cycling
+bool presetCyclingEnabled = false;
+byte presetCycleMin = 1, presetCycleMax = 5;
+uint16_t presetCycleTime = 1250;
+unsigned long presetCycledTime = 0; byte presetCycCurr = presetCycleMin;
+bool presetApplyBri = true, presetApplyCol = true, presetApplyFx = true;
+bool saveCurrPresetCycConf = false;
+
+//realtime
+bool realtimeActive = false;
+IPAddress realtimeIP = (0,0,0,0);
+unsigned long realtimeTimeout = 0;
+
+//mqtt
+bool mqttInit = false;
+long lastMQTTReconnectAttempt = 0;
+long lastInterfaceUpdate = 0;
+byte interfaceUpdateCallMode = 0;
+uint32_t mqttFailedConAttempts = 0;
+
+//auxiliary debug pin
+byte auxTime = 0;
+unsigned long auxStartTime = 0;
+bool auxActive = false, auxActiveBefore = false;
 
 //alexa udp
-WiFiUDP UDP;
+WiFiUDP alexaUDP;
 IPAddress ipMulti(239, 255, 255, 250);
 unsigned int portMulti = 1900;
-char packetBuffer[255];
 String escapedMac;
 
+//dns server
+DNSServer dnsServer;
+bool dnsActive = false;
+
+//network time
+bool ntpConnected = false;
+time_t local = 0;
+unsigned long ntpLastSyncTime = 999000000L;
+unsigned long ntpPacketSentTime = 999000000L;
+IPAddress ntpServerIP;
+unsigned int ntpLocalPort = 2390;
+#define NTP_PACKET_SIZE 48
+
+//string temp buffer
+#define OMAX 1750
+char obuf[OMAX];
+uint16_t olen = 0;
+
+//server library objects
 #ifdef ARDUINO_ARCH_ESP32
 WebServer server(80);
 #else
 ESP8266WebServer server(80);
 #endif
+HTTPClient* hueClient = NULL;
+WiFiClient* mqttTCPClient = NULL;
+PubSubClient* mqtt = NULL;
+
 ESP8266HTTPUpdateServer httpUpdater;
-WiFiUDP notifierUdp;
+
+//udp interface objects
+WiFiUDP notifierUdp, rgbUdp;
 WiFiUDP ntpUdp;
+E131* e131;
 
-WS2812FX strip = WS2812FX(LEDCOUNT);
-
-//eeprom Version code, enables default settings instead of 0 init on update
-#define EEPVER 4
-//0 -> old version, default
-//1 -> 0.4p 1711272 and up
-//2 -> 0.4p 1711302 and up
-//3 -> 0.4  1712121 and up
-//4 -> 0.5.0 and up
+//led fx library object
+WS2812FX strip = WS2812FX();
 
+//debug macros
 #ifdef DEBUG
  #define DEBUG_PRINT(x)  Serial.print (x)
  #define DEBUG_PRINTLN(x) Serial.println (x)
  #define DEBUG_PRINTF(x) Serial.printf (x)
+ unsigned long debugTime = 0;
+ int lastWifiState = 3;
+ unsigned long wifiStateChangedTime = 0;
 #else
  #define DEBUG_PRINT(x)
  #define DEBUG_PRINTLN(x)
  #define DEBUG_PRINTF(x)
 #endif
 
+//filesystem
 #ifdef USEFS
 #include <FS.h>;
 File fsUploadFile;
 #endif
 
-#ifdef DEBUG
-long debugTime = 0;
-int lastWifiState = 3;
-long wifiStateChangedTime = 0;
-#endif
-
-const uint8_t gamma8[] = {
+//gamma 2.4 lookup table used for color correction
+const byte gamma8[] = {
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,
     1,  1,  1,  1,  1,  1,  1,  1,  1,  2,  2,  2,  2,  2,  2,  2,
@@ -296,50 +426,81 @@ const uint8_t gamma8[] = {
 
 String txd = "Please disable OTA Lock in security settings!";
 
+//function prototypes
 void serveMessage(int,String,String,int=255);
 
-void down()
-{
-  bri_t = 0;
-  setAllLeds();
-  DEBUG_PRINTLN("MODULE TERMINATED");
-  while (1) {delay(1000);}
-}
 
+//turns all LEDs off and restarts ESP
 void reset()
 {
-  bri_t = 0;
+  briT = 0;
   setAllLeds();
   DEBUG_PRINTLN("MODULE RESET");
   ESP.restart();
 }
 
+
+//append new c string to temp buffer efficiently
+bool oappend(char* txt)
+{
+  uint16_t len = strlen(txt);
+  if (olen + len >= OMAX) return false; //buffer full
+  strcpy(obuf + olen, txt);
+  olen += len;
+  return true;
+}
+
+
+//append new number to temp buffer efficiently
+bool oappendi(int i)
+{
+  char s[11]; 
+  sprintf(s,"%ld", i);
+  return oappend(s);
+}
+
+
+//boot starts here
 void setup() {
     wledInit();
 }
 
+
+//main program loop
 void loop() {
     server.handleClient();
+    handleSerial();
     handleNotifications();
     handleTransitions();
+    userLoop();
+    
     yield();
     handleButton();
     handleNetworkTime();
-    if (!otaLock && aOtaEnabled) ArduinoOTA.handle();
-    #ifdef CRONIXIE
-    handleCronixie();
-    #endif
-    handleAlexa();
-    if (!arlsTimeout) //block stuff if WARLS is enabled
+    if (!onlyAP)
     {
-      handleNightlight();
-    #ifdef USEOVERLAYS
-      handleOverlays();
-    #endif
-      if (bri_t) strip.service(); //do not update strip if off, prevents flicker on ESP32
+      handleAlexa();
+      handleMQTT();
     }
     
-    //DEBUG
+    handleOverlays();
+
+    yield();
+    
+    
+    if (!realtimeActive) //block stuff if WARLS/Adalight is enabled
+    {
+      if (dnsActive) dnsServer.processNextRequest();
+      if (aOtaEnabled) ArduinoOTA.handle();
+      handleNightlight();
+      if (!onlyAP) {
+        handleHue();
+        handleBlynk();
+      }
+      if (briT) strip.service(); //do not update strip if off, prevents flicker on ESP32
+    }
+    
+    //DEBUG serial logging
     #ifdef DEBUG
     if (millis() - debugTime > 5000)
     {
@@ -353,7 +514,7 @@ void loop() {
         wifiStateChangedTime = millis();
       }
       lastWifiState = WiFi.status();
-      DEBUG_PRINT("Wifi state: "); DEBUG_PRINTLN(wifiStateChangedTime);
+      DEBUG_PRINT("State time: "); DEBUG_PRINTLN(wifiStateChangedTime);
       DEBUG_PRINT("NTP last sync: "); DEBUG_PRINTLN(ntpLastSyncTime);
       DEBUG_PRINT("Client IP: "); DEBUG_PRINTLN(WiFi.localIP());
       debugTime = millis(); 

wled00/wled01_eeprom.ino

@@ -1,9 +1,26 @@
 /*
  * Methods to handle saving and loading to non-volatile memory
+ * EEPROM Map: https://github.com/Aircoookie/WLED/wiki/EEPROM-Map
  */
 
-#define EEPSIZE 2048
+#define EEPSIZE 3072
 
+//eeprom Version code, enables default settings instead of 0 init on update
+#define EEPVER 9
+//0 -> old version, default
+//1 -> 0.4p 1711272 and up
+//2 -> 0.4p 1711302 and up
+//3 -> 0.4  1712121 and up
+//4 -> 0.5.0 and up
+//5 -> 0.5.1 and up
+//6 -> 0.6.0 and up
+//7 -> 0.7.1 and up
+//8 -> 0.8.0-a and up
+//9 -> 0.8.0
+
+/*
+ * Erase all configuration data
+ */
 void clearEEPROM()
 {
   for (int i = 0; i < EEPSIZE; i++)
@@ -13,318 +30,479 @@ void clearEEPROM()
   EEPROM.commit();
 }
 
+void writeStringToEEPROM(uint16_t pos, char* str, uint16_t len)
+{
+  for (int i = 0; i < len; ++i)
+  {
+    EEPROM.write(pos + i, str[i]);
+    if (str[i] == 0) return;
+  }
+}
+
+void readStringFromEEPROM(uint16_t pos, char* str, uint16_t len)
+{
+  for (int i = 0; i < len; ++i)
+  {
+    str[i] = EEPROM.read(pos + i);
+    if (str[i] == 0) return;
+  }
+  str[len] = 0; //make sure every string is properly terminated. str must be at least len +1 big.
+}
+
+/*
+ * Write configuration to flash
+ */
 void saveSettingsToEEPROM()
 {
   if (EEPROM.read(233) != 233) //set no first boot flag
   {
     clearEEPROM();
     EEPROM.write(233, 233);
-  } else
-  {
-    showWelcomePage = false;
   }
   
-  for (int i = 0; i < 32; ++i)
-  {
-    EEPROM.write(i, clientssid.charAt(i));
-  }
-  for (int i = 32; i < 96; ++i)
-  {
-    EEPROM.write(i, clientpass.charAt(i-32));
-  }
-  for (int i = 96; i < 128; ++i)
-  {
-    EEPROM.write(i, cmdns.charAt(i-96));
-  }
-  for (int i = 128; i < 160; ++i)
-  {
-    EEPROM.write(i, apssid.charAt(i-128));
-  }
-  for (int i = 160; i < 224; ++i)
-  {
-    EEPROM.write(i, appass.charAt(i-160));
-  }
+  writeStringToEEPROM(  0, clientSSID, 32);
+  writeStringToEEPROM( 32, clientPass, 64);
+  writeStringToEEPROM( 96,      cmDNS, 32);
+  writeStringToEEPROM(128,     apSSID, 32);
+  writeStringToEEPROM(160,     apPass, 64);
+
   EEPROM.write(224, nightlightDelayMins);
   EEPROM.write(225, nightlightFade);
   EEPROM.write(226, notifyDirectDefault);
-  EEPROM.write(227, apchannel);
-  EEPROM.write(228, aphide);
-  EEPROM.write(229, ledcount);
+  EEPROM.write(227, apChannel);
+  EEPROM.write(228, apHide);
+  EEPROM.write(229, (ledCount >> 0) & 0xFF);
   EEPROM.write(230, notifyButton);
-  //231 was notifyNightlight
+  EEPROM.write(231, notifyTwice);
   EEPROM.write(232, buttonEnabled);
   //233 reserved for first boot flag
-  EEPROM.write(234, staticip[0]);
-  EEPROM.write(235, staticip[1]);
-  EEPROM.write(236, staticip[2]);
-  EEPROM.write(237, staticip[3]);
-  EEPROM.write(238, staticgateway[0]);
-  EEPROM.write(239, staticgateway[1]);
-  EEPROM.write(240, staticgateway[2]);
-  EEPROM.write(241, staticgateway[3]);
-  EEPROM.write(242, staticsubnet[0]);
-  EEPROM.write(243, staticsubnet[1]);
-  EEPROM.write(244, staticsubnet[2]);
-  EEPROM.write(245, staticsubnet[3]);
-  EEPROM.write(246, col_s[0]);
-  EEPROM.write(247, col_s[1]);
-  EEPROM.write(248, col_s[2]);
-  EEPROM.write(249, bri_s);
+  
+  for (int i = 0; i<4; i++) //ip addresses
+  {
+    EEPROM.write(234+i, staticIP[i]);
+    EEPROM.write(238+i, staticGateway[i]);
+    EEPROM.write(242+i, staticSubnet[i]);
+  }
+  
+  EEPROM.write(246, colS[0]);
+  EEPROM.write(247, colS[1]);
+  EEPROM.write(248, colS[2]);
+  EEPROM.write(249, briS);
+  
   EEPROM.write(250, receiveNotificationBrightness);
   EEPROM.write(251, fadeTransition);
-  EEPROM.write(253, (transitionDelay >> 0) & 0xFF);
-  EEPROM.write(254, (transitionDelay >> 8) & 0xFF);
+  EEPROM.write(252, reverseMode);
+  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)
-  {
-    EEPROM.write(i, otapass.charAt(i-256));
-  }
+  writeStringToEEPROM(256, otaPass, 32);
+  
   EEPROM.write(288, nightlightTargetBri);
   EEPROM.write(289, otaLock);
   EEPROM.write(290, (udpPort >> 0) & 0xFF);
   EEPROM.write(291, (udpPort >> 8) & 0xFF);
-  for (int i = 292; i < 324; ++i)
-  {
-    EEPROM.write(i, serverDescription.charAt(i-292));
-  }
+  writeStringToEEPROM(292, serverDescription, 32);
+  
   EEPROM.write(324, effectDefault);
   EEPROM.write(325, effectSpeedDefault);
   EEPROM.write(326, effectIntensityDefault);
+  
   EEPROM.write(327, ntpEnabled);
-  //328 reserved for timezone setting
-  //329 reserved for dst setting
+  EEPROM.write(328, currentTimezone);
+  EEPROM.write(329, useAMPM);
   EEPROM.write(330, useGammaCorrectionBri);
   EEPROM.write(331, useGammaCorrectionRGB);
   EEPROM.write(332, overlayDefault);
+  
   EEPROM.write(333, alexaEnabled);
-  for (int i = 334; i < 366; ++i)
-  {
-    EEPROM.write(i, alexaInvocationName.charAt(i-334));
-  }
-  EEPROM.write(366, alexaNotify);
-  EEPROM.write(367, arlsSign);
+  writeStringToEEPROM(334, alexaInvocationName, 32);
+  EEPROM.write(366, notifyAlexa);
+  
+  EEPROM.write(367, (arlsOffset>=0));
   EEPROM.write(368, abs(arlsOffset));
   EEPROM.write(369, turnOnAtBoot);
   EEPROM.write(370, useHSBDefault);
-  EEPROM.write(371, white_s);
+  EEPROM.write(371, whiteS);
   EEPROM.write(372, useRGBW);
-  EEPROM.write(373, sweepTransition);
-  EEPROM.write(374, sweepDirection);
+  EEPROM.write(373, effectPaletteDefault);
+  EEPROM.write(374, strip.paletteFade);
   EEPROM.write(375, apWaitTimeSecs);
   EEPROM.write(376, recoveryAPDisabled);
+  
   EEPROM.write(377, EEPVER); //eeprom was updated to latest
-  EEPROM.write(378, col_sec_s[0]);
-  EEPROM.write(379, col_sec_s[1]);
-  EEPROM.write(380, col_sec_s[2]);
-  EEPROM.write(381, white_sec_s);
-  EEPROM.write(382, cc_index1);
-  EEPROM.write(383, cc_index2);
-  EEPROM.write(384, cc_numPrimary);
-  EEPROM.write(385, cc_numSecondary);
-  EEPROM.write(386, cc_fromStart);
-  EEPROM.write(387, cc_fromEnd);
-  EEPROM.write(388, cc_step);
+  
+  EEPROM.write(378, colSecS[0]);
+  EEPROM.write(379, colSecS[1]);
+  EEPROM.write(380, colSecS[2]);
+  EEPROM.write(381, whiteSecS);
+  EEPROM.write(382, strip.paletteBlend);
+  
   EEPROM.write(389, bootPreset);
   EEPROM.write(390, aOtaEnabled);
   EEPROM.write(391, receiveNotificationColor);
   EEPROM.write(392, receiveNotificationEffects);
   EEPROM.write(393, wifiLock);
+  
+  EEPROM.write(394, (abs(utcOffsetSecs) >> 0) & 0xFF);
+  EEPROM.write(395, (abs(utcOffsetSecs) >> 8) & 0xFF);
+  EEPROM.write(396, (utcOffsetSecs<0)); //is negative
+  EEPROM.write(397, initLedsLast);
+  EEPROM.write(398, (ledCount >> 8) & 0xFF);
+  EEPROM.write(399, !enableSecTransition);
+
+  //favorite setting (preset) memory (25 slots/ each 20byte)
+  //400 - 899 reserved
 
   for (int k=0;k<6;k++){
     int in = 900+k*8;
-    for (int i=in; i < in+8; ++i)
-    {
-      EEPROM.write(i, cssCol[k].charAt(i-in));
-    }}
+    writeStringToEEPROM(in, cssCol[k], 8);
+  }
 
   EEPROM.write(948,currentTheme);
-  for (int i = 950; i < 982; ++i)
+  writeStringToEEPROM(950, cssFont, 32);
+
+  EEPROM.write(2048, huePollingEnabled);
+  //EEPROM.write(2049, hueUpdatingEnabled);
+  for (int i = 2050; i < 2054; ++i)
   {
-    EEPROM.write(i, cssFont.charAt(i-950));
+    EEPROM.write(i, hueIP[i-2050]);
   }
+  writeStringToEEPROM(2054, hueApiKey, 46);
+  EEPROM.write(2100, (huePollIntervalMs >> 0) & 0xFF);
+  EEPROM.write(2101, (huePollIntervalMs >> 8) & 0xFF);
+  EEPROM.write(2102, notifyHue);
+  EEPROM.write(2103, hueApplyOnOff);
+  EEPROM.write(2104, hueApplyBri);
+  EEPROM.write(2105, hueApplyColor);
+  EEPROM.write(2106, huePollLightId);
+
+  EEPROM.write(2150, overlayMin);
+  EEPROM.write(2151, overlayMax);
+  EEPROM.write(2152, analogClock12pixel);
+  EEPROM.write(2153, analogClock5MinuteMarks);
+  EEPROM.write(2154, analogClockSecondsTrail);
+  
+  EEPROM.write(2155, countdownMode);
+  EEPROM.write(2156, countdownYear);
+  EEPROM.write(2157, countdownMonth);
+  EEPROM.write(2158, countdownDay);
+  EEPROM.write(2159, countdownHour);
+  EEPROM.write(2160, countdownMin);
+  EEPROM.write(2161, countdownSec);
+  setCountdown();
+
+  writeStringToEEPROM(2165, cronixieDisplay, 6);
+  EEPROM.write(2171, cronixieBacklight);
+  setCronixie();
+  
+  EEPROM.write(2175, macroBoot);
+  EEPROM.write(2176, macroAlexaOn);
+  EEPROM.write(2177, macroAlexaOff);
+  EEPROM.write(2178, macroButton);
+  EEPROM.write(2179, macroLongPress);
+  EEPROM.write(2180, macroCountdown);
+  EEPROM.write(2181, macroNl);
+
+  EEPROM.write(2190, (e131Universe >> 0) & 0xFF);
+  EEPROM.write(2191, (e131Universe >> 8) & 0xFF);
+  EEPROM.write(2192, e131Multicast);
+  EEPROM.write(2193, (realtimeTimeoutMs >> 0) & 0xFF);
+  EEPROM.write(2194, (realtimeTimeoutMs >> 8) & 0xFF);
+  EEPROM.write(2195, arlsForceMaxBri);
+  EEPROM.write(2196, arlsDisableGammaCorrection);
+
+  EEPROM.write(2200, !receiveDirect);
+  EEPROM.write(2201, enableRealtimeUI);
+  EEPROM.write(2202, uiConfiguration);
+  EEPROM.write(2203, autoRGBtoRGBW);
+  EEPROM.write(2204, skipFirstLed);
+
+  if (saveCurrPresetCycConf)
+  {
+    EEPROM.write(2205, presetCyclingEnabled);
+    EEPROM.write(2206, (presetCycleTime >> 0) & 0xFF);
+    EEPROM.write(2207, (presetCycleTime >> 8) & 0xFF);
+    EEPROM.write(2208, presetCycleMin);
+    EEPROM.write(2209, presetCycleMax);
+    EEPROM.write(2210, presetApplyBri);
+    EEPROM.write(2211, presetApplyCol);
+    EEPROM.write(2212, presetApplyFx);
+    saveCurrPresetCycConf = false;
+  }
+
+  writeStringToEEPROM(2220, blynkApiKey, 35);
+
+  for (int i = 0; i < 8; ++i)
+  {
+    EEPROM.write(2260 + i, timerHours[i]  );
+    EEPROM.write(2270 + i, timerMinutes[i]);
+    EEPROM.write(2280 + i, timerWeekday[i]);
+    EEPROM.write(2290 + i, timerMacro[i]  );
+  }
+
+  writeStringToEEPROM(2300,      mqttServer, 32);
+  writeStringToEEPROM(2333, mqttDeviceTopic, 32);
+  writeStringToEEPROM(2366,  mqttGroupTopic, 32);
   
   EEPROM.commit();
 }
 
+/*
+ * Read all configuration from flash
+ */
 void loadSettingsFromEEPROM(bool first)
 {
   if (EEPROM.read(233) != 233) //first boot/reset to default
   {
-    showWelcomePage=true;
     saveSettingsToEEPROM();
     return;
   }
   int lastEEPROMversion = EEPROM.read(377); //last EEPROM version before update
   
-  clientssid = "";
-  for (int i = 0; i < 32; ++i)
-  {
-    if (EEPROM.read(i) == 0) break;
-    clientssid += char(EEPROM.read(i));
-  }
-  clientpass = "";
-  for (int i = 32; i < 96; ++i)
-  {
-    if (EEPROM.read(i) == 0) break;
-    clientpass += char(EEPROM.read(i));
-  }
-  cmdns = "";
-  for (int i = 96; i < 128; ++i)
-  {
-    if (EEPROM.read(i) == 0) break;
-    cmdns += char(EEPROM.read(i));
-  }
-  apssid = "";
-  for (int i = 128; i < 160; ++i)
-  {
-    if (EEPROM.read(i) == 0) break;
-    apssid += char(EEPROM.read(i));
-  }
-  appass = "";
-  for (int i = 160; i < 224; ++i)
-  {
-    if (EEPROM.read(i) == 0) break;
-    appass += char(EEPROM.read(i));
-  }
+
+  readStringFromEEPROM(  0, clientSSID, 32);
+  readStringFromEEPROM( 32, clientPass, 64);
+  readStringFromEEPROM( 96,      cmDNS, 32);
+  readStringFromEEPROM(128,     apSSID, 32);
+  readStringFromEEPROM(160,     apPass, 64);
+
   nightlightDelayMins = EEPROM.read(224);
   nightlightFade = EEPROM.read(225);
   notifyDirectDefault = EEPROM.read(226);
   notifyDirect = notifyDirectDefault;
-  apchannel = EEPROM.read(227);
-  if (apchannel > 13 || apchannel < 1) apchannel = 1;
-  aphide = EEPROM.read(228);
-  if (aphide > 1) aphide = 1;
-  ledcount = EEPROM.read(229); if (ledcount > LEDCOUNT) ledcount = LEDCOUNT;
+  
+  apChannel = EEPROM.read(227);
+  if (apChannel > 13 || apChannel < 1) apChannel = 1;
+  apHide = EEPROM.read(228);
+  if (apHide > 1) apHide = 1;
+  ledCount = ((EEPROM.read(229) << 0) & 0xFF) + ((EEPROM.read(398) << 8) & 0xFF00); if (ledCount > 1200 || ledCount == 0) ledCount = 10;
+  
   notifyButton = EEPROM.read(230);
-  //231 was notifyNightlight
+  notifyTwice = EEPROM.read(231);
   buttonEnabled = EEPROM.read(232);
-  staticip[0] = EEPROM.read(234);
-  staticip[1] = EEPROM.read(235);
-  staticip[2] = EEPROM.read(236);
-  staticip[3] = EEPROM.read(237);
-  staticgateway[0] = EEPROM.read(238);
-  staticgateway[1] = EEPROM.read(239);
-  staticgateway[2] = EEPROM.read(240);
-  staticgateway[3] = EEPROM.read(241);
-  staticsubnet[0] = EEPROM.read(242);
-  staticsubnet[1] = EEPROM.read(243);
-  staticsubnet[2] = EEPROM.read(244);
-  staticsubnet[3] = EEPROM.read(245);
-  col_s[0] = EEPROM.read(246); col[0] = col_s[0];
-  col_s[1] = EEPROM.read(247); col[1] = col_s[1];
-  col_s[2] = EEPROM.read(248); col[2] = col_s[2];
-  bri_s = EEPROM.read(249); bri = bri_s;
+  
+  staticIP[0] = EEPROM.read(234);
+  staticIP[1] = EEPROM.read(235);
+  staticIP[2] = EEPROM.read(236);
+  staticIP[3] = EEPROM.read(237);
+  staticGateway[0] = EEPROM.read(238);
+  staticGateway[1] = EEPROM.read(239);
+  staticGateway[2] = EEPROM.read(240);
+  staticGateway[3] = EEPROM.read(241);
+  staticSubnet[0] = EEPROM.read(242);
+  staticSubnet[1] = EEPROM.read(243);
+  staticSubnet[2] = EEPROM.read(244);
+  staticSubnet[3] = EEPROM.read(245);
+  
+  colS[0] = EEPROM.read(246); col[0] = colS[0];
+  colS[1] = EEPROM.read(247); col[1] = colS[1];
+  colS[2] = EEPROM.read(248); col[2] = colS[2];
+  briS = EEPROM.read(249); bri = briS;
   if (!EEPROM.read(369) && first)
   {
-    bri = 0; bri_last = bri_s;
+    bri = 0; briLast = briS;
   }
   receiveNotificationBrightness = EEPROM.read(250);
   fadeTransition = EEPROM.read(251);
-  transitionDelay = ((EEPROM.read(253) << 0) & 0xFF) + ((EEPROM.read(254) << 8) & 0xFF00);
+  reverseMode = EEPROM.read(252);
+  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)
-  {
-    if (EEPROM.read(i) == 0) break;
-    otapass += char(EEPROM.read(i));
-  }
+
+  readStringFromEEPROM(256, otaPass, 32);
+  
   nightlightTargetBri = EEPROM.read(288);
   otaLock = EEPROM.read(289);
   udpPort = ((EEPROM.read(290) << 0) & 0xFF) + ((EEPROM.read(291) << 8) & 0xFF00);
-  serverDescription = "";
-  for (int i = 292; i < 324; ++i)
-  {
-    if (EEPROM.read(i) == 0) break;
-    serverDescription += char(EEPROM.read(i));
-  }
+
+  readStringFromEEPROM(292, serverDescription, 32);
+  
   effectDefault = EEPROM.read(324); effectCurrent = effectDefault;
   effectSpeedDefault = EEPROM.read(325); effectSpeed = effectSpeedDefault;
   ntpEnabled = EEPROM.read(327);
+  currentTimezone = EEPROM.read(328);
+  useAMPM = EEPROM.read(329);
   useGammaCorrectionBri = EEPROM.read(330);
   useGammaCorrectionRGB = EEPROM.read(331);
   overlayDefault = EEPROM.read(332);
+  if (lastEEPROMversion < 8 && overlayDefault > 0) overlayDefault--; //overlay mode 1 (solid) was removed
+  
   alexaEnabled = EEPROM.read(333);
-  alexaInvocationName = "";
-  for (int i = 334; i < 366; ++i)
-  {
-    if (EEPROM.read(i) == 0) break;
-    alexaInvocationName += char(EEPROM.read(i));
-  }
-  alexaNotify = EEPROM.read(366);
-  arlsSign = EEPROM.read(367);
+
+  readStringFromEEPROM(334, alexaInvocationName, 32);
+  
+  notifyAlexa = EEPROM.read(366);
   arlsOffset = EEPROM.read(368);
-  if (!arlsSign) arlsOffset = -arlsOffset;
+  if (!EEPROM.read(367)) arlsOffset = -arlsOffset;
   turnOnAtBoot = EEPROM.read(369);
   useHSBDefault = EEPROM.read(370);
-  white_s = EEPROM.read(371); white = white_s;
+  whiteS = EEPROM.read(371); white = whiteS;
   useRGBW = EEPROM.read(372);
-  sweepTransition = EEPROM.read(373);
-  sweepDirection = EEPROM.read(374);
+  effectPaletteDefault = EEPROM.read(373); effectPalette = effectPaletteDefault;
+  //374 - strip.paletteFade
+
   if (lastEEPROMversion > 0) { 
     apWaitTimeSecs = EEPROM.read(375);
     recoveryAPDisabled = EEPROM.read(376);
   }
   //377 = lastEEPROMversion
   if (lastEEPROMversion > 1) {
-    col_sec_s[0] = EEPROM.read(378); col_sec[0] = col_sec_s[0];
-    col_sec_s[1] = EEPROM.read(379); col_sec[1] = col_sec_s[1];
-    col_sec_s[2] = EEPROM.read(380); col_sec[2] = col_sec_s[2];
-    white_sec_s = EEPROM.read(381); white_sec = white_sec_s; 
-    cc_index1 = EEPROM.read(382);
-    cc_index2 = EEPROM.read(383);
-    cc_numPrimary = EEPROM.read(384);
-    cc_numSecondary = EEPROM.read(385);
-    cc_fromStart = EEPROM.read(386);
-    cc_fromEnd = EEPROM.read(387);
-    cc_step = EEPROM.read(388);
-    strip.setCustomChase(cc_index1, cc_index2, cc_start, cc_numPrimary, cc_numSecondary, cc_step, cc_fromStart, cc_fromEnd);
+    colSecS[0] = EEPROM.read(378); colSec[0] = colSecS[0];
+    colSecS[1] = EEPROM.read(379); colSec[1] = colSecS[1];
+    colSecS[2] = EEPROM.read(380); colSec[2] = colSecS[2];
+    whiteSecS = EEPROM.read(381); whiteSec = whiteSecS;
   }
   if (lastEEPROMversion > 3) {
     effectIntensityDefault = EEPROM.read(326); effectIntensity = effectIntensityDefault; 
     aOtaEnabled = EEPROM.read(390);
     receiveNotificationColor = EEPROM.read(391);
     receiveNotificationEffects = EEPROM.read(392);
-    cssFont = "";
-    for (int i = 950; i < 982; ++i)
-    {
-      if (EEPROM.read(i) == 0) break;
-      cssFont += char(EEPROM.read(i));
-    }
+
+    readStringFromEEPROM(950, cssFont, 32);
+  } else //keep receiving notification behavior from pre0.5.0 after update
+  {
+    receiveNotificationColor = receiveNotificationBrightness;
+    receiveNotificationEffects = receiveNotificationBrightness;
   }
   receiveNotifications = (receiveNotificationBrightness || receiveNotificationColor || receiveNotificationEffects);
+  if (lastEEPROMversion > 4) {
+    huePollingEnabled = EEPROM.read(2048);
+    //hueUpdatingEnabled = EEPROM.read(2049);
+    for (int i = 2050; i < 2054; ++i)
+    {
+      hueIP[i-2050] = EEPROM.read(i);
+    }
+
+    readStringFromEEPROM(2054, hueApiKey, 46);
+    
+    huePollIntervalMs = ((EEPROM.read(2100) << 0) & 0xFF) + ((EEPROM.read(2101) << 8) & 0xFF00);
+    notifyHue = EEPROM.read(2102);
+    hueApplyOnOff = EEPROM.read(2103);
+    hueApplyBri = EEPROM.read(2104);
+    hueApplyColor = EEPROM.read(2105);
+    huePollLightId = EEPROM.read(2106);
+  }
+  if (lastEEPROMversion > 5) {
+    overlayMin = EEPROM.read(2150);
+    overlayMax = EEPROM.read(2151);
+    analogClock12pixel = EEPROM.read(2152);
+    analogClock5MinuteMarks = EEPROM.read(2153);
+    analogClockSecondsTrail = EEPROM.read(2154);
+    countdownMode = EEPROM.read(2155);
+    countdownYear = EEPROM.read(2156);
+    countdownMonth = EEPROM.read(2157);
+    countdownDay = EEPROM.read(2158);
+    countdownHour = EEPROM.read(2159);
+    countdownMin = EEPROM.read(2160);
+    countdownSec = EEPROM.read(2161);
+    setCountdown();
+
+    readStringFromEEPROM(2165, cronixieDisplay, 6);
+    cronixieBacklight = EEPROM.read(2171);
+    
+    macroBoot = EEPROM.read(2175);
+    macroAlexaOn = EEPROM.read(2176);
+    macroAlexaOff = EEPROM.read(2177);
+    macroButton = EEPROM.read(2178);
+    macroLongPress = EEPROM.read(2179);
+    macroCountdown = EEPROM.read(2180);
+    macroNl = EEPROM.read(2181);
+  }
+
+  if (lastEEPROMversion > 6)
+  {
+    e131Universe = ((EEPROM.read(2190) << 0) & 0xFF) + ((EEPROM.read(2191) << 8) & 0xFF00);
+    e131Multicast = EEPROM.read(2192);
+    realtimeTimeoutMs = ((EEPROM.read(2193) << 0) & 0xFF) + ((EEPROM.read(2194) << 8) & 0xFF00);
+    arlsForceMaxBri = EEPROM.read(2195);
+    arlsDisableGammaCorrection = EEPROM.read(2196);
+  }
+
+  if (lastEEPROMversion > 7)
+  {
+    strip.paletteFade  = EEPROM.read(374);
+    strip.paletteBlend = EEPROM.read(382);
+
+    for (int i = 0; i < 8; ++i)
+    {
+      timerHours[i]   = EEPROM.read(2260 + i);
+      timerMinutes[i] = EEPROM.read(2270 + i);
+      timerWeekday[i] = EEPROM.read(2280 + i);
+      if (timerWeekday[i] == 0) timerWeekday[i] = 255;
+      timerMacro[i]  = EEPROM.read(2290 + i);
+    }
+  }
+
+  if (lastEEPROMversion > 8)
+  {
+    readStringFromEEPROM(2300,      mqttServer, 32);
+    readStringFromEEPROM(2333, mqttDeviceTopic, 32);
+    readStringFromEEPROM(2366,  mqttGroupTopic, 32);
+  }
+  
+  receiveDirect = !EEPROM.read(2200);
+  enableRealtimeUI = EEPROM.read(2201);
+  uiConfiguration = EEPROM.read(2202);
+  
+  #ifdef WLED_FLASH_512K_MODE
+  uiConfiguration = 1;
+  //force default UI since mobile is unavailable
+  #endif
+  
+  autoRGBtoRGBW = EEPROM.read(2203);
+  skipFirstLed = EEPROM.read(2204);
+
+  if (EEPROM.read(2210) || EEPROM.read(2211) || EEPROM.read(2212))
+  {
+    presetCyclingEnabled = EEPROM.read(2205);
+    presetCycleTime = ((EEPROM.read(2206) << 0) & 0xFF) + ((EEPROM.read(2207) << 8) & 0xFF00);
+    presetCycleMin = EEPROM.read(2208);
+    presetCycleMax = EEPROM.read(2209);
+    presetApplyBri = EEPROM.read(2210);
+    presetApplyCol = EEPROM.read(2211);
+    presetApplyFx = EEPROM.read(2212);
+  }
   
   bootPreset = EEPROM.read(389);
   wifiLock = EEPROM.read(393);
+  utcOffsetSecs = ((EEPROM.read(394) << 0) & 0xFF) + ((EEPROM.read(395) << 8) & 0xFF00);
+  if (EEPROM.read(396)) utcOffsetSecs = -utcOffsetSecs; //negative
+  initLedsLast = EEPROM.read(397);
+  enableSecTransition = !EEPROM.read(399);
 
-  //favorite setting memory (25 slots/ each 20byte)
+  //favorite setting (preset) memory (25 slots/ each 20byte)
   //400 - 899 reserved
 
   currentTheme = EEPROM.read(948);
   for (int k=0;k<6;k++){
     int in=900+k*8;
-    for (int i=in; i < in+8; ++i)
-    {
-      if (EEPROM.read(i) == 0) break;
-      cssCol[k] += char(EEPROM.read(i));
-    }}
+    readStringFromEEPROM(in, cssCol[k], 8);
+  }
 
   //custom macro memory (16 slots/ each 64byte)
   //1024-2047 reserved
+
+  readStringFromEEPROM(2220, blynkApiKey, 35);
+  
+  //user MOD memory
+  //2944 - 3071 reserved
   
   useHSB = useHSBDefault;
 
   strip.setMode(effectCurrent);
   strip.setSpeed(effectSpeed);
   strip.setIntensity(effectIntensity);
+  strip.setPalette(effectPalette);
   overlayCurrent = overlayDefault;
 }
 
 //PRESET PROTOCOL 20 bytes
 //0: preset purpose byte 0:invalid 1:valid preset 1.0
-//1:a 2:r 3:g 4:b 5:w 6:er 7:eg 8:eb 9:ew 10:fx 11:sx | custom chase 12:numP 13:numS 14:(0:fs 1:both 2:fe) 15:step 16:ix 17-19:Zeros
+//1:a 2:r 3:g 4:b 5:w 6:er 7:eg 8:eb 9:ew 10:fx 11:sx | custom chase 12:numP 13:numS 14:(0:fs 1:both 2:fe) 15:step 16:ix 17: fp 18-19:Zeros
 
-void applyPreset(uint8_t index, bool loadBri, bool loadCol, bool loadFX)
+void applyPreset(byte index, bool loadBri, bool loadCol, bool loadFX)
 {
   if (index == 255 || index == 0) loadSettingsFromEEPROM(false);//load boot defaults
   if (index > 25 || index < 1) return;
@@ -337,29 +515,26 @@ void applyPreset(uint8_t index, bool loadBri, bool loadCol, bool loadFX)
     col[1] = EEPROM.read(i+3);
     col[2] = EEPROM.read(i+4);
     white = EEPROM.read(i+5);
-    col_sec[0] = EEPROM.read(i+6);
-    col_sec[1] = EEPROM.read(i+7);
-    col_sec[2] = EEPROM.read(i+8);
-    white_sec = EEPROM.read(i+9);
+    colSec[0] = EEPROM.read(i+6);
+    colSec[1] = EEPROM.read(i+7);
+    colSec[2] = EEPROM.read(i+8);
+    whiteSec = EEPROM.read(i+9);
   }
   if (loadFX)
   {
+    byte lastfx = effectCurrent;
     effectCurrent = EEPROM.read(i+10);
     effectSpeed = EEPROM.read(i+11);
     effectIntensity = EEPROM.read(i+16);
-    cc_numPrimary = EEPROM.read(i+12);
-    cc_numSecondary = EEPROM.read(i+13);
-    cc_fromEnd = EEPROM.read(i+14);
-    cc_fromStart = (EEPROM.read(i+14)<2);
-    cc_step = EEPROM.read(i+15);
-    strip.setCustomChase(cc_index1, cc_index2, cc_start, cc_numPrimary, cc_numSecondary, cc_step, cc_fromStart, cc_fromEnd);
-    strip.setMode(effectCurrent);
+    effectPalette = EEPROM.read(i+17);
+    if (lastfx != effectCurrent) strip.setMode(effectCurrent);
     strip.setSpeed(effectSpeed);
     strip.setIntensity(effectIntensity);
+    strip.setPalette(effectPalette);
   }
 }
 
-void savePreset(uint8_t index)
+void savePreset(byte index)
 {
   if (index > 25) return;
   if (index < 1) {saveSettingsToEEPROM();return;}
@@ -370,34 +545,40 @@ void savePreset(uint8_t index)
   EEPROM.write(i+3, col[1]);
   EEPROM.write(i+4, col[2]);
   EEPROM.write(i+5, white);
-  EEPROM.write(i+6, col_sec[0]);
-  EEPROM.write(i+7, col_sec[1]);
-  EEPROM.write(i+8, col_sec[2]);
-  EEPROM.write(i+9, white_sec);
+  EEPROM.write(i+6, colSec[0]);
+  EEPROM.write(i+7, colSec[1]);
+  EEPROM.write(i+8, colSec[2]);
+  EEPROM.write(i+9, whiteSec);
   EEPROM.write(i+10, effectCurrent);
   EEPROM.write(i+11, effectSpeed);
-  EEPROM.write(i+12, cc_numPrimary);
-  EEPROM.write(i+13, cc_numSecondary);
-  uint8_t m = 1;
-  if (!cc_fromStart) m = 2;
-  if (!cc_fromEnd) m = 0;
-  EEPROM.write(i+14, m);
-  EEPROM.write(i+15, cc_step);
+  
   EEPROM.write(i+16, effectIntensity);
+  EEPROM.write(i+17, effectPalette);
   EEPROM.commit();
 }
 
-void applyMacro(uint8_t index)
+String loadMacro(byte index)
 {
-  if (index > 15) return;
-  String mc="win&";
+  index-=1;
+  String m="";
+  if (index > 15) return m;
   for (int i = 1024+64*index; i < 1088+64*index; i++)
   {
     if (EEPROM.read(i) == 0) break;
-    mc += char(EEPROM.read(i));
+    m += char(EEPROM.read(i));
   }
+  if (m.charAt(0) < 65 || m.charAt(0) > 90) return ""; //do simple check if macro is valid (capital first letter)
+  return m;
+}
+
+void applyMacro(byte index)
+{
+  index-=1;
+  if (index > 15) return;
+  String mc="win&";
+  mc += loadMacro(index+1);
   mc += "&IN"; //internal, no XML response
-  if (!macroNotify) mc += "&NN";
+  if (!notifyMacro) mc += "&NN";
   String forbidden = "&M="; //dont apply if called by the macro itself to prevent loop
   /*
    * NOTE: loop is still possible if you call a different macro from a macro, which then calls the first macro again. 
@@ -408,14 +589,15 @@ void applyMacro(uint8_t index)
   handleSet(mc);
 }
 
-void saveMacro(uint8_t index, String mc)
+void saveMacro(byte index, String mc, bool sing=true) //only commit on single save, not in settings
 {
+  index-=1;
   if (index > 15) return;
   int s = 1024+index*64;
   for (int i = s; i < s+64; i++)
   {
     EEPROM.write(i, mc.charAt(i-s));
   }
-  EEPROM.commit();
+  if (sing) EEPROM.commit();
 }
 

wled00/wled02_xml.ino

@@ -2,211 +2,322 @@
  * Sending XML status files to client
  */
 
-void XML_response()
+void XML_response(bool isHTTP)
 {
-   String resp;
-   resp = resp + "<?xml version = \"1.0\" ?>";
-   resp = resp + "<vs>";
-   resp = resp + "<act>";
+   olen = 0;
+   oappend("<?xml version = \"1.0\" ?><vs><ac>");
    if (nightlightActive && nightlightFade)
    {
-     resp = resp + bri_t;
+     oappendi(briT);
    } else
    {
-    resp = resp + bri;
+     oappendi(bri);
    }
-   resp = resp + "</act>";
+   oappend("</ac>");
 
    for (int i = 0; i < 3; i++)
    {
-     resp = resp + "<cl>";
-     resp = resp + col[i];
-     resp = resp + "</cl>";
+     oappend("<cl>");
+     oappendi(col[i]);
+     oappend("</cl>");
    }
-   resp = resp + "<ns>";
-   resp = resp + notifyDirect;
-   resp = resp + "</ns><nr>";
-   resp = resp + receiveNotifications;
-   resp = resp + "</nr><nl>";
-   resp = resp + nightlightActive;
-   resp = resp + "</nl><nf>";
-   resp = resp + nightlightFade;
-   resp = resp + "</nf><nd>";
-   resp = resp + nightlightDelayMins;
-   resp = resp + "</nd><nt>";
-   resp = resp + nightlightTargetBri;
-   resp = resp + "</nt><fx>";
-   resp = resp + effectCurrent;
-   resp = resp + "</fx><sx>";
-   resp = resp + effectSpeed;
-   resp = resp + "</sx><ix>";
-   resp = resp + effectIntensity;
-   resp = resp + "</ix><wv>";
-   if (useRGBW) {
-     resp = resp + white;
+   oappend("<ns>");
+   oappendi(notifyDirect);
+   oappend("</ns><nr>");
+   oappendi(receiveNotifications);
+   oappend("</nr><nl>");
+   oappendi(nightlightActive);
+   oappend("</nl><nf>");
+   oappendi(nightlightFade);
+   oappend("</nf><nd>");
+   oappendi(nightlightDelayMins);
+   oappend("</nd><nt>");
+   oappendi(nightlightTargetBri);
+   oappend("</nt><fx>");
+   oappendi(effectCurrent);
+   oappend("</fx><sx>");
+   oappendi(effectSpeed);
+   oappend("</sx><ix>");
+   oappendi(effectIntensity);
+   oappend("</ix><fp>");
+   oappendi(effectPalette);
+   oappend("</fp><wv>");
+   if (useRGBW && !autoRGBtoRGBW) {
+     oappendi(white);
    } else {
-     resp = resp + "-1";
+     oappend("-1");
    }
-   resp = resp + "</wv><md>";
-   resp = resp + useHSB;
-   resp = resp + "</md><desc>";
-   resp = resp + serverDescription;
-   resp = resp + "</desc>";
-   resp = resp + "</vs>";
-   server.send(200, "text/xml", resp);
+   oappend("</wv><md>");
+   oappendi(useHSB);
+   oappend("</md><ds>");
+   oappend(serverDescription);
+   oappend("</ds></vs>");
+   if (isHTTP) server.send(200, "text/xml", obuf);
 }
 
-String getSettings(uint8_t subPage)
+void sappend(char stype, char* key, int val) //append a setting to string buffer
+{
+  char ds[] = "d.Sf.";
+  
+  switch(stype)
+  {
+    case 'c': //checkbox
+      oappend(ds);
+      oappend(key);
+      oappend(".checked=");
+      oappendi(val);
+      oappend(";");
+      break;
+    case 'v': //numeric
+      oappend(ds);
+      oappend(key);
+      oappend(".value=");
+      oappendi(val);
+      oappend(";");
+      break;
+    case 'i': //selectedIndex
+      oappend(ds);
+      oappend(key);
+      oappend(".selectedIndex=");
+      oappendi(val);
+      oappend(";");
+      break;
+  }
+}
+
+void sappends(char stype, char* key, char* val) //append a string setting
+{
+  switch(stype)
+  {
+    case 's': //string (we can interpret val as char*)
+        oappend("d.Sf.");
+        oappend(key);
+        oappend(".value=\"");
+        oappend(val);
+        oappend("\";");
+        break;
+    case 'm': //message
+        oappend("d.getElementsByClassName");
+        oappend(key);
+        oappend(".innerHTML=\"");
+        oappend(val);
+        oappend("\";");
+        break;
+  }
+}
+
+void getSettingsJS(byte subPage) //get values for settings form in javascript
 {
   //0: menu 1: wifi 2: leds 3: ui 4: sync 5: time 6: sec
   DEBUG_PRINT("settings resp");
   DEBUG_PRINTLN(subPage);
   
-  String resp = "";
-  if (subPage <1 || subPage >6) return resp;
-  
-  String ds = "d.Sf.";
-  String dg = "d.getElementsByClassName";
-  String v = ".value=";
-  String c = ".checked=";
-  String ih = ".innerHTML=";
+  olen = 0; obuf[0] = 0; //clear buffer
+  if (subPage <1 || subPage >6) return;
 
   if (subPage == 1) {
-    resp += ds + "CSSID" + v + "\"" + clientssid + "\";";
-    resp += ds + "CPASS" + v + "\"";
-    for (int i = 0; i < clientpass.length(); i++)
+    sappends('s',"CS",clientSSID);
+
+    byte l = strlen(clientPass);
+    char fpass[l+1]; //fill password field with ***
+    fpass[l] = 0;
+    memset(fpass,'*',l); 
+    sappends('s',"CP",fpass);
+
+    char k[3]; k[2] = 0; //IP addresses
+    for (int i = 0; i<4; i++)
     {
-      resp += "*";
+      k[1] = 48+i; //ascii 0,1,2,3
+      k[0] = 'I'; sappend('v',k,staticIP[i]);
+      k[0] = 'G'; sappend('v',k,staticGateway[i]);
+      k[0] = 'S'; sappend('v',k,staticSubnet[i]);
     }
-    resp += "\";";
-    resp += ds + "CSIP0" + v + staticip[0] +";";
-    resp += ds + "CSIP1" + v + staticip[1] +";";
-    resp += ds + "CSIP2" + v + staticip[2] +";";
-    resp += ds + "CSIP3" + v + staticip[3] +";";
-    resp += ds + "CSGW0" + v + staticgateway[0] +";";
-    resp += ds + "CSGW1" + v + staticgateway[1] +";";
-    resp += ds + "CSGW2" + v + staticgateway[2] +";";
-    resp += ds + "CSGW3" + v + staticgateway[3] +";";
-    resp += ds + "CSSN0" + v + staticsubnet[0] +";";
-    resp += ds + "CSSN1" + v + staticsubnet[1] +";";
-    resp += ds + "CSSN2" + v + staticsubnet[2] +";";
-    resp += ds + "CSSN3" + v + staticsubnet[3] +";";
-    resp += ds + "CMDNS" + v + "\"" + cmdns + "\";";
-    resp += ds + "APWTM" + v + apWaitTimeSecs +";";
-    resp += ds + "APSSID" + v + "\"" + apssid + "\";";
-    resp += ds + "APHSSID" + c + aphide + ";";
-    resp += ds + "APPASS" + v + "\"";
-    for (int i = 0; i < clientpass.length(); i++)
+
+    sappends('s',"CM",cmDNS);
+    sappend('v',"AT",apWaitTimeSecs);
+    sappends('s',"AS",apSSID);
+    sappend('c',"AH",apHide);
+    
+    l = strlen(apPass);
+    char fapass[l+1]; //fill password field with ***
+    fapass[l] = 0;
+    memset(fapass,'*',l); 
+    sappends('s',"AP",fapass);
+    
+    sappend('v',"AC",apChannel);
+
+    if (WiFi.localIP()[0] != 0) //is connected
     {
-      resp += "*";
-    }
-    resp += "\";";
-    resp += ds + "APCHAN" + v + apchannel +";";
-    resp += dg + "(\"sip\")[0]" + ih + "\"";
-    if (!WiFi.localIP()[0] == 0)
-    {
-      resp += WiFi.localIP()[0];
-      resp += + ".";
-      resp += WiFi.localIP()[1];
-      resp += ".";
-      resp += WiFi.localIP()[2];
-      resp += ".";
-      resp += WiFi.localIP()[3];
+      char s[16];
+      IPAddress localIP = WiFi.localIP();
+      sprintf(s, "%d.%d.%d.%d", localIP[0], localIP[1], localIP[2], localIP[3]);
+      sappends('m',"(\"sip\")[0]",s);
     } else
     {
-      resp += "Not connected";
+      sappends('m',"(\"sip\")[0]","Not connected");
     }
-    resp += "\";";
-    resp += dg + "(\"sip\")[1]" + ih + "\"";
-    if (!WiFi.softAPIP()[0] == 0)
+    
+    if (WiFi.softAPIP()[0] != 0) //is active
     {
-      resp += WiFi.softAPIP()[0];
-      resp += + ".";
-      resp += WiFi.softAPIP()[1];
-      resp += ".";
-      resp += WiFi.softAPIP()[2];
-      resp += ".";
-      resp += WiFi.softAPIP()[3];
+      char s[16];
+      IPAddress apIP = WiFi.softAPIP();
+      sprintf(s, "%d.%d.%d.%d", apIP[0], apIP[1], apIP[2], apIP[3]);
+      sappends('m',"(\"sip\")[1]",s);
     } else
     {
-      resp += "Not active";
+      sappends('m',"(\"sip\")[1]","Not active");
     }
-    resp += "\";";
   }
   
   if (subPage == 2) {
-    resp += ds + "LEDCN" + v + ledcount +";";
-    resp += ds + "CLDFR" + v + col_s[0] +";";
-    resp += ds + "CLDFG" + v + col_s[1] +";";
-    resp += ds + "CLDFB" + v + col_s[2] +";";
-    resp += ds + "CLDFA" + v + bri_s +";";
-    if (useRGBW) {
-      resp += ds + "CLDFW" + v + white_s +";";
-    } else {
-      resp += ds + "CLDFW" + v + "-1;";
-    }
-    resp += ds + "CSECR" + v + col_sec_s[0] +";";
-    resp += ds + "CSECG" + v + col_sec_s[1] +";";
-    resp += ds + "CSECB" + v + col_sec_s[2] +";";
-    resp += ds + "CSECW" + v + white_s +";";
-    resp += ds + "BOOTN" + c + turnOnAtBoot +";";
-    resp += ds + "BOOTP" + v + bootPreset +";";
-    resp += ds + "FXDEF" + v + effectDefault +";";
-    resp += ds + "SXDEF" + v + effectSpeedDefault +";";
-    resp += ds + "IXDEF" + v + effectIntensityDefault +";";
-    resp += ds + "GCBRI" + c + useGammaCorrectionBri +";";
-    resp += ds + "GCRGB" + c + useGammaCorrectionRGB +";";
-    resp += ds + "TFADE" + c + fadeTransition +";";
-    resp += ds + "TSWEE" + c + sweepTransition +";";
-    resp += ds + "TSDIR" + c + !sweepDirection +";";
-    resp += ds + "TDLAY" + v + transitionDelay +";";
-    resp += ds + "NRBRI" + v + briMultiplier +";";
-    resp += ds + "TLBRI" + v + nightlightTargetBri +";";
-    resp += ds + "TLDUR" + v + nightlightDelayMins +";";
-    resp += ds + "TLFDE" + c + nightlightFade +";";
-    resp += ds + "OLDEF" + v + overlayDefault +";";
-    resp += ds + "WOFFS" + v + arlsOffset +";";
+    sappend('v',"LC",ledCount);
+    sappend('v',"CR",colS[0]);
+    sappend('v',"CG",colS[1]);
+    sappend('v',"CB",colS[2]);
+    sappend('v',"CA",briS);
+    sappend('c',"EW",useRGBW);
+    sappend('c',"AW",autoRGBtoRGBW);
+    sappend('v',"CW",whiteS);
+    sappend('v',"SR",colSecS[0]);
+    sappend('v',"SG",colSecS[1]);
+    sappend('v',"SB",colSecS[2]);
+    sappend('v',"SW",whiteSecS);
+    sappend('c',"BO",turnOnAtBoot);
+    sappend('v',"BP",bootPreset);
+    sappend('v',"FX",effectDefault);
+    sappend('v',"SX",effectSpeedDefault);
+    sappend('v',"IX",effectIntensityDefault);
+    sappend('v',"FP",effectPaletteDefault);
+    sappend('c',"GB",useGammaCorrectionBri);
+    sappend('c',"GC",useGammaCorrectionRGB);
+    sappend('c',"TF",fadeTransition);
+    sappend('v',"TD",transitionDelay);
+    sappend('c',"PF",strip.paletteFade);
+    sappend('c',"T2",enableSecTransition);
+    sappend('v',"BF",briMultiplier);
+    sappend('v',"TB",nightlightTargetBri);
+    sappend('v',"TL",nightlightDelayMins);
+    sappend('c',"TW",nightlightFade);
+    sappend('i',"PB",strip.paletteBlend);
+    sappend('c',"RV",reverseMode);
+    sappend('c',"EI",initLedsLast);
+    sappend('c',"SL",skipFirstLed);
   }
 
   if (subPage == 3)
   { 
-    resp += ds + "DESC" + v + "\"" + serverDescription + "\";";
-    resp += ds + "COLMD" + c + useHSBDefault + ";";
-    resp += ds + "THEME.selectedIndex=" + String(currentTheme) + ";";
-    for(int i=0;i<6;i++)
-    resp += ds + "CCOL" + i + v + "\"" + cssCol[i] + "\";";
-    resp += ds + "CFONT" + v + "\"" + cssFont + "\";";
+    sappend('i',"UI",uiConfiguration);
+    sappends('s',"DS",serverDescription);
+    sappend('c',"MD",useHSBDefault);
+    sappend('i',"TH",currentTheme);
+    char k[3]; k[0] = 'C'; k[2] = 0; //keys
+    for (int i=0; i<6; i++)
+    {
+      k[1] = 48+i; //ascii 0,1,2,3,4,5
+      sappends('s',k,cssCol[i]);
+    }
+    sappends('s',"CF",cssFont);
   }
 
   if (subPage == 4)
   {
-    resp += ds + "BTNON" + c + buttonEnabled +";";
-    resp += ds + "NUDPP" + v + udpPort +";";
-    resp += ds + "NRCBR" + c + receiveNotificationBrightness +";";
-    resp += ds + "NRCCL" + c + receiveNotificationColor +";";
-    resp += ds + "NRCFX" + c + receiveNotificationEffects +";";
-    resp += ds + "NSDIR" + c + notifyDirectDefault +";";
-    resp += ds + "NSBTN" + c + notifyButton +";";
-    resp += ds + "ALEXA" + c + alexaEnabled +";";
-    resp += ds + "AINVN" + v + "\"" + alexaInvocationName + "\";";
-    resp += ds + "NSALX" + c + alexaNotify +";";
+    sappend('c',"BT",buttonEnabled);
+    sappend('v',"UP",udpPort);
+    sappend('c',"RB",receiveNotificationBrightness);
+    sappend('c',"RC",receiveNotificationColor);
+    sappend('c',"RX",receiveNotificationEffects);
+    sappend('c',"SD",notifyDirectDefault);
+    sappend('c',"SB",notifyButton);
+    sappend('c',"SH",notifyHue);
+    sappend('c',"S2",notifyTwice);
+    sappend('c',"RD",receiveDirect);
+    sappend('c',"EM",e131Multicast);
+    sappend('v',"EU",e131Universe);
+    sappend('v',"ET",realtimeTimeoutMs);
+    sappend('c',"FB",arlsForceMaxBri);
+    sappend('c',"RG",arlsDisableGammaCorrection);
+    sappend('v',"WO",arlsOffset);
+    sappend('c',"RU",enableRealtimeUI);
+    sappend('c',"AL",alexaEnabled);
+    sappends('s',"AI",alexaInvocationName);
+    sappend('c',"SA",notifyAlexa);
+    sappends('s',"BK",(char*)((blynkEnabled)?"Hidden":""));
+    sappends('s',"MS",mqttServer);
+    sappends('s',"MD",mqttDeviceTopic);
+    sappends('s',"MG",mqttGroupTopic);
+    sappend('v',"H0",hueIP[0]);
+    sappend('v',"H1",hueIP[1]);
+    sappend('v',"H2",hueIP[2]);
+    sappend('v',"H3",hueIP[3]);
+    sappend('v',"HL",huePollLightId);
+    sappend('v',"HI",huePollIntervalMs);
+    sappend('c',"HP",huePollingEnabled);
+    sappend('c',"HO",hueApplyOnOff);
+    sappend('c',"HB",hueApplyBri);
+    sappend('c',"HC",hueApplyColor);
+    sappends('m',"(\"hms\")[0]",hueError);
   }
 
   if (subPage == 5)
   {
-    resp += ds + "NTPON" + c + ntpEnabled +";";
-    resp += dg + "(\"times\")[0]" + ih + "\"" + getTimeString() + "\";";
+    sappend('c',"NT",ntpEnabled);
+    sappend('c',"CF",!useAMPM);
+    sappend('i',"TZ",currentTimezone);
+    sappend('v',"UO",utcOffsetSecs);
+    sappends('m',"(\"times\")[0]",(char*)getTimeString().c_str());
+    sappend('i',"OL",overlayCurrent);
+    sappend('v',"O1",overlayMin);
+    sappend('v',"O2",overlayMax);
+    sappend('v',"OM",analogClock12pixel);
+    sappend('c',"OS",analogClockSecondsTrail);
+    sappend('c',"O5",analogClock5MinuteMarks);
+    sappends('s',"CX",cronixieDisplay);
+    sappend('c',"CB",cronixieBacklight);
+    sappend('c',"CE",countdownMode);
+    sappend('v',"CY",countdownYear);
+    sappend('v',"CI",countdownMonth);
+    sappend('v',"CD",countdownDay);
+    sappend('v',"CH",countdownHour);
+    sappend('v',"CM",countdownMin);
+    sappend('v',"CS",countdownSec);
+
+    char k[4]; k[0]= 'M';
+    for (int i=1;i<17;i++)
+    {
+      sprintf(k+1,"%i",i);
+      sappends('s',k,(char*)loadMacro(i).c_str());
+    }
+    
+    sappend('v',"MB",macroBoot);
+    sappend('v',"A0",macroAlexaOn);
+    sappend('v',"A1",macroAlexaOff);
+    sappend('v',"MP",macroButton);
+    sappend('v',"ML",macroLongPress);
+    sappend('v',"MC",macroCountdown);
+    sappend('v',"MN",macroNl);
+
+    k[2] = 0; //Time macros
+    for (int i = 0; i<8; i++)
+    {
+      k[1] = 48+i; //ascii 0,1,2,3
+      k[0] = 'H'; sappend('v',k,timerHours[i]);
+      k[0] = 'N'; sappend('v',k,timerMinutes[i]);
+      k[0] = 'T'; sappend('v',k,timerMacro[i]);
+    }
   }
 
   if (subPage == 6)
   {
-    resp += ds + "NOOTA" + c + otaLock +";";
-    resp += ds + "OWIFI" + c + wifiLock +";";
-    resp += ds + "AROTA" + c + aOtaEnabled +";";
-    resp += ds + "NORAP" + c + recoveryAPDisabled +";";
-    resp += dg + "(\"msg\")[0]" + ih + "\"WLED "+ versionString +" (build " + VERSION + ") OK\";";
+    sappend('c',"NO",otaLock);
+    sappend('c',"OW",wifiLock);
+    sappend('c',"AO",aOtaEnabled);
+    sappend('c',"NA",recoveryAPDisabled);
+    sappends('m',"(\"msg\")[0]","WLED ");
+    olen -= 2; //delete ";
+    oappend(versionString);
+    oappend(" (build ");
+    oappendi(VERSION);
+    oappend(") OK\";");
   }
-  resp += "}</script>";
-  
-  return resp;
+  oappend("}</script>");
 }

wled00/wled03_set.ino

@@ -2,24 +2,20 @@
  * Receives client input
  */
 
-void _setRandomColor(bool _sec)
+void _setRandomColor(bool _sec,bool fromButton=false)
 {
   lastRandomIndex = strip.get_random_wheel_index(lastRandomIndex);
-  uint32_t _color = strip.color_wheel(lastRandomIndex);
   if (_sec){
-    white_sec = ((_color >> 24) & 0xFF);
-    col_sec[0] = ((_color >> 16) & 0xFF);
-    col_sec[1] = ((_color >> 8) & 0xFF);
-    col_sec[2] = (_color & 0xFF);
+    colorHStoRGB(lastRandomIndex*256,255,colSec);
   } else {
-    white = ((_color >> 24) & 0xFF);
-    col[0] = ((_color >> 16) & 0xFF);
-    col[1] = ((_color >> 8) & 0xFF);
-    col[2] = (_color & 0xFF);
+    colorHStoRGB(lastRandomIndex*256,255,col);
   }
+  if (fromButton) colorUpdated(2);
 }
 
-void handleSettingsSet(uint8_t subPage)
+
+//called upon POST settings form submit
+void handleSettingsSet(byte subPage)
 {
   //0: menu 1: wifi 2: leds 3: ui 4: sync 5: time 6: sec
   if (subPage <1 || subPage >6) return;
@@ -27,273 +23,254 @@ void handleSettingsSet(uint8_t subPage)
   //WIFI SETTINGS
   if (subPage == 1)
   {
-    if (server.hasArg("CSSID")) clientssid = server.arg("CSSID");
-    if (server.hasArg("CPASS"))
+    strcpy(clientSSID,server.arg("CS").c_str());
+    if (server.arg("CP").charAt(0) != '*') strcpy(clientPass, server.arg("CP").c_str());
+
+    strcpy(cmDNS, server.arg("CM").c_str());
+    
+    int t = server.arg("AT").toInt(); if (t > 9 && t <= 255) apWaitTimeSecs = t;
+    strcpy(apSSID, server.arg("AS").c_str());
+    apHide = server.hasArg("AH");
+    if (server.arg("AP").charAt(0) != '*') strcpy(apPass, server.arg("AP").c_str());
+    t = server.arg("AC").toInt(); if (t > 0 && t < 14) apChannel = t;
+    
+    char k[3]; k[2] = 0;
+    for (int i = 0; i<4; i++)
     {
-      if (!server.arg("CPASS").indexOf('*') == 0)
-      {
-        DEBUG_PRINTLN("Setting pass");
-        clientpass = server.arg("CPASS");
-      }
-    }
-    if (server.hasArg("CMDNS")) cmdns = server.arg("CMDNS");
-    if (server.hasArg("APWTM"))
-    {
-        int i = server.arg("APWTM").toInt();
-        if (i >= 0 && i <= 255) apWaitTimeSecs = i;
-    }
-    if (server.hasArg("APSSID")) apssid = server.arg("APSSID");
-    aphide = server.hasArg("APHSSID");
-    if (server.hasArg("APPASS"))
-    {
-      if (!server.arg("APPASS").indexOf('*') == 0) appass = server.arg("APPASS");
-    }
-    if (server.hasArg("APCHAN"))
-    {
-      int chan = server.arg("APCHAN").toInt();
-      if (chan > 0 && chan < 14) apchannel = chan;
-    }
-    if (server.hasArg("CSIP0"))
-    {
-      int i = server.arg("CSIP0").toInt();
-      if (i >= 0 && i <= 255) staticip[0] = i;
-    }
-    if (server.hasArg("CSIP1"))
-    {
-      int i = server.arg("CSIP1").toInt();
-      if (i >= 0 && i <= 255) staticip[1] = i;
-    }
-    if (server.hasArg("CSIP2"))
-    {
-      int i = server.arg("CSIP2").toInt();
-      if (i >= 0 && i <= 255) staticip[2] = i;
-    }
-    if (server.hasArg("CSIP3"))
-    {
-      int i = server.arg("CSIP3").toInt();
-      if (i >= 0 && i <= 255) staticip[3] = i;
-    }
-    if (server.hasArg("CSGW0"))
-    {
-      int i = server.arg("CSGW0").toInt();
-      if (i >= 0 && i <= 255) staticgateway[0] = i;
-    }
-    if (server.hasArg("CSGW1"))
-    {
-      int i = server.arg("CSGW1").toInt();
-      if (i >= 0 && i <= 255) staticgateway[1] = i;
-    }
-    if (server.hasArg("CSGW2"))
-    {
-      int i = server.arg("CSGW2").toInt();
-      if (i >= 0 && i <= 255) staticgateway[2] = i;
-    }
-    if (server.hasArg("CSGW3"))
-    {
-      int i = server.arg("CSGW3").toInt();
-      if (i >= 0 && i <= 255) staticgateway[3] = i;
-    }
-    if (server.hasArg("CSSN0"))
-    {
-      int i = server.arg("CSSN0").toInt();
-      if (i >= 0 && i <= 255) staticsubnet[0] = i;
-    }
-    if (server.hasArg("CSSN1"))
-    {
-      int i = server.arg("CSSN1").toInt();
-      if (i >= 0 && i <= 255) staticsubnet[1] = i;
-    }
-    if (server.hasArg("CSSN2"))
-    {
-      int i = server.arg("CSSN2").toInt();
-      if (i >= 0 && i <= 255) staticsubnet[2] = i;
-    }
-    if (server.hasArg("CSSN3"))
-    {
-      int i = server.arg("CSSN3").toInt();
-      if (i >= 0 && i <= 255) staticsubnet[3] = i;
+      k[1] = i+48;//ascii 0,1,2,3
+      
+      k[0] = 'I'; //static IP
+      staticIP[i] = server.arg(k).toInt();
+      
+      k[0] = 'G'; //gateway
+      staticGateway[i] = server.arg(k).toInt();
+      
+      k[0] = 'S'; //subnet
+      staticSubnet[i] = server.arg(k).toInt();
     }
   }
 
   //LED SETTINGS
   if (subPage == 2)
   {
-    if (server.hasArg("LEDCN"))
+    int t = server.arg("LC").toInt();
+    if (t > 0 && t <= 1200) ledCount = t;
+    //RMT eats up too much RAM
+    #ifdef ARDUINO_ARCH_ESP32
+    if (ledCount > 600) ledCount = 600;
+    #endif
+    useRGBW = server.hasArg("EW");
+    autoRGBtoRGBW = server.hasArg("AW");
+    if (server.hasArg("IS")) //ignore settings and save current brightness, colors and fx as default
     {
-      int i = server.arg("LEDCN").toInt();
-      if (i >= 0 && i <= LEDCOUNT) ledcount = i;
-      strip.setLedCount(ledcount);
-    }
-    if (server.hasArg("CBEOR")) //ignore settings and save current brightness, colors and fx as default
-    {
-      col_s[0] = col[0];
-      col_s[1] = col[1];
-      col_s[2] = col[2];
-      if (useRGBW) white_s = white;
-      bri_s = bri;
+      colS[0] = col[0];
+      colS[1] = col[1];
+      colS[2] = col[2];
+      colSecS[0] = colSec[0];
+      colSecS[1] = colSec[1];
+      colSecS[2] = colSec[2];
+      whiteS = white;
+      whiteSecS = whiteSec;
+      briS = bri;
       effectDefault = effectCurrent;
       effectSpeedDefault = effectSpeed;
+      effectIntensityDefault = effectIntensity;
+      effectPaletteDefault = effectPalette;
     } else {
-      if (server.hasArg("CLDFR"))
-      {
-        int i = server.arg("CLDFR").toInt();
-        if (i >= 0 && i <= 255) col_s[0] = i;
-      }
-      if (server.hasArg("CLDFG"))
-      {
-        int i = server.arg("CLDFG").toInt();
-        if (i >= 0 && i <= 255) col_s[1] = i;
-      }
-      if (server.hasArg("CLDFB"))
-      {
-        int i = server.arg("CLDFB").toInt();
-        if (i >= 0 && i <= 255) col_s[2] = i;
-      }
-      if (server.hasArg("CSECR"))
-      {
-        int i = server.arg("CSECR").toInt();
-        if (i >= 0 && i <= 255) col_sec_s[0] = i;
-      }
-      if (server.hasArg("CSECG"))
-      {
-        int i = server.arg("CSECG").toInt();
-        if (i >= 0 && i <= 255) col_sec_s[1] = i;
-      }
-      if (server.hasArg("CSECB"))
-      {
-        int i = server.arg("CSECB").toInt();
-        if (i >= 0 && i <= 255) col_sec_s[2] = i;
-      }
-      if (server.hasArg("CSECW"))
-      {
-        int i = server.arg("CSECW").toInt();
-        if (i >= 0 && i <= 255) white_sec_s = i;
-      }
-      if (server.hasArg("CLDFW"))
-      {
-        int i = server.arg("CLDFW").toInt();
-        if (i >= 0 && i <= 255)
-        {
-          useRGBW = true;
-          white_s = i;
-        } else {
-          useRGBW = false;
-          white_s = 0;
-        }
-      }
-      if (server.hasArg("CLDFA"))
-      {
-        int i = server.arg("CLDFA").toInt();
-        if (i >= 0 && i <= 255) bri_s = i;
-      }
-      if (server.hasArg("FXDEF"))
-      {
-        int i = server.arg("FXDEF").toInt();
-        if (i >= 0 && i <= 255) effectDefault = i;
-      }
-      if (server.hasArg("SXDEF"))
-      {
-        int i = server.arg("SXDEF").toInt();
-        if (i >= 0 && i <= 255) effectSpeedDefault = i;
-      }
-      if (server.hasArg("IXDEF"))
-      {
-        int i = server.arg("IXDEF").toInt();
-        if (i >= 0 && i <= 255) effectIntensityDefault = i;
-      }
-    }
-    turnOnAtBoot = server.hasArg("BOOTN");
-    if (server.hasArg("BOOTP"))
-    {
-      int i = server.arg("BOOTP").toInt();
-      if (i >= 0 && i <= 25) bootPreset = i;
-    }
-    useGammaCorrectionBri = server.hasArg("GCBRI");
-    useGammaCorrectionRGB = server.hasArg("GCRGB");
-    fadeTransition = server.hasArg("TFADE");
-    sweepTransition = server.hasArg("TSWEE");
-    sweepDirection = !server.hasArg("TSDIR");
-    if (server.hasArg("TDLAY"))
-    {
-      int i = server.arg("TDLAY").toInt();
-      if (i > 0){
-        transitionDelay = i;
-      }
-    }
-    if (server.hasArg("TLBRI"))
-    {
-      nightlightTargetBri = server.arg("TLBRI").toInt();
-    }
-    if (server.hasArg("TLDUR"))
-    {
-      int i = server.arg("TLDUR").toInt();
-      if (i > 0) nightlightDelayMins = i;
-    }
-    nightlightFade = server.hasArg("TLFDE");
-    if (server.hasArg("OLDEF"))
-    {
-      int i = server.arg("OLDEF").toInt();
-      if (i >= 0  && i <= 255) overlayDefault = i;
-    }
-    if (server.hasArg("WOFFS"))
-    {
-      int i = server.arg("WOFFS").toInt();
-      if (i >= -255  && i <= 255) arlsOffset = i;
-      arlsSign = (i>=0)?true:false;
-    }
-    if (server.hasArg("NRBRI"))
-    {
-      int i = server.arg("NRBRI").toInt();
-      if (i > 0) briMultiplier = i;
+      colS[0] = server.arg("CR").toInt();
+      colS[1] = server.arg("CG").toInt();
+      colS[2] = server.arg("CB").toInt();
+      colSecS[0] = server.arg("SR").toInt();
+      colSecS[1] = server.arg("SG").toInt();
+      colSecS[2] = server.arg("SB").toInt();
+      whiteS = server.arg("CW").toInt();
+      whiteSecS = server.arg("SW").toInt();
+      briS = server.arg("CA").toInt();
+      effectDefault = server.arg("FX").toInt();
+      effectSpeedDefault = server.arg("SX").toInt();
+      effectIntensityDefault = server.arg("IX").toInt();
+      effectPaletteDefault = server.arg("FP").toInt();
     }
+    saveCurrPresetCycConf = server.hasArg("PC");
+    turnOnAtBoot = server.hasArg("BO");
+    t = server.arg("BP").toInt();
+    if (t <= 25) bootPreset = t;
+    useGammaCorrectionBri = server.hasArg("GB");
+    useGammaCorrectionRGB = server.hasArg("GC");
+    
+    fadeTransition = server.hasArg("TF");
+    t = server.arg("TD").toInt();
+    if (t > 0) transitionDelay = t;
+    transitionDelayDefault = t;
+    strip.paletteFade = server.hasArg("PF");
+    enableSecTransition = server.hasArg("T2");
+    
+    nightlightTargetBri = server.arg("TB").toInt();
+    t = server.arg("TL").toInt();
+    if (t > 0) nightlightDelayMins = t;
+    nightlightFade = server.hasArg("TW");
+    
+    t = server.arg("PB").toInt();
+    if (t >= 0 && t < 4) strip.paletteBlend = t;
+    initLedsLast = server.hasArg("EI");
+    reverseMode = server.hasArg("RV");
+    strip.setReverseMode(reverseMode);
+    skipFirstLed = server.hasArg("SL");
+    t = server.arg("BF").toInt();
+    if (t > 0) briMultiplier = t;
   }
 
   //UI
   if (subPage == 3)
   {
-    if (server.hasArg("DESC")) serverDescription = server.arg("DESC");
-    useHSBDefault = server.hasArg("COLMD");
+    int t = server.arg("UI").toInt();
+    if (t >= 0 && t < 3) uiConfiguration = t;
+    strcpy(serverDescription, server.arg("DS").c_str());
+    useHSBDefault = server.hasArg("MD");
     useHSB = useHSBDefault;
-    if (server.hasArg("THEME")) currentTheme = server.arg("THEME").toInt();
+    currentTheme = server.arg("TH").toInt();
+    char k[3]; k[0]='C'; k[2]=0;
     for(int i=0;i<6;i++)
     {
-      if (server.hasArg("CCOL"+String(i))) cssCol[i] = server.arg("CCOL"+String(i));
+      k[1] = i+48;
+      strcpy(cssCol[i],server.arg(k).c_str());
     }
-    if (server.hasArg("CFONT")) cssFont = server.arg("CFONT");
+    strcpy(cssFont,server.arg("CF").c_str());
     buildCssColorString();
   }
 
   //SYNC
   if (subPage == 4)
   {
-    buttonEnabled = server.hasArg("BTNON");
-    if (server.hasArg("NUDPP"))
-    {
-      udpPort = server.arg("NUDPP").toInt();
-    }
-    receiveNotificationBrightness = server.hasArg("NRCBR");
-    receiveNotificationColor = server.hasArg("NRCCL");
-    receiveNotificationEffects = server.hasArg("NRCFX");
+    buttonEnabled = server.hasArg("BT");
+    int t = server.arg("UP").toInt();
+    if (t > 0) udpPort = t;
+    receiveNotificationBrightness = server.hasArg("RB");
+    receiveNotificationColor = server.hasArg("RC");
+    receiveNotificationEffects = server.hasArg("RX");
     receiveNotifications = (receiveNotificationBrightness || receiveNotificationColor || receiveNotificationEffects);
-    notifyDirectDefault = server.hasArg("NSDIR");
+    notifyDirectDefault = server.hasArg("SD");
     notifyDirect = notifyDirectDefault;
-    notifyButton = server.hasArg("NSBTN");
-    alexaEnabled = server.hasArg("ALEXA");
-    if (server.hasArg("AINVN")) alexaInvocationName = server.arg("AINVN");
-    alexaNotify = server.hasArg("NSALX");
+    notifyButton = server.hasArg("SB");
+    notifyTwice = server.hasArg("S2");
+    
+    receiveDirect = server.hasArg("RD");
+    e131Multicast = server.hasArg("EM");
+    t = server.arg("EU").toInt();
+    if (t > 0  && t <= 63999) e131Universe = t;
+    t = server.arg("ET").toInt();
+    if (t > 99  && t <= 65000) realtimeTimeoutMs = t;
+    arlsForceMaxBri = server.hasArg("FB");
+    arlsDisableGammaCorrection = server.hasArg("RG");
+    t = server.arg("WO").toInt();
+    if (t >= -255  && t <= 255) arlsOffset = t;
+    enableRealtimeUI = server.hasArg("RU");
+    
+    alexaEnabled = server.hasArg("AL");
+    strcpy(alexaInvocationName, server.arg("AI").c_str());
+    notifyAlexa = server.hasArg("SA");
+    
+    if (server.hasArg("BK") && !server.arg("BK").equals("Hidden")) {strcpy(blynkApiKey,server.arg("BK").c_str()); initBlynk(blynkApiKey);}
+
+    strcpy(mqttServer, server.arg("MS").c_str());
+    strcpy(mqttDeviceTopic, server.arg("MD").c_str());
+    strcpy(mqttGroupTopic, server.arg("MG").c_str());
+    
+    notifyHue = server.hasArg("SH");
+    for (int i=0;i<4;i++){
+      String a = "H"+String(i);
+      hueIP[i] = server.arg(a).toInt();
+    }
+
+    t = server.arg("HL").toInt();
+    if (t > 0) huePollLightId = t;
+
+    t = server.arg("HI").toInt();
+    if (t > 50) huePollIntervalMs = t;
+
+    hueApplyOnOff = server.hasArg("HO");
+    hueApplyBri = server.hasArg("HB");
+    hueApplyColor = server.hasArg("HC");
+    if (server.hasArg("HP"))
+    {
+      if (!huePollingEnabled) hueAttempt = true;
+      if (!setupHue()) hueAttempt = true;
+    } else
+    {
+      huePollingEnabled = false;
+      strcpy(hueError,"Inactive");
+    }
   }
 
   //TIME
   if (subPage == 5)
   {
-    ntpEnabled = server.hasArg("NTPON");
+    ntpEnabled = server.hasArg("NT");
+    useAMPM = !server.hasArg("CF");
+    currentTimezone = server.arg("TZ").toInt();
+    utcOffsetSecs = server.arg("UO").toInt();
     if (ntpEnabled && WiFi.status() == WL_CONNECTED && !ntpConnected) ntpConnected = ntpUdp.begin(ntpLocalPort); //start if not already connected
+    
+    if (server.hasArg("OL")){
+      overlayDefault = server.arg("OL").toInt();
+      overlayCurrent = overlayDefault;
+    }
+    
+    overlayMin = server.arg("O1").toInt();
+    overlayMax = server.arg("O2").toInt();
+    analogClock12pixel = server.arg("OM").toInt();
+    analogClock5MinuteMarks = server.hasArg("O5");
+    analogClockSecondsTrail = server.hasArg("OS");
+    
+    strcpy(cronixieDisplay,server.arg("CX").c_str());
+    bool cbOld = cronixieBacklight;
+    cronixieBacklight = server.hasArg("CB");
+    if (cbOld != cronixieBacklight && overlayCurrent == 3)
+    {
+      strip.setCronixieBacklight(cronixieBacklight); overlayRefreshedTime = 0;
+    }
+    countdownMode = server.hasArg("CE");
+    countdownYear = server.arg("CY").toInt();
+    countdownMonth = server.arg("CI").toInt();
+    countdownDay = server.arg("CD").toInt();
+    countdownHour = server.arg("CH").toInt();
+    countdownMin = server.arg("CM").toInt();
+    countdownSec = server.arg("CS").toInt();
+    
+    for (int i=1;i<17;i++)
+    {
+      String a = "M"+String(i);
+      if (server.hasArg(a)) saveMacro(i,server.arg(a),false);
+    }
+    
+    macroBoot = server.arg("MB").toInt();
+    macroAlexaOn = server.arg("A0").toInt();
+    macroAlexaOff = server.arg("A1").toInt();
+    macroButton = server.arg("MP").toInt();
+    macroLongPress = server.arg("ML").toInt();
+    macroCountdown = server.arg("MC").toInt();
+    macroNl = server.arg("MN").toInt();
+
+    char k[3]; k[2] = 0;
+    for (int i = 0; i<8; i++)
+    {
+      k[1] = i+48;//ascii 0,1,2,3
+      
+      k[0] = 'H'; //timer hours
+      timerHours[i] = server.arg(k).toInt();
+      
+      k[0] = 'N'; //minutes
+      timerMinutes[i] = server.arg(k).toInt();
+      
+      k[0] = 'T'; //macros
+      timerMacro[i] = server.arg(k).toInt();
+    }
   }
 
   //SECURITY
   if (subPage == 6)
   {
-    if (server.hasArg("RESET"))
+    if (server.hasArg("RS")) //complete factory reset
     {
       clearEEPROM();
       serveMessage(200, "All Settings erased.", "Connect to WLED-AP to setup again...",255);
@@ -301,36 +278,35 @@ void handleSettingsSet(uint8_t subPage)
     }
 
     bool pwdCorrect = !otaLock; //always allow access if ota not locked
-    if (server.hasArg("OPASS"))
+    if (server.hasArg("OP"))
     {
-      if (otaLock && otapass.equals(server.arg("OPASS")))
+      if (otaLock && strcmp(otaPass,server.arg("OP").c_str()) == 0)
       {
         pwdCorrect = true;
       }
-      if (!otaLock && server.arg("OPASS").length() > 0)
+      if (!otaLock && server.arg("OP").length() > 0)
       {
-        otapass = server.arg("OPASS");
+        strcpy(otaPass,server.arg("OP").c_str());
       }
     }
     
     if (pwdCorrect) //allow changes if correct pwd or no ota active
     {
-      otaLock = server.hasArg("NOOTA");
-      wifiLock = server.hasArg("OWIFI");
-      recoveryAPDisabled = server.hasArg("NORAP");
-      aOtaEnabled = server.hasArg("AROTA");
+      otaLock = server.hasArg("NO");
+      wifiLock = server.hasArg("OW");
+      recoveryAPDisabled = server.hasArg("NA");
+      aOtaEnabled = server.hasArg("AO");
     }
   }
-
   saveSettingsToEEPROM();
+  if (subPage == 2) strip.init(useRGBW,ledCount,skipFirstLed);
 }
 
-boolean handleSet(String req)
+bool handleSet(String req)
 {
-   boolean effectUpdated = false;
-   if (!(req.indexOf("win") >= 0)) {
-        return false;
-   }
+   bool effectUpdated = false;
+   if (!(req.indexOf("win") >= 0)) return false;
+
    int pos = 0;
    DEBUG_PRINT("API req: ");
    DEBUG_PRINTLN(req);
@@ -348,7 +324,7 @@ boolean handleSet(String req)
       }
       
       pos = req.indexOf("IN");
-      if (pos < 1) XML_response();
+      if (pos < 1) XML_response(true);
       return true;
       //if you save a macro in one request, other commands in that request are ignored due to unwanted behavior otherwise
    }
@@ -358,6 +334,19 @@ boolean handleSet(String req)
    if (pos > 0) {
       bri = req.substring(pos + 3).toInt();
    }
+
+   //set hue
+   pos = req.indexOf("HU=");
+   if (pos > 0) {
+      uint16_t temphue = req.substring(pos + 3).toInt();
+      byte tempsat = 255;
+      pos = req.indexOf("SA=");
+      if (pos > 0) {
+        tempsat = req.substring(pos + 3).toInt();
+      }
+      colorHStoRGB(temphue,tempsat,(req.indexOf("H2")>0)? colSec:col);
+   }
+   
    //set red value
    pos = req.indexOf("&R=");
    if (pos > 0) {
@@ -382,46 +371,58 @@ boolean handleSet(String req)
    //set 2nd red value
    pos = req.indexOf("R2=");
    if (pos > 0) {
-      col_sec[0] = req.substring(pos + 3).toInt();
+      colSec[0] = req.substring(pos + 3).toInt();
    }
    //set 2nd green value
    pos = req.indexOf("G2=");
    if (pos > 0) {
-      col_sec[1] = req.substring(pos + 3).toInt();
+      colSec[1] = req.substring(pos + 3).toInt();
    }
    //set 2nd blue value
    pos = req.indexOf("B2=");
    if (pos > 0) {
-      col_sec[2] = req.substring(pos + 3).toInt();
+      colSec[2] = req.substring(pos + 3).toInt();
    }
    //set 2nd white value
    pos = req.indexOf("W2=");
    if (pos > 0) {
-      white_sec = req.substring(pos + 3).toInt();
+      whiteSec = req.substring(pos + 3).toInt();
+   }
+   
+   //set color from HEX or 32bit DEC
+   pos = req.indexOf("CL=");
+   if (pos > 0) {
+      colorFromDecOrHexString(col, &white, (char*)req.substring(pos + 3).c_str());
+   }
+   pos = req.indexOf("C2=");
+   if (pos > 0) {
+      colorFromDecOrHexString(colSec, &whiteSec, (char*)req.substring(pos + 3).c_str());
    }
    
    //set 2nd to white
    pos = req.indexOf("SW");
    if (pos > 0) {
       if(useRGBW) {
-        white_sec = 255;
-        col_sec[0] = 0;
-        col_sec[1] = 0;
-        col_sec[2] = 0;
+        whiteSec = 255;
+        colSec[0] = 0;
+        colSec[1] = 0;
+        colSec[2] = 0;
       } else {
-        col_sec[0] = 255;
-        col_sec[1] = 255;
-        col_sec[2] = 255;
+        colSec[0] = 255;
+        colSec[1] = 255;
+        colSec[2] = 255;
       }
    }
+   
    //set 2nd to black
    pos = req.indexOf("SB");
    if (pos > 0) {
-      white_sec = 0;
-      col_sec[0] = 0;
-      col_sec[1] = 0;
-      col_sec[2] = 0;
+      whiteSec = 0;
+      colSec[0] = 0;
+      colSec[1] = 0;
+      colSec[2] = 0;
    }
+   
    //set to random hue SR=0->1st SR=1->2nd
    pos = req.indexOf("SR");
    if (pos > 0) {
@@ -430,24 +431,24 @@ boolean handleSet(String req)
    //set 2nd to 1st
    pos = req.indexOf("SP");
    if (pos > 0) {
-      col_sec[0] = col[0];
-      col_sec[1] = col[1];
-      col_sec[2] = col[2];
-      white_sec = white;
+      colSec[0] = col[0];
+      colSec[1] = col[1];
+      colSec[2] = col[2];
+      whiteSec = white;
    }
    //swap 2nd & 1st
    pos = req.indexOf("SC");
    if (pos > 0) {
-      uint8_t _temp[4];
+      byte _temp[4];
       for (int i = 0; i<3; i++)
       {
         _temp[i] = col[i];
-        col[i] = col_sec[i];
-        col_sec[i] = _temp[i];
+        col[i] = colSec[i];
+        colSec[i] = _temp[i];
       }
       _temp[3] = white;
-      white = white_sec;
-      white_sec = _temp[3];
+      white = whiteSec;
+      whiteSec = _temp[3];
    }
    
    //set current effect index
@@ -480,6 +481,29 @@ boolean handleSet(String req)
         effectUpdated = true;
       }
    }
+   //set effect palette (only for FastLED effects)
+   pos = req.indexOf("FP=");
+   if (pos > 0) {
+      if (effectPalette != req.substring(pos + 3).toInt())
+      {
+        effectPalette = req.substring(pos + 3).toInt();
+        strip.setPalette(effectPalette);
+        effectUpdated = true;
+      }
+   }
+
+   //set hue polling light: 0 -off
+   pos = req.indexOf("HP=");
+   if (pos > 0) {
+      int id = req.substring(pos + 3).toInt();
+      if (id > 0)
+      {
+        if (id < 100) huePollLightId = id;
+        setupHue();
+      } else {
+        huePollingEnabled = false;
+      }
+   }
    
    //set default control mode (0 - RGB, 1 - HSB)
    pos = req.indexOf("MD=");
@@ -492,19 +516,6 @@ boolean handleSet(String req)
         overlayCurrent = req.substring(pos + 3).toInt();
         strip.unlockAll();
    }
-   //set individual pixel (range) to current color
-   pos = req.indexOf("&I=");
-   if (pos > 0){
-      int index = req.substring(pos + 3).toInt();
-      pos = req.indexOf("I2=");
-      if (pos > 0){
-        int index2 = req.substring(pos + 3).toInt();
-        strip.setRange(index, index2);
-      } else
-      {
-        strip.setIndividual(index);
-      }
-   }
    //(un)lock pixel (ranges)
    pos = req.indexOf("&L=");
    if (pos > 0){
@@ -530,6 +541,7 @@ boolean handleSet(String req)
         }
       }
    }
+
    //apply macro
    pos = req.indexOf("&M=");
    if (pos > 0) {
@@ -544,6 +556,7 @@ boolean handleSet(String req)
         notifyDirect = false;
       }
    }
+   
    //toggle receive UDP direct notifications
    if (req.indexOf("RN=") > 0)
    {
@@ -553,26 +566,35 @@ boolean handleSet(String req)
         receiveNotifications = false;
       }
    }
+   
    //toggle nightlight mode
+   bool aNlDef = false;
+   if (req.indexOf("&ND") > 0) aNlDef = true;
    pos = req.indexOf("NL=");
    if (pos > 0)
    {
       if (req.indexOf("NL=0") > 0)
       {
         nightlightActive = false;
-        bri = bri_t;
+        bri = briT;
       } else {
         nightlightActive = true;
-        nightlightDelayMins = req.substring(pos + 3).toInt();
+        if (!aNlDef) nightlightDelayMins = req.substring(pos + 3).toInt();
         nightlightStartTime = millis();
       }
+   } else if (aNlDef)
+   {
+      nightlightActive = true;
+      nightlightStartTime = millis();
    }
+   
    //set nightlight target brightness
    pos = req.indexOf("NT=");
    if (pos > 0) {
       nightlightTargetBri = req.substring(pos + 3).toInt();
-      nightlightActive_old = false; //re-init
+      nightlightActiveOld = false; //re-init
    }
+   
    //toggle nightlight fade
    if (req.indexOf("NF=") > 0)
    {
@@ -582,8 +604,9 @@ boolean handleSet(String req)
       } else {
         nightlightFade = true;
       }
-      nightlightActive_old = false; //re-init
+      nightlightActiveOld = false; //re-init
    }
+   
    //toggle general purpose output
    pos = req.indexOf("AX=");
    if (pos > 0) {
@@ -591,28 +614,38 @@ boolean 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) {
+      nightlightActive = false; //always disable nightlight when toggling
       switch (req.substring(pos + 3).toInt())
       {
-        case 0: if (bri != 0){bri_last = bri; bri = 0;} break; //off
-        case 1: bri = bri_last; break; //on
+        case 0: if (bri != 0){briLast = bri; bri = 0;} break; //off
+        case 1: bri = briLast; break; //on
         default: if (bri == 0) //toggle
         {
-          bri = bri_last;
+          bri = briLast;
         } else
         {
-          bri_last = bri;
+          briLast = bri;
           bri = 0;
         }
       }
    }
+   
+   //deactivate nightlight if target brightness is reached
+   if (bri == nightlightTargetBri) nightlightActive = false;
    //set time (unix timestamp)
    pos = req.indexOf("ST=");
    if (pos > 0) {
       setTime(req.substring(pos+3).toInt());
    }
+   
    //set countdown goal (unix timestamp)
    pos = req.indexOf("CT=");
    if (pos > 0) {
@@ -620,52 +653,64 @@ boolean handleSet(String req)
       if (countdownTime - now() > 0) countdownOverTriggered = false;
    }
    
-   //set custom chase data
-   bool _cc_updated = false;
-   pos = req.indexOf("C0="); if (pos > 0) {cc_start =  (req.substring(pos + 3).toInt()); _cc_updated = true;}
-   pos = req.indexOf("C1="); if (pos > 0) {cc_index1 = (req.substring(pos + 3).toInt()); _cc_updated = true;}
-   pos = req.indexOf("C2="); if (pos > 0) {cc_index2 = (req.substring(pos + 3).toInt()); _cc_updated = true;}
-   pos = req.indexOf("CP="); if (pos > 0) {cc_numPrimary = (req.substring(pos + 3).toInt()); _cc_updated = true;}
-   pos = req.indexOf("CS="); if (pos > 0) {cc_numSecondary = (req.substring(pos + 3).toInt()); _cc_updated = true;}
-   pos = req.indexOf("CM="); if (pos > 0) {cc_step = (req.substring(pos + 3).toInt()); _cc_updated = true;}
-   pos = req.indexOf("CF="); if (pos > 0) {cc_fromStart = (req.substring(pos + 3).toInt()); _cc_updated = true;}
-   pos = req.indexOf("CE="); if (pos > 0) {cc_fromEnd = (req.substring(pos + 3).toInt()); _cc_updated = true;}
-   if (_cc_updated) strip.setCustomChase(cc_index1, cc_index2, cc_start, cc_numPrimary, cc_numSecondary, cc_step, cc_fromStart, cc_fromEnd);
-   
    //set presets
+    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();
+   
+   if (req.indexOf("CY=") > 0) //preset cycle
+   {
+      presetCyclingEnabled = true;
+      if (req.indexOf("CY=0") > 0)
+      {
+        presetCyclingEnabled = false;
+      }
+      presetCycCurr = presetCycleMin;
+   }
+   pos = req.indexOf("PT="); //sets cycle time in ms
+   if (pos > 0) {
+      int v = req.substring(pos + 3).toInt();
+      if (v > 49) presetCycleTime = v;
+   }
+   if (req.indexOf("PA=") > 0) //apply brightness from preset
+   {
+      presetApplyBri = true;
+      if (req.indexOf("PA=0") > 0) presetApplyBri = false;
+   }
+   if (req.indexOf("PC=") > 0) //apply color from preset
+   {
+      presetApplyCol = true;
+      if (req.indexOf("PC=0") > 0) presetApplyCol = false;
+   }
+   if (req.indexOf("PX=") > 0) //apply effects from preset
+   {
+      presetApplyFx = true;
+      if (req.indexOf("PX=0") > 0) presetApplyFx = false;
+   }
    pos = req.indexOf("PS="); //saves current in preset
    if (pos > 0) {
       savePreset(req.substring(pos + 3).toInt());
    }
    pos = req.indexOf("PL="); //applies entire preset
    if (pos > 0) {
-      applyPreset(req.substring(pos + 3).toInt(), true, true, true);
-      effectUpdated = true;
+      applyPreset(req.substring(pos + 3).toInt(), presetApplyBri, presetApplyCol, presetApplyFx);
+      if (presetApplyFx) effectUpdated = true;
    }
-   pos = req.indexOf("PA="); //applies brightness from preset
-   if (pos > 0) {
-      applyPreset(req.substring(pos + 3).toInt(), true, false, false);
-   }
-   pos = req.indexOf("PC="); //applies color from preset
-   if (pos > 0) {
-      applyPreset(req.substring(pos + 3).toInt(), false, true, false);
-   }
-   pos = req.indexOf("PX="); //applies effects from preset
-   if (pos > 0) {
-      applyPreset(req.substring(pos + 3).toInt(), false, false, true);
-      effectUpdated = true;
-   }
-   #ifdef CRONIXIE
+
+   //cronixie
    pos = req.indexOf("NX="); //sets digits to code
    if (pos > 0) {
-      setCronixie(req.substring(pos + 3, pos + 9).c_str());
+      strcpy(cronixieDisplay,req.substring(pos + 3, pos + 9).c_str());
+      setCronixie();
    }
    pos = req.indexOf("NM="); //mode, 1 countdown
    if (pos > 0) {
-      cronixieCountdown = true;
+      countdownMode = true;
       if (req.indexOf("NM=0") > 0)
       {
-        cronixieCountdown = false;
+        countdownMode = false;
       }
    }
    if (req.indexOf("NB=") > 0) //sets backlight
@@ -675,13 +720,22 @@ boolean handleSet(String req)
       {
         cronixieBacklight = false;
       }
-      strip.setCronixieBacklight(cronixieBacklight);
-      cronixieRefreshedTime = 0;
+      if (overlayCurrent == 3) strip.setCronixieBacklight(cronixieBacklight);
+      overlayRefreshedTime = 0;
    }
-   #endif
+   pos = req.indexOf("U0="); //user var 0
+   if (pos > 0) {
+      userVar0 = req.substring(pos + 3).toInt();
+   }
+   pos = req.indexOf("U1="); //user var 1
+   if (pos > 0) {
+      userVar1 = req.substring(pos + 3).toInt();
+   }
+   //you can add more if you need
+   
    //internal call, does not send XML response
    pos = req.indexOf("IN");
-   if (pos < 1) XML_response();
+   if (pos < 1) XML_response(true);
    //do not send UDP notifications this time
    pos = req.indexOf("NN");
    if (pos > 0)

wled00/wled04_file.ino

@@ -1,6 +1,41 @@
 /*
- * 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 (!realtimeActive && bri == 0) strip.setBrightness(briLast);
+      arlsLock(realtimeTimeoutMs);
+      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();
+        }
+        setRealtimePixel(i,sc[0],sc[1],sc[2],0);
+      }
+      strip.show();
+    }
+  }
+}
+
 #ifdef USEFS
 
 String formatBytes(size_t bytes){

wled00/wled05_init.ino

@@ -3,478 +3,258 @@
  */
 
 void wledInit()
-{
-  Serial.begin(115200);
+{ 
+  EEPROM.begin(EEPSIZE);
+  ledCount = ((EEPROM.read(229) << 0) & 0xFF) + ((EEPROM.read(398) << 8) & 0xFF00); if (ledCount > 1200 || ledCount == 0) ledCount = 10;
+  //RMT eats up too much RAM
+  #ifdef ARDUINO_ARCH_ESP32
+  if (ledCount > 600) ledCount = 600;
+  #endif
+  if (!EEPROM.read(397)) strip.init(EEPROM.read(372),ledCount,EEPROM.read(2204)); //quick init
 
+  Serial.begin(115200);
+  Serial.setTimeout(50);
+  
   #ifdef USEFS
   SPIFFS.begin();
-  {
-    Dir dir = SPIFFS.openDir("/");
-    while (dir.next()) {    
-      String fileName = dir.fileName();
-      size_t fileSize = dir.fileSize();
-      #ifdef DEBUG
-      Serial.printf("FS File: %s, size: %s\n", fileName.c_str(), formatBytes(fileSize).c_str());
-      #endif
-    }
-    DEBUG_PRINTF("\n");
-  }
   #endif
   
-  DEBUG_PRINTLN("Init EEPROM");
-  EEPROM.begin(EEPSIZE);
+  DEBUG_PRINTLN("Load EEPROM");
   loadSettingsFromEEPROM(true);
-  DEBUG_PRINT("CC: SSID: ");
-  DEBUG_PRINT(clientssid);
+  if (!initLedsLast) initStrip();
+  DEBUG_PRINT("CSSID: ");
+  DEBUG_PRINT(clientSSID);
   buildCssColorString();
-
-  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);
-  }
+  userBeginPreConnection();
+  if (strcmp(clientSSID,"Your_Network") == 0) showWelcomePage = true;
 
   initCon();
 
   DEBUG_PRINTLN("");
   DEBUG_PRINT("Connected! IP address: ");
   DEBUG_PRINTLN(WiFi.localIP());
-  
-  // Set up mDNS responder:
-  if (cmdns != NULL && !onlyAP && !MDNS.begin(cmdns.c_str())) {
-    DEBUG_PRINTLN("Error setting up MDNS responder!");
-    down();
-  }
-  DEBUG_PRINTLN("mDNS responder started");
 
-  if (udpPort > 0 && udpPort != ntpLocalPort && WiFi.status() == WL_CONNECTED)
+  if (hueIP[0] == 0)
+  {
+    hueIP[0] = WiFi.localIP()[0];
+    hueIP[1] = WiFi.localIP()[1];
+    hueIP[2] = WiFi.localIP()[2];
+  }
+
+  if (udpPort > 0 && udpPort != ntpLocalPort)
   {
     udpConnected = notifierUdp.begin(udpPort);
+    if (udpConnected && udpRgbPort != udpPort) udpRgbConnected = rgbUdp.begin(udpRgbPort);
   }
   if (ntpEnabled && WiFi.status() == WL_CONNECTED)
   ntpConnected = ntpUdp.begin(ntpLocalPort);
 
-  //SERVER INIT
-  //settings page
-  server.on("/settings", HTTP_GET, [](){
-    serveSettings(0);
-  });
-  server.on("/settings/wifi", HTTP_GET, [](){
-    if (!(wifiLock && otaLock))
-    {
-      serveSettings(1);
-    }else{
-      serveMessage(500, "Access Denied", txd, 254);
-    }
-  });
-  server.on("/settings/leds", HTTP_GET, [](){
-    serveSettings(2);
-  });
-  server.on("/settings/ui", HTTP_GET, [](){
-    serveSettings(3);
-  });
-  server.on("/settings/sync", HTTP_GET, [](){
-    serveSettings(4);
-  });
-  server.on("/settings/time", HTTP_GET, [](){
-    serveSettings(5);
-  });
-  server.on("/settings/sec", HTTP_GET, [](){
-    serveSettings(6);
-  });
-  
-  server.on("/favicon.ico", HTTP_GET, [](){
-    if(!handleFileRead("/favicon.ico"))
-    {
-      server.send_P(200, "image/x-icon", favicon, 156);
-    }
-  });
-  
-  server.on("/", HTTP_GET, [](){
-    if (!showWelcomePage){
-      if(!handleFileRead("/index.htm")) {
-        serveIndex();
-      }
-    }else{
-      if(!handleFileRead("/welcome.htm")) {
-        serveSettings(255);
-      }
-    }
-  });
-  
-  server.on("/sliders", HTTP_GET, serveIndex);
-  
-  server.on("/welcome", HTTP_GET, [](){
-    serveSettings(255);
-  });
-  
-  server.on("/reset", HTTP_GET, [](){
-    serveMessage(200,"Rebooting now...","(takes ~20 seconds, wait for auto-redirect)",139);
-    reset();
-  });
-  
-  server.on("/settings/wifi", HTTP_POST, [](){
-    if (!(wifiLock && otaLock)) handleSettingsSet(1);
-    serveMessage(200,"WiFi settings saved.","Rebooting now... (takes ~20 seconds, wait for auto-redirect)",139);
-    reset();
-  });
-
-  server.on("/settings/leds", HTTP_POST, [](){
-    handleSettingsSet(2);
-    serveMessage(200,"LED settings saved.","Redirecting...",1);
-  });
-
-  server.on("/settings/ui", HTTP_POST, [](){
-    handleSettingsSet(3);
-    serveMessage(200,"UI settings saved.","Reloading to apply theme...",122);
-  });
-
-  server.on("/settings/sync", HTTP_POST, [](){
-    handleSettingsSet(4);
-    serveMessage(200,"Sync settings saved.","Redirecting...",1);
-  });
-
-  server.on("/settings/time", HTTP_POST, [](){
-    handleSettingsSet(5);
-    serveMessage(200,"Time settings saved.","Redirecting...",1);
-  });
-
-  server.on("/settings/sec", HTTP_POST, [](){
-    handleSettingsSet(6);
-    serveMessage(200,"Security settings saved.","Rebooting now... (takes ~20 seconds, wait for auto-redirect)",139);
-    reset();
-  });
-  
-  server.on("/version", HTTP_GET, [](){
-    server.send(200, "text/plain", (String)VERSION);
-    });
-    
-  server.on("/uptime", HTTP_GET, [](){
-    server.send(200, "text/plain", (String)millis());
-    });
-    
-  server.on("/freeheap", HTTP_GET, [](){
-    server.send(200, "text/plain", (String)ESP.getFreeHeap());
-    });
-    
-  server.on("/power", HTTP_GET, [](){
-    String val = (String)(int)strip.getPowerEstimate(ledcount,strip.getColor(),strip.getBrightness());
-    val += "mA currently";
-    serveMessage(200,val,"This is just an estimate (does not take into account several factors like effects and wire resistance). It is NOT an accurate measurement!",254);
-    });
-    
-  server.on("/teapot", HTTP_GET, [](){
-    serveMessage(418, "418. I'm a teapot.","(Tangible Embedded Advanced Project Of Twinkling)",254);
-    });
-    
-  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 USEOVERLAYS
-    info += "overlays: true\r\n";
-    #else
-    info += "overlays: false\r\n";
-    #endif
-    #ifdef CRONIXIE
-    info += "cronixie: true\r\n";
-    #else
-    info += "cronixie: false\r\n";
-    #endif
-    #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);
-    });
-  //if OTA is allowed
-  if (!otaLock){
-    server.on("/edit", HTTP_GET, [](){
-    if(!handleFileRead("/edit.htm")) server.send(200, "text/html", PAGE_edit);
-    });
-    #ifdef USEFS
-    server.on("/edit", HTTP_PUT, handleFileCreate);
-    server.on("/edit", HTTP_DELETE, handleFileDelete);
-    server.on("/edit", HTTP_POST, [](){ server.send(200, "text/plain", ""); }, handleFileUpload);
-    server.on("/list", HTTP_GET, handleFileList);
-    #endif
-    server.on("/down", HTTP_GET, down);
-    server.on("/cleareeprom", HTTP_GET, clearEEPROM);
-    //init ota page
-    httpUpdater.setup(&server);
-  } else
+  //start captive portal if AP active
+  if (onlyAP || strlen(apSSID) > 0) 
   {
-    server.on("/edit", HTTP_GET, [](){
-    serveMessage(500, "Access Denied", txd, 254);
-    });
-    server.on("/down", HTTP_GET, [](){
-    serveMessage(500, "Access Denied", txd, 254);
-    });
-    server.on("/cleareeprom", HTTP_GET, [](){
-    serveMessage(500, "Access Denied", txd, 254);
-    });
-    server.on("/update", HTTP_GET, [](){
-    serveMessage(500, "Access Denied", txd, 254);
-    });
-    server.on("/list", HTTP_GET, [](){
-    serveMessage(500, "Access Denied", txd, 254);
-    });
+    dnsServer.setErrorReplyCode(DNSReplyCode::ServerFailure);
+    dnsServer.start(53, "wled.me", WiFi.softAPIP());
+    dnsActive = true;
   }
-  //called when the url is not defined here, ajax-in; get-settings
-  server.onNotFound([](){
-    DEBUG_PRINTLN("Not-Found HTTP call:");
-    DEBUG_PRINTLN("URI: " + server.uri());
-    DEBUG_PRINTLN("Body: " + server.arg(0));
-    if(!handleSet(server.uri())){
-      if(!handleAlexaApiCall(server.uri(),server.arg(0)))
-      server.send(404, "text/plain", "Not Found");
-    }
-  });
+
+  prepareIds(); //UUID from MAC (for Alexa and MQTT)
+  if (mqttDeviceTopic[0] == 0)
+  {
+    strcpy(mqttDeviceTopic, "wled/");
+    strcat(mqttDeviceTopic, escapedMac.c_str());
+  }
+  
+  //smartInit, we only init some resources when connected
+  if (!onlyAP && WiFi.status() == WL_CONNECTED)
+  {
+    mqttTCPClient = new WiFiClient();
+    mqtt = new PubSubClient(*mqttTCPClient);
+    mqttInit = initMQTT();
+  }
+   
+  if (!initLedsLast) strip.service();
+
+  //HTTP server page init
+  initServer();
+  
+  if (!initLedsLast) strip.service();
   //init Alexa hue emulation
-  if (alexaEnabled) alexaInit();
+  if (alexaEnabled && !onlyAP) alexaInit();
 
   server.begin();
   DEBUG_PRINTLN("HTTP server started");
-  // Add service to MDNS
-  MDNS.addService("http", "tcp", 80);
 
   //init ArduinoOTA
-  if (aOtaEnabled)
-  {
-    ArduinoOTA.onStart([]() {
-      #ifndef ARDUINO_ARCH_ESP32
-      wifi_set_sleep_type(NONE_SLEEP_T);
-      #endif
-      DEBUG_PRINTLN("Start ArduinoOTA");
-    });
-    ArduinoOTA.begin();
+  if (!onlyAP) {
+    if (aOtaEnabled)
+    {
+      ArduinoOTA.onStart([]() {
+        #ifndef ARDUINO_ARCH_ESP32
+        wifi_set_sleep_type(NONE_SLEEP_T);
+        #endif
+        DEBUG_PRINTLN("Start ArduinoOTA");
+      });
+      if (strlen(cmDNS) > 0) ArduinoOTA.setHostname(cmDNS);
+      ArduinoOTA.begin();
+    }
+  
+    if (!initLedsLast) strip.service();
+    // Set up mDNS responder:
+    if (strlen(cmDNS) > 0 && !onlyAP)
+    {
+      MDNS.begin(cmDNS);
+      DEBUG_PRINTLN("mDNS responder started");
+      // Add service to MDNS
+      MDNS.addService("http", "tcp", 80);
+    }
+    if (!initLedsLast) strip.service();
+
+    initBlynk(blynkApiKey);
+    initE131();
+
+    hueClient = new HTTPClient();
+  } else {
+    e131Enabled = false;
   }
 
-  // Initialize NeoPixel Strip
-  strip.init();
-  strip.setLedCount(ledcount);
+  if (initLedsLast) initStrip();
+  userBegin();
+  if (macroBoot>0) applyMacro(macroBoot);
+  Serial.println("Ada");
+}
+
+void initStrip()
+{
+  // Initialize NeoPixel Strip and button
+  if (initLedsLast) strip.init(useRGBW,ledCount,skipFirstLed);
+  strip.setReverseMode(reverseMode);
   strip.setColor(0);
   strip.setBrightness(255);
-  strip.start();
 
   pinMode(buttonPin, INPUT_PULLUP);
-  #ifdef CRONIXIE
-  strip.driverModeCronixie(true);
-  strip.setCronixieBacklight(cronixieBacklight);
-  setCronixie(cronixieDefault);
-  #endif
+  pinMode(4,OUTPUT); //this is only needed in special cases
+  digitalWrite(4,LOW);
+
   if (bootPreset>0) applyPreset(bootPreset, turnOnAtBoot, true, true);
   colorUpdated(0);
   if(digitalRead(buttonPin) == LOW) buttonEnabled = false; //disable button if it is "pressed" unintentionally
 }
 
 void initAP(){
-  String save = apssid;
-  #ifdef CRONIXIE
-    if (apssid.length() <1) apssid = "CRONIXIE-AP";
-  #else
-    if (apssid.length() <1) apssid = "WLED-AP";
-  #endif
-  WiFi.softAP(apssid.c_str(), appass.c_str(), apchannel, aphide);
-  apssid = save;
+  bool set = apSSID[0];
+  if (!set) strcpy(apSSID,"WLED-AP");
+  WiFi.softAP(apSSID, apPass, apChannel, apHide);
+  if (!set) apSSID[0] = 0;
 }
 
 void initCon()
 {
+  WiFi.disconnect(); //close old connections
+
+  if (staticIP[0] != 0)
+  {
+    WiFi.config(staticIP, staticGateway, staticSubnet, staticDNS);
+  } else
+  {
+    WiFi.config(0U, 0U, 0U);
+  }
+
+  if (strlen(apSSID)>0)
+  {
+    DEBUG_PRINT(" USING AP");
+    DEBUG_PRINTLN(strlen(apSSID));
+    initAP();
+  } else
+  {
+    DEBUG_PRINTLN(" NO AP");
+    WiFi.softAPdisconnect(true);
+  }
   int fail_count = 0;
-  if (clientssid.length() <1 || clientssid.equals("Your_Network_Here")) fail_count = apWaitTimeSecs*2;
-  WiFi.begin(clientssid.c_str(), clientpass.c_str());
-  while(WiFi.status() != WL_CONNECTED) {
-    delay(500);
-    DEBUG_PRINTLN("C_NC");
-    fail_count++;
-    if (!recoveryAPDisabled && fail_count > apWaitTimeSecs*2)
+  if (strlen(clientSSID) <1 || strcmp(clientSSID,"Your_Network") == 0) fail_count = apWaitTimeSecs*2; //instantly go to ap mode
+  #ifndef ARDUINO_ARCH_ESP32
+  WiFi.hostname(serverDescription);
+  #endif
+  WiFi.begin(clientSSID, clientPass);
+  #ifdef ARDUINO_ARCH_ESP32
+  WiFi.setHostname(serverDescription);
+  #endif
+  unsigned long lastTry = 0;
+  bool con = false;
+  while(!con)
+  {
+    yield();
+    if (!initLedsLast)
     {
-      WiFi.disconnect();
-      DEBUG_PRINTLN("Can't connect. Opening AP...");
-      onlyAP = true;
-      initAP();
-      return;
+      handleTransitions();
+      handleButton();
+      handleOverlays();
+      if (briT) strip.service();
+    }
+    if (millis()-lastTry > 499) {
+      con = (WiFi.status() == WL_CONNECTED);
+      lastTry = millis();
+      DEBUG_PRINTLN("C_NC");
+      if (!recoveryAPDisabled && fail_count > apWaitTimeSecs*2)
+      {
+        WiFi.disconnect();
+        DEBUG_PRINTLN("Can't connect. Opening AP...");
+        onlyAP = true;
+        initAP();
+        return;
+      }
+      fail_count++;
     }
   }
 }
 
-void buildCssColorString()
+
+void getBuildInfo()
 {
-  String cs[]={"","","","","",""};
-  switch (currentTheme)
-  {
-    default: cs[0]="D9B310"; cs[1]="0B3C5D"; cs[2]="1D2731"; cs[3]="328CC1"; cs[4]="000"; cs[5]="328CC1"; break; //night
-    case 1: cs[0]="eee"; cs[1]="ddd"; cs[2]="b9b9b9"; cs[3]="049"; cs[4]="777"; cs[5]="049"; break; //modern
-    case 2: cs[0]="abc"; cs[1]="fff"; cs[2]="ddd"; cs[3]="000"; cs[4]="0004"; cs[5]="000"; break; //bright
-    case 3: cs[0]="c09f80"; cs[1]="d7cec7"; cs[2]="76323f"; cs[3]="888"; cs[4]="3334"; cs[5]="888"; break; //wine
-    case 4: cs[0]="3cc47c"; cs[1]="828081"; cs[2]="d9a803"; cs[3]="1e392a"; cs[4]="000a"; cs[5]="1e392a"; break; //electric
-    case 5: cs[0]="57bc90"; cs[1]="a5a5af"; cs[2]="015249"; cs[3]="88c9d4"; cs[4]="0004"; cs[5]="88c9d4"; break; //mint
-    case 6: cs[0]="f7c331"; cs[1]="dcc7aa"; cs[2]="6b7a8f"; cs[3]="f7882f"; cs[4]="0007"; cs[5]="f7882f"; break; //amber
-    case 7: cs[0]="fc3"; cs[1]="124"; cs[2]="334"; cs[3]="f1d"; cs[4]="f00"; cs[5]="f1d"; break;//club
-    case 8: cs[0]="0ac"; cs[1]="124"; cs[2]="224"; cs[3]="003eff"; cs[4]="003eff"; cs[5]="003eff"; break;//air
-    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 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
-  }
-  cssColorString="<style>:root{--aCol:#";
-  cssColorString+=cs[0];
-  cssColorString+=";--bCol:#";
-  cssColorString+=cs[1];
-  cssColorString+=";--cCol:#";
-  cssColorString+=cs[2];
-  cssColorString+=";--dCol:#";
-  cssColorString+=cs[3];
-  cssColorString+=";--sCol:#";
-  cssColorString+=cs[4];
-  cssColorString+=";--tCol:#";
-  cssColorString+=cs[5];
-  cssColorString+=";--cFn:";
-  cssColorString+=cssFont;
-  cssColorString+=";}";
+  //fill string buffer with build info
+  olen = 0;
+  oappend("hard-coded build info:\r\n\n");
+  #ifdef ARDUINO_ARCH_ESP32
+  oappend("platform: esp32");
+  #else
+  oappend("platform: esp8266");
+  #endif
+  oappend("\r\nversion: ");
+  oappend(versionString);
+  oappend("\r\nbuild: ");
+  oappendi(VERSION);
+  oappend("\r\neepver: ");
+  oappendi(EEPVER);
+  #ifdef USEFS
+  oappend("\r\nspiffs: true\r\n");
+  #else
+  oappend("\r\nspiffs: false\r\n");
+  #endif
+  #ifdef DEBUG
+  oappend("debug: true\r\n");
+  #else
+  oappend("debug: false\r\n");
+  #endif
+  oappend("button-pin: gpio");
+  oappendi(buttonPin);
+  oappend("\r\n");
+  #ifdef ARDUINO_ARCH_ESP32
+  oappend("strip-pin: gpio");
+  oappendi(LEDPIN);
+  #else
+  oappend("strip-pin: gpio2");
+  #endif
+  oappend("\r\nbuild-type: src\r\n");
 }
 
-void serveIndex()
-{
-  if (!arlsTimeout) //do not serve while receiving realtime
-  {
-    server.setContentLength(strlen_P(PAGE_index0) + cssColorString.length() + strlen_P(PAGE_index1) + strlen_P(PAGE_index2) + strlen_P(PAGE_index3));
-    server.send(200, "text/html", "");
-    server.sendContent_P(PAGE_index0);
-    server.sendContent(cssColorString); 
-    server.sendContent_P(PAGE_index1); 
-    server.sendContent_P(PAGE_index2);
-    server.sendContent_P(PAGE_index3);
-  } else {
-    server.send(200, "text/plain", "The WLED UI is not available while receiving real-time data.");
-  }
-}
 
-void serveMessage(int code, String headl, String subl="", int optionType)
+bool checkClientIsMobile(String useragent)
 {
-  String messageBody = "<h2>";
-  messageBody += headl;
-  messageBody += "</h2>";
-  messageBody += subl;
-  switch(optionType)
-  {
-    case 255: break; //simple message
-    case 254: messageBody += "<br><br><button type=\"button\" onclick=\"B()\">Back</button>"; break; //back button
-    case 253: messageBody += "<br><br><form action=/settings><button type=submit>Back</button></form>"; //button to settings
-  }
-  if (optionType < 60) //redirect to settings after optionType seconds
-  {
-    messageBody += "<script>setTimeout(RS," + String(optionType*1000) + ")</script>";
-  } else if (optionType < 120) //redirect back after optionType-60 seconds
-  {
-    messageBody += "<script>setTimeout(B," + String((optionType-60)*1000) + ")</script>";
-  } else if (optionType < 180) //reload parent after optionType-120 seconds
-  {
-    messageBody += "<script>setTimeout(RP," + String((optionType-120)*1000) + ")</script>";
-  }
-  messageBody += "</body></html>";
-  server.setContentLength(strlen_P(PAGE_msg0) + cssColorString.length() + strlen_P(PAGE_msg1) + messageBody.length());
-  server.send(code, "text/html", "");
-  server.sendContent_P(PAGE_msg0);
-  server.sendContent(cssColorString);
-  server.sendContent_P(PAGE_msg1);
-  server.sendContent(messageBody);
-}
-
-void serveSettings(uint8_t subPage)
-{
-  //0: menu 1: wifi 2: leds 3: ui 4: sync 5: time 6: sec 255: welcomepage
-  if (!arlsTimeout) //do not serve while receiving realtime
-    {
-      int pl0, pl1;
-      switch (subPage)
-      {
-        case 1: pl0 = strlen_P(PAGE_settings_wifi0); pl1 = strlen_P(PAGE_settings_wifi1); break;
-        case 2: pl0 = strlen_P(PAGE_settings_leds0); pl1 = strlen_P(PAGE_settings_leds1); break;
-        case 3: pl0 = strlen_P(PAGE_settings_ui0); pl1 = strlen_P(PAGE_settings_ui1); break;
-        case 4: pl0 = strlen_P(PAGE_settings_sync0); pl1 = strlen_P(PAGE_settings_sync1); break;
-        case 5: pl0 = strlen_P(PAGE_settings_time0); pl1 = strlen_P(PAGE_settings_time1); break;
-        case 6: pl0 = strlen_P(PAGE_settings_sec0); pl1 = strlen_P(PAGE_settings_sec1); break;
-        case 255: pl0 = strlen_P(PAGE_welcome0); pl1 = strlen_P(PAGE_welcome1); break;
-        default: pl0 = strlen_P(PAGE_settings0); pl1 = strlen_P(PAGE_settings1);
-      }
-      
-      String settingsBuffer = getSettings(subPage);
-      int sCssLength = (subPage >0 && subPage <7)?strlen_P(PAGE_settingsCss):0;
-      
-      server.setContentLength(pl0 + cssColorString.length() + settingsBuffer.length() + sCssLength + pl1);
-      server.send(200, "text/html", "");
-      
-      switch (subPage)
-      {
-        case 1: server.sendContent_P(PAGE_settings_wifi0); break;
-        case 2: server.sendContent_P(PAGE_settings_leds0); break;
-        case 3: server.sendContent_P(PAGE_settings_ui0); break;
-        case 4: server.sendContent_P(PAGE_settings_sync0); break;
-        case 5: server.sendContent_P(PAGE_settings_time0); break;
-        case 6: server.sendContent_P(PAGE_settings_sec0); break;
-        case 255: server.sendContent_P(PAGE_welcome0); break;
-        default: server.sendContent_P(PAGE_settings0); 
-      }
-      server.sendContent(settingsBuffer);
-      server.sendContent(cssColorString);
-      if (subPage >0 && subPage <7) server.sendContent_P(PAGE_settingsCss);
-      switch (subPage)
-      {
-        case 1: server.sendContent_P(PAGE_settings_wifi1); break;
-        case 2: server.sendContent_P(PAGE_settings_leds1); break;
-        case 3: server.sendContent_P(PAGE_settings_ui1); break;
-        case 4: server.sendContent_P(PAGE_settings_sync1); break;
-        case 5: server.sendContent_P(PAGE_settings_time1); break;
-        case 6: server.sendContent_P(PAGE_settings_sec1); break;
-        case 255: server.sendContent_P(PAGE_welcome1); break;
-        default: server.sendContent_P(PAGE_settings1); 
-      }
-    } else {
-        server.send(200, "text/plain", "The settings are not available while receiving real-time data.");
-    }
+  //to save complexity this function is not comprehensive
+  if (useragent.indexOf("Android") >= 0) return true;
+  if (useragent.indexOf("iPhone") >= 0) return true;
+  if (useragent.indexOf("iPod") >= 0) return true;
+  return false;
 }
 
 
 
-

wled00/wled06_stringfiles.ino

@@ -1,6 +0,0 @@
-/*
- * foo
- */
-
-String readFromFS(String filename){return "N";};
-void writeToFS(String filename, String file) {};

wled00/wled06_usermod.ino

@@ -0,0 +1,22 @@
+/*
+ * This file allows you to add own functionality to WLED more easily
+ * See: https://github.com/Aircoookie/WLED/wiki/Add-own-functionality
+ * EEPROM bytes 2944 to 3071 are reserved for your custom use case.
+ */
+
+//Use userVar0 and userVar1 (API calls &U0=,&U1=, uint16_t)
+
+void userBeginPreConnection()
+{
+  
+}
+
+void userBegin()
+{
+
+}
+
+void userLoop()
+{
+  
+}

wled00/wled07_notify.ino

@@ -4,15 +4,19 @@
 
 #define WLEDPACKETSIZE 24
 
-void notify(uint8_t callMode)
+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;
+    case 9: if (!notifyDirect) return; break;
     default: return;
   }
   byte udpOut[WLEDPACKETSIZE];
@@ -27,12 +31,15 @@ void notify(uint8_t callMode)
   udpOut[8] = effectCurrent;
   udpOut[9] = effectSpeed;
   udpOut[10] = white;
-  udpOut[11] = 3; //compatibilityVersionByte: 0: old 1: supports white 2: supports secondary color 3: supports FX intensity, 24 byte packet
-  udpOut[12] = col_sec[0];
-  udpOut[13] = col_sec[1];
-  udpOut[14] = col_sec[2];
-  udpOut[15] = white_sec;
+  udpOut[11] = 5; //compatibilityVersionByte: 0: old 1: supports white 2: supports secondary color 3: supports FX intensity, 24 byte packet 4: supports transitionDelay 5: sup palette
+  udpOut[12] = colSec[0];
+  udpOut[13] = colSec[1];
+  udpOut[14] = colSec[2];
+  udpOut[15] = whiteSec;
   udpOut[16] = effectIntensity;
+  udpOut[17] = (transitionDelay >> 0) & 0xFF;
+  udpOut[18] = (transitionDelay >> 8) & 0xFF;
+  udpOut[19] = effectPalette;
   
   IPAddress broadcastIp;
   broadcastIp = ~WiFi.subnetMask() | WiFi.gatewayIP();
@@ -40,16 +47,98 @@ void notify(uint8_t callMode)
   notifierUdp.beginPacket(broadcastIp, udpPort);
   notifierUdp.write(udpOut, WLEDPACKETSIZE);
   notifierUdp.endPacket();
+  notificationSentCallMode = callMode;
+  notificationSentTime = millis();
+  notificationTwoRequired = (followUp)? false:notifyTwice;
+}
+
+void arlsLock(uint32_t timeoutMs)
+{
+  if (!realtimeActive){
+     for (uint16_t i = 0; i < ledCount; i++)
+     {
+       strip.setPixelColor(i,0,0,0,0);
+     }
+     strip.setMode(0);
+  }
+  realtimeActive = true;
+  realtimeTimeout = millis() + timeoutMs;
+  if (arlsForceMaxBri) strip.setBrightness(255);
+}
+
+void initE131(){
+  if (WiFi.status() == WL_CONNECTED && e131Enabled)
+  {
+    e131 = new E131();
+    e131->begin((e131Multicast) ? E131_MULTICAST : E131_UNICAST , e131Universe);
+  } else {
+    e131Enabled = false;
+  }
 }
 
 void handleNotifications()
 {
-  if(udpConnected && receiveNotifications){
-    int packetSize = notifierUdp.parsePacket();
+  //send second notification if enabled
+  if(udpConnected && notificationTwoRequired && millis()-notificationSentTime > 250){
+    notify(notificationSentCallMode,true);
+  }
+
+  //E1.31 protocol support
+  if(e131Enabled) {
+    uint16_t len = e131->parsePacket();
+    if (len && e131->universe == e131Universe) {
+      arlsLock(realtimeTimeoutMs);
+      if (len > ledCount) len = ledCount;
+      for (uint16_t i = 0; i < len; i++) {
+        int j = i * 3;
+        
+        setRealtimePixel(i, e131->data[j], e131->data[j+1], e131->data[j+2], 0);
+      }
+      strip.show();
+    }
+  }
+
+  //unlock strip when realtime UDP times out
+  if (realtimeActive && millis() > realtimeTimeout)
+  {
+    strip.unlockAll();
+    strip.setBrightness(bri);
+    realtimeActive = false;
+    strip.setMode(effectCurrent);
+    realtimeIP[0] = 0;
+  }
+
+  //receive UDP notifications
+  if(udpConnected && (receiveNotifications || receiveDirect)){
+    uint16_t packetSize = notifierUdp.parsePacket();
+
+    //hyperion / raw RGB
+    if (!packetSize && udpRgbConnected) {
+      packetSize = rgbUdp.parsePacket();
+      if (!receiveDirect) return;
+      if (packetSize > 1026 || packetSize < 3) return;
+      realtimeIP = rgbUdp.remoteIP();
+      DEBUG_PRINTLN(rgbUdp.remoteIP());
+      byte udpIn[packetSize];
+      rgbUdp.read(udpIn, packetSize);
+      arlsLock(realtimeTimeoutMs);
+      uint16_t id = 0;
+      for (uint16_t i = 0; i < packetSize -2; i += 3)
+      {
+        setRealtimePixel(id, udpIn[i], udpIn[i+1], udpIn[i+2], 0);
+        
+        id++; if (id >= ledCount) break;
+      }
+      strip.show();
+      return;
+    }
+    
+    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 && !realtimeActive && receiveNotifications) //wled notifier, block if realtime packets active
       {
         if (receiveNotificationColor)
         {
@@ -62,10 +151,10 @@ void handleNotifications()
           white = udpIn[10];
           if (udpIn[11] > 1 )
           {
-            col_sec[0] = udpIn[12];
-            col_sec[1] = udpIn[13];
-            col_sec[2] = udpIn[14];
-            white_sec = udpIn[15];
+            colSec[0] = udpIn[12];
+            colSec[1] = udpIn[13];
+            colSec[2] = udpIn[14];
+            whiteSec = udpIn[15];
           }
         }
         if (udpIn[8] != effectCurrent && receiveNotificationEffects)
@@ -83,45 +172,74 @@ void handleNotifications()
           effectIntensity = udpIn[16];
           strip.setIntensity(effectIntensity);
         }
+        if (udpIn[11] > 3)
+        {
+          transitionDelayTemp = ((udpIn[17] << 0) & 0xFF) + ((udpIn[18] << 8) & 0xFF00);
+        }
+        if (udpIn[11] > 4 && udpIn[19] != effectPalette && receiveNotificationEffects)
+        {
+          effectPalette = udpIn[19];
+          strip.setPalette(effectPalette);
+        }
         nightlightActive = udpIn[6];
         if (!nightlightActive)
         {
           if (receiveNotificationBrightness) bri = udpIn[2];
           colorUpdated(3);
         }
-      }  else if (udpIn[0] == 1) //warls
+      }  else if (udpIn[0] > 0 && udpIn[0] < 4 && receiveDirect) //1 warls //2 drgb //3 drgbw
       {
+        realtimeIP = notifierUdp.remoteIP();
+        DEBUG_PRINTLN(notifierUdp.remoteIP());
         if (packetSize > 1) {
           if (udpIn[1] == 0)
           {
-            arlsTimeout = false;
+            realtimeActive = false;
           } else {
-            if (!arlsTimeout){
-              strip.setRange(0, ledcount-1, 0);
-              strip.setMode(0);
-            }
-            arlsTimeout = true;
-            arlsTimeoutTime = millis() + 1000*udpIn[1];
+            arlsLock(udpIn[1]*1000);
           }
-          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 (uint16_t 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]);
+              setRealtimePixel(udpIn[i], udpIn[i+1], udpIn[i+2], udpIn[i+3], 0);
+            }
+          } else if (udpIn[0] == 2) //drgb
+          {
+            uint16_t id = 0;
+            for (uint16_t i = 2; i < packetSize -2; i += 3)
+            {
+              setRealtimePixel(id, udpIn[i], udpIn[i+1], udpIn[i+2], 0);
+
+              id++; if (id >= ledCount) break;
+            }
+          } else if (udpIn[0] == 3) //drgbw
+          {
+            uint16_t id = 0;
+            for (uint16_t i = 2; i < packetSize -3; i += 4)
+            {
+              setRealtimePixel(id, udpIn[i], udpIn[i+1], udpIn[i+2], udpIn[i+3]);
+              
+              id++; if (id >= ledCount) break;
             }
           }
           strip.show();
         }
       }
     }
-    if (arlsTimeout && millis() > arlsTimeoutTime)
+  }
+}
+
+void setRealtimePixel(uint16_t i, byte r, byte g, byte b, byte w)
+{
+  uint16_t pix = i + arlsOffset;
+  if (pix < ledCount)
+  {
+    if (!arlsDisableGammaCorrection && useGammaCorrectionRGB)
     {
-      strip.unlockAll();
-      arlsTimeout = false;
-      strip.setMode(effectCurrent);
+      strip.setPixelColor(pix, gamma8[r], gamma8[g], gamma8[b], gamma8[w]);
+    } else {
+      strip.setPixelColor(pix, r, g, b, w);
     }
   }
 }

wled00/wled08_led.ino

@@ -3,37 +3,56 @@
  */
 
 void setAllLeds() {
-  double d = bri_t*briMultiplier;
-  int val = d/100;
-  if (val > 255) val = 255;
-  if (useGammaCorrectionBri)
+  if (!realtimeActive || !arlsForceMaxBri)
   {
-    strip.setBrightness(gamma8[val]);
-  } else {
-    strip.setBrightness(val);
+    double d = briT*briMultiplier;
+    int val = d/100;
+    if (val > 255) val = 255;
+    if (useGammaCorrectionBri)
+    {
+      strip.setBrightness(gamma8[val]);
+    } else {
+      strip.setBrightness(val);
+    }
+  }
+  if (!enableSecTransition)
+  {
+    for (byte i = 0; i<3; i++)
+    {
+      colSecT[i] = colSec[i];
+    }
+    whiteSecT = whiteSec;
+  }
+  if (autoRGBtoRGBW)
+  {
+    colorRGBtoRGBW(colT,&whiteT);
+    colorRGBtoRGBW(colSecT,&whiteSecT);
   }
   if (useGammaCorrectionRGB)
   {
-    strip.setColor(gamma8[col_t[0]], gamma8[col_t[1]], gamma8[col_t[2]], gamma8[white_t]);
-    strip.setSecondaryColor(gamma8[col_sec[0]], gamma8[col_sec[1]], gamma8[col_sec[2]], gamma8[white_sec]);
+    strip.setColor(gamma8[colT[0]], gamma8[colT[1]], gamma8[colT[2]], gamma8[whiteT]);
+    strip.setSecondaryColor(gamma8[colSecT[0]], gamma8[colSecT[1]], gamma8[colSecT[2]], gamma8[whiteSecT]);
   } else {
-    strip.setColor(col_t[0], col_t[1], col_t[2], white_t);
-    strip.setSecondaryColor(col_sec[0], col_sec[1], col_sec[2], white_sec);
+    strip.setColor(colT[0], colT[1], colT[2], whiteT);
+    strip.setSecondaryColor(colSecT[0], colSecT[1], colSecT[2], whiteSecT);
   }
 }
 
 void setLedsStandard()
 {
-  col_old[0] = col[0];
-  col_old[1] = col[1];
-  col_old[2] = col[2];
-  white_old = white;
-  bri_old = bri;
-  col_t[0] = col[0];
-  col_t[1] = col[1];
-  col_t[2] = col[2];
-  white_t = white;
-  bri_t = bri;
+  for (byte i = 0; i<3; i++)
+  {
+    colOld[i] = col[i];
+    colT[i] = col[i];
+    colSecOld[i] = colSec[i];
+    colSecT[i] = colSec[i];
+  }
+  whiteOld = white;
+  briOld = bri;
+  whiteSecOld = whiteSec;
+  whiteT = white;
+  briT = bri;
+  whiteSecT = whiteSec;
   setAllLeds();
 }
 
@@ -41,17 +60,17 @@ bool colorChanged()
 {
   for (int i = 0; i < 3; i++)
   {
-    if (col[i] != col_it[i]) return true;
-    if (col_sec[i] != col_sec_it[i]) return true;
+    if (col[i] != colIT[i]) return true;
+    if (colSec[i] != colSecIT[i]) return true;
   }
-  if (white != white_it || white_sec != white_sec_it) return true;
-  if (bri != bri_it) return true;
+  if (white != whiteIT || whiteSec != whiteSecIT) return true;
+  if (bri != briIT) return true;
   return false;
 }
 
 void colorUpdated(int callMode)
 {
-  //call for notifier -> 0: init 1: direct change 2: button 3: notification 4: nightlight 5: other (no not.) (NN)6: fx changed
+  //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 9: blynk
   if (!colorChanged())
   {
     if (callMode == 6) notify(6);
@@ -59,83 +78,103 @@ void colorUpdated(int callMode)
   }
   if (callMode != 5 && nightlightActive && nightlightFade)
   {
-    bri_nl_t = bri;
+    briNlT = bri;
     nightlightDelayMs -= (millis() - nightlightStartTime);
     nightlightStartTime = millis();
   }
-  col_it[0] = col[0];
-  col_it[1] = col[1];
-  col_it[2] = col[2];
-  col_sec_it[0] = col_sec[0];
-  col_sec_it[1] = col_sec[1];
-  col_sec_it[2] = col_sec[2];
-  white_it = white;
-  white_sec_it = white_sec;
-  bri_it = bri;
-  if (bri > 0) bri_last = bri;
+  colIT[0] = col[0];
+  colIT[1] = col[1];
+  colIT[2] = col[2];
+  colSecIT[0] = colSec[0];
+  colSecIT[1] = colSec[1];
+  colSecIT[2] = colSec[2];
+  whiteIT = white;
+  whiteSecIT = whiteSec;
+  briIT = bri;
+  if (bri > 0) briLast = bri;
+  
   notify(callMode);
-  if (fadeTransition || sweepTransition)
+  
+  if (fadeTransition)
   {
+    //set correct delay if not using notification delay
+    if (callMode != 3) transitionDelayTemp = transitionDelay;
+    if (transitionDelayTemp == 0) {setLedsStandard(); strip.trigger(); return;}
+    
     if (transitionActive)
     {
-      col_old[0] = col_t[0];
-      col_old[1] = col_t[1];
-      col_old[2] = col_t[2];
-      white_old = white_t;
-      bri_old = bri_t;
-      tper_last = 0;
+      colOld[0] = colT[0];
+      colOld[1] = colT[1];
+      colOld[2] = colT[2];
+      whiteOld = whiteT;
+      colSecOld[0] = colSecT[0];
+      colSecOld[1] = colSecT[1];
+      colSecOld[2] = colSecT[2];
+      whiteSecOld = whiteSecT;
+      briOld = briT;
+      tperLast = 0;
     }
+    strip.setTransitionMode(true);
     transitionActive = true;
     transitionStartTime = millis();
-    strip.setFastUpdateMode(true);
   } else
   {
     setLedsStandard();
     strip.trigger();
   }
+
+  if (callMode == 8) return;
+  //only update Blynk and mqtt every 2 seconds to reduce lag
+  if (millis() - lastInterfaceUpdate <= 2000)
+  {
+    interfaceUpdateCallMode = callMode;
+    return;
+  }
+  updateInterfaces(callMode);
+}
+
+void updateInterfaces(uint8_t callMode)
+{
+  if (callMode != 9 && callMode != 5) updateBlynk();
+  publishMQTT();
+  lastInterfaceUpdate = millis();
 }
 
 void handleTransitions()
 {
-  if (transitionActive && transitionDelay > 0)
+  //handle still pending interface update
+  if (interfaceUpdateCallMode && millis() - lastInterfaceUpdate > 2000)
   {
-    float tper = (millis() - transitionStartTime)/(float)transitionDelay;
+    updateInterfaces(interfaceUpdateCallMode);
+    interfaceUpdateCallMode = 0; //disable
+  }
+  
+  if (transitionActive && transitionDelayTemp > 0)
+  {
+    float tper = (millis() - transitionStartTime)/(float)transitionDelayTemp;
     if (tper >= 1.0)
     {
+      strip.setTransitionMode(false);
       transitionActive = false;
-      tper_last = 0;
-      if (sweepTransition) strip.unlockAll();
+      tperLast = 0;
       setLedsStandard();
-      strip.setFastUpdateMode(false);
       return;
     }
-    if (tper - tper_last < transitionResolution)
+    if (tper - tperLast < 0.004)
     {
       return;
     }
-    tper_last = tper;
+    tperLast = tper;
     if (fadeTransition)
     {
-      col_t[0] = col_old[0]+((col[0] - col_old[0])*tper);
-      col_t[1] = col_old[1]+((col[1] - col_old[1])*tper);
-      col_t[2] = col_old[2]+((col[2] - col_old[2])*tper);
-      white_t  = white_old +((white  - white_old )*tper);
-      bri_t    = bri_old   +((bri    - bri_old   )*tper);
-    }
-    if (sweepTransition)
-    {
-      strip.lockAll();
-      if (sweepDirection)
+      for (byte i = 0; i<3; i++)
       {
-        strip.unlockRange(0, (int)(tper*(double)ledcount));
-      } else
-      {
-        strip.unlockRange(ledcount - (int)(tper*(double)ledcount), ledcount);
-      }
-      if (!fadeTransition)
-      {
-        setLedsStandard();
+        colT[i] = colOld[i]+((col[i] - colOld[i])*tper);
+        colSecT[i] = colSecOld[i]+((colSec[i] - colSecOld[i])*tper);
       }
+      whiteT  = whiteOld +((white  - whiteOld )*tper);
+      whiteSecT = whiteSecOld +((whiteSec  - whiteSecOld )*tper);
+      briT    = briOld   +((bri    - briOld   )*tper);
     }
     if (fadeTransition) setAllLeds();
   }
@@ -145,18 +184,18 @@ void handleNightlight()
 {
   if (nightlightActive)
   {
-    if (!nightlightActive_old) //init
+    if (!nightlightActiveOld) //init
     {
       nightlightStartTime = millis();
       notify(4);
       nightlightDelayMs = (int)(nightlightDelayMins*60000);
-      nightlightActive_old = true;
-      bri_nl_t = bri;
+      nightlightActiveOld = true;
+      briNlT = bri;
     }
     float nper = (millis() - nightlightStartTime)/((float)nightlightDelayMs);
     if (nightlightFade)
     {
-      bri = bri_nl_t+((nightlightTargetBri - bri_nl_t)*nper);
+      bri = briNlT+((nightlightTargetBri - briNlT)*nper);
       colorUpdated(5);
     }
     if (nper >= 1)
@@ -167,10 +206,21 @@ void handleNightlight()
         bri = nightlightTargetBri;
         colorUpdated(5);
       }
-      if (bri == 0) bri_last = bri_nl_t;
+      updateBlynk();
+      if (bri == 0) briLast = briNlT;
     }
-  } else if (nightlightActive_old) //early de-init
+  } else if (nightlightActiveOld) //early de-init
   {
-    nightlightActive_old = false;
+    nightlightActiveOld = false;
+  }
+
+  //also handle preset cycle here
+  if (presetCyclingEnabled && (millis() - presetCycledTime > presetCycleTime))
+  {
+    applyPreset(presetCycCurr,presetApplyBri,presetApplyCol,presetApplyFx);
+    presetCycCurr++; if (presetCycCurr > presetCycleMax) presetCycCurr = presetCycleMin;
+    if (presetCycCurr > 25) presetCycCurr = 1;
+    colorUpdated(8);
+    presetCycledTime = millis();
   }
 }

wled00/wled09_button.ino

@@ -10,27 +10,34 @@ void handleButton()
     {
       buttonPressedTime = millis();
       buttonPressedBefore = true;
-      if (buttonMacro == 255)
-      {
-        if (bri == 0)
-        {
-          bri = bri_last;
-        } else
-        {
-          bri_last = bri;
-          bri = 0;
-        }
-        colorUpdated(2);
-      } else {
-        applyMacro(buttonMacro);
-      }
     }
      else if (digitalRead(buttonPin) == HIGH && buttonPressedBefore)
     {
       delay(15); //debounce
       if (digitalRead(buttonPin) == HIGH)
       {
-        if (millis() - buttonPressedTime > 7000) initAP();
+        if (millis() - buttonPressedTime > 7000) {initAP();}
+        else if (millis() - buttonPressedTime > 700) 
+        {
+          if (macroLongPress != 0) {applyMacro(macroLongPress);}
+          else _setRandomColor(false,true);
+        }
+        else {
+          if (macroButton == 0)
+          {
+            if (bri == 0)
+            {
+              bri = briLast;
+            } else
+            {
+              briLast = bri;
+              bri = 0;
+            }
+            colorUpdated(2);
+          } else {
+            applyMacro(macroButton);
+          }
+        }
         buttonPressedBefore = false;
       }
     }

wled00/wled10_ntp.ino

@@ -2,6 +2,58 @@
  * Acquires time from NTP server
  */
 
+TimeChangeRule UTCr = {Last, Sun, Mar, 1, 0};     // UTC
+Timezone tzUTC(UTCr, UTCr);
+
+TimeChangeRule BST = {Last, Sun, Mar, 1, 60};        // British Summer Time
+TimeChangeRule GMT = {Last, Sun, Oct, 2, 0};         // Standard Time
+Timezone tzUK(BST, GMT);
+
+TimeChangeRule CEST = {Last, Sun, Mar, 2, 120};     //Central European Summer Time
+TimeChangeRule CET = {Last, Sun, Oct, 3, 60};       //Central European Standard Time
+Timezone tzEUCentral(CEST, CET);
+
+TimeChangeRule EEST = {Last, Sun, Mar, 3, 180};     //Central European Summer Time
+TimeChangeRule EET = {Last, Sun, Oct, 4, 120};       //Central European Standard Time
+Timezone tzEUEastern(EEST, EET);
+
+TimeChangeRule EDT = {Second, Sun, Mar, 2, -240 };    //Daylight time = UTC - 4 hours
+TimeChangeRule EST = {First, Sun, Nov, 2, -300 };     //Standard time = UTC - 5 hours
+Timezone tzUSEastern(EDT, EST);
+
+TimeChangeRule CDT = {Second, Sun, Mar, 2, -300 };    //Daylight time = UTC - 5 hours
+TimeChangeRule CST = {First, Sun, Nov, 2, -360 };     //Standard time = UTC - 6 hours
+Timezone tzUSCentral(CDT, CST);
+
+TimeChangeRule MDT = {Second, Sun, Mar, 2, -360 };    //Daylight time = UTC - 6 hours
+TimeChangeRule MST = {First, Sun, Nov, 2, -420 };     //Standard time = UTC - 7 hours
+Timezone tzUSMountain(MDT, MST);
+
+Timezone tzUSArizona(MST, MST); //Mountain without DST
+
+TimeChangeRule PDT = {Second, Sun, Mar, 2, -420 };    //Daylight time = UTC - 7 hours
+TimeChangeRule PST = {First, Sun, Nov, 2, -480 };     //Standard time = UTC - 8 hours
+Timezone tzUSPacific(PDT, PST);
+
+TimeChangeRule ChST = {Last, Sun, Mar, 1, 480};     // China Standard Time = UTC + 8 hours
+Timezone tzChina(ChST, ChST);
+
+TimeChangeRule JST = {Last, Sun, Mar, 1, 540};     // Japan Standard Time = UTC + 9 hours
+Timezone tzJapan(JST, JST);
+
+TimeChangeRule AEDT = {Second, Sun, Oct, 2, 660 };    //Daylight time = UTC + 11 hours
+TimeChangeRule AEST = {First, Sun, Apr, 3, 600 };     //Standard time = UTC + 10 hours
+Timezone tzAUEastern(AEDT, AEST);
+
+TimeChangeRule NZDT = {Second, Sun, Sep, 2, 780 };    //Daylight time = UTC + 13 hours
+TimeChangeRule NZST = {First, Sun, Apr, 3, 720 };     //Standard time = UTC + 12 hours
+Timezone tzNZ(NZDT, NZST);
+
+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()
 {
   if (ntpEnabled && ntpConnected && millis() - ntpLastSyncTime > 50000000L && WiFi.status() == WL_CONNECTED)
@@ -23,40 +75,40 @@ void sendNTPPacket()
   WiFi.hostByName(ntpServerName, ntpServerIP);
   DEBUG_PRINTLN("send NTP packet");
 
-  memset(ntpPacketBuffer, 0, NTP_PACKET_SIZE);
+  memset(obuf, 0, NTP_PACKET_SIZE);
 
-  ntpPacketBuffer[0] = 0b11100011;   // LI, Version, Mode
-  ntpPacketBuffer[1] = 0;     // Stratum, or type of clock
-  ntpPacketBuffer[2] = 6;     // Polling Interval
-  ntpPacketBuffer[3] = 0xEC;  // Peer Clock Precision
+  obuf[0] = 0b11100011;   // LI, Version, Mode
+  obuf[1] = 0;     // Stratum, or type of clock
+  obuf[2] = 6;     // Polling Interval
+  obuf[3] = 0xEC;  // Peer Clock Precision
   // 8 bytes of zero for Root Delay & Root Dispersion
-  ntpPacketBuffer[12]  = 49;
-  ntpPacketBuffer[13]  = 0x4E;
-  ntpPacketBuffer[14]  = 49;
-  ntpPacketBuffer[15]  = 52;
+  obuf[12]  = 49;
+  obuf[13]  = 0x4E;
+  obuf[14]  = 49;
+  obuf[15]  = 52;
 
   ntpUdp.beginPacket(ntpServerIP, 123); //NTP requests are to port 123
-  ntpUdp.write(ntpPacketBuffer, NTP_PACKET_SIZE);
+  ntpUdp.write((byte*)obuf, NTP_PACKET_SIZE);
   ntpUdp.endPacket();
 }
 
-boolean checkNTPResponse()
+bool checkNTPResponse()
 {
   int cb = ntpUdp.parsePacket();
   if (cb) {
-    DEBUG_PRINT("packet received, length=");
+    DEBUG_PRINT("packet received, l=");
     DEBUG_PRINTLN(cb);
 
-    ntpUdp.read(ntpPacketBuffer, NTP_PACKET_SIZE); // read the packet into the buffer
+    ntpUdp.read(obuf, NTP_PACKET_SIZE); // read the packet into the buffer
 
-    unsigned long highWord = word(ntpPacketBuffer[40], ntpPacketBuffer[41]);
-    unsigned long lowWord = word(ntpPacketBuffer[42], ntpPacketBuffer[43]);
+    unsigned long highWord = word(obuf[40], obuf[41]);
+    unsigned long lowWord = word(obuf[42], obuf[43]);
     if (highWord == 0 && lowWord == 0) return false;
     
     unsigned long secsSince1900 = highWord << 16 | lowWord;
  
     DEBUG_PRINT("Unix time = ");
-    unsigned long epoch = secsSince1900 - seventyYears;
+    unsigned long epoch = secsSince1900 - 2208988799UL; //subtract 70 years -1sec (on avg. more precision)
     setTime(epoch);
     DEBUG_PRINTLN(epoch);
     if (countdownTime - now() > 0) countdownOverTriggered = false;
@@ -65,36 +117,70 @@ boolean checkNTPResponse()
   return false;
 }
 
+void updateLocalTime()
+{
+  unsigned long tmc = now()+ utcOffsetSecs;
+  local = timezones[currentTimezone]->toLocal(tmc);
+}
+
 String getTimeString()
 {
-  local = TZ.toLocal(now(), &tcr);
+  updateLocalTime();
   String ret = monthStr(month(local));
   ret = ret + " ";
   ret = ret + day(local);
   ret = ret + " ";
   ret = ret + year(local);
   ret = ret + ", ";
-  ret = ret + hour(local);
+  ret += (useAMPM)? hour(local)%12:hour(local);
   ret = ret + ":";
   if (minute(local) < 10) ret = ret + "0";
   ret = ret + minute(local);
   ret = ret + ":";
   if (second(local) < 10) ret = ret + "0";
   ret = ret + second(local);
+  if (useAMPM)
+  {
+    ret += (hour(local) > 11)? " PM":" AM";
+  }
   return ret;
 }
 
+void setCountdown()
+{
+  countdownTime = timezones[currentTimezone]->toUTC(getUnixTime(countdownHour, countdownMin, countdownSec, countdownDay, countdownMonth, countdownYear));
+  if (countdownTime - now() > 0) countdownOverTriggered = false;
+}
+
 //returns true if countdown just over
 bool checkCountdown()
 {
-  long diff = countdownTime - local;
+  long diff = countdownTime - now();
   local = abs(diff);
   if (diff <0 && !countdownOverTriggered)
   {
-    applyMacro(countdownMacro);
+    if (macroCountdown != 0) applyMacro(macroCountdown);
     countdownOverTriggered = true;
     return true;
   }
   return false;
 }
 
+void checkTimers()
+{
+  if (lastTimerMinute != minute(local)) //only check once a new minute begins
+  {
+    lastTimerMinute = minute(local);
+    for (uint8_t i = 0; i < 8; i++)
+    {
+      if (timerMacro[i] != 0
+          && (timerHours[i] == hour(local) || timerHours[i] == 24) //if hour is set to 24, activate every hour 
+          && timerMinutes[i] == minute(local)
+          && timerWeekday[i] >> weekday(local) & 0x01) //timer should activate at current day of week
+      {
+        applyMacro(timerMacro[i]);
+      }
+    }
+  }
+}
+

wled00/wled11_ol.ino

@@ -1,13 +1,28 @@
 /*
- * The Overlay function is over a year old, largely untested and not configurable during runtime. Consider it as deprecated for now, it might get either removed/simplified/reworked.
+ * Used to draw clock overlays over the strip
  */
-#ifdef USEOVERLAYS
-void _nixieDisplay(int num[], int dur[], int pausedur[], int cnt)
+void initCronixie()
+{
+  if (overlayCurrent == 3 && !cronixieInit)
+  {
+    strip.driverModeCronixie(true);
+    strip.setCronixieBacklight(cronixieBacklight);
+    setCronixie();
+    cronixieInit = true;
+  } else if (cronixieInit && overlayCurrent != 3)
+  {
+    strip.driverModeCronixie(false);
+    cronixieInit = false; 
+  }
+}
+
+
+void _nixieDisplay(int num[], uint16_t dur[], uint16_t pausedur[], byte cnt)
 {
   strip.setRange(overlayMin, overlayMax, 0);
   if (num[nixieClockI] >= 0 && !nixiePause)
   {
-    strip.setIndividual(num[nixieClockI],((uint32_t)white << 24)| ((uint32_t)col_t[0] << 16) | ((uint32_t)col_t[1] << 8) | col_t[2]);
+    strip.setIndividual(num[nixieClockI],((uint32_t)white << 24)| ((uint32_t)colT[0] << 16) | ((uint32_t)colT[1] << 8) | colT[2]);
     strip.unlock(num[nixieClockI]);
   }
   if (!nixiePause)
@@ -84,8 +99,6 @@ void _nixieNumber(int number, int dur)
       if (overlayArr[i] != -1)
       {
         overlayArr[i] = overlayArr[i] + overlayMin;
-        if (overlayReverse)
-          overlayArr[i] = overlayMax - overlayArr[i];
       }
     }
     for (int i = 0; i <6; i++)
@@ -104,26 +117,23 @@ void _nixieNumber(int number, int dur)
   }
 }
 
+
 void handleOverlays()
 {
-  //properties: range, (color)
-  //0 no overlay
-  //1 solid color (NI)
-  //2 analog clock
-  //3 digital nixie-style clock one digit
-  //4 just static hour (NI)
-  //5 analog countdown
-  //6 digital one digit countdown
   if (millis() - overlayRefreshedTime > overlayRefreshMs)
   {
-    overlayRefreshedTime = millis();
+    initCronixie();
+    updateLocalTime();
+    checkTimers();
     switch (overlayCurrent)
     {
-      case 2: _overlayAnalogClock(); break;//2 analog clock
-      case 3: _overlayNixieClock(); break;//nixie 1-digit
-      case 5: _overlayAnalogCountdown(); break;//a.countdown 
-      case 6: _overlayNixieCountdown(); break;//d.
+      case 0: break;//no overlay
+      case 1: _overlayAnalogClock(); break;//2 analog clock
+      case 2: _overlayNixieClock(); break;//nixie 1-digit
+      case 3: _overlayCronixie();//Diamex cronixie clock kit
     }
+    if (!countdownMode || overlayCurrent < 2) checkCountdown(); //countdown macro activation must work
+    overlayRefreshedTime = millis();
   }
 }
 
@@ -131,13 +141,10 @@ void _overlayAnalogClock()
 {
   int overlaySize = overlayMax - overlayMin +1;
   strip.unlockAll();
-  if (overlayDimBg)
+  if (countdownMode)
   {
-    uint32_t ct = (white>>1)*16777216 + (col[0]>>1)*65536 + (col[1]>>1)*256 + (col[2]>>1);
-    if (useGammaCorrectionRGB) ct = (gamma8[white]>>1)*16777216 + (gamma8[col[0]]>>1)*65536 + (gamma8[col[1]]>>1)*256 + (gamma8[col[2]]>>1);
-    strip.setRange(overlayMin, overlayMax, ct);
+    _overlayAnalogCountdown(); return;
   }
-  local = TZ.toLocal(now(), &tcr);
   double hourP = ((double)(hour(local)%12))/12;
   double minuteP = ((double)minute(local))/60;
   hourP = hourP + minuteP/12;
@@ -148,6 +155,17 @@ void _overlayAnalogClock()
   if (minutePixel > overlayMax) minutePixel = overlayMin -1 + minutePixel - overlayMax; 
   int secondPixel = floor(analogClock12pixel + overlaySize*secondP);
   if (secondPixel > overlayMax) secondPixel = overlayMin -1 + secondPixel - overlayMax;
+  if (analogClockSecondsTrail)
+  {
+    if (secondPixel < analogClock12pixel)
+    {
+      strip.setRange(analogClock12pixel, overlayMax, 0xFF0000);
+      strip.setRange(overlayMin, secondPixel, 0xFF0000);
+    } else
+    {
+      strip.setRange(analogClock12pixel, secondPixel, 0xFF0000);
+    }
+  }
   if (analogClock5MinuteMarks)
   {
     int pix;
@@ -155,16 +173,10 @@ void _overlayAnalogClock()
     {
       pix = overlayMin + analogClock12pixel + (overlaySize/12)*i;
       if (pix > overlayMax) pix = pix - overlayMax;
-      strip.setIndividual(pix, 0xAAAAAA);
+      strip.setIndividual(pix,0x00FFAA);
     }
   }
-  if (analogClockSecondsTrail)
-  {
-    strip.setRange(analogClock12pixel, secondPixel, 0xFF0000);
-  } else
-  {
-    strip.setIndividual(secondPixel, 0xFF0000);
-  }
+  if (!analogClockSecondsTrail) strip.setIndividual(secondPixel, 0xFF0000);
   strip.setIndividual(minutePixel, 0x00FF00);
   strip.setIndividual(hourPixel, 0x0000FF);
   overlayRefreshMs = 998;
@@ -172,14 +184,18 @@ void _overlayAnalogClock()
 
 void _overlayNixieClock()
 {
+  #ifdef WLED_FLASH_512K_MODE
+  if (countdownMode) checkCountdown();
+  #else
+  
+  if (countdownMode)
+  {
+    _overlayNixieCountdown(); return;
+  }
   if (nixieClockI < 0)
   {
-      local = TZ.toLocal(now(), &tcr);
       overlayArr[0] = hour(local);
-      if (nixieClock12HourFormat && overlayArr[0] > 12)
-      {
-        overlayArr[0] = overlayArr[0]%12;
-      }
+      if (useAMPM) overlayArr[0] = overlayArr[0]%12;
       overlayArr[1] = -1;
       if (overlayArr[0] > 9)
       {
@@ -191,7 +207,7 @@ void _overlayNixieClock()
       overlayArr[2] = overlayArr[2]/10;
       overlayArr[4] = -1;
       overlayArr[5] = -1;
-      if (nixieClockDisplaySeconds)
+      if (analogClockSecondsTrail)
       {
         overlayArr[4] = second(local);
         overlayArr[5] = overlayArr[4]%10;
@@ -202,8 +218,6 @@ void _overlayNixieClock()
         if (overlayArr[i] != -1)
         {
           overlayArr[i] = overlayArr[i] + overlayMin;
-          if (overlayReverse)
-            overlayArr[i] = overlayMax - overlayArr[i];
         }
       }
       overlayDur[0] = 12 + 12*(255 - overlaySpeed);
@@ -258,6 +272,7 @@ void _overlayNixieClock()
   {
     _nixieDisplay(overlayArr, overlayDur, overlayPauseDur, 6);
   }
+  #endif
 }
 
 void _overlayAnalogCountdown()
@@ -292,19 +307,20 @@ void _overlayAnalogCountdown()
     int overlaySize = overlayMax - overlayMin +1;
     double perc = (pval-(double)diff)/pval;
     if (perc > 1.0) perc = 1.0;
-    uint8_t pixelCnt = perc*overlaySize;
+    byte pixelCnt = perc*overlaySize;
     if (analogClock12pixel + pixelCnt > overlayMax)
     {
-      strip.setRange(analogClock12pixel, overlayMax, ((uint32_t)white_sec << 24)| ((uint32_t)col_sec[0] << 16) | ((uint32_t)col_sec[1] << 8) | col_sec[2]);
-      strip.setRange(overlayMin, overlayMin +pixelCnt -(1+ overlayMax -analogClock12pixel), ((uint32_t)white_sec << 24)| ((uint32_t)col_sec[0] << 16) | ((uint32_t)col_sec[1] << 8) | col_sec[2]);
+      strip.setRange(analogClock12pixel, overlayMax, ((uint32_t)whiteSec << 24)| ((uint32_t)colSec[0] << 16) | ((uint32_t)colSec[1] << 8) | colSec[2]);
+      strip.setRange(overlayMin, overlayMin +pixelCnt -(1+ overlayMax -analogClock12pixel), ((uint32_t)whiteSec << 24)| ((uint32_t)colSec[0] << 16) | ((uint32_t)colSec[1] << 8) | colSec[2]);
     } else
     {
-      strip.setRange(analogClock12pixel, analogClock12pixel + pixelCnt, ((uint32_t)white_sec << 24)| ((uint32_t)col_sec[0] << 16) | ((uint32_t)col_sec[1] << 8) | col_sec[2]);
+      strip.setRange(analogClock12pixel, analogClock12pixel + pixelCnt, ((uint32_t)whiteSec << 24)| ((uint32_t)colSec[0] << 16) | ((uint32_t)colSec[1] << 8) | colSec[2]);
     }
   }
   overlayRefreshMs = 998;
 }
 
+
 void _overlayNixieCountdown()
 {
   if (now() >= countdownTime)
@@ -331,5 +347,5 @@ void _overlayNixieCountdown()
     }
     _nixieNumber(diff, 800);
   }
+  overlayRefreshMs = 998;
 }
-#endif

wled00/wled12_alexa.ino

@@ -10,8 +10,6 @@ void alexaInit()
 {
   if (alexaEnabled && WiFi.status() == WL_CONNECTED)
   {
-    prepareIds();
-    
     udpConnected = connectUDP();
     
     if (udpConnected) alexaInitPages();
@@ -24,17 +22,16 @@ void handleAlexa()
   {
     if(udpConnected){    
     // if there’s data available, read a packet
-    int packetSize = UDP.parsePacket();
+    int packetSize = alexaUDP.parsePacket();
       if(packetSize>0) {
-        IPAddress remote = UDP.remoteIP();
-        int len = UDP.read(packetBuffer, 255);
+        IPAddress remote = alexaUDP.remoteIP();
+        int len = alexaUDP.read(obuf, 254);
         if (len > 0) {
-            packetBuffer[len] = 0;
+            obuf[len] = 0;
         }
-        String request = packetBuffer;
         
-        if(request.indexOf("M-SEARCH") >= 0) {
-          if(request.indexOf("upnp:rootdevice") > 0 || request.indexOf("device:basic:1") > 0) {
+        if(strstr(obuf,"M-SEARCH") > 0) {
+          if(strstr(obuf,"upnp:rootdevice") > 0 || strstr(obuf,"device:basic:1") > 0) {
               DEBUG_PRINTLN("Responding search req...");
               respondToSearch();
           }
@@ -46,47 +43,40 @@ void handleAlexa()
 
 void alexaOn()
 {
-  if (alexaOnMacro == 255)
+  if (macroAlexaOn == 0)
   {
-    handleSet((alexaNotify)?"win&T=1&IN":"win&T=1&NN&IN");
+    handleSet((notifyAlexa)?"win&T=1&IN":"win&T=1&NN&IN");
   } else
   {
-    applyMacro(alexaOnMacro);
+    applyMacro(macroAlexaOn);
   }
 
-  String body = "[{\"success\":{\"/lights/1/state/on\":true}}]";
-
-  server.send(200, "text/xml", body.c_str());
-        
-  DEBUG_PRINT("Sending :");
-  DEBUG_PRINTLN(body);
+  server.send(200, "application/json", "[{\"success\":{\"/lights/1/state/on\":true}}]");
 }
 
 void alexaOff()
 {
-  if (alexaOffMacro == 255)
+  if (macroAlexaOff == 0)
   {
-    handleSet((alexaNotify)?"win&T=0&IN":"win&T=0&NN&IN");
+    handleSet((notifyAlexa)?"win&T=0&IN":"win&T=0&NN&IN");
   } else
   {
-    applyMacro(alexaOffMacro);
+    applyMacro(macroAlexaOff);
   }
 
-  String body = "[{\"success\":{\"/lights/1/state/on\":false}}]";
-
-  server.send(200, "application/json", body.c_str());
-        
-  DEBUG_PRINT("Sending:");
-  DEBUG_PRINTLN(body);
+  server.send(200, "application/json", "[{\"success\":{\"/lights/1/state/on\":false}}]");
 }
 
-void alexaDim(uint8_t briL)
+void alexaDim(byte briL)
 {
-  String body = "[{\"success\":{\"/lights/1/state/bri\":"+ String(briL) +"}}]";
+  olen = 0;
+  oappend("[{\"success\":{\"/lights/1/state/bri\":");
+  oappendi(briL);
+  oappend("}}]");
 
-  server.send(200, "application/json", body.c_str());
+  server.send(200, "application/json", obuf);
   
-  String ct = (alexaNotify)?"win&IN&A=":"win&NN&IN&A=";
+  String ct = (notifyAlexa)?"win&IN&A=":"win&NN&IN&A=";
   if (briL < 255)
   {
     ct = ct + (briL+1);
@@ -106,32 +96,39 @@ void prepareIds() {
 void respondToSearch() {
     DEBUG_PRINTLN("");
     DEBUG_PRINT("Send resp to ");
-    DEBUG_PRINTLN(UDP.remoteIP());
+    DEBUG_PRINTLN(alexaUDP.remoteIP());
     DEBUG_PRINT("Port : ");
-    DEBUG_PRINTLN(UDP.remotePort());
+    DEBUG_PRINTLN(alexaUDP.remotePort());
 
     IPAddress localIP = WiFi.localIP();
     char s[16];
     sprintf(s, "%d.%d.%d.%d", localIP[0], localIP[1], localIP[2], localIP[3]);
 
-    String response = 
+    olen = 0;
+    oappend(
       "HTTP/1.1 200 OK\r\n"
       "EXT:\r\n"
       "CACHE-CONTROL: max-age=100\r\n" // SSDP_INTERVAL
-      "LOCATION: http://"+ String(s) +":80/description.xml\r\n"
+      "LOCATION: http://");
+    oappend(s);
+    oappend(":80/description.xml\r\n"
       "SERVER: FreeRTOS/6.0.5, UPnP/1.0, IpBridge/1.17.0\r\n" // _modelName, _modelNumber
-      "hue-bridgeid: "+ escapedMac +"\r\n"
+      "hue-bridgeid: ");
+    oappend((char*)escapedMac.c_str());
+    oappend("\r\n"
       "ST: urn:schemas-upnp-org:device:basic:1\r\n"  // _deviceType
-      "USN: uuid:2f402f80-da50-11e1-9b23-"+ escapedMac +"::upnp:rootdevice\r\n" // _uuid::_deviceType
-      "\r\n";
+      "USN: uuid:2f402f80-da50-11e1-9b23-");
+    oappend((char*)escapedMac.c_str());
+    oappend("::upnp:rootdevice\r\n" // _uuid::_deviceType
+      "\r\n");
 
-    UDP.beginPacket(UDP.remoteIP(), UDP.remotePort());
+    alexaUDP.beginPacket(alexaUDP.remoteIP(), alexaUDP.remotePort());
     #ifdef ARDUINO_ARCH_ESP32
-    UDP.write((uint8_t*)response.c_str(), response.length());
+    alexaUDP.write((byte*)obuf, olen);
     #else
-    UDP.write(response.c_str());
+    alexaUDP.write(obuf);
     #endif
-    UDP.endPacket();                    
+    alexaUDP.endPacket();                    
 
      DEBUG_PRINTLN("Response sent!");
 }
@@ -144,22 +141,31 @@ void alexaInitPages() {
       IPAddress localIP = WiFi.localIP();
       char s[16];
       sprintf(s, "%d.%d.%d.%d", localIP[0], localIP[1], localIP[2], localIP[3]);
-    
-      String setup_xml = "<?xml version=\"1.0\" ?>"
+
+      olen = 0;
+      oappend("<?xml version=\"1.0\" ?>"
           "<root xmlns=\"urn:schemas-upnp-org:device-1-0\">"
           "<specVersion><major>1</major><minor>0</minor></specVersion>"
-          "<URLBase>http://"+ String(s) +":80/</URLBase>"
+          "<URLBase>http://");
+      oappend(s);
+      oappend(":80/</URLBase>"
           "<device>"
             "<deviceType>urn:schemas-upnp-org:device:Basic:1</deviceType>"
-            "<friendlyName>Philips hue ("+ String(s) +")</friendlyName>"
+            "<friendlyName>Philips hue (");
+      oappend(s);
+      oappend(")</friendlyName>"
             "<manufacturer>Royal Philips Electronics</manufacturer>"
             "<manufacturerURL>http://www.philips.com</manufacturerURL>"
             "<modelDescription>Philips hue Personal Wireless Lighting</modelDescription>"
             "<modelName>Philips hue bridge 2012</modelName>"
             "<modelNumber>929000226503</modelNumber>"
             "<modelURL>http://www.meethue.com</modelURL>"
-            "<serialNumber>"+ escapedMac +"</serialNumber>"
-            "<UDN>uuid:2f402f80-da50-11e1-9b23-"+ escapedMac +"</UDN>"
+            "<serialNumber>");
+      oappend((char*)escapedMac.c_str());
+      oappend("</serialNumber>"
+            "<UDN>uuid:2f402f80-da50-11e1-9b23-");
+      oappend((char*)escapedMac.c_str());
+      oappend("</UDN>"
             "<presentationURL>index.html</presentationURL>"
             "<iconList>"
             "  <icon>"
@@ -178,12 +184,11 @@ void alexaInitPages() {
             "  </icon>"
             "</iconList>"
           "</device>"
-          "</root>";
+          "</root>");
             
-        server.send(200, "text/xml", setup_xml.c_str());
+        server.send(200, "text/xml", obuf);
         
-        DEBUG_PRINT("Sending :");
-        DEBUG_PRINTLN(setup_xml);
+        DEBUG_PRINTLN("Sending setup_xml");
     });
 
     // openHAB support
@@ -202,9 +207,9 @@ void alexaInitPages() {
       server.on("/status.html", HTTP_GET, [](){
         DEBUG_PRINTLN("Got status request");
  
-        String statrespone = "0"; 
+        char statrespone[] = "0"; 
         if (bri > 0) {
-          statrespone = "1"; 
+          statrespone[0] = '1'; 
         }
         server.send(200, "text/plain", statrespone);
       
@@ -223,7 +228,7 @@ String briForHue(int realBri)
   return String(realBri);
 }
 
-boolean handleAlexaApiCall(String req, String body) //basic implementation of Philips hue api functions needed for basic Alexa control
+bool handleAlexaApiCall(String req, String body) //basic implementation of Philips hue api functions needed for basic Alexa control
 {
   DEBUG_PRINTLN("AlexaApiCall");
   if (req.indexOf("api") <0) return false;
@@ -246,14 +251,14 @@ boolean handleAlexaApiCall(String req, String body) //basic implementation of Ph
   if (req.indexOf("lights/1") > 0) //client wants light info
   {
     DEBUG_PRINTLN("l1");
-    server.send(200, "application/json", "{\"manufacturername\":\"OpenSource\",\"modelid\":\"LST001\",\"name\":\""+ alexaInvocationName +"\",\"state\":{\"on\":"+ boolString(bri) +",\"hue\":0,\"bri\":"+ briForHue(bri) +",\"sat\":0,\"xy\":[0.00000,0.00000],\"ct\":500,\"alert\":\"none\",\"effect\":\"none\",\"colormode\":\"hs\",\"reachable\":true},\"swversion\":\"0.1\",\"type\":\"Extended color light\",\"uniqueid\":\"2\"}");
+    server.send(200, "application/json", "{\"manufacturername\":\"OpenSource\",\"modelid\":\"LST001\",\"name\":\""+ String(alexaInvocationName) +"\",\"state\":{\"on\":"+ boolString(bri) +",\"hue\":0,\"bri\":"+ briForHue(bri) +",\"sat\":0,\"xy\":[0.00000,0.00000],\"ct\":500,\"alert\":\"none\",\"effect\":\"none\",\"colormode\":\"hs\",\"reachable\":true},\"swversion\":\"0.1\",\"type\":\"Extended color light\",\"uniqueid\":\"2\"}");
 
     return true;
   }
   if (req.indexOf("lights") > 0) //client wants all lights
   {
     DEBUG_PRINTLN("lAll");
-    server.send(200, "application/json", "{\"1\":{\"type\":\"Extended color light\",\"manufacturername\":\"OpenSource\",\"swversion\":\"0.1\",\"name\":\""+ alexaInvocationName +"\",\"uniqueid\":\""+ WiFi.macAddress() +"-2\",\"modelid\":\"LST001\",\"state\":{\"on\":"+ boolString(bri) +",\"bri\":"+ briForHue(bri) +",\"xy\":[0.00000,0.00000],\"colormode\":\"hs\",\"effect\":\"none\",\"ct\":500,\"hue\":0,\"sat\":0,\"alert\":\"none\",\"reachable\":true}}}");
+    server.send(200, "application/json", "{\"1\":{\"type\":\"Extended color light\",\"manufacturername\":\"OpenSource\",\"swversion\":\"0.1\",\"name\":\""+ String(alexaInvocationName) +"\",\"uniqueid\":\""+ WiFi.macAddress() +"-2\",\"modelid\":\"LST001\",\"state\":{\"on\":"+ boolString(bri) +",\"bri\":"+ briForHue(bri) +",\"xy\":[0.00000,0.00000],\"colormode\":\"hs\",\"effect\":\"none\",\"ct\":500,\"hue\":0,\"sat\":0,\"alert\":\"none\",\"reachable\":true}}}");
     return true;
   }
 
@@ -262,16 +267,16 @@ boolean handleAlexaApiCall(String req, String body) //basic implementation of Ph
   return true;
 }
 
-boolean connectUDP(){
-  boolean state = false;
+bool connectUDP(){
+  bool state = false;
   
   DEBUG_PRINTLN("");
   DEBUG_PRINTLN("Con UDP");
 
   #ifdef ARDUINO_ARCH_ESP32
-  if(UDP.beginMulticast(ipMulti, portMulti))
+  if(alexaUDP.beginMulticast(ipMulti, portMulti))
   #else
-  if(UDP.beginMulticast(WiFi.localIP(), ipMulti, portMulti))
+  if(alexaUDP.beginMulticast(WiFi.localIP(), ipMulti, portMulti))
   #endif
   {
     DEBUG_PRINTLN("Con success");

wled00/wled13_cronixie.ino

@@ -1,14 +1,13 @@
 /*
  * Support for the Cronixie clock
  */
-#ifdef CRONIXIE
-uint8_t getSameCodeLength(char code, int index, char const digits[])
+byte getSameCodeLength(char code, int index, char const cronixieDisplay[])
 {
-  uint8_t counter = 0;
+  byte counter = 0;
   
   for (int i = index+1; i < 6; i++)
   {
-    if (digits[i] == code)
+    if (cronixieDisplay[i] == code)
     {
       counter++;
     } else {
@@ -18,8 +17,9 @@ uint8_t getSameCodeLength(char code, int index, char const digits[])
   return counter;
 }
 
-void setCronixie(char const digits[])
+void setCronixie()
 {
+  #ifndef WLED_FLASH_512K_MODE
   /*
    * digit purpose index
    * 0-9 | 0-9 (incl. random)
@@ -84,14 +84,14 @@ void setCronixie(char const digits[])
   //D Day of Week | DD Day Of Month | DDD Day Of Year
 
   DEBUG_PRINT("cset ");
-  DEBUG_PRINTLN(digits);
+  DEBUG_PRINTLN(cronixieDisplay);
 
-  cronixieRefreshMs = 1997; //Only refresh every 2secs if no seconds are displayed
+  overlayRefreshMs = 1997; //Only refresh every 2secs if no seconds are displayed
   
   for (int i = 0; i < 6; i++)
   {
     dP[i] = 10;
-    switch (digits[i])
+    switch (cronixieDisplay[i])
     {
       case '_': dP[i] = 10; break; 
       case '-': dP[i] = 11; break; 
@@ -99,24 +99,24 @@ void setCronixie(char const digits[])
       case 'R': dP[i] = random(0,10); break; //random btw. 0-9
       case 't': break; //Test upw.
       case 'T': break; //Test dnw.
-      case 'b': dP[i] = 14 + getSameCodeLength('b',i,digits); i = i+dP[i]-14; break; 
-      case 'B': dP[i] = 14 + getSameCodeLength('B',i,digits); i = i+dP[i]-14; break;
-      case 'h': dP[i] = 70 + getSameCodeLength('h',i,digits); i = i+dP[i]-70; break;
-      case 'H': dP[i] = 20 + getSameCodeLength('H',i,digits); i = i+dP[i]-20; break;
+      case 'b': dP[i] = 14 + getSameCodeLength('b',i,cronixieDisplay); i = i+dP[i]-14; break; 
+      case 'B': dP[i] = 14 + getSameCodeLength('B',i,cronixieDisplay); i = i+dP[i]-14; break;
+      case 'h': dP[i] = 70 + getSameCodeLength('h',i,cronixieDisplay); i = i+dP[i]-70; break;
+      case 'H': dP[i] = 20 + getSameCodeLength('H',i,cronixieDisplay); i = i+dP[i]-20; break;
       case 'A': dP[i] = 108; i++; break;
       case 'a': dP[i] = 58; i++; break;
-      case 'm': dP[i] = 74 + getSameCodeLength('m',i,digits); i = i+dP[i]-74; break;
-      case 'M': dP[i] = 24 + getSameCodeLength('M',i,digits); i = i+dP[i]-24; break;
-      case 's': dP[i] = 80 + getSameCodeLength('s',i,digits); i = i+dP[i]-80; cronixieRefreshMs = 497; break; //refresh more often bc. of secs
-      case 'S': dP[i] = 30 + getSameCodeLength('S',i,digits); i = i+dP[i]-30; cronixieRefreshMs = 497; break;
-      case 'Y': dP[i] = 36 + getSameCodeLength('Y',i,digits); i = i+dP[i]-36; break; 
-      case 'y': dP[i] = 86 + getSameCodeLength('y',i,digits); i = i+dP[i]-86; break; 
-      case 'I': dP[i] = 39 + getSameCodeLength('I',i,digits); i = i+dP[i]-39; break;  //Month. Don't ask me why month and minute both start with M.
-      case 'i': dP[i] = 89 + getSameCodeLength('i',i,digits); i = i+dP[i]-89; break; 
+      case 'm': dP[i] = 74 + getSameCodeLength('m',i,cronixieDisplay); i = i+dP[i]-74; break;
+      case 'M': dP[i] = 24 + getSameCodeLength('M',i,cronixieDisplay); i = i+dP[i]-24; break;
+      case 's': dP[i] = 80 + getSameCodeLength('s',i,cronixieDisplay); i = i+dP[i]-80; overlayRefreshMs = 497; break; //refresh more often bc. of secs
+      case 'S': dP[i] = 30 + getSameCodeLength('S',i,cronixieDisplay); i = i+dP[i]-30; overlayRefreshMs = 497; break;
+      case 'Y': dP[i] = 36 + getSameCodeLength('Y',i,cronixieDisplay); i = i+dP[i]-36; break; 
+      case 'y': dP[i] = 86 + getSameCodeLength('y',i,cronixieDisplay); i = i+dP[i]-86; break; 
+      case 'I': dP[i] = 39 + getSameCodeLength('I',i,cronixieDisplay); i = i+dP[i]-39; break;  //Month. Don't ask me why month and minute both start with M.
+      case 'i': dP[i] = 89 + getSameCodeLength('i',i,cronixieDisplay); i = i+dP[i]-89; break; 
       case 'W': break;
       case 'w': break;
-      case 'D': dP[i] = 43 + getSameCodeLength('D',i,digits); i = i+dP[i]-43; break;
-      case 'd': dP[i] = 93 + getSameCodeLength('d',i,digits); i = i+dP[i]-93; break;
+      case 'D': dP[i] = 43 + getSameCodeLength('D',i,cronixieDisplay); i = i+dP[i]-43; break;
+      case 'd': dP[i] = 93 + getSameCodeLength('d',i,cronixieDisplay); i = i+dP[i]-93; break;
       case '0': dP[i] = 0; break;
       case '1': dP[i] = 1; break;
       case '2': dP[i] = 2; break;
@@ -139,27 +139,26 @@ void setCronixie(char const digits[])
   }
   DEBUG_PRINTLN((int)dP[5]);
 
-  cronixieRefreshedTime = 0; //refresh immediately
+  _overlayCronixie(); //refresh
+  #endif
 }
 
-void handleCronixie()
+void _overlayCronixie()
 {
-  if (millis() - cronixieRefreshedTime > cronixieRefreshMs)
-  {
-    cronixieRefreshedTime = millis();
-    local = TZ.toLocal(now(), &tcr);
-    if (cronixieCountdown) checkCountdown();
-    uint8_t h = hour(local);
-    uint8_t h0 = h;
-    uint8_t m = minute(local);
-    uint8_t s = second(local);
-    uint8_t d = day(local);
-    uint8_t mi = month(local);
+    if (countdownMode) checkCountdown();
+    #ifndef WLED_FLASH_512K_MODE
+    
+    byte h = hour(local);
+    byte h0 = h;
+    byte m = minute(local);
+    byte s = second(local);
+    byte d = day(local);
+    byte mi = month(local);
     int y = year(local);
     //this has to be changed in time for 22nd century
     y -= 2000; if (y<0) y += 30; //makes countdown work
 
-    if (cronixieUseAMPM && !cronixieCountdown)
+    if (useAMPM && !countdownMode)
     {
       if (h>12) h-=12;
       else if (h==0) h+=12;
@@ -213,6 +212,6 @@ void handleCronixie()
     }
     strip.setCronixieDigits(_digitOut);
     //strip.trigger(); //this has a drawback, no effects slower than RefreshMs. advantage: Quick update, not dependant on effect time
-  }
+    #endif
 }
-#endif
+

wled00/wled14_colors.ino

@@ -1,27 +1,158 @@
 /*
  * Color conversion methods
  */
-void colorCTtoRGB(uint16_t mired, uint8_t* rgb) //white spectrum to rgb
+void colorCTtoRGB(uint16_t mired, byte* rgb) //white spectrum to rgb
 {
-  
+  //this is only an approximation using WS2812B with gamma correction enabled
+  if (mired > 475)
+  {
+    rgb[0]=255;rgb[1]=199;rgb[2]=92;//500
+  } else if (mired > 425)
+  {
+    rgb[0]=255;rgb[1]=213;rgb[2]=118;//450
+  } else if (mired > 375)
+  {
+    rgb[0]=255;rgb[1]=216;rgb[2]=118;//400
+  } else if (mired > 325)
+  {
+    rgb[0]=255;rgb[1]=234;rgb[2]=140;//350
+  } else if (mired > 275)
+  {
+    rgb[0]=255;rgb[1]=243;rgb[2]=160;//300
+  } else if (mired > 225)
+  {
+    rgb[0]=250;rgb[1]=255;rgb[2]=188;//250
+  } else if (mired > 175)
+  {
+    rgb[0]=247;rgb[1]=255;rgb[2]=215;//200
+  } else
+  {
+    rgb[0]=237;rgb[1]=255;rgb[2]=239;//150
+  }
 }
 
-void colorHSBtoRGB(uint16_t hue, uint8_t sat, uint8_t bri, uint8_t* rgb) //hue, sat, bri to rgb
+void colorHStoRGB(uint16_t hue, byte sat, byte* rgb) //hue, sat to rgb
 {
-  
+  float h = ((float)hue)/65535.0;
+  float s = ((float)sat)/255.0;
+  byte i = floor(h*6);
+  float f = h * 6-i;
+  float p = 255 * (1-s);
+  float q = 255 * (1-f*s);
+  float t = 255 * (1-(1-f)*s);
+  switch (i%6) {
+    case 0: rgb[0]=255,rgb[1]=t,rgb[2]=p;break;
+    case 1: rgb[0]=q,rgb[1]=255,rgb[2]=p;break;
+    case 2: rgb[0]=p,rgb[1]=255,rgb[2]=t;break;
+    case 3: rgb[0]=p,rgb[1]=q,rgb[2]=255;break;
+    case 4: rgb[0]=t,rgb[1]=p,rgb[2]=255;break;
+    case 5: rgb[0]=255,rgb[1]=p,rgb[2]=q;
+  }
 }
 
-void colorXYtoRGB(float x, float y, uint8_t* rgb) //coordinates to rgb (https://www.developers.meethue.com/documentation/color-conversions-rgb-xy)
+void colorXYtoRGB(float x, float y, byte* rgb) //coordinates to rgb (https://www.developers.meethue.com/documentation/color-conversions-rgb-xy)
 {
   float z = 1.0f - x - y;
-  //float Y = 1.0f; // Brightness, we handle this separately
   float X = (1.0f / y) * x;
   float Z = (1.0f / y) * z;
-  rgb[0] = (int)(X * 1.656492f - 0.354851f - Z * 0.255038f);
-  rgb[1] = (int)(-X * 0.707196f + 1.655397f + Z * 0.036152f);
-  rgb[2] = (int)(X * 0.051713f - 0.121364f + Z * 1.011530f);
+  float r = (int)255*(X * 1.656492f - 0.354851f - Z * 0.255038f);
+  float g = (int)255*(-X * 0.707196f + 1.655397f + Z * 0.036152f);
+  float b = (int)255*(X * 0.051713f - 0.121364f + Z * 1.011530f);
+  if (r > b && r > g && r > 1.0f) {
+        // red is too big
+        g = g / r;
+        b = b / r;
+        r = 1.0f;
+  } else if (g > b && g > r && g > 1.0f) {
+        // green is too big
+        r = r / g;
+        b = b / g;
+        g = 1.0f;
+  } else if (b > r && b > g && b > 1.0f) {
+        // blue is too big
+        r = r / b;
+        g = g / b;
+        b = 1.0f;
+  }
+  // Apply gamma correction
+  r = r <= 0.0031308f ? 12.92f * r : (1.0f + 0.055f) * pow(r, (1.0f / 2.4f)) - 0.055f;
+  g = g <= 0.0031308f ? 12.92f * g : (1.0f + 0.055f) * pow(g, (1.0f / 2.4f)) - 0.055f;
+  b = b <= 0.0031308f ? 12.92f * b : (1.0f + 0.055f) * pow(b, (1.0f / 2.4f)) - 0.055f;
+
+  if (r > b && r > g) {
+      // red is biggest
+      if (r > 1.0f) {
+          g = g / r;
+          b = b / r;
+          r = 1.0f;
+      }
+  } else if (g > b && g > r) {
+      // green is biggest
+      if (g > 1.0f) {
+          r = r / g;
+          b = b / g;
+          g = 1.0f;
+      }
+  } else if (b > r && b > g) {
+      // blue is biggest
+      if (b > 1.0f) {
+          r = r / b;
+          g = g / b;
+          b = 1.0f;
+      }
+  }
+  rgb[0] = 255.0*r;
+  rgb[1] = 255.0*g;
+  rgb[2] = 255.0*b;
 }
 
-void colorRGBtoXY(uint8_t* rgb, float* xy){} //rgb to coordinates (https://www.developers.meethue.com/documentation/color-conversions-rgb-xy)
+void colorFromDecOrHexString(byte* rgb, byte* wht, char* in)
+{
+  if (in[0] == 0) return;
+  char first = in[0];
+  uint32_t c = 0;
+  
+  if (first == '#' || first == 'h' || first == 'H') //is HEX encoded
+  {
+    c = strtoul(in +1, NULL, 16);
+  } else
+  {
+    c = strtoul(in, NULL, 10);
+  }
+
+  *wht   = (c >> 24) & 0xFF;
+  rgb[0] = (c >> 16) & 0xFF;
+  rgb[1] = (c >>  8) & 0xFF;
+  rgb[2] =  c        & 0xFF;
+}
+
+void colorRGBtoXY(byte* rgb, float* xy) //rgb to coordinates (https://www.developers.meethue.com/documentation/color-conversions-rgb-xy)
+{
+  float X = rgb[0] * 0.664511f + rgb[1] * 0.154324f + rgb[2] * 0.162028f;
+  float Y = rgb[0] * 0.283881f + rgb[1] * 0.668433f + rgb[2] * 0.047685f;
+  float Z = rgb[0] * 0.000088f + rgb[1] * 0.072310f + rgb[2] * 0.986039f;
+  xy[0] = X / (X + Y + Z);
+  xy[1] = Y / (X + Y + Z);
+}
+
+float minf (float v, float w)
+{
+  if (w > v) return v;
+  return w;
+}
+
+float maxf (float v, float w)
+{
+  if (w > v) return w;
+  return v;
+}
+
+void colorRGBtoRGBW(byte* rgb, byte* wht) //rgb to rgbw (http://codewelt.com/rgbw)
+{
+  float low = minf(rgb[0],minf(rgb[1],rgb[2]));
+  float high = maxf(rgb[0],maxf(rgb[1],rgb[2]));
+  if (high < 0.1f) return;
+  float sat = 255.0f * ((high - low) / high);
+  *wht = (byte)((255.0f - sat) / 255.0f * (rgb[0] + rgb[1] + rgb[2]) / 3);
+}
 
-void colorRGBtoRGBW(uint8_t* rgb, uint8_t* rgbw){} //rgb to rgbw, not imlemented yet

wled00/wled15_hue.ino

@@ -1,4 +1,209 @@
 /*
  * Sync to Philips hue lights
  */
-void foo(){}
+
+void handleHue()
+{
+  if (huePollingEnabled && WiFi.status() == WL_CONNECTED && hueClient != NULL)
+  {
+    if (millis() - hueLastRequestSent > huePollIntervalMsTemp)
+    {
+      sendHuePoll(false);
+    }
+  }
+}
+
+bool setupHue()
+{
+  if (WiFi.status() == WL_CONNECTED) //setup needed
+  {
+    if (strlen(hueApiKey)>20) //api key is probably ok
+    {
+      if (sendHuePoll(false))
+      {
+        huePollingEnabled = true;
+        return true;
+      }
+      if (hueError[0] == 'R' || hueError[0] == 'I') return false; //can't connect
+      delay(20);
+    }
+    sendHuePoll(true); //new API key
+    if (hueError[0] != 'C') return false; //still some error
+    delay(20);
+    if (sendHuePoll(false))
+    {
+      huePollingEnabled = true;
+      return true;
+    }
+    return false;
+  }
+  else return false;
+  return true;
+}
+
+bool sendHuePoll(bool sAuth)
+{
+  bool st;
+  hueClient->setReuse(true);
+  hueClient->setTimeout(450);
+  String hueURL = "http://";
+  hueURL += hueIP.toString();
+  hueURL += "/api/";
+  if (!sAuth) {
+    hueURL += hueApiKey;
+    hueURL += "/lights/" + String(huePollLightId);
+  }
+  hueClient->begin(hueURL);
+  int httpCode = (sAuth)? hueClient->POST("{\"devicetype\":\"wled#esp\"}"):hueClient->GET();
+  //TODO this request may block operation for ages
+  
+  if (httpCode>0){
+    st = handleHueResponse(hueClient->getString(),sAuth);
+  } else {
+    strcpy(hueError,"Request timed out");
+    st = false;
+  }
+  if (!st){ //error
+    if (huePollIntervalMsTemp<300000) huePollIntervalMsTemp*=2; // only poll every ~5min when unable to connect
+    hueFailCount++;
+    if (hueFailCount > 150) huePollingEnabled = false; //disable after many hours offline
+  }
+  hueLastRequestSent = millis();
+  return st;
+}
+
+bool handleHueResponse(String hueResp, bool isAuth)
+{
+  DEBUG_PRINTLN(hueApiKey);
+  DEBUG_PRINTLN(hueResp);
+  if (hueResp.indexOf("error")>0)//hue bridge returned error
+  {
+    int hueErrorCode = getJsonValue(&hueResp,"type").toInt();
+    switch (hueErrorCode)
+    {
+      case 1: strcpy(hueError,"Unauthorized"); break;
+      case 3: strcpy(hueError,"Invalid light ID"); break;
+      case 101: strcpy(hueError,"Link button not pressed"); break;
+      default:
+        char coerr[18];
+        sprintf(coerr,"Bridge Error %i",hueErrorCode);
+        strcpy(hueError,coerr);
+    }
+    return false;
+  }
+  
+  if (isAuth)
+  {
+    String tempApi = getJsonValue(&hueResp,"username");
+    if (tempApi.length()>0)
+    {
+      strcpy(hueApiKey,tempApi.c_str());
+      return true;
+    }
+    strcpy(hueError,"Invalid response");
+    return false;
+  }
+
+  float hueX=0, hueY=0;
+  uint16_t hueHue=0, hueCt=0;
+  byte hueBri=0, hueSat=0, hueColormode=0;
+  
+  if (getJsonValue(&hueResp,"on").charAt(0) == 't')
+  {
+    String tempV = getJsonValue(&hueResp,"bri");
+    if (tempV.length()>0) //Dimmable device
+    {
+      hueBri = (tempV.toInt())+1;
+      tempV = getJsonValue(&hueResp,"colormode");
+      if (hueApplyColor && tempV.length()>0) //Color device
+      {
+        if (tempV.charAt(0) == 'x') //xy mode
+        {
+          tempV = getJsonValue(&hueResp,"xy");
+          if (tempV.length()>0) //valid
+          {
+            hueColormode = 1;
+            hueX = tempV.toFloat();
+            tempV = tempV.substring(tempV.indexOf(',')+1);
+            hueY = tempV.toFloat();
+          }
+        } else if (tempV.charAt(0) == 'h') //hs mode
+        {
+          tempV = getJsonValue(&hueResp,"hue");
+          if (tempV.length()>0) //valid
+          {
+            hueColormode = 2;
+            hueHue = tempV.toInt();
+            tempV = getJsonValue(&hueResp,"sat");
+            if (tempV.length()>0) //valid
+            {
+              hueSat = tempV.toInt();
+            }
+          }
+        } else //ct mode
+        {
+          tempV = getJsonValue(&hueResp,"\"ct"); //dirty hack to not get effect value instead
+          if (tempV.length()>0) //valid
+          {
+            hueColormode = 3;
+            hueCt = tempV.toInt();
+          }
+        }
+      }
+    } else //On/Off device
+    {
+      hueBri = briLast;
+    }
+  } else
+  {
+    hueBri = 0;
+  }
+  hueFailCount = 0;
+  huePollIntervalMsTemp = huePollIntervalMs;
+  strcpy(hueError,"Connected");
+  //applying vals
+  if (hueBri != hueBriLast)
+  {
+    if (hueApplyOnOff)
+    {
+      if (hueBri==0) {bri = 0;}
+      else if (bri==0 && hueBri>0) bri = briLast;
+    }
+    if (hueApplyBri)
+    {
+      if (hueBri>0) bri = hueBri;
+    }
+    hueBriLast = hueBri;
+  }
+  if (hueApplyColor)
+  {
+    switch(hueColormode)
+    {
+      case 1: if (hueX != hueXLast || hueY != hueYLast) colorXYtoRGB(hueX,hueY,col); hueXLast = hueX; hueYLast = hueY; break;
+      case 2: if (hueHue != hueHueLast || hueSat != hueSatLast) colorHStoRGB(hueHue,hueSat,col); hueHueLast = hueHue; hueSatLast = hueSat; break;
+      case 3: if (hueCt != hueCtLast) colorCTtoRGB(hueCt,col); hueCtLast = hueCt; break;
+    }
+  }
+  colorUpdated(7);
+  return true;
+}
+
+String getJsonValue(String* req, String key)
+{
+  //TODO may replace with ArduinoJSON if too complex
+  //this is horribly inefficient and designed to work only in this case
+  uint16_t pos = req->indexOf(key);
+  String b = req->substring(pos + key.length()+2);
+  if (b.charAt(0)=='\"') //is string
+  {
+    return b.substring(1,b.substring(1).indexOf('\"')+1);
+  } else if (b.charAt(0)=='[') //is array
+  {
+    return b.substring(1,b.indexOf(']'));
+  } else //is primitive type
+  {
+    return b.substring(0,b.indexOf(',')); //this works only if value not last
+  }
+  return "";
+}
+

wled00/wled16_blynk.ino

@@ -0,0 +1,89 @@
+/*
+ * Remote light control with the free Blynk app
+ */
+
+uint16_t blHue = 0;
+byte blSat = 255;
+
+void initBlynk(const char* auth)
+{
+  if (WiFi.status() != WL_CONNECTED) return;
+  blynkEnabled = (auth[0] != 0);
+  if (blynkEnabled) Blynk.config(auth);
+}
+
+void handleBlynk()
+{
+  if (WiFi.status() == WL_CONNECTED && blynkEnabled)
+  Blynk.run();
+}
+
+void updateBlynk()
+{
+  if (onlyAP) return;
+  Blynk.virtualWrite(V0, bri);
+  //we need a RGB -> HSB convert here
+  Blynk.virtualWrite(V3, bri? 1:0);
+  Blynk.virtualWrite(V4, effectCurrent);
+  Blynk.virtualWrite(V5, effectSpeed);
+  Blynk.virtualWrite(V6, effectIntensity);
+  Blynk.virtualWrite(V7, nightlightActive);
+  Blynk.virtualWrite(V8, notifyDirect);
+}
+
+BLYNK_WRITE(V0)
+{
+ bri = param.asInt();//bri
+ colorUpdated(9);
+}
+
+BLYNK_WRITE(V1)
+{
+ blHue = param.asInt();//hue
+ colorHStoRGB(blHue*10,blSat,(false)? colSec:col);
+ colorUpdated(9);
+}
+
+BLYNK_WRITE(V2)
+{
+ blSat = param.asInt();//sat
+ colorHStoRGB(blHue*10,blSat,(false)? colSec:col);
+ colorUpdated(9);
+}
+
+BLYNK_WRITE(V3)
+{
+  handleSet((param.asInt()>0)?"win&T=1&IN":"win&T=0&IN");//power
+}
+
+BLYNK_WRITE(V4)
+{
+ effectCurrent = param.asInt()-1;//fx
+ strip.setMode(effectCurrent);
+ colorUpdated(6);
+}
+
+BLYNK_WRITE(V5)
+{
+ effectSpeed = param.asInt();//sx
+ strip.setSpeed(effectSpeed);
+ colorUpdated(6);
+}
+
+BLYNK_WRITE(V6)
+{
+ effectIntensity = param.asInt();//ix
+ strip.setIntensity(effectIntensity);
+ colorUpdated(6);
+}
+
+BLYNK_WRITE(V7)
+{
+  handleSet((param.asInt()>0)?"win&ND&IN":"win&NL=0&IN");//nl
+}
+
+BLYNK_WRITE(V8)
+{
+  notifyDirect = (param.asInt()>0); //send notifications
+}
+

wled00/wled17_mqtt.ino

@@ -0,0 +1,136 @@
+/*
+ * MQTT communication protocol for home automation
+ */
+
+void parseMQTTBriPayload(char* payload)
+{
+  if      (strcmp(payload, "ON") == 0) {bri = briLast; colorUpdated(1);}
+  else if (strcmp(payload, "T" ) == 0) {handleSet("win&T=2");}
+  else {
+    uint8_t in = strtoul(payload, NULL, 10);
+    if (in == 0 && bri > 0) briLast = bri;
+    bri = in;
+    colorUpdated(1);
+  }
+}
+
+void callbackMQTT(char* topic, byte* payload, unsigned int length) {
+
+  DEBUG_PRINT("MQTT callb rec: ");
+  DEBUG_PRINTLN(topic);
+  DEBUG_PRINTLN((char*)payload);
+
+  //no need to check the topic because we only get topics we are subscribed to
+
+  if (strstr(topic, "/col"))
+  {
+    colorFromDecOrHexString(col, &white, (char*)payload);
+    colorUpdated(1);
+  } else if (strstr(topic, "/api"))
+  {
+    String apireq = "win&";
+    apireq += (char*)payload;
+    handleSet(apireq);
+  } else
+  {
+    parseMQTTBriPayload((char*)payload);
+  }
+}
+
+void publishMQTT()
+{
+  if (mqtt == NULL) return;
+  if (!mqtt->connected()) return;
+  DEBUG_PRINTLN("Publish MQTT");
+
+  char s[10];
+  char subuf[38];
+  
+  sprintf(s, "%ld", bri);
+  strcpy(subuf, mqttDeviceTopic);
+  strcat(subuf, "/g");
+  mqtt->publish(subuf, s);
+
+  sprintf(s, "#%X", white*16777216 + col[0]*65536 + col[1]*256 + col[2]);
+  strcpy(subuf, mqttDeviceTopic);
+  strcat(subuf, "/c");
+  mqtt->publish(subuf, s);
+
+  //if you want to use this, increase the MQTT buffer in PubSubClient.h to 350+
+  //it will publish the API response to MQTT
+  /*XML_response(false);
+  strcpy(subuf, mqttDeviceTopic);
+  strcat(subuf, "/v");
+  mqtt->publish(subuf, obuf);*/
+}
+
+bool reconnectMQTT()
+{
+  if (mqtt->connect(escapedMac.c_str()))
+  {
+    //re-subscribe to required topics
+    char subuf[38];
+    strcpy(subuf, mqttDeviceTopic);
+    
+    if (mqttDeviceTopic[0] != 0)
+    {
+      strcpy(subuf, mqttDeviceTopic);
+      mqtt->subscribe(subuf);
+      strcat(subuf, "/col");
+      mqtt->subscribe(subuf);
+      strcpy(subuf, mqttDeviceTopic);
+      strcat(subuf, "/api");
+      mqtt->subscribe(subuf);
+    }
+
+    if (mqttGroupTopic[0] != 0)
+    {
+      strcpy(subuf, mqttGroupTopic);
+      mqtt->subscribe(subuf);
+      strcat(subuf, "/col");
+      mqtt->subscribe(subuf);
+      strcpy(subuf, mqttGroupTopic);
+      strcat(subuf, "/api");
+      mqtt->subscribe(subuf);
+    }
+  }
+  return mqtt->connected();
+}
+
+bool initMQTT()
+{
+  if (WiFi.status() != WL_CONNECTED) return false;
+  if (mqttServer[0] == 0) return false;
+  
+  IPAddress mqttIP;
+  if (mqttIP.fromString(mqttServer)) //see if server is IP or domain
+  {
+    mqtt->setServer(mqttIP,1883);
+  } else {
+    mqtt->setServer(mqttServer,1883);
+  }
+  mqtt->setCallback(callbackMQTT);
+  DEBUG_PRINTLN("MQTT ready.");
+  return true;
+}
+
+void handleMQTT()
+{
+  if (WiFi.status() != WL_CONNECTED || !mqttInit) return;
+  
+  //every time connection is unsuccessful, the attempt interval is increased, since attempt will block program for 7 sec each time
+  if (!mqtt->connected() && millis() - lastMQTTReconnectAttempt > 5000 + (5000 * mqttFailedConAttempts * mqttFailedConAttempts))
+  {
+    DEBUG_PRINTLN("Attempting to connect MQTT...");
+    lastMQTTReconnectAttempt = millis();
+    if (!reconnectMQTT())
+    {
+      //still attempt reconnect about once daily
+      if (mqttFailedConAttempts < 120) mqttFailedConAttempts++;
+      return;
+    }
+    DEBUG_PRINTLN("MQTT con!");
+    mqttFailedConAttempts = 0;
+  }
+  mqtt->loop();
+}

wled00/wled18_server.ino

@@ -0,0 +1,366 @@
+/*
+ * Server page definitions
+ */
+
+void initServer()
+{
+  //settings page
+  server.on("/settings", HTTP_GET, [](){
+    serveSettings(0);
+  });
+  server.on("/settings/wifi", HTTP_GET, [](){
+    if (!(wifiLock && otaLock))
+    {
+      serveSettings(1);
+    }else{
+      serveMessage(500, "Access Denied", txd, 254);
+    }
+  });
+  server.on("/settings/leds", HTTP_GET, [](){
+    serveSettings(2);
+  });
+  server.on("/settings/ui", HTTP_GET, [](){
+    serveSettings(3);
+  });
+  server.on("/settings/sync", HTTP_GET, [](){
+    serveSettings(4);
+  });
+  server.on("/settings/time", HTTP_GET, [](){
+    serveSettings(5);
+  });
+  server.on("/settings/sec", HTTP_GET, [](){
+    serveSettings(6);
+  });
+  
+  server.on("/favicon.ico", HTTP_GET, [](){
+    if(!handleFileRead("/favicon.ico"))
+    {
+      server.send_P(200, "image/x-icon", favicon, 156);
+    }
+  });
+  
+  server.on("/sliders", HTTP_GET, serveIndex);
+  
+  server.on("/welcome", HTTP_GET, [](){
+    serveSettings(255);
+  });
+  
+  server.on("/reset", HTTP_GET, [](){
+    serveMessage(200,"Rebooting now...","(takes ~20 seconds, wait for auto-redirect)",79);
+    reset();
+  });
+  
+  server.on("/settings/wifi", HTTP_POST, [](){
+    if (!(wifiLock && otaLock)) handleSettingsSet(1);
+    serveMessage(200,"WiFi settings saved.","Rebooting now...",255);
+    reset();
+  });
+
+  server.on("/settings/leds", HTTP_POST, [](){
+    handleSettingsSet(2);
+    serveMessage(200,"LED settings saved.","Redirecting...",1);
+  });
+
+  server.on("/settings/ui", HTTP_POST, [](){
+    handleSettingsSet(3);
+    serveMessage(200,"UI settings saved.","Reloading to apply theme...",122);
+  });
+
+  server.on("/settings/sync", HTTP_POST, [](){
+    handleSettingsSet(4);
+    if (hueAttempt)
+    {
+      serveMessage(200,"Hue setup result",hueError,253);
+    } else {
+      serveMessage(200,"Sync settings saved.","Redirecting...",1);
+    }
+    hueAttempt = false;
+  });
+
+  server.on("/settings/time", HTTP_POST, [](){
+    handleSettingsSet(5);
+    serveMessage(200,"Time settings saved.","Redirecting...",1);
+  });
+
+  server.on("/settings/sec", HTTP_POST, [](){
+    handleSettingsSet(6);
+    serveMessage(200,"Security settings saved.","Rebooting now... (takes ~20 seconds, wait for auto-redirect)",139);
+    reset();
+  });
+  
+  server.on("/version", HTTP_GET, [](){
+    server.send(200, "text/plain", (String)VERSION);
+    });
+    
+  server.on("/uptime", HTTP_GET, [](){
+    server.send(200, "text/plain", (String)millis());
+    });
+    
+  server.on("/freeheap", HTTP_GET, [](){
+    server.send(200, "text/plain", (String)ESP.getFreeHeap());
+    });
+    
+  server.on("/power", HTTP_GET, [](){
+    String val = (String)(int)strip.getPowerEstimate(ledCount,strip.getColor(),strip.getBrightness());
+    val += "mA currently";
+    serveMessage(200,val,"This is just an estimate (does not take into account several factors like effects and wire resistance). It is NOT an accurate measurement!",254);
+    });
+
+  server.on("/u", HTTP_GET, [](){
+    server.setContentLength(strlen_P(PAGE_usermod));
+    server.send(200, "text/html", "");
+    server.sendContent_P(PAGE_usermod);
+    });
+    
+  server.on("/teapot", HTTP_GET, [](){
+    serveMessage(418, "418. I'm a teapot.","(Tangible Embedded Advanced Project Of Twinkling)",254);
+    });
+    
+  server.on("/build", HTTP_GET, [](){
+    getBuildInfo();
+    server.send(200, "text/plain", obuf);
+    });
+  //if OTA is allowed
+  if (!otaLock){
+    server.on("/edit", HTTP_GET, [](){
+    server.send(200, "text/html", PAGE_edit);
+    });
+    #ifdef USEFS
+    server.on("/edit", HTTP_PUT, handleFileCreate);
+    server.on("/edit", HTTP_DELETE, handleFileDelete);
+    server.on("/edit", HTTP_POST, [](){ server.send(200, "text/plain", ""); }, handleFileUpload);
+    server.on("/list", HTTP_GET, handleFileList);
+    #endif
+    //init ota page
+    httpUpdater.setup(&server);
+  } else
+  {
+    server.on("/edit", HTTP_GET, [](){
+    serveMessage(500, "Access Denied", txd, 254);
+    });
+    server.on("/update", HTTP_GET, [](){
+    serveMessage(500, "Access Denied", txd, 254);
+    });
+    server.on("/list", HTTP_GET, [](){
+    serveMessage(500, "Access Denied", txd, 254);
+    });
+  }
+
+  //this ceased working somehow
+  /*server.on("/", HTTP_GET, [](){
+    serveIndexOrWelcome();
+  });*/
+  
+  //called when the url is not defined here, ajax-in; get-settings
+  server.onNotFound([](){
+    DEBUG_PRINTLN("Not-Found HTTP call:");
+    DEBUG_PRINTLN("URI: " + server.uri());
+    DEBUG_PRINTLN("Body: " + server.arg(0));
+
+    //workaround for subpage issue
+    if (server.uri().length() == 1)
+    {
+      serveIndexOrWelcome();
+      return;
+    }
+    
+    if(!handleSet(server.uri())){
+      if(!handleAlexaApiCall(server.uri(),server.arg(0)))
+      server.send(404, "text/plain", "Not Found");
+    }
+  });
+  
+  #ifndef ARDUINO_ARCH_ESP32
+  const char * headerkeys[] = {"User-Agent"};
+  server.collectHeaders(headerkeys,sizeof(headerkeys)/sizeof(char*));
+  #else
+  String ua = "User-Agent";
+  server.collectHeaders(ua);
+  #endif
+}
+
+void buildCssColorString()
+{
+  String cs[]={"","","","","",""};
+  switch (currentTheme)
+  {
+    default: cs[0]="D9B310"; cs[1]="0B3C5D"; cs[2]="1D2731"; cs[3]="328CC1"; cs[4]="000"; cs[5]="328CC1"; break; //night
+    case 1: cs[0]="eee"; cs[1]="ddd"; cs[2]="b9b9b9"; cs[3]="049"; cs[4]="777"; cs[5]="049"; break; //modern
+    case 2: cs[0]="abc"; cs[1]="fff"; cs[2]="ddd"; cs[3]="000"; cs[4]="0004"; cs[5]="000"; break; //bright
+    case 3: cs[0]="c09f80"; cs[1]="d7cec7"; cs[2]="76323f"; cs[3]="888"; cs[4]="3334"; cs[5]="888"; break; //wine
+    case 4: cs[0]="3cc47c"; cs[1]="828081"; cs[2]="d9a803"; cs[3]="1e392a"; cs[4]="000a"; cs[5]="1e392a"; break; //electric
+    case 5: cs[0]="57bc90"; cs[1]="a5a5af"; cs[2]="015249"; cs[3]="88c9d4"; cs[4]="0004"; cs[5]="88c9d4"; break; //mint
+    case 6: cs[0]="f7c331"; cs[1]="dcc7aa"; cs[2]="6b7a8f"; cs[3]="f7882f"; cs[4]="0007"; cs[5]="f7882f"; break; //amber
+    case 7: cs[0]="fc3"; cs[1]="124"; cs[2]="334"; cs[3]="f1d"; cs[4]="f00"; cs[5]="f1d"; break;//club
+    case 8: cs[0]="0ac"; cs[1]="124"; cs[2]="224"; cs[3]="003eff"; cs[4]="003eff"; cs[5]="003eff"; break;//air
+    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
+  }
+  cssColorString="<style>:root{--aCol:#";
+  cssColorString+=cs[0];
+  cssColorString+=";--bCol:#";
+  cssColorString+=cs[1];
+  cssColorString+=";--cCol:#";
+  cssColorString+=cs[2];
+  cssColorString+=";--dCol:#";
+  cssColorString+=cs[3];
+  cssColorString+=";--sCol:#";
+  cssColorString+=cs[4];
+  cssColorString+=";--tCol:#";
+  cssColorString+=cs[5];
+  cssColorString+=";--cFn:";
+  cssColorString+=cssFont;
+  cssColorString+=";}";
+}
+
+void serveIndexOrWelcome()
+{
+  if (!showWelcomePage){
+    serveIndex();
+  }else{
+    serveSettings(255);
+  }
+}
+
+void serveRealtimeError(bool settings)
+{
+  String mesg = "The ";
+  mesg += (settings)?"settings":"WLED";
+  mesg += " UI is not available while receiving real-time data (";
+  if (realtimeIP[0] == 0)
+  {
+    mesg += "E1.31";
+  } else {
+    mesg += "UDP from ";
+    mesg += realtimeIP[0];
+    for (int i = 1; i < 4; i++)
+    {
+      mesg += ".";
+      mesg += realtimeIP[i];
+    }
+  }
+  mesg += ").";
+  server.send(200, "text/plain", mesg);
+}
+
+void serveIndex()
+{
+  bool serveMobile = false;
+  if (uiConfiguration == 0) serveMobile = checkClientIsMobile(server.header("User-Agent"));
+  else if (uiConfiguration == 2) serveMobile = true;
+
+  if (!realtimeActive || enableRealtimeUI) //do not serve while receiving realtime
+  {
+    if (serveMobile)
+    {
+      server.setContentLength(strlen_P(PAGE_indexM));
+      server.send(200, "text/html", "");
+      server.sendContent_P(PAGE_indexM);
+    } else
+    {
+      server.setContentLength(strlen_P(PAGE_index0) + cssColorString.length() + strlen_P(PAGE_index1) + strlen_P(PAGE_index2) + strlen_P(PAGE_index3));
+      server.send(200, "text/html", "");
+      server.sendContent_P(PAGE_index0);
+      server.sendContent(cssColorString); 
+      server.sendContent_P(PAGE_index1); 
+      server.sendContent_P(PAGE_index2);
+      server.sendContent_P(PAGE_index3);
+    }
+  } else {
+    serveRealtimeError(false);
+  }
+}
+
+void serveMessage(int code, String headl, String subl="", int optionType)
+{
+  String messageBody = "<h2>";
+  messageBody += headl;
+  messageBody += "</h2>";
+  messageBody += subl;
+  switch(optionType)
+  {
+    case 255: break; //simple message
+    case 254: messageBody += "<br><br><button type=\"button\" onclick=\"B()\">Back</button>"; break; //back button
+    case 253: messageBody += "<br><br><form action=/settings><button type=submit>Back</button></form>"; //button to settings
+  }
+  if (optionType < 60) //redirect to settings after optionType seconds
+  {
+    messageBody += "<script>setTimeout(RS," + String(optionType*1000) + ")</script>";
+  } else if (optionType < 120) //redirect back after optionType-60 seconds
+  {
+    messageBody += "<script>setTimeout(B," + String((optionType-60)*1000) + ")</script>";
+  } else if (optionType < 180) //reload parent after optionType-120 seconds
+  {
+    messageBody += "<script>setTimeout(RP," + String((optionType-120)*1000) + ")</script>";
+  }
+  messageBody += "</body></html>";
+  server.setContentLength(strlen_P(PAGE_msg0) + cssColorString.length() + strlen_P(PAGE_msg1) + messageBody.length());
+  server.send(code, "text/html", "");
+  server.sendContent_P(PAGE_msg0);
+  server.sendContent(cssColorString);
+  server.sendContent_P(PAGE_msg1);
+  server.sendContent(messageBody);
+}
+
+void serveSettings(byte subPage)
+{
+  //0: menu 1: wifi 2: leds 3: ui 4: sync 5: time 6: sec 255: welcomepage
+  if (!realtimeActive || enableRealtimeUI) //do not serve while receiving realtime
+    {
+      #ifdef WLED_FLASH_512K_MODE //disable welcome page if not enough storage
+      if (subPage == 255) {serveIndex(); return;}
+      #endif
+      
+      int pl0, pl1;
+      switch (subPage)
+      {
+        case 1: pl0 = strlen_P(PAGE_settings_wifi0); pl1 = strlen_P(PAGE_settings_wifi1); break;
+        case 2: pl0 = strlen_P(PAGE_settings_leds0); pl1 = strlen_P(PAGE_settings_leds1); break;
+        case 3: pl0 = strlen_P(PAGE_settings_ui0); pl1 = strlen_P(PAGE_settings_ui1); break;
+        case 4: pl0 = strlen_P(PAGE_settings_sync0); pl1 = strlen_P(PAGE_settings_sync1); break;
+        case 5: pl0 = strlen_P(PAGE_settings_time0); pl1 = strlen_P(PAGE_settings_time1); break;
+        case 6: pl0 = strlen_P(PAGE_settings_sec0); pl1 = strlen_P(PAGE_settings_sec1); break;
+        case 255: pl0 = strlen_P(PAGE_welcome0); pl1 = strlen_P(PAGE_welcome1); break;
+        default: pl0 = strlen_P(PAGE_settings0); pl1 = strlen_P(PAGE_settings1);
+      }
+      
+      getSettingsJS(subPage);
+      int sCssLength = (subPage >0 && subPage <7)?strlen_P(PAGE_settingsCss):0;
+      
+      server.setContentLength(pl0 + cssColorString.length() + olen + sCssLength + pl1);
+      server.send(200, "text/html", "");
+      
+      switch (subPage)
+      {
+        case 1: server.sendContent_P(PAGE_settings_wifi0); break;
+        case 2: server.sendContent_P(PAGE_settings_leds0); break;
+        case 3: server.sendContent_P(PAGE_settings_ui0); break;
+        case 4: server.sendContent_P(PAGE_settings_sync0); break;
+        case 5: server.sendContent_P(PAGE_settings_time0); break;
+        case 6: server.sendContent_P(PAGE_settings_sec0); break;
+        case 255: server.sendContent_P(PAGE_welcome0); break;
+        default: server.sendContent_P(PAGE_settings0); 
+      }
+      server.sendContent(obuf);
+      server.sendContent(cssColorString);
+      if (subPage >0 && subPage <7) server.sendContent_P(PAGE_settingsCss);
+      switch (subPage)
+      {
+        case 1: server.sendContent_P(PAGE_settings_wifi1); break;
+        case 2: server.sendContent_P(PAGE_settings_leds1); break;
+        case 3: server.sendContent_P(PAGE_settings_ui1); break;
+        case 4: server.sendContent_P(PAGE_settings_sync1); break;
+        case 5: server.sendContent_P(PAGE_settings_time1); break;
+        case 6: server.sendContent_P(PAGE_settings_sec1); break;
+        case 255: server.sendContent_P(PAGE_welcome1); break;
+        default: server.sendContent_P(PAGE_settings1); 
+      }
+    } else {
+        serveRealtimeError(true);
+    }
+}
+