diff options
| author | Jeremy O'Brien <neutral@fastmail.com> | 2023-01-10 21:02:47 -0500 |
|---|---|---|
| committer | Jeremy O'Brien <neutral@fastmail.com> | 2023-01-10 21:02:47 -0500 |
| commit | 8331a5489633c36358f4eca77a7b6c97b974e80a (patch) | |
| tree | 5e1066122f9df43ea383addeeef10e1498c3989f | |
| parent | 280d8b246a60fa49d932bfbc573b93acffd7af29 (diff) | |
| download | Sensor-Watch-8331a5489633c36358f4eca77a7b6c97b974e80a.tar.gz Sensor-Watch-8331a5489633c36358f4eca77a7b6c97b974e80a.tar.bz2 Sensor-Watch-8331a5489633c36358f4eca77a7b6c97b974e80a.zip | |
Remove more unnecessary conditionals
| -rw-r--r-- | movement/watch_faces/clock/weeknumber_clock_face.c | 8 | ||||
| -rw-r--r-- | movement/watch_faces/complication/alarm_face.c | 10 |
2 files changed, 3 insertions, 15 deletions
diff --git a/movement/watch_faces/clock/weeknumber_clock_face.c b/movement/watch_faces/clock/weeknumber_clock_face.c index deaaedbd..45d751af 100644 --- a/movement/watch_faces/clock/weeknumber_clock_face.c +++ b/movement/watch_faces/clock/weeknumber_clock_face.c @@ -136,13 +136,7 @@ bool weeknumber_clock_face_loop(movement_event_t event, movement_settings_t *set case EVENT_BACKGROUND_TASK: // uncomment this line to snap back to the clock face when the hour signal sounds: // 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(); - } else { - // beep quickly (this call blocks for 275 ms), - movement_play_signal(); - } + movement_play_signal(); break; default: break; diff --git a/movement/watch_faces/complication/alarm_face.c b/movement/watch_faces/complication/alarm_face.c index 181a5aba..a871452d 100644 --- a/movement/watch_faces/complication/alarm_face.c +++ b/movement/watch_faces/complication/alarm_face.c @@ -417,13 +417,7 @@ bool alarm_face_loop(movement_event_t event, movement_settings_t *settings, void case EVENT_BACKGROUND_TASK: // play alarm 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); - } else { - // play beep - _alarm_play_short_beep(state->alarm[state->alarm_playing_idx].pitch); - } + _alarm_play_short_beep(state->alarm[state->alarm_playing_idx].pitch); } else { // 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), @@ -450,4 +444,4 @@ bool alarm_face_loop(movement_event_t event, movement_settings_t *settings, void } return true; -}
\ No newline at end of file +} |