From ddc036b69ea508750f5129d9a43fee484148716a Mon Sep 17 00:00:00 2001
From: Travis La Marr <exiva@exiva.net>
Date: Fri, 24 Mar 2017 12:53:55 -0400
Subject: 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.
---
 tmk_core/common.mk | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'tmk_core/common.mk')

diff --git a/tmk_core/common.mk b/tmk_core/common.mk
index a86dccc616..2b0fda5f2d 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
-- 
cgit v1.2.3


From 43eee52cba8db46e9f305a56ca6623428e28cc2e Mon Sep 17 00:00:00 2001
From: Travis La Marr <exiva@exiva.net>
Date: Fri, 24 Mar 2017 17:14:57 -0400
Subject: Add BLE and EZKey module defines.

Also restored serial init back to original location. Was getting junk data.
---
 tmk_core/common.mk | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tmk_core/common.mk')

diff --git a/tmk_core/common.mk b/tmk_core/common.mk
index 2b0fda5f2d..47f6fc5719 100644
--- a/tmk_core/common.mk
+++ b/tmk_core/common.mk
@@ -99,10 +99,12 @@ endif
 
 ifeq ($(strip $(BLUETOOTH)), AdafruitBLE)
 		TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
+		TMK_COMMON_DEFS += -DMODULE_ADAFRUIT_BLE
 endif
 
 ifeq ($(strip $(BLUETOOTH)), AdafruitEZKey)
 		TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
+		TMK_COMMON_DEFS += -DMODULE_ADAFRUIT_EZKEY
 endif
 
 ifeq ($(strip $(ONEHAND_ENABLE)), yes)
-- 
cgit v1.2.3


From 71da013995ec72293ab1f3e2518a99d64ec486fb Mon Sep 17 00:00:00 2001
From: Travis La Marr <exiva@exiva.net>
Date: Wed, 29 Mar 2017 23:03:04 -0400
Subject: Add RN42 Bluetooth module support

Added support for sending HID keycodes over the RN42/reflashed HC05 module. Tested on OS X and iOS.
---
 tmk_core/common.mk | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'tmk_core/common.mk')

diff --git a/tmk_core/common.mk b/tmk_core/common.mk
index 47f6fc5719..3e0bd7dbc8 100644
--- a/tmk_core/common.mk
+++ b/tmk_core/common.mk
@@ -107,6 +107,11 @@ ifeq ($(strip $(BLUETOOTH)), AdafruitEZKey)
 		TMK_COMMON_DEFS += -DMODULE_ADAFRUIT_EZKEY
 endif
 
+ifeq ($(strip $(BLUETOOTH)), RN42)
+		TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
+		TMK_COMMON_DEFS += -DMODULE_RN42
+endif
+
 ifeq ($(strip $(ONEHAND_ENABLE)), yes)
     TMK_COMMON_DEFS += -DONEHAND_ENABLE
 endif
-- 
cgit v1.2.3