diff options
author | Joshua Diamond <josh@windowoffire.com> | 2021-01-31 17:25:55 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-01 09:25:55 +1100 |
commit | ae4ee7553abfaa2149fcea04c3cbee20f3b8c7a5 (patch) | |
tree | 8baafbc7332a9ed95e5ff35de3f9ed5f21826f4f /quantum/audio/audio_pwm.c | |
parent | db11a2a1fd7a7ff9c458e8ec9e963a61a1192bf3 (diff) | |
download | qmk_firmware-ae4ee7553abfaa2149fcea04c3cbee20f3b8c7a5.tar.gz qmk_firmware-ae4ee7553abfaa2149fcea04c3cbee20f3b8c7a5.zip |
Stop sounds when suspended (#11553)
* fix stopping audio on suspend vs. startup sound
* trim firmware size
* fix stuck audio on startup (ARM)
Diffstat (limited to 'quantum/audio/audio_pwm.c')
-rw-r--r-- | quantum/audio/audio_pwm.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/quantum/audio/audio_pwm.c b/quantum/audio/audio_pwm.c index 545aef6dd..d93ac4bb4 100644 --- a/quantum/audio/audio_pwm.c +++ b/quantum/audio/audio_pwm.c | |||
@@ -29,6 +29,11 @@ | |||
29 | 29 | ||
30 | #define CPU_PRESCALER 8 | 30 | #define CPU_PRESCALER 8 |
31 | 31 | ||
32 | #ifndef STARTUP_SONG | ||
33 | # define STARTUP_SONG SONG(STARTUP_SOUND) | ||
34 | #endif | ||
35 | float startup_song[][2] = STARTUP_SONG; | ||
36 | |||
32 | // Timer Abstractions | 37 | // Timer Abstractions |
33 | 38 | ||
34 | // TIMSK3 - Timer/Counter #3 Interrupt Mask Register | 39 | // TIMSK3 - Timer/Counter #3 Interrupt Mask Register |
@@ -155,6 +160,12 @@ void audio_init() { | |||
155 | audio_initialized = true; | 160 | audio_initialized = true; |
156 | } | 161 | } |
157 | 162 | ||
163 | void audio_startup() { | ||
164 | if (audio_config.enable) { | ||
165 | PLAY_SONG(startup_song); | ||
166 | } | ||
167 | } | ||
168 | |||
158 | void stop_all_notes() { | 169 | void stop_all_notes() { |
159 | if (!audio_initialized) { | 170 | if (!audio_initialized) { |
160 | audio_init(); | 171 | audio_init(); |