Vibration scheduler

src/CMakeLists.txt

@@ -473,6 +473,7 @@ list(APPEND SOURCE_FILES
         components/settings/Settings.cpp
         components/timer/TimerController.cpp
         components/alarm/AlarmController.cpp
+        components/alert/AlertController.cpp
         components/fs/FS.cpp
         drivers/Cst816s.cpp
         FreeRTOS/port.c
@@ -539,6 +540,7 @@ list(APPEND RECOVERY_SOURCE_FILES
         components/settings/Settings.cpp
         components/timer/TimerController.cpp
         components/alarm/AlarmController.cpp
+        components/alert/AlertController.cpp
         drivers/Cst816s.cpp
         FreeRTOS/port.c
         FreeRTOS/port_cmsis_systick.c
@@ -655,6 +657,7 @@ set(INCLUDE_FILES
         components/settings/Settings.h
         components/timer/TimerController.h
         components/alarm/AlarmController.h
+        components/alert/AlertController.h
         drivers/Cst816s.h
         FreeRTOS/portmacro.h
         FreeRTOS/portmacro_cmsis.h

src/components/alarm/AlarmController.cpp

@@ -104,5 +104,5 @@ void AlarmController::StopAlerting() {
     // set next instance
     ScheduleAlarm();
   }
-  systemTask->PushMessage(System::Messages::StopRinging);
+  systemTask->PushMessage(System::Messages::StopAlarm);
 }

src/components/alert/AlertController.cpp

@@ -0,0 +1,74 @@
+#include "components/alert/AlertController.h"
+
+using namespace Pinetime::Controllers;
+using namespace Pinetime::Applications::Display;
+
+AlertController::AlertController(MotorController& motorController) : motorController {motorController} {
+}
+
+// return true if a change has happened
+bool AlertController::Update() {
+  if (motorController.IsVibrating())
+    return false;
+
+  bool ok = true;
+
+  if (phoneCallIsActive) {
+    ok = motorController.StartRinging(55);
+  } else if (timerIsActive) {
+    ok = motorController.StartRinging(50);
+  } else if (alarmIsActive) {
+    ok = motorController.StartRinging(45);
+  } else if (notificationIsActive) {
+    ok = motorController.SingleVibration(40);
+  }
+
+  return ok;
+}
+
+Messages AlertController::DisplayMessage() const {
+  if (timerIsActive) {
+    return Messages::TimerDone;
+  } else if (alarmIsActive) {
+    return Messages::AlarmTriggered;
+  }
+
+  return Messages::NewNotification;
+}
+
+void AlertController::ActivatePhoneCall() {
+  phoneCallIsActive = true;
+};
+
+void AlertController::ActivateTimer() {
+  timerIsActive = true;
+};
+
+void AlertController::ActivateAlarm() {
+  alarmIsActive = true;
+};
+
+void AlertController::ActivateNotification() {
+  notificationIsActive = true;
+};
+
+void AlertController::DeactivatePhoneCall() {
+  if (phoneCallIsActive) {
+    motorController.StopRinging();
+  }
+  phoneCallIsActive = false;
+};
+
+void AlertController::DeactivateTimer() {
+  if (!phoneCallIsActive && timerIsActive) {
+    motorController.StopRinging();
+  }
+  timerIsActive = false;
+};
+
+void AlertController::DeactivateAlarm() {
+  if (!phoneCallIsActive && !timerIsActive && alarmIsActive) {
+    motorController.StopRinging();
+  }
+  alarmIsActive = false;
+};

src/components/alert/AlertController.h

@@ -0,0 +1,38 @@
+#pragma once
+
+#include "components/motor/MotorController.h"
+#include "displayapp/Messages.h"
+
+namespace Pinetime {
+  namespace Controllers {
+
+    class AlertController {
+    public:
+      AlertController(MotorController& motorController);
+
+      bool IsActive() const {
+        return phoneCallIsActive || timerIsActive || alarmIsActive || notificationIsActive;
+      }
+
+      void ActivatePhoneCall();
+      void ActivateTimer();
+      void ActivateAlarm();
+      void ActivateNotification();
+
+      void DeactivatePhoneCall();
+      void DeactivateTimer();
+      void DeactivateAlarm();
+
+      bool Update();
+      Pinetime::Applications::Display::Messages DisplayMessage() const;
+
+    private:
+      bool phoneCallIsActive = false;
+      bool timerIsActive = false;
+      bool alarmIsActive = false;
+      bool notificationIsActive = false;
+
+      MotorController& motorController;
+    };
+  }
+}

src/components/motor/MotorController.cpp

@@ -9,7 +9,7 @@ void MotorController::Init() {
   nrf_gpio_cfg_output(PinMap::Motor);
   nrf_gpio_pin_set(PinMap::Motor);
 
-  shortVib = xTimerCreate("shortVib", 1, pdFALSE, nullptr, StopMotor);
+  shortVib = xTimerCreate("shortVib", 1, pdFALSE, this, StopMotor);
   longVib = xTimerCreate("longVib", pdMS_TO_TICKS(1000), pdTRUE, this, Ring);
 }
 
@@ -20,20 +20,38 @@ void MotorController::Ring(TimerHandle_t xTimer) {
 
 void MotorController::RunForDuration(uint8_t motorDuration) {
   if (motorDuration > 0 && xTimerChangePeriod(shortVib, pdMS_TO_TICKS(motorDuration), 0) == pdPASS && xTimerStart(shortVib, 0) == pdPASS) {
+    isShortVibrating = true;
     nrf_gpio_pin_clear(PinMap::Motor);
   }
 }
 
-void MotorController::StartRinging() {
-  RunForDuration(50);
+bool MotorController::StartRinging(uint8_t Duration) {
+  if (IsVibrating()) {
+    return false;
+  }
+  isLongVibrating = true;
+  RunForDuration(Duration);
   xTimerStart(longVib, 0);
+  return true;
 }
 
 void MotorController::StopRinging() {
   xTimerStop(longVib, 0);
   nrf_gpio_pin_set(PinMap::Motor);
+  isLongVibrating = false;
 }
 
 void MotorController::StopMotor(TimerHandle_t xTimer) {
+  auto* motorController = static_cast<MotorController*>(pvTimerGetTimerID(xTimer));
   nrf_gpio_pin_set(PinMap::Motor);
+  motorController->isShortVibrating = false;
+}
+
+// CAUTION: this one will not trigger a vibration if another one is already running!
+bool MotorController::SingleVibration(uint8_t Duration) {
+  if (IsVibrating()) {
+    return false;
+  }
+  RunForDuration(Duration);
+  return true;
 }

src/components/motor/MotorController.h

@@ -12,15 +12,28 @@ namespace Pinetime {
       MotorController() = default;
 
       void Init();
-      void RunForDuration(uint8_t motorDuration);
-      void StartRinging();
+
+      // SingleVibration and StartRinging do nothing when a vibration is already running.
+      // they return false in this case.
+      // if everything went good they return true.
+      bool SingleVibration(uint8_t Duration);
+      bool StartRinging(uint8_t Duration);
       void StopRinging();
 
+      bool IsVibrating() {
+        return isShortVibrating || isLongVibrating;
+      };
+
     private:
+      void RunForDuration(uint8_t motorDuration);
+
       static void Ring(TimerHandle_t xTimer);
       static void StopMotor(TimerHandle_t xTimer);
       TimerHandle_t shortVib;
       TimerHandle_t longVib;
+
+      bool isShortVibrating = false;
+      bool isLongVibrating = false;
     };
   }
 }

src/displayapp/DisplayApp.cpp

@@ -74,6 +74,7 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
                        Pinetime::Controllers::MotionController& motionController,
                        Pinetime::Controllers::TimerController& timerController,
                        Pinetime::Controllers::AlarmController& alarmController,
+                       Pinetime::Controllers::AlertController& alertController,
                        Pinetime::Controllers::BrightnessController& brightnessController,
                        Pinetime::Controllers::TouchHandler& touchHandler,
                        Pinetime::Controllers::FS& filesystem)
@@ -91,6 +92,7 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
     motionController {motionController},
     timerController {timerController},
     alarmController {alarmController},
+    alertController {alertController},
     brightnessController {brightnessController},
     touchHandler {touchHandler},
     filesystem {filesystem} {
@@ -384,6 +386,7 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
                                                                notificationManager,
                                                                systemTask->nimble().alertService(),
                                                                motorController,
+                                                               alertController,
                                                                *systemTask,
                                                                Screens::Notifications::Modes::Normal);
       break;
@@ -392,6 +395,7 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
                                                                notificationManager,
                                                                systemTask->nimble().alertService(),
                                                                motorController,
+                                                               alertController,
                                                                *systemTask,
                                                                Screens::Notifications::Modes::Preview);
       break;

