diff options
author | Drashna Jaelre <drashna@live.com> | 2021-08-15 13:51:50 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-15 21:51:50 +0100 |
commit | 4e3726bfe11b02757c5724211d2a0fc62c7f66e8 (patch) | |
tree | 749429b1900496d443f5490c3e547d510e0511fd /quantum | |
parent | 4b453dca92f87899d98b5340b16677bd78a52beb (diff) | |
download | qmk_firmware-4e3726bfe11b02757c5724211d2a0fc62c7f66e8.tar.gz qmk_firmware-4e3726bfe11b02757c5724211d2a0fc62c7f66e8.zip |
Fixup Audio startup and add to documents (#13606)
* Fixup Audio startup and add to documents
* fix doc descriptions
Diffstat (limited to 'quantum')
-rw-r--r-- | quantum/audio/audio.c | 3 | ||||
-rw-r--r-- | quantum/quantum.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/quantum/audio/audio.c b/quantum/audio/audio.c index 46277dd70..49bb309e8 100644 --- a/quantum/audio/audio.c +++ b/quantum/audio/audio.c | |||
@@ -139,6 +139,9 @@ void audio_init() { | |||
139 | audio_initialized = true; | 139 | audio_initialized = true; |
140 | } | 140 | } |
141 | stop_all_notes(); | 141 | stop_all_notes(); |
142 | #ifndef AUDIO_INIT_DELAY | ||
143 | audio_startup(); | ||
144 | #endif | ||
142 | } | 145 | } |
143 | 146 | ||
144 | void audio_startup(void) { | 147 | void audio_startup(void) { |
diff --git a/quantum/quantum.c b/quantum/quantum.c index d17338871..e60378afe 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c | |||
@@ -398,7 +398,7 @@ void matrix_init_quantum() { | |||
398 | } | 398 | } |
399 | 399 | ||
400 | void matrix_scan_quantum() { | 400 | void matrix_scan_quantum() { |
401 | #if defined(AUDIO_ENABLE) | 401 | #if defined(AUDIO_ENABLE) && defined(AUDIO_INIT_DELAY) |
402 | // There are some tasks that need to be run a little bit | 402 | // There are some tasks that need to be run a little bit |
403 | // after keyboard startup, or else they will not work correctly | 403 | // after keyboard startup, or else they will not work correctly |
404 | // because of interaction with the USB device state, which | 404 | // because of interaction with the USB device state, which |