Fix linker errors. All global vars declared extern.

wled00/wled.cpp

@@ -13,6 +13,370 @@
 #include "wled_mqtt.h"
 #include "wled_eeprom.h"
 #include "wled_server.h"
+// Global Variable definitions
+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
+#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
+
+
 
 WLED::WLED() {
 

wled00/wled.h

@@ -123,305 +123,297 @@ extern "C"
 //version code in format yymmddb (b = daily build)
 #define VERSION 2003222
 
-char versionString[] = "0.9.1";
+extern char versionString[];
 
 //AP and OTA default passwords (for maximum change them!)
-char apPass[65] = DEFAULT_AP_PASS;
+extern char apPass[65];
-char otaPass[33] = DEFAULT_OTA_PASS;
+extern char otaPass[33];
 
 //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
+extern byte auxDefaultState;                       //0: input 1: high 2: low
-byte auxTriggeredState = 0;                     //0: input 1: high 2: low
+extern byte auxTriggeredState;                     //0: input 1: high 2: low
-char ntpServerName[33] = "0.wled.pool.ntp.org"; //NTP server to use
+extern char ntpServerName[33]; //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;
+extern char clientSSID[33];
-char clientPass[65] = CLIENT_PASS;
+extern char clientPass[65];
-char cmDNS[33] = "x";                       //mDNS address (placeholder, will be replaced by wledXXXXXXXXXXXX.local)
+extern char cmDNS[33];                       //mDNS address (placeholder, will be replaced by wledXXXXXXXXXXXX.local)
-char apSSID[33] = "";                       //AP off by default (unless setup)
+extern char apSSID[33];                       //AP off by default (unless setup)
-byte apChannel = 1;                         //2.4GHz WiFi AP channel (1-13)
+extern byte apChannel;                         //2.4GHz WiFi AP channel (1-13)
-byte apHide = 0;                            //hidden AP SSID
+extern byte apHide;                            //hidden AP SSID
-byte apBehavior = AP_BEHAVIOR_BOOT_NO_CONN; //access point opens when no connection after boot by default
+extern byte apBehavior; //access point opens when no connection after boot by default
-IPAddress staticIP(0, 0, 0, 0);             //static IP of ESP
+extern IPAddress staticIP;             //static IP of ESP
-IPAddress staticGateway(0, 0, 0, 0);        //gateway (router) IP
+extern IPAddress staticGateway;        //gateway (router) IP
-IPAddress staticSubnet(255, 255, 255, 0);   //most common subnet in home networks
+extern IPAddress staticSubnet;   //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
+extern bool noWifiSleep;                   //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
+extern uint16_t ledCount;            //overcurrent prevented by ABL
-bool useRGBW = false;              //SK6812 strips can contain an extra White channel
+extern bool useRGBW;              //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
+extern bool turnOnAtBoot;          //turn on LEDs at power-up
-byte bootPreset = 0;               //save preset to load after power-up
+extern byte bootPreset;               //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.
+extern byte col[]; //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
+extern byte colSec[];  //current RGB(W) secondary color
-byte briS = 128;            //default brightness
+extern byte briS;            //default brightness
 
-byte nightlightTargetBri = 0; //brightness after nightlight is over
+extern byte nightlightTargetBri; //brightness after nightlight is over
-byte nightlightDelayMins = 60;
+extern byte nightlightDelayMins;
-bool nightlightFade = true;       //if enabled, light will gradually dim towards the target bri. Otherwise, it will instantly set after delay over
+extern bool nightlightFade;       //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.
+extern bool nightlightColorFade; //if enabled, light will gradually fade color from primary to secondary color.
-bool fadeTransition = true;       //enable crossfading color transition
+extern bool fadeTransition;       //enable crossfading color transition
-uint16_t transitionDelay = 750;   //default crossfade duration in ms
+extern uint16_t transitionDelay;   //default crossfade duration in ms
 
-bool skipFirstLed = false; //ignore first LED in strip (useful if you need the LED as signal repeater)
+extern bool skipFirstLed; //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)
+extern byte briMultiplier;  //% 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
+extern char serverDescription[33]; //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
+extern bool syncToggleReceive;      //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;
+extern bool buttonEnabled;
-byte irEnabled = 0; //Infrared receiver
+extern byte irEnabled; //Infrared receiver
 
-uint16_t udpPort = 21324;    //WLED notifier default port
+extern uint16_t udpPort;    //WLED notifier default port
-uint16_t udpRgbPort = 19446; //Hyperion port
+extern uint16_t udpRgbPort; //Hyperion port
 
-bool receiveNotificationBrightness = true; //apply brightness from incoming notifications
+extern bool receiveNotificationBrightness; //apply brightness from incoming notifications
-bool receiveNotificationColor = true;      //apply color
+extern bool receiveNotificationColor;      //apply color
-bool receiveNotificationEffects = true;    //apply effects setup
+extern bool receiveNotificationEffects;    //apply effects setup
-bool notifyDirect = false;                 //send notification if change via UI or HTTP API
+extern bool notifyDirect;                 //send notification if change via UI or HTTP API
-bool notifyButton = false;                 //send if updated by button or infrared remote
+extern bool notifyButton;                 //send if updated by button or infrared remote
-bool notifyAlexa = false;                  //send notification if updated via Alexa
+extern bool notifyAlexa;                  //send notification if updated via Alexa
-bool notifyMacro = false;                  //send notification for macro
+extern bool notifyMacro;                  //send notification for macro
-bool notifyHue = true;                     //send notification if Hue light changes
+extern bool notifyHue;                     //send notification if Hue light changes
-bool notifyTwice = false;                  //notifications use UDP: enable if devices don't sync reliably
+extern bool notifyTwice;                  //notifications use UDP: enable if devices don't sync reliably
 
-bool alexaEnabled = true;               //enable device discovery by Amazon Echo
+extern bool alexaEnabled;               //enable device discovery by Amazon Echo
-char alexaInvocationName[33] = "Light"; //speech control name of device. Choose something voice-to-text can understand
+extern char alexaInvocationName[33]; //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
+extern 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
+extern uint16_t realtimeTimeoutMs;      //ms timeout of realtime mode before returning to normal mode
-int arlsOffset = 0;                     //realtime LED offset
+extern int arlsOffset;                     //realtime LED offset
-bool receiveDirect = true;              //receive UDP realtime
+extern bool receiveDirect;              //receive UDP realtime
-bool arlsDisableGammaCorrection = true; //activate if gamma correction is handled by the source
+extern bool arlsDisableGammaCorrection; //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
+extern bool arlsForceMaxBri;           //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)
+extern uint16_t e131Universe;                               //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.)
+extern uint8_t DMXMode;                 //DMX mode (s.a.)
-uint16_t DMXAddress = 1;                                 //DMX start address of fixture, a.k.a. first Channel [for E1.31 (sACN) protocol]
+extern uint16_t DMXAddress;                                 //DMX start address of fixture, a.k.a. first Channel [for E1.31 (sACN) protocol]
-uint8_t DMXOldDimmer = 0;                                //only update brightness on change
+extern uint8_t DMXOldDimmer;                                //only update brightness on change
-uint8_t e131LastSequenceNumber[E131_MAX_UNIVERSE_COUNT]; //to detect packet loss
+extern uint8_t e131LastSequenceNumber[E131_MAX_UNIVERSE_COUNT]; //to detect packet loss
-bool e131Multicast = false;                              //multicast or unicast
+extern bool e131Multicast;                              //multicast or unicast
-bool e131SkipOutOfSequence = false;                      //freeze instead of flickering
+extern bool e131SkipOutOfSequence;                      //freeze instead of flickering
 
-bool mqttEnabled = false;
+extern bool mqttEnabled;
-char mqttDeviceTopic[33] = "";        //main MQTT topic (individual per device, default is wled/mac)
+extern 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)
+extern char mqttGroupTopic[33]; //second MQTT topic (for example to group devices)
-char mqttServer[33] = "";             //both domains and IPs should work (no SSL)
+extern char mqttServer[33];             //both domains and IPs should work (no SSL)
-char mqttUser[41] = "";               //optional: username for MQTT auth
+extern char mqttUser[41];               //optional: username for MQTT auth
-char mqttPass[41] = "";               //optional: password for MQTT auth
+extern char mqttPass[41];               //optional: password for MQTT auth
-char mqttClientID[41] = "";           //override the client ID
+extern char mqttClientID[41];           //override the client ID
-uint16_t mqttPort = 1883;
+extern uint16_t mqttPort;
 
