NTP: use sntp app from lwip on latest Cores, replace ntpclientlib

code/espurna/broker.h

@@ -54,7 +54,6 @@ using StatusBroker = TBroker<TBrokerType::STATUS, const String&, unsigned char,
 using SensorReadBroker = TBroker<TBrokerType::SENSOR_READ, const String&, unsigned char, double, const char*>;
 using SensorReportBroker = TBroker<TBrokerType::SENSOR_REPORT, const String&, unsigned char, double, const char*>;
 
-using TimeBroker = TBroker<TBrokerType::DATETIME, const String&, time_t, const String&>;
 using ConfigBroker = TBroker<TBrokerType::CONFIG, const String&, const String&>;
 
 #endif // BROKER_SUPPORT

code/espurna/config/dependencies.h

@@ -76,7 +76,9 @@
 
 #if SCHEDULER_SUPPORT
 #undef NTP_SUPPORT
-#define NTP_SUPPORT 1 // Scheduler needs NTP
+#define NTP_SUPPORT 1 // Scheduler needs NTP to work
+#undef BROKER_SUPPORT
+#define BROKER_SUPPORT 1 // Scheduler needs Broker to trigger every minute
 #endif
 
 #if LWIP_VERSION_MAJOR != 1
@@ -146,3 +148,11 @@
 #define SSDP_SUPPORT 0
 #endif
 
+//------------------------------------------------------------------------------
+// Change ntp module depending on Core version
+
+#if NTP_SUPPORT && defined(ARDUINO_ESP8266_RELEASE_2_3_0)
+#define NTP_LEGACY_SUPPORT 1
+#else
+#define NTP_LEGACY_SUPPORT 0
+#endif

code/espurna/config/general.h

@@ -1476,13 +1476,38 @@
 // -----------------------------------------------------------------------------
 
 #ifndef NTP_SUPPORT
-#define NTP_SUPPORT 1 // Build with NTP support by default (6.78Kb)
+#define NTP_SUPPORT 1 // Build with NTP support by default (depends on Core version)
 #endif
 
 #ifndef NTP_SERVER
 #define NTP_SERVER "pool.ntp.org" // Default NTP server
 #endif
 
+#ifndef NTP_TIMEZONE
+#define NTP_TIMEZONE TZ_Etc_UTC // POSIX TZ variable. Default to UTC from TZ.h (which is PSTR("UTC0"))
+ // For the format documentation, see:
+ // - https://www.gnu.org/software/libc/manual/html_node/TZ-Variable.html
+ // ESP8266 Core provides human-readable aliases for POSIX format, see:
+ // - Latest: https://github.com/esp8266/Arduino/blob/master/cores/esp8266/TZ.h
+ // - PlatformIO: ~/.platformio/packages/framework-arduinoespressif8266/cores/esp8266/TZ.h
+ // (or, possibly, c:\.platformio\... on Windows)
+ // - Arduino IDE: depends on platform, see `/dist/arduino_ide/README.md`
+#endif
+
+#ifndef NTP_UPDATE_INTERVAL
+#define NTP_UPDATE_INTERVAL 1800 // NTP check every 30 minutes
+#endif
+
+#ifndef NTP_START_DELAY
+#define NTP_START_DELAY 3 // Delay NTP start for 3 seconds
+#endif
+
+#ifndef NTP_WAIT_FOR_SYNC
+#define NTP_WAIT_FOR_SYNC 1 // Do not report any datetime until NTP sync'ed
+#endif
+
+// WARNING: legacy NTP settings. can be ignored with Core 2.6.2+
+
 #ifndef NTP_TIMEOUT
 #define NTP_TIMEOUT 1000 // Set NTP request timeout to 2 seconds (issue #452)
 #endif
@@ -1499,22 +1524,10 @@
 #define NTP_SYNC_INTERVAL 60 // NTP initial check every minute
 #endif
 
-#ifndef NTP_UPDATE_INTERVAL
-#define NTP_UPDATE_INTERVAL 1800 // NTP check every 30 minutes
-#endif
-
-#ifndef NTP_START_DELAY
-#define NTP_START_DELAY 1000 // Delay NTP start 1 second
-#endif
-
 #ifndef NTP_DST_REGION
 #define NTP_DST_REGION 0 // 0 for Europe, 1 for USA (defined in NtpClientLib)
 #endif
 
-#ifndef NTP_WAIT_FOR_SYNC
-#define NTP_WAIT_FOR_SYNC 1 // Do not report any datetime until NTP sync'ed
-#endif
-
 // -----------------------------------------------------------------------------
 // ALEXA
 // -----------------------------------------------------------------------------

code/espurna/espurna.ino

@@ -26,7 +26,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #include "button.h"
 #include "debug.h"
 #include "led.h"
+#include "ntp.h"
 #include "relay.h"
+#include "rpnrules.h"
 #include "settings.h"
 #include "system.h"
 #include "tuya.h"

code/espurna/libs/NtpClientWrap.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#if NTP_LEGACY_SUPPORT
+
 #include <WiFiUdp.h>
 #include <NtpClientLib.h>
 
@@ -27,3 +29,5 @@ class NTPClientWrap : public NTPClient {
 // NOTE: original NTP should be discarded by the linker
 // TODO: allow NTP client object to be destroyed
 NTPClientWrap NTPw;
+
+#endif

code/espurna/libs/SecureClientHelpers.h

@@ -185,7 +185,11 @@ struct SecureClientChecks {
  client.setFingerprint(_buffer);
  }
  } else if (check == SECURE_CLIENT_CHECK_CA) {
- client.setX509Time(ntpLocal2UTC(now()));
+ #if NTP_LEGACY_SUPPORT
+ client.setX509Time(ntpLocal2UTC(now()));
+ #else
+ client.setX509Time(now());
+ #endif
  if (!certs.getCount()) {
  if (config.on_certificate) certs.append(config.on_certificate());
  }

code/espurna/mqtt.ino

@@ -16,10 +16,10 @@ Updated secure client support by Niek van der Maas < mail at niekvandermaas dot
 #include <vector>
 #include <utility>
 #include <Ticker.h>
-#include <TimeLib.h>
 
 #include "system.h"
 #include "libs/SecureClientHelpers.h"
+#include "ntp.h"
 #include "ws.h"
 
 #if MQTT_LIBRARY == MQTT_LIBRARY_ASYNCMQTTCLIENT

code/espurna/ntp.h

@@ -0,0 +1,52 @@
+/*
+
+NTP MODULE
+
+*/
+
+#pragma once
+
+#include "broker.h"
+
+// TODO: need this prototype for .ino
+struct NtpCalendarWeekday;
+
+#if NTP_SUPPORT
+
+#if NTP_LEGACY_SUPPORT // Use legacy TimeLib and NtpClientLib
+
+#include <TimeLib.h>
+#include "libs/NtpClientWrap.h"
+
+#else // POSIX time functions + configTime(...)
+
+#include <lwip/apps/sntp.h>
+#include <TZ.h>
+#include "ntp_timelib.h"
+
+#endif
+
+// --- rest of the module is ESPurna functions
+
+enum class NtpTick {
+ EveryMinute,
+ EveryHour
+};
+
+struct NtpCalendarWeekday {
+ int local_wday;
+ int local_hour;
+ int local_minute;
+ int utc_wday;
+ int utc_hour;
+ int utc_minute;
+};
+
+using NtpBroker = TBroker<TBrokerType::DATETIME, const NtpTick, time_t, const String&>;
+
+String ntpDateTime(time_t ts);
+String ntpDateTime();
+
+void ntpSetup();
+
+#endif // NTP_SUPPORT