aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/protocol/lufa/outputselect.c
diff options
context:
space:
mode:
authorTravis La Marr <exiva@exiva.net>2017-03-24 12:53:55 -0400
committerTravis La Marr <exiva@exiva.net>2017-03-24 12:53:55 -0400
commitddc036b69ea508750f5129d9a43fee484148716a (patch)
tree24cb80061dfa59b0fe81a73bd987c228571aad80 /tmk_core/protocol/lufa/outputselect.c
parent7a9437a2e3a2597e8eef1ea293bfb3c394f588b9 (diff)
downloadqmk_firmware-ddc036b69ea508750f5129d9a43fee484148716a.tar.gz
qmk_firmware-ddc036b69ea508750f5129d9a43fee484148716a.zip
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/protocol/lufa/outputselect.c')
-rw-r--r--tmk_core/protocol/lufa/outputselect.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tmk_core/protocol/lufa/outputselect.c b/tmk_core/protocol/lufa/outputselect.c
index 5d2457bff..0df5d3b75 100644
--- a/tmk_core/protocol/lufa/outputselect.c
+++ b/tmk_core/protocol/lufa/outputselect.c
@@ -14,7 +14,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
14 14
15#include "lufa.h" 15#include "lufa.h"
16#include "outputselect.h" 16#include "outputselect.h"
17#ifdef ADAFRUIT_BLE_ENABLE 17#ifdef MODULE_ADAFRUIT_BLE
18 #include "adafruit_ble.h" 18 #include "adafruit_ble.h"
19#endif 19#endif
20 20
@@ -34,9 +34,9 @@ uint8_t auto_detect_output(void) {
34 return OUTPUT_USB; 34 return OUTPUT_USB;
35 } 35 }
36 36
37#ifdef ADAFRUIT_BLE_ENABLE 37#ifdef MODULE_ADAFRUIT_BLE
38 if (adafruit_ble_is_connected()) { 38 if (adafruit_ble_is_connected()) {
39 return OUTPUT_ADAFRUIT_BLE; 39 return OUTPUT_BLUETOOTH;
40 } 40 }
41#endif 41#endif
42 42