lba.gitea/NTPClient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove user offset from epoch time, but include it in local time

Browse Source
This commit is contained in:
Peeter Normak 2017-10-31 10:24:10 +02:00
parent 9dc9ad184b
commit 055b927b4d
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
NTPClient.cpp
View File

@ -102,26 +102,35 @@ bool NTPClient::update() {
} }
unsigned long NTPClient::getEpochTime() { unsigned long NTPClient::getEpochTime() {
return this->_timeOffset + // User offset return this->_currentEpoc + // Epoc returned by the NTP server
this->_currentEpoc + // Epoc returned by the NTP server
((millis() - this->_lastUpdate) / 1000); // Time since last update ((millis() - this->_lastUpdate) / 1000); // Time since last update
} }
int NTPClient::getDay() { int NTPClient::getDay() {
return (((this->getEpochTime() / 86400L) + 4 ) % 7); //0 is Sunday unsigned long time = this->getEpochTime();
time += this->_timeOffset; // User offset
return (((time / 86400L) + 4 ) % 7); //0 is Sunday
} }
int NTPClient::getHours() { int NTPClient::getHours() {
return ((this->getEpochTime() % 86400L) / 3600); unsigned long time = this->getEpochTime();
time += this->_timeOffset; // User offset
return ((time % 86400L) / 3600);
} }
int NTPClient::getMinutes() { int NTPClient::getMinutes() {
return ((this->getEpochTime() % 3600) / 60); unsigned long time = this->getEpochTime();
time += this->_timeOffset; // User offset
return ((time % 3600) / 60);
} }
int NTPClient::getSeconds() { int NTPClient::getSeconds() {
return (this->getEpochTime() % 60); unsigned long time = this->getEpochTime();
time += this->_timeOffset; // User offset
return (time % 60);
} }
String NTPClient::getFormattedTime() { String NTPClient::getFormattedTime() {
unsigned long rawTime = this->getEpochTime(); unsigned long rawTime = this->getEpochTime();
rawTime += this->_timeOffset; // User offset
unsigned long hours = (rawTime % 86400L) / 3600; unsigned long hours = (rawTime % 86400L) / 3600;
String hoursStr = hours < 10 ? "0" + String(hours) : String(hours); String hoursStr = hours < 10 ? "0" + String(hours) : String(hours);