aboutsummaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorGabriel Young <gabeplaysdrums@live.com>2017-02-25 15:02:43 -0800
committerGabriel Young <gabeplaysdrums@live.com>2017-02-25 15:02:43 -0800
commit525be99ee938aa6e48448d7dd6ea6e6fe50bb36d (patch)
tree8842033e455e5a2546894d03b701ae8fe2f565a7 /tmk_core
parent64eecfc5303788bd82bf2fb466ec4a6f1bd0c028 (diff)
downloadqmk_firmware-525be99ee938aa6e48448d7dd6ea6e6fe50bb36d.tar.gz
qmk_firmware-525be99ee938aa6e48448d7dd6ea6e6fe50bb36d.zip
Split MIDI functionality into MIDI_BASIC and MIDI_ADVANCED
MIDI_ENABLE = no text data bss dec hex filename 0 17080 0 17080 42b8 satan_midi.hex MIDI_ENABLE = yes MIDI_BASIC undefined MIDI_ADVANCED undefined text data bss dec hex filename 0 19494 0 19494 4c26 satan_midi.hex MIDI_ENABLE = yes #define MIDI_BASIC MIDI_ADVANCED undefined text data bss dec hex filename 0 19788 0 19788 4d4c satan_midi.hex MIDI_ENABLE = yes MIDI_BASIC undefined #define MIDI_ADVANCED text data bss dec hex filename 0 20846 0 20846 516e satan_midi.hex MIDI_ENABLE = yes #define MIDI_BASIC #define MIDI_ADVANCED text data bss dec hex filename 0 21140 0 21140 5294 satan_midi.hex
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/protocol/lufa/lufa.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index bd2498057..651a0f347 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -1104,7 +1104,9 @@ void sysex_callback(MidiDevice * device,
1104 1104
1105void setup_midi(void) 1105void setup_midi(void)
1106{ 1106{
1107#ifdef MIDI_ADVANCED
1107 midi_init(); 1108 midi_init();
1109#endif
1108 midi_device_init(&midi_device); 1110 midi_device_init(&midi_device);
1109 midi_device_set_send_func(&midi_device, usb_send_func); 1111 midi_device_set_send_func(&midi_device, usb_send_func);
1110 midi_device_set_pre_input_process_func(&midi_device, usb_get_midi); 1112 midi_device_set_pre_input_process_func(&midi_device, usb_get_midi);
@@ -1180,8 +1182,10 @@ int main(void)
1180 1182
1181#ifdef MIDI_ENABLE 1183#ifdef MIDI_ENABLE
1182 midi_device_process(&midi_device); 1184 midi_device_process(&midi_device);
1185#ifdef MIDI_ADVANCED
1183 midi_task(); 1186 midi_task();
1184#endif 1187#endif
1188#endif
1185 1189
1186#if defined(RGBLIGHT_ANIMATIONS) & defined(RGBLIGHT_ENABLE) 1190#if defined(RGBLIGHT_ANIMATIONS) & defined(RGBLIGHT_ENABLE)
1187 rgblight_task(); 1191 rgblight_task();