summaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorPeter Eichinger <peter.eichinger@gmail.com>2016-01-25 17:46:50 +0100
committerPeter Eichinger <peter.eichinger@gmail.com>2016-01-25 17:46:50 +0100
commit78192791bc0bb98d7a469f88a77febb3250c5b93 (patch)
treec20d43cfa5cc4980f8dcf967832e8c913bb84bbe /tmk_core
parentc5f90eb99b282c7425e151b82f0ca22969a4a275 (diff)
parente9356dcad5769bc917ab9d3366013b5f193c3ef3 (diff)
Merge branch 'master' into flicker-fix
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/common.mk3
-rw-r--r--tmk_core/protocol/lufa/lufa.c7
2 files changed, 8 insertions, 2 deletions
diff --git a/tmk_core/common.mk b/tmk_core/common.mk
index edbcc282a5..89c366f554 100644
--- a/tmk_core/common.mk
+++ b/tmk_core/common.mk
@@ -53,6 +53,9 @@ ifdef MIDI_ENABLE
OPT_DEFS += -DMIDI_ENABLE
endif
+ifdef AUDIO_ENABLE
+ OPT_DEFS += -DAUDIO_ENABLE
+endif
ifdef USB_6KRO_ENABLE
OPT_DEFS += -DUSB_6KRO_ENABLE
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,