summaryrefslogtreecommitdiffstats
path: root/tmk_core/common.mk
diff options
context:
space:
mode:
authorTravis La Marr <exiva@exiva.net>2017-03-24 17:53:55 +0100
committerTravis La Marr <exiva@exiva.net>2017-03-24 17:53:55 +0100
commitddc036b69ea508750f5129d9a43fee484148716a (patch)
tree24cb80061dfa59b0fe81a73bd987c228571aad80 /tmk_core/common.mk
parent7a9437a2e3a2597e8eef1ea293bfb3c394f588b9 (diff)
downloadqmk_firmware-ddc036b69ea508750f5129d9a43fee484148716a.tar.gz
qmk_firmware-ddc036b69ea508750f5129d9a43fee484148716a.tar.xz
Refactor Bluetooth Handling
Refactored Bluetooth support to make adding new Bluetooth modules easier in the future. * Remove `OUT_BLE` key from QMK's keymap. `OUT_BT` is all we need now as there's no difference anymore. * Made BLUETOOTH_ENABLE build option legacy as not to break existing keymaps (Falls back to existing EZ Key support if on) * Removed `ADAFRUIT_BLE_ENABLE` build option * Created new build option `BLUETOOTH` with module option (Currently `AdafruitEZKey` & `AdafruitBLE`) * Moved all LUFA bluetooth key/mouse events under `BLUETOOTH_ENABLE` ifdef with selected modules output.
Diffstat (limited to 'tmk_core/common.mk')
-rw-r--r--tmk_core/common.mk12
1 files changed, 8 insertions, 4 deletions
diff --git a/tmk_core/common.mk b/tmk_core/common.mk
index a86dccc61..2b0fda5f2 100644
--- a/tmk_core/common.mk
+++ b/tmk_core/common.mk
@@ -93,14 +93,18 @@ ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
TMK_COMMON_DEFS += -DBACKLIGHT_ENABLE
endif
-ifeq ($(strip $(ADAFRUIT_BLE_ENABLE)), yes)
- TMK_COMMON_DEFS += -DADAFRUIT_BLE_ENABLE
-endif
-
ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
endif
+ifeq ($(strip $(BLUETOOTH)), AdafruitBLE)
+ TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
+endif
+
+ifeq ($(strip $(BLUETOOTH)), AdafruitEZKey)
+ TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
+endif
+
ifeq ($(strip $(ONEHAND_ENABLE)), yes)
TMK_COMMON_DEFS += -DONEHAND_ENABLE
endif