From e00cbcc15356f123db9eee4799436e3b15548639 Mon Sep 17 00:00:00 2001 From: pennam Date: Fri, 13 Jun 2025 11:29:11 +0200 Subject: [PATCH] Add getTime fallback using NTPUtils --- arduino/component.mk | 4 ++-- main/sketch.ino.cpp | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/arduino/component.mk b/arduino/component.mk index 881a9e31..858fc796 100644 --- a/arduino/component.mk +++ b/arduino/component.mk @@ -1,3 +1,3 @@ -COMPONENT_ADD_INCLUDEDIRS := cores/esp32 libraries/SPIS/src libraries/WiFi/src libraries/Wire/src libraries/ArduinoECCX08/src libraries/ArduinoBearSSL/src +COMPONENT_ADD_INCLUDEDIRS := cores/esp32 libraries/SPIS/src libraries/WiFi/src libraries/Wire/src libraries/ArduinoECCX08/src libraries/ArduinoBearSSL/src libraries/NTP/src -COMPONENT_SRCDIRS := cores/esp32 libraries/SPIS/src libraries/WiFi/src libraries/Wire/src libraries/ArduinoECCX08/src libraries/ArduinoBearSSL/src libraries/ArduinoBearSSL/src/bearssl libraries/ArduinoBearSSL/src/utility +COMPONENT_SRCDIRS := cores/esp32 libraries/SPIS/src libraries/WiFi/src libraries/Wire/src libraries/ArduinoECCX08/src libraries/ArduinoBearSSL/src libraries/ArduinoBearSSL/src/bearssl libraries/ArduinoBearSSL/src/utility libraries/NTP/src diff --git a/main/sketch.ino.cpp b/main/sketch.ino.cpp index 9eb97c53..45b7a8b9 100644 --- a/main/sketch.ino.cpp +++ b/main/sketch.ino.cpp @@ -38,6 +38,7 @@ extern "C" { #include #include +#include #include "CommandHandler.h" @@ -110,7 +111,16 @@ void setup() { // #define UNO_WIFI_REV2 unsigned long getTime() { - return time(nullptr); + unsigned long xtime = 0; + xtime = time(nullptr); + if (xtime > 946684800) { + ESP_LOGI("getTime", "xtime = %lu", xtime); + return xtime; + } + WiFiUDP ntpClient; + xtime = NTPUtils::getTime(ntpClient); + ESP_LOGW("getTime", "xtime = %lu", xtime); + return xtime; } void setupWiFi() {