Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add description in Bluetooth docs for requiring NKRO to be disabled #10359

Merged
merged 2 commits into from
Sep 22, 2020
Merged

Add description in Bluetooth docs for requiring NKRO to be disabled #10359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11fc7de
Add description in Bluetooth documentation for requiring NKRO to be d…
pwlandoll Sep 18, 2020
af17d3d
Remove NKRO_ENABLE if any Bluetooth rules are enabled
pwlandoll Sep 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion docs/feature_bluetooth.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ A Bluefruit UART friend can be converted to an SPI friend, however this [require

<!-- FIXME: Document bluetooth support more completely. -->
## 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
Expand Down
10 changes: 7 additions & 3 deletions tmk_core/common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down