diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-01-23 20:34:05 -0500 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-01-23 20:34:05 -0500 |
| commit | 5143c59bdff8e0b8cb896b905ab643ab8293ea47 (patch) | |
| tree | 7082bac0facec617715d55deddca2b448ad880fa /tmk_core | |
| parent | 544a49329cac78206c0d195f2e7bfd39db05507d (diff) | |
| parent | c753bfcc144e4158a1e683c2c93b32667dc08388 (diff) | |
| download | firmware-5143c59bdff8e0b8cb896b905ab643ab8293ea47.tar.gz firmware-5143c59bdff8e0b8cb896b905ab643ab8293ea47.tar.bz2 firmware-5143c59bdff8e0b8cb896b905ab643ab8293ea47.zip | |
Merge branch 'audio' of https://github.com/jackhumbert/tmk_keyboard into smarkefile
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common.mk | 3 | ||||
| -rw-r--r-- | tmk_core/protocol/lufa/lufa.c | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/tmk_core/common.mk b/tmk_core/common.mk index edbcc282a..89c366f55 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 f04790f4e..5d40dcf7b 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, |