From 70964357388096ab64c07c5d6f6944fc34c70059 Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Sat, 5 Feb 2022 14:05:33 -0500 Subject: sunrise/sunset: improve timeout behavior --- movement/watch_faces/complication/sunrise_sunset_face.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'movement/watch_faces/complication/sunrise_sunset_face.c') diff --git a/movement/watch_faces/complication/sunrise_sunset_face.c b/movement/watch_faces/complication/sunrise_sunset_face.c index f3489ba4..56565cda 100644 --- a/movement/watch_faces/complication/sunrise_sunset_face.c +++ b/movement/watch_faces/complication/sunrise_sunset_face.c @@ -321,15 +321,21 @@ bool sunrise_sunset_face_loop(movement_event_t event, movement_settings_t *setti case EVENT_ALARM_LONG_PRESS: if (state->page == 0) { state->page++; + state->active_digit = 0; watch_clear_display(); movement_request_tick_frequency(4); _sunrise_sunset_face_update_settings_display(event, context); } break; case EVENT_TIMEOUT: - if (state->page != 0) { - movement_move_to_face(0); + if (state->page || state->rise_index) { + // on timeout, exit settings mode and return to the next sunrise or sunset + state->page = 0; + state->rise_index = 0; + movement_request_tick_frequency(1); + _sunrise_sunset_face_update(settings, state); } + break; default: break; } -- cgit v1.2.3