diff options
| author | Hugh Enxing <henxing@draper.com> | 2017-03-28 12:11:49 -0400 |
|---|---|---|
| committer | Hugh Enxing <henxing@draper.com> | 2017-03-28 12:11:49 -0400 |
| commit | 3fdc45b4e9581c823ac09545241241e0c6d3f313 (patch) | |
| tree | f17c050672086233a2de4e4c8d0ba72c5bd87841 /quantum/quantum.c | |
| parent | 25f2295ba88627521bed63ec4e5412b983626901 (diff) | |
| parent | 5e4daf1c6db980fad269fe7b013205008bfe701e (diff) | |
Merge branch 'master' into default_atreus_layout
Diffstat (limited to 'quantum/quantum.c')
| -rw-r--r-- | quantum/quantum.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c index 582f8920b1..5a9e771a90 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -98,8 +98,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { void reset_keyboard(void) { clear_keyboard(); -#ifdef AUDIO_ENABLE - stop_all_notes(); +#if defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_ENABLE_BASIC)) + music_all_notes_off(); shutdown_user(); #endif wait_ms(250); @@ -153,10 +153,13 @@ bool process_record_quantum(keyrecord_t *record) { if (!( process_record_kb(keycode, record) && - #ifdef MIDI_ENABLE + #if defined(MIDI_ENABLE) && defined(MIDI_ADVANCED) process_midi(keycode, record) && #endif #ifdef AUDIO_ENABLE + process_audio(keycode, record) && + #endif + #if defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC)) process_music(keycode, record) && #endif #ifdef TAP_DANCE_ENABLE @@ -294,14 +297,6 @@ bool process_record_quantum(keyrecord_t *record) { return false; break; #endif - #ifdef ADAFRUIT_BLE_ENABLE - case OUT_BLE: - if (record->event.pressed) { - set_output(OUTPUT_ADAFRUIT_BLE); - } - return false; - break; - #endif #endif case MAGIC_SWAP_CONTROL_CAPSLOCK ... MAGIC_TOGGLE_NKRO: if (record->event.pressed) { |