never disable buzzer output

4 files changed, 4 insertions, 12 deletions

diff --git a/movement/watch_faces/clock/simple_clock_face.c b/movement/watch_faces/clock/simple_clock_face.c
index 7721b12a..d66e5886 100644
--- a/movement/watch_faces/clock/simple_clock_face.c
+++ b/movement/watch_faces/clock/simple_clock_face.c
@@ -144,12 +144,8 @@ bool simple_clock_face_loop(movement_event_t event, movement_settings_t *setting
                 // if we are in the foreground, we can just beep.
                 movement_play_signal();
             } else {
-                // if we were in the background, we need to enable the buzzer peripheral first,
-                watch_enable_buzzer();
                 // beep quickly (this call blocks for 275 ms),
                 movement_play_signal();
-                // and then turn the buzzer peripheral off again.
-                watch_disable_buzzer();
             }
             break;
         default:
diff --git a/movement/watch_faces/clock/weeknumber_clock_face.c b/movement/watch_faces/clock/weeknumber_clock_face.c
index e49e5abf..deaaedbd 100644
--- a/movement/watch_faces/clock/weeknumber_clock_face.c
+++ b/movement/watch_faces/clock/weeknumber_clock_face.c
@@ -140,12 +140,8 @@ bool weeknumber_clock_face_loop(movement_event_t event, movement_settings_t *set
                 // if we are in the foreground, we can just beep.
                 movement_play_signal();
             } else {
-                // if we were in the background, we need to enable the buzzer peripheral first,
-                watch_enable_buzzer();
                 // beep quickly (this call blocks for 275 ms),
                 movement_play_signal();
-                // and then turn the buzzer peripheral off again.
-                watch_disable_buzzer();
             }
             break;
         default:
diff --git a/movement/watch_faces/complication/alarm_face.c b/movement/watch_faces/complication/alarm_face.c
index 35e2890f..181a5aba 100644
--- a/movement/watch_faces/complication/alarm_face.c
+++ b/movement/watch_faces/complication/alarm_face.c
@@ -421,10 +421,8 @@ bool alarm_face_loop(movement_event_t event, movement_settings_t *settings, void
             if (watch_is_buzzer_or_led_enabled()) {
                 _alarm_play_short_beep(state->alarm[state->alarm_playing_idx].pitch);
             } else {
-                // enable, play beep and disable buzzer again
-                watch_enable_buzzer();
+                // play beep
                 _alarm_play_short_beep(state->alarm[state->alarm_playing_idx].pitch);
-                watch_disable_buzzer();
             }
         } else {
             // regular alarm beeps
diff --git a/watch-library/hardware/watch/watch_buzzer.c b/watch-library/hardware/watch/watch_buzzer.c
index c06242ff..7a5f1704 100644
--- a/watch-library/hardware/watch/watch_buzzer.c
+++ b/watch-library/hardware/watch/watch_buzzer.c
@@ -28,6 +28,7 @@
     if (!hri_tcc_get_CTRLA_reg(TCC0, TCC_CTRLA_ENABLE)) {
         _watch_enable_tcc();
     }
+    gpio_set_pin_direction(BUZZER, GPIO_DIRECTION_OUT);
 }
 inline void watch_set_buzzer_period(uint32_t period) {
     hri_tcc_write_PERBUF_reg(TCC0, period);
@@ -35,6 +36,7 @@ inline void watch_set_buzzer_period(uint32_t period) {
 
 void watch_disable_buzzer(void) {
     _watch_disable_tcc();
+    watch_set_buzzer_off();
 }
 
 inline void watch_set_buzzer_on(void) {
@@ -43,8 +45,8 @@ inline void watch_set_buzzer_on(void) {
 }
 
 inline void watch_set_buzzer_off(void) {
-    gpio_set_pin_direction(BUZZER, GPIO_DIRECTION_OFF);
     gpio_set_pin_function(BUZZER, GPIO_PIN_FUNCTION_OFF);
+    gpio_set_pin_level(BUZZER, true);
 }
 
 void watch_buzzer_play_note(BuzzerNote note, uint16_t duration_ms) {