diff options
| author | Erez Zukerman <bulk@ezuk.org> | 2016-11-29 08:16:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-29 08:16:04 -0500 |
| commit | 51ae6da99edd732ccdec6e102bd757e08950d23b (patch) | |
| tree | 53e316e1fbe468e0b1f65fd11e161ebc74c6ef70 /tmk_core/protocol/lufa/lufa.h | |
| parent | 7b219a7f6016dfe80c1c3db33bcf859e3e355d8d (diff) | |
| parent | f946d830f98da0161753d37da9659caa7469cf4f (diff) | |
| download | qmk_firmware-51ae6da99edd732ccdec6e102bd757e08950d23b.tar.gz qmk_firmware-51ae6da99edd732ccdec6e102bd757e08950d23b.zip | |
Merge pull request #918 from jackhumbert/wu5y7
Adds Ergodox EZ RGB lights (both sides using I2C) and implements API base, Midi SysEx API
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 { | |||
| 68 | } __attribute__ ((packed)) report_extra_t; | 68 | } __attribute__ ((packed)) report_extra_t; |
| 69 | 69 | ||
| 70 | #ifdef MIDI_ENABLE | 70 | #ifdef MIDI_ENABLE |
| 71 | void MIDI_Task(void); | 71 | void MIDI_Task(void); |
| 72 | MidiDevice midi_device; | 72 | MidiDevice midi_device; |
| 73 | #define MIDI_SYSEX_BUFFER 32 | ||
| 74 | #endif | ||
| 75 | |||
| 76 | #ifdef API_ENABLE | ||
| 77 | #include "api.h" | ||
| 78 | #endif | ||
| 79 | |||
| 80 | #ifdef API_SYSEX_ENABLE | ||
| 81 | #include "api_sysex.h" | ||
| 73 | #endif | 82 | #endif |
| 74 | 83 | ||
| 75 | // #if LUFA_VERSION_INTEGER < 0x120730 | 84 | // #if LUFA_VERSION_INTEGER < 0x120730 |