Fix DMX compilation

2020-04-10 12:30:08 +02:00 · 2020-04-10 12:30:08 +02:00 · 19945e4ccb
commit 19945e4ccb
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,43 +2,62 @@

 ### Development versions after 0.9.1 release

+
+#### Build 2004100
+
+-   Fixed DMX output compilation
+-   Added DMX start LED setting
+
+#### Build 2004061
+
+-   Fixed RBG and BGR getPixelColor (#825)
+-   Improved formatting
+
+#### Build 2004060
+
+-   Consolidated global variables in wled.h
+
+#### Build 2003300
+
+-   Major change of project structure from .ino to .cpp and func_declare.h
+
 #### Build 2003262

-  - Fixed compilation for Analog LEDs
-  - Fixed sync settings network port fields too small
+- Fixed compilation for Analog LEDs
+-   Fixed sync settings network port fields too small

 #### Build 2003261

-  - Fixed live preview not displaying whole light if over 255 LEDs
+-   Fixed live preview not displaying whole light if over 255 LEDs

 #### Build 2003251

-  - Added Pacifica effect (tentative, doesn't yet support other colors)
-  - Added Atlantica palette
-  - Fixed ESP32 build of Espalexa
+-   Added Pacifica effect (tentative, doesn't yet support other colors)
+-   Added Atlantica palette
+-   Fixed ESP32 build of Espalexa

 #### Build 2003222

-  - Fixed Alexa Whites on non-RGBW lights (bump Espalexa to 2.4.5)
+-   Fixed Alexa Whites on non-RGBW lights (bump Espalexa to 2.4.5)

 #### Build 2003221

-  - Moved Cronixie driver from FX library to drawOverlay handler
+-   Moved Cronixie driver from FX library to drawOverlay handler

 #### Build 2003211

-  - Added custom mapping compile define to FX_fcn.h
-  - Merged pull request #784 by @TravisDean: Fixed initialization bug when toggling skip first
-  - Added link to youtube videos by Room31 to readme
+-   Added custom mapping compile define to FX_fcn.h
+-   Merged pull request #784 by @TravisDean: Fixed initialization bug when toggling skip first
+-   Added link to youtube videos by Room31 to readme

 #### Build 2003141

-  - Fixed color of main segment returned in JSON API during transition not being target color (closes #765)
-  - Fixed arlsLock() being called after pixels set in E1.31 (closes #772)
-  - Fixed HTTP API calls not having an effect if no segment selected (now applies to main segment)
+-   Fixed color of main segment returned in JSON API during transition not being target color (closes #765)
+-   Fixed arlsLock() being called after pixels set in E1.31 (closes #772)
+-   Fixed HTTP API calls not having an effect if no segment selected (now applies to main segment)

 #### Build 2003121

-  - Created changelog.md - make tracking changes to code easier
-  - Merged pull request #766 by @pille: Fix E1.31 out-of sequence detection
+-   Created changelog.md - make tracking changes to code easier
+-   Merged pull request #766 by @pille: Fix E1.31 out-of sequence detection

--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@ -601,7 +601,7 @@ uint16_t WS2812FX::mode_hyper_sparkle(void) {
  }

  if(random8(5) < 2) {
-    for(uint16_t i = 0; i < max(1, SEGLEN/3); i++) {
+    for(uint16_t i = 0; i < MAX(1, SEGLEN/3); i++) {
      setPixelColor(random16(SEGLEN), SEGCOLOR(1));
    }
    return 20;
@ -1115,7 +1115,7 @@ uint16_t WS2812FX::mode_fireworks() {
  if (valid1) setPixelColor(SEGENV.aux0 , sv1);
  if (valid2) setPixelColor(SEGENV.aux1, sv2);

-  for(uint16_t i=0; i<max(1, SEGLEN/20); i++) {
+  for(uint16_t i=0; i<MAX(1, SEGLEN/20); i++) {
    if(random8(129 - (SEGMENT.intensity >> 1)) == 0) {
      uint16_t index = random(SEGLEN);
      setPixelColor(index, color_from_palette(random8(), false, false, 0));
@ -1162,12 +1162,12 @@ uint16_t WS2812FX::mode_fire_flicker(void) {
  byte r = (SEGCOLOR(0) >> 16) & 0xFF;
  byte g = (SEGCOLOR(0) >>  8) & 0xFF;
  byte b = (SEGCOLOR(0)        & 0xFF);
-  byte lum = (SEGMENT.palette == 0) ? max(w, max(r, max(g, b))) : 255;
+  byte lum = (SEGMENT.palette == 0) ? MAX(w, MAX(r, MAX(g, b))) : 255;
  lum /= (((256-SEGMENT.intensity)/16)+1);
  for(uint16_t i = 0; i < SEGLEN; i++) {
    byte flicker = random8(lum);
    if (SEGMENT.palette == 0) {
-      setPixelColor(i, max(r - flicker, 0), max(g - flicker, 0), max(b - flicker, 0), max(w - flicker, 0));
+      setPixelColor(i, MAX(r - flicker, 0), MAX(g - flicker, 0), MAX(b - flicker, 0), MAX(w - flicker, 0));
    } else {
      setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 0, 255 - flicker));
    }
@ -1197,7 +1197,7 @@ uint16_t WS2812FX::gradient_base(bool loading) {
    {
      val = abs(((i>pp) ? p2:pp) -i);
    } else {
-      val = min(abs(pp-i),min(abs(p1-i),abs(p2-i)));
+      val = MIN(abs(pp-i),MIN(abs(p1-i),abs(p2-i)));
    }
    val = (brd > val) ? val/brd * 255 : 255;
    setPixelColor(i, color_blend(SEGCOLOR(0), color_from_palette(i, true, PALETTE_SOLID_WRAP, 1), val));
@ -1778,7 +1778,7 @@ uint16_t WS2812FX::mode_fire_2012()

  // Step 4.  Map from heat cells to LED colors
  for (uint16_t j = 0; j < SEGLEN; j++) {
-    CRGB color = ColorFromPalette(currentPalette, min(heat[j],240), 255, LINEARBLEND);
+    CRGB color = ColorFromPalette(currentPalette, MIN(heat[j],240), 255, LINEARBLEND);
    setPixelColor(j, color.red, color.green, color.blue);
  }
  return FRAMETIME;
@ -2573,7 +2573,7 @@ uint16_t WS2812FX::mode_bouncing_balls(void) {
    
    uint32_t color = SEGCOLOR(0);
    if (SEGMENT.palette) {
-      color = color_wheel(i*(256/max(numBalls, 8)));
+      color = color_wheel(i*(256/MAX(numBalls, 8)));
    } else if (hasCol2) {
      color = SEGCOLOR(i % NUM_COLORS);
    }
@ -3101,7 +3101,7 @@ uint16_t WS2812FX::mode_plasma(void) {
 */
 uint16_t WS2812FX::mode_percent(void) {

-	uint8_t percent = max(0, min(200, SEGMENT.intensity));
+	uint8_t percent = MAX(0, MIN(200, SEGMENT.intensity));
 	uint16_t active_leds = (percent < 100) ? SEGLEN * percent / 100.0
                                         : SEGLEN * (200 - percent) / 100.0;
  
--- a/wled00/FX.h
+++ b/wled00/FX.h
@ -38,8 +38,8 @@
 #define DEFAULT_SPEED      (uint8_t)128
 #define DEFAULT_COLOR      (uint32_t)0xFFAA00

-#define min(a,b) ((a)<(b)?(a):(b))
-#define max(a,b) ((a)>(b)?(a):(b))
+#define MIN(a,b) ((a)<(b)?(a):(b))
+#define MAX(a,b) ((a)>(b)?(a):(b))

 /* Not used in all effects yet */
 #define WLED_FPS         42
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@ -224,7 +224,7 @@ void WS2812FX::show(void) {
      if(useWackyWS2815PowerModel)
      {
        // ignore white component on WS2815 power calculation
-        powerSum += (max(max(c.R,c.G),c.B)) * 3;
+        powerSum += (MAX(MAX(c.R,c.G),c.B)) * 3;
      }
      else 
      {
@ -412,8 +412,8 @@ uint32_t WS2812FX::getPixelColor(uint16_t i)
    case  0: return ((col.W << 24) | (col.G << 8) | (col.R << 16) | (col.B)); //0 = GRB, default
    case  1: return ((col.W << 24) | (col.R << 8) | (col.G << 16) | (col.B)); //1 = RGB, common for WS2811
    case  2: return ((col.W << 24) | (col.B << 8) | (col.R << 16) | (col.G)); //2 = BRG
-    case  3: return ((col.W << 24) | (col.R << 8) | (col.B << 16) | (col.G)); //3 = RBG
-    case  4: return ((col.W << 24) | (col.B << 8) | (col.G << 16) | (col.R)); //4 = BGR
+    case  3: return ((col.W << 24) | (col.B << 8) | (col.G << 16) | (col.R)); //3 = RBG
+    case  4: return ((col.W << 24) | (col.R << 8) | (col.B << 16) | (col.G)); //4 = BGR
    case  5: return ((col.W << 24) | (col.G << 8) | (col.B << 16) | (col.R)); //5 = GBR
  }
  return 0;
@ -647,7 +647,7 @@ uint8_t WS2812FX::get_random_wheel_index(uint8_t pos) {
    r = random8();
    x = abs(pos - r);
    y = 255 - x;
-    d = min(x, y);
+    d = MIN(x, y);
  }
  return r;
 }
@ -730,8 +730,8 @@ void WS2812FX::handle_palette(void)
      CHSV prim_hsv = rgb2hsv_approximate(prim);
      targetPalette = CRGBPalette16(
                      CHSV(prim_hsv.h, prim_hsv.s, prim_hsv.v), //color itself
-                      CHSV(prim_hsv.h, max(prim_hsv.s - 50,0), prim_hsv.v), //less saturated
-                      CHSV(prim_hsv.h, prim_hsv.s, max(prim_hsv.v - 50,0)), //darker
+                      CHSV(prim_hsv.h, MAX(prim_hsv.s - 50,0), prim_hsv.v), //less saturated
+                      CHSV(prim_hsv.h, prim_hsv.s, MAX(prim_hsv.v - 50,0)), //darker
                      CHSV(prim_hsv.h, prim_hsv.s, prim_hsv.v)); //color itself
      break;}
    case 4: {//primary + secondary
--- a/wled00/NpbWrapper.h
+++ b/wled00/NpbWrapper.h
@ -9,6 +9,7 @@
 //#define USE_APA102  // Uncomment for using APA102 LEDs.
 //#define USE_WS2801  // Uncomment for using WS2801 LEDs (make sure you have NeoPixelBus v2.5.6 or newer)
 //#define USE_LPD8806 // Uncomment for using LPD8806
+//#define USE_P9813   // Uncomment for using P9813 LEDs (make sure you have NeoPixelBus v2.5.8 or newer)
 //#define WLED_USE_ANALOG_LEDS //Uncomment for using "dumb" PWM controlled LEDs (see pins below, default R: gpio5, G: 12, B: 15, W: 13)
 //#define WLED_USE_H801 //H801 controller. Please uncomment #define WLED_USE_ANALOG_LEDS as well
 //#define WLED_USE_5CH_LEDS  //5 Channel H801 for cold and warm white
@ -35,7 +36,7 @@

 //END CONFIGURATION

-#if defined(USE_APA102) || defined(USE_WS2801) || defined(USE_LPD8806)
+#if defined(USE_APA102) || defined(USE_WS2801) || defined(USE_LPD8806) || defined(USE_P9813)
 #define CLKPIN 0
 #define DATAPIN 2
 #if BTNPIN == CLKPIN || BTNPIN == DATAPIN
@ -73,6 +74,8 @@
  #define PIXELMETHOD NeoWs2801Method
 #elif defined(USE_LPD8806)
  #define PIXELMETHOD Lpd8806Method
+ #elif defined(USE_P9813)
+  #define PIXELMETHOD P9813Method  
 #else
  #define PIXELMETHOD NeoEsp32Rmt0Ws2812xMethod
 #endif
@ -84,6 +87,8 @@
  #define PIXELMETHOD NeoWs2801Method
 #elif defined(USE_LPD8806)
  #define PIXELMETHOD Lpd8806Method
+ #elif defined(USE_P9813)
+  #define PIXELMETHOD P9813Method  
 #elif LEDPIN == 2
  #define PIXELMETHOD NeoEsp8266Uart1Ws2813Method //if you get an error here, try to change to NeoEsp8266UartWs2813Method or update Neopixelbus
 #elif LEDPIN == 3
@ -102,6 +107,9 @@
 #elif defined(USE_LPD8806)
 #define PIXELFEATURE3 Lpd8806GrbFeature 
 #define PIXELFEATURE4 Lpd8806GrbFeature
+#elif defined(USE_P9813)
+ #define PIXELFEATURE3 P9813BgrFeature 
+ #define PIXELFEATURE4 NeoGrbwFeature   
 #else
 #define PIXELFEATURE3 NeoGrbFeature
 #define PIXELFEATURE4 NeoGrbwFeature
@ -143,7 +151,7 @@ public:
    switch (_type)
    {
      case NeoPixelType_Grb:
-      #if defined(USE_APA102) || defined(USE_WS2801) || defined(USE_LPD8806)
+      #if defined(USE_APA102) || defined(USE_WS2801) || defined(USE_LPD8806) || defined(USE_P9813)
        _pGrb = new NeoPixelBrightnessBus<PIXELFEATURE3,PIXELMETHOD>(countPixels, CLKPIN, DATAPIN);
      #else
        _pGrb = new NeoPixelBrightnessBus<PIXELFEATURE3,PIXELMETHOD>(countPixels, LEDPIN);
@ -152,7 +160,7 @@ public:
      break;

      case NeoPixelType_Grbw:
-      #if defined(USE_APA102) || defined(USE_WS2801) || defined(USE_LPD8806)
+      #if defined(USE_APA102) || defined(USE_WS2801) || defined(USE_LPD8806) || defined(USE_P9813)
        _pGrbw = new NeoPixelBrightnessBus<PIXELFEATURE4,PIXELMETHOD>(countPixels, CLKPIN, DATAPIN);
      #else
        _pGrbw = new NeoPixelBrightnessBus<PIXELFEATURE4,PIXELMETHOD>(countPixels, LEDPIN);
--- a/wled00/wled12_alexa.ino
+++ b/wled00/wled12_alexa.ino
@ -1,10 +1,13 @@
+#include "wled.h"
+
 /*
- * Alexa Voice On/Off/Brightness Control. Emulates a Philips Hue bridge to Alexa.
+ * Alexa Voice On/Off/Brightness/Color Control. Emulates a Philips Hue bridge to Alexa.
 * 
 * This was put together from these two excellent projects:
 * https://github.com/kakopappa/arduino-esp8266-alexa-wemo-switch
 * https://github.com/probonopd/ESP8266HueEmulator
 */
+#include "src/dependencies/espalexa/EspalexaDevice.h"

 #ifndef WLED_DISABLE_ALEXA
 void onAlexaChange(EspalexaDevice* dev);
--- a/wled00/wled16_blynk.ino
+++ b/wled00/wled16_blynk.ino
@ -1,3 +1,6 @@
+#include "wled.h"
+#include "src/dependencies/blynk/Blynk/BlynkHandlers.h"
+
 /*
 * Remote light control with the free Blynk app
 */
--- a/wled00/wled09_button.ino
+++ b/wled00/wled09_button.ino
@ -1,3 +1,5 @@
+#include "wled.h"
+
 /*
 * Physical IO
 */
@ -44,7 +46,7 @@ void handleButton()

    if (dur > 6000) //long press
    {
-      initAP(true);
+      WLED::instance().initAP(true);
    }
    else if (!buttonLongPressed) { //short press
      if (macroDoublePress)
--- a/wled00/wled14_colors.ino
+++ b/wled00/wled14_colors.ino
@ -1,3 +1,5 @@
+#include "wled.h"
+
 /*
 * Color conversion methods
 */
@ -18,7 +20,7 @@ void colorFromUint32(uint32_t in, bool secondary)
 }

 //load a color without affecting the white channel
-void colorFromUint24(uint32_t in, bool secondary = false)
+void colorFromUint24(uint32_t in, bool secondary)
 {
  if (secondary) {
    colSec[0] = in >> 16 & 0xFF;
@ -32,7 +34,7 @@ void colorFromUint24(uint32_t in, bool secondary = false)
 }

 //relatively change white brightness, minumum A=5
-void relativeChangeWhite(int8_t amount, byte lowerBoundary =0)
+void relativeChangeWhite(int8_t amount, byte lowerBoundary)
 {
  int16_t new_val = (int16_t) col[3] + amount;
  if (new_val > 0xFF) new_val = 0xFF;
@ -149,7 +151,8 @@ void colorRGBtoXY(byte* rgb, float* xy) //rgb to coordinates (https://www.develo
  xy[0] = X / (X + Y + Z);
  xy[1] = Y / (X + Y + Z);
 }
-#endif
+#endif // WLED_DISABLE_HUESYNC
+

 void colorFromDecOrHexString(byte* rgb, char* in)
 {
--- a/wled00/const.h
+++ b/wled00/const.h
@ -1,5 +1,9 @@
-#ifndef wled_const_h
-#define wled_const_h
+#ifndef WLED_CONST_H
+#define WLED_CONST_H
+
+/*
+ * Readability defines and their associated numerical values + compile-time constants
+ */

 //Defaults
 #define DEFAULT_CLIENT_SSID "Your_Network"
@ -72,4 +76,20 @@
 #define HUE_ERROR_TIMEOUT       251
 #define HUE_ERROR_ACTIVE        255

+//EEPROM size
+#define EEPSIZE 2560  //Maximum is 4096
+
+#define NTP_PACKET_SIZE 48
+
+// maximum number of LEDs - MAX_LEDS is coming from the JSON response getting too big, MAX_LEDS_DMA will become a timing issue
+#define MAX_LEDS 1500
+#define MAX_LEDS_DMA 500
+
+// string temp buffer (now stored in stack locally)
+#define OMAX 2048
+
+#define E131_MAX_UNIVERSE_COUNT 9
+
+#define ABL_MILLIAMPS_DEFAULT 850; // auto lower brightness to stay close to milliampere limit
+
 #endif
--- a/wled00/dmx.cpp
+++ b/wled00/dmx.cpp
@ -0,0 +1,67 @@
+#include "wled.h"
+
+/*
+ * Support for DMX via MAX485.
+ * Change the output pin in src/dependencies/ESPDMX.cpp if needed.
+ * Library from:
+ * https://github.com/Rickgg/ESP-Dmx
+ */
+
+#ifdef WLED_ENABLE_DMX
+#include "src/dependencies/dmx/ESPDMX.h"
+DMXESPSerial dmx;
+
+void handleDMX()
+{
+  // TODO: calculate brightness manually if no shutter channel is set
+
+  uint8_t brightness = strip.getBrightness();
+
+  for (int i = DMXStartLED; i < ledCount; i++) {        // uses the amount of LEDs as fixture count
+
+    uint32_t in = strip.getPixelColor(i);     // get the colors for the individual fixtures as suggested by Aircoookie in issue #462
+    byte w = in >> 24 & 0xFF;
+    byte r = in >> 16 & 0xFF;
+    byte g = in >> 8 & 0xFF;
+    byte b = in & 0xFF;
+
+    int DMXFixtureStart = DMXStart + (DMXGap * (i - DMXStartLED));
+    for (int j = 0; j < DMXChannels; j++) {
+      int DMXAddr = DMXFixtureStart + j;
+      switch (DMXFixtureMap[j]) {
+        case 0:        // Set this channel to 0. Good way to tell strobe- and fade-functions to fuck right off.
+          dmx.write(DMXAddr, 0);
+          break;
+        case 1:        // Red
+          dmx.write(DMXAddr, r);
+          break;
+        case 2:        // Green
+          dmx.write(DMXAddr, g);
+          break;
+        case 3:        // Blue
+          dmx.write(DMXAddr, b);
+          break;
+        case 4:        // White
+          dmx.write(DMXAddr, w);
+          break;
+        case 5:        // Shutter channel. Controls the brightness.
+          dmx.write(DMXAddr, brightness);
+          break;
+        case 6:        // Sets this channel to 255. Like 0, but more wholesome.
+          dmx.write(DMXAddr, 255);
+          break;
+      }
+    }
+  }
+
+  dmx.update();        // update the DMX bus
+}
+
+void initDMX() {
+  dmx.init(512);        // initialize with bus length
+}
+
+#else
+void handleDMX() {}
+void initDMX() {}
+#endif
--- a/wled00/e131.cpp
+++ b/wled00/e131.cpp
@ -0,0 +1,144 @@
+#include "wled.h"
+
+/*
+ * E1.31 handler
+ */
+
+void handleE131Packet(e131_packet_t* p, IPAddress clientIP){
+  //E1.31 protocol support
+
+  uint16_t uni = htons(p->universe);
+  uint8_t previousUniverses = uni - e131Universe;
+  uint16_t possibleLEDsInCurrentUniverse;
+  uint16_t dmxChannels = htons(p->property_value_count) -1;
+
+  // only listen for universes we're handling & allocated memory
+  if (uni >= (e131Universe + E131_MAX_UNIVERSE_COUNT)) return;
+
+  if (e131SkipOutOfSequence)
+    if (p->sequence_number < e131LastSequenceNumber[uni-e131Universe] && p->sequence_number > 20 && e131LastSequenceNumber[uni-e131Universe] < 250){
+      DEBUG_PRINT("skipping E1.31 frame (last seq=");
+      DEBUG_PRINT(e131LastSequenceNumber[uni-e131Universe]);
+      DEBUG_PRINT(", current seq=");
+      DEBUG_PRINT(p->sequence_number);
+      DEBUG_PRINT(", universe=");
+      DEBUG_PRINT(uni);
+      DEBUG_PRINTLN(")");
+      return;
+    }
+  e131LastSequenceNumber[uni-e131Universe] = p->sequence_number;
+
+  // update status info
+  realtimeIP = clientIP;
+  
+  switch (DMXMode) {
+    case DMX_MODE_DISABLED:
+      return;  // nothing to do
+      break;
+
+    case DMX_MODE_SINGLE_RGB:
+      if (uni != e131Universe) return;
+      if (dmxChannels-DMXAddress+1 < 3) return;
+      arlsLock(realtimeTimeoutMs, REALTIME_MODE_E131);
+      for (uint16_t i = 0; i < ledCount; i++)
+        setRealtimePixel(i, p->property_values[DMXAddress+0], p->property_values[DMXAddress+1], p->property_values[DMXAddress+2], 0);
+      break;
+
+    case DMX_MODE_SINGLE_DRGB:
+      if (uni != e131Universe) return;
+      if (dmxChannels-DMXAddress+1 < 4) return;
+      arlsLock(realtimeTimeoutMs, REALTIME_MODE_E131);
+      if (DMXOldDimmer != p->property_values[DMXAddress+0]) {
+        DMXOldDimmer = p->property_values[DMXAddress+0];
+        bri = p->property_values[DMXAddress+0];
+        strip.setBrightness(bri);
+      }
+      for (uint16_t i = 0; i < ledCount; i++)
+        setRealtimePixel(i, p->property_values[DMXAddress+1], p->property_values[DMXAddress+2], p->property_values[DMXAddress+3], 0);
+      break;
+
+    case DMX_MODE_EFFECT:
+      if (uni != e131Universe) return;
+      if (dmxChannels-DMXAddress+1 < 11) return;
+      if (DMXOldDimmer != p->property_values[DMXAddress+0]) {
+        DMXOldDimmer = p->property_values[DMXAddress+0];
+        bri = p->property_values[DMXAddress+0];
+      }
+      if (p->property_values[DMXAddress+1] < MODE_COUNT)
+        effectCurrent = p->property_values[DMXAddress+ 1];
+      effectSpeed     = p->property_values[DMXAddress+ 2];  // flickers
+      effectIntensity = p->property_values[DMXAddress+ 3];
+      effectPalette   = p->property_values[DMXAddress+ 4];
+      col[0]          = p->property_values[DMXAddress+ 5];
+      col[1]          = p->property_values[DMXAddress+ 6];
+      col[2]          = p->property_values[DMXAddress+ 7];
+      colSec[0]       = p->property_values[DMXAddress+ 8];
+      colSec[1]       = p->property_values[DMXAddress+ 9];
+      colSec[2]       = p->property_values[DMXAddress+10];
+      if (dmxChannels-DMXAddress+1 > 11)
+      {
+        col[3]          = p->property_values[DMXAddress+11]; //white
+        colSec[3]       = p->property_values[DMXAddress+12];
+      }
+      transitionDelayTemp = 0;                        // act fast
+      colorUpdated(NOTIFIER_CALL_MODE_NOTIFICATION);  // don't send UDP
+      return;                                         // don't activate realtime live mode
+      break;
+
+    case DMX_MODE_MULTIPLE_RGB:
+      arlsLock(realtimeTimeoutMs, REALTIME_MODE_E131);
+      if (previousUniverses == 0) {
+        // first universe of this fixture
+        possibleLEDsInCurrentUniverse = (dmxChannels - DMXAddress + 1) / 3;
+        for (uint16_t i = 0; i < ledCount; i++) {
+          if (i >= possibleLEDsInCurrentUniverse) break;  // more LEDs will follow in next universe(s)
+          setRealtimePixel(i, p->property_values[DMXAddress+i*3+0], p->property_values[DMXAddress+i*3+1], p->property_values[DMXAddress+i*3+2], 0);
+        }
+      } else if (previousUniverses > 0 && uni < (e131Universe + E131_MAX_UNIVERSE_COUNT)) {
+        // additional universe(s) of this fixture
+        uint16_t numberOfLEDsInPreviousUniverses = ((512 - DMXAddress + 1) / 3);                            // first universe
+        if (previousUniverses > 1) numberOfLEDsInPreviousUniverses += (512 / 3) * (previousUniverses - 1);  // extended universe(s) before current
+        possibleLEDsInCurrentUniverse = dmxChannels / 3;
+        for (uint16_t i = numberOfLEDsInPreviousUniverses; i < ledCount; i++) {
+          uint8_t j = i - numberOfLEDsInPreviousUniverses;
+          if (j >= possibleLEDsInCurrentUniverse) break;   // more LEDs will follow in next universe(s)
+          setRealtimePixel(i, p->property_values[j*3+1], p->property_values[j*3+2], p->property_values[j*3+3], 0);
+        }
+      }
+      break;
+
+    case DMX_MODE_MULTIPLE_DRGB:
+      arlsLock(realtimeTimeoutMs, REALTIME_MODE_E131);
+      if (previousUniverses == 0) {
+        // first universe of this fixture
+        if (DMXOldDimmer != p->property_values[DMXAddress+0]) {
+          DMXOldDimmer = p->property_values[DMXAddress+0];
+          bri = p->property_values[DMXAddress+0];
+          strip.setBrightness(bri);
+        }
+        possibleLEDsInCurrentUniverse = (dmxChannels - DMXAddress) / 3;
+        for (uint16_t i = 0; i < ledCount; i++) {
+          if (i >= possibleLEDsInCurrentUniverse) break;  // more LEDs will follow in next universe(s)
+          setRealtimePixel(i, p->property_values[DMXAddress+i*3+1], p->property_values[DMXAddress+i*3+2], p->property_values[DMXAddress+i*3+3], 0);
+        }
+      } else if (previousUniverses > 0 && uni < (e131Universe + E131_MAX_UNIVERSE_COUNT)) {
+        // additional universe(s) of this fixture
+        uint16_t numberOfLEDsInPreviousUniverses = ((512 - DMXAddress + 1) / 3);                            // first universe
+        if (previousUniverses > 1) numberOfLEDsInPreviousUniverses += (512 / 3) * (previousUniverses - 1);  // extended universe(s) before current
+        possibleLEDsInCurrentUniverse = dmxChannels / 3;
+        for (uint16_t i = numberOfLEDsInPreviousUniverses; i < ledCount; i++) {
+          uint8_t j = i - numberOfLEDsInPreviousUniverses;
+          if (j >= possibleLEDsInCurrentUniverse) break;   // more LEDs will follow in next universe(s)
+          setRealtimePixel(i, p->property_values[j*3+1], p->property_values[j*3+2], p->property_values[j*3+3], 0);
+        }
+      }
+      break;
+
+    default:
+      DEBUG_PRINTLN("unknown E1.31 DMX mode");
+      return;  // nothing to do
+      break;
+  }
+
+  e131NewData = true;
+}
--- a/wled00/fcn_declare.h
+++ b/wled00/fcn_declare.h
@ -0,0 +1,184 @@
+#ifndef WLED_FCN_DECLARE_H
+#define WLED_FCN_DECLARE_H
+#include <Arduino.h>
+#include "src/dependencies/espalexa/EspalexaDevice.h"
+#include "src/dependencies/e131/ESPAsyncE131.h"
+
+/*
+ * All globally accessible functions are declared here
+ */
+
+//alexa.cpp
+void onAlexaChange(EspalexaDevice* dev);
+void alexaInit();
+void handleAlexa();
+void onAlexaChange(EspalexaDevice* dev);
+
+//blynk.cpp
+void initBlynk(const char* auth);
+void handleBlynk();
+void updateBlynk();
+
+//button.cpp
+void shortPressAction();
+void handleButton();
+void handleIO();
+
+//colors.cpp
+void colorFromUint32(uint32_t in, bool secondary = false);
+void colorFromUint24(uint32_t in, bool secondary = false);
+void relativeChangeWhite(int8_t amount, byte lowerBoundary = 0);
+void colorHStoRGB(uint16_t hue, byte sat, byte* rgb); //hue, sat to rgb
+void colorCTtoRGB(uint16_t mired, byte* rgb); //white spectrum to rgb
+
+void colorXYtoRGB(float x, float y, byte* rgb); // only defined if huesync disabled TODO
+void colorRGBtoXY(byte* rgb, float* xy); // only defined if huesync disabled TODO
+
+void colorFromDecOrHexString(byte* rgb, char* in);
+void colorRGBtoRGBW(byte* rgb); //rgb to rgbw (http://codewelt.com/rgbw). (RGBW_MODE_LEGACY)
+
+//dmx.cpp
+void initDMX();
+void handleDMX();
+
+//e131.cpp
+void handleE131Packet(e131_packet_t* p, IPAddress clientIP);
+
+//file.cpp
+bool handleFileRead(AsyncWebServerRequest*, String path);
+
+//hue.cpp
+void handleHue();
+void reconnectHue();
+void onHueError(void* arg, AsyncClient* client, int8_t error);
+void onHueConnect(void* arg, AsyncClient* client);
+void sendHuePoll();
+void onHueData(void* arg, AsyncClient* client, void *data, size_t len);
+
+//ir.cpp
+bool decodeIRCustom(uint32_t code);
+void relativeChange(byte* property, int8_t amount, byte lowerBoundary = 0, byte higherBoundary = 0xFF);
+void changeEffectSpeed(int8_t amount);
+void changeEffectIntensity(int8_t amount);
+void decodeIR(uint32_t code);
+void decodeIR24(uint32_t code);
+void decodeIR24OLD(uint32_t code);
+void decodeIR24CT(uint32_t code);
+void decodeIR40(uint32_t code);
+void decodeIR44(uint32_t code);
+void decodeIR21(uint32_t code);
+void decodeIR6(uint32_t code);
+
+void initIR();
+void handleIR();
+
+//json.cpp
+#include "ESPAsyncWebServer.h"
+#include "src/dependencies/json/ArduinoJson-v6.h"
+#include "src/dependencies/json/AsyncJson-v6.h"
+#include "FX.h"
+// TODO: AsynicWebServerRequest conflict?
+
+void deserializeSegment(JsonObject elem, byte it);
+bool deserializeState(JsonObject root);
+void serializeSegment(JsonObject& root, WS2812FX::Segment& seg, byte id);
+void serializeState(JsonObject root);
+void serializeInfo(JsonObject root);
+void serveJson(AsyncWebServerRequest* request);
+void serveLiveLeds(AsyncWebServerRequest* request);
+
+//led.cpp
+void setValuesFromMainSeg();
+void resetTimebase();
+void toggleOnOff();
+void setAllLeds();
+void setLedsStandard(bool justColors = false);
+bool colorChanged();
+void colorUpdated(int callMode);
+void updateInterfaces(uint8_t callMode);
+void handleTransitions();
+void handleNightlight();
+
+//mqtt.cpp
+bool initMqtt();
+void publishMqtt();
+
+//notify.cpp
+void notify(byte callMode, bool followUp=false);
+void arlsLock(uint32_t timeoutMs, byte md = REALTIME_MODE_GENERIC);
+void handleNotifications();
+void setRealtimePixel(uint16_t i, byte r, byte g, byte b, byte w);
+
+//ntp.cpp
+void handleNetworkTime();
+void sendNTPPacket();
+bool checkNTPResponse();    
+void updateLocalTime();
+void getTimeString(char* out);
+bool checkCountdown();
+void setCountdown();
+byte weekdayMondayFirst();
+void checkTimers();
+
+//overlay.cpp
+void initCronixie();
+void handleOverlays();
+void handleOverlayDraw();
+void _overlayAnalogCountdown();
+void _overlayAnalogClock();
+
+byte getSameCodeLength(char code, int index, char const cronixieDisplay[]);
+void setCronixie();
+void _overlayCronixie();    
+void _drawOverlayCronixie();
+
+//set.cpp
+void _setRandomColor(bool _sec,bool fromButton=false);
+bool isAsterisksOnly(const char* str, byte maxLen);
+void handleSettingsSet(AsyncWebServerRequest *request, byte subPage);
+bool handleSet(AsyncWebServerRequest *request, const String& req);
+int getNumVal(const String* req, uint16_t pos);
+bool updateVal(const String* req, const char* key, byte* val, byte minv=0, byte maxv=255);
+
+//usermod.cpp
+void userSetup();
+void userConnected();
+void userLoop();
+
+//wled_eeprom.cpp
+void commit();
+void clearEEPROM();
+void writeStringToEEPROM(uint16_t pos, char* str, uint16_t len);
+void readStringFromEEPROM(uint16_t pos, char* str, uint16_t len);
+void saveSettingsToEEPROM();
+void loadSettingsFromEEPROM(bool first);
+void savedToPresets();
+bool applyPreset(byte index, bool loadBri = true);
+void savePreset(byte index, bool persist = true);
+void loadMacro(byte index, char* m);
+void applyMacro(byte index);
+void saveMacro(byte index, String mc, bool persist = true); //only commit on single save, not in settings
+
+//wled_serial.cpp
+void handleSerial();
+
+//wled_server.cpp
+bool isIp(String str);
+bool captivePortal(AsyncWebServerRequest *request);
+void initServer();
+void serveIndexOrWelcome(AsyncWebServerRequest *request);
+void serveIndex(AsyncWebServerRequest* request);
+String msgProcessor(const String& var);
+void serveMessage(AsyncWebServerRequest* request, uint16_t code, String headl, String subl="", byte optionT=255);
+String settingsProcessor(const String& var);
+String dmxProcessor(const String& var);
+void serveSettings(AsyncWebServerRequest* request);
+
+//xml.cpp
+char* XML_response(AsyncWebServerRequest *request, char* dest = nullptr);
+char* URL_response(AsyncWebServerRequest *request);
+void sappend(char stype, const char* key, int val);
+void sappends(char stype, const char* key, char* val);
+void getSettingsJS(byte subPage, char* dest);
+
+#endif
--- a/wled00/file.cpp
+++ b/wled00/file.cpp
@ -0,0 +1,55 @@
+#include "wled.h"
+
+/*
+ * Utility for SPIFFS filesystem
+ */
+
+//filesystem
+#ifndef WLED_DISABLE_FILESYSTEM
+#include <FS.h>
+#ifdef ARDUINO_ARCH_ESP32
+#include "SPIFFS.h"
+#endif
+#include "SPIFFSEditor.h"
+#endif
+
+
+#if !defined WLED_DISABLE_FILESYSTEM && defined WLED_ENABLE_FS_SERVING
+//Un-comment any file types you need
+String getContentType(AsyncWebServerRequest* request, String filename){
+  if(request->hasArg("download")) return "application/octet-stream";
+  else if(filename.endsWith(".htm")) return "text/html";
+  else if(filename.endsWith(".html")) return "text/html";
+//  else if(filename.endsWith(".css")) return "text/css";
+//  else if(filename.endsWith(".js")) return "application/javascript";
+  else if(filename.endsWith(".json")) return "application/json";
+  else if(filename.endsWith(".png")) return "image/png";
+//  else if(filename.endsWith(".gif")) return "image/gif";
+  else if(filename.endsWith(".jpg")) return "image/jpeg";
+  else if(filename.endsWith(".ico")) return "image/x-icon";
+//  else if(filename.endsWith(".xml")) return "text/xml";
+//  else if(filename.endsWith(".pdf")) return "application/x-pdf";
+//  else if(filename.endsWith(".zip")) return "application/x-zip";
+//  else if(filename.endsWith(".gz")) return "application/x-gzip";
+  return "text/plain";
+}
+
+bool handleFileRead(AsyncWebServerRequest* request, String path){
+  DEBUG_PRINTLN("FileRead: " + path);
+  if(path.endsWith("/")) path += "index.htm";
+  String contentType = getContentType(request, path);
+  String pathWithGz = path + ".gz";
+  if(SPIFFS.exists(pathWithGz)){
+    request->send(SPIFFS, pathWithGz, contentType);
+    return true;
+  }
+  if(SPIFFS.exists(path)) {
+    request->send(SPIFFS, path, contentType);
+    return true;
+  }
+  return false;
+}
+
+#else
+bool handleFileRead(AsyncWebServerRequest*, String path){return false;}
+#endif
--- a/wled00/html_other.h
+++ b/wled00/html_other.h
@ -1,5 +1,5 @@
 /*
- * Various pages
+ * Various web pages
 */

 //USER HTML HERE (/u subpage)
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@ -1,6 +1,6 @@
 /*
-   Settings html
-*/
+ *  Settings html
+ */

 //common CSS of settings pages
 const char PAGE_settingsCss[] PROGMEM = R"=====(<style>body{font-family:Verdana,sans-serif;text-align:center;background:#222;color:#fff;line-height:200%%;margin:0}hr{border-color:#666}button{background:#333;color:#fff;font-family:Verdana,sans-serif;border:.3ch solid #333;display:inline-block;font-size:20px;margin:8px;margin-top:12px}.helpB{text-align:left;position:absolute;width:60px}input{background:#333;color:#fff;font-family:Verdana,sans-serif;border:.5ch solid #333}input[type=number]{width:4em}select{background:#333;color:#fff;font-family:Verdana,sans-serif;border:0.5ch solid #333}td{padding:2px;}.d5{width:4.5em !important;}</style>)=====";
@ -214,17 +214,12 @@ function S(){GCH(15);GetV();mMap();}function H(){window.open("https://github.com

 <i>Number of fixtures is taken from LED config page</i><br>

-channels per fixture (15 max): <input type="number" min="1" max="15" name="CN" maxlength="2" onchange="mMap();"><br />
-start channel: <input type="number" min="1" max="512" name="CS" maxlength="2"><br />
-spacing between start channels: <input type="number" min="1" max="512" name="CG" maxlength="2" onchange="mMap();"> [ <a href="javascript:alert('if set to 10, first fixture will start at 10,\nsecond will start at 20 etc.\nRegardless of the channel count.\nMakes memorizing channel numbers easier.');">info</a> ]<br>
+Channels per fixture (15 max): <input type="number" min="1" max="15" name="CN" maxlength="2" onchange="mMap();"><br />
+Start channel: <input type="number" min="1" max="512" name="CS" maxlength="2"><br />
+Spacing between start channels: <input type="number" min="1" max="512" name="CG" maxlength="2" onchange="mMap();"> [ <a href="javascript:alert('if set to 10, first fixture will start at 10,\nsecond will start at 20 etc.\nRegardless of the channel count.\nMakes memorizing channel numbers easier.');">info</a> ]<br>
 <div id="gapwarning" style="color: orange; display: none;">WARNING: Channel gap is lower than channels per fixture.<br />This will cause overlap.</div>
 <button type="button" onclick="location.href='/dmxmap';">DMX Map</button><br>
-
-<i>If wanting to use DMX together with LEDs. Number of fixtures will also depend on the segment and start LED settings below</i><br>
-<i>Using these settings, you can position your fixtures anywhere you want on the LED strip</i><br>
-which segment should DMX use: <input type="number" min="0" max="9" name="SEG" maxlength="2"><br />
-start LED from the above channel from which DMX fixtures should start: <input type="number" min="0" max="1500" name="SL" maxlength="2"><br />
-
+DMX fixtures start LED: <input type="number" min="0" max="1500" name="SL">
 <h3>channel functions</h3>
 <div id="dmxchannels"></div>
 <hr><button type="button" onclick="B()">Back</button><button type="submit">Save</button>
--- a/wled00/wled15_hue.ino
+++ b/wled00/wled15_hue.ino
@ -1,7 +1,11 @@
+#include "wled.h"
+
 /*
 * Sync to Philips hue lights
 */
+
 #ifndef WLED_DISABLE_HUESYNC
+
 void handleHue()
 {
  if (hueReceived)
--- a/wled00/wled20_ir.ino
+++ b/wled00/wled20_ir.ino
@ -1,3 +1,5 @@
+#include "wled.h"
+
 /*
 * Infrared sensor support for generic 24/40/44 key RGB remotes
 */
@ -35,7 +37,7 @@ bool decodeIRCustom(uint32_t code)


 //relatively change brightness, minumum A=5
-void relativeChange(byte* property, int8_t amount, byte lowerBoundary = 0, byte higherBoundary = 0xFF)
+void relativeChange(byte* property, int8_t amount, byte lowerBoundary, byte higherBoundary)
 {
  int16_t new_val = (int16_t) *property + amount;
  if (new_val > higherBoundary) new_val = higherBoundary;
--- a/wled00/wled19_json.ino
+++ b/wled00/wled19_json.ino
@ -1,3 +1,5 @@
+#include "wled.h"
+
 /*
 * JSON API (De)serialization
 */
@ -248,6 +250,26 @@ void serializeState(JsonObject root)
  }
 }

+//by https://github.com/tzapu/WiFiManager/blob/master/WiFiManager.cpp
+int getSignalQuality(int rssi)
+{
+    int quality = 0;
+
+    if (rssi <= -100)
+    {
+        quality = 0;
+    }
+    else if (rssi >= -50)
+    {
+        quality = 100;
+    }
+    else
+    {
+        quality = 2 * (rssi + 100);
+    }
+    return quality;
+}
+
 void serializeInfo(JsonObject root)
 {
  root["ver"] = versionString;
--- a/wled00/wled08_led.ino
+++ b/wled00/wled08_led.ino
@ -1,6 +1,9 @@
+#include "wled.h"
+
 /*
 * LED methods
 */
+
 void setValuesFromMainSeg()
 {
  WS2812FX::Segment& seg = strip.getSegment(strip.getMainSegmentId());
@ -50,7 +53,7 @@ void setAllLeds() {
 }


-void setLedsStandard(bool justColors = false)
+void setLedsStandard(bool justColors)
 {
  for (byte i=0; i<4; i++)
  {
--- a/wled00/wled17_mqtt.ino
+++ b/wled00/wled17_mqtt.ino
@ -1,3 +1,5 @@
+#include "wled.h"
+
 /*
 * MQTT communication protocol for home automation
 */
--- a/wled00/wled10_ntp.ino
+++ b/wled00/wled10_ntp.ino
@ -1,3 +1,6 @@
+#include "src/dependencies/timezone/Timezone.h"
+#include "wled.h"
+
 /*
 * Acquires time from NTP server
 */
@ -57,6 +60,7 @@ Timezone tzNK(NKST, NKST);
 TimeChangeRule IST = {Last, Sun, Mar, 1, 330};     // India Standard Time = UTC + 5.5 hours
 Timezone tzIndia(IST, IST);

+// Pick your timezone from here.
 Timezone* timezones[] = {&tzUTC, &tzUK, &tzEUCentral, &tzEUEastern, &tzUSEastern, &tzUSCentral, &tzUSMountain, &tzUSArizona, &tzUSPacific, &tzChina, &tzJapan, &tzAUEastern, &tzNZ, &tzNK, &tzIndia, &tzCASaskatchewan};  

 void handleNetworkTime()
--- a/wled00/wled13_cronixie.ino
+++ b/wled00/wled13_cronixie.ino
@ -1,9 +1,141 @@
+#include "wled.h"
+
+/*
+ * Used to draw clock overlays over the strip
+ */
+ 
+void initCronixie()
+{
+  if (overlayCurrent == 3 && !cronixieInit)
+  {
+    setCronixie();
+    strip.getSegment(0).grouping = 10; //10 LEDs per digit
+    cronixieInit = true;
+  } else if (cronixieInit && overlayCurrent != 3)
+  {
+    strip.getSegment(0).grouping = 1;
+    cronixieInit = false; 
+  }
+}
+
+
+void handleOverlays()
+{
+  if (millis() - overlayRefreshedTime > overlayRefreshMs)
+  {
+    initCronixie();
+    updateLocalTime();
+    checkTimers();
+    checkCountdown();
+    if (overlayCurrent == 3) _overlayCronixie();//Diamex cronixie clock kit
+    overlayRefreshedTime = millis();
+  }
+}
+
+
+void _overlayAnalogClock()
+{
+  int overlaySize = overlayMax - overlayMin +1;
+  if (countdownMode)
+  {
+    _overlayAnalogCountdown(); return;
+  }
+  double hourP = ((double)(hour(local)%12))/12;
+  double minuteP = ((double)minute(local))/60;
+  hourP = hourP + minuteP/12;
+  double secondP = ((double)second(local))/60;
+  int hourPixel = floor(analogClock12pixel + overlaySize*hourP);
+  if (hourPixel > overlayMax) hourPixel = overlayMin -1 + hourPixel - overlayMax;
+  int minutePixel = floor(analogClock12pixel + overlaySize*minuteP);
+  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;
+    for (int i = 0; i <= 12; i++)
+    {
+      pix = analogClock12pixel + round((overlaySize / 12.0) *i);
+      if (pix > overlayMax) pix -= overlaySize;
+      strip.setPixelColor(pix, 0x00FFAA);
+    }
+  }
+  if (!analogClockSecondsTrail) strip.setPixelColor(secondPixel, 0xFF0000);
+  strip.setPixelColor(minutePixel, 0x00FF00);
+  strip.setPixelColor(hourPixel, 0x0000FF);
+  overlayRefreshMs = 998;
+}
+
+
+void _overlayAnalogCountdown()
+{
+  if (now() < countdownTime)
+  {
+    long diff = countdownTime - now();
+    double pval = 60;
+    if (diff > 31557600L) //display in years if more than 365 days
+    {
+      pval = 315576000L; //10 years
+    } else if (diff > 2592000L) //display in months if more than a month
+    {
+      pval = 31557600L; //1 year
+    } else if (diff > 604800) //display in weeks if more than a week
+    {
+      pval = 2592000L; //1 month
+    } else if (diff > 86400) //display in days if more than 24 hours
+    {
+      pval = 604800; //1 week
+    } else if (diff > 3600) //display in hours if more than 60 minutes
+    {
+      pval = 86400; //1 day
+    } else if (diff > 60) //display in minutes if more than 60 seconds
+    {
+      pval = 3600; //1 hour
+    }
+    int overlaySize = overlayMax - overlayMin +1;
+    double perc = (pval-(double)diff)/pval;
+    if (perc > 1.0) perc = 1.0;
+    byte pixelCnt = perc*overlaySize;
+    if (analogClock12pixel + pixelCnt > overlayMax)
+    {
+      strip.setRange(analogClock12pixel, overlayMax, ((uint32_t)colSec[3] << 24)| ((uint32_t)colSec[0] << 16) | ((uint32_t)colSec[1] << 8) | colSec[2]);
+      strip.setRange(overlayMin, overlayMin +pixelCnt -(1+ overlayMax -analogClock12pixel), ((uint32_t)colSec[3] << 24)| ((uint32_t)colSec[0] << 16) | ((uint32_t)colSec[1] << 8) | colSec[2]);
+    } else
+    {
+      strip.setRange(analogClock12pixel, analogClock12pixel + pixelCnt, ((uint32_t)colSec[3] << 24)| ((uint32_t)colSec[0] << 16) | ((uint32_t)colSec[1] << 8) | colSec[2]);
+    }
+  }
+  overlayRefreshMs = 998;
+}
+
+
+void handleOverlayDraw() {
+  if (!overlayCurrent) return;
+  switch (overlayCurrent)
+  {
+    case 1: _overlayAnalogClock(); break;
+    case 3: _drawOverlayCronixie(); break;
+  }
+}
+
+
 /*
 * Support for the Cronixie clock
 */
+ 
 #ifndef WLED_DISABLE_CRONIXIE
 byte _digitOut[6] = {10,10,10,10,10,10};
-#endif
 
 byte getSameCodeLength(char code, int index, char const cronixieDisplay[])
 {
@ -23,7 +155,6 @@ byte getSameCodeLength(char code, int index, char const cronixieDisplay[])

 void setCronixie()
 {
-  #ifndef WLED_DISABLE_CRONIXIE
  /*
   * digit purpose index
   * 0-9 | 0-9 (incl. random)
@ -144,12 +275,10 @@ void setCronixie()
  DEBUG_PRINTLN((int)dP[5]);

  _overlayCronixie(); //refresh
-  #endif
 }

 void _overlayCronixie()
 {
-  #ifndef WLED_DISABLE_CRONIXIE
  byte h = hour(local);
  byte h0 = h;
  byte m = minute(local);
@ -211,12 +340,10 @@ void _overlayCronixie()
      }
    }
  }
-  #endif
 }

 void _drawOverlayCronixie()
 {
-  #ifndef WLED_DISABLE_CRONIXIE
  byte offsets[] = {5, 0, 6, 1, 7, 2, 8, 3, 9, 4};
  
  for (uint16_t i = 0; i < 6; i++)
@ -239,5 +366,11 @@ void _drawOverlayCronixie()
      }
    }
  }
-  #endif
 }
+
+#else // WLED_DISABLE_CRONIXIE
+byte getSameCodeLength(char code, int index, char const cronixieDisplay[]) {}
+void setCronixie() {}
+void _overlayCronixie() {}
+void _drawOverlayCronixie() {}
+#endif
--- a/wled00/wled03_set.ino
+++ b/wled00/wled03_set.ino
@ -1,8 +1,10 @@
+#include "wled.h"
+
 /*
 * Receives client input
 */

-void _setRandomColor(bool _sec,bool fromButton=false)
+void _setRandomColor(bool _sec,bool fromButton)
 {
  lastRandomIndex = strip.get_random_wheel_index(lastRandomIndex);
  if (_sec){
@ -305,19 +307,15 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
    if (t>0 && t<513) {
      DMXGap = t;
    }
+    t = request->arg("SL").toInt();
+    if (t>=0 && t < MAX_LEDS) {
+      DMXStartLED = t;
+    }
    for (int i=0; i<15; i++) {
      String argname = "CH" + String((i+1));
      t = request->arg(argname).toInt();
      DMXFixtureMap[i] = t;
    }
-    t = request->arg("SEG").toInt();
-    if (t>=0 && t<10) {
-      DMXSegment = t;
-    }
-    t = request->arg("SL").toInt();
-    if (t>=0 && t<1500) {
-      DMXStartLED = t;
-    }
  }
  
  #endif
@ -338,7 +336,7 @@ int getNumVal(const String* req, uint16_t pos)


 //helper to get int value at a position in string
-bool updateVal(const String* req, const char* key, byte* val, byte minv=0, byte maxv=255)
+bool updateVal(const String* req, const char* key, byte* val, byte minv, byte maxv)
 {
  int pos = req->indexOf(key);
  if (pos < 1) return false;
--- a/wled00/src/dependencies/blynk/BlynkSimpleEsp.cpp
+++ b/wled00/src/dependencies/blynk/BlynkSimpleEsp.cpp
@ -0,0 +1,5 @@
+#include "BlynkSimpleEsp.h"
+
+WiFiClient _blynkWifiClient;
+BlynkArduinoClient _blynkTransport(_blynkWifiClient);
+BlynkWifi Blynk(_blynkTransport);
--- a/wled00/src/dependencies/blynk/BlynkSimpleEsp.h
+++ b/wled00/src/dependencies/blynk/BlynkSimpleEsp.h
@ -89,8 +89,6 @@ public:

 };

-static WiFiClient _blynkWifiClient;
-static BlynkArduinoClient _blynkTransport(_blynkWifiClient);
-BlynkWifi Blynk(_blynkTransport);
+extern BlynkWifi Blynk;

 #endif
--- a/wled00/src/dependencies/dmx/ESPDMX.cpp
+++ b/wled00/src/dependencies/dmx/ESPDMX.cpp
@ -0,0 +1,106 @@
+// - - - - -
+// ESPDMX - A Arduino library for sending and receiving DMX using the builtin serial hardware port.
+// ESPDMX.cpp: Library implementation file
+//
+// Copyright (C) 2015  Rick <ricardogg95@gmail.com>
+// This work is licensed under a GNU style license.
+//
+// Last change: Marcel Seerig <https://github.com/mseerig>
+//
+// Documentation and samples are available at https://github.com/Rickgg/ESP-Dmx
+// - - - - -
+
+/* ----- LIBRARIES ----- */
+#include <Arduino.h>
+
+#include "ESPDMX.h"
+
+
+
+#define dmxMaxChannel  512
+#define defaultMax 32
+
+#define DMXSPEED       250000
+#define DMXFORMAT      SERIAL_8N2
+#define BREAKSPEED     83333
+#define BREAKFORMAT    SERIAL_8N1
+
+bool dmxStarted = false;
+int sendPin = 2;		//dafault on ESP8266
+
+//DMX value array and size. Entry 0 will hold startbyte
+uint8_t dmxData[dmxMaxChannel] = {};
+int chanSize;
+
+
+void DMXESPSerial::init() {
+  chanSize = defaultMax;
+
+  Serial1.begin(DMXSPEED);
+  pinMode(sendPin, OUTPUT);
+  dmxStarted = true;
+}
+
+// Set up the DMX-Protocol
+void DMXESPSerial::init(int chanQuant) {
+
+  if (chanQuant > dmxMaxChannel || chanQuant <= 0) {
+    chanQuant = defaultMax;
+  }
+
+  chanSize = chanQuant;
+
+  Serial1.begin(DMXSPEED);
+  pinMode(sendPin, OUTPUT);
+  dmxStarted = true;
+}
+
+// Function to read DMX data
+uint8_t DMXESPSerial::read(int Channel) {
+  if (dmxStarted == false) init();
+
+  if (Channel < 1) Channel = 1;
+  if (Channel > dmxMaxChannel) Channel = dmxMaxChannel;
+  return(dmxData[Channel]);
+}
+
+// Function to send DMX data
+void DMXESPSerial::write(int Channel, uint8_t value) {
+  if (dmxStarted == false) init();
+
+  if (Channel < 1) Channel = 1;
+  if (Channel > chanSize) Channel = chanSize;
+  if (value < 0) value = 0;
+  if (value > 255) value = 255;
+
+  dmxData[Channel] = value;
+}
+
+void DMXESPSerial::end() {
+  delete dmxData;
+  chanSize = 0;
+  Serial1.end();
+  dmxStarted == false;
+}
+
+void DMXESPSerial::update() {
+  if (dmxStarted == false) init();
+
+  //Send break
+  digitalWrite(sendPin, HIGH);
+  Serial1.begin(BREAKSPEED, BREAKFORMAT);
+  Serial1.write(0);
+  Serial1.flush();
+  delay(1);
+  Serial1.end();
+
+  //send data
+  Serial1.begin(DMXSPEED, DMXFORMAT);
+  digitalWrite(sendPin, LOW);
+  Serial1.write(dmxData, chanSize);
+  Serial1.flush();
+  delay(1);
+  Serial1.end();
+}
+
+// Function to update the DMX bus
--- a/wled00/src/dependencies/dmx/ESPDMX.h
+++ b/wled00/src/dependencies/dmx/ESPDMX.h
@ -0,0 +1,31 @@
+// - - - - -
+// ESPDMX - A Arduino library for sending and receiving DMX using the builtin serial hardware port.
+// ESPDMX.cpp: Library implementation file
+//
+// Copyright (C) 2015  Rick <ricardogg95@gmail.com>
+// This work is licensed under a GNU style license.
+//
+// Last change: Marcel Seerig <https://github.com/mseerig>
+//
+// Documentation and samples are available at https://github.com/Rickgg/ESP-Dmx
+// - - - - -
+
+#include <inttypes.h>
+
+
+#ifndef ESPDMX_h
+#define ESPDMX_h
+
+// ---- Methods ----
+
+class DMXESPSerial {
+public:
+  void init();
+  void init(int MaxChan);
+  uint8_t read(int Channel);
+  void write(int channel, uint8_t value);
+  void update();
+  void end();
+};
+
+#endif
--- a/wled00/src/dependencies/espalexa/EspalexaDevice.h
+++ b/wled00/src/dependencies/espalexa/EspalexaDevice.h
@ -1,6 +1,6 @@
 #ifndef EspalexaDevice_h
 #define EspalexaDevice_h
-
+#include <functional>
 #include "Arduino.h"
 #include <functional>

--- a/wled00/wled07_notify.ino
+++ b/wled00/wled07_notify.ino
@ -1,12 +1,13 @@
+#include "wled.h"
+
 /*
- * UDP notifier
+ * UDP sync notifier
 */

 #define WLEDPACKETSIZE 29
 #define UDP_IN_MAXSIZE 1472

-
-void notify(byte callMode, bool followUp=false)
+void notify(byte callMode, bool followUp)
 {
  if (!udpConnected) return;
  switch (callMode)
@ -71,7 +72,7 @@ void notify(byte callMode, bool followUp=false)
 }


-void arlsLock(uint32_t timeoutMs, byte md = REALTIME_MODE_GENERIC)
+void arlsLock(uint32_t timeoutMs, byte md)
 {
  if (!realtimeMode){
    for (uint16_t i = 0; i < ledCount; i++)
@ -86,146 +87,6 @@ void arlsLock(uint32_t timeoutMs, byte md = REALTIME_MODE_GENERIC)
 }


-void handleE131Packet(e131_packet_t* p, IPAddress clientIP){
-  //E1.31 protocol support
-
-  uint16_t uni = htons(p->universe);
-  uint8_t previousUniverses = uni - e131Universe;
-  uint16_t possibleLEDsInCurrentUniverse;
-  uint16_t dmxChannels = htons(p->property_value_count) -1;
-
-  // only listen for universes we're handling & allocated memory
-  if (uni >= (e131Universe + E131_MAX_UNIVERSE_COUNT)) return;
-
-  if (e131SkipOutOfSequence)
-    if (p->sequence_number < e131LastSequenceNumber[uni-e131Universe] && p->sequence_number > 20 && e131LastSequenceNumber[uni-e131Universe] < 250){
-      DEBUG_PRINT("skipping E1.31 frame (last seq=");
-      DEBUG_PRINT(e131LastSequenceNumber[uni-e131Universe]);
-      DEBUG_PRINT(", current seq=");
-      DEBUG_PRINT(p->sequence_number);
-      DEBUG_PRINT(", universe=");
-      DEBUG_PRINT(uni);
-      DEBUG_PRINTLN(")");
-      return;
-    }
-  e131LastSequenceNumber[uni-e131Universe] = p->sequence_number;
-
-  // update status info
-  realtimeIP = clientIP;
-  
-  switch (DMXMode) {
-    case DMX_MODE_DISABLED:
-      return;  // nothing to do
-      break;
-
-    case DMX_MODE_SINGLE_RGB:
-      if (uni != e131Universe) return;
-      if (dmxChannels-DMXAddress+1 < 3) return;
-      arlsLock(realtimeTimeoutMs, REALTIME_MODE_E131);
-      for (uint16_t i = 0; i < ledCount; i++)
-        setRealtimePixel(i, p->property_values[DMXAddress+0], p->property_values[DMXAddress+1], p->property_values[DMXAddress+2], 0);
-      break;
-
-    case DMX_MODE_SINGLE_DRGB:
-      if (uni != e131Universe) return;
-      if (dmxChannels-DMXAddress+1 < 4) return;
-      arlsLock(realtimeTimeoutMs, REALTIME_MODE_E131);
-      if (DMXOldDimmer != p->property_values[DMXAddress+0]) {
-        DMXOldDimmer = p->property_values[DMXAddress+0];
-        bri = p->property_values[DMXAddress+0];
-        strip.setBrightness(bri);
-      }
-      for (uint16_t i = 0; i < ledCount; i++)
-        setRealtimePixel(i, p->property_values[DMXAddress+1], p->property_values[DMXAddress+2], p->property_values[DMXAddress+3], 0);
-      break;
-
-    case DMX_MODE_EFFECT:
-      if (uni != e131Universe) return;
-      if (dmxChannels-DMXAddress+1 < 11) return;
-      if (DMXOldDimmer != p->property_values[DMXAddress+0]) {
-        DMXOldDimmer = p->property_values[DMXAddress+0];
-        bri = p->property_values[DMXAddress+0];
-      }
-      if (p->property_values[DMXAddress+1] < MODE_COUNT)
-        effectCurrent = p->property_values[DMXAddress+ 1];
-      effectSpeed     = p->property_values[DMXAddress+ 2];  // flickers
-      effectIntensity = p->property_values[DMXAddress+ 3];
-      effectPalette   = p->property_values[DMXAddress+ 4];
-      col[0]          = p->property_values[DMXAddress+ 5];
-      col[1]          = p->property_values[DMXAddress+ 6];
-      col[2]          = p->property_values[DMXAddress+ 7];
-      colSec[0]       = p->property_values[DMXAddress+ 8];
-      colSec[1]       = p->property_values[DMXAddress+ 9];
-      colSec[2]       = p->property_values[DMXAddress+10];
-      if (dmxChannels-DMXAddress+1 > 11)
-      {
-        col[3]          = p->property_values[DMXAddress+11]; //white
-        colSec[3]       = p->property_values[DMXAddress+12];
-      }
-      transitionDelayTemp = 0;                        // act fast
-      colorUpdated(NOTIFIER_CALL_MODE_NOTIFICATION);  // don't send UDP
-      return;                                         // don't activate realtime live mode
-      break;
-
-    case DMX_MODE_MULTIPLE_RGB:
-      arlsLock(realtimeTimeoutMs, REALTIME_MODE_E131);
-      if (previousUniverses == 0) {
-        // first universe of this fixture
-        possibleLEDsInCurrentUniverse = (dmxChannels - DMXAddress + 1) / 3;
-        for (uint16_t i = 0; i < ledCount; i++) {
-          if (i >= possibleLEDsInCurrentUniverse) break;  // more LEDs will follow in next universe(s)
-          setRealtimePixel(i, p->property_values[DMXAddress+i*3+0], p->property_values[DMXAddress+i*3+1], p->property_values[DMXAddress+i*3+2], 0);
-        }
-      } else if (previousUniverses > 0 && uni < (e131Universe + E131_MAX_UNIVERSE_COUNT)) {
-        // additional universe(s) of this fixture
-        uint16_t numberOfLEDsInPreviousUniverses = ((512 - DMXAddress + 1) / 3);                            // first universe
-        if (previousUniverses > 1) numberOfLEDsInPreviousUniverses += (512 / 3) * (previousUniverses - 1);  // extended universe(s) before current
-        possibleLEDsInCurrentUniverse = dmxChannels / 3;
-        for (uint16_t i = numberOfLEDsInPreviousUniverses; i < ledCount; i++) {
-          uint8_t j = i - numberOfLEDsInPreviousUniverses;
-          if (j >= possibleLEDsInCurrentUniverse) break;   // more LEDs will follow in next universe(s)
-          setRealtimePixel(i, p->property_values[j*3+1], p->property_values[j*3+2], p->property_values[j*3+3], 0);
-        }
-      }
-      break;
-
-    case DMX_MODE_MULTIPLE_DRGB:
-      arlsLock(realtimeTimeoutMs, REALTIME_MODE_E131);
-      if (previousUniverses == 0) {
-        // first universe of this fixture
-        if (DMXOldDimmer != p->property_values[DMXAddress+0]) {
-          DMXOldDimmer = p->property_values[DMXAddress+0];
-          bri = p->property_values[DMXAddress+0];
-          strip.setBrightness(bri);
-        }
-        possibleLEDsInCurrentUniverse = (dmxChannels - DMXAddress) / 3;
-        for (uint16_t i = 0; i < ledCount; i++) {
-          if (i >= possibleLEDsInCurrentUniverse) break;  // more LEDs will follow in next universe(s)
-          setRealtimePixel(i, p->property_values[DMXAddress+i*3+1], p->property_values[DMXAddress+i*3+2], p->property_values[DMXAddress+i*3+3], 0);
-        }
-      } else if (previousUniverses > 0 && uni < (e131Universe + E131_MAX_UNIVERSE_COUNT)) {
-        // additional universe(s) of this fixture
-        uint16_t numberOfLEDsInPreviousUniverses = ((512 - DMXAddress + 1) / 3);                            // first universe
-        if (previousUniverses > 1) numberOfLEDsInPreviousUniverses += (512 / 3) * (previousUniverses - 1);  // extended universe(s) before current
-        possibleLEDsInCurrentUniverse = dmxChannels / 3;
-        for (uint16_t i = numberOfLEDsInPreviousUniverses; i < ledCount; i++) {
-          uint8_t j = i - numberOfLEDsInPreviousUniverses;
-          if (j >= possibleLEDsInCurrentUniverse) break;   // more LEDs will follow in next universe(s)
-          setRealtimePixel(i, p->property_values[j*3+1], p->property_values[j*3+2], p->property_values[j*3+3], 0);
-        }
-      }
-      break;
-
-    default:
-      DEBUG_PRINTLN("unknown E1.31 DMX mode");
-      return;  // nothing to do
-      break;
-  }
-
-  e131NewData = true;
-}
-
-
 void handleNotifications()
 {
  //send second notification if enabled
--- a/wled00/wled06_usermod.ino
+++ b/wled00/wled06_usermod.ino
@ -1,7 +1,8 @@
+#include "wled.h"
 /*
 * This file allows you to add own functionality to WLED more easily
 * See: https://github.com/Aircoookie/WLED/wiki/Add-own-functionality
- * EEPROM bytes 2750+ are reserved for your custom use case. (if you extend #define EEPSIZE in wled01_eeprom.h)
+ * EEPROM bytes 2750+ are reserved for your custom use case. (if you extend #define EEPSIZE in const.h)
 * bytes 2400+ are currently ununsed, but might be used for future wled features
 */

--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@ -0,0 +1,458 @@
+#define WLED_DEFINE_GLOBAL_VARS //only in one source file, wled.cpp!
+#include "wled.h"
+#include <Arduino.h>
+
+/*
+ * Main WLED class implementation. Mostly initialization and connection logic
+ */
+
+WLED::WLED()
+{
+}
+
+// turns all LEDs off and restarts ESP
+void WLED::reset()
+{
+  briT = 0;
+  long dly = millis();
+  while (millis() - dly < 250) {
+    yield();        // enough time to send response to client
+  }
+  setAllLeds();
+  DEBUG_PRINTLN("MODULE RESET");
+  ESP.restart();
+}
+
+bool oappendi(int i)
+{
+  char s[11];
+  sprintf(s, "%ld", i);
+  return oappend(s);
+}
+
+bool oappend(const char* txt)
+{
+  uint16_t len = strlen(txt);
+  if (olen + len >= OMAX)
+    return false;        // buffer full
+  strcpy(obuf + olen, txt);
+  olen += len;
+  return true;
+}
+
+void WLED::loop()
+{
+  handleIR();        // 2nd call to function needed for ESP32 to return valid results -- should be good for ESP8266, too
+  handleConnection();
+  handleSerial();
+  handleNotifications();
+  handleTransitions();
+#ifdef WLED_ENABLE_DMX
+  handleDMX();
+#endif
+  userLoop();
+
+  yield();
+  handleIO();
+  handleIR();
+  handleNetworkTime();
+  handleAlexa();
+
+  handleOverlays();
+  yield();
+#ifdef WLED_USE_ANALOG_LEDS
+  strip.setRgbwPwm();
+#endif
+
+  if (doReboot)
+    reset();
+
+  if (!realtimeMode)        // block stuff if WARLS/Adalight is enabled
+  {
+    if (apActive)
+      dnsServer.processNextRequest();
+#ifndef WLED_DISABLE_OTA
+    if (WLED_CONNECTED && aOtaEnabled)
+      ArduinoOTA.handle();
+#endif
+    handleNightlight();
+    yield();
+
+    handleHue();
+    handleBlynk();
+
+    yield();
+    if (!offMode)
+      strip.service();
+  }
+  yield();
+#ifdef ESP8266
+  MDNS.update();
+#endif
+  if (millis() - lastMqttReconnectAttempt > 30000)
+    initMqtt();
+
+// DEBUG serial logging
+#ifdef WLED_DEBUG
+  if (millis() - debugTime > 9999) {
+    DEBUG_PRINTLN("---DEBUG INFO---");
+    DEBUG_PRINT("Runtime: ");
+    DEBUG_PRINTLN(millis());
+    DEBUG_PRINT("Unix time: ");
+    DEBUG_PRINTLN(now());
+    DEBUG_PRINT("Free heap: ");
+    DEBUG_PRINTLN(ESP.getFreeHeap());
+    DEBUG_PRINT("Wifi state: ");
+    DEBUG_PRINTLN(WiFi.status());
+    if (WiFi.status() != lastWifiState) {
+      wifiStateChangedTime = millis();
+    }
+    lastWifiState = WiFi.status();
+    DEBUG_PRINT("State time: ");
+    DEBUG_PRINTLN(wifiStateChangedTime);
+    DEBUG_PRINT("NTP last sync: ");
+    DEBUG_PRINTLN(ntpLastSyncTime);
+    DEBUG_PRINT("Client IP: ");
+    DEBUG_PRINTLN(WiFi.localIP());
+    DEBUG_PRINT("Loops/sec: ");
+    DEBUG_PRINTLN(loops / 10);
+    loops = 0;
+    debugTime = millis();
+  }
+  loops++;
+#endif        // WLED_DEBU
+}
+
+void WLED::setup()
+{
+  EEPROM.begin(EEPSIZE);
+  ledCount = EEPROM.read(229) + ((EEPROM.read(398) << 8) & 0xFF00);
+  if (ledCount > MAX_LEDS || ledCount == 0)
+    ledCount = 30;
+
+#ifdef ESP8266
+  #if LEDPIN == 3
+    if (ledCount > MAX_LEDS_DMA)
+      ledCount = MAX_LEDS_DMA;        // DMA method uses too much ram
+  #endif
+#endif
+  Serial.begin(115200);
+  Serial.setTimeout(50);
+  DEBUG_PRINTLN();
+  DEBUG_PRINT("---WLED ");
+  DEBUG_PRINT(versionString);
+  DEBUG_PRINT(" ");
+  DEBUG_PRINT(VERSION);
+  DEBUG_PRINTLN(" INIT---");
+#ifdef ARDUINO_ARCH_ESP32
+  DEBUG_PRINT("esp32 ");
+  DEBUG_PRINTLN(ESP.getSdkVersion());
+#else
+  DEBUG_PRINT("esp8266 ");
+  DEBUG_PRINTLN(ESP.getCoreVersion());
+#endif
+  int heapPreAlloc = ESP.getFreeHeap();
+  DEBUG_PRINT("heap ");
+  DEBUG_PRINTLN(ESP.getFreeHeap());
+
+  strip.init(EEPROM.read(372), ledCount, EEPROM.read(2204));        // init LEDs quickly
+  strip.setBrightness(0);
+
+  DEBUG_PRINT("LEDs inited. heap usage ~");
+  DEBUG_PRINTLN(heapPreAlloc - ESP.getFreeHeap());
+
+#ifndef WLED_DISABLE_FILESYSTEM
+  #ifdef ARDUINO_ARCH_ESP32
+    SPIFFS.begin(true);
+  #endif
+    SPIFFS.begin();
+#endif
+
+  DEBUG_PRINTLN("Load EEPROM");
+  loadSettingsFromEEPROM(true);
+  beginStrip();
+  userSetup();
+  if (strcmp(clientSSID, DEFAULT_CLIENT_SSID) == 0)
+    showWelcomePage = true;
+  WiFi.persistent(false);
+
+  if (macroBoot > 0)
+    applyMacro(macroBoot);
+  Serial.println("Ada");
+
+  // generate module IDs
+  escapedMac = WiFi.macAddress();
+  escapedMac.replace(":", "");
+  escapedMac.toLowerCase();
+  if (strcmp(cmDNS, "x") == 0)        // fill in unique mdns default
+  {
+    strcpy(cmDNS, "wled-");
+    sprintf(cmDNS + 5, "%*s", 6, escapedMac.c_str() + 6);
+  }
+  if (mqttDeviceTopic[0] == 0) {
+    strcpy(mqttDeviceTopic, "wled/");
+    sprintf(mqttDeviceTopic + 5, "%*s", 6, escapedMac.c_str() + 6);
+  }
+  if (mqttClientID[0] == 0) {
+    strcpy(mqttClientID, "WLED-");
+    sprintf(mqttClientID + 5, "%*s", 6, escapedMac.c_str() + 6);
+  }
+
+  strip.service();
+
+#ifndef WLED_DISABLE_OTA
+  if (aOtaEnabled) {
+    ArduinoOTA.onStart([]() {
+#ifdef ESP8266
+      wifi_set_sleep_type(NONE_SLEEP_T);
+#endif
+      DEBUG_PRINTLN("Start ArduinoOTA");
+    });
+    if (strlen(cmDNS) > 0)
+      ArduinoOTA.setHostname(cmDNS);
+  }
+#endif
+#ifdef WLED_ENABLE_DMX
+  initDMX();
+#endif
+  // HTTP server page init
+  initServer();
+}
+
+void WLED::beginStrip()
+{
+  // Initialize NeoPixel Strip and button
+  strip.setShowCallback(handleOverlayDraw);
+
+#ifdef BTNPIN
+  pinMode(BTNPIN, INPUT_PULLUP);
+#endif
+
+  if (bootPreset > 0)
+    applyPreset(bootPreset, turnOnAtBoot);
+  colorUpdated(NOTIFIER_CALL_MODE_INIT);
+
+// init relay pin
+#if RLYPIN >= 0
+  pinMode(RLYPIN, OUTPUT);
+#if RLYMDE
+  digitalWrite(RLYPIN, bri);
+#else
+  digitalWrite(RLYPIN, !bri);
+#endif
+#endif
+
+  // disable button if it is "pressed" unintentionally
+#ifdef BTNPIN
+  if (digitalRead(BTNPIN) == LOW)
+    buttonEnabled = false;
+#else
+  buttonEnabled = false;
+#endif
+}
+
+void WLED::initAP(bool resetAP)
+{
+  if (apBehavior == AP_BEHAVIOR_BUTTON_ONLY && !resetAP)
+    return;
+
+  if (!apSSID[0] || resetAP)
+    strcpy(apSSID, "WLED-AP");
+  if (resetAP)
+    strcpy(apPass, DEFAULT_AP_PASS);
+  DEBUG_PRINT("Opening access point ");
+  DEBUG_PRINTLN(apSSID);
+  WiFi.softAPConfig(IPAddress(4, 3, 2, 1), IPAddress(4, 3, 2, 1), IPAddress(255, 255, 255, 0));
+  WiFi.softAP(apSSID, apPass, apChannel, apHide);
+
+  if (!apActive)        // start captive portal if AP active
+  {
+    DEBUG_PRINTLN("Init AP interfaces");
+    server.begin();
+    if (udpPort > 0 && udpPort != ntpLocalPort) {
+      udpConnected = notifierUdp.begin(udpPort);
+    }
+    if (udpRgbPort > 0 && udpRgbPort != ntpLocalPort && udpRgbPort != udpPort) {
+      udpRgbConnected = rgbUdp.begin(udpRgbPort);
+    }
+
+    dnsServer.setErrorReplyCode(DNSReplyCode::NoError);
+    dnsServer.start(53, "*", WiFi.softAPIP());
+  }
+  apActive = true;
+}
+
+void WLED::initConnection()
+{
+  WiFi.disconnect();        // close old connections
+#ifdef ESP8266
+  WiFi.setPhyMode(WIFI_PHY_MODE_11N);
+#endif
+
+  if (staticIP[0] != 0 && staticGateway[0] != 0) {
+    WiFi.config(staticIP, staticGateway, staticSubnet, IPAddress(8, 8, 8, 8));
+  } else {
+    WiFi.config(0U, 0U, 0U);
+  }
+
+  lastReconnectAttempt = millis();
+
+  if (!WLED_WIFI_CONFIGURED) {
+    DEBUG_PRINT("No connection configured. ");
+    if (!apActive)
+      initAP();        // instantly go to ap mode
+    return;
+  } else if (!apActive) {
+    if (apBehavior == AP_BEHAVIOR_ALWAYS) {
+      initAP();
+    } else {
+      DEBUG_PRINTLN("Access point disabled.");
+      WiFi.softAPdisconnect(true);
+    }
+  }
+  showWelcomePage = false;
+
+  DEBUG_PRINT("Connecting to ");
+  DEBUG_PRINT(clientSSID);
+  DEBUG_PRINTLN("...");
+
+#ifdef ESP8266
+  WiFi.hostname(serverDescription);
+#endif
+
+  WiFi.begin(clientSSID, clientPass);
+
+#ifdef ARDUINO_ARCH_ESP32
+  WiFi.setSleep(!noWifiSleep);
+  WiFi.setHostname(serverDescription);
+#else
+  wifi_set_sleep_type((noWifiSleep) ? NONE_SLEEP_T : MODEM_SLEEP_T);
+#endif
+}
+
+void WLED::initInterfaces()
+{
+  DEBUG_PRINTLN("Init STA interfaces");
+
+  if (hueIP[0] == 0) {
+    hueIP[0] = WiFi.localIP()[0];
+    hueIP[1] = WiFi.localIP()[1];
+    hueIP[2] = WiFi.localIP()[2];
+  }
+
+  // init Alexa hue emulation
+  if (alexaEnabled)
+    alexaInit();
+
+#ifndef WLED_DISABLE_OTA
+  if (aOtaEnabled)
+    ArduinoOTA.begin();
+#endif
+
+  strip.service();
+  // Set up mDNS responder:
+  if (strlen(cmDNS) > 0) {
+    if (!aOtaEnabled)
+      MDNS.begin(cmDNS);
+
+    DEBUG_PRINTLN("mDNS started");
+    MDNS.addService("http", "tcp", 80);
+    MDNS.addService("wled", "tcp", 80);
+    MDNS.addServiceTxt("wled", "tcp", "mac", escapedMac.c_str());
+  }
+  server.begin();
+
+  if (udpPort > 0 && udpPort != ntpLocalPort) {
+    udpConnected = notifierUdp.begin(udpPort);
+    if (udpConnected && udpRgbPort != udpPort)
+      udpRgbConnected = rgbUdp.begin(udpRgbPort);
+  }
+  if (ntpEnabled)
+    ntpConnected = ntpUdp.begin(ntpLocalPort);
+
+  initBlynk(blynkApiKey);
+  e131.begin((e131Multicast) ? E131_MULTICAST : E131_UNICAST, e131Universe, E131_MAX_UNIVERSE_COUNT);
+  reconnectHue();
+  initMqtt();
+  interfacesInited = true;
+  wasConnected = true;
+}
+
+byte stacO = 0;
+uint32_t lastHeap;
+unsigned long heapTime = 0;
+
+void WLED::handleConnection()
+{
+  if (millis() < 2000 && (!WLED_WIFI_CONFIGURED || apBehavior == AP_BEHAVIOR_ALWAYS))
+    return;
+  if (lastReconnectAttempt == 0)
+    initConnection();
+
+  // reconnect WiFi to clear stale allocations if heap gets too low
+  if (millis() - heapTime > 5000) {
+    uint32_t heap = ESP.getFreeHeap();
+    if (heap < 9000 && lastHeap < 9000) {
+      DEBUG_PRINT("Heap too low! ");
+      DEBUG_PRINTLN(heap);
+      forceReconnect = true;
+    }
+    lastHeap = heap;
+    heapTime = millis();
+  }
+
+  byte stac = 0;
+  if (apActive) {
+#ifdef ESP8266
+    stac = wifi_softap_get_station_num();
+#else
+    wifi_sta_list_t stationList;
+    esp_wifi_ap_get_sta_list(&stationList);
+    stac = stationList.num;
+#endif
+    if (stac != stacO) {
+      stacO = stac;
+      DEBUG_PRINT("Connected AP clients: ");
+      DEBUG_PRINTLN(stac);
+      if (!WLED_CONNECTED && WLED_WIFI_CONFIGURED) {        // trying to connect, but not connected
+        if (stac)
+          WiFi.disconnect();        // disable search so that AP can work
+        else
+          initConnection();        // restart search
+      }
+    }
+  }
+  if (forceReconnect) {
+    DEBUG_PRINTLN("Forcing reconnect.");
+    initConnection();
+    interfacesInited = false;
+    forceReconnect = false;
+    wasConnected = false;
+    return;
+  }
+  if (!WLED_CONNECTED) {
+    if (interfacesInited) {
+      DEBUG_PRINTLN("Disconnected!");
+      interfacesInited = false;
+      initConnection();
+    }
+    if (millis() - lastReconnectAttempt > ((stac) ? 300000 : 20000) && WLED_WIFI_CONFIGURED)
+      initConnection();
+    if (!apActive && millis() - lastReconnectAttempt > 12000 && (!wasConnected || apBehavior == AP_BEHAVIOR_NO_CONN))
+      initAP();
+  } else if (!interfacesInited) {        // newly connected
+    DEBUG_PRINTLN("");
+    DEBUG_PRINT("Connected! IP address: ");
+    DEBUG_PRINTLN(WiFi.localIP());
+    initInterfaces();
+    userConnected();
+
+    // shut down AP
+    if (apBehavior != AP_BEHAVIOR_ALWAYS && apActive) {
+      dnsServer.stop();
+      WiFi.softAPdisconnect(true);
+      apActive = false;
+      DEBUG_PRINTLN("Access point disabled.");
+    }
+  }
+}
--- a/wled00/wled.h
+++ b/wled00/wled.h
@ -0,0 +1,519 @@
+#ifndef WLED_H
+#define WLED_H
+/*
+   Main sketch, global variable declarations
+   @title WLED project sketch
+   @version 0.9.1n
+   @author Christian Schwinne
+ */
+
+// version code in format yymmddb (b = daily build)
+#define VERSION 2004100
+
+// ESP8266-01 (blue) got too little storage space to work with all features of WLED. To use it, you must use ESP8266 Arduino Core v2.4.2 and the setting 512K(No SPIFFS).
+
+// ESP8266-01 (black) has 1MB flash and can thus fit the whole program. Use 1M(64K SPIFFS).
+// Uncomment some of the following lines to disable features to compile for ESP8266-01 (max flash size 434kB):
+// Alternatively, with platformio pass your chosen flags to your custom build target in platformio.ini.override
+
+// You are required to disable over-the-air updates:
+//#define WLED_DISABLE_OTA         // saves 14kb
+
+// You need to choose some of these features to disable:
+//#define WLED_DISABLE_ALEXA       // saves 11kb
+//#define WLED_DISABLE_BLYNK       // saves 6kb
+//#define WLED_DISABLE_CRONIXIE    // saves 3kb
+//#define WLED_DISABLE_HUESYNC     // saves 4kb
+//#define WLED_DISABLE_INFRARED    // there is no pin left for this on ESP8266-01, saves 12kb
+#define WLED_ENABLE_MQTT           // saves 12kb
+#define WLED_ENABLE_ADALIGHT       // saves 500b only
+//#define WLED_ENABLE_DMX          // uses 3.5kb (use LEDPIN other than 2)
+
+#define WLED_DISABLE_FILESYSTEM        // SPIFFS is not used by any WLED feature yet
+//#define WLED_ENABLE_FS_SERVING   // Enable sending html file from SPIFFS before serving progmem version
+//#define WLED_ENABLE_FS_EDITOR    // enable /edit page for editing SPIFFS content. Will also be disabled with OTA lock
+
+// to toggle usb serial debug (un)comment the following line
+//#define WLED_DEBUG
+
+// Library inclusions. 
+#include <Arduino.h>
+#ifdef ESP8266
+  #include <ESP8266WiFi.h>
+  #include <ESP8266mDNS.h>
+  #include <ESPAsyncTCP.h>
+  extern "C"
+  {
+  #include <user_interface.h>
+  }
+#else // ESP32
+  #include <WiFi.h>
+  #include "esp_wifi.h"
+  #include <ESPmDNS.h>
+  #include <AsyncTCP.h>
+  #include "SPIFFS.h"
+#endif
+
+#include <ESPAsyncWebServer.h>
+#include <EEPROM.h>
+#include <WiFiUdp.h>
+#include <DNSServer.h>
+#ifndef WLED_DISABLE_OTA
+  #include <ArduinoOTA.h>
+#endif
+#include <SPIFFSEditor.h>
+#include "src/dependencies/time/TimeLib.h"
+#include "src/dependencies/timezone/Timezone.h"
+
+#ifndef WLED_DISABLE_ALEXA
+  #define ESPALEXA_ASYNC
+  #define ESPALEXA_NO_SUBPAGE
+  #define ESPALEXA_MAXDEVICES 1
+  // #define ESPALEXA_DEBUG
+  #include "src/dependencies/espalexa/Espalexa.h"
+#endif
+#ifndef WLED_DISABLE_BLYNK
+  #include "src/dependencies/blynk/BlynkSimpleEsp.h"
+#endif
+
+#include "src/dependencies/e131/ESPAsyncE131.h"
+#include "src/dependencies/async-mqtt-client/AsyncMqttClient.h"
+#include "src/dependencies/json/AsyncJson-v6.h"
+#include "src/dependencies/json/ArduinoJson-v6.h"
+
+#include "fcn_declare.h"
+#include "html_ui.h"
+#include "html_settings.h"
+#include "html_other.h"
+#include "FX.h"
+#include "ir_codes.h"
+#include "const.h"
+
+#ifndef CLIENT_SSID
+  #define CLIENT_SSID DEFAULT_CLIENT_SSID
+#endif
+
+#ifndef CLIENT_PASS
+  #define CLIENT_PASS ""
+#endif
+
+#if IR_PIN < 0
+  #ifndef WLED_DISABLE_INFRARED
+    #define WLED_DISABLE_INFRARED
+  #endif
+#endif
+
+#ifndef WLED_DISABLE_INFRARED
+  #include <IRremoteESP8266.h>
+  #include <IRrecv.h>
+  #include <IRutils.h>
+#endif
+
+// remove flicker because PWM signal of RGB channels can become out of phase
+#if defined(WLED_USE_ANALOG_LEDS) && defined(ESP8266)
+  #include "src/dependencies/arduino/core_esp8266_waveform.h"
+#endif
+
+// enable additional debug output
+#ifdef WLED_DEBUG
+  #ifndef ESP8266
+  #include <rom/rtc.h>
+  #endif
+  #define DEBUG_PRINT(x) Serial.print(x)
+  #define DEBUG_PRINTLN(x) Serial.println(x)
+  #define DEBUG_PRINTF(x) Serial.printf(x)
+#else
+  #define DEBUG_PRINT(x)
+  #define DEBUG_PRINTLN(x)
+  #define DEBUG_PRINTF(x)
+#endif
+
+// GLOBAL VARIABLES
+// both declared and defined in header (solution from http://www.keil.com/support/docs/1868.htm)
+//
+//e.g. byte test = 2 becomes WLED_GLOBAL byte test _INIT(2);
+//     int arr[]{0,1,2} becomes WLED_GLOBAL int arr[] _INIT_N(({0,1,2}));
+
+#ifndef WLED_DEFINE_GLOBAL_VARS
+# define WLED_GLOBAL extern
+# define _INIT(x)
+# define _INIT_N(x)
+#else
+# define WLED_GLOBAL
+# define _INIT(x) = x
+
+//needed to ignore commas in array definitions
+#define UNPACK( ... ) __VA_ARGS__
+# define _INIT_N(x) UNPACK x
+#endif
+
+// Global Variable definitions
+WLED_GLOBAL char versionString[] _INIT("0.9.1n");
+
+// AP and OTA default passwords (for maximum security change them!)
+WLED_GLOBAL char apPass[65]  _INIT(DEFAULT_AP_PASS);
+WLED_GLOBAL char otaPass[33] _INIT(DEFAULT_OTA_PASS);
+
+// Hardware CONFIG (only changeble HERE, not at runtime)
+// LED strip pin, button pin and IR pin changeable in NpbWrapper.h!
+
+WLED_GLOBAL byte auxDefaultState _INIT(0);                         // 0: input 1: high 2: low
+WLED_GLOBAL byte auxTriggeredState _INIT(0);                       // 0: input 1: high 2: low
+WLED_GLOBAL char ntpServerName[33] _INIT("0.wled.pool.ntp.org");   // NTP server to use
+
+// WiFi CONFIG (all these can be changed via web UI, no need to set them here)
+WLED_GLOBAL char clientSSID[33] _INIT(CLIENT_SSID);
+WLED_GLOBAL char clientPass[65] _INIT(CLIENT_PASS);
+WLED_GLOBAL char cmDNS[33] _INIT("x");                             // mDNS address (placeholder, is replaced by wledXXXXXX.local)
+WLED_GLOBAL char apSSID[33] _INIT("");                             // AP off by default (unless setup)
+WLED_GLOBAL byte apChannel _INIT(1);                               // 2.4GHz WiFi AP channel (1-13)
+WLED_GLOBAL byte apHide    _INIT(0);                               // hidden AP SSID
+WLED_GLOBAL byte apBehavior _INIT(AP_BEHAVIOR_BOOT_NO_CONN);       // access point opens when no connection after boot by default
+WLED_GLOBAL IPAddress staticIP      _INIT_N(((  0,   0,  0,  0))); // static IP of ESP
+WLED_GLOBAL IPAddress staticGateway _INIT_N(((  0,   0,  0,  0))); // gateway (router) IP
+WLED_GLOBAL IPAddress staticSubnet  _INIT_N(((255, 255, 255, 0))); // most common subnet in home networks
+WLED_GLOBAL bool noWifiSleep _INIT(false);                         // disabling modem sleep modes will increase heat output and power usage, but may help with connection issues
+
+// LED CONFIG
+WLED_GLOBAL uint16_t ledCount _INIT(30);          // overcurrent prevented by ABL
+WLED_GLOBAL bool useRGBW      _INIT(false);       // SK6812 strips can contain an extra White channel
+WLED_GLOBAL bool turnOnAtBoot _INIT(true);        // turn on LEDs at power-up
+WLED_GLOBAL byte bootPreset   _INIT(0);           // save preset to load after power-up
+
+WLED_GLOBAL byte col[]    _INIT_N(({ 255, 160, 0, 0 }));  // current RGB(W) primary color. col[] should be updated if you want to change the color.
+WLED_GLOBAL byte colSec[] _INIT_N(({ 0, 0, 0, 0 }));      // current RGB(W) secondary color
+WLED_GLOBAL byte briS     _INIT(128);                     // default brightness
+
+WLED_GLOBAL byte nightlightTargetBri _INIT(0);      // brightness after nightlight is over
+WLED_GLOBAL byte nightlightDelayMins _INIT(60);
+WLED_GLOBAL bool nightlightFade      _INIT(true);   // if enabled, light will gradually dim towards the target bri. Otherwise, it will instantly set after delay over
+WLED_GLOBAL bool nightlightColorFade _INIT(false);  // if enabled, light will gradually fade color from primary to secondary color.
+WLED_GLOBAL bool fadeTransition      _INIT(true);   // enable crossfading color transition
+WLED_GLOBAL uint16_t transitionDelay _INIT(750);    // default crossfade duration in ms
+
+WLED_GLOBAL bool skipFirstLed  _INIT(false);        // ignore first LED in strip (useful if you need the LED as signal repeater)
+WLED_GLOBAL byte briMultiplier _INIT(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
+WLED_GLOBAL char serverDescription[33] _INIT("WLED");  // Name of module
+WLED_GLOBAL bool syncToggleReceive     _INIT(false);   // UIs which only have a single button for sync should toggle send+receive if this is true, only send otherwise
+
+// Sync CONFIG
+WLED_GLOBAL bool buttonEnabled  _INIT(true);
+WLED_GLOBAL byte irEnabled      _INIT(0);     // Infrared receiver
+
+WLED_GLOBAL uint16_t udpPort    _INIT(21324); // WLED notifier default port
+WLED_GLOBAL uint16_t udpRgbPort _INIT(19446); // Hyperion port
+
+WLED_GLOBAL bool receiveNotificationBrightness _INIT(true);       // apply brightness from incoming notifications
+WLED_GLOBAL bool receiveNotificationColor      _INIT(true);       // apply color
+WLED_GLOBAL bool receiveNotificationEffects    _INIT(true);       // apply effects setup
+WLED_GLOBAL bool notifyDirect _INIT(false);                       // send notification if change via UI or HTTP API
+WLED_GLOBAL bool notifyButton _INIT(false);                       // send if updated by button or infrared remote
+WLED_GLOBAL bool notifyAlexa  _INIT(false);                       // send notification if updated via Alexa
+WLED_GLOBAL bool notifyMacro  _INIT(false);                       // send notification for macro
+WLED_GLOBAL bool notifyHue    _INIT(true);                        // send notification if Hue light changes
+WLED_GLOBAL bool notifyTwice  _INIT(false);                       // notifications use UDP: enable if devices don't sync reliably
+
+WLED_GLOBAL bool alexaEnabled _INIT(true);                        // enable device discovery by Amazon Echo
+WLED_GLOBAL char alexaInvocationName[33] _INIT("Light");          // speech control name of device. Choose something voice-to-text can understand
+
+WLED_GLOBAL char blynkApiKey[36] _INIT("");                       // Auth token for Blynk server. If empty, no connection will be made
+
+WLED_GLOBAL uint16_t realtimeTimeoutMs _INIT(2500);               // ms timeout of realtime mode before returning to normal mode
+WLED_GLOBAL int arlsOffset _INIT(0);                              // realtime LED offset
+WLED_GLOBAL bool receiveDirect _INIT(true);                       // receive UDP realtime
+WLED_GLOBAL bool arlsDisableGammaCorrection _INIT(true);          // activate if gamma correction is handled by the source
+WLED_GLOBAL bool arlsForceMaxBri _INIT(false);                    // enable to force max brightness if source has very dark colors that would be black
+
+WLED_GLOBAL uint16_t e131Universe _INIT(1);                       // settings for E1.31 (sACN) protocol (only DMX_MODE_MULTIPLE_* can span over consequtive universes)
+WLED_GLOBAL byte DMXMode _INIT(DMX_MODE_MULTIPLE_RGB);            // DMX mode (s.a.)
+WLED_GLOBAL uint16_t DMXAddress _INIT(1);                         // DMX start address of fixture, a.k.a. first Channel [for E1.31 (sACN) protocol]
+WLED_GLOBAL byte DMXOldDimmer _INIT(0);                           // only update brightness on change
+WLED_GLOBAL byte e131LastSequenceNumber[E131_MAX_UNIVERSE_COUNT]; // to detect packet loss
+WLED_GLOBAL bool e131Multicast _INIT(false);                      // multicast or unicast
+WLED_GLOBAL bool e131SkipOutOfSequence _INIT(false);              // freeze instead of flickering
+
+WLED_GLOBAL bool mqttEnabled _INIT(false);
+WLED_GLOBAL char mqttDeviceTopic[33] _INIT("");            // main MQTT topic (individual per device, default is wled/mac)
+WLED_GLOBAL char mqttGroupTopic[33] _INIT("wled/all");     // second MQTT topic (for example to group devices)
+WLED_GLOBAL char mqttServer[33] _INIT("");                 // both domains and IPs should work (no SSL)
+WLED_GLOBAL char mqttUser[41] _INIT("");                   // optional: username for MQTT auth
+WLED_GLOBAL char mqttPass[41] _INIT("");                   // optional: password for MQTT auth
+WLED_GLOBAL char mqttClientID[41] _INIT("");               // override the client ID
+WLED_GLOBAL uint16_t mqttPort _INIT(1883);
+
+WLED_GLOBAL bool huePollingEnabled _INIT(false);           // poll hue bridge for light state
+WLED_GLOBAL uint16_t huePollIntervalMs _INIT(2500);        // low values (< 1sec) may cause lag but offer quicker response
+WLED_GLOBAL char hueApiKey[47] _INIT("api");               // key token will be obtained from bridge
+WLED_GLOBAL byte huePollLightId _INIT(1);                  // ID of hue lamp to sync to. Find the ID in the hue app ("about" section)
+WLED_GLOBAL IPAddress hueIP _INIT((0, 0, 0, 0));           // IP address of the bridge
+WLED_GLOBAL bool hueApplyOnOff _INIT(true);
+WLED_GLOBAL bool hueApplyBri _INIT(true);
+WLED_GLOBAL bool hueApplyColor _INIT(true);
+
+// Time CONFIG
+WLED_GLOBAL bool ntpEnabled _INIT(false);         // get internet time. Only required if you use clock overlays or time-activated macros
+WLED_GLOBAL bool useAMPM _INIT(false);            // 12h/24h clock format
+WLED_GLOBAL byte currentTimezone _INIT(0);        // Timezone ID. Refer to timezones array in wled10_ntp.ino
+WLED_GLOBAL int utcOffsetSecs _INIT(0);           // Seconds to offset from UTC before timzone calculation
+
+WLED_GLOBAL byte overlayDefault _INIT(0);                               // 0: no overlay 1: analog clock 2: single-digit clocl 3: cronixie
+WLED_GLOBAL byte overlayMin _INIT(0), overlayMax _INIT(ledCount - 1);   // boundaries of overlay mode
+
+WLED_GLOBAL byte analogClock12pixel _INIT(0);               // The pixel in your strip where "midnight" would be
+WLED_GLOBAL bool analogClockSecondsTrail _INIT(false);      // Display seconds as trail of LEDs instead of a single pixel
+WLED_GLOBAL bool analogClock5MinuteMarks _INIT(false);      // Light pixels at every 5-minute position
+
+WLED_GLOBAL char cronixieDisplay[7] _INIT("HHMMSS");        // Cronixie Display mask. See wled13_cronixie.ino
+WLED_GLOBAL bool cronixieBacklight _INIT(true);             // Allow digits to be back-illuminated
+
+WLED_GLOBAL bool countdownMode _INIT(false);                         // Clock will count down towards date
+WLED_GLOBAL byte countdownYear _INIT(20), countdownMonth _INIT(1);   // Countdown target date, year is last two digits
+WLED_GLOBAL byte countdownDay  _INIT(1) , countdownHour  _INIT(0);
+WLED_GLOBAL byte countdownMin  _INIT(0) , countdownSec   _INIT(0);
+
+WLED_GLOBAL byte macroBoot _INIT(0);        // macro loaded after startup
+WLED_GLOBAL byte macroNl   _INIT(0);        // after nightlight delay over
+WLED_GLOBAL byte macroCountdown _INIT(0);
+WLED_GLOBAL byte macroAlexaOn _INIT(0), macroAlexaOff _INIT(0);
+WLED_GLOBAL byte macroButton _INIT(0), macroLongPress _INIT(0), macroDoublePress _INIT(0);
+
+// Security CONFIG
+WLED_GLOBAL bool otaLock     _INIT(false);  // prevents OTA firmware updates without password. ALWAYS enable if system exposed to any public networks
+WLED_GLOBAL bool wifiLock    _INIT(false);  // prevents access to WiFi settings when OTA lock is enabled
+WLED_GLOBAL bool aOtaEnabled _INIT(true);   // ArduinoOTA allows easy updates directly from the IDE. Careful, it does not auto-disable when OTA lock is on
+
+WLED_GLOBAL uint16_t userVar0 _INIT(0), userVar1 _INIT(0); //available for use in usermod
+
+#ifdef WLED_ENABLE_DMX
+  // dmx CONFIG
+  WLED_GLOBAL byte DMXChannels _INIT(7);        // number of channels per fixture
+  WLED_GLOBAL byte DMXFixtureMap[15] _INIT_N(({ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }));
+  // assigns the different channels to different functions. See wled21_dmx.ino for more information.
+  WLED_GLOBAL uint16_t DMXGap _INIT(10);          // gap between the fixtures. makes addressing easier because you don't have to memorize odd numbers when climbing up onto a rig.
+  WLED_GLOBAL uint16_t DMXStart _INIT(10);        // start address of the first fixture
+  WLED_GLOBAL uint16_t DMXStartLED _INIT(0);      // LED from which DMX fixtures start
+#endif
+
+// internal global variable declarations
+// wifi
+WLED_GLOBAL bool apActive _INIT(false);
+WLED_GLOBAL bool forceReconnect _INIT(false);
+WLED_GLOBAL uint32_t lastReconnectAttempt _INIT(0);
+WLED_GLOBAL bool interfacesInited _INIT(false);
+WLED_GLOBAL bool wasConnected _INIT(false);
+
+// color
+WLED_GLOBAL byte colOld[]    _INIT_N(({ 0, 0, 0, 0 }));        // color before transition
+WLED_GLOBAL byte colT[]      _INIT_N(({ 0, 0, 0, 0 }));          // color that is currently displayed on the LEDs
+WLED_GLOBAL byte colIT[]     _INIT_N(({ 0, 0, 0, 0 }));         // color that was last sent to LEDs
+WLED_GLOBAL byte colSecT[]   _INIT_N(({ 0, 0, 0, 0 }));
+WLED_GLOBAL byte colSecOld[] _INIT_N(({ 0, 0, 0, 0 }));
+WLED_GLOBAL byte colSecIT[]  _INIT_N(({ 0, 0, 0, 0 }));
+
+WLED_GLOBAL byte lastRandomIndex _INIT(0);        // used to save last random color so the new one is not the same
+
+// transitions
+WLED_GLOBAL bool transitionActive _INIT(false);
+WLED_GLOBAL uint16_t transitionDelayDefault _INIT(transitionDelay);
+WLED_GLOBAL uint16_t transitionDelayTemp _INIT(transitionDelay);
+WLED_GLOBAL unsigned long transitionStartTime;
+WLED_GLOBAL float tperLast _INIT(0);        // crossfade transition progress, 0.0f - 1.0f
+WLED_GLOBAL bool jsonTransitionOnce _INIT(false);
+
+// nightlight
+WLED_GLOBAL bool nightlightActive _INIT(false);
+WLED_GLOBAL bool nightlightActiveOld _INIT(false);
+WLED_GLOBAL uint32_t nightlightDelayMs _INIT(10);
+WLED_GLOBAL byte nightlightDelayMinsDefault _INIT(nightlightDelayMins);
+WLED_GLOBAL unsigned long nightlightStartTime;
+WLED_GLOBAL byte briNlT _INIT(0);                     // current nightlight brightness
+WLED_GLOBAL byte colNlT[] _INIT_N(({ 0, 0, 0, 0 }));        // current nightlight color
+
+// brightness
+WLED_GLOBAL unsigned long lastOnTime _INIT(0);
+WLED_GLOBAL bool offMode _INIT(!turnOnAtBoot);
+WLED_GLOBAL byte bri _INIT(briS);
+WLED_GLOBAL byte briOld _INIT(0);
+WLED_GLOBAL byte briT _INIT(0);
+WLED_GLOBAL byte briIT _INIT(0);
+WLED_GLOBAL byte briLast _INIT(128);          // brightness before turned off. Used for toggle function
+WLED_GLOBAL byte whiteLast _INIT(128);        // white channel before turned off. Used for toggle function
+
+// button
+WLED_GLOBAL bool buttonPressedBefore _INIT(false);
+WLED_GLOBAL bool buttonLongPressed _INIT(false);
+WLED_GLOBAL unsigned long buttonPressedTime _INIT(0);
+WLED_GLOBAL unsigned long buttonWaitTime _INIT(0);
+
+// notifications
+WLED_GLOBAL bool notifyDirectDefault _INIT(notifyDirect);
+WLED_GLOBAL bool receiveNotifications _INIT(true);
+WLED_GLOBAL unsigned long notificationSentTime _INIT(0);
+WLED_GLOBAL byte notificationSentCallMode _INIT(NOTIFIER_CALL_MODE_INIT);
+WLED_GLOBAL bool notificationTwoRequired _INIT(false);
+
+// effects
+WLED_GLOBAL byte effectCurrent _INIT(0);
+WLED_GLOBAL byte effectSpeed _INIT(128);
+WLED_GLOBAL byte effectIntensity _INIT(128);
+WLED_GLOBAL byte effectPalette _INIT(0);
+
+// network
+WLED_GLOBAL bool udpConnected _INIT(false), udpRgbConnected _INIT(false);
+
+// ui style
+WLED_GLOBAL bool showWelcomePage _INIT(false);
+
+// hue
+WLED_GLOBAL byte hueError _INIT(HUE_ERROR_INACTIVE);
+// WLED_GLOBAL uint16_t hueFailCount _INIT(0);
+WLED_GLOBAL float hueXLast _INIT(0), hueYLast _INIT(0);
+WLED_GLOBAL uint16_t hueHueLast _INIT(0), hueCtLast _INIT(0);
+WLED_GLOBAL byte hueSatLast _INIT(0), hueBriLast _INIT(0);
+WLED_GLOBAL unsigned long hueLastRequestSent _INIT(0);
+WLED_GLOBAL bool hueAuthRequired _INIT(false);
+WLED_GLOBAL bool hueReceived _INIT(false);
+WLED_GLOBAL bool hueStoreAllowed _INIT(false), hueNewKey _INIT(false);
+
+// overlays
+WLED_GLOBAL byte overlayCurrent _INIT(overlayDefault);
+WLED_GLOBAL byte overlaySpeed _INIT(200);
+WLED_GLOBAL unsigned long overlayRefreshMs _INIT(200);
+WLED_GLOBAL unsigned long overlayRefreshedTime;
+
+// cronixie
+WLED_GLOBAL byte dP[] _INIT_N(({ 0, 0, 0, 0, 0, 0 }));
+WLED_GLOBAL bool cronixieInit _INIT(false);
+
+// countdown
+WLED_GLOBAL unsigned long countdownTime _INIT(1514764800L);
+WLED_GLOBAL bool countdownOverTriggered _INIT(true);
+
+// timer
+WLED_GLOBAL byte lastTimerMinute _INIT(0);
+WLED_GLOBAL byte timerHours[] _INIT_N(({ 0, 0, 0, 0, 0, 0, 0, 0 }));
+WLED_GLOBAL byte timerMinutes[] _INIT_N(({ 0, 0, 0, 0, 0, 0, 0, 0 }));
+WLED_GLOBAL byte timerMacro[] _INIT_N(({ 0, 0, 0, 0, 0, 0, 0, 0 }));
+WLED_GLOBAL byte timerWeekday[] _INIT_N(({ 255, 255, 255, 255, 255, 255, 255, 255 }));        // weekdays to activate on
+// bit pattern of arr elem: 0b11111111: sun,sat,fri,thu,wed,tue,mon,validity
+
+// blynk
+WLED_GLOBAL bool blynkEnabled _INIT(false);
+
+// preset cycling
+WLED_GLOBAL bool presetCyclingEnabled _INIT(false);
+WLED_GLOBAL byte presetCycleMin _INIT(1), presetCycleMax _INIT(5);
+WLED_GLOBAL uint16_t presetCycleTime _INIT(1250);
+WLED_GLOBAL unsigned long presetCycledTime _INIT(0);
+WLED_GLOBAL byte presetCycCurr _INIT(presetCycleMin);
+WLED_GLOBAL bool presetApplyBri _INIT(true);
+WLED_GLOBAL bool saveCurrPresetCycConf _INIT(false);
+
+// realtime
+WLED_GLOBAL byte realtimeMode _INIT(REALTIME_MODE_INACTIVE);
+WLED_GLOBAL IPAddress realtimeIP _INIT((0, 0, 0, 0));
+WLED_GLOBAL unsigned long realtimeTimeout _INIT(0);
+
+// mqtt
+WLED_GLOBAL long lastMqttReconnectAttempt _INIT(0);
+WLED_GLOBAL long lastInterfaceUpdate _INIT(0);
+WLED_GLOBAL byte interfaceUpdateCallMode _INIT(NOTIFIER_CALL_MODE_INIT);
+WLED_GLOBAL char mqttStatusTopic[40] _INIT("");        // this must be global because of async handlers
+
+#if AUXPIN >= 0
+  // auxiliary debug pin
+  WLED_GLOBAL byte auxTime _INIT(0);
+  WLED_GLOBAL unsigned long auxStartTime _INIT(0);
+  WLED_GLOBAL bool auxActive _INIT(false, auxActiveBefore _INIT(false);
+#endif
+
+// alexa udp
+WLED_GLOBAL String escapedMac;
+#ifndef WLED_DISABLE_ALEXA
+  WLED_GLOBAL Espalexa espalexa;
+  WLED_GLOBAL EspalexaDevice* espalexaDevice;
+#endif
+
+// dns server
+WLED_GLOBAL DNSServer dnsServer;
+
+// network time
+WLED_GLOBAL bool ntpConnected _INIT(false);
+WLED_GLOBAL time_t local _INIT(0);
+WLED_GLOBAL unsigned long ntpLastSyncTime _INIT(999000000L);
+WLED_GLOBAL unsigned long ntpPacketSentTime _INIT(999000000L);
+WLED_GLOBAL IPAddress ntpServerIP;
+WLED_GLOBAL uint16_t ntpLocalPort _INIT(2390);
+
+// Temp buffer
+WLED_GLOBAL char* obuf;
+WLED_GLOBAL uint16_t olen _INIT(0);
+
+// presets
+WLED_GLOBAL uint16_t savedPresets _INIT(0);
+WLED_GLOBAL int8_t currentPreset _INIT(-1);
+WLED_GLOBAL bool isPreset _INIT(false);
+
+WLED_GLOBAL byte errorFlag _INIT(0);
+
+WLED_GLOBAL String messageHead, messageSub;
+WLED_GLOBAL byte optionType;
+
+WLED_GLOBAL bool doReboot _INIT(false);        // flag to initiate reboot from async handlers
+WLED_GLOBAL bool doPublishMqtt _INIT(false);
+
+// server library objects
+WLED_GLOBAL AsyncWebServer server _INIT_N(((80)));
+WLED_GLOBAL AsyncClient* hueClient _INIT(NULL);
+WLED_GLOBAL AsyncMqttClient* mqtt _INIT(NULL);
+
+// udp interface objects
+WLED_GLOBAL WiFiUDP notifierUdp, rgbUdp;
+WLED_GLOBAL WiFiUDP ntpUdp;
+WLED_GLOBAL ESPAsyncE131 e131 _INIT_N(((handleE131Packet)));
+WLED_GLOBAL bool e131NewData _INIT(false);
+
+// led fx library object
+WLED_GLOBAL WS2812FX strip _INIT(WS2812FX());
+
+// debug macro variable definitions
+#ifdef WLED_DEBUG
+  WLED_GLOBAL unsigned long debugTime _INIT(0);
+  WLED_GLOBAL int lastWifiState _INIT(3);
+  WLED_GLOBAL unsigned long wifiStateChangedTime _INIT(0);
+  WLED_GLOBAL int loops _INIT(0);
+#endif
+
+
+#define WLED_CONNECTED (WiFi.status() == WL_CONNECTED)
+#define WLED_WIFI_CONFIGURED (strlen(clientSSID) >= 1 && strcmp(clientSSID, DEFAULT_CLIENT_SSID) != 0)
+
+// append new c string to temp buffer efficiently
+bool oappend(const char* txt);
+// append new number to temp buffer efficiently
+bool oappendi(int i);
+
+class WLED {
+public:
+  WLED();
+  static WLED& instance()
+  {
+    static WLED instance;
+    return instance;
+  }
+
+  // boot starts here
+  void setup();
+
+  void loop();
+  void reset();
+
+  void beginStrip();
+  void handleConnection();
+  void initAP(bool resetAP = false);
+  void initConnection();
+  void initInterfaces();
+};
+#endif        // WLED_H
--- a/wled00/wled00.ino
+++ b/wled00/wled00.ino
@ -1,619 +1,21 @@
 /*
-   Main sketch, global variable declarations
-*/
-/*
- * @title WLED project sketch
- * @version 0.9.1
- * @author Christian Schwinne
+ * WLED Arduino IDE compatibility file.
+ * 
+ * Where has everything gone?
+ * 
+ * In April 2020, the project's structure underwent a major change. 
+ * Global variables are now found in file "wled.h"
+ * Global function declarations are found in "fcn_declare.h"
+ * 
+ * Usermod compatibility: Existing wled06_usermod.ino mods should continue to work. Delete usermod.cpp.
+ * New usermods should use usermod.cpp instead.
 */
+#include "wled.h"

-//ESP8266-01 (blue) got too little storage space to work with all features of WLED. To use it, you must use ESP8266 Arduino Core v2.4.2 and the setting 512K(No SPIFFS).
-
-//ESP8266-01 (black) has 1MB flash and can thus fit the whole program. Use 1M(64K SPIFFS).
-//Uncomment some of the following lines to disable features to compile for ESP8266-01 (max flash size 434kB):
-
-//You are required to disable over-the-air updates:
-//#define WLED_DISABLE_OTA         //saves 14kb
-
-//You need to choose some of these features to disable:
-//#define WLED_DISABLE_ALEXA       //saves 11kb
-//#define WLED_DISABLE_BLYNK       //saves 6kb
-//#define WLED_DISABLE_CRONIXIE    //saves 3kb
-//#define WLED_DISABLE_HUESYNC     //saves 4kb
-//#define WLED_DISABLE_INFRARED    //there is no pin left for this on ESP8266-01, saves 12kb
-#define WLED_ENABLE_MQTT           //saves 12kb
-#define WLED_ENABLE_ADALIGHT       //saves 500b only
-//#define WLED_ENABLE_DMX          //uses 3.5kb, if wanting to use DMX together with LEDs, you should change the LEDPIN to something other than 2 in NpbWrapper.h
-
-#define WLED_DISABLE_FILESYSTEM    //SPIFFS is not used by any WLED feature yet
-//#define WLED_ENABLE_FS_SERVING   //Enable sending html file from SPIFFS before serving progmem version
-//#define WLED_ENABLE_FS_EDITOR    //enable /edit page for editing SPIFFS content. Will also be disabled with OTA lock
-
-//to toggle usb serial debug (un)comment the following line
-//#define WLED_DEBUG
-
-//library inclusions
-#include <Arduino.h>
-#ifdef WLED_ENABLE_DMX
-  #include <ESPDMX.h>
-  DMXESPSerial dmx;
-#endif
-#ifdef ESP8266
-  #include <ESP8266WiFi.h>
-  #include <ESP8266mDNS.h>
-  #include <ESPAsyncTCP.h>
-  extern "C" {
-  #include <user_interface.h>
-  }
-#else  //ESP32
-  #include <WiFi.h>
-  #include "esp_wifi.h"
-  #include <ESPmDNS.h>
-  #include <AsyncTCP.h>
-  #include "SPIFFS.h"
-#endif
-
-#include <ESPAsyncWebServer.h>
-#include <EEPROM.h>
-#include <WiFiUdp.h>
-#include <DNSServer.h>
-#ifndef WLED_DISABLE_OTA
-  #include <ArduinoOTA.h>
-#endif
-#include <SPIFFSEditor.h>
-#include "src/dependencies/time/TimeLib.h"
-#include "src/dependencies/timezone/Timezone.h"
-#ifndef WLED_DISABLE_ALEXA
-  #define ESPALEXA_ASYNC
-  #define ESPALEXA_NO_SUBPAGE
-  #define ESPALEXA_MAXDEVICES 1
-  // #define ESPALEXA_DEBUG
-  #include "src/dependencies/espalexa/Espalexa.h"
-#endif
-#ifndef WLED_DISABLE_BLYNK
-  #include "src/dependencies/blynk/BlynkSimpleEsp.h"
-#endif
-#include "src/dependencies/e131/ESPAsyncE131.h"
-#include "src/dependencies/async-mqtt-client/AsyncMqttClient.h"
-#include "src/dependencies/json/AsyncJson-v6.h"
-#include "src/dependencies/json/ArduinoJson-v6.h"
-#include "html_ui.h"
-#include "html_settings.h"
-#include "html_other.h"
-#include "FX.h"
-#include "ir_codes.h"
-#include "const.h"
-
-#ifndef CLIENT_SSID
-#define CLIENT_SSID DEFAULT_CLIENT_SSID
-#endif
-
-#ifndef CLIENT_PASS
-#define CLIENT_PASS ""
-#endif
-
-
-#if IR_PIN < 0
-  #ifndef WLED_DISABLE_INFRARED
-    #define WLED_DISABLE_INFRARED
-  #endif
-#endif
-
-#ifndef WLED_DISABLE_INFRARED
-  #include <IRremoteESP8266.h>
-  #include <IRrecv.h>
-  #include <IRutils.h>
-#endif
-
-// remove flicker because PWM signal of RGB channels can become out of phase
-#if defined(WLED_USE_ANALOG_LEDS) && defined(ESP8266)
-  #include "src/dependencies/arduino/core_esp8266_waveform.h"
-#endif
-
-// enable additional debug output
-#ifdef WLED_DEBUG
-  #ifndef ESP8266
-    #include <rom/rtc.h>
-  #endif
-#endif
-
-//version code in format yymmddb (b = daily build)
-#define VERSION 2003262
-
-char versionString[] = "0.9.1";
-
-
-//AP and OTA default passwords (for maximum change them!)
-char apPass[65] = DEFAULT_AP_PASS;
-char otaPass[33] = DEFAULT_OTA_PASS;
-
-
-//Hardware CONFIG (only changeble HERE, not at runtime)
-//LED strip pin, button pin and IR pin changeable in NpbWrapper.h!
-
-byte auxDefaultState   = 0;                   //0: input 1: high 2: low
-byte auxTriggeredState = 0;                   //0: input 1: high 2: low
-char ntpServerName[33] = "0.wled.pool.ntp.org";//NTP server to use
-
-
-//WiFi CONFIG (all these can be changed via web UI, no need to set them here)
-char clientSSID[33] = CLIENT_SSID;
-char clientPass[65] = CLIENT_PASS;
-char cmDNS[33] = "x";                         //mDNS address (placeholder, will be replaced by wledXXXXXXXXXXXX.local)
-char apSSID[33] = "";                         //AP off by default (unless setup)
-byte apChannel = 1;                           //2.4GHz WiFi AP channel (1-13)
-byte apHide = 0;                              //hidden AP SSID
-byte apBehavior = AP_BEHAVIOR_BOOT_NO_CONN;   //access point opens when no connection after boot by default
-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
-bool noWifiSleep = false;                     //disabling modem sleep modes will increase heat output and power usage, but may help with connection issues
-
-
-//LED CONFIG
-uint16_t ledCount = 30;                       //overcurrent prevented by ABL
-bool useRGBW = false;                         //SK6812 strips can contain an extra White channel
-#define ABL_MILLIAMPS_DEFAULT 850;            //auto lower brightness to stay close to milliampere limit
-bool turnOnAtBoot  = true;                    //turn on LEDs at power-up
-byte bootPreset = 0;                          //save preset to load after power-up
-
-byte col[] {255, 160, 0, 0};                  //current RGB(W) primary color. col[] should be updated if you want to change the color.
-byte colSec[] {0, 0, 0, 0};                   //current RGB(W) secondary color
-byte briS = 128;                              //default brightness
-
-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 nightlightColorFade = false;             //if enabled, light will gradually fade color from primary to secondary color.
-bool fadeTransition = true;                   //enable crossfading color transition
-uint16_t transitionDelay = 750;               //default crossfade duration in ms
-
-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";          //Name of module
-bool syncToggleReceive = false;               //UIs which only have a single button for sync should toggle send+receive if this is true, only send otherwise
-
-
-//Sync CONFIG
-bool buttonEnabled =  true;
-byte irEnabled     =  0;                      //Infrared receiver
-
-uint16_t udpPort    = 21324;                  //WLED notifier default port
-uint16_t udpRgbPort = 19446;                  //Hyperion port
-
-bool receiveNotificationBrightness = true;    //apply brightness from incoming notifications
-bool receiveNotificationColor      = true;    //apply color
-bool receiveNotificationEffects    = true;    //apply effects setup
-bool notifyDirect = false;                    //send notification if change via UI or HTTP API
-bool notifyButton = false;                    //send if updated by button or infrared remote
-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
-
-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
-
-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 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
-
-#define E131_MAX_UNIVERSE_COUNT 9
-uint16_t e131Universe = 1;                    //settings for E1.31 (sACN) protocol (only DMX_MODE_MULTIPLE_* can span over consequtive universes)
-uint8_t  DMXMode = DMX_MODE_MULTIPLE_RGB;     //DMX mode (s.a.)
-uint16_t DMXAddress = 1;                      //DMX start address of fixture, a.k.a. first Channel [for E1.31 (sACN) protocol]
-uint8_t  DMXOldDimmer = 0;                    //only update brightness on change
-uint8_t  e131LastSequenceNumber[E131_MAX_UNIVERSE_COUNT];          //to detect packet loss
-bool     e131Multicast = false;               //multicast or unicast
-bool     e131SkipOutOfSequence = false;       //freeze instead of flickering
-
-bool mqttEnabled = 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)
-char mqttUser[41] = "";                       //optional: username for MQTT auth
-char mqttPass[41] = "";                       //optional: password for MQTT auth
-char mqttClientID[41] = "";                   //override the client ID
-uint16_t mqttPort = 1883;
-
-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 = 20, 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, macroDoublePress = 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;
-
-#ifdef WLED_ENABLE_DMX
-  //dmx CONFIG
-  byte DMXChannels = 7;                       // number of channels per fixture
-  byte DMXFixtureMap[15] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-                                              // assigns the different channels to different functions. See wled21_dmx.ino for more information.
-  uint16_t DMXGap = 10;                       // gap between the fixtures. makes addressing easier because you don't have to memorize odd numbers when climbing up onto a rig.
-  uint16_t DMXStart = 10;                     // start address of the first fixture
-  uint16_t DMXSegment = 0;                    // segment which DMX fixtures use
-  uint16_t DMXStartLED = 0;                   // start LED from which DMX fixtures should start
-#endif
-
-
-//internal global variable declarations
-//wifi
-bool apActive = false;
-bool forceReconnect = false;
-uint32_t lastReconnectAttempt = 0;
-bool interfacesInited = false;
-bool wasConnected = false;
-
-//color
-byte colOld[] {0, 0, 0, 0};                   //color before transition
-byte colT[] {0, 0, 0, 0};                     //color that is currently displayed on the LEDs
-byte colIT[] {0, 0, 0, 0};                    //color that was last sent to LEDs
-byte colSecT[] {0, 0, 0, 0};
-byte colSecOld[] {0, 0, 0, 0};
-byte colSecIT[] {0, 0, 0, 0};
-
-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;
-float tperLast = 0;                           //crossfade transition progress, 0.0f - 1.0f
-bool jsonTransitionOnce = false;
-
-//nightlight
-bool nightlightActive = false;
-bool nightlightActiveOld = false;
-uint32_t nightlightDelayMs = 10;
-uint8_t nightlightDelayMinsDefault = nightlightDelayMins;
-unsigned long nightlightStartTime;
-byte briNlT = 0;                              //current nightlight brightness
-byte colNlT[] {0, 0, 0, 0};                   //current nightlight color
-
-//brightness
-unsigned long lastOnTime = 0;
-bool offMode = !turnOnAtBoot;
-byte bri = briS;
-byte briOld = 0;
-byte briT = 0;
-byte briIT = 0;
-byte briLast = 128;                           //brightness before turned off. Used for toggle function
-byte whiteLast = 128;                         //white channel before turned off. Used for toggle function
-
-//button
-bool buttonPressedBefore = false;
-bool buttonLongPressed = false;
-unsigned long buttonPressedTime = 0;
-unsigned long buttonWaitTime = 0;
-
-//notifications
-bool notifyDirectDefault = notifyDirect;
-bool receiveNotifications = true;
-unsigned long notificationSentTime = 0;
-byte notificationSentCallMode = NOTIFIER_CALL_MODE_INIT;
-bool notificationTwoRequired = false;
-
-//effects
-byte effectCurrent = 0;
-byte effectSpeed = 128;
-byte effectIntensity = 128;
-byte effectPalette = 0;
-
-//network
-bool udpConnected = false, udpRgbConnected = false;
-
-//ui style
-bool showWelcomePage = false;
-
-//hue
-byte hueError = HUE_ERROR_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;
-bool hueAuthRequired = false;
-bool hueReceived = false;
-bool hueStoreAllowed = false, hueNewKey = false;
-
-//overlays
-byte overlayCurrent = overlayDefault;
-byte overlaySpeed = 200;
-unsigned long overlayRefreshMs = 200;
-unsigned long overlayRefreshedTime;
-
-//cronixie
-byte dP[] {0, 0, 0, 0, 0, 0};
-bool cronixieInit = false;
-
-//countdown
-unsigned long countdownTime = 1514764800L;
-bool countdownOverTriggered = true;
-
-//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: sun,sat,fri,thu,wed,tue,mon,validity
-
-//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;
-bool saveCurrPresetCycConf = false;
-
-//realtime
-byte realtimeMode = REALTIME_MODE_INACTIVE;
-IPAddress realtimeIP = (0,0,0,0);
-unsigned long realtimeTimeout = 0;
-
-//mqtt
-long lastMqttReconnectAttempt = 0;
-long lastInterfaceUpdate = 0;
-byte interfaceUpdateCallMode = NOTIFIER_CALL_MODE_INIT;
-char mqttStatusTopic[40] = ""; //this must be global because of async handlers
-
-#if AUXPIN >= 0
-  //auxiliary debug pin
-  byte auxTime = 0;
-  unsigned long auxStartTime = 0;
-  bool auxActive = false, auxActiveBefore = false;
-#endif
-
-//alexa udp
-String escapedMac;
-#ifndef WLED_DISABLE_ALEXA
-  Espalexa espalexa;
-  EspalexaDevice* espalexaDevice;
-#endif
-
-//dns server
-DNSServer dnsServer;
-
-//network time
-bool ntpConnected = false;
-time_t local = 0;
-unsigned long ntpLastSyncTime = 999000000L;
-unsigned long ntpPacketSentTime = 999000000L;
-IPAddress ntpServerIP;
-uint16_t ntpLocalPort = 2390;
-#define NTP_PACKET_SIZE 48
-
-//maximum number of LEDs - MAX_LEDS is coming from the JSON response getting too big, MAX_LEDS_DMA will become a timing issue
-#define MAX_LEDS 1500
-#define MAX_LEDS_DMA 500
-
-//string temp buffer (now stored in stack locally)
-#define OMAX 2048
-char* obuf;
-uint16_t olen = 0;
-
-//presets
-uint16_t savedPresets = 0;
-int8_t currentPreset = -1;
-bool isPreset = false;
-
-byte errorFlag = 0;
-
-String messageHead, messageSub;
-byte optionType;
-
-bool doReboot = false; //flag to initiate reboot from async handlers
-bool doPublishMqtt = false;
-
-//server library objects
-AsyncWebServer server(80);
-AsyncClient* hueClient = NULL;
-AsyncMqttClient* mqtt = NULL;
-
-//function prototypes
-void colorFromUint32(uint32_t, bool = false);
-void serveMessage(AsyncWebServerRequest*, uint16_t, String, String, byte);
-void handleE131Packet(e131_packet_t*, IPAddress);
-void arlsLock(uint32_t,byte);
-void handleOverlayDraw();
-
-//udp interface objects
-WiFiUDP notifierUdp, rgbUdp;
-WiFiUDP ntpUdp;
-ESPAsyncE131 e131(handleE131Packet);
-bool e131NewData = false;
-
-//led fx library object
-WS2812FX strip = WS2812FX();
-
-#define WLED_CONNECTED (WiFi.status() == WL_CONNECTED)
-#define WLED_WIFI_CONFIGURED (strlen(clientSSID) >= 1 && strcmp(clientSSID,DEFAULT_CLIENT_SSID) != 0)
-
-//debug macros
-#ifdef WLED_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;
-  int loops = 0;
-#else
-  #define DEBUG_PRINT(x)
-  #define DEBUG_PRINTLN(x)
-  #define DEBUG_PRINTF(x)
-#endif
-
-//filesystem
-#ifndef WLED_DISABLE_FILESYSTEM
-  #include <FS.h>
-  #ifdef ARDUINO_ARCH_ESP32
-    #include "SPIFFS.h"
-  #endif
-  #include "SPIFFSEditor.h"
-#endif
-
-
-
-//turns all LEDs off and restarts ESP
-void reset()
-{
-  briT = 0;
-  long dly = millis();
-  while (millis() - dly < 250)
-  {
-    yield(); //enough time to send response to client
-  }
-  setAllLeds();
-  DEBUG_PRINTLN("MODULE RESET");
-  ESP.restart();
-}
-
-
-//append new c string to temp buffer efficiently
-bool oappend(const 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();
+  WLED::instance().setup();
 }

-
-//main program loop
 void loop() {
-  handleIR();          //2nd call to function needed for ESP32 to return valid results -- should be good for ESP8266, too
-  handleConnection();
-  handleSerial();
-  handleNotifications();
-  handleTransitions();
-#ifdef WLED_ENABLE_DMX
-  handleDMX();
-#endif
-  userLoop();
-
-  yield();
-  handleIO();
-  handleIR();
-  handleNetworkTime();
-  handleAlexa();
-
-  handleOverlays();
-  yield();
-#ifdef WLED_USE_ANALOG_LEDS 
-  strip.setRgbwPwm();
-#endif
-
-  if (doReboot) reset();
-
-  if (!realtimeMode) //block stuff if WARLS/Adalight is enabled
-  {
-    if (apActive) dnsServer.processNextRequest();
-#ifndef WLED_DISABLE_OTA
-    if (WLED_CONNECTED && aOtaEnabled) ArduinoOTA.handle();
-#endif
-    handleNightlight();
-    yield();
-
-    handleHue();
-    handleBlynk();
-
-    yield();
-    if (!offMode) strip.service();
-  }
-  yield();
-#ifdef ESP8266
-  MDNS.update();
-#endif
-  if (millis() - lastMqttReconnectAttempt > 30000) initMqtt();
-
-  //DEBUG serial logging
-#ifdef WLED_DEBUG
-  if (millis() - debugTime > 9999)
-  {
-    DEBUG_PRINTLN("---DEBUG INFO---");
-    DEBUG_PRINT("Runtime: "); DEBUG_PRINTLN(millis());
-    DEBUG_PRINT("Unix time: "); DEBUG_PRINTLN(now());
-    DEBUG_PRINT("Free heap: "); DEBUG_PRINTLN(ESP.getFreeHeap());
-    DEBUG_PRINT("Wifi state: "); DEBUG_PRINTLN(WiFi.status());
-    if (WiFi.status() != lastWifiState)
-    {
-      wifiStateChangedTime = millis();
-    }
-    lastWifiState = WiFi.status();
-    DEBUG_PRINT("State time: "); DEBUG_PRINTLN(wifiStateChangedTime);
-    DEBUG_PRINT("NTP last sync: "); DEBUG_PRINTLN(ntpLastSyncTime);
-    DEBUG_PRINT("Client IP: "); DEBUG_PRINTLN(WiFi.localIP());
-    DEBUG_PRINT("Loops/sec: "); DEBUG_PRINTLN(loops / 10);
-    loops = 0;
-    debugTime = millis();
-  }
-  loops++;
-#endif
+  WLED::instance().loop();
 }
--- a/wled00/wled00.vcxproj
+++ b/wled00/wled00.vcxproj
@ -104,231 +104,103 @@
    <None Include="wled00.ino">
      <FileType>CppCode</FileType>
    </None>
-    <None Include="wled01_eeprom.ino">
-      <FileType>CppCode</FileType>
-    </None>
-    <None Include="wled02_xml.ino">
-      <FileType>CppCode</FileType>
-    </None>
-    <None Include="wled03_set.ino">
-      <FileType>CppCode</FileType>
-    </None>
-    <None Include="wled04_file.ino">
-      <FileType>CppCode</FileType>
-    </None>
-    <None Include="wled05_init.ino">
-      <FileType>CppCode</FileType>
-    </None>
-    <None Include="wled06_usermod.ino">
-      <FileType>CppCode</FileType>
-    </None>
-    <None Include="wled07_notify.ino">
-      <FileType>CppCode</FileType>
-    </None>
-    <None Include="wled08_led.ino">
-      <FileType>CppCode</FileType>
-    </None>
-    <None Include="wled09_button.ino">
-      <FileType>CppCode</FileType>
-    </None>
-    <None Include="wled10_ntp.ino">
-      <FileType>CppCode</FileType>
-    </None>
-    <None Include="wled11_ol.ino">
-      <FileType>CppCode</FileType>
-    </None>
-    <None Include="wled12_alexa.ino">
-      <FileType>CppCode</FileType>
-    </None>
-    <None Include="wled13_cronixie.ino">
-      <FileType>CppCode</FileType>
-    </None>
-    <None Include="wled14_colors.ino">
-      <FileType>CppCode</FileType>
-    </None>
-    <None Include="wled15_hue.ino">
-      <FileType>CppCode</FileType>
-    </None>
-    <None Include="wled16_blynk.ino">
-      <FileType>CppCode</FileType>
-    </None>
-    <None Include="wled17_mqtt.ino">
-      <FileType>CppCode</FileType>
-    </None>
-    <None Include="wled18_server.ino">
-      <FileType>CppCode</FileType>
-    </None>
-    <None Include="wled19_json.ino">
-      <FileType>CppCode</FileType>
-    </None>
-    <None Include="wled20_ir.ino">
-      <FileType>CppCode</FileType>
-    </None>
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="html_classic.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="html_mobile.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="html_other.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="html_settings.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="ir_codes.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="NpbWrapper.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="palettes.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient.hpp">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Callbacks.hpp">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\DisconnectReasons.hpp">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Flags.hpp">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Helpers.hpp">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\MessageProperties.hpp">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\ConnAckPacket.hpp">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\Packet.hpp">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PingRespPacket.hpp">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PubAckPacket.hpp">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PubCompPacket.hpp">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PublishPacket.hpp">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PubRecPacket.hpp">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PubRelPacket.hpp">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\SubAckPacket.hpp">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\UnsubAckPacket.hpp">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\ParsingInformation.hpp">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Storage.hpp">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\BlynkSimpleEsp.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkApi.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkApiArduino.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkArduinoClient.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkConfig.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkDateTime.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkDebug.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkDetectDevice.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkEveryN.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkFifo.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkHandlers.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkParam.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkProtocol.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkProtocolDefs.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkTemplates.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkTimer.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkUtility.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkWidgetBase.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkWiFiCommon.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
+    <ClInclude Include="alexa.h" />
+    <ClInclude Include="blynk.h" />
+    <ClInclude Include="button.h" />
+    <ClInclude Include="colors.h" />
+    <ClInclude Include="const.h" />
+    <ClInclude Include="cronixie.h" />
+    <ClInclude Include="dmx.h" />
+    <ClInclude Include="file.h" />
+    <ClInclude Include="html_classic.h" />
+    <ClInclude Include="html_mobile.h" />
+    <ClInclude Include="html_other.h" />
+    <ClInclude Include="html_settings.h" />
+    <ClInclude Include="html_ui.h" />
+    <ClInclude Include="hue.h" />
+    <ClInclude Include="ir.h" />
+    <ClInclude Include="ir_codes.h" />
+    <ClInclude Include="json.h" />
+    <ClInclude Include="led.h" />
+    <ClInclude Include="mqtt.h" />
+    <ClInclude Include="notify.h" />
+    <ClInclude Include="NpbWrapper.h" />
+    <ClInclude Include="ntp.h" />
+    <ClInclude Include="overlay.h" />
+    <ClInclude Include="palettes.h" />
+    <ClInclude Include="set.h" />
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient.h" />
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient.hpp" />
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Callbacks.hpp" />
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\DisconnectReasons.hpp" />
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Flags.hpp" />
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Helpers.hpp" />
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\MessageProperties.hpp" />
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\ConnAckPacket.hpp" />
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\Packet.hpp" />
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PingRespPacket.hpp" />
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PubAckPacket.hpp" />
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PubCompPacket.hpp" />
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PublishPacket.hpp" />
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PubRecPacket.hpp" />
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PubRelPacket.hpp" />
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\SubAckPacket.hpp" />
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\UnsubAckPacket.hpp" />
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\ParsingInformation.hpp" />
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Storage.hpp" />
+    <ClInclude Include="src\dependencies\blynk\BlynkSimpleEsp.h" />
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkApi.h" />
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkApiArduino.h" />
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkArduinoClient.h" />
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkConfig.h" />
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkDateTime.h" />
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkDebug.h" />
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkDetectDevice.h" />
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkEveryN.h" />
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkFifo.h" />
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkHandlers.h" />
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkParam.h" />
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkProtocol.h" />
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkProtocolDefs.h" />
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkTemplates.h" />
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkTimer.h" />
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkUtility.h" />
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkWidgetBase.h" />
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkWiFiCommon.h" />
    <ClInclude Include="src\dependencies\e131\ESPAsyncE131.h" />
-    <ClInclude Include="src\dependencies\espalexa\Espalexa.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\espalexa\EspalexaDevice.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\json\ArduinoJson-v6.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\json\AsyncJson-v6.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\timezone\Timezone.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\time\Time.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\time\TimeLib.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
-    <ClInclude Include="FX.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
+    <ClInclude Include="src\dependencies\espalexa\Espalexa.h" />
+    <ClInclude Include="src\dependencies\espalexa\EspalexaDevice.h" />
+    <ClInclude Include="src\dependencies\json\ArduinoJson-v6.h" />
+    <ClInclude Include="src\dependencies\json\AsyncJson-v6.h" />
+    <ClInclude Include="src\dependencies\timezone\Timezone.h" />
+    <ClInclude Include="src\dependencies\time\Time.h" />
+    <ClInclude Include="src\dependencies\time\TimeLib.h" />
+    <ClInclude Include="FX.h" />
+    <ClInclude Include="usermod.h" />
+    <ClInclude Include="wled.h" />
+    <ClInclude Include="wled_eeprom.h" />
+    <ClInclude Include="wled_server.h" />
+    <ClInclude Include="xml.h" />
    <ClInclude Include="__vm\.wled00.vsarduino.h" />
  </ItemGroup>
  <ItemGroup>
+    <ClCompile Include="alexa.cpp" />
+    <ClCompile Include="blynk.cpp" />
+    <ClCompile Include="button.cpp" />
+    <ClCompile Include="colors.cpp" />
+    <ClCompile Include="cronixie.cpp" />
+    <ClCompile Include="file.cpp" />
+    <ClCompile Include="hue.cpp" />
+    <ClCompile Include="ir.cpp" />
+    <ClCompile Include="json.cpp" />
+    <ClCompile Include="led.cpp" />
+    <ClCompile Include="mqtt.cpp" />
+    <ClCompile Include="notify.cpp" />
+    <ClCompile Include="ntp.cpp" />
+    <ClCompile Include="overlay.cpp" />
+    <ClCompile Include="set.cpp" />
    <ClCompile Include="src\dependencies\async-mqtt-client\AsyncMqttClient.cpp" />
    <ClCompile Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\ConnAckPacket.cpp" />
    <ClCompile Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PingRespPacket.cpp" />
@ -350,6 +222,11 @@
    <ClCompile Include="src\dependencies\time\Time.cpp" />
    <ClCompile Include="FX.cpp" />
    <ClCompile Include="FX_fcn.cpp" />
+    <ClCompile Include="usermod.cpp" />
+    <ClCompile Include="wled.cpp" />
+    <ClCompile Include="wled_eeprom.cpp" />
+    <ClCompile Include="wled_server.cpp" />
+    <ClCompile Include="xml.cpp" />
  </ItemGroup>
  <PropertyGroup>
    <DebuggerFlavor>VisualMicroDebugger</DebuggerFlavor>
--- a/wled00/wled00.vcxproj.filters
+++ b/wled00/wled00.vcxproj.filters
@ -13,29 +13,15 @@
      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
    </Filter>
+    <Filter Include="Source Files\Dependencies">
+      <UniqueIdentifier>{72fe60da-ba26-45b4-82c1-bdff809975da}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Dependencies">
+      <UniqueIdentifier>{8880888d-efea-4189-a25a-834b7b3bb756}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
  <ItemGroup>
    <None Include="wled00.ino" />
-    <None Include="wled01_eeprom.ino" />
-    <None Include="wled02_xml.ino" />
-    <None Include="wled03_set.ino" />
-    <None Include="wled04_file.ino" />
-    <None Include="wled05_init.ino" />
-    <None Include="wled06_usermod.ino" />
-    <None Include="wled07_notify.ino" />
-    <None Include="wled08_led.ino" />
-    <None Include="wled09_button.ino" />
-    <None Include="wled10_ntp.ino" />
-    <None Include="wled11_ol.ino" />
-    <None Include="wled12_alexa.ino" />
-    <None Include="wled13_cronixie.ino" />
-    <None Include="wled14_colors.ino" />
-    <None Include="wled15_hue.ino" />
-    <None Include="wled16_blynk.ino" />
-    <None Include="wled17_mqtt.ino" />
-    <None Include="wled18_server.ino" />
-    <None Include="wled19_json.ino" />
-    <None Include="wled20_ir.ino" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="__vm\.wled00.vsarduino.h">
@ -53,219 +39,348 @@
    <ClInclude Include="html_settings.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="ir_codes.h">
+    <ClInclude Include="FX.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="src\dependencies\json\ArduinoJson-v6.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\json\AsyncJson-v6.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient.hpp">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkApi.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkApiArduino.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkArduinoClient.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkConfig.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkDateTime.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkDebug.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkDetectDevice.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkEveryN.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkFifo.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkHandlers.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkParam.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkProtocol.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkProtocolDefs.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\blynk\BlynkSimpleEsp.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkTemplates.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkTimer.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkUtility.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkWidgetBase.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkWiFiCommon.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Callbacks.hpp">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\ConnAckPacket.hpp">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\DisconnectReasons.hpp">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\espalexa\Espalexa.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\espalexa\EspalexaDevice.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\e131\ESPAsyncE131.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Flags.hpp">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Helpers.hpp">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\MessageProperties.hpp">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
    <ClInclude Include="NpbWrapper.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\Packet.hpp">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\ParsingInformation.hpp">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PingRespPacket.hpp">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PubAckPacket.hpp">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PubCompPacket.hpp">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PublishPacket.hpp">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PubRecPacket.hpp">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PubRelPacket.hpp">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Storage.hpp">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\SubAckPacket.hpp">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\time\Time.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\time\TimeLib.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\timezone\Timezone.h">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\UnsubAckPacket.hpp">
+      <Filter>Header Files\Dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="alexa.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="blynk.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="button.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="colors.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="const.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="cronixie.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="dmx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="file.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="html_ui.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="hue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ir.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="json.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="led.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="mqtt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="notify.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ntp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="overlay.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="set.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="usermod.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="wled.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="wled_eeprom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="wled_server.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="xml.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ir_codes.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="palettes.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Callbacks.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\DisconnectReasons.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Flags.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Helpers.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\MessageProperties.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\ParsingInformation.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Storage.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\ConnAckPacket.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\Packet.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PingRespPacket.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PubAckPacket.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PubCompPacket.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PublishPacket.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PubRecPacket.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PubRelPacket.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\SubAckPacket.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\UnsubAckPacket.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\BlynkSimpleEsp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkApi.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkApiArduino.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkArduinoClient.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkConfig.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkDateTime.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkDebug.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkDetectDevice.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkEveryN.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkFifo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkHandlers.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkParam.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkProtocol.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkProtocolDefs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkTemplates.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkTimer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkUtility.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkWidgetBase.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\blynk\Blynk\BlynkWiFiCommon.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\espalexa\Espalexa.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\espalexa\EspalexaDevice.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\json\ArduinoJson-v6.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\json\AsyncJson-v6.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\time\Time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\time\TimeLib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\timezone\Timezone.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="FX.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dependencies\e131\ESPAsyncE131.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="src\dependencies\async-mqtt-client\AsyncMqttClient.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\ConnAckPacket.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PingRespPacket.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PubAckPacket.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PubCompPacket.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PublishPacket.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PubRecPacket.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PubRelPacket.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\SubAckPacket.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\UnsubAckPacket.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dependencies\blynk\Blynk\BlynkDebug.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dependencies\blynk\Blynk\BlynkHandlers.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dependencies\blynk\Blynk\BlynkTimer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dependencies\blynk\Blynk\utility.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dependencies\espalexa\EspalexaDevice.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dependencies\time\DateStrings.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dependencies\time\Time.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dependencies\timezone\Timezone.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="FX.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="FX_fcn.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="src\dependencies\blynk\Blynk\utility.cpp">
+      <Filter>Source Files\Dependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="src\dependencies\async-mqtt-client\AsyncMqttClient.cpp">
+      <Filter>Source Files\Dependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="src\dependencies\blynk\Blynk\BlynkDebug.cpp">
+      <Filter>Source Files\Dependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="src\dependencies\blynk\Blynk\BlynkHandlers.cpp">
+      <Filter>Source Files\Dependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="src\dependencies\blynk\Blynk\BlynkTimer.cpp">
+      <Filter>Source Files\Dependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\ConnAckPacket.cpp">
+      <Filter>Source Files\Dependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="src\dependencies\time\DateStrings.cpp">
+      <Filter>Source Files\Dependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="src\dependencies\espalexa\EspalexaDevice.cpp">
+      <Filter>Source Files\Dependencies</Filter>
+    </ClCompile>
    <ClCompile Include="src\dependencies\e131\ESPAsyncE131.cpp">
+      <Filter>Source Files\Dependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PingRespPacket.cpp">
+      <Filter>Source Files\Dependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PubAckPacket.cpp">
+      <Filter>Source Files\Dependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PubCompPacket.cpp">
+      <Filter>Source Files\Dependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PublishPacket.cpp">
+      <Filter>Source Files\Dependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PubRecPacket.cpp">
+      <Filter>Source Files\Dependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\PubRelPacket.cpp">
+      <Filter>Source Files\Dependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\SubAckPacket.cpp">
+      <Filter>Source Files\Dependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="src\dependencies\time\Time.cpp">
+      <Filter>Source Files\Dependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="src\dependencies\timezone\Timezone.cpp">
+      <Filter>Source Files\Dependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="src\dependencies\async-mqtt-client\AsyncMqttClient\Packets\UnsubAckPacket.cpp">
+      <Filter>Source Files\Dependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="alexa.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="blynk.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="button.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="colors.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="cronixie.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="file.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="hue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ir.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="json.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="led.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="mqtt.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="notify.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ntp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="overlay.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="set.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="usermod.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="wled.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="wled_eeprom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="wled_server.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="xml.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
  </ItemGroup>
--- a/wled00/wled05_init.ino
+++ b/wled00/wled05_init.ino
@ -1,339 +0,0 @@
-/*
- * Setup code
- */
-
-void wledInit()
-{
-  EEPROM.begin(EEPSIZE);
-  ledCount = EEPROM.read(229) + ((EEPROM.read(398) << 8) & 0xFF00);
-  if (ledCount > MAX_LEDS || ledCount == 0) ledCount = 30;
-
-  #ifdef ESP8266
-  #if LEDPIN == 3
-  if (ledCount > MAX_LEDS_DMA) ledCount = MAX_LEDS_DMA; //DMA method uses too much ram
-  #endif
-  #endif
-  Serial.begin(115200);
-  Serial.setTimeout(50);
-  DEBUG_PRINTLN();
-  DEBUG_PRINT("---WLED "); DEBUG_PRINT(versionString); DEBUG_PRINT(" "); DEBUG_PRINT(VERSION); DEBUG_PRINTLN(" INIT---");
-  #ifdef ARDUINO_ARCH_ESP32
-  DEBUG_PRINT("esp32 ");   DEBUG_PRINTLN(ESP.getSdkVersion());
-  #else
-  DEBUG_PRINT("esp8266 "); DEBUG_PRINTLN(ESP.getCoreVersion());
-  #endif
-  int heapPreAlloc = ESP.getFreeHeap();
-  DEBUG_PRINT("heap ");
-  DEBUG_PRINTLN(ESP.getFreeHeap());
-
-  strip.init(EEPROM.read(372),ledCount,EEPROM.read(2204)); //init LEDs quickly
-  strip.setBrightness(0);
-
-  DEBUG_PRINT("LEDs inited. heap usage ~");
-  DEBUG_PRINTLN(heapPreAlloc - ESP.getFreeHeap());
-
-  #ifndef WLED_DISABLE_FILESYSTEM
-   #ifdef ARDUINO_ARCH_ESP32
-    SPIFFS.begin(true);
-   #endif
-    SPIFFS.begin();
-  #endif
-
-  DEBUG_PRINTLN("Load EEPROM");
-  loadSettingsFromEEPROM(true);
-  beginStrip();
-  userSetup();
-  if (strcmp(clientSSID,DEFAULT_CLIENT_SSID) == 0) showWelcomePage = true;
-  WiFi.persistent(false);
-
-  if (macroBoot>0) applyMacro(macroBoot);
-  Serial.println("Ada");
-
-  //generate module IDs
-  escapedMac = WiFi.macAddress();
-  escapedMac.replace(":", "");
-  escapedMac.toLowerCase();
-  if (strcmp(cmDNS,"x") == 0) //fill in unique mdns default
-  {
-    strcpy(cmDNS, "wled-");
-    sprintf(cmDNS+5, "%*s", 6, escapedMac.c_str()+6);
-  }
-  if (mqttDeviceTopic[0] == 0)
-  {
-    strcpy(mqttDeviceTopic, "wled/");
-    sprintf(mqttDeviceTopic+5, "%*s", 6, escapedMac.c_str()+6);
-  }
-  if (mqttClientID[0] == 0)
-  {
-    strcpy(mqttClientID, "WLED-");
-    sprintf(mqttClientID+5, "%*s", 6, escapedMac.c_str()+6);
-  }
-
-  strip.service();
-
-  #ifndef WLED_DISABLE_OTA
-    if (aOtaEnabled)
-    {
-      ArduinoOTA.onStart([]() {
-        #ifdef ESP8266
-        wifi_set_sleep_type(NONE_SLEEP_T);
-        #endif
-        DEBUG_PRINTLN("Start ArduinoOTA");
-      });
-      if (strlen(cmDNS) > 0) ArduinoOTA.setHostname(cmDNS);
-    }
-  #endif
-  #ifdef WLED_ENABLE_DMX
-    dmx.init(512); // initialize with bus length
-  #endif
-  //HTTP server page init
-  initServer();
-}
-
-
-void beginStrip()
-{
-  // Initialize NeoPixel Strip and button
-  strip.setShowCallback(handleOverlayDraw);
-
-#ifdef BTNPIN
-  pinMode(BTNPIN, INPUT_PULLUP);
-#endif
-
-  if (bootPreset > 0) applyPreset(bootPreset, turnOnAtBoot);
-  colorUpdated(NOTIFIER_CALL_MODE_INIT);
-
-  //init relay pin
-  #if RLYPIN >= 0
-    pinMode(RLYPIN, OUTPUT);
-    #if RLYMDE
-      digitalWrite(RLYPIN, bri);
-    #else
-      digitalWrite(RLYPIN, !bri);
-    #endif
-  #endif
-
-  //disable button if it is "pressed" unintentionally
-#ifdef BTNPIN
-  if(digitalRead(BTNPIN) == LOW) buttonEnabled = false;
-#else
-  buttonEnabled = false;
-#endif
-}
-
-
-void initAP(bool resetAP=false){
-  if (apBehavior == AP_BEHAVIOR_BUTTON_ONLY && !resetAP) return;
-
-  if (!apSSID[0] || resetAP) strcpy(apSSID, "WLED-AP");
-  if (resetAP) strcpy(apPass,DEFAULT_AP_PASS);
-  DEBUG_PRINT("Opening access point ");
-  DEBUG_PRINTLN(apSSID);
-  WiFi.softAPConfig(IPAddress(4, 3, 2, 1), IPAddress(4, 3, 2, 1), IPAddress(255,255,255,0));
-  WiFi.softAP(apSSID, apPass, apChannel, apHide);
-  
-  if (!apActive) //start captive portal if AP active
-  {
-    DEBUG_PRINTLN("Init AP interfaces");
-    server.begin();
-    if (udpPort > 0 && udpPort != ntpLocalPort)
-    {
-      udpConnected = notifierUdp.begin(udpPort);
-    }
-    if (udpRgbPort > 0 && udpRgbPort != ntpLocalPort && udpRgbPort != udpPort)
-    {
-      udpRgbConnected = rgbUdp.begin(udpRgbPort);
-    }
-
-    dnsServer.setErrorReplyCode(DNSReplyCode::NoError);
-    dnsServer.start(53, "*", WiFi.softAPIP());
-  }
-  apActive = true;
-}
-
-void initConnection()
-{
-  WiFi.disconnect(); //close old connections
-  #ifdef ESP8266
-  WiFi.setPhyMode(WIFI_PHY_MODE_11N);
-  #endif
-
-  if (staticIP[0] != 0 && staticGateway[0] != 0)
-  {
-    WiFi.config(staticIP, staticGateway, staticSubnet, IPAddress(8,8,8,8));
-  } else
-  {
-    WiFi.config(0U, 0U, 0U);
-  }
-
-  lastReconnectAttempt = millis();
-
-  if (!WLED_WIFI_CONFIGURED)
-  {
-    DEBUG_PRINT("No connection configured. ");
-    if (!apActive) initAP(); //instantly go to ap mode
-    return;
-  } else if (!apActive) {
-    if (apBehavior == AP_BEHAVIOR_ALWAYS)
-    {
-      initAP();
-    } else
-    {
-      DEBUG_PRINTLN("Access point disabled.");
-      WiFi.softAPdisconnect(true);
-    }
-  }
-  showWelcomePage = false;
-  
-  DEBUG_PRINT("Connecting to ");
-  DEBUG_PRINT(clientSSID);
-  DEBUG_PRINTLN("...");
-
-  #ifdef ESP8266
-   WiFi.hostname(serverDescription);
-  #endif
-  
-   WiFi.begin(clientSSID, clientPass);
-   
-  #ifdef ARDUINO_ARCH_ESP32
-   WiFi.setSleep(!noWifiSleep);
-   WiFi.setHostname(serverDescription);
-  #else
-   wifi_set_sleep_type((noWifiSleep) ? NONE_SLEEP_T : MODEM_SLEEP_T);
-  #endif
-}
-
-void initInterfaces() {
-  DEBUG_PRINTLN("Init STA interfaces");
-  
-  if (hueIP[0] == 0)
-  {
-    hueIP[0] = WiFi.localIP()[0];
-    hueIP[1] = WiFi.localIP()[1];
-    hueIP[2] = WiFi.localIP()[2];
-  }
-
-  //init Alexa hue emulation
-  if (alexaEnabled) alexaInit();
-
-  #ifndef WLED_DISABLE_OTA
-   if (aOtaEnabled) ArduinoOTA.begin();
-  #endif
-
-  strip.service();
-  // Set up mDNS responder:
-  if (strlen(cmDNS) > 0)
-  {
-    if (!aOtaEnabled) MDNS.begin(cmDNS);
-
-    DEBUG_PRINTLN("mDNS started");
-    MDNS.addService("http", "tcp", 80);
-    MDNS.addService("wled", "tcp", 80);
-    MDNS.addServiceTxt("wled", "tcp", "mac", escapedMac.c_str());
-  }
-  server.begin();
-
-  if (udpPort > 0 && udpPort != ntpLocalPort)
-  {
-    udpConnected = notifierUdp.begin(udpPort);
-    if (udpConnected && udpRgbPort != udpPort) udpRgbConnected = rgbUdp.begin(udpRgbPort);
-  }
-  if (ntpEnabled) ntpConnected = ntpUdp.begin(ntpLocalPort);
-
-  initBlynk(blynkApiKey);
-  e131.begin((e131Multicast) ? E131_MULTICAST : E131_UNICAST , e131Universe, E131_MAX_UNIVERSE_COUNT);
-  reconnectHue();
-  initMqtt();
-  interfacesInited = true;
-  wasConnected = true;
-}
-
-byte stacO = 0;
-uint32_t lastHeap;
-unsigned long heapTime = 0;
-
-void handleConnection() {
-  if (millis() < 2000 && (!WLED_WIFI_CONFIGURED || apBehavior == AP_BEHAVIOR_ALWAYS)) return;
-  if (lastReconnectAttempt == 0) initConnection();
-
-  //reconnect WiFi to clear stale allocations if heap gets too low
-  if (millis() - heapTime > 5000)
-  {
-    uint32_t heap = ESP.getFreeHeap();
-    if (heap < 9000 && lastHeap < 9000) {
-      DEBUG_PRINT("Heap too low! ");
-      DEBUG_PRINTLN(heap);
-      forceReconnect = true;
-    }
-    lastHeap = heap;
-    heapTime = millis();
-  }
-  
-  byte stac = 0;
-  if (apActive) {
-    #ifdef ESP8266
-    stac = wifi_softap_get_station_num();
-    #else
-    wifi_sta_list_t stationList;
-    esp_wifi_ap_get_sta_list(&stationList);
-    stac = stationList.num;
-    #endif
-    if (stac != stacO)
-    {
-      stacO = stac;
-      DEBUG_PRINT("Connected AP clients: ");
-      DEBUG_PRINTLN(stac);
-      if (!WLED_CONNECTED && WLED_WIFI_CONFIGURED) { //trying to connect, but not connected
-        if (stac) WiFi.disconnect(); //disable search so that AP can work
-        else initConnection(); //restart search 
-      }
-    }
-  }
-  if (forceReconnect) {
-    DEBUG_PRINTLN("Forcing reconnect.");
-    initConnection();
-    interfacesInited = false;
-    forceReconnect = false;
-    wasConnected = false;
-    return;
-  }
-  if (!WLED_CONNECTED) {
-    if (interfacesInited) {
-      DEBUG_PRINTLN("Disconnected!");
-      interfacesInited = false;
-      initConnection();
-    }
-    if (millis() - lastReconnectAttempt > ((stac) ? 300000 : 20000) && WLED_WIFI_CONFIGURED) initConnection();
-    if (!apActive && millis() - lastReconnectAttempt > 12000 && (!wasConnected || apBehavior == AP_BEHAVIOR_NO_CONN)) initAP(); 
-  } else if (!interfacesInited) { //newly connected
-    DEBUG_PRINTLN("");
-    DEBUG_PRINT("Connected! IP address: ");
-    DEBUG_PRINTLN(WiFi.localIP());
-    initInterfaces();
-    userConnected();
-
-    //shut down AP
-    if (apBehavior != AP_BEHAVIOR_ALWAYS && apActive)
-    {
-      dnsServer.stop();
-      WiFi.softAPdisconnect(true);
-      apActive = false;
-      DEBUG_PRINTLN("Access point disabled.");
-    }
-  }
-}
-
-//by https://github.com/tzapu/WiFiManager/blob/master/WiFiManager.cpp
-int getSignalQuality(int rssi)
-{
-  int quality = 0;
-
-  if (rssi <= -100) {
-    quality = 0;
-  } else if (rssi >= -50) {
-    quality = 100;
-  } else {
-    quality = 2 * (rssi + 100);
-  }
-  return quality;
-}
--- a/wled00/wled11_ol.ino
+++ b/wled00/wled11_ol.ino
@ -1,128 +0,0 @@
-/*
- * Used to draw clock overlays over the strip
- */
- 
-void initCronixie()
-{
-  if (overlayCurrent == 3 && !cronixieInit)
-  {
-    setCronixie();
-    strip.getSegment(0).grouping = 10; //10 LEDs per digit
-    cronixieInit = true;
-  } else if (cronixieInit && overlayCurrent != 3)
-  {
-    strip.getSegment(0).grouping = 1;
-    cronixieInit = false; 
-  }
-}
-
-
-void handleOverlays()
-{
-  if (millis() - overlayRefreshedTime > overlayRefreshMs)
-  {
-    initCronixie();
-    updateLocalTime();
-    checkTimers();
-    checkCountdown();
-    if (overlayCurrent == 3) _overlayCronixie();//Diamex cronixie clock kit
-    overlayRefreshedTime = millis();
-  }
-}
-
-
-void _overlayAnalogClock()
-{
-  int overlaySize = overlayMax - overlayMin +1;
-  if (countdownMode)
-  {
-    _overlayAnalogCountdown(); return;
-  }
-  double hourP = ((double)(hour(local)%12))/12;
-  double minuteP = ((double)minute(local))/60;
-  hourP = hourP + minuteP/12;
-  double secondP = ((double)second(local))/60;
-  int hourPixel = floor(analogClock12pixel + overlaySize*hourP);
-  if (hourPixel > overlayMax) hourPixel = overlayMin -1 + hourPixel - overlayMax;
-  int minutePixel = floor(analogClock12pixel + overlaySize*minuteP);
-  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;
-    for (int i = 0; i <= 12; i++)
-    {
-      pix = analogClock12pixel + round((overlaySize / 12.0) *i);
-      if (pix > overlayMax) pix -= overlaySize;
-      strip.setPixelColor(pix, 0x00FFAA);
-    }
-  }
-  if (!analogClockSecondsTrail) strip.setPixelColor(secondPixel, 0xFF0000);
-  strip.setPixelColor(minutePixel, 0x00FF00);
-  strip.setPixelColor(hourPixel, 0x0000FF);
-  overlayRefreshMs = 998;
-}
-
-
-void _overlayAnalogCountdown()
-{
-  if (now() < countdownTime)
-  {
-    long diff = countdownTime - now();
-    double pval = 60;
-    if (diff > 31557600L) //display in years if more than 365 days
-    {
-      pval = 315576000L; //10 years
-    } else if (diff > 2592000L) //display in months if more than a month
-    {
-      pval = 31557600L; //1 year
-    } else if (diff > 604800) //display in weeks if more than a week
-    {
-      pval = 2592000L; //1 month
-    } else if (diff > 86400) //display in days if more than 24 hours
-    {
-      pval = 604800; //1 week
-    } else if (diff > 3600) //display in hours if more than 60 minutes
-    {
-      pval = 86400; //1 day
-    } else if (diff > 60) //display in minutes if more than 60 seconds
-    {
-      pval = 3600; //1 hour
-    }
-    int overlaySize = overlayMax - overlayMin +1;
-    double perc = (pval-(double)diff)/pval;
-    if (perc > 1.0) perc = 1.0;
-    byte pixelCnt = perc*overlaySize;
-    if (analogClock12pixel + pixelCnt > overlayMax)
-    {
-      strip.setRange(analogClock12pixel, overlayMax, ((uint32_t)colSec[3] << 24)| ((uint32_t)colSec[0] << 16) | ((uint32_t)colSec[1] << 8) | colSec[2]);
-      strip.setRange(overlayMin, overlayMin +pixelCnt -(1+ overlayMax -analogClock12pixel), ((uint32_t)colSec[3] << 24)| ((uint32_t)colSec[0] << 16) | ((uint32_t)colSec[1] << 8) | colSec[2]);
-    } else
-    {
-      strip.setRange(analogClock12pixel, analogClock12pixel + pixelCnt, ((uint32_t)colSec[3] << 24)| ((uint32_t)colSec[0] << 16) | ((uint32_t)colSec[1] << 8) | colSec[2]);
-    }
-  }
-  overlayRefreshMs = 998;
-}
-
-
-void handleOverlayDraw() {
-  if (!overlayCurrent) return;
-  switch (overlayCurrent)
-  {
-    case 1: _overlayAnalogClock(); break;
-    case 3: _drawOverlayCronixie(); break;
-  }
-}
--- a/wled00/wled21_dmx.ino
+++ b/wled00/wled21_dmx.ino
@ -1,62 +0,0 @@
-/*
- * Support for DMX via MAX485.
- * Needs the espdmx library. You might have to change the output pin within the library. Sketchy, i know.
- * https://github.com/Rickgg/ESP-Dmx
- */
-#ifdef WLED_ENABLE_DMX
-
-void handleDMX() {  
-  WS2812FX::Segment& seg = strip.getSegment(DMXSegment);
-
-  if (!seg.isActive()) {
-    return;
-  }
-
-  // TODO: calculate brightness manually if no shutter channel is set
-  uint8_t brightness = strip.getBrightness();
-
-  // Calculate the start LED depending on segment and DMXStartLED config
-  uint8_t startLed = seg.start + DMXStartLED;
-
-  for (int i = startLed; i < seg.stop; i++) {
-    uint32_t in = strip.getPixelColor(i); // time to get the colors for the individual fixtures as suggested by AirCookie at issue #462
-    byte w = in >> 24 & 0xFF;
-    byte r = in >> 16 & 0xFF;
-    byte g = in >> 8  & 0xFF;
-    byte b = in       & 0xFF;
-
-    int DMXFixtureStart = DMXStart + (DMXGap * (i - startLed));
-    for (int j = 0; j < DMXChannels; j++) {
-      int DMXAddr = DMXFixtureStart + j;
-      switch (DMXFixtureMap[j]) {
-        case 0: // Set this channel to 0. Good way to tell strobe- and fade-functions to fuck right off.
-          dmx.write(DMXAddr, 0);
-          break;
-        case 1: // Red
-          dmx.write(DMXAddr, r);
-          break;
-        case 2: // Green
-          dmx.write(DMXAddr, g);
-          break;
-        case 3: // Blue
-          dmx.write(DMXAddr, b);
-          break;
-        case 4: // White
-          dmx.write(DMXAddr, w);
-          break;
-        case 5: // Shutter channel. Controls the brightness.
-          dmx.write(DMXAddr, brightness);
-          break;
-        case 6:// Sets this channel to 255. Like 0, but more wholesome.
-          dmx.write(DMXAddr, 255);
-          break;
-      }
-    }
-  }
-
-  dmx.update();           // update the DMX bus
-}
-
-#else
-void handleDMX() {}
-#endif
--- a/wled00/wled01_eeprom.ino
+++ b/wled00/wled01_eeprom.ino
@ -1,10 +1,11 @@
+#include <EEPROM.h>
+#include "wled.h"
+
 /*
 * Methods to handle saving and loading to non-volatile memory
 * EEPROM Map: https://github.com/Aircoookie/WLED/wiki/EEPROM-Map
 */

-#define EEPSIZE 2560  //Maximum is 4096
-
 //eeprom Version code, enables default settings instead of 0 init on update
 #define EEPVER 18
 //0 -> old version, default
@ -270,9 +271,6 @@ void saveSettingsToEEPROM()
  for (int i=0; i<15; i++) {
    EEPROM.write(2535+i, DMXFixtureMap[i]);
  } // last used: 2549. maybe leave a few bytes for future expansion and go on with 2600 kthxbye.
-
-  EEPROM.write(2550, DMXSegment);
-  EEPROM.write(2551, DMXStartLED);
  #endif

  commit();
@ -554,12 +552,11 @@ void loadSettingsFromEEPROM(bool first)
  DMXChannels = EEPROM.read(2530);
  DMXGap = EEPROM.read(2531) + ((EEPROM.read(2532) << 8) & 0xFF00);
  DMXStart = EEPROM.read(2533) + ((EEPROM.read(2534) << 8) & 0xFF00);
-  DMXSegment = EEPROM.read(2550);
-  DMXStartLED = EEPROM.read(2551);
  
  for (int i=0;i<15;i++) {
    DMXFixtureMap[i] = EEPROM.read(2535+i);
-  } //last used: 2549. maybe leave a few bytes for future expansion and go on with 2600 kthxbye.
+  } //last used: 2549
+  EEPROM.write(2550, DMXStartLED);
  #endif

  //user MOD memory
@ -596,7 +593,7 @@ void savedToPresets()
  }
 }

-bool applyPreset(byte index, bool loadBri = true)
+bool applyPreset(byte index, bool loadBri)
 {
  if (index == 255 || index == 0)
  {
@ -634,7 +631,7 @@ bool applyPreset(byte index, bool loadBri = true)
  return true;
 }

-void savePreset(byte index, bool persist = true)
+void savePreset(byte index, bool persist)
 {
  if (index > 16) return;
  if (index < 1) {saveSettingsToEEPROM();return;}
@ -702,7 +699,7 @@ void applyMacro(byte index)
 }


-void saveMacro(byte index, String mc, bool persist = true) //only commit on single save, not in settings
+void saveMacro(byte index, String mc, bool persist) //only commit on single save, not in settings
 {
  index-=1;
  if (index > 15) return;
--- a/wled00/wled_serial.cpp
+++ b/wled00/wled_serial.cpp
@ -1,6 +1,9 @@
+#include "wled.h"
+
 /*
- * Utility for SPIFFS filesystem & Serial console
+ * Adalight handler
 */
+
 enum class AdaState {
  Header_A,
  Header_d,
@ -78,44 +81,3 @@ void handleSerial()
  }
  #endif
 }
-
-
-#if !defined WLED_DISABLE_FILESYSTEM && defined WLED_ENABLE_FS_SERVING
-//Un-comment any file types you need
-String getContentType(AsyncWebServerRequest* request, String filename){
-  if(request->hasArg("download")) return "application/octet-stream";
-  else if(filename.endsWith(".htm")) return "text/html";
-  else if(filename.endsWith(".html")) return "text/html";
-//  else if(filename.endsWith(".css")) return "text/css";
-//  else if(filename.endsWith(".js")) return "application/javascript";
-  else if(filename.endsWith(".json")) return "application/json";
-  else if(filename.endsWith(".png")) return "image/png";
-//  else if(filename.endsWith(".gif")) return "image/gif";
-  else if(filename.endsWith(".jpg")) return "image/jpeg";
-  else if(filename.endsWith(".ico")) return "image/x-icon";
-//  else if(filename.endsWith(".xml")) return "text/xml";
-//  else if(filename.endsWith(".pdf")) return "application/x-pdf";
-//  else if(filename.endsWith(".zip")) return "application/x-zip";
-//  else if(filename.endsWith(".gz")) return "application/x-gzip";
-  return "text/plain";
-}
-
-bool handleFileRead(AsyncWebServerRequest* request, String path){
-  DEBUG_PRINTLN("FileRead: " + path);
-  if(path.endsWith("/")) path += "index.htm";
-  String contentType = getContentType(request, path);
-  String pathWithGz = path + ".gz";
-  if(SPIFFS.exists(pathWithGz)){
-    request->send(SPIFFS, pathWithGz, contentType);
-    return true;
-  }
-  if(SPIFFS.exists(path)) {
-    request->send(SPIFFS, path, contentType);
-    return true;
-  }
-  return false;
-}
-
-#else
-bool handleFileRead(AsyncWebServerRequest*, String path){return false;}
-#endif
--- a/wled00/wled18_server.ino
+++ b/wled00/wled18_server.ino
@ -1,5 +1,7 @@
+#include "wled.h"
+
 /*
- * Server page definitions
+ * Integrated HTTP web server page declarations
 */

 //Is this an IP?
@ -303,7 +305,7 @@ String msgProcessor(const String& var)
 }


-void serveMessage(AsyncWebServerRequest* request, uint16_t code, String headl, String subl="", byte optionT=255)
+void serveMessage(AsyncWebServerRequest* request, uint16_t code, String headl, String subl, byte optionT)
 {
  messageHead = headl;
  messageSub = subl;
--- a/wled00/wled02_xml.ino
+++ b/wled00/wled02_xml.ino
@ -1,9 +1,11 @@
+#include "wled.h"
+
 /*
 * Sending XML status files to client
 */

 //build XML response to HTTP /win API request
-char* XML_response(AsyncWebServerRequest *request, char* dest = nullptr)
+char* XML_response(AsyncWebServerRequest *request, char* dest)
 {
  char sbuf[(dest == nullptr)?1024:1]; //allocate local buffer if none passed
  obuf = (dest == nullptr)? sbuf:dest;
@ -455,7 +457,6 @@ void getSettingsJS(byte subPage, char* dest)
    sappend('v',"CN",DMXChannels);
    sappend('v',"CG",DMXGap);
    sappend('v',"CS",DMXStart);
-    sappend('v',"SEG",DMXSegment);
    sappend('v',"SL",DMXStartLED);
    
    sappend('i',"CH1",DMXFixtureMap[0]);