aboutsummaryrefslogtreecommitdiffstats
path: root/tmk_core
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2020-07-22 13:57:47 -0700
committerJames Young <18669334+noroadsleft@users.noreply.github.com>2020-08-29 14:30:02 -0700
commit3c74edbc691502228b2d2c4d42d5888311f0ca4c (patch)
tree2eb771f065654d4ec37376f790a2219b9b5d962f /tmk_core
parent686a9d35ffe1cf834673be2991d7bf1025423ae6 (diff)
downloadfirmware-3c74edbc691502228b2d2c4d42d5888311f0ca4c.tar.gz
firmware-3c74edbc691502228b2d2c4d42d5888311f0ca4c.tar.bz2
firmware-3c74edbc691502228b2d2c4d42d5888311f0ca4c.zip
Disable NKRO on V-USB controllers (#9054)
* Disable NKRO on V-USB controllers * not _currently_ supported text Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/common.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/tmk_core/common.mk b/tmk_core/common.mk
index b7fe45afd..56ed4a857 100644
--- a/tmk_core/common.mk
+++ b/tmk_core/common.mk
@@ -99,8 +99,12 @@ ifeq ($(strip $(COMMAND_ENABLE)), yes)
endif
ifeq ($(strip $(NKRO_ENABLE)), yes)
- TMK_COMMON_DEFS += -DNKRO_ENABLE
- SHARED_EP_ENABLE = yes
+ ifneq ($(PROTOCOL),VUSB)
+ 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
ifeq ($(strip $(USB_6KRO_ENABLE)), yes)