hueso/Sensor-Watch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

add default loop handler to all current watch faces

Browse Source
This commit is contained in:
Jeremy O'Brien
2023-01-24 22:43:31 -05:00
committed by joeycastillo
parent 12f2d31f98
commit 2b22ecc8e4
40 changed files with 58 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
movement/watch_faces/demo/character_set_face.c
View File

@@ -45,12 +45,6 @@ bool character_set_face_loop(movement_event_t event, movement_settings_t *settin
char *c = (char *)context;
char buf[11];
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_UP:
*c = (*c) + 1;
if (*c & 0x80) *c = ' ';
@@ -63,6 +57,7 @@ bool character_set_face_loop(movement_event_t event, movement_settings_t *settin
movement_move_to_face(0);
break;
default:
movement_default_loop_handler(event, settings);
break;
}

7
movement/watch_faces/demo/demo_face.c
View File

@@ -65,12 +65,6 @@ bool demo_face_loop(movement_event_t event, movement_settings_t *settings, void
(void) settings;
demo_face_index_t *screen = (demo_face_index_t *)context;
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_UP:
*screen = ((*screen) + 1) % DEMO_FACE_NUM_FACES;
// fall through
@@ -129,6 +123,7 @@ bool demo_face_loop(movement_event_t event, movement_settings_t *settings, void
// ignore timeout
break;
default:
movement_default_loop_handler(event, settings);
break;
}

4
movement/watch_faces/demo/frequency_correction_face.c
View File

@@ -96,9 +96,6 @@ bool frequency_correction_face_loop(movement_event_t event, movement_settings_t
break;
case EVENT_TICK:
break;
case EVENT_MODE_BUTTON_UP:
movement_move_to_next_face();
break;
case EVENT_LIGHT_BUTTON_UP:
freqcorr = RTC->MODE2.FREQCORR.reg;
if (freqcorr < 127) {
@@ -126,6 +123,7 @@ bool frequency_correction_face_loop(movement_event_t event, movement_settings_t
watch_start_tick_animation(500);
break;
default:
movement_default_loop_handler(event, settings);
break;
}

14
movement/watch_faces/demo/hello_there_face.c
View File

@@ -66,18 +66,6 @@ bool hello_there_face_loop(movement_event_t event, movement_settings_t *settings
state->current_word = (state->current_word + 1) % 2;
}
break;
case EVENT_LIGHT_BUTTON_UP:
// when the user presses 'light', we illuminate the LED. We could override this if
// our UI needed an additional button for input, consuming the light button press
// but not illuminating the LED.
movement_illuminate_led();
break;
case EVENT_MODE_BUTTON_UP:
// when the user presses 'mode', we tell movement to move to the next watch face.
// movement will call our resign function, clear the screen, and transfer control
// to the next watch face in the list.
movement_move_to_next_face();
break;
case EVENT_ALARM_BUTTON_UP:
// when the user presses 'alarm', we toggle the state of the animation. If animating,
// we stop; if stopped, we resume.
@@ -97,7 +85,9 @@ bool hello_there_face_loop(movement_event_t event, movement_settings_t *settings
// and it will do it long before the watch enters low energy mode. This ensures we
// won't be on screen, and thus opts us out of getting the EVENT_LOW_ENERGY_UPDATE above.
movement_move_to_face(0);
break;
default:
movement_default_loop_handler(event, settings);
break;
}

7
movement/watch_faces/demo/lis2dw_logging_face.c
View File

@@ -146,12 +146,6 @@ bool lis2dw_logging_face_loop(movement_event_t event, movement_settings_t *setti
lis2dw_interrupt_source interrupt_source = 0;
switch (event.event_type) {
case EVENT_MODE_BUTTON_UP:
movement_move_to_next_face();
break;
case EVENT_LIGHT_LONG_PRESS:
movement_illuminate_led();
break;
case EVENT_LIGHT_BUTTON_DOWN:
logger_state->axis_index = (logger_state->axis_index + 1) % 4;
logger_state->log_ticks = 255;
@@ -187,6 +181,7 @@ bool lis2dw_logging_face_loop(movement_event_t event, movement_settings_t *setti
_lis2dw_logging_face_log_data(logger_state);
break;
default:
movement_default_loop_handler(event, settings);
break;
}

7
movement/watch_faces/demo/voltage_face.c
View File

@@ -55,12 +55,6 @@ bool voltage_face_loop(movement_event_t event, movement_settings_t *settings, vo
(void) context;
watch_date_time 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_ACTIVATE:
_voltage_face_update_display();
break;
@@ -78,6 +72,7 @@ bool voltage_face_loop(movement_event_t event, movement_settings_t *settings, vo
watch_display_string("BA SLEEP ", 0);
break;
default:
movement_default_loop_handler(event, settings);
break;
}