summaryrefslogtreecommitdiff
path: root/src/Components/DateTime
diff options
context:
space:
mode:
Diffstat (limited to 'src/Components/DateTime')
-rw-r--r--src/Components/DateTime/DateTimeController.cpp66
-rw-r--r--src/Components/DateTime/DateTimeController.h39
2 files changed, 0 insertions, 105 deletions
diff --git a/src/Components/DateTime/DateTimeController.cpp b/src/Components/DateTime/DateTimeController.cpp
deleted file mode 100644
index 30d9c13..0000000
--- a/src/Components/DateTime/DateTimeController.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include "DateTimeController.h"
-#include <date/date.h>
-#include <libraries/log/nrf_log.h>
-
-using namespace Pinetime::Controllers;
-
-
-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) {
- std::tm tm = { /* .tm_sec = */ second,
- /* .tm_min = */ minute,
- /* .tm_hour = */ hour,
- /* .tm_mday = */ day,
- /* .tm_mon = */ month - 1,
- /* .tm_year = */ year - 1900,
- };
- tm.tm_isdst = -1; // Use DST value from local time zone
- currentDateTime = std::chrono::system_clock::from_time_t(std::mktime(&tm));
-
- 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) {
- // Handle systick counter overflow
- uint32_t systickDelta = 0;
- if(systickCounter < previousSystickCounter) {
- systickDelta = 0xffffff - previousSystickCounter;
- systickDelta += systickCounter + 1;
- } else {
- systickDelta = systickCounter - previousSystickCounter;
- }
-
- /*
- * 1000 ms = 1024 ticks
- */
- auto correctedDelta = systickDelta / 1024;
- auto rest = (systickDelta - (correctedDelta*1024));
- if(systickCounter >= rest) {
- previousSystickCounter = systickCounter - rest;
- } else {
- previousSystickCounter = 0xffffff - (rest - systickCounter);
- }
-
- currentDateTime += std::chrono::seconds(correctedDelta);
- uptime += std::chrono::seconds(correctedDelta);
-
- 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();
-}
-
diff --git a/src/Components/DateTime/DateTimeController.h b/src/Components/DateTime/DateTimeController.h
deleted file mode 100644
index d602074..0000000
--- a/src/Components/DateTime/DateTimeController.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <chrono>
-
-namespace Pinetime {
- namespace Controllers {
- class DateTime {
- public:
- enum class Days : uint8_t {Unknown, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday};
- enum class Months : uint8_t {Unknown, January, February, March, April, May, June, July, August, September, October, November, December};
-
- void 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);
- void UpdateTime(uint32_t systickCounter);
- uint16_t Year() const { return year; }
- Months Month() const { return month; }
- uint8_t Day() const { return day; }
- Days DayOfWeek() const { return dayOfWeek; }
- uint8_t Hours() const { return hour; }
- uint8_t Minutes() const { return minute; }
- 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;
- uint8_t day = 0;
- Days dayOfWeek = Days::Unknown;
- uint8_t hour = 0;
- uint8_t minute = 0;
- uint8_t second = 0;
-
- 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