From 1d7576de64a33837434e6f414a74ae7dbe929196 Mon Sep 17 00:00:00 2001 From: Jean-François Milants Date: Fri, 2 Apr 2021 17:33:49 +0200 Subject: Reset the step count every day at midnight. --- src/components/datetime/DateTimeController.cpp | 13 +++++++++++++ src/components/datetime/DateTimeController.h | 8 ++++++++ 2 files changed, 21 insertions(+) (limited to 'src/components') diff --git a/src/components/datetime/DateTimeController.cpp b/src/components/datetime/DateTimeController.cpp index 59982477..9c1f2684 100644 --- a/src/components/datetime/DateTimeController.cpp +++ b/src/components/datetime/DateTimeController.cpp @@ -1,9 +1,14 @@ #include "DateTimeController.h" #include #include +#include using namespace Pinetime::Controllers; +DateTime::DateTime(System::SystemTask& systemTask) : systemTask{systemTask} { + +} + 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) { @@ -62,6 +67,14 @@ void DateTime::UpdateTime(uint32_t systickCounter) { hour = time.hours().count(); minute = time.minutes().count(); second = time.seconds().count(); + + // Notify new day to SystemTask + if(hour == 0 and not isMidnightAlreadyNotified) { + isMidnightAlreadyNotified = true; + systemTask.PushMessage(System::SystemTask::Messages::OnNewDay); + } else if (hour != 0) { + isMidnightAlreadyNotified = false; + } } const char *DateTime::MonthShortToString() { diff --git a/src/components/datetime/DateTimeController.h b/src/components/datetime/DateTimeController.h index 16bb59c9..fb0969d1 100644 --- a/src/components/datetime/DateTimeController.h +++ b/src/components/datetime/DateTimeController.h @@ -4,12 +4,17 @@ #include namespace Pinetime { + namespace System { + class SystemTask; + } 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}; + DateTime(System::SystemTask& systemTask); + 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; } @@ -31,6 +36,7 @@ namespace Pinetime { std::chrono::time_point CurrentDateTime() const { return currentDateTime; } std::chrono::seconds Uptime() const { return uptime; } private: + System::SystemTask& systemTask; uint16_t year = 0; Months month = Months::Unknown; uint8_t day = 0; @@ -43,6 +49,8 @@ namespace Pinetime { std::chrono::time_point currentDateTime; std::chrono::seconds uptime {0}; + bool isMidnightAlreadyNotified = false; + static char const *DaysString[]; static char const *DaysStringShort[]; static char const *DaysStringLow[]; -- cgit v1.2.3-70-g09d2