diff options
author | Jack Humbert <jack.humb@gmail.com> | 2015-10-23 20:12:04 -0400 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2015-10-23 20:12:04 -0400 |
commit | 71a8fd8b1286926bd21edce3d2ec7423d8ca4eef (patch) | |
tree | 14c7ce66ad9224f0f957d0437d9be910416140a7 /keyboard/planck/Makefile | |
parent | bbb21f60e9834a25157fe9043e794b67f1ad615e (diff) | |
download | firmware-71a8fd8b1286926bd21edce3d2ec7423d8ca4eef.tar.gz firmware-71a8fd8b1286926bd21edce3d2ec7423d8ca4eef.tar.bz2 firmware-71a8fd8b1286926bd21edce3d2ec7423d8ca4eef.zip |
bluetooth working with usb
Diffstat (limited to 'keyboard/planck/Makefile')
-rw-r--r-- | keyboard/planck/Makefile | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile index d9e8ce788..3ac4540e1 100644 --- a/keyboard/planck/Makefile +++ b/keyboard/planck/Makefile @@ -124,13 +124,13 @@ COMMAND_ENABLE = yes # Commands for debug and configuration # SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend # NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -# MIDI_ENABLE = YES # MIDI controls +MIDI_ENABLE = YES # MIDI controls # UNICODE_ENABLE = YES # Unicode -# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID +BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID ifdef MIDI_ENABLE - SRC += keymap_midi.c - # beeps.c + SRC += keymap_midi.c \ + beeps.c endif ifdef UNICODE_ENABLE @@ -144,17 +144,7 @@ endif VPATH += $(TARGET_DIR) VPATH += $(TOP_DIR) - - -ifdef BLUETOOTH_ENABLE - BLUEFRUIT_TRACE_SERIAL=true - - include $(TOP_DIR)/protocol.mk - include $(TOP_DIR)/protocol/bluefruit.mk - include $(TOP_DIR)/protocol.mk -else - include $(TOP_DIR)/protocol/lufa.mk -endif +include $(TOP_DIR)/protocol/lufa.mk include $(TOP_DIR)/common.mk include $(TOP_DIR)/rules.mk |