summaryrefslogtreecommitdiff
path: root/tmk_core/protocol
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-01-23 20:37:00 -0500
committerJack Humbert <jack.humb@gmail.com>2016-01-23 20:37:00 -0500
commit9a1ae948c9e19d3153512c196801a969c9637732 (patch)
tree948641e82788ee298468da9090749f79ad765c00 /tmk_core/protocol
parente5aee62e54d0b6f02ff170f4e9bf1e738d36fb4c (diff)
parentae620fe8562254a5c00a48b863cabd4c87abd613 (diff)
Merge pull request #104 from jackhumbert/smarkefile
Rework Planck file structure
Diffstat (limited to 'tmk_core/protocol')
-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 f04790f4e8..5d40dcf7b2 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -52,8 +52,8 @@
#include "descriptor.h"
#include "lufa.h"
-#ifdef MIDI_ENABLE
- #include <beeps.h>
+#ifdef AUDIO_ENABLE
+ #include <audio.h>
#endif
#ifdef BLUETOOTH_ENABLE
@@ -946,6 +946,8 @@ int main(void)
#ifdef MIDI_ENABLE
void fallthrough_callback(MidiDevice * device,
uint16_t cnt, uint8_t byte0, uint8_t byte1, uint8_t byte2){
+
+#ifdef AUDIO_ENABLE
if (cnt == 3) {
switch (byte0 & 0xF0) {
case MIDI_NOTEON:
@@ -959,6 +961,7 @@ void fallthrough_callback(MidiDevice * device,
if (byte0 == MIDI_STOP) {
stop_all_notes();
}
+#endif
}
void cc_callback(MidiDevice * device,