From ef830123ba6144ed253b4cf9fa8ec18c1b19c99a Mon Sep 17 00:00:00 2001 From: Michele Bini Date: Sat, 16 Apr 2022 21:30:36 +0200 Subject: Protect OnStopRinging diff --git a/src/components/alarm/AlarmController.h b/src/components/alarm/AlarmController.h index d70dcc3..f4bfdd3 100644 --- a/src/components/alarm/AlarmController.h +++ b/src/components/alarm/AlarmController.h @@ -39,7 +39,6 @@ namespace Pinetime { void SetOffAlarmNow(); uint32_t SecondsToAlarm(); void StopAlerting(); - void OnStopRinging(); enum class AlarmState { Not_Set, Set, Alerting }; enum class RecurType { None, Daily, Weekdays }; uint8_t Hours() const { @@ -58,6 +57,10 @@ namespace Pinetime { recurrence = recurType; } + protected: + friend class Pinetime::System::SystemTask; + void OnStopRinging(); + private: Controllers::DateTime& dateTimeController; System::SystemTask* systemTask = nullptr; diff --git a/src/components/motor/MotorController.cpp b/src/components/motor/MotorController.cpp index 5ff549e..b895c83 100644 --- a/src/components/motor/MotorController.cpp +++ b/src/components/motor/MotorController.cpp @@ -19,6 +19,7 @@ void MotorController::Init() { void MotorController::Ring(TimerHandle_t xTimer) { auto motorController = static_cast(pvTimerGetTimerID(xTimer)); + motorController->RunForDuration(50); } -- cgit v0.10.2