aboutsummaryrefslogtreecommitdiff
path: root/quantum/quantum.c
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2018-07-29 21:24:42 -0700
committerJack Humbert <jack.humb@gmail.com>2018-08-04 16:49:57 -0400
commitef5b161bb5ebf137bd95e4462588bb20ffbe0f79 (patch)
treeffc894fd39b99956d1c77d1d523f740fcc23ca9a /quantum/quantum.c
parent23d68d0ba12ced8b58b7e6225c3c1c5aa41a38d0 (diff)
downloadqmk_firmware-ef5b161bb5ebf137bd95e4462588bb20ffbe0f79.tar.gz
qmk_firmware-ef5b161bb5ebf137bd95e4462588bb20ffbe0f79.zip
Fix Audio code when resetting keyboard
I incorrectly disabled a bunch of code that shouldn't have been disabled. This should only disable music mode stuff, not general audio.
Diffstat (limited to 'quantum/quantum.c')
-rw-r--r--quantum/quantum.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 9c6ed3330..aad678e1a 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -147,8 +147,10 @@ void reset_keyboard(void) {
147#if defined(MIDI_ENABLE) && defined(MIDI_BASIC) 147#if defined(MIDI_ENABLE) && defined(MIDI_BASIC)
148 process_midi_all_notes_off(); 148 process_midi_all_notes_off();
149#endif 149#endif
150#if defined(AUDIO_ENABLE) && !defined(NO_MUSIC_MODE) 150#ifdef AUDIO_ENABLE
151 music_all_notes_off(); 151 #ifndef NO_MUSIC_MODE
152 music_all_notes_off();
153 #endif
152 uint16_t timer_start = timer_read(); 154 uint16_t timer_start = timer_read();
153 PLAY_SONG(goodbye_song); 155 PLAY_SONG(goodbye_song);
154 shutdown_user(); 156 shutdown_user();
@@ -931,7 +933,7 @@ uint8_t rgb_matrix_task_counter = 0;
931#endif 933#endif
932 934
933void matrix_scan_quantum() { 935void matrix_scan_quantum() {
934 #if defined(AUDIO_ENABLE) 936 #if defined(AUDIO_ENABLE) && !defined(NO_MUSIC_MODE)
935 matrix_scan_music(); 937 matrix_scan_music();
936 #endif 938 #endif
937 939