55#include " TimeClientHelper.hpp"
66
77// NTP Client
8- WiFiUDP ntpUDP;
8+ WiFiUDP ntpUDP;
99NTPClient* timeClient = nullptr ;
1010
1111// Central European Time (Berlin, Paris, ...)
1212TimeChangeRule CEST = {" CEST" , Last, Sun, Mar, 2 , 120 }; // Central European Summer Time
13- TimeChangeRule CET = {" CET " , Last, Sun, Oct, 3 , 60 }; // Central European Standard Time
14- Timezone Europe (CEST, CET);
13+ TimeChangeRule CET = {" CET " , Last, Sun, Oct, 3 , 60 }; // Central European Standard Time
14+ Timezone Europe (CEST, CET);
1515
1616// Eastern European Time (Helsinki, Athens, ...)
1717TimeChangeRule EEST = {" EEST" , Last, Sun, Mar, 3 , 180 }; // Eastern European Summer Time
18- TimeChangeRule EET = {" EET " , Last, Sun, Oct, 4 , 120 }; // Eastern European Standard Time
19- Timezone EasternEurope (EEST, EET);
18+ TimeChangeRule EET = {" EET " , Last, Sun, Oct, 4 , 120 }; // Eastern European Standard Time
19+ Timezone EasternEurope (EEST, EET);
2020
2121// Western European Time (London, Lisbon, ...)
2222TimeChangeRule BST = {" BST" , Last, Sun, Mar, 1 , 60 }; // British Summer Time
2323TimeChangeRule GMT = {" GMT" , Last, Sun, Oct, 2 , 0 }; // Greenwich Mean Time
24- Timezone WesternEurope (BST, GMT);
24+ Timezone WesternEurope (BST, GMT);
2525
2626// US Eastern Time (New York, Washington, ...)
2727TimeChangeRule EDT = {" EDT" , Second, Sun, Mar, 2 , -240 }; // Eastern Daylight Time (UTC-4)
2828TimeChangeRule EST = {" EST" , First, Sun, Nov, 2 , -300 }; // Eastern Standard Time (UTC-5)
29- Timezone USEastern (EDT, EST);
29+ Timezone USEastern (EDT, EST);
3030
3131// US Central Time (Chicago, Houston, ...)
3232TimeChangeRule CDT = {" CDT" , Second, Sun, Mar, 2 , -300 }; // Central Daylight Time (UTC-5)
3333TimeChangeRule CST = {" CST" , First, Sun, Nov, 2 , -360 }; // Central Standard Time (UTC-6)
34- Timezone USCentral (CDT, CST);
34+ Timezone USCentral (CDT, CST);
3535
3636// US Mountain Time (Denver, ...)
3737// Note: Most of Arizona does not observe DST
3838TimeChangeRule MDT = {" MDT" , Second, Sun, Mar, 2 , -360 }; // Mountain Daylight Time (UTC-6)
3939TimeChangeRule MST = {" MST" , First, Sun, Nov, 2 , -420 }; // Mountain Standard Time (UTC-7)
40- Timezone USMountain (MDT, MST);
40+ Timezone USMountain (MDT, MST);
4141
4242// US Pacific Time (Los Angeles, San Francisco, ...)
4343TimeChangeRule PDT = {" PDT" , Second, Sun, Mar, 2 , -420 }; // Pacific Daylight Time (UTC-7)
4444TimeChangeRule PST = {" PST" , First, Sun, Nov, 2 , -480 }; // Pacific Standard Time (UTC-8)
45- Timezone USPacific (PDT, PST);
45+ Timezone USPacific (PDT, PST);
4646
4747// Australian Eastern Time (Sydney, Melbourne, ...)
4848TimeChangeRule AEDT = {" AEDT" , First, Sun, Oct, 2 , 660 }; // Australian Eastern Daylight Time (UTC+11)
4949TimeChangeRule AEST = {" AEST" , First, Sun, Apr, 3 , 600 }; // Australian Eastern Standard Time (UTC+10)
50- Timezone AustralianEastern (AEDT, AEST);
50+ Timezone AustralianEastern (AEDT, AEST);
5151
5252// Japan Time Zone (Tokyo) - No DST
5353TimeChangeRule JST = {" JST" , First, Sun, Mar, 0 , 9 * 60 }; // UTC + 9 hours
54- Timezone Japan (JST, JST);
54+ Timezone Japan (JST, JST);
5555
5656// China Time Zone (Beijing) - No DST
5757TimeChangeRule CST_CHINA = {" CST" , First, Sun, Mar, 0 , 8 * 60 }; // UTC + 8 hours
58- Timezone China (CST_CHINA, CST_CHINA);
58+ Timezone China (CST_CHINA, CST_CHINA);
5959
6060TimeZoneInfo _timezones[10 ] = {{" Central European" , &Europe},
6161 {" Eastern European" , &EasternEurope},
@@ -71,9 +71,9 @@ TimeZoneInfo _timezones[10] = {{"Central European", &Europe},
7171int _selectedTimezoneIndex = 0 ; // Default to Central European Time
7272
7373// Time sync tracking
74- static time_t _lastValidTime = 0 ; // Last known good time from NTP
75- static uint32_t _lastValidTimeMillis = 0 ; // millis() when last valid time was captured
76- static bool _timeSyncValid = false ; // Whether time sync is currently valid
74+ static time_t _lastValidTime = 0 ; // Last known good time from NTP
75+ static uint32_t _lastValidTimeMillis = 0 ; // millis() when last valid time was captured
76+ static bool _timeSyncValid = false ; // Whether time sync is currently valid
7777
7878void timeClientSetup (const char * ntpServer) {
7979 // Create NTP client with configured server
@@ -100,9 +100,9 @@ time_t getUtcTime() {
100100
101101 // Validate time is reasonable (after 2020-01-01)
102102 if (ntpTime >= MIN_VALID_TIME) {
103- _lastValidTime = ntpTime;
103+ _lastValidTime = ntpTime;
104104 _lastValidTimeMillis = millis ();
105- _timeSyncValid = true ;
105+ _timeSyncValid = true ;
106106 return ntpTime;
107107 }
108108 }
@@ -163,12 +163,10 @@ String getFormattedTime(time_t rawTime) {
163163 String hoursStr = hours < 10 ? " 0" + String (hours) : String (hours);
164164
165165 unsigned long minutes = (rawTime % 3600 ) / 60 ;
166- String minuteStr =
167- minutes < 10 ? " 0" + String (minutes) : String (minutes);
166+ String minuteStr = minutes < 10 ? " 0" + String (minutes) : String (minutes);
168167
169168 unsigned long seconds = rawTime % 60 ;
170- String secondStr =
171- seconds < 10 ? " 0" + String (seconds) : String (seconds);
169+ String secondStr = seconds < 10 ? " 0" + String (seconds) : String (seconds);
172170
173171 return hoursStr + " :" + minuteStr + " :" + secondStr;
174172}
0 commit comments