diff options
| author | joeycastillo <joeycastillo@utexas.edu> | 2022-10-11 23:14:59 -0500 |
|---|---|---|
| committer | joeycastillo <joeycastillo@utexas.edu> | 2022-10-11 23:14:59 -0500 |
| commit | 4de51740fb22d702610072019ee11371191c2d65 (patch) | |
| tree | 1847dabac1cb4ed3d15fc0ef449428e3a67a8ca3 | |
| parent | 79ff361f06e0693114a33d1613feb81d4c2ff624 (diff) | |
| download | Sensor-Watch-4de51740fb22d702610072019ee11371191c2d65.tar.gz Sensor-Watch-4de51740fb22d702610072019ee11371191c2d65.tar.bz2 Sensor-Watch-4de51740fb22d702610072019ee11371191c2d65.zip | |
don't sleep on watch face change
| -rw-r--r-- | movement/movement.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/movement/movement.c b/movement/movement.c index 3d8fac01..c70e1aaa 100644 --- a/movement/movement.c +++ b/movement/movement.c @@ -413,9 +413,11 @@ bool app_loop(void) { // 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.current_watch_face > 0 && movement_state.current_watch_face == movement_state.next_watch_face) { + if (event.event_type == EVENT_MODE_LONG_PRESS + && movement_state.current_watch_face > 0 + && movement_state.current_watch_face == movement_state.next_watch_face) { movement_move_to_face(0); - can_sleep = false; + movement_state.watch_face_changed = true; } event.event_type = EVENT_NONE; } @@ -481,7 +483,13 @@ bool app_loop(void) { event.subsecond = 0; - return can_sleep && (movement_state.light_ticks == -1) && !movement_state.is_buzzing; + // if the watch face changed, we can't sleep because we need to update the display. + if (movement_state.watch_face_changed) can_sleep = false; + + // if the buzzer or the LED is on, we need to stay awake to keep the TCC running. + if (movement_state.is_buzzing || movement_state.light_ticks != -1) can_sleep = false; + + return can_sleep; } static movement_event_type_t _figure_out_button_event(bool pin_level, movement_event_type_t button_down_event_type, uint8_t *down_timestamp) { |