Merge ../../InfiniTime into ultraredux

# Conflicts:
#	src/displayapp/screens/WatchFaceDigital.cpp

1 files changed, 3 insertions, 3 deletions

diff --git a/src/components/datetime/DateTimeController.cpp b/src/components/datetime/DateTimeController.cpp
index 3bfbdc7..8bf5fb9 100644
--- a/src/components/datetime/DateTimeController.cpp
+++ b/src/components/datetime/DateTimeController.cpp
@@ -89,12 +89,12 @@ void DateTime::UpdateTime(uint32_t systickCounter) {
     isHourAlreadyNotified = false;
   }
 
-  if ((minute == 0 || minute == 30) && !isHalfHourAlreadyNotified) {
+  if ((!(minute%5)) && !isHalfHourAlreadyNotified) {
     isHalfHourAlreadyNotified = true;
     if (systemTask != nullptr) {
-      systemTask->PushMessage(System::Messages::OnNewHalfHour);
+      systemTask->PushMessage(System::Messages::OnChime);
     }
-  } else if (minute != 0 && minute != 30) {
+  } else if (!!(minute%5)) {
     isHalfHourAlreadyNotified = false;
   }