aboutsummaryrefslogtreecommitdiff
path: root/quantum/quantum.h
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-05-15 00:51:06 -0400
committerJack Humbert <jack.humb@gmail.com>2016-05-15 00:51:06 -0400
commitfde477a927edc6b4207a6968d44aeed021e8b300 (patch)
tree89a52f005d7d119af31b03261607792aa1f459ff /quantum/quantum.h
parentbf5c2ccee5497523c214dae7aacdc27fdbb0f235 (diff)
downloadqmk_firmware-fde477a927edc6b4207a6968d44aeed021e8b300.tar.gz
qmk_firmware-fde477a927edc6b4207a6968d44aeed021e8b300.zip
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.h3
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 @@
13 #include "audio.h" 13 #include "audio.h"
14#endif 14#endif
15#ifdef MIDI_ENABLE 15#ifdef MIDI_ENABLE
16 #include <keymap_midi.h> 16 // #include <keymap_midi.h>
17 #include <lufa.h>
17#endif 18#endif
18#include "action_layer.h" 19#include "action_layer.h"
19#include "eeconfig.h" 20#include "eeconfig.h"