Merge branch 'develop' of JF/PineTime into master

2 files changed, 4 insertions, 2 deletions

diff --git a/src/Components/DateTime/DateTimeController.cpp b/src/Components/DateTime/DateTimeController.cpp
index 5cfa08e..30d9c13 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 1e65bd1..d602074 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