andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

make NTP arduino3 ready

Browse Source
This commit is contained in:
MichaelDvP
2023-10-03 10:57:20 +02:00
parent 17d7487423
commit 62eeca944b
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/framework/NTPSettingsService.cpp
View File

@@ -1,5 +1,4 @@
#include <NTPSettingsService.h> #include <NTPSettingsService.h>
#include <esp_sntp.h>
#include "../../src/emsesp_stub.hpp" #include "../../src/emsesp_stub.hpp"
@@ -50,13 +49,13 @@ void NTPSettingsService::configureNTP() {
emsesp::EMSESP::system_.ntp_connected(false); emsesp::EMSESP::system_.ntp_connected(false);
if (connected_ && _state.enabled) { if (connected_ && _state.enabled) {
emsesp::EMSESP::logger().info("Starting NTP service"); emsesp::EMSESP::logger().info("Starting NTP service");
sntp_set_sync_interval(3600000); // one hour esp_sntp_set_sync_interval(3600000); // one hour
sntp_set_time_sync_notification_cb(ntp_received); esp_sntp_set_time_sync_notification_cb(ntp_received);
configTzTime(_state.tzFormat.c_str(), _state.server.c_str()); configTzTime(_state.tzFormat.c_str(), _state.server.c_str());
} else { } else {
setenv("TZ", _state.tzFormat.c_str(), 1); setenv("TZ", _state.tzFormat.c_str(), 1);
tzset(); tzset();
sntp_stop(); esp_sntp_stop();
} }
} }

2
lib/framework/NTPSettingsService.h
View File

@@ -5,7 +5,7 @@
#include <FSPersistence.h> #include <FSPersistence.h>
#include <time.h> #include <time.h>
#include <lwip/apps/sntp.h> #include <esp_sntp.h>
#ifndef FACTORY_NTP_ENABLED #ifndef FACTORY_NTP_ENABLED
#define FACTORY_NTP_ENABLED true #define FACTORY_NTP_ENABLED true

4
lib/framework/NTPStatus.cpp
View File

@@ -36,7 +36,7 @@ void NTPStatus::ntpStatus(AsyncWebServerRequest * request) {
time_t now = time(nullptr); time_t now = time(nullptr);
// only provide enabled/disabled status for now // 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 // the current time in UTC
root["utc_time"] = toUTCTimeString(gmtime(&now)); root["utc_time"] = toUTCTimeString(gmtime(&now));
@@ -45,7 +45,7 @@ void NTPStatus::ntpStatus(AsyncWebServerRequest * request) {
root["local_time"] = toLocalTimeString(localtime(&now)); root["local_time"] = toLocalTimeString(localtime(&now));
// the sntp server name // the sntp server name
root["server"] = sntp_getservername(0); root["server"] = esp_sntp_getservername(0);
response->setLength(); response->setLength();
request->send(response); request->send(response);

2
lib/framework/NTPStatus.h
View File

@@ -4,7 +4,7 @@
#include <time.h> #include <time.h>
#include <WiFi.h> #include <WiFi.h>
#include <lwip/apps/sntp.h> #include <esp_sntp.h>
#include <ArduinoJson.h> #include <ArduinoJson.h>
#include <ESPAsyncWebServer.h> #include <ESPAsyncWebServer.h>