-bool huePollingEnabled = false;    //poll hue bridge for light state
+extern bool huePollingEnabled;    //poll hue bridge for light state
-uint16_t huePollIntervalMs = 2500; //low values (< 1sec) may cause lag but offer quicker response
+extern uint16_t huePollIntervalMs; //low values (< 1sec) may cause lag but offer quicker response
-char hueApiKey[47] = "api";        //key token will be obtained from bridge
+extern char hueApiKey[47];        //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)
+extern byte huePollLightId;           //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
+extern IPAddress hueIP;    //IP address of the bridge
-bool hueApplyOnOff = true;
+extern bool hueApplyOnOff;
-bool hueApplyBri = true;
+extern bool hueApplyBri;
-bool hueApplyColor = true;
+extern bool hueApplyColor;
 
 //Time CONFIG
-bool ntpEnabled = false;  //get internet time. Only required if you use clock overlays or time-activated macros
+extern bool ntpEnabled;  //get internet time. Only required if you use clock overlays or time-activated macros
-bool useAMPM = false;     //12h/24h clock format
+extern bool useAMPM;     //12h/24h clock format
-byte currentTimezone = 0; //Timezone ID. Refer to timezones array in wled10_ntp.ino
+extern byte currentTimezone; //Timezone ID. Refer to timezones array in wled_ntp.cpp
-int utcOffsetSecs = 0;    //Seconds to offset from UTC before timzone calculation
+extern int utcOffsetSecs;    //Seconds to offset from UTC before timzone calculation
 