src/displayapp/DisplayApp.h

@@ -15,6 +15,7 @@
 #include "displayapp/screens/Screen.h"
 #include "components/timer/TimerController.h"
 #include "components/alarm/AlarmController.h"
+#include "components/alert/AlertController.h"
 #include "touchhandler/TouchHandler.h"
 
 #include "displayapp/Messages.h"
@@ -65,6 +66,7 @@ namespace Pinetime {
                  Pinetime::Controllers::MotionController& motionController,
                  Pinetime::Controllers::TimerController& timerController,
                  Pinetime::Controllers::AlarmController& alarmController,
+                 Pinetime::Controllers::AlertController& alertController,
                  Pinetime::Controllers::BrightnessController& brightnessController,
                  Pinetime::Controllers::TouchHandler& touchHandler,
                  Pinetime::Controllers::FS& filesystem);
@@ -93,6 +95,7 @@ namespace Pinetime {
       Pinetime::Controllers::MotionController& motionController;
       Pinetime::Controllers::TimerController& timerController;
       Pinetime::Controllers::AlarmController& alarmController;
+      Pinetime::Controllers::AlertController& alertController;
       Pinetime::Controllers::BrightnessController& brightnessController;
       Pinetime::Controllers::TouchHandler& touchHandler;
       Pinetime::Controllers::FS& filesystem;

src/displayapp/DisplayAppRecovery.cpp

@@ -24,6 +24,7 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
                        Pinetime::Controllers::MotionController& motionController,
                        Pinetime::Controllers::TimerController& timerController,
                        Pinetime::Controllers::AlarmController& alarmController,
+                       Pinetime::Controllers::AlertController& alertController,
                        Pinetime::Controllers::BrightnessController& brightnessController,
                        Pinetime::Controllers::TouchHandler& touchHandler,
                        Pinetime::Controllers::FS& filesystem)

