summaryrefslogtreecommitdiff
path: root/quantum
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2021-08-15 13:51:50 -0700
committerGitHub <noreply@github.com>2021-08-15 21:51:50 +0100
commit4e3726bfe11b02757c5724211d2a0fc62c7f66e8 (patch)
tree749429b1900496d443f5490c3e547d510e0511fd /quantum
parent4b453dca92f87899d98b5340b16677bd78a52beb (diff)
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.c3
-rw-r--r--quantum/quantum.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/quantum/audio/audio.c b/quantum/audio/audio.c
index 46277dd70b..49bb309e80 100644
--- a/quantum/audio/audio.c
+++ b/quantum/audio/audio.c
@@ -139,6 +139,9 @@ void audio_init() {
audio_initialized = true;
}
stop_all_notes();
+#ifndef AUDIO_INIT_DELAY
+ audio_startup();
+#endif
}
void audio_startup(void) {
diff --git a/quantum/quantum.c b/quantum/quantum.c
index d173388714..e60378afe4 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -398,7 +398,7 @@ void matrix_init_quantum() {
}
void matrix_scan_quantum() {
-#if defined(AUDIO_ENABLE)
+#if defined(AUDIO_ENABLE) && defined(AUDIO_INIT_DELAY)
// There are some tasks that need to be run a little bit
// after keyboard startup, or else they will not work correctly
// because of interaction with the USB device state, which