-byte overlayDefault = 0;                        //0: no overlay 1: analog clock 2: single-digit clocl 3: cronixie
+extern byte overlayDefault;                        //0: no overlay 1: analog clock 2: single-digit clocl 3: cronixie
-byte overlayMin = 0, overlayMax = ledCount - 1; //boundaries of overlay mode
+extern byte overlayMin; //boundaries of overlay mode
+extern byte overlayMax;
 
-byte analogClock12pixel = 0;          //The pixel in your strip where "midnight" would be
+extern byte analogClock12pixel;          //The pixel in your strip where "midnight" would be
-bool analogClockSecondsTrail = false; //Display seconds as trail of LEDs instead of a single pixel
+extern bool analogClockSecondsTrail; //Display seconds as trail of LEDs instead of a single pixel
-bool analogClock5MinuteMarks = false; //Light pixels at every 5-minute position
+extern bool analogClock5MinuteMarks; //Light pixels at every 5-minute position
 
-char cronixieDisplay[7] = "HHMMSS"; //Cronixie Display mask. See wled13_cronixie.ino
+extern char cronixieDisplay[7]; //Cronixie Display mask. See wled13_cronixie.ino
-bool cronixieBacklight = true;      //Allow digits to be back-illuminated
+extern bool cronixieBacklight;      //Allow digits to be back-illuminated
 
-bool countdownMode = false;                  //Clock will count down towards date
+extern bool countdownMode;                  //Clock will count down towards date
-byte countdownYear = 20, countdownMonth = 1; //Countdown target date, year is last two digits
+extern byte countdownYear, countdownMonth; //Countdown target date, year is last two digits
-byte countdownDay = 1, countdownHour = 0;
+extern byte countdownDay, countdownHour;
-byte countdownMin = 0, countdownSec = 0;
+extern byte countdownMin, countdownSec;
 
-byte macroBoot = 0; //macro loaded after startup
+extern byte macroBoot; //macro loaded after startup
-byte macroNl = 0;   //after nightlight delay over
+extern byte macroNl;   //after nightlight delay over
-byte macroCountdown = 0;
+extern byte macroCountdown;
-byte macroAlexaOn = 0, macroAlexaOff = 0;
+extern byte macroAlexaOn, macroAlexaOff;
-byte macroButton = 0, macroLongPress = 0, macroDoublePress = 0;
+extern byte macroButton, macroLongPress, macroDoublePress;
 
 //Security CONFIG
