aboutsummaryrefslogtreecommitdiffstats
path: root/src/systemtask
diff options
context:
space:
mode:
authorRiku Isokoski <riksu9000@gmail.com>2023-02-27 15:40:43 +0200
committerRiku Isokoski <riksu9000@gmail.com>2023-04-16 14:33:23 +0000
commit661ffbeb1eea68ec0cd63b4db537515f1d1772c8 (patch)
tree415631431e5eba55b0d07ed1184359bdad07faa4 /src/systemtask
parent4d93ae6d27a94fe2a3c03b8f09bff2e23da30e12 (diff)
TimerController: Make TimerController reusable
TimerController instance was moved to DisplayApp.
Diffstat (limited to 'src/systemtask')
-rw-r--r--src/systemtask/Messages.h1
-rw-r--r--src/systemtask/SystemTask.cpp9
-rw-r--r--src/systemtask/SystemTask.h3
3 files changed, 0 insertions, 13 deletions
diff --git a/src/systemtask/Messages.h b/src/systemtask/Messages.h
index d92755b7..81be9151 100644
--- a/src/systemtask/Messages.h
+++ b/src/systemtask/Messages.h
@@ -9,7 +9,6 @@ namespace Pinetime {
TouchWakeUp,
OnNewTime,
OnNewNotification,
- OnTimerDone,
OnNewCall,
BleConnected,
BleFirmwareUpdateStarted,
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 9dac95ee..0621c6ef 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -39,7 +39,6 @@ SystemTask::SystemTask(Drivers::SpiMaster& spi,
Controllers::Battery& batteryController,
Controllers::Ble& bleController,
Controllers::DateTime& dateTimeController,
- Controllers::TimerController& timerController,
Controllers::AlarmController& alarmController,
Drivers::Watchdog& watchdog,
Pinetime::Controllers::NotificationManager& notificationManager,
@@ -60,7 +59,6 @@ SystemTask::SystemTask(Drivers::SpiMaster& spi,
batteryController {batteryController},
bleController {bleController},
dateTimeController {dateTimeController},
- timerController {timerController},
alarmController {alarmController},
watchdog {watchdog},
notificationManager {notificationManager},
@@ -127,7 +125,6 @@ void SystemTask::Work() {
dateTimeController.Register(this);
batteryController.Register(this);
motionSensor.SoftReset();
- timerController.Init(this);
alarmController.Init(this);
// Reset the TWI device because the motion sensor chip most probably crashed it...
@@ -256,12 +253,6 @@ void SystemTask::Work() {
displayApp.PushMessage(Pinetime::Applications::Display::Messages::NewNotification);
}
break;
- case Messages::OnTimerDone:
- if (state == SystemTaskState::Sleeping) {
- GoToRunning();
- }
- displayApp.PushMessage(Pinetime::Applications::Display::Messages::TimerDone);
- break;
case Messages::SetOffAlarm:
if (state == SystemTaskState::Sleeping) {
GoToRunning();
diff --git a/src/systemtask/SystemTask.h b/src/systemtask/SystemTask.h
index 22d268be..79f1cf44 100644
--- a/src/systemtask/SystemTask.h
+++ b/src/systemtask/SystemTask.h
@@ -15,7 +15,6 @@
#include "systemtask/SystemMonitor.h"
#include "components/ble/NimbleController.h"
#include "components/ble/NotificationManager.h"
-#include "components/timer/TimerController.h"
#include "components/alarm/AlarmController.h"
#include "components/fs/FS.h"
#include "touchhandler/TouchHandler.h"
@@ -61,7 +60,6 @@ namespace Pinetime {
Controllers::Battery& batteryController,
Controllers::Ble& bleController,
Controllers::DateTime& dateTimeController,
- Controllers::TimerController& timerController,
Controllers::AlarmController& alarmController,
Drivers::Watchdog& watchdog,
Pinetime::Controllers::NotificationManager& notificationManager,
@@ -107,7 +105,6 @@ namespace Pinetime {
Pinetime::Controllers::Ble& bleController;
Pinetime::Controllers::DateTime& dateTimeController;
- Pinetime::Controllers::TimerController& timerController;
Pinetime::Controllers::AlarmController& alarmController;
QueueHandle_t systemTasksMsgQueue;
Pinetime::Drivers::Watchdog& watchdog;