From 1ba1bbc9e38d06763f3c114d123eaa0ec2a9525d Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Wed, 19 May 2021 01:08:37 +0200 Subject: [PATCH] remove smart pointer from NTP --- src/TaskNTP.cpp | 12 ++++++------ src/TaskNTP.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/TaskNTP.cpp b/src/TaskNTP.cpp index ada8c02..3e03f5b 100644 --- a/src/TaskNTP.cpp +++ b/src/TaskNTP.cpp @@ -12,7 +12,7 @@ NTPTask::~NTPTask() { } bool NTPTask::setup(System &system) { - _ntpClient = std::shared_ptr(new NTPClient(system.getUserConfig()->ntpServer.c_str())); + _ntpClient.setPoolServerName(system.getUserConfig()->ntpServer.c_str()); return true; } @@ -21,15 +21,15 @@ bool NTPTask::loop(System &system) { return false; } if (!_beginCalled) { - _ntpClient->begin(); + _ntpClient.begin(); _beginCalled = true; } - if (_ntpClient->update()) { - setTime(_ntpClient->getEpochTime()); + if (_ntpClient.update()) { + setTime(_ntpClient.getEpochTime()); logPrintI("Current time: "); - logPrintlnI(_ntpClient->getFormattedTime()); + logPrintlnI(_ntpClient.getFormattedTime()); } - _stateInfo = _ntpClient->getFormattedTime(); + _stateInfo = _ntpClient.getFormattedTime(); _state = Okay; return true; } diff --git a/src/TaskNTP.h b/src/TaskNTP.h index d7e53bc..3eab8e3 100644 --- a/src/TaskNTP.h +++ b/src/TaskNTP.h @@ -13,8 +13,8 @@ public: virtual bool loop(System &system) override; private: - std::shared_ptr _ntpClient; - bool _beginCalled; + NTPClient _ntpClient; + bool _beginCalled; }; #endif