diff options
author | xyverz <xyverz@gmail.com> | 2016-12-06 17:36:19 -0800 |
---|---|---|
committer | xyverz <xyverz@gmail.com> | 2016-12-06 17:36:19 -0800 |
commit | 9216bc73778ef0fe5830b91511f37dd90fb0f0a1 (patch) | |
tree | 6c9f343c2485150c1912b7b68ade364a232015bd /tmk_core/protocol/lufa/lufa.h | |
parent | f9cf4f75aec8cb24f054f243b985d9e5c18a2a80 (diff) | |
parent | 985a091a739c99736d5b17de5161831488dbc219 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core/protocol/lufa/lufa.h')
-rw-r--r-- | tmk_core/protocol/lufa/lufa.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/tmk_core/protocol/lufa/lufa.h b/tmk_core/protocol/lufa/lufa.h index aad08d6407..b11854101d 100644 --- a/tmk_core/protocol/lufa/lufa.h +++ b/tmk_core/protocol/lufa/lufa.h @@ -68,8 +68,17 @@ typedef struct { } __attribute__ ((packed)) report_extra_t; #ifdef MIDI_ENABLE -void MIDI_Task(void); -MidiDevice midi_device; + void MIDI_Task(void); + MidiDevice midi_device; + #define MIDI_SYSEX_BUFFER 32 +#endif + +#ifdef API_ENABLE + #include "api.h" +#endif + +#ifdef API_SYSEX_ENABLE + #include "api_sysex.h" #endif // #if LUFA_VERSION_INTEGER < 0x120730 |