diff options
| author | Riku Isokoski <riksu9000@gmail.com> | 2023-02-25 10:25:38 +0200 |
|---|---|---|
| committer | Riku Isokoski <riksu9000@gmail.com> | 2023-02-25 12:15:00 +0200 |
| commit | 5ab255b26b4f23ca4b6fab2a660f8cf55fcda48b (patch) | |
| tree | 8f16b35829065bd633935f4e29d41843f0ef10f8 /src/systemtask/SystemTask.cpp | |
| parent | 255b07094b949b695829080c4709656d741d881b (diff) | |
SystemTask: Move MotorController to DisplayApp
Vibrations should be associated with something happening on the UI.
Therefore SystemTask should not be controlling the motor.
Diffstat (limited to 'src/systemtask/SystemTask.cpp')
| -rw-r--r-- | src/systemtask/SystemTask.cpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp index 2f29dc7a..49c30a9f 100644 --- a/src/systemtask/SystemTask.cpp +++ b/src/systemtask/SystemTask.cpp @@ -61,7 +61,6 @@ SystemTask::SystemTask(Drivers::SpiMaster& spi, Controllers::AlarmController& alarmController, Drivers::Watchdog& watchdog, Pinetime::Controllers::NotificationManager& notificationManager, - Pinetime::Controllers::MotorController& motorController, Pinetime::Drivers::Hrs3300& heartRateSensor, Pinetime::Controllers::MotionController& motionController, Pinetime::Drivers::Bma421& motionSensor, @@ -85,7 +84,6 @@ SystemTask::SystemTask(Drivers::SpiMaster& spi, alarmController {alarmController}, watchdog {watchdog}, notificationManager {notificationManager}, - motorController {motorController}, heartRateSensor {heartRateSensor}, motionSensor {motionSensor}, settingsController {settingsController}, @@ -149,7 +147,6 @@ void SystemTask::Work() { touchPanel.Init(); dateTimeController.Register(this); batteryController.Register(this); - motorController.Init(); motionSensor.SoftReset(); timerController.Init(this); alarmController.Init(this); @@ -295,19 +292,14 @@ void SystemTask::Work() { if (state == SystemTaskState::Sleeping) { GoToRunning(); } - motorController.RunForDuration(35); displayApp.PushMessage(Pinetime::Applications::Display::Messages::TimerDone); break; case Messages::SetOffAlarm: if (state == SystemTaskState::Sleeping) { GoToRunning(); } - motorController.StartRinging(); displayApp.PushMessage(Pinetime::Applications::Display::Messages::AlarmTriggered); break; - case Messages::StopRinging: - motorController.StopRinging(); - break; case Messages::BleConnected: ReloadIdleTimer(); isBleDiscoveryTimerRunning = true; @@ -394,9 +386,8 @@ void SystemTask::Work() { alarmController.State() != AlarmController::AlarmState::Alerting) { if (state == SystemTaskState::Sleeping) { GoToRunning(); - displayApp.PushMessage(Pinetime::Applications::Display::Messages::Clock); + displayApp.PushMessage(Pinetime::Applications::Display::Messages::Chime); } - motorController.RunForDuration(35); } break; case Messages::OnNewHalfHour: @@ -406,14 +397,13 @@ void SystemTask::Work() { alarmController.State() != AlarmController::AlarmState::Alerting) { if (state == SystemTaskState::Sleeping) { GoToRunning(); - displayApp.PushMessage(Pinetime::Applications::Display::Messages::Clock); + displayApp.PushMessage(Pinetime::Applications::Display::Messages::Chime); } - motorController.RunForDuration(35); } break; case Messages::OnChargingEvent: batteryController.ReadPowerState(); - motorController.RunForDuration(15); + displayApp.PushMessage(Applications::Display::Messages::OnChargingEvent); ReloadIdleTimer(); if (state == SystemTaskState::Sleeping) { GoToRunning(); @@ -439,7 +429,6 @@ void SystemTask::Work() { if (state == SystemTaskState::Sleeping) { GoToRunning(); } - motorController.RunForDuration(35); displayApp.PushMessage(Pinetime::Applications::Display::Messages::ShowPairingKey); break; case Messages::BleRadioEnableToggle: |