sans alarm

3 files changed, 0 insertions, 19 deletions

diff --git a/src/systemtask/Messages.h b/src/systemtask/Messages.h
index 20af7d3..4e818d0 100644
--- a/src/systemtask/Messages.h
+++ b/src/systemtask/Messages.h
@@ -23,7 +23,6 @@ namespace Pinetime {
         OnNewHour,
         OnNewHalfHour,
         OnChargingEvent,
-        SetOffAlarm,
         StopRinging,
         MeasureBatteryTimerExpired,
         BatteryPercentageUpdated,
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index c1f178f..68fc8f0 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -55,7 +55,6 @@ SystemTask::SystemTask(Drivers::SpiMaster& spi,
                        Controllers::Battery& batteryController,
                        Controllers::Ble& bleController,
                        Controllers::DateTime& dateTimeController,
-                       Controllers::AlarmController& alarmController,
                        Drivers::Watchdog& watchdog,
                        Pinetime::Controllers::NotificationManager& notificationManager,
                        Pinetime::Controllers::MotorController& motorController,
@@ -74,7 +73,6 @@ SystemTask::SystemTask(Drivers::SpiMaster& spi,
     batteryController {batteryController},
     bleController {bleController},
     dateTimeController {dateTimeController},
-    alarmController {alarmController},
     watchdog {watchdog},
     notificationManager {notificationManager},
     motorController {motorController},
@@ -134,7 +132,6 @@ void SystemTask::Work() {
   batteryController.Register(this);
   motorController.Init();
   motionSensor.SoftReset();
-  alarmController.Init(this);
 
   // Reset the TWI device because the motion sensor chip most probably crashed it...
   twiMaster.Sleep();
@@ -263,9 +260,6 @@ void SystemTask::Work() {
         case Messages::OnNewTime:
           ReloadIdleTimer();
           displayApp.PushMessage(Pinetime::Applications::Display::Messages::UpdateDateTime);
-          if (alarmController.State() == Controllers::AlarmController::AlarmState::Set) {
-            alarmController.ScheduleAlarm();
-          }
           break;
         case Messages::OnNewNotification:
           if (settingsController.GetNotificationStatus() == Pinetime::Controllers::Settings::Notification::ON) {
@@ -277,13 +271,6 @@ void SystemTask::Work() {
             displayApp.PushMessage(Pinetime::Applications::Display::Messages::NewNotification);
           }
           break;
-        case Messages::SetOffAlarm:
-          if (isSleeping && !isWakingUp) {
-            GoToRunning();
-          }
-          motorController.StartRinging();
-          displayApp.PushMessage(Pinetime::Applications::Display::Messages::AlarmTriggered);
-          break;
         case Messages::StopRinging:
           motorController.StopRinging();
           break;
@@ -355,10 +342,8 @@ void SystemTask::Work() {
           stepCounterMustBeReset = true;
           break;
         case Messages::OnNewHour:
-          using Pinetime::Controllers::AlarmController;
           break;
         case Messages::OnNewHalfHour:
-          using Pinetime::Controllers::AlarmController;
           break;
         case Messages::OnChargingEvent:
           batteryController.ReadPowerState();
diff --git a/src/systemtask/SystemTask.h b/src/systemtask/SystemTask.h
index 8fc48f1..600d13e 100644
--- a/src/systemtask/SystemTask.h
+++ b/src/systemtask/SystemTask.h
@@ -15,7 +15,6 @@
 #include "components/ble/NimbleController.h"
 #include "components/ble/NotificationManager.h"
 #include "components/motor/MotorController.h"
-#include "components/alarm/AlarmController.h"
 #include "touchhandler/TouchHandler.h"
 #include "buttonhandler/ButtonHandler.h"
 #include "buttonhandler/ButtonActions.h"
@@ -58,7 +57,6 @@ namespace Pinetime {
                  Controllers::Battery& batteryController,
                  Controllers::Ble& bleController,
                  Controllers::DateTime& dateTimeController,
-                 Controllers::AlarmController& alarmController,
                  Drivers::Watchdog& watchdog,
                  Pinetime::Controllers::NotificationManager& notificationManager,
                  Pinetime::Controllers::MotorController& motorController,
@@ -98,7 +96,6 @@ namespace Pinetime {
 
       Pinetime::Controllers::Ble& bleController;
       Pinetime::Controllers::DateTime& dateTimeController;
-      Pinetime::Controllers::AlarmController& alarmController;
       QueueHandle_t systemTasksMsgQueue;
       std::atomic<bool> isSleeping {false};
       std::atomic<bool> isGoingToSleep {false};