aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/protocol/lufa/lufa.c
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-01-20 00:06:52 -0500
committerJack Humbert <jack.humb@gmail.com>2016-01-20 00:06:52 -0500
commiteb61700912f1713ba27d34c23d7f07be66ee6513 (patch)
tree7781c85a3e67a3af34a31a09d6736f07b6a492fe /tmk_core/protocol/lufa/lufa.c
parent6e3c36360ed291b9ca2bd014571236308a933d0c (diff)
downloadqmk_firmware-eb61700912f1713ba27d34c23d7f07be66ee6513.tar.gz
qmk_firmware-eb61700912f1713ba27d34c23d7f07be66ee6513.zip
better integrations
Diffstat (limited to 'tmk_core/protocol/lufa/lufa.c')
-rw-r--r--tmk_core/protocol/lufa/lufa.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index f04790f4e..5d40dcf7b 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -52,8 +52,8 @@
52#include "descriptor.h" 52#include "descriptor.h"
53#include "lufa.h" 53#include "lufa.h"
54 54
55#ifdef MIDI_ENABLE 55#ifdef AUDIO_ENABLE
56 #include <beeps.h> 56 #include <audio.h>
57#endif 57#endif
58 58
59#ifdef BLUETOOTH_ENABLE 59#ifdef BLUETOOTH_ENABLE
@@ -946,6 +946,8 @@ int main(void)
946#ifdef MIDI_ENABLE 946#ifdef MIDI_ENABLE
947void fallthrough_callback(MidiDevice * device, 947void fallthrough_callback(MidiDevice * device,
948 uint16_t cnt, uint8_t byte0, uint8_t byte1, uint8_t byte2){ 948 uint16_t cnt, uint8_t byte0, uint8_t byte1, uint8_t byte2){
949
950#ifdef AUDIO_ENABLE
949 if (cnt == 3) { 951 if (cnt == 3) {
950 switch (byte0 & 0xF0) { 952 switch (byte0 & 0xF0) {
951 case MIDI_NOTEON: 953 case MIDI_NOTEON:
@@ -959,6 +961,7 @@ void fallthrough_callback(MidiDevice * device,
959 if (byte0 == MIDI_STOP) { 961 if (byte0 == MIDI_STOP) {
960 stop_all_notes(); 962 stop_all_notes();
961 } 963 }
964#endif
962} 965}
963 966
964void cc_callback(MidiDevice * device, 967void cc_callback(MidiDevice * device,