Merge branch 'development03' of https://github.com/Telekatz/ahoy into Telekatz-development03

This commit is contained in:
lumapu 2024-01-20 13:10:08 +01:00
commit c5ec5c718a
3 changed files with 7 additions and 6 deletions

View file

@ -116,7 +116,7 @@ class app : public IApp, public ah::Scheduler {
}
uint64_t getTimestampMs() {
return ((uint64_t)Scheduler::mTimestamp * 1000) + (uint64_t)Scheduler::mTsMillis;
return ((uint64_t)Scheduler::mTimestamp * 1000) + ((uint64_t)millis() - (uint64_t)Scheduler::mTsMillis) % 1000;
}
bool saveSettings(bool reboot) {