summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichele Bini <michele.bini@gmail.com>2022-04-16 19:30:36 (GMT)
committerMichele Bini <michele.bini@gmail.com>2022-04-16 19:30:36 (GMT)
commitef830123ba6144ed253b4cf9fa8ec18c1b19c99a (patch)
treeceecaf4478e591cf80864e47751c22c897889ba5
parentea7ab274813982d0e55dd80d6609133fda417d54 (diff)
Protect OnStopRinging
-rw-r--r--src/components/alarm/AlarmController.h5
-rw-r--r--src/components/motor/MotorController.cpp1
2 files changed, 5 insertions, 1 deletions
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<MotorController*>(pvTimerGetTimerID(xTimer));
+
motorController->RunForDuration(50);
}