diff options
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/datetime/DateTimeController.cpp | 10 | ||||
| -rw-r--r-- | src/components/datetime/DateTimeController.h | 5 | ||||
| -rw-r--r-- | src/components/settings/Settings.h | 2 |
3 files changed, 10 insertions, 7 deletions
diff --git a/src/components/datetime/DateTimeController.cpp b/src/components/datetime/DateTimeController.cpp index 2656764..7545058 100644 --- a/src/components/datetime/DateTimeController.cpp +++ b/src/components/datetime/DateTimeController.cpp @@ -100,13 +100,13 @@ void DateTime::UpdateTime(uint32_t systickCounter) { isHourAlreadyNotified = false; } - if ((minute == 0 || minute == 30) && !isHalfHourAlreadyNotified) { - isHalfHourAlreadyNotified = true; + if (minute%chimePeriod) { + hasChimed = false; + } else if (!hasChimed) { if (systemTask != nullptr) { - systemTask->PushMessage(System::Messages::OnNewHalfHour); + systemTask->PushMessage(System::Messages::OnChime); + hasChimed = true; } - } else if (minute != 0 && minute != 30) { - isHalfHourAlreadyNotified = false; } // Notify new day to SystemTask diff --git a/src/components/datetime/DateTimeController.h b/src/components/datetime/DateTimeController.h index 00bbc2e..48fe2b1 100644 --- a/src/components/datetime/DateTimeController.h +++ b/src/components/datetime/DateTimeController.h @@ -91,7 +91,10 @@ namespace Pinetime { bool isMidnightAlreadyNotified = false; bool isHourAlreadyNotified = true; - bool isHalfHourAlreadyNotified = true; + bool hasChimed = true; + public: + uint8_t chimePeriod = 5; + private: System::SystemTask* systemTask = nullptr; Controllers::Settings& settingsController; }; diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h index cbba25e..5914e1a 100644 --- a/src/components/settings/Settings.h +++ b/src/components/settings/Settings.h @@ -10,7 +10,7 @@ namespace Pinetime { public: enum class ClockType : uint8_t { H24, H12 }; enum class Notification : uint8_t { ON, OFF }; - enum class ChimesOption : uint8_t { None, Hours, HalfHours }; + enum class ChimesOption : uint8_t { None, Hours, HalfHours, FiveMinutes }; enum class WakeUpMode : uint8_t { SingleTap = 0, DoubleTap = 1, |
