From 11fc7debeef85100ffa080a3f76f49a0747ad40f Mon Sep 17 00:00:00 2001 From: Peter Landoll Date: Fri, 18 Sep 2020 16:37:23 -0400 Subject: [PATCH 1/2] Add description in Bluetooth documentation for requiring NKRO to be disabled --- docs/feature_bluetooth.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/feature_bluetooth.md b/docs/feature_bluetooth.md index 7b450b1ac8fc..08e5f24ac558 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 ## Bluetooth Rules.mk Options -Use only one of these + +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`. + +Use only one of these to enable Bluetooth: * BLUETOOTH_ENABLE = yes (Legacy Option) * BLUETOOTH = RN42 * BLUETOOTH = AdafruitBLE From af17d3dc99ced5cb5892480bbfd96766ec2f5c0e Mon Sep 17 00:00:00 2001 From: Peter Landoll Date: Sun, 20 Sep 2020 10:35:19 -0400 Subject: [PATCH 2/2] Remove NKRO_ENABLE if any Bluetooth rules are enabled --- tmk_core/common.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tmk_core/common.mk b/tmk_core/common.mk index c60a1c405254..fdf2aa09727f 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk @@ -99,11 +99,15 @@ ifeq ($(strip $(COMMAND_ENABLE)), yes) endif ifeq ($(strip $(NKRO_ENABLE)), yes) - ifneq ($(PROTOCOL),VUSB) + ifeq ($(PROTOCOL), VUSB) + $(info NKRO is not currently supported on V-USB, and has been disabled.) + else ifeq ($(strip $(BLUETOOTH_ENABLE)), yes) + $(info NKRO is not currently supported with Bluetooth, and has been disabled.) + else ifneq ($(BLUETOOTH),) + $(info NKRO is not currently supported with Bluetooth, and has been disabled.) + else TMK_COMMON_DEFS += -DNKRO_ENABLE SHARED_EP_ENABLE = yes - else - $(info NKRO is not currently supported on V-USB, and has been disabled.) endif endif