Test code for missed alarm

3 files changed, 17 insertions, 9 deletions

diff --git a/src/components/alarm/AlarmController.cpp b/src/components/alarm/AlarmController.cpp
index 28b328d..46baa02 100644
--- a/src/components/alarm/AlarmController.cpp
+++ b/src/components/alarm/AlarmController.cpp
@@ -27,9 +27,11 @@ using namespace std::chrono_literals;
 AlarmController::AlarmController(Controllers::DateTime& dateTimeController) : dateTimeController {dateTimeController} {
 }
 
-APP_TIMER_DEF(alarmAppTimer);
-
 namespace {
+  void SetOffAlarmCallback(TimerHandle_t xTimer) {
+    auto controller = static_cast<Pinetime::Controllers::AlarmController*>(pvTimerGetTimerID(xTimer));
+    controller->SetOffAlarmNow();
+  }
   void SetOffAlarm(void* p_context) {
     auto* controller = static_cast<Pinetime::Controllers::AlarmController*>(p_context);
     if (controller != nullptr) {
@@ -39,7 +41,8 @@ namespace {
 }
 
 void AlarmController::Init(System::SystemTask* systemTask) {
-  app_timer_create(&alarmAppTimer, APP_TIMER_MODE_SINGLE_SHOT, SetOffAlarm);
+  // app_timer_create(&alarmAppTimer, APP_TIMER_MODE_SINGLE_SHOT, SetOffAlarm);
+  alarmAppTimer = xTimerCreate("alarmAppTm", 1, pdFALSE, this, SetOffAlarmCallback);
   this->systemTask = systemTask;
 }
 
@@ -50,7 +53,7 @@ void AlarmController::SetAlarmTime(uint8_t alarmHr, uint8_t alarmMin) {
 
 void AlarmController::ScheduleAlarm() {
   // Determine the next time the alarm needs to go off and set the app_timer
-  app_timer_stop(alarmAppTimer);
+  xTimerStop(alarmAppTimer, 0);
 
   auto now = dateTimeController.CurrentDateTime();
   alarmTime = now;
@@ -81,7 +84,9 @@ void AlarmController::ScheduleAlarm() {
   // now can convert back to a time_point
   alarmTime = std::chrono::system_clock::from_time_t(std::mktime(tmAlarmTime));
   auto mSecToAlarm = std::chrono::duration_cast<std::chrono::milliseconds>(alarmTime - now).count();
-  app_timer_start(alarmAppTimer, APP_TIMER_TICKS(mSecToAlarm), this);
+  // app_timer_start(alarmAppTimer, APP_TIMER_TICKS(mSecToAlarm), this, SetOffAlarm);
+  xTimerChangePeriod(alarmAppTimer, pdMS_TO_TICKS(mSecToAlarm), 0);
+  xTimerStart(alarmAppTimer, 0);
 
   state = AlarmState::Set;
 }
@@ -91,7 +96,7 @@ uint32_t AlarmController::SecondsToAlarm() {
 }
 
 void AlarmController::DisableAlarm() {
-  app_timer_stop(alarmAppTimer);
+  xTimerStop(alarmAppTimer, 0);
   state = AlarmState::Not_Set;
 }
 
diff --git a/src/components/alarm/AlarmController.h b/src/components/alarm/AlarmController.h
index f39fbde..fb33edb 100644
--- a/src/components/alarm/AlarmController.h
+++ b/src/components/alarm/AlarmController.h
@@ -17,6 +17,8 @@
 */
 #pragma once
 
+#include <FreeRTOS.h>
+#include <timers.h>
 #include <cstdint>
 #include "components/datetime/DateTimeController.h"
 
@@ -57,6 +59,7 @@ namespace Pinetime {
     private:
       Controllers::DateTime& dateTimeController;
       System::SystemTask* systemTask = nullptr;
+      TimerHandle_t alarmAppTimer;
       uint8_t hours = 7;
       uint8_t minutes = 0;
       std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> alarmTime;
diff --git a/src/sdk_config.h b/src/sdk_config.h
index 7634dca..f6896c3 100644
--- a/src/sdk_config.h
+++ b/src/sdk_config.h
@@ -6818,9 +6818,9 @@
 // <i> system latency. If queue size is too small app_timer calls
 // <i> will fail.
 
-#ifndef APP_TIMER_CONFIG_OP_QUEUE_SIZE
-  #define APP_TIMER_CONFIG_OP_QUEUE_SIZE 10
-#endif
+// #ifndef APP_TIMER_CONFIG_OP_QUEUE_SIZE
+#define APP_TIMER_CONFIG_OP_QUEUE_SIZE 15
+// #endif
 
 // <q> APP_TIMER_CONFIG_USE_SCHEDULER  - Enable scheduling app_timer events to app_scheduler