From 62eeca944bd0694c74c877263d14212ec0db9eb8 Mon Sep 17 00:00:00 2001
From: MichaelDvP <github@mdvp.de>
Date: Tue, 3 Oct 2023 10:57:20 +0200
Subject: [PATCH] make NTP arduino3 ready

---
 lib/framework/NTPSettingsService.cpp | 7 +++----
 lib/framework/NTPSettingsService.h   | 2 +-
 lib/framework/NTPStatus.cpp          | 4 ++--
 lib/framework/NTPStatus.h            | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/framework/NTPSettingsService.cpp b/lib/framework/NTPSettingsService.cpp
index 5d4529d96..588f5a1a5 100644
--- a/lib/framework/NTPSettingsService.cpp
+++ b/lib/framework/NTPSettingsService.cpp
@@ -1,5 +1,4 @@
 #include <NTPSettingsService.h>
-#include <esp_sntp.h>
 
 #include "../../src/emsesp_stub.hpp"
 
@@ -50,13 +49,13 @@ void NTPSettingsService::configureNTP() {
     emsesp::EMSESP::system_.ntp_connected(false);
     if (connected_ && _state.enabled) {
         emsesp::EMSESP::logger().info("Starting NTP service");
-        sntp_set_sync_interval(3600000); // one hour
-        sntp_set_time_sync_notification_cb(ntp_received);
+        esp_sntp_set_sync_interval(3600000); // one hour
+        esp_sntp_set_time_sync_notification_cb(ntp_received);
         configTzTime(_state.tzFormat.c_str(), _state.server.c_str());
     } else {
         setenv("TZ", _state.tzFormat.c_str(), 1);
         tzset();
-        sntp_stop();
+        esp_sntp_stop();
     }
 }
 
diff --git a/lib/framework/NTPSettingsService.h b/lib/framework/NTPSettingsService.h
index 6871ac053..f26273ecf 100644
--- a/lib/framework/NTPSettingsService.h
+++ b/lib/framework/NTPSettingsService.h
@@ -5,7 +5,7 @@
 #include <FSPersistence.h>
 
 #include <time.h>
-#include <lwip/apps/sntp.h>
+#include <esp_sntp.h>
 
 #ifndef FACTORY_NTP_ENABLED
 #define FACTORY_NTP_ENABLED true
diff --git a/lib/framework/NTPStatus.cpp b/lib/framework/NTPStatus.cpp
index 069814dfa..efe18c53f 100644
--- a/lib/framework/NTPStatus.cpp
+++ b/lib/framework/NTPStatus.cpp
@@ -36,7 +36,7 @@ void NTPStatus::ntpStatus(AsyncWebServerRequest * request) {
     time_t now = time(nullptr);
 
     // only provide enabled/disabled status for now
-    root["status"] = sntp_enabled() ? emsesp::EMSESP::system_.ntp_connected() ? 2 : 1 : 0;
+    root["status"] = esp_sntp_enabled() ? emsesp::EMSESP::system_.ntp_connected() ? 2 : 1 : 0;
 
     // the current time in UTC
     root["utc_time"] = toUTCTimeString(gmtime(&now));
@@ -45,7 +45,7 @@ void NTPStatus::ntpStatus(AsyncWebServerRequest * request) {
     root["local_time"] = toLocalTimeString(localtime(&now));
 
     // the sntp server name
-    root["server"] = sntp_getservername(0);
+    root["server"] = esp_sntp_getservername(0);
 
     response->setLength();
     request->send(response);
diff --git a/lib/framework/NTPStatus.h b/lib/framework/NTPStatus.h
index 98e82589a..0ebe80495 100644
--- a/lib/framework/NTPStatus.h
+++ b/lib/framework/NTPStatus.h
@@ -4,7 +4,7 @@
 #include <time.h>
 
 #include <WiFi.h>
-#include <lwip/apps/sntp.h>
+#include <esp_sntp.h>
 
 #include <ArduinoJson.h>
 #include <ESPAsyncWebServer.h>