diff options
| -rw-r--r-- | docs/feature_bluetooth.md | 5 | ||||
| -rw-r--r-- | tmk_core/common.mk | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/docs/feature_bluetooth.md b/docs/feature_bluetooth.md index 7b450b1ac..08e5f24ac 100644 --- a/docs/feature_bluetooth.md +++ b/docs/feature_bluetooth.md | |||
| @@ -26,7 +26,10 @@ A Bluefruit UART friend can be converted to an SPI friend, however this [require | |||
| 26 | 26 | ||
| 27 | <!-- FIXME: Document bluetooth support more completely. --> | 27 | <!-- FIXME: Document bluetooth support more completely. --> |
| 28 | ## Bluetooth Rules.mk Options | 28 | ## Bluetooth Rules.mk Options |
| 29 | Use only one of these | 29 | |
| 30 | The currently supported Bluetooth chipsets do not support [N-Key Rollover (NKRO)](reference_glossary.md#n-key-rollover-nkro), so `rules.mk` must contain `NKRO_ENABLE = no`. | ||
| 31 | |||
| 32 | Use only one of these to enable Bluetooth: | ||
| 30 | * BLUETOOTH_ENABLE = yes (Legacy Option) | 33 | * BLUETOOTH_ENABLE = yes (Legacy Option) |
| 31 | * BLUETOOTH = RN42 | 34 | * BLUETOOTH = RN42 |
| 32 | * BLUETOOTH = AdafruitBLE | 35 | * BLUETOOTH = AdafruitBLE |
diff --git a/tmk_core/common.mk b/tmk_core/common.mk index c60a1c405..fdf2aa097 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk | |||
| @@ -99,11 +99,15 @@ ifeq ($(strip $(COMMAND_ENABLE)), yes) | |||
| 99 | endif | 99 | endif |
| 100 | 100 | ||
| 101 | ifeq ($(strip $(NKRO_ENABLE)), yes) | 101 | ifeq ($(strip $(NKRO_ENABLE)), yes) |
| 102 | ifneq ($(PROTOCOL),VUSB) | 102 | ifeq ($(PROTOCOL), VUSB) |
| 103 | $(info NKRO is not currently supported on V-USB, and has been disabled.) | ||
| 104 | else ifeq ($(strip $(BLUETOOTH_ENABLE)), yes) | ||
| 105 | $(info NKRO is not currently supported with Bluetooth, and has been disabled.) | ||
| 106 | else ifneq ($(BLUETOOTH),) | ||
| 107 | $(info NKRO is not currently supported with Bluetooth, and has been disabled.) | ||
| 108 | else | ||
| 103 | TMK_COMMON_DEFS += -DNKRO_ENABLE | 109 | TMK_COMMON_DEFS += -DNKRO_ENABLE |
| 104 | SHARED_EP_ENABLE = yes | 110 | SHARED_EP_ENABLE = yes |
| 105 | else | ||
| 106 | $(info NKRO is not currently supported on V-USB, and has been disabled.) | ||
| 107 | endif | 111 | endif |
| 108 | endif | 112 | endif |
| 109 | 113 | ||
