diff options
| author | Travis La Marr <exiva@exiva.net> | 2017-03-24 12:53:55 -0400 |
|---|---|---|
| committer | Travis La Marr <exiva@exiva.net> | 2017-03-24 12:53:55 -0400 |
| commit | ddc036b69ea508750f5129d9a43fee484148716a (patch) | |
| tree | 24cb80061dfa59b0fe81a73bd987c228571aad80 /quantum | |
| parent | 7a9437a2e3a2597e8eef1ea293bfb3c394f588b9 (diff) | |
| download | qmk_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 'quantum')
| -rw-r--r-- | quantum/quantum.c | 8 | ||||
| -rw-r--r-- | quantum/quantum_keycodes.h | 3 |
2 files changed, 0 insertions, 11 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c index 582f8920b..807a7084a 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c | |||
| @@ -294,14 +294,6 @@ bool process_record_quantum(keyrecord_t *record) { | |||
| 294 | return false; | 294 | return false; |
| 295 | break; | 295 | break; |
| 296 | #endif | 296 | #endif |
| 297 | #ifdef ADAFRUIT_BLE_ENABLE | ||
| 298 | case OUT_BLE: | ||
| 299 | if (record->event.pressed) { | ||
| 300 | set_output(OUTPUT_ADAFRUIT_BLE); | ||
| 301 | } | ||
| 302 | return false; | ||
| 303 | break; | ||
| 304 | #endif | ||
| 305 | #endif | 297 | #endif |
| 306 | case MAGIC_SWAP_CONTROL_CAPSLOCK ... MAGIC_TOGGLE_NKRO: | 298 | case MAGIC_SWAP_CONTROL_CAPSLOCK ... MAGIC_TOGGLE_NKRO: |
| 307 | if (record->event.pressed) { | 299 | if (record->event.pressed) { |
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index 903d57f1e..78b02a0de 100644 --- a/quantum/quantum_keycodes.h +++ b/quantum/quantum_keycodes.h | |||
| @@ -159,9 +159,6 @@ enum quantum_keycodes { | |||
| 159 | #ifdef BLUETOOTH_ENABLE | 159 | #ifdef BLUETOOTH_ENABLE |
| 160 | OUT_BT, | 160 | OUT_BT, |
| 161 | #endif | 161 | #endif |
| 162 | #ifdef ADAFRUIT_BLE_ENABLE | ||
| 163 | OUT_BLE, | ||
| 164 | #endif | ||
| 165 | 162 | ||
| 166 | // always leave at the end | 163 | // always leave at the end |
| 167 | SAFE_RANGE | 164 | SAFE_RANGE |
