1 files changed, 49 insertions, 9 deletions
diff --git a/src/Components/DateTime/DateTimeController.cpp b/src/Components/DateTime/DateTimeController.cpp
index 1c15642e..cd512705 100644
--- a/src/Components/DateTime/DateTimeController.cpp
+++ b/src/Components/DateTime/DateTimeController.cpp
@@ -1,16 +1,56 @@
 #include "DateTimeController.h"
+#include <date/date.h>
+#include <libraries/log/nrf_log.h>
 
 using namespace Pinetime::Controllers;
 
 
-void DateTime::UpdateTime(uint16_t year, Months month, uint8_t day, Days dayOfWeek, uint8_t hour, uint8_t minute,
-                          uint8_t second) {
-  this->year = year;
-  this->month = month;
-  this->dayOfWeek = dayOfWeek;
-  this->day = day;
-  this->hour = hour;
-  this->minute = minute;
-  this->second = second;
+void DateTime::SetTime(uint16_t year, uint8_t month, uint8_t day, uint8_t dayOfWeek, uint8_t hour, uint8_t minute,
+                       uint8_t second, uint32_t systickCounter) {
+
+  currentDateTime = {};
+  currentDateTime += date::years( year-1970);
+  currentDateTime += date::days( day - 1);
+  currentDateTime += date::months( month - 1);
+
+  currentDateTime += std::chrono::hours(hour);
+  currentDateTime += std::chrono::minutes (minute);
+  currentDateTime += std::chrono::seconds (second);
+
+  currentDateTime -= std::chrono::hours(3); // TODO WHYYYY?
+  NRF_LOG_INFO("%d %d %d ", day, month, year);
+  NRF_LOG_INFO("%d %d %d ", hour, minute, second);
+  previousSystickCounter = systickCounter;
+  UpdateTime(systickCounter);
+  NRF_LOG_INFO("* %d %d %d ", this->hour, this->minute, this->second);
+  NRF_LOG_INFO("* %d %d %d ", this->day, this->month, this->year);
+
+
+}
+
+void DateTime::UpdateTime(uint32_t systickCounter) {
+  uint32_t systickDelta = 0;
+  if(systickCounter < previousSystickCounter) {
+    systickDelta = 0xffffff - previousSystickCounter;
+    systickDelta += systickCounter + 1;
+  } else {
+    systickDelta = systickCounter - previousSystickCounter;
+  }
+
+  previousSystickCounter = systickCounter;
+  currentDateTime += std::chrono::milliseconds(systickDelta);
+
+  auto dp = date::floor<date::days>(currentDateTime);
+  auto time = date::make_time(currentDateTime-dp);
+  auto yearMonthDay = date::year_month_day(dp);
+
+  year = (int)yearMonthDay.year();
+  month = static_cast<Months>((unsigned)yearMonthDay.month());
+  day = (unsigned)yearMonthDay.day();
+  dayOfWeek = static_cast<Days>(date::weekday(yearMonthDay).iso_encoding());
+
+  hour = time.hours().count();
+  minute = time.minutes().count();
+  second = time.seconds().count();
 }