-bool otaLock = false;    //prevents OTA firmware updates without password. ALWAYS enable if system exposed to any public networks
+extern bool otaLock;    //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
+extern bool wifiLock;   //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
+extern bool aOtaEnabled; //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;
+extern uint16_t userVar0, userVar1;
 
 #ifdef WLED_ENABLE_DMX
 //dmx CONFIG
-byte DMXChannels = 7; // number of channels per fixture
+extern byte DMXChannels; // number of channels per fixture
-byte DMXFixtureMap[15] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+extern byte DMXFixtureMap[15];
-// assigns the different channels to different functions. See wled21_dmx.ino for more information.
+extern // 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.
+extern uint16_t DMXGap;   // 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
+extern uint16_t DMXStart; // start address of the first fixture
 #endif
 
 //internal global variable declarations
 //wifi
-bool apActive = false;
+extern bool apActive;
-bool forceReconnect = false;
+extern bool forceReconnect;
-uint32_t lastReconnectAttempt = 0;
+extern uint32_t lastReconnectAttempt;
-bool interfacesInited = false;
+extern bool interfacesInited;
-bool wasConnected = false;
+extern bool wasConnected;
 
 //color
-byte colOld[]{0, 0, 0, 0}; //color before transition
+extern byte colOld[]; //color before transition
-byte colT[]{0, 0, 0, 0};   //color that is currently displayed on the LEDs
+extern byte colT[];   //color that is currently displayed on the LEDs
-byte colIT[]{0, 0, 0, 0};  //color that was last sent to LEDs
+extern byte colIT[];  //color that was last sent to LEDs
-byte colSecT[]{0, 0, 0, 0};
+extern byte colSecT[];
-byte colSecOld[]{0, 0, 0, 0};
+extern byte colSecOld[];
-byte colSecIT[]{0, 0, 0, 0};
+extern byte colSecIT[];
 
-byte lastRandomIndex = 0; //used to save last random color so the new one is not the same
+extern byte lastRandomIndex; //used to save last random color so the new one is not the same
 
 //transitions
-bool transitionActive = false;
+extern bool transitionActive;
-uint16_t transitionDelayDefault = transitionDelay;
+extern uint16_t transitionDelayDefault;
-uint16_t transitionDelayTemp = transitionDelay;
+extern uint16_t transitionDelayTemp;
-unsigned long transitionStartTime;
+extern unsigned long transitionStartTime;
-float tperLast = 0; //crossfade transition progress, 0.0f - 1.0f
+extern float tperLast; //crossfade transition progress, 0.0f - 1.0f
-bool jsonTransitionOnce = false;
+extern bool jsonTransitionOnce;
 
 //nightlight
-bool nightlightActive = false;
+extern bool nightlightActive;
-bool nightlightActiveOld = false;
+extern bool nightlightActiveOld;
-uint32_t nightlightDelayMs = 10;
+extern uint32_t nightlightDelayMs;
-uint8_t nightlightDelayMinsDefault = nightlightDelayMins;
+extern uint8_t nightlightDelayMinsDefault;
-unsigned long nightlightStartTime;
+extern unsigned long nightlightStartTime;
-byte briNlT = 0;           //current nightlight brightness
+extern byte briNlT;           //current nightlight brightness
-byte colNlT[]{0, 0, 0, 0}; //current nightlight color
+extern byte colNlT[]; //current nightlight color
 
-//brightness
+extern unsigned long lastOnTime;
-unsigned long lastOnTime = 0;
+extern bool offMode;
-bool offMode = !turnOnAtBoot;
+extern byte bri;
-byte bri = briS;
+extern byte briOld;
-byte briOld = 0;
+extern byte briT;
-byte briT = 0;
+extern byte briIT;
-byte briIT = 0;
+extern byte briLast;   //brightness before turned off. Used for toggle function
-byte briLast = 128;   //brightness before turned off. Used for toggle function
+extern byte whiteLast; //white channel before turned off. Used for toggle function
-byte whiteLast = 128; //white channel before turned off. Used for toggle function
 
-//button
+extern bool buttonPressedBefore;
-bool buttonPressedBefore = false;
+extern bool buttonLongPressed;
-bool buttonLongPressed = false;
+extern unsigned long buttonPressedTime;
-unsigned long buttonPressedTime = 0;
+extern unsigned long buttonWaitTime;
-unsigned long buttonWaitTime = 0;
 
