NTP uses networkManager

This commit is contained in:
Petr Kracik
2026-01-13 00:08:29 +01:00
committed by Petr Kracík
parent eb4087073b
commit 891fc906bb

View File

@@ -18,14 +18,14 @@
#include <NTPClient.h> #include <NTPClient.h>
#include <WiFiUdp.h> #include <WiFiUdp.h>
#include <WiFi.h>
#include "configuration.h" #include "configuration.h"
#include "network_manager.h"
#include "ntp_utils.h" #include "ntp_utils.h"
#include "time.h" #include "time.h"
extern Configuration Config; extern Configuration Config;
extern NetworkManager *networkManager;
WiFiUDP ntpUDP; WiFiUDP ntpUDP;
NTPClient* timeClient; NTPClient* timeClient;
@@ -33,7 +33,7 @@ NTPClient* timeClient;
namespace NTP_Utils { namespace NTP_Utils {
void setup() { void setup() {
if (WiFi.status() == WL_CONNECTED && Config.digi.ecoMode == 0 && Config.callsign != "NOCALL-10") { if (networkManager->isConnected() && Config.digi.ecoMode == 0 && Config.callsign != "NOCALL-10") {
int gmt = Config.ntp.gmtCorrection * 3600; int gmt = Config.ntp.gmtCorrection * 3600;
timeClient = new NTPClient(ntpUDP, Config.ntp.server.c_str(), gmt, 15 * 60 * 1000); // Update interval 15 min timeClient = new NTPClient(ntpUDP, Config.ntp.server.c_str(), gmt, 15 * 60 * 1000); // Update interval 15 min
timeClient->begin(); timeClient->begin();
@@ -41,11 +41,11 @@ namespace NTP_Utils {
} }
void update() { void update() {
if (WiFi.status() == WL_CONNECTED && Config.digi.ecoMode == 0 && Config.callsign != "NOCALL-10") timeClient->update(); if (networkManager->isConnected() && Config.digi.ecoMode == 0 && Config.callsign != "NOCALL-10") timeClient->update();
} }
String getFormatedTime() { String getFormatedTime() {
if (WiFi.status() == WL_CONNECTED && Config.digi.ecoMode == 0) return timeClient->getFormattedTime(); if (networkManager->isConnected() && Config.digi.ecoMode == 0) return timeClient->getFormattedTime();
return "DigiEcoMode Active"; return "DigiEcoMode Active";
} }