mirror of
https://github.com/lumapu/ahoy.git
synced 2025-08-06 09:58:23 +02:00
Merge branch 'development03' of https://github.com/Telekatz/ahoy into Telekatz-development03
This commit is contained in:
commit
c5ec5c718a
3 changed files with 7 additions and 6 deletions
|
@ -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) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue