summaryrefslogtreecommitdiff
path: root/src/Components
diff options
context:
space:
mode:
authorJF <jf@codingfield.com>2020-06-07 20:04:43 +0200
committerJF <jf@codingfield.com>2020-06-07 20:04:43 +0200
commite22c0609b542b133fe2effe8f91501d50b763d45 (patch)
tree722461ec13de07daa1f67033e490b3af16549e6c /src/Components
parentbaafb96f3089d7fc890b4b5ef65bb2934fce3f55 (diff)
Add uptime counter in DateTimeController and display it in SystemInfo screen.
Diffstat (limited to 'src/Components')
-rw-r--r--src/Components/DateTime/DateTimeController.cpp3
-rw-r--r--src/Components/DateTime/DateTimeController.h3
2 files changed, 4 insertions, 2 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);
diff --git a/src/Components/DateTime/DateTimeController.h b/src/Components/DateTime/DateTimeController.h
index 1e65bd11..d6020745 100644
--- a/src/Components/DateTime/DateTimeController.h
+++ b/src/Components/DateTime/DateTimeController.h
@@ -21,6 +21,7 @@ namespace Pinetime {
uint8_t Seconds() const { return second; }
std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> CurrentDateTime() const { return currentDateTime; }
+ std::chrono::seconds Uptime() const { return uptime; }
private:
uint16_t year = 0;
Months month = Months::Unknown;
@@ -32,7 +33,7 @@ namespace Pinetime {
uint32_t previousSystickCounter = 0;
std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> currentDateTime;
-
+ std::chrono::seconds uptime {0};
};
}
} \ No newline at end of file