refactor movement's button preference into a function call

This commit is contained in:
joeycastillo
2024-09-28 21:57:21 -04:00
parent fec225ec8b
commit 01f1008e16
18 changed files with 63 additions and 52 deletions

View File

@@ -167,7 +167,7 @@ bool tachymeter_face_loop(movement_event_t event, movement_settings_t *settings,
break;
case EVENT_ALARM_BUTTON_UP:
if (!state->running && state->total_time == 0){
if (settings->bit.button_should_sound && !state->editing) {
if (movement_button_should_sound() && !state->editing) {
watch_buzzer_play_note(BUZZER_NOTE_C8, 50);
}
if (!state->editing) {
@@ -200,7 +200,7 @@ bool tachymeter_face_loop(movement_event_t event, movement_settings_t *settings,
}
}
} else if (state->running) {
if (settings->bit.button_should_sound && !state->editing) {
if (movement_button_should_sound() && !state->editing) {
watch_buzzer_play_note(BUZZER_NOTE_C8, 50);
}
// Stop running
@@ -220,7 +220,7 @@ bool tachymeter_face_loop(movement_event_t event, movement_settings_t *settings,
// Enter editing
state->editing = true;
state->active_digit = 0;
if (settings->bit.button_should_sound) {
if (movement_button_should_sound()) {
watch_buzzer_play_note(BUZZER_NOTE_C7, 80);
watch_buzzer_play_note(BUZZER_NOTE_C8, 80);
}
@@ -232,7 +232,7 @@ bool tachymeter_face_loop(movement_event_t event, movement_settings_t *settings,
state->dist_digits.ones = 1;
}
_tachymeter_face_distance_lcd(event, state);
if (settings->bit.button_should_sound) {
if (movement_button_should_sound()) {
watch_buzzer_play_note(BUZZER_NOTE_C8, 80);
watch_buzzer_play_note(BUZZER_NOTE_C7, 80);
}