New chimes engine

3 files changed, 12 insertions, 9 deletions

diff --git a/src/components/datetime/DateTimeController.cpp b/src/components/datetime/DateTimeController.cpp
index fbaa01b..01e2859 100644
--- a/src/components/datetime/DateTimeController.cpp
+++ b/src/components/datetime/DateTimeController.cpp
@@ -38,7 +38,7 @@ void DateTime::SetTime(
 
   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);
+  NRF_LOG_INFO("* %d %d %d ", this->day, ((int)this->month), this->year);
 
   systemTask->PushMessage(System::Messages::OnNewTime);
 }
@@ -82,15 +82,15 @@ 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
   if (hour == 0 and not isMidnightAlreadyNotified) {
     isMidnightAlreadyNotified = true;
diff --git a/src/components/datetime/DateTimeController.h b/src/components/datetime/DateTimeController.h
index 2126ca1..ca7320c 100644
--- a/src/components/datetime/DateTimeController.h
+++ b/src/components/datetime/DateTimeController.h
@@ -97,7 +97,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 2d5f1d5..b85b5b4 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,