-//notifications
+extern bool notifyDirectDefault;
-bool notifyDirectDefault = notifyDirect;
+extern bool receiveNotifications;
-bool receiveNotifications = true;
+extern unsigned long notificationSentTime;
-unsigned long notificationSentTime = 0;
+extern byte notificationSentCallMode;
-byte notificationSentCallMode = NOTIFIER_CALL_MODE_INIT;
+extern bool notificationTwoRequired;
-bool notificationTwoRequired = false;
 
-//effects
+extern byte effectCurrent;
-byte effectCurrent = 0;
+extern byte effectSpeed;
-byte effectSpeed = 128;
+extern byte effectIntensity;
-byte effectIntensity = 128;
+extern byte effectPalette;
-byte effectPalette = 0;
 
-//network
+extern bool udpConnected, udpRgbConnected;
-bool udpConnected = false, udpRgbConnected = false;
 
-//ui style
+extern bool showWelcomePage;
-bool showWelcomePage = false;
 
-//hue
+extern byte hueError;
-byte hueError = HUE_ERROR_INACTIVE;
+//uint16_t hueFailCount;
-//uint16_t hueFailCount = 0;
+extern float hueXLast, hueYLast;
-float hueXLast = 0, hueYLast = 0;
+extern uint16_t hueHueLast, hueCtLast;
-uint16_t hueHueLast = 0, hueCtLast = 0;
+extern byte hueSatLast, hueBriLast;
-byte hueSatLast = 0, hueBriLast = 0;
+extern unsigned long hueLastRequestSent;
-unsigned long hueLastRequestSent = 0;
+extern bool hueAuthRequired;
-bool hueAuthRequired = false;
+extern bool hueReceived;
-bool hueReceived = false;
+extern bool hueStoreAllowed, hueNewKey;
-bool hueStoreAllowed = false, hueNewKey = false;
 
-//overlays
+extern byte overlayCurrent;
-byte overlayCurrent = overlayDefault;
+extern byte overlaySpeed;
-byte overlaySpeed = 200;
+extern unsigned long overlayRefreshMs;
-unsigned long overlayRefreshMs = 200;
+extern unsigned long overlayRefreshedTime;
-unsigned long overlayRefreshedTime;
 
-//cronixie
+extern byte dP[];
-byte dP[]{0, 0, 0, 0, 0, 0};
+extern bool cronixieInit;
-bool cronixieInit = false;
 
 //countdown
-unsigned long countdownTime = 1514764800L;
+extern unsigned long countdownTime;
-bool countdownOverTriggered = true;
+extern bool countdownOverTriggered;
 
 //timer
-byte lastTimerMinute = 0;
+extern byte lastTimerMinute;
-byte timerHours[] = {0, 0, 0, 0, 0, 0, 0, 0};
+extern byte timerHours[];
-byte timerMinutes[] = {0, 0, 0, 0, 0, 0, 0, 0};
+extern byte timerMinutes[];
-byte timerMacro[] = {0, 0, 0, 0, 0, 0, 0, 0};
+extern byte timerMacro[];
-byte timerWeekday[] = {255, 255, 255, 255, 255, 255, 255, 255}; //weekdays to activate on
+extern byte timerWeekday[]; //weekdays to activate on
 //bit pattern of arr elem: 0b11111111: sun,sat,fri,thu,wed,tue,mon,validity
 
 //blynk
-bool blynkEnabled = false;
+extern bool blynkEnabled;
 
 //preset cycling
-bool presetCyclingEnabled = false;
+extern bool presetCyclingEnabled;
-byte presetCycleMin = 1, presetCycleMax = 5;
+extern byte presetCycleMin, presetCycleMax;
-uint16_t presetCycleTime = 1250;
+extern uint16_t presetCycleTime;
-unsigned long presetCycledTime = 0;
+extern unsigned long presetCycledTime;
-byte presetCycCurr = presetCycleMin;
+extern byte presetCycCurr;
-bool presetApplyBri = true;
+extern bool presetApplyBri;
-bool saveCurrPresetCycConf = false;
+extern bool saveCurrPresetCycConf;
 
 //realtime
