From ae4ee7553abfaa2149fcea04c3cbee20f3b8c7a5 Mon Sep 17 00:00:00 2001
From: Joshua Diamond <josh@windowoffire.com>
Date: Sun, 31 Jan 2021 17:25:55 -0500
Subject: Stop sounds when suspended (#11553)

* fix stopping audio on suspend vs. startup sound

* trim firmware size

* fix stuck audio on startup (ARM)
---
 quantum/audio/audio_chibios.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'quantum/audio/audio_chibios.c')

diff --git a/quantum/audio/audio_chibios.c b/quantum/audio/audio_chibios.c
index 1863ae140b..dddb8f1357 100644
--- a/quantum/audio/audio_chibios.c
+++ b/quantum/audio/audio_chibios.c
@@ -281,6 +281,12 @@ void audio_init() {
     dacStart(&DACD1, &dac1cfg1);
     dacStart(&DACD2, &dac1cfg2);
 
+    /*
+     * Start the note timer
+     */
+    gptStart(&GPTD8, &gpt8cfg1);
+    gptStartContinuous(&GPTD8, 2U);
+
     /*
      * Starting GPT6/7 driver, it is used for triggering the DAC.
      */
@@ -295,10 +301,12 @@ void audio_init() {
 
     audio_initialized = true;
 
+    stop_all_notes();
+}
+
+void audio_startup() {
     if (audio_config.enable) {
         PLAY_SONG(startup_song);
-    } else {
-        stop_all_notes();
     }
 }
 
@@ -638,6 +646,9 @@ bool is_playing_notes(void) { return playing_notes; }
 bool is_audio_on(void) { return (audio_config.enable != 0); }
 
 void audio_toggle(void) {
+    if (audio_config.enable) {
+        stop_all_notes();
+    }
     audio_config.enable ^= 1;
     eeconfig_update_audio(audio_config.raw);
     if (audio_config.enable) {
-- 
cgit v1.2.3