never disable buzzer output

This commit is contained in:
joeycastillo 2023-01-03 21:24:14 -06:00
parent 801230cc3a
commit 851d047c81
4 changed files with 4 additions and 12 deletions

View File

@ -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. // if we are in the foreground, we can just beep.
movement_play_signal(); movement_play_signal();
} else { } 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), // beep quickly (this call blocks for 275 ms),
movement_play_signal(); movement_play_signal();
// and then turn the buzzer peripheral off again.
watch_disable_buzzer();
} }
break; break;
default: default:

View File

@ -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. // if we are in the foreground, we can just beep.
movement_play_signal(); movement_play_signal();
} else { } 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), // beep quickly (this call blocks for 275 ms),
movement_play_signal(); movement_play_signal();
// and then turn the buzzer peripheral off again.
watch_disable_buzzer();
} }
break; break;
default: default:

View File

@ -421,10 +421,8 @@ bool alarm_face_loop(movement_event_t event, movement_settings_t *settings, void
if (watch_is_buzzer_or_led_enabled()) { 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 { } else {
// enable, play beep and disable buzzer again // play beep
watch_enable_buzzer();
_alarm_play_short_beep(state->alarm[state->alarm_playing_idx].pitch); _alarm_play_short_beep(state->alarm[state->alarm_playing_idx].pitch);
watch_disable_buzzer();
} }
} else { } else {
// regular alarm beeps // regular alarm beeps

View File

@ -28,6 +28,7 @@
if (!hri_tcc_get_CTRLA_reg(TCC0, TCC_CTRLA_ENABLE)) { if (!hri_tcc_get_CTRLA_reg(TCC0, TCC_CTRLA_ENABLE)) {
_watch_enable_tcc(); _watch_enable_tcc();
} }
gpio_set_pin_direction(BUZZER, GPIO_DIRECTION_OUT);
} }
inline void watch_set_buzzer_period(uint32_t period) { inline void watch_set_buzzer_period(uint32_t period) {
hri_tcc_write_PERBUF_reg(TCC0, 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) { void watch_disable_buzzer(void) {
_watch_disable_tcc(); _watch_disable_tcc();
watch_set_buzzer_off();
} }
inline void watch_set_buzzer_on(void) { 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) { 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_function(BUZZER, GPIO_PIN_FUNCTION_OFF);
gpio_set_pin_level(BUZZER, true);
} }
void watch_buzzer_play_note(BuzzerNote note, uint16_t duration_ms) { void watch_buzzer_play_note(BuzzerNote note, uint16_t duration_ms) {