diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-11-21 20:14:16 -0500 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-11-21 20:14:16 -0500 |
| commit | 6390033e8688550826a4bd3004a2e76568600657 (patch) | |
| tree | 32ec4183fc85c3823d5fd9e4773181df8cb39a76 /tmk_core | |
| parent | 664c0a036b3d7c3ed39f4a7a78d97f4a9cc7d20c (diff) | |
| download | qmk_firmware-6390033e8688550826a4bd3004a2e76568600657.tar.gz qmk_firmware-6390033e8688550826a4bd3004a2e76568600657.zip | |
cleaning up midid
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/host_driver.h | 9 | ||||
| -rw-r--r-- | tmk_core/protocol/lufa/lufa.c | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/tmk_core/common/host_driver.h b/tmk_core/common/host_driver.h index edb9e5dd9c..588d1c0be8 100644 --- a/tmk_core/common/host_driver.h +++ b/tmk_core/common/host_driver.h @@ -20,7 +20,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <stdint.h> #include "report.h" - +#ifdef MIDI_ENABLE + #include "midi.h" +#endif typedef struct { uint8_t (*keyboard_leds)(void); @@ -28,6 +30,11 @@ typedef struct { void (*send_mouse)(report_mouse_t *); void (*send_system)(uint16_t); void (*send_consumer)(uint16_t); +#ifdef MIDI_ENABLE + void (*usb_send_func)(MidiDevice *, uint16_t, uint8_t, uint8_t, uint8_t); + void (*usb_get_midi)(MidiDevice *); + void (*midi_usb_init)(MidiDevice *); +#endif } host_driver_t; #endif diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c index 14da3b8039..a33a16599e 100644 --- a/tmk_core/protocol/lufa/lufa.c +++ b/tmk_core/protocol/lufa/lufa.c @@ -1051,7 +1051,7 @@ int main(void) // MIDI_Task(); #endif -#ifdef RGBLIGHT_ENABLE +#ifdef RGBLIGHT_ANIMATIONS rgblight_task(); #endif |