diff options
author | 2016-12-04 23:57:47 +0700 | |
---|---|---|
committer | 2016-12-04 23:57:47 +0700 | |
commit | fc80aa9974faad146837cd26d9264b5a6c74dd4b (patch) | |
tree | 893e6f573c2753a51f67ed3636110850036405c7 /tmk_core/protocol/lufa/lufa.h | |
parent | a8e5f6180585f46684d713976ad05d4d81b11ab1 (diff) | |
parent | f39e1b5dfe7552f01dbc6eab95c268f41a9d98e2 (diff) | |
download | qmk_firmware-fc80aa9974faad146837cd26d9264b5a6c74dd4b.tar.gz |
Merge branch 'master' into promethium
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 aad08d640..b11854101 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 |