diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/alarm/AlarmController.cpp | 10 | ||||
| -rw-r--r-- | src/sdk_config.h | 6 |
2 files changed, 5 insertions, 11 deletions
diff --git a/src/components/alarm/AlarmController.cpp b/src/components/alarm/AlarmController.cpp index 46baa02..4c65fcb 100644 --- a/src/components/alarm/AlarmController.cpp +++ b/src/components/alarm/AlarmController.cpp @@ -28,21 +28,15 @@ AlarmController::AlarmController(Controllers::DateTime& dateTimeController) : da } namespace { - void SetOffAlarmCallback(TimerHandle_t xTimer) { + void SetOffAlarm(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) { - controller->SetOffAlarmNow(); - } - } } void AlarmController::Init(System::SystemTask* systemTask) { // app_timer_create(&alarmAppTimer, APP_TIMER_MODE_SINGLE_SHOT, SetOffAlarm); - alarmAppTimer = xTimerCreate("alarmAppTm", 1, pdFALSE, this, SetOffAlarmCallback); + alarmAppTimer = xTimerCreate("alarmAppTm", 1, pdFALSE, this, SetOffAlarm); this->systemTask = systemTask; } diff --git a/src/sdk_config.h b/src/sdk_config.h index f6896c3..7634dca 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 15 -// #endif +#ifndef APP_TIMER_CONFIG_OP_QUEUE_SIZE + #define APP_TIMER_CONFIG_OP_QUEUE_SIZE 10 +#endif // <q> APP_TIMER_CONFIG_USE_SCHEDULER - Enable scheduling app_timer events to app_scheduler |