-byte realtimeMode = REALTIME_MODE_INACTIVE;
+extern byte realtimeMode;
-IPAddress realtimeIP = (0, 0, 0, 0);
+extern IPAddress realtimeIP;
-unsigned long realtimeTimeout = 0;
+extern unsigned long realtimeTimeout;
 
 //mqtt
-long lastMqttReconnectAttempt = 0;
+extern long lastMqttReconnectAttempt;
-long lastInterfaceUpdate = 0;
+extern long lastInterfaceUpdate;
-byte interfaceUpdateCallMode = NOTIFIER_CALL_MODE_INIT;
+extern byte interfaceUpdateCallMode;
-char mqttStatusTopic[40] = ""; //this must be global because of async handlers
+extern char mqttStatusTopic[40]; //this must be global because of async handlers
 
 #if AUXPIN >= 0
-    //auxiliary debug pin
+//auxiliary debug pin
-byte auxTime = 0;
+extern byte auxTime;
-unsigned long auxStartTime = 0;
+extern unsigned long auxStartTime;
-bool auxActive = false, auxActiveBefore = false;
+extern bool auxActive;
 #endif
 
 //alexa udp
-String escapedMac;
+extern String escapedMac;
 #ifndef WLED_DISABLE_ALEXA
-Espalexa espalexa;
+extern Espalexa espalexa;
-EspalexaDevice *espalexaDevice;
+extern EspalexaDevice *espalexaDevice;
 #endif
 
 //dns server
-DNSServer dnsServer;
+extern DNSServer dnsServer;
 
 //network time
-bool ntpConnected = false;
+extern bool ntpConnected;
-time_t local = 0;
+extern time_t local;
-unsigned long ntpLastSyncTime = 999000000L;
+extern unsigned long ntpLastSyncTime;
-unsigned long ntpPacketSentTime = 999000000L;
+extern unsigned long ntpPacketSentTime;
-IPAddress ntpServerIP;
+extern IPAddress ntpServerIP;
-uint16_t ntpLocalPort = 2390;
+extern uint16_t ntpLocalPort;
 #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
@@ -430,42 +422,43 @@ uint16_t ntpLocalPort = 2390;
 
 //string temp buffer (now stored in stack locally)
 #define OMAX 2048
-char *obuf;
+extern char *obuf;
-uint16_t olen = 0;
+extern uint16_t olen;
 
 //presets
-uint16_t savedPresets = 0;
+extern uint16_t savedPresets;
-int8_t currentPreset = -1;
+extern int8_t currentPreset;
-bool isPreset = false;
+extern bool isPreset;
 
-byte errorFlag = 0;
+extern byte errorFlag;
 
-String messageHead, messageSub;
+extern String messageHead, messageSub;
-byte optionType;
+extern byte optionType;
 
-bool doReboot = false; //flag to initiate reboot from async handlers
+extern bool doReboot; //flag to initiate reboot from async handlers
-bool doPublishMqtt = false;
+extern bool doPublishMqtt;
 
 //server library objects
-AsyncWebServer server(80);
+extern AsyncWebServer server;
-AsyncClient *hueClient = NULL;
+extern AsyncClient *hueClient;
-AsyncMqttClient *mqtt = NULL;
+extern AsyncMqttClient *mqtt;
 
 //function prototypes
-void colorFromUint32(uint32_t, bool = false);
+extern void colorFromUint32(uint32_t, bool);
-void serveMessage(AsyncWebServerRequest *, uint16_t, String, String, byte);
+extern void serveMessage(AsyncWebServerRequest *, uint16_t, String, String, byte);
-void handleE131Packet(e131_packet_t *, IPAddress);
+extern void handleE131Packet(e131_packet_t *, IPAddress);
-void arlsLock(uint32_t, byte);
+extern void arlsLock(uint32_t, byte);
-void handleOverlayDraw();
+extern void handleOverlayDraw();
 
 //udp interface objects
-WiFiUDP notifierUdp, rgbUdp;
+extern WiFiUDP notifierUdp, rgbUdp;
-WiFiUDP ntpUdp;
+extern WiFiUDP ntpUdp;
-ESPAsyncE131 e131(handleE131Packet);
+extern ESPAsyncE131 e131;
-bool e131NewData = false;
+extern bool e131NewData;
 
 //led fx library object
