diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-05-15 06:51:06 +0200 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-05-15 06:51:06 +0200 |
| commit | fde477a927edc6b4207a6968d44aeed021e8b300 (patch) | |
| tree | 89a52f005d7d119af31b03261607792aa1f459ff /quantum/quantum.h | |
| parent | bf5c2ccee5497523c214dae7aacdc27fdbb0f235 (diff) | |
| download | qmk_firmware-fde477a927edc6b4207a6968d44aeed021e8b300.tar.gz qmk_firmware-fde477a927edc6b4207a6968d44aeed021e8b300.tar.xz | |
updates midi functionality (#331)
* implements leader key for planck experimental
* allows override of leader timeout
* adds ability to use the leader key in seq
* fixes leader keycode
* adds chording prototype
* fixes keycode detection
* moves music mode to quantum.c
* disables chording by default
* adds music sequencer functionality
* implements audio/music functions in quantum.c
* splits up process_action to allow independent processing of actions
* moves midi stuff to quantum.c
* adds additional scales for midi
Diffstat (limited to 'quantum/quantum.h')
| -rw-r--r-- | quantum/quantum.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/quantum/quantum.h b/quantum/quantum.h index db726ad42..bfecdb262 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -13,7 +13,8 @@ #include "audio.h" #endif #ifdef MIDI_ENABLE - #include <keymap_midi.h> + // #include <keymap_midi.h> + #include <lufa.h> #endif #include "action_layer.h" #include "eeconfig.h" |