Remove more unnecessary conditionals

diff --git a/movement/watch_faces/clock/weeknumber_clock_face.c b/movement/watch_faces/clock/weeknumber_clock_face.c
index deaaedbde2987b8146bba9ae5c1f5a31d11893a8..45d751af086e851878260e9c39bbb7f997fdc6f6 100644 (file)
--- 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 181a5abaafecd85e13d6cedaf364421f3533a245..a871452dde243013e408644219fe79783781d4ac 100644 (file)
--- 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
+}