summaryrefslogtreecommitdiff
path: root/keyboards/converter/usb_usb
diff options
context:
space:
mode:
authorfauxpark <fauxpark@gmail.com>2021-12-09 17:24:05 +1100
committerfauxpark <fauxpark@gmail.com>2021-12-09 17:24:05 +1100
commitc394bf1c986c15d486a004f264e06f7b36a453eb (patch)
tree15f5f39fc9ab594b4fed749f6deec8f599086bdd /keyboards/converter/usb_usb
parent7aa466515e30ba1687039b42ae83245697411950 (diff)
parenta8d440e4e043dc8427f17c07631556d0ff3efc20 (diff)
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/converter/usb_usb')
-rw-r--r--keyboards/converter/usb_usb/ble/rules.mk3
-rw-r--r--keyboards/converter/usb_usb/rules.mk2
2 files changed, 2 insertions, 3 deletions
diff --git a/keyboards/converter/usb_usb/ble/rules.mk b/keyboards/converter/usb_usb/ble/rules.mk
index 6c1829a02c..596f719630 100644
--- a/keyboards/converter/usb_usb/ble/rules.mk
+++ b/keyboards/converter/usb_usb/ble/rules.mk
@@ -6,8 +6,7 @@ MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = no # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = no # USB Nkey Rollover
+NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/converter/usb_usb/rules.mk b/keyboards/converter/usb_usb/rules.mk
index 9f14764edf..9f024b96d8 100644
--- a/keyboards/converter/usb_usb/rules.mk
+++ b/keyboards/converter/usb_usb/rules.mk
@@ -12,7 +12,7 @@ BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
EXTRAKEY_ENABLE = yes # Audio control and System control
#CONSOLE_ENABLE = yes # Console for debug
#COMMAND_ENABLE = yes # Commands for debug and configuration
-#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
+NKRO_ENABLE = no # Enable N-Key Rollover
#BACKLIGHT_ENABLE = yes
USB_HID_ENABLE = yes
CUSTOM_MATRIX = yes