hueso/Sensor-Watch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Revert "never disable buzzer output"

Browse Source 
This reverts commit 851d047c818dacc30c86f4d87f33247dcfb0095c.
This commit is contained in:
joeycastillo 2023-01-17 08:52:01 -06:00
parent ca05567576
commit 5163cf1fe1
4 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
movement/watch_faces/clock/simple_clock_face.c
View File

@ -142,7 +142,17 @@ bool simple_clock_face_loop(movement_event_t event, movement_settings_t *setting
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 {
// 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:
break;

10
movement/watch_faces/clock/weeknumber_clock_face.c
View File

@ -136,7 +136,17 @@ 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 {
// 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:
break;

8
movement/watch_faces/complication/alarm_face.c
View File

@ -417,7 +417,15 @@ 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 {
// enable, play beep and disable buzzer again
watch_enable_buzzer();
_alarm_play_short_beep(state->alarm[state->alarm_playing_idx].pitch);
watch_disable_buzzer();
}
} 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),

4
watch-library/hardware/watch/watch_buzzer.c
View File

@ -147,7 +147,6 @@ inline void watch_enable_buzzer(void) {
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) {
@ -157,7 +156,6 @@ 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) {
@ -166,8 +164,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) {