WantClue/NerdNos-Firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
BitMaker 2023-09-07 15:18:59 +02:00 committed by GitHub
commit 7baf783f48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/monitor.cpp
View File

@ -166,8 +166,7 @@ String getTime(void){
//Check if need an NTP call to check current time //Check if need an NTP call to check current time
if((mTriggerUpdate == 0) || (millis() - mTriggerUpdate > UPDATE_PERIOD_h * 60 * 60 * 1000)){ //60 sec. * 60 min * 1000ms if((mTriggerUpdate == 0) || (millis() - mTriggerUpdate > UPDATE_PERIOD_h * 60 * 60 * 1000)){ //60 sec. * 60 min * 1000ms
if(WiFi.status() == WL_CONNECTED) { if(WiFi.status() == WL_CONNECTED) {
timeClient.update(); //NTP call to get current time if(timeClient.update()) mTriggerUpdate = millis();
mTriggerUpdate = millis();
initialTime = timeClient.getEpochTime(); // Guarda la hora inicial (en segundos desde 1970) initialTime = timeClient.getEpochTime(); // Guarda la hora inicial (en segundos desde 1970)
Serial.print("TimeClient NTPupdateTime "); Serial.print("TimeClient NTPupdateTime ");
} }
@ -257,5 +256,6 @@ coin_data getCoinData(unsigned long mElapsed)
data.progressPercent = (HALVING_BLOCKS - remainingBlocks) * 100 / HALVING_BLOCKS; data.progressPercent = (HALVING_BLOCKS - remainingBlocks) * 100 / HALVING_BLOCKS;
data.remainingBlocks = String(remainingBlocks) + " BLOCKS"; data.remainingBlocks = String(remainingBlocks) + " BLOCKS";
return data; return data;
} }