Merge ../../InfiniTime into ultraredux

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

2 files changed, 16 insertions, 2 deletions

diff --git a/src/systemtask/Messages.h b/src/systemtask/Messages.h
index 4e818d0..c2a18e2 100644
--- a/src/systemtask/Messages.h
+++ b/src/systemtask/Messages.h
@@ -21,7 +21,7 @@ namespace Pinetime {
         DisableSleeping,
         OnNewDay,
         OnNewHour,
-        OnNewHalfHour,
+        OnChime,
         OnChargingEvent,
         StopRinging,
         MeasureBatteryTimerExpired,
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 8f76d8e..7a0d151 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -343,8 +343,22 @@ void SystemTask::Work() {
           stepCounterMustBeReset = true;
           break;
         case Messages::OnNewHour:
+          if (settingsController.GetChimeOption() == Controllers::Settings::ChimesOption::Hours) {
+            if (isSleeping && !isWakingUp) {
+              GoToRunning();
+              displayApp.PushMessage(Pinetime::Applications::Display::Messages::Clock);
+            }
+            motorController.RunForDuration(22);
+          }
           break;
-        case Messages::OnNewHalfHour:
+        case Messages::OnChime:
+          if (settingsController.GetChimeOption() == Controllers::Settings::ChimesOption::HalfHours) {
+            if (false && isSleeping && !isWakingUp) {
+              GoToRunning();
+              displayApp.PushMessage(Pinetime::Applications::Display::Messages::Clock);
+            }
+            motorController.RunForDuration(11);
+          }
           break;
         case Messages::OnChargingEvent:
           batteryController.ReadPowerState();