diff options
author | Jeremy O'Brien <neutral@fastmail.com> | 2023-01-24 22:43:31 -0500 |
---|---|---|
committer | joeycastillo <joeycastillo@utexas.edu> | 2023-01-25 09:23:50 -0600 |
commit | 2b22ecc8e43cc21c56d82ee3f89f32dd7b6b8e4a (patch) | |
tree | e8a40ebcd6d99ff2a32625ae219a822c770ff6d0 /movement/watch_faces/sensor | |
parent | 12f2d31f98cfc81d1e4ab9365c47aa3038dce4a7 (diff) | |
download | Sensor-Watch-2b22ecc8e43cc21c56d82ee3f89f32dd7b6b8e4a.tar.gz Sensor-Watch-2b22ecc8e43cc21c56d82ee3f89f32dd7b6b8e4a.tar.bz2 Sensor-Watch-2b22ecc8e43cc21c56d82ee3f89f32dd7b6b8e4a.zip |
add default loop handler to all current watch faces
Diffstat (limited to 'movement/watch_faces/sensor')
4 files changed, 4 insertions, 15 deletions
diff --git a/movement/watch_faces/sensor/accelerometer_data_acquisition_face.c b/movement/watch_faces/sensor/accelerometer_data_acquisition_face.c index 9da8b35c..80f09f7c 100644 --- a/movement/watch_faces/sensor/accelerometer_data_acquisition_face.c +++ b/movement/watch_faces/sensor/accelerometer_data_acquisition_face.c @@ -159,9 +159,6 @@ bool accelerometer_data_acquisition_face_loop(movement_event_t event, movement_s break; } break; - case EVENT_MODE_BUTTON_UP: - movement_move_to_next_face(); - break; case EVENT_LIGHT_BUTTON_UP: switch (state->mode) { case ACCELEROMETER_DATA_ACQUISITION_MODE_IDLE: @@ -218,6 +215,7 @@ bool accelerometer_data_acquisition_face_loop(movement_event_t event, movement_s } break; default: + movement_default_loop_handler(event, settings); break; } diff --git a/movement/watch_faces/sensor/thermistor_logging_face.c b/movement/watch_faces/sensor/thermistor_logging_face.c index 40c40027..64f605e9 100644 --- a/movement/watch_faces/sensor/thermistor_logging_face.c +++ b/movement/watch_faces/sensor/thermistor_logging_face.c @@ -94,9 +94,6 @@ bool thermistor_logging_face_loop(movement_event_t event, movement_settings_t *s case EVENT_TIMEOUT: movement_move_to_face(0); break; - case EVENT_MODE_BUTTON_UP: - movement_move_to_next_face(); - break; case EVENT_LIGHT_LONG_PRESS: // light button shows the timestamp, but if you need the light, long press it. movement_illuminate_led(); @@ -121,6 +118,7 @@ bool thermistor_logging_face_loop(movement_event_t event, movement_settings_t *s _thermistor_logging_face_log_data(logger_state); break; default: + movement_default_loop_handler(event, settings); break; } diff --git a/movement/watch_faces/sensor/thermistor_readout_face.c b/movement/watch_faces/sensor/thermistor_readout_face.c index 28106022..8a78f73a 100644 --- a/movement/watch_faces/sensor/thermistor_readout_face.c +++ b/movement/watch_faces/sensor/thermistor_readout_face.c @@ -57,12 +57,6 @@ bool thermistor_readout_face_loop(movement_event_t event, movement_settings_t *s (void) context; watch_date_time date_time = watch_rtc_get_date_time(); 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_ALARM_BUTTON_DOWN: settings->bit.use_imperial_units = !settings->bit.use_imperial_units; _thermistor_readout_face_update_display(settings->bit.use_imperial_units); @@ -86,6 +80,7 @@ bool thermistor_readout_face_loop(movement_event_t event, movement_settings_t *s watch_display_string("TE SLEEP ", 0); break; default: + movement_default_loop_handler(event, settings); break; } diff --git a/movement/watch_faces/sensor/thermistor_testing_face.c b/movement/watch_faces/sensor/thermistor_testing_face.c index f50e0567..2910fbd9 100644 --- a/movement/watch_faces/sensor/thermistor_testing_face.c +++ b/movement/watch_faces/sensor/thermistor_testing_face.c @@ -64,9 +64,6 @@ void thermistor_testing_face_activate(movement_settings_t *settings, void *conte bool thermistor_testing_face_loop(movement_event_t event, movement_settings_t *settings, void *context) { (void) context; switch (event.event_type) { - case EVENT_MODE_BUTTON_UP: - movement_move_to_next_face(); - break; case EVENT_ALARM_BUTTON_DOWN: settings->bit.use_imperial_units = !settings->bit.use_imperial_units; _thermistor_testing_face_update_display(settings->bit.use_imperial_units); @@ -76,6 +73,7 @@ bool thermistor_testing_face_loop(movement_event_t event, movement_settings_t *s _thermistor_testing_face_update_display(settings->bit.use_imperial_units); break; default: + movement_default_loop_handler(event, settings); break; } |