Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity

Merge pull request #1112 from newsboytko/newsboytko/midi-keycodes

Browse source 
Flesh out MIDI support
This commit is contained in:
Jack Humbert 2017-03-28 09:26:54 -04:00 • committed by GitHub
commit 7e37daa2ce
36 changed files with 1435 additions and 496 deletions
Download patch file Download diff file Expand all files Collapse all files

19
tmk_core/protocol/lufa/lufa.c
View file

@ -1096,16 +1096,23 @@ void cc_callback(MidiDevice * device,
uint8_t chan, uint8_t num, uint8_t val);
void sysex_callback(MidiDevice * device,
uint16_t start, uint8_t length, uint8_t * data);
void setup_midi(void)
{
#ifdef MIDI_ADVANCED
midi_init();
#endif
midi_device_init(&midi_device);
midi_device_set_send_func(&midi_device, usb_send_func);
midi_device_set_pre_input_process_func(&midi_device, usb_get_midi);
}
#endif
int main(void) __attribute__ ((weak));
int main(void)
{
#ifdef MIDI_ENABLE
midi_device_init(&midi_device);
midi_device_set_send_func(&midi_device, usb_send_func);
midi_device_set_pre_input_process_func(&midi_device, usb_get_midi);
setup_midi();
#endif
setup_mcu();
@ -1170,7 +1177,9 @@ int main(void)
#ifdef MIDI_ENABLE
midi_device_process(&midi_device);
// MIDI_Task();
#ifdef MIDI_ADVANCED
midi_task();
#endif
#endif
#if defined(RGBLIGHT_ANIMATIONS) & defined(RGBLIGHT_ENABLE)

2
tmk_core/protocol/lufa/lufa.h
View file

@ -49,7 +49,7 @@
#include <LUFA/Drivers/USB/USB.h>
#include "host.h"
#ifdef MIDI_ENABLE
#include "midi.h"
#include "process_midi.h"
#endif
#ifdef __cplusplus
extern "C" {