diff options
| author | JF <jf@codingfield.com> | 2020-06-16 21:15:16 +0200 |
|---|---|---|
| committer | Gitea <gitea@fake.local> | 2020-06-16 21:15:16 +0200 |
| commit | 3a49bbbae48a62d5252fee0cb6d04002d917c820 (patch) | |
| tree | 800c2ab76a4609382865ba9fd8b16b9732e5eb03 /src/Components/DateTime/DateTimeController.cpp | |
| parent | a0e73f5c1a1e652aa6270b7e42a73aee3d12ded6 (diff) | |
| parent | 9a89ff7f7764df085a59c8a24fe578228a22fc6c (diff) | |
Merge branch 'develop' of JF/PineTime into master
Diffstat (limited to 'src/Components/DateTime/DateTimeController.cpp')
| -rw-r--r-- | src/Components/DateTime/DateTimeController.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Components/DateTime/DateTimeController.cpp b/src/Components/DateTime/DateTimeController.cpp index 5cfa08eb..30d9c13f 100644 --- a/src/Components/DateTime/DateTimeController.cpp +++ b/src/Components/DateTime/DateTimeController.cpp @@ -47,7 +47,8 @@ void DateTime::UpdateTime(uint32_t systickCounter) { previousSystickCounter = 0xffffff - (rest - systickCounter); } - currentDateTime += std::chrono::seconds (correctedDelta); + currentDateTime += std::chrono::seconds(correctedDelta); + uptime += std::chrono::seconds(correctedDelta); auto dp = date::floor<date::days>(currentDateTime); auto time = date::make_time(currentDateTime-dp); |