Merge PR #394 - keep LED lit while buttons held

Keeps the LED turned on while the user is interacting with the watch. Reviewed-by: Matheus Afonso Martins Moreira <[email protected]> GitHub-Pull-Request: #394
joeycastillo · Sep 7, 2024 · 99586f8 · 99586f8
2 parents b9dbc4e + 5f1a651
commit 99586f8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/movement/movement.c b/movement/movement.c
@@ -612,6 +612,17 @@ bool app_loop(void) {
         event.subsecond = movement_state.subsecond;
         // the first trip through the loop overrides the can_sleep state
         can_sleep = wf->loop(event, &movement_state.settings, watch_face_contexts[movement_state.current_face_idx]);
+
+        // Keep light on if user is still interacting with the watch.
+        if (movement_state.light_ticks > 0) {
+            switch (event.event_type) {
+                case EVENT_LIGHT_BUTTON_DOWN:
+                case EVENT_MODE_BUTTON_DOWN:
+                case EVENT_ALARM_BUTTON_DOWN:
+                    movement_illuminate_led();
+            }
+        }
+
         event.event_type = EVENT_NONE;
     }
 

diff --git a/watch-library/simulator/main.c b/watch-library/simulator/main.c
@@ -89,6 +89,7 @@ void main_loop_sleep(uint32_t ms) {
     main_loop_set_sleeping(true);
     emscripten_sleep(ms);
     main_loop_set_sleeping(false);
+    animation_frame_id = ANIMATION_FRAME_ID_INVALID;
 }
 
 bool main_loop_is_sleeping(void) {