From 5932391c8b2178cc0beed9f4c2b0aa4a24ac7e1f Mon Sep 17 00:00:00 2001 From: SteveAmor Date: Sun, 7 Nov 2021 10:50:33 +0000 Subject: Chimes option --- src/components/datetime/DateTimeController.cpp | 16 ++++++++++++++++ src/components/datetime/DateTimeController.h | 2 ++ 2 files changed, 18 insertions(+) (limited to 'src/components/datetime') diff --git a/src/components/datetime/DateTimeController.cpp b/src/components/datetime/DateTimeController.cpp index e9c5d870..2513e427 100644 --- a/src/components/datetime/DateTimeController.cpp +++ b/src/components/datetime/DateTimeController.cpp @@ -75,6 +75,22 @@ void DateTime::UpdateTime(uint32_t systickCounter) { minute = time.minutes().count(); second = time.seconds().count(); + if(minute == 0 and not isHourAlreadyNotified) { + isHourAlreadyNotified = true; + if(systemTask != nullptr) + systemTask->PushMessage(System::Messages::OnNewHour); + } else if (minute != 0) { + isHourAlreadyNotified = false; + } + + if((minute == 0 or minute == 30) and not isHalfHourAlreadyNotified) { + isHalfHourAlreadyNotified = true; + if(systemTask != nullptr) + systemTask->PushMessage(System::Messages::OnNewHalfHour); + } else if (minute != 0 and minute != 30) { + isHalfHourAlreadyNotified = false; + } + // Notify new day to SystemTask if (hour == 0 and not isMidnightAlreadyNotified) { isMidnightAlreadyNotified = true; diff --git a/src/components/datetime/DateTimeController.h b/src/components/datetime/DateTimeController.h index 77ed68e8..cbc80447 100644 --- a/src/components/datetime/DateTimeController.h +++ b/src/components/datetime/DateTimeController.h @@ -86,6 +86,8 @@ namespace Pinetime { std::chrono::seconds uptime {0}; bool isMidnightAlreadyNotified = false; + bool isHourAlreadyNotified = true; + bool isHalfHourAlreadyNotified = true; System::SystemTask* systemTask = nullptr; }; } -- cgit v1.2.3-70-g09d2 From 37de10f47dafc7207299e70843caba21c633081a Mon Sep 17 00:00:00 2001 From: SteveAmor Date: Sun, 7 Nov 2021 12:10:23 +0000 Subject: applied clang-format --- src/components/datetime/DateTimeController.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/components/datetime') diff --git a/src/components/datetime/DateTimeController.cpp b/src/components/datetime/DateTimeController.cpp index 2513e427..4e3076cd 100644 --- a/src/components/datetime/DateTimeController.cpp +++ b/src/components/datetime/DateTimeController.cpp @@ -75,17 +75,17 @@ void DateTime::UpdateTime(uint32_t systickCounter) { minute = time.minutes().count(); second = time.seconds().count(); - if(minute == 0 and not isHourAlreadyNotified) { + if (minute == 0 and not isHourAlreadyNotified) { isHourAlreadyNotified = true; - if(systemTask != nullptr) + if (systemTask != nullptr) systemTask->PushMessage(System::Messages::OnNewHour); } else if (minute != 0) { isHourAlreadyNotified = false; } - if((minute == 0 or minute == 30) and not isHalfHourAlreadyNotified) { + if ((minute == 0 or minute == 30) and not isHalfHourAlreadyNotified) { isHalfHourAlreadyNotified = true; - if(systemTask != nullptr) + if (systemTask != nullptr) systemTask->PushMessage(System::Messages::OnNewHalfHour); } else if (minute != 0 and minute != 30) { isHalfHourAlreadyNotified = false; @@ -116,4 +116,3 @@ const char* DateTime::MonthShortToStringLow(Months month) { void DateTime::Register(Pinetime::System::SystemTask* systemTask) { this->systemTask = systemTask; } - -- cgit v1.2.3-70-g09d2 From 822b6ae6a0305c20a02a3e6e79f6f58296d585d4 Mon Sep 17 00:00:00 2001 From: SteveAmor Date: Sun, 7 Nov 2021 13:12:01 +0000 Subject: format changes --- src/components/datetime/DateTimeController.cpp | 12 +++++++----- src/systemtask/SystemTask.cpp | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'src/components/datetime') diff --git a/src/components/datetime/DateTimeController.cpp b/src/components/datetime/DateTimeController.cpp index 4e3076cd..762cded4 100644 --- a/src/components/datetime/DateTimeController.cpp +++ b/src/components/datetime/DateTimeController.cpp @@ -75,19 +75,21 @@ void DateTime::UpdateTime(uint32_t systickCounter) { minute = time.minutes().count(); second = time.seconds().count(); - if (minute == 0 and not isHourAlreadyNotified) { + if (minute == 0 && !isHourAlreadyNotified) { isHourAlreadyNotified = true; - if (systemTask != nullptr) + if (systemTask != nullptr) { systemTask->PushMessage(System::Messages::OnNewHour); + } } else if (minute != 0) { isHourAlreadyNotified = false; } - if ((minute == 0 or minute == 30) and not isHalfHourAlreadyNotified) { + if ((minute == 0 || minute == 30) && !isHalfHourAlreadyNotified) { isHalfHourAlreadyNotified = true; - if (systemTask != nullptr) + if (systemTask != nullptr) { systemTask->PushMessage(System::Messages::OnNewHalfHour); - } else if (minute != 0 and minute != 30) { + } + } else if (minute != 0 && minute != 30) { isHalfHourAlreadyNotified = false; } diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp index 1e546e16..c48307af 100644 --- a/src/systemtask/SystemTask.cpp +++ b/src/systemtask/SystemTask.cpp @@ -354,7 +354,7 @@ void SystemTask::Work() { break; case Messages::OnNewHour: using Pinetime::Controllers::AlarmController; - if (settingsController.GetChimesState() == 1 and alarmController.State() != AlarmController::AlarmState::Alerting) { + if (settingsController.GetChimesState() == 1 && alarmController.State() != AlarmController::AlarmState::Alerting) { if (isSleeping && !isWakingUp) { GoToRunning(); displayApp.PushMessage(Pinetime::Applications::Display::Messages::Clock); @@ -364,7 +364,7 @@ void SystemTask::Work() { break; case Messages::OnNewHalfHour: using Pinetime::Controllers::AlarmController; - if (settingsController.GetChimesState() == 2 and alarmController.State() != AlarmController::AlarmState::Alerting) { + if (settingsController.GetChimesState() == 2 && alarmController.State() != AlarmController::AlarmState::Alerting) { if (isSleeping && !isWakingUp) { GoToRunning(); displayApp.PushMessage(Pinetime::Applications::Display::Messages::Clock); -- cgit v1.2.3-70-g09d2