diff options
| author | Travis La Marr <exiva@exiva.net> | 2017-03-24 17:53:55 +0100 |
|---|---|---|
| committer | Travis La Marr <exiva@exiva.net> | 2017-03-24 17:53:55 +0100 |
| commit | ddc036b69ea508750f5129d9a43fee484148716a (patch) | |
| tree | 24cb80061dfa59b0fe81a73bd987c228571aad80 /tmk_core/protocol/lufa/outputselect.c | |
| parent | 7a9437a2e3a2597e8eef1ea293bfb3c394f588b9 (diff) | |
| download | qmk_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/protocol/lufa/outputselect.c')
| -rw-r--r-- | tmk_core/protocol/lufa/outputselect.c | 6 |
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/>. #include "lufa.h" #include "outputselect.h" -#ifdef ADAFRUIT_BLE_ENABLE +#ifdef MODULE_ADAFRUIT_BLE #include "adafruit_ble.h" #endif @@ -34,9 +34,9 @@ uint8_t auto_detect_output(void) { return OUTPUT_USB; } -#ifdef ADAFRUIT_BLE_ENABLE +#ifdef MODULE_ADAFRUIT_BLE if (adafruit_ble_is_connected()) { - return OUTPUT_ADAFRUIT_BLE; + return OUTPUT_BLUETOOTH; } #endif |