From 874b24fb320c6dc16e509514b70965bb4ca7964b Mon Sep 17 00:00:00 2001 From: Blaz Kristan Date: Sat, 13 Jan 2024 13:06:00 +0100 Subject: [PATCH] WLED time overrides --- wled00/wled.h | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/wled00/wled.h b/wled00/wled.h index 83b1d4f3a..217acd627 100755 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -8,7 +8,7 @@ */ // version code in format yymmddb (b = daily build) -#define VERSION 2401110 +#define VERSION 2401130 //uncomment this if you have a "my_config.h" file you'd like to use //#define WLED_USE_MY_CONFIG @@ -475,10 +475,19 @@ WLED_GLOBAL char last_signal_src[13] _INIT(""); // last seen ESP-NOW sender #endif // 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 +#ifndef WLED_NTP_ENABLED + #define WLED_NTP_ENABLED false +#endif +#ifndef WLED_TIMEZONE + #define WLED_TIMEZONE 0 +#endif +#ifndef WLED_UTC_OFFSET + #define WLED_UTC_OFFSET 0 +#endif +WLED_GLOBAL bool ntpEnabled _INIT(WLED_NTP_ENABLED); // 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(WLED_TIMEZONE); // Timezone ID. Refer to timezones array in wled10_ntp.ino +WLED_GLOBAL int utcOffsetSecs _INIT(WLED_UTC_OFFSET); // Seconds to offset from UTC before timzone calculation WLED_GLOBAL byte overlayCurrent _INIT(0); // 0: no overlay 1: analog clock 2: was single-digit clock 3: was cronixie WLED_GLOBAL byte overlayMin _INIT(0), overlayMax _INIT(DEFAULT_LED_COUNT - 1); // boundaries of overlay mode @@ -650,6 +659,12 @@ WLED_GLOBAL String escapedMac; WLED_GLOBAL DNSServer dnsServer; // network time +#ifndef WLED_LAT + #define WLED_LAT 0.0f +#endif +#ifndef WLED_LON + #define WLED_LON 0.0f +#endif WLED_GLOBAL bool ntpConnected _INIT(false); WLED_GLOBAL time_t localTime _INIT(0); WLED_GLOBAL unsigned long ntpLastSyncTime _INIT(999000000L); @@ -657,8 +672,8 @@ WLED_GLOBAL unsigned long ntpPacketSentTime _INIT(999000000L); WLED_GLOBAL IPAddress ntpServerIP; WLED_GLOBAL uint16_t ntpLocalPort _INIT(2390); WLED_GLOBAL uint16_t rolloverMillis _INIT(0); -WLED_GLOBAL float longitude _INIT(0.0); -WLED_GLOBAL float latitude _INIT(0.0); +WLED_GLOBAL float longitude _INIT(WLED_LON); +WLED_GLOBAL float latitude _INIT(WLED_LAT); WLED_GLOBAL time_t sunrise _INIT(0); WLED_GLOBAL time_t sunset _INIT(0); WLED_GLOBAL Toki toki _INIT(Toki());