Remove more unnecessary conditionals
This commit is contained in:
parent
280d8b246a
commit
8331a54896
@ -136,13 +136,7 @@ bool weeknumber_clock_face_loop(movement_event_t event, movement_settings_t *set
|
|||||||
case EVENT_BACKGROUND_TASK:
|
case EVENT_BACKGROUND_TASK:
|
||||||
// uncomment this line to snap back to the clock face when the hour signal sounds:
|
// uncomment this line to snap back to the clock face when the hour signal sounds:
|
||||||
// movement_move_to_face(state->watch_face_index);
|
// movement_move_to_face(state->watch_face_index);
|
||||||
if (watch_is_buzzer_or_led_enabled()) {
|
|
||||||
// if we are in the foreground, we can just beep.
|
|
||||||
movement_play_signal();
|
movement_play_signal();
|
||||||
} else {
|
|
||||||
// beep quickly (this call blocks for 275 ms),
|
|
||||||
movement_play_signal();
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
@ -417,13 +417,7 @@ bool alarm_face_loop(movement_event_t event, movement_settings_t *settings, void
|
|||||||
case EVENT_BACKGROUND_TASK:
|
case EVENT_BACKGROUND_TASK:
|
||||||
// play alarm
|
// play alarm
|
||||||
if (state->alarm[state->alarm_playing_idx].beeps == 0) {
|
if (state->alarm[state->alarm_playing_idx].beeps == 0) {
|
||||||
// short beep
|
|
||||||
if (watch_is_buzzer_or_led_enabled()) {
|
|
||||||
_alarm_play_short_beep(state->alarm[state->alarm_playing_idx].pitch);
|
_alarm_play_short_beep(state->alarm[state->alarm_playing_idx].pitch);
|
||||||
} else {
|
|
||||||
// play beep
|
|
||||||
_alarm_play_short_beep(state->alarm[state->alarm_playing_idx].pitch);
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
// regular alarm beeps
|
// regular alarm beeps
|
||||||
movement_play_alarm_beeps((state->alarm[state->alarm_playing_idx].beeps == (ALARM_MAX_BEEP_ROUNDS - 1) ? 20 : state->alarm[state->alarm_playing_idx].beeps),
|
movement_play_alarm_beeps((state->alarm[state->alarm_playing_idx].beeps == (ALARM_MAX_BEEP_ROUNDS - 1) ? 20 : state->alarm[state->alarm_playing_idx].beeps),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user