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

4
movement/watch_faces/complication/alarm_face.c
View File

@@ -441,13 +441,11 @@ bool alarm_face_loop(movement_event_t event, movement_settings_t *settings, void
_alarm_update_alarm_enabled(settings, state);
}
break;
case EVENT_MODE_BUTTON_UP:
movement_move_to_next_face();
break;
case EVENT_TIMEOUT:
movement_move_to_face(0);
break;
default:
movement_default_loop_handler(event, settings);
break;
}

9
movement/watch_faces/complication/astronomy_face.c
View File

@@ -219,14 +219,6 @@ bool astronomy_face_loop(movement_event_t event, movement_settings_t *settings,
case EVENT_TICK:
_astronomy_face_update(event, settings, state);
break;
case EVENT_MODE_BUTTON_UP:
// You shouldn't need to change this case; Mode almost always moves to the next watch face.
movement_move_to_next_face();
break;
case EVENT_LIGHT_BUTTON_UP:
// If you have other uses for the Light button, you can opt not to illuminate the LED for this event.
movement_illuminate_led();
break;
case EVENT_ALARM_BUTTON_UP:
switch (state->mode) {
case ASTRONOMY_MODE_SELECTING_BODY:
@@ -267,6 +259,7 @@ bool astronomy_face_loop(movement_event_t event, movement_settings_t *settings,
// TODO?
break;
default:
movement_default_loop_handler(event, settings);
break;
}

5
movement/watch_faces/complication/blinky_face.c
View File

@@ -57,9 +57,6 @@ bool blinky_face_loop(movement_event_t event, movement_settings_t *settings, voi
case EVENT_ACTIVATE:
_blinky_face_update_lcd(state);
break;
case EVENT_MODE_BUTTON_UP:
movement_move_to_next_face();
break;
case EVENT_LIGHT_BUTTON_UP:
if (!state->active) {
state->color = (state->color + 1) % 3;
@@ -93,7 +90,9 @@ bool blinky_face_loop(movement_event_t event, movement_settings_t *settings, voi
break;
case EVENT_TIMEOUT:
if (!state->active) movement_move_to_face(0);
break;
default:
movement_default_loop_handler(event, settings);
break;
}

7
movement/watch_faces/complication/countdown_face.c
View File

@@ -160,9 +160,6 @@ bool countdown_face_loop(movement_event_t event, movement_settings_t *settings,
}
draw(state, event.subsecond);
break;
case EVENT_MODE_BUTTON_UP:
movement_move_to_next_face();
break;
case EVENT_LIGHT_BUTTON_UP:
switch(state->mode) {
case cd_running:
@@ -216,8 +213,10 @@ bool countdown_face_loop(movement_event_t event, movement_settings_t *settings,
movement_move_to_face(0);
break;
case EVENT_LOW_ENERGY_UPDATE:
break;
default:
break;
movement_default_loop_handler(event, settings);
break;
}
return true;

7
movement/watch_faces/complication/counter_face.c
View File

@@ -47,12 +47,6 @@ bool counter_face_loop(movement_event_t event, movement_settings_t *settings, vo
counter_state_t *state = (counter_state_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:
state->counter_idx++; // increment counter index
if (state->counter_idx>99) { //0-99
@@ -72,6 +66,7 @@ bool counter_face_loop(movement_event_t event, movement_settings_t *settings, vo
// ignore timeout
break;
default:
movement_default_loop_handler(event, settings);
break;
}

8
movement/watch_faces/complication/databank_face.c
View File

@@ -110,12 +110,6 @@ bool databank_face_loop(movement_event_t event, movement_settings_t *settings, v
databank_state.current_word = 0;
display();
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_LONG_PRESS:
databank_state.databank_page = (databank_state.databank_page + 1) % databank_num_pages;
databank_state.current_word = 0;
@@ -141,7 +135,9 @@ bool databank_face_loop(movement_event_t event, movement_settings_t *settings, v
// 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;
}

5
movement/watch_faces/complication/day_one_face.c
View File

@@ -123,9 +123,6 @@ bool day_one_face_loop(movement_event_t event, movement_settings_t *settings, vo
}
}
break;
case EVENT_MODE_BUTTON_UP:
movement_move_to_next_face();
break;
case EVENT_LIGHT_BUTTON_DOWN:
// only illuminate if we're in display mode
if (state->current_page == 0) movement_illuminate_led();
@@ -176,7 +173,9 @@ bool day_one_face_loop(movement_event_t event, movement_settings_t *settings, vo
if (state->current_page != 0) {
movement_move_to_face(0);
}
break;
default:
movement_default_loop_handler(event, settings);
break;
}

8
movement/watch_faces/complication/interval_face.c
View File

@@ -664,14 +664,12 @@ bool interval_face_loop(movement_event_t event, movement_settings_t *settings, v
watch_buzzer_play_sequence((int8_t *)_sound_seq_finish, NULL);
}
break;
case EVENT_MODE_BUTTON_UP:
movement_move_to_next_face();
break;
case EVENT_TIMEOUT:
if (state->face_state != interval_state_running) movement_move_to_face(0);
break;
default:
break;
movement_default_loop_handler(event, settings);
break;
}
return true;
}
}

9
movement/watch_faces/complication/orrery_face.c
View File

@@ -174,14 +174,6 @@ bool orrery_face_loop(movement_event_t event, movement_settings_t *settings, voi
case EVENT_TICK:
_orrery_face_update(event, settings, state);
break;
case EVENT_MODE_BUTTON_UP:
movement_move_to_next_face();
break;
case EVENT_LIGHT_BUTTON_DOWN:
movement_illuminate_led();
break;
case EVENT_LIGHT_BUTTON_UP:
break;
case EVENT_ALARM_BUTTON_UP:
switch (state->mode) {
case ORRERY_MODE_SELECTING_BODY:
@@ -219,6 +211,7 @@ bool orrery_face_loop(movement_event_t event, movement_settings_t *settings, voi
movement_move_to_face(0);
break;
default:
movement_default_loop_handler(event, settings);
break;
}

4
movement/watch_faces/complication/probability_face.c
View File

@@ -141,9 +141,6 @@ bool probability_face_loop(movement_event_t event, movement_settings_t *settings
case EVENT_TICK:
display_dice_roll_animation(state);
break;
case EVENT_MODE_BUTTON_UP:
movement_move_to_next_face();
break;
case EVENT_LIGHT_BUTTON_UP:
// Change how many sides the die has
for (int i = 0; i < NUM_DICE_TYPES; i++) {
@@ -170,6 +167,7 @@ bool probability_face_loop(movement_event_t event, movement_settings_t *settings
watch_display_string("SLEEP ", 4);
break;
default:
movement_default_loop_handler(event, settings);
break;
}

7
movement/watch_faces/complication/pulsometer_face.c
View File

@@ -46,12 +46,6 @@ bool pulsometer_face_loop(movement_event_t event, movement_settings_t *settings,
pulsometer_state_t *pulsometer_state = (pulsometer_state_t *)context;
char buf[14];
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:
pulsometer_state->measuring = true;
pulsometer_state->pulse = 0xFFFF;
@@ -102,6 +96,7 @@ bool pulsometer_face_loop(movement_event_t event, movement_settings_t *settings,
movement_move_to_face(0);
break;
default:
movement_default_loop_handler(event, settings);
break;
}

7
movement/watch_faces/complication/ratemeter_face.c
View File

@@ -49,12 +49,6 @@ bool ratemeter_face_loop(movement_event_t event, movement_settings_t *settings,
case EVENT_ACTIVATE:
watch_display_string("ra ", 0);
break;
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:
if (ratemeter_state->ticks != 0) {
ratemeter_state->rate = (int16_t)(60.0 / ((float)ratemeter_state->ticks / (float)RATEMETER_FACE_FREQUENCY));
@@ -85,6 +79,7 @@ bool ratemeter_face_loop(movement_event_t event, movement_settings_t *settings,
movement_move_to_face(0);
break;
default:
movement_default_loop_handler(event, settings);
break;
}

2
movement/watch_faces/complication/rpn_calculator_alt_face.c
View File

@@ -441,7 +441,9 @@ bool rpn_calculator_alt_face_loop(movement_event_t event, movement_settings_t *s
movement_move_to_face(0);
break;
case EVENT_LOW_ENERGY_UPDATE:
break;
default:
movement_default_loop_handler(event, settings);
break;
}

1
movement/watch_faces/complication/rpn_calculator_face.c
View File

@@ -333,6 +333,7 @@ bool rpn_calculator_face_loop(movement_event_t event, movement_settings_t *setti
case EVENT_LOW_ENERGY_UPDATE:
break;
default:
movement_default_loop_handler(event, settings);
break;
}

7
movement/watch_faces/complication/sailing_face.c
View File

@@ -197,9 +197,6 @@ bool sailing_face_loop(movement_event_t event, movement_settings_t *settings, vo
}
draw(state, event.subsecond, settings);
break;
case EVENT_MODE_BUTTON_UP:
movement_move_to_next_face();
break;
case EVENT_LIGHT_LONG_PRESS:
if (state->mode == sl_running) {
reset(state);
@@ -258,8 +255,10 @@ bool sailing_face_loop(movement_event_t event, movement_settings_t *settings, vo
}
break;
case EVENT_LOW_ENERGY_UPDATE:
break;
default:
break;
movement_default_loop_handler(event, settings);
break;
}
return true;

6
movement/watch_faces/complication/stock_stopwatch_face.c
View File

@@ -251,9 +251,6 @@ bool stock_stopwatch_face_loop(movement_event_t event, movement_settings_t *sett
case EVENT_TICK:
_draw();
break;
case EVENT_MODE_BUTTON_UP:
movement_move_to_next_face();
break;
case EVENT_LIGHT_LONG_PRESS:
// kind od hidden feature: long press toggles light on or off
state->light_on_button = !state->light_on_button;
@@ -313,6 +310,7 @@ bool stock_stopwatch_face_loop(movement_event_t event, movement_settings_t *sett
_draw();
break;
default:
movement_default_loop_handler(event, settings);
break;
}
return true;
@@ -323,4 +321,4 @@ void stock_stopwatch_face_resign(movement_settings_t *settings, void *context) {
(void) context;
// cancel the keepalive task
movement_cancel_background_task();
}
}

4
movement/watch_faces/complication/tachymeter_face.c
View File

@@ -138,9 +138,6 @@ bool tachymeter_face_loop(movement_event_t event, movement_settings_t *settings,
state->animation_state = (state->animation_state + 1) % 6;
}
break;
case EVENT_MODE_BUTTON_UP:
movement_move_to_next_face();
break;
case EVENT_LIGHT_BUTTON_UP:
if (state->editing){
// Go to next digit
@@ -254,6 +251,7 @@ bool tachymeter_face_loop(movement_event_t event, movement_settings_t *settings,
// watch_start_tick_animation(500);
break;
default:
movement_default_loop_handler(event, settings);
break;
}
// return true if the watch can enter standby mode. If you are PWM'ing an LED or buzzing the buzzer here,

7
movement/watch_faces/complication/tally_face.c
View File

@@ -46,12 +46,6 @@ bool tally_face_loop(movement_event_t event, movement_settings_t *settings, void
tally_state_t *state = (tally_state_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:
// increment tally index
state->tally_idx++;
@@ -79,6 +73,7 @@ bool tally_face_loop(movement_event_t event, movement_settings_t *settings, void
// ignore timeout
break;
default:
movement_default_loop_handler(event, settings);
break;
}

8
movement/watch_faces/complication/tarot_face.c
View File

@@ -248,9 +248,6 @@ bool tarot_face_loop(movement_event_t event, movement_settings_t *settings, void
case EVENT_TICK:
display_animation(state);
break;
case EVENT_MODE_BUTTON_UP:
movement_move_to_next_face();
break;
case EVENT_LIGHT_BUTTON_UP:
if (state->drawn_cards[0] == 0xff) {
// deck is inited; cycle through # cards to draw
@@ -287,11 +284,8 @@ bool tarot_face_loop(movement_event_t event, movement_settings_t *settings, void
case EVENT_LOW_ENERGY_UPDATE:
watch_display_string("SLEEP ", 4);
break;
case EVENT_MODE_LONG_PRESS:
// since we ignore timeouts, provide a convenient way to jump back to the start
movement_move_to_face(0);
break;
default:
movement_default_loop_handler(event, settings);
break;
}

7
movement/watch_faces/complication/tempchart_face.c
View File

@@ -89,12 +89,6 @@ bool tempchart_face_loop(movement_event_t event, movement_settings_t *settings,
case EVENT_TICK:
// on activate and tick, if we are animating,
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_LOW_ENERGY_UPDATE:
// This low energy mode update occurs once a minute, if the watch face is in the
// foreground when Movement enters low energy mode. We have the option of supporting
@@ -133,6 +127,7 @@ bool tempchart_face_loop(movement_event_t event, movement_settings_t *settings,
break;
default:
movement_default_loop_handler(event, settings);
break;
}

4
movement/watch_faces/complication/tomato_face.c
View File

@@ -142,9 +142,6 @@ bool tomato_face_loop(movement_event_t event, movement_settings_t *settings, voi
}
tomato_draw(state);
break;
case EVENT_MODE_BUTTON_UP:
movement_move_to_next_face();
break;
case EVENT_LIGHT_BUTTON_UP:
movement_illuminate_led();
if (state->mode == tomato_ready) {
@@ -179,6 +176,7 @@ bool tomato_face_loop(movement_event_t event, movement_settings_t *settings, voi
movement_move_to_face(0);
break;
default:
movement_default_loop_handler(event, settings);
break;
}

8
movement/watch_faces/complication/totp_face.c
View File

@@ -79,12 +79,6 @@ bool totp_face_loop(movement_event_t event, movement_settings_t *settings, void
watch_display_string(buf, 0);
break;
case EVENT_MODE_BUTTON_UP:
movement_move_to_next_face();
break;
case EVENT_LIGHT_BUTTON_DOWN:
movement_illuminate_led();
break;
case EVENT_TIMEOUT:
movement_move_to_face(0);
break;
@@ -101,7 +95,9 @@ bool totp_face_loop(movement_event_t event, movement_settings_t *settings, void
break;
case EVENT_ALARM_BUTTON_DOWN:
case EVENT_ALARM_LONG_PRESS:
break;
default:
movement_default_loop_handler(event, settings);
break;
}

8
movement/watch_faces/complication/totp_face_lfs.c
View File

@@ -242,12 +242,6 @@ bool totp_face_lfs_loop(movement_event_t event, movement_settings_t *settings, v
case EVENT_ACTIVATE:
totp_face_display(totp_state);
break;
case EVENT_MODE_BUTTON_UP:
movement_move_to_next_face();
break;
case EVENT_LIGHT_BUTTON_DOWN:
movement_illuminate_led();
break;
case EVENT_TIMEOUT:
movement_move_to_face(0);
break;
@@ -257,7 +251,9 @@ bool totp_face_lfs_loop(movement_event_t event, movement_settings_t *settings, v
break;
case EVENT_ALARM_BUTTON_DOWN:
case EVENT_ALARM_LONG_PRESS:
break;
default:
movement_default_loop_handler(event, settings);
break;
}

9
movement/watch_faces/complication/wake_face.c
View File

@@ -144,16 +144,15 @@ bool wake_face_loop(movement_event_t event, movement_settings_t *settings, void
movement_play_alarm();
// 2022-07-23: Thx @joeycastillo for the dedicated “alarm” signal
break;
case EVENT_MODE_BUTTON_UP:
movement_move_to_next_face();
break;
case EVENT_TIMEOUT:
movement_move_to_face(0);
break;
case EVENT_LOW_ENERGY_UPDATE:
break;
default:
break;
movement_default_loop_handler(event, settings);
break;
}
return true;
}
}