1- /* Copyright (C) 2019-2020 Lee C. Bussy (@LBussy)
1+ /* Copyright (C) 2019-2021 Lee C. Bussy (@LBussy)
22
33This file is part of Lee Bussy's Brew Bubbles (brew-bubbles).
44
@@ -20,34 +20,56 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2121SOFTWARE. */
2222
23+ // NTP Examples in:
24+ // https://github.com/esp8266/Arduino/blob/master/libraries/esp8266/examples/NTP-TZ-DST/NTP-TZ-DST.ino
25+
2326#include " ntp.h"
2427
28+ #if LWIP_VERSION_MAJOR == 1
29+ #warning "Remember: You are using lwIP v1.x and this causes ntp time to act weird."
30+ #endif
31+
32+ static const int __attribute__ ((unused)) SECS_1_1_2019 = 1546300800; // 1546300800 = 01/01/2019 @ 12:00am (UTC)
33+ static const char __attribute__ ((unused)) * DAY_OF_WEEK[] = {" Sunday" " Monday" " Tuesday" " Wednesday" " Thursday" " Friday" " Saturday"
34+ static const char __attribute__ ((unused)) * DAY_OF_WEEK_SHORT[] = {" Sun" " Mon" " Tue" " Wed" " Thu" " Fri" " Sat"
35+
2536void setClock ()
2637{
2738 Ticker blinker;
2839 Log.notice (F (" Entering blocking loop to get NTP time."
2940 blinker.attach_ms (NTPBLINK, ntpBlinker);
30- time_t startSecs = time ( nullptr ) ;
41+ unsigned long startSecs = millis () / 1000 ;
3142 int cycle = 0 ;
32- while (time (nullptr ) < EPOCH_1_1_2019)
43+ #if LWIP_VERSION_MAJOR == 1
44+ sntp_setservername (0 , (char *)" pool.ntp.org"
45+ sntp_setservername (0 , (char *)" time.nist.gov"
46+ sntp_set_timezone (0 );
47+ while (sntp_get_current_timestamp () == 0 )
48+ {
49+ sntp_stop ();
50+ sntp_init ();
51+ #else
52+ while (time (nullptr ) < SECS_1_1_2019)
3353 {
34- configTime (" GMT" " pool.ntp.org" " time.nist.gov"
35- if (time (nullptr ) - startSecs > 9 )
54+ configTime (THISTZ, TIMESERVER);
55+ #endif
56+ if ((millis () / 1000 ) - startSecs > 9 )
3657 {
3758 if (cycle > 9 )
3859 {
3960#ifdef LOG_LEVEL
4061 myPrintln ();
4162#endif
42- Log.warning (F (" Unable to get time hack from %s, starting with epoch ." , TIMESERVER );
63+ Log.warning (F (" Unable to get time hack from server, restarting ."
4364 blinker.detach ();
65+ ESP.restart ();
4466 return ;
4567 }
4668#ifdef LOG_LEVEL
4769 myPrintln ();
4870#endif
4971 Log.verbose (F (" Re-requesting time hack."
50- startSecs = time ( nullptr ) ;
72+ startSecs = millis () / 1000 ;
5173 cycle++;
5274 }
5375#ifdef LOG_LEVEL
@@ -60,18 +82,13 @@ void setClock()
6082#ifdef LOG_LEVEL
6183 myPrintln ();
6284#endif
63- lastNTPUpdate = millis ();
6485 Log.notice (F (" NTP time set."
65- struct tm timeinfo;
66- time_t nowSecs = time (nullptr );
67- gmtime_r (&nowSecs, &timeinfo);
6886}
6987
7088String getDTS ()
7189{
7290 // Returns JSON-type string = 2019-12-20T13:59:39Z
73- // / Also:
74- // sprintf(dts, "%04u-%02u-%02uT%02u:%02u:%02uZ", getYear(), getMonth(), getDate(), getHour(), getMinute(), getSecond());
91+ // Also: sprintf(dta, "%04u-%02u-%02uT%02u:%02u:%02uZ", getYear(), getMonth(), getDate(), getHour(), getMinute(), getSecond());
7592 time_t now;
7693 time_t rawtime = time (&now);
7794 struct tm ts;
@@ -100,7 +117,7 @@ int getMonth()
100117 struct tm *ts;
101118 time (&rawtime);
102119 ts = gmtime (&rawtime);
103- int month = ts->tm_mon ;
120+ int month = ts->tm_mon + 1 ;
104121 return month;
105122}
106123
@@ -126,6 +143,16 @@ int getWday()
126143 return wday;
127144}
128145
146+ String getDayofWeek ()
147+ {
148+ return DAY_OF_WEEK[getWday ()];
149+ }
150+
151+ String getShortDayofWeek ()
152+ {
153+ return DAY_OF_WEEK_SHORT[getWday ()];
154+ }
155+
129156int getHour ()
130157{
131158 // tm_hour = hours since midnight (0-23)
0 commit comments