Merge pull request brettdottech#245 from dreed47/NTP-fixes

Set NTP update interval to every 15 minutes.  Also check for update r…

Author: brett-dot-tech

firmware/src/core/globaltime/GlobalTime.cpp

@@ -3,6 +3,7 @@
 #include "ConfigManager.h"
 #include "config_helper.h"
 #include <ArduinoJson.h>
+#include <ArduinoLog.h>
 
 GlobalTime *GlobalTime::m_instance = nullptr;
 
@@ -13,7 +14,7 @@ GlobalTime::GlobalTime() {
     m_ntpServer = cm->getConfigString("ntpServer", m_ntpServer); // config added in MainHelper
     Serial.printf("GlobalTime initialized, tzLoc=%s, clockFormat=%d, ntpServer=%s\n", m_timezoneLocation.c_str(), clockFormat, m_ntpServer.c_str());
     m_format24hour = (clockFormat == CLOCK_FORMAT_24_HOUR);
-    m_timeClient = new NTPClient(m_udp, m_ntpServer.c_str());
+    m_timeClient = new NTPClient(m_udp, m_ntpServer.c_str(), 0, m_updateInterval);
     m_timeClient->begin();
 }
 
@@ -33,8 +34,17 @@ void GlobalTime::updateTime(bool force) {
         if (m_timeZoneOffset == -1 || (m_nextTimeZoneUpdate > 0 && m_unixEpoch > m_nextTimeZoneUpdate)) {
             getTimeZoneOffsetFromAPI();
         }
-        m_timeClient->update();
+        bool updated = m_timeClient->update();
         m_unixEpoch = m_timeClient->getEpochTime();
+        if (updated) {
+            if (year(m_unixEpoch) < m_lowYearTest || year(m_unixEpoch) > m_highYearTest) {
+                Log.warningln("NTP updated but year is not in acceptable range, skipping update, trying again...");
+                m_timeClient->setUpdateInterval(3000); // try again in 3 seconds
+                return;
+            }
+            Log.noticeln("NTP updated successful - Year is: %d", year(m_unixEpoch));
+            m_timeClient->setUpdateInterval(m_updateInterval); // reset update interval
+        }
         m_updateTimer = millis();
         m_minute = minute(m_unixEpoch);
         if (m_format24hour) {
@@ -173,4 +183,4 @@ bool GlobalTime::getFormat24Hour() {
 bool GlobalTime::setFormat24Hour(bool format24hour) {
     m_format24hour = format24hour;
     return m_format24hour;
-}
+}

firmware/src/core/globaltime/GlobalTime.h

@@ -92,6 +92,9 @@ class GlobalTime {
     WiFiUDP m_udp;
     NTPClient *m_timeClient{nullptr};
 
+    unsigned long m_updateInterval = 900000; // Update every 15 min
+    const int m_lowYearTest = 2025;
+    const int m_highYearTest = 2035;
     unsigned long m_oneSecond = 1000;
     unsigned long m_updateTimer = 0;
 
@@ -101,4 +104,4 @@ class GlobalTime {
     void getTimeZoneOffsetFromAPI();
 };
 
-#endif // GLOBALTIME_H
+#endif // GLOBALTIME_H