src/displayapp/DisplayAppRecovery.h

@@ -10,6 +10,7 @@
 #include <date/date.h>
 #include <drivers/Watchdog.h>
 #include <components/motor/MotorController.h>
+#include <components/alert/AlertController.h>
 #include "BootErrors.h"
 #include "displayapp/TouchEvents.h"
 #include "displayapp/Apps.h"
@@ -60,6 +61,7 @@ namespace Pinetime {
                  Pinetime::Controllers::MotionController& motionController,
                  Pinetime::Controllers::TimerController& timerController,
                  Pinetime::Controllers::AlarmController& alarmController,
+                 Pinetime::Controllers::AlertController& alertController,
                  Pinetime::Controllers::BrightnessController& brightnessController,
                  Pinetime::Controllers::TouchHandler& touchHandler,
                  Pinetime::Controllers::FS& filesystem);

src/displayapp/screens/InfiniPaint.cpp

@@ -54,7 +54,7 @@ bool InfiniPaint::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
       }
 
       std::fill(b, b + bufferSize, selectColor);
-      motor.RunForDuration(35);
+      motor.SingleVibration(35);
       return true;
     default:
       return true;

src/displayapp/screens/Metronome.cpp

@@ -83,9 +83,9 @@ void Metronome::Refresh() {
       counter--;
       if (counter == 0) {
         counter = bpb;
-        motorController.RunForDuration(90);
+        motorController.SingleVibration(90);
       } else {
-        motorController.RunForDuration(30);
+        motorController.SingleVibration(30);
       }
     }
   }