-WS2812FX strip = WS2812FX();
+extern WS2812FX strip;
+
 
 #define WLED_CONNECTED (WiFi.status() == WL_CONNECTED)
 #define WLED_WIFI_CONFIGURED (strlen(clientSSID) >= 1 && strcmp(clientSSID, DEFAULT_CLIENT_SSID) != 0)

wled00/wled_colors.h

@@ -5,7 +5,7 @@
  * Color conversion methods
  */
 
-void colorFromUint32(uint32_t in, bool secondary);
+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

wled00/wled_ntp.cpp

@@ -1,7 +1,63 @@
 #include "wled_ntp.h"
 #include "wled.h"
 #include "wled_eeprom.h" 
+TimeChangeRule UTCr = {Last, Sun, Mar, 1, 0};     // UTC
+Timezone tzUTC(UTCr, UTCr);
 
+TimeChangeRule BST = {Last, Sun, Mar, 1, 60};        // British Summer Time
+TimeChangeRule GMT = {Last, Sun, Oct, 2, 0};         // Standard Time
+Timezone tzUK(BST, GMT);
+
+TimeChangeRule CEST = {Last, Sun, Mar, 2, 120};     //Central European Summer Time
+TimeChangeRule CET = {Last, Sun, Oct, 3, 60};       //Central European Standard Time
+Timezone tzEUCentral(CEST, CET);
+
+TimeChangeRule EEST = {Last, Sun, Mar, 3, 180};     //Central European Summer Time
+TimeChangeRule EET = {Last, Sun, Oct, 4, 120};       //Central European Standard Time
+Timezone tzEUEastern(EEST, EET);
+
+TimeChangeRule EDT = {Second, Sun, Mar, 2, -240 };    //Daylight time = UTC - 4 hours
+TimeChangeRule EST = {First, Sun, Nov, 2, -300 };     //Standard time = UTC - 5 hours
+Timezone tzUSEastern(EDT, EST);
+
+TimeChangeRule CDT = {Second, Sun, Mar, 2, -300 };    //Daylight time = UTC - 5 hours
+TimeChangeRule CST = {First, Sun, Nov, 2, -360 };     //Standard time = UTC - 6 hours
+Timezone tzUSCentral(CDT, CST);
+
+Timezone tzCASaskatchewan(CST, CST); //Central without DST
+
+TimeChangeRule MDT = {Second, Sun, Mar, 2, -360 };    //Daylight time = UTC - 6 hours
+TimeChangeRule MST = {First, Sun, Nov, 2, -420 };     //Standard time = UTC - 7 hours
+Timezone tzUSMountain(MDT, MST);
+
+Timezone tzUSArizona(MST, MST); //Mountain without DST
+
+TimeChangeRule PDT = {Second, Sun, Mar, 2, -420 };    //Daylight time = UTC - 7 hours
+TimeChangeRule PST = {First, Sun, Nov, 2, -480 };     //Standard time = UTC - 8 hours
+Timezone tzUSPacific(PDT, PST);
+
+TimeChangeRule ChST = {Last, Sun, Mar, 1, 480};     // China Standard Time = UTC + 8 hours
+Timezone tzChina(ChST, ChST);
+
+TimeChangeRule JST = {Last, Sun, Mar, 1, 540};     // Japan Standard Time = UTC + 9 hours
+Timezone tzJapan(JST, JST);
+
+TimeChangeRule AEDT = {Second, Sun, Oct, 2, 660 };    //Daylight time = UTC + 11 hours
+TimeChangeRule AEST = {First, Sun, Apr, 3, 600 };     //Standard time = UTC + 10 hours
+Timezone tzAUEastern(AEDT, AEST);
+
+TimeChangeRule NZDT = {Second, Sun, Sep, 2, 780 };    //Daylight time = UTC + 13 hours
+TimeChangeRule NZST = {First, Sun, Apr, 3, 720 };     //Standard time = UTC + 12 hours
+Timezone tzNZ(NZDT, NZST);
+
+TimeChangeRule NKST = {Last, Sun, Mar, 1, 510};     //Pyongyang Time = UTC + 8.5 hours
+Timezone tzNK(NKST, NKST);
+
+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()
 {

wled00/wled_ntp.h

@@ -2,66 +2,9 @@
 #define WLED_NTP_H
 #include <Arduino.h>
 #include "timezone/Timezone.h"
-
 /*
  * Acquires time from NTP server
  */
-TimeChangeRule UTCr = {Last, Sun, Mar, 1, 0};     // UTC
-Timezone tzUTC(UTCr, UTCr);
-
-TimeChangeRule BST = {Last, Sun, Mar, 1, 60};        // British Summer Time
-TimeChangeRule GMT = {Last, Sun, Oct, 2, 0};         // Standard Time
-Timezone tzUK(BST, GMT);
-
-TimeChangeRule CEST = {Last, Sun, Mar, 2, 120};     //Central European Summer Time
-TimeChangeRule CET = {Last, Sun, Oct, 3, 60};       //Central European Standard Time
-Timezone tzEUCentral(CEST, CET);
-
-TimeChangeRule EEST = {Last, Sun, Mar, 3, 180};     //Central European Summer Time
-TimeChangeRule EET = {Last, Sun, Oct, 4, 120};       //Central European Standard Time
-Timezone tzEUEastern(EEST, EET);
-
-TimeChangeRule EDT = {Second, Sun, Mar, 2, -240 };    //Daylight time = UTC - 4 hours
-TimeChangeRule EST = {First, Sun, Nov, 2, -300 };     //Standard time = UTC - 5 hours
-Timezone tzUSEastern(EDT, EST);
-
-TimeChangeRule CDT = {Second, Sun, Mar, 2, -300 };    //Daylight time = UTC - 5 hours
-TimeChangeRule CST = {First, Sun, Nov, 2, -360 };     //Standard time = UTC - 6 hours
-Timezone tzUSCentral(CDT, CST);
-
-Timezone tzCASaskatchewan(CST, CST); //Central without DST
-
-TimeChangeRule MDT = {Second, Sun, Mar, 2, -360 };    //Daylight time = UTC - 6 hours
-TimeChangeRule MST = {First, Sun, Nov, 2, -420 };     //Standard time = UTC - 7 hours
-Timezone tzUSMountain(MDT, MST);
-
-Timezone tzUSArizona(MST, MST); //Mountain without DST
-
-TimeChangeRule PDT = {Second, Sun, Mar, 2, -420 };    //Daylight time = UTC - 7 hours
-TimeChangeRule PST = {First, Sun, Nov, 2, -480 };     //Standard time = UTC - 8 hours
-Timezone tzUSPacific(PDT, PST);
-
-TimeChangeRule ChST = {Last, Sun, Mar, 1, 480};     // China Standard Time = UTC + 8 hours
-Timezone tzChina(ChST, ChST);
-
-TimeChangeRule JST = {Last, Sun, Mar, 1, 540};     // Japan Standard Time = UTC + 9 hours
-Timezone tzJapan(JST, JST);
-
-TimeChangeRule AEDT = {Second, Sun, Oct, 2, 660 };    //Daylight time = UTC + 11 hours
-TimeChangeRule AEST = {First, Sun, Apr, 3, 600 };     //Standard time = UTC + 10 hours
-Timezone tzAUEastern(AEDT, AEST);
-
-TimeChangeRule NZDT = {Second, Sun, Sep, 2, 780 };    //Daylight time = UTC + 13 hours
-TimeChangeRule NZST = {First, Sun, Apr, 3, 720 };     //Standard time = UTC + 12 hours
-Timezone tzNZ(NZDT, NZST);
-
-TimeChangeRule NKST = {Last, Sun, Mar, 1, 510};     //Pyongyang Time = UTC + 8.5 hours
-Timezone tzNK(NKST, NKST);
-
-TimeChangeRule IST = {Last, Sun, Mar, 1, 330};     // India Standard Time = UTC + 5.5 hours
-Timezone tzIndia(IST, IST);
-
-Timezone* timezones[] = {&tzUTC, &tzUK, &tzEUCentral, &tzEUEastern, &tzUSEastern, &tzUSCentral, &tzUSMountain, &tzUSArizona, &tzUSPacific, &tzChina, &tzJapan, &tzAUEastern, &tzNZ, &tzNK, &tzIndia, &tzCASaskatchewan};  
 
 void handleNetworkTime();
 void sendNTPPacket();