From 71a8fd8b1286926bd21edce3d2ec7423d8ca4eef Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Fri, 23 Oct 2015 20:12:04 -0400 Subject: bluetooth working with usb --- keyboard/planck/Makefile | 20 +++++------------- keyboard/planck/config.h | 4 ++-- keyboard/planck/keymaps/keymap_lock.c | 40 +++++++++++++++++------------------ 3 files changed, 27 insertions(+), 37 deletions(-) (limited to 'keyboard/planck') diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile index d9e8ce7889..3ac4540e16 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 diff --git a/keyboard/planck/config.h b/keyboard/planck/config.h index 0a1a6a9357..cc3a1741a2 100644 --- a/keyboard/planck/config.h +++ b/keyboard/planck/config.h @@ -131,10 +131,10 @@ along with this program. If not, see . */ /* disable debug print */ -// #define NO_DEBUG +#define NO_DEBUG /* disable print */ -// #define NO_PRINT +#define NO_PRINT /* disable action features */ //#define NO_ACTION_LAYER diff --git a/keyboard/planck/keymaps/keymap_lock.c b/keyboard/planck/keymaps/keymap_lock.c index b844d1cdab..cc9be55f64 100644 --- a/keyboard/planck/keymaps/keymap_lock.c +++ b/keyboard/planck/keymaps/keymap_lock.c @@ -75,33 +75,33 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) default_layer_and(0); default_layer_or((1<<5)); - uint8_t low = boot_lock_fuse_bits_get(0x0000); - uint8_t high = boot_lock_fuse_bits_get(0x0003); - uint8_t ext = boot_lock_fuse_bits_get(0x0002); - uint8_t lock = boot_lock_fuse_bits_get(0x0001); + // uint8_t low = boot_lock_fuse_bits_get(0x0000); + // uint8_t high = boot_lock_fuse_bits_get(0x0003); + // uint8_t ext = boot_lock_fuse_bits_get(0x0002); + // uint8_t lock = boot_lock_fuse_bits_get(0x0001); - register_code(hextokeycode((low & 0xF0) >> 4)); - unregister_code(hextokeycode((low & 0xF0) >> 4)); - register_code(hextokeycode((low & 0x0F))); - unregister_code(hextokeycode((low & 0x0F))); + // register_code(hextokeycode((low & 0xF0) >> 4)); + // unregister_code(hextokeycode((low & 0xF0) >> 4)); + // register_code(hextokeycode((low & 0x0F))); + // unregister_code(hextokeycode((low & 0x0F))); - register_code(hextokeycode((high & 0xF0) >> 4)); - unregister_code(hextokeycode((high & 0xF0) >> 4)); - register_code(hextokeycode((high & 0x0F))); - unregister_code(hextokeycode((high & 0x0F))); + // register_code(hextokeycode((high & 0xF0) >> 4)); + // unregister_code(hextokeycode((high & 0xF0) >> 4)); + // register_code(hextokeycode((high & 0x0F))); + // unregister_code(hextokeycode((high & 0x0F))); - register_code(hextokeycode((ext & 0xF0) >> 4)); - unregister_code(hextokeycode((ext & 0xF0) >> 4)); - register_code(hextokeycode((ext & 0x0F))); - unregister_code(hextokeycode((ext & 0x0F))); + // register_code(hextokeycode((ext & 0xF0) >> 4)); + // unregister_code(hextokeycode((ext & 0xF0) >> 4)); + // register_code(hextokeycode((ext & 0x0F))); + // unregister_code(hextokeycode((ext & 0x0F))); - register_code(hextokeycode((lock & 0xF0) >> 4)); - unregister_code(hextokeycode((lock & 0xF0) >> 4)); - register_code(hextokeycode((lock & 0x0F))); - unregister_code(hextokeycode((lock & 0x0F))); + // register_code(hextokeycode((lock & 0xF0) >> 4)); + // unregister_code(hextokeycode((lock & 0xF0) >> 4)); + // register_code(hextokeycode((lock & 0x0F))); + // unregister_code(hextokeycode((lock & 0x0F))); // note(0+12, 20); // note(0+24, 20); -- cgit v1.2.3