diff options
Diffstat (limited to 'movement/movement.c')
| -rw-r--r-- | movement/movement.c | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/movement/movement.c b/movement/movement.c index e9ec612f..1bb4a3af 100644 --- a/movement/movement.c +++ b/movement/movement.c @@ -219,6 +219,30 @@ void movement_illuminate_led(void) { } } +bool movement_default_loop_handler(movement_event_t event, movement_settings_t *settings) { + (void)settings; + + switch (event.event_type) { + case EVENT_MODE_BUTTON_UP: + movement_move_to_next_face(); + break; + case EVENT_LIGHT_BUTTON_DOWN: + movement_illuminate_led(); + break; + case EVENT_MODE_LONG_PRESS: + if (MOVEMENT_SECONDARY_FACE_INDEX && movement_state.current_watch_face == 0) { + movement_move_to_face(MOVEMENT_SECONDARY_FACE_INDEX); + } else { + movement_move_to_face(0); + } + break; + default: + break; + } + + return true; +} + void movement_move_to_face(uint8_t watch_face_index) { movement_state.watch_face_changed = true; movement_state.next_watch_face = watch_face_index; @@ -449,20 +473,6 @@ bool app_loop(void) { if (event.event_type) { event.subsecond = movement_state.subsecond; can_sleep = watch_faces[movement_state.current_watch_face].loop(event, &movement_state.settings, watch_face_contexts[movement_state.current_watch_face]); - - // Long-pressing MODE brings one back to the first face, provided that the watch face hasn't decided to send them elsewhere - // (and we're not currently on the first face). If we're currently on the first face, a long press - // of MODE sends us to the secondary faces (if defined). - // Note that it's the face's responsibility to provide some way to get to the next face, so if EVENT_MODE_BUTTON_* is - // used for face functionality EVENT_MODE_LONG_PRESS should probably be handled and next_face() triggered in the face - // (which would effectively disable the normal 'long press to face 0' behaviour). - if (event.event_type == EVENT_MODE_LONG_PRESS - && !movement_state.watch_face_changed) { - if (MOVEMENT_SECONDARY_FACE_INDEX && movement_state.current_watch_face == 0) { - movement_move_to_face(MOVEMENT_SECONDARY_FACE_INDEX); - } - } - event.event_type = EVENT_NONE; } // if we have timed out of our timeout countdown, give the app a hint that they can resign. |