Keep screen on during timer buzzing

This prevents the motorController from buzzing infinitely while the watch is sleeping.
InfiniTimeOrg · Feb 14, 2025 · 44389c6 · 44389c6
1 parent 7e368b5
commit 44389c6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/displayapp/screens/Timer.cpp b/src/displayapp/screens/Timer.cpp
@@ -17,8 +17,8 @@ static void btnEventHandler(lv_obj_t* obj, lv_event_t event) {
   }
 }
 
-Timer::Timer(Controllers::Timer& timerController, Controllers::MotorController& motorController)
-  : timer {timerController}, motorController {motorController} {
+Timer::Timer(Controllers::Timer& timerController, Controllers::MotorController& motorController, System::SystemTask& systemTask)
+  : timer {timerController}, motorController {motorController}, wakeLock(systemTask) {
 
   lv_obj_t* colonLabel = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(colonLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
@@ -108,9 +108,15 @@ void Timer::UpdateMask() {
 void Timer::Refresh() {
   if (isRinging) {
     DisplayTime();
-    // Stop buzzing after 10 seconds, but continue the counter
-    if (motorController.IsRinging() && displaySeconds.Get().count() > 10) {
-      motorController.StopRinging();
+    if (motorController.IsRinging()) {
+      if (displaySeconds.Get().count() > 10) {
+        // Stop buzzing after 10 seconds, but continue the counter
+        motorController.StopRinging();
+        wakeLock.Release();
+      } else {
+        // Keep the screen awake during the first 10 seconds
+        wakeLock.Lock();
+      }
     }
     // Reset timer after 1 minute
     if (displaySeconds.Get().count() > 60) {

diff --git a/src/displayapp/screens/Timer.h b/src/displayapp/screens/Timer.h
@@ -3,6 +3,7 @@
 #include "displayapp/screens/Screen.h"
 #include "components/motor/MotorController.h"
 #include "systemtask/SystemTask.h"
+#include "systemtask/WakeLock.h"
 #include "displayapp/LittleVgl.h"
 #include "displayapp/widgets/Counter.h"
 #include "utility/DirtyValue.h"
@@ -15,7 +16,7 @@ namespace Pinetime::Applications {
   namespace Screens {
     class Timer : public Screen {
     public:
-      Timer(Controllers::Timer& timerController, Controllers::MotorController& motorController);
+      Timer(Controllers::Timer& timerController, Controllers::MotorController& motorController, System::SystemTask& systemTask);
       ~Timer() override;
       void Refresh() override;
       void Reset();
@@ -32,6 +33,8 @@ namespace Pinetime::Applications {
       Pinetime::Controllers::Timer& timer;
       Pinetime::Controllers::MotorController& motorController;
 
+      Pinetime::System::WakeLock wakeLock;
+
       lv_obj_t* btnPlayPause;
       lv_obj_t* txtPlayPause;
 
@@ -58,7 +61,7 @@ namespace Pinetime::Applications {
     static constexpr const char* icon = Screens::Symbols::hourGlass;
 
     static Screens::Screen* Create(AppControllers& controllers) {
-      return new Screens::Timer(controllers.timer, controllers.motorController);
+      return new Screens::Timer(controllers.timer, controllers.motorController, *controllers.systemTask);
     };
   };
 }