diff options
author | fauxpark <fauxpark@gmail.com> | 2021-12-09 17:24:05 +1100 |
---|---|---|
committer | fauxpark <fauxpark@gmail.com> | 2021-12-09 17:24:05 +1100 |
commit | c394bf1c986c15d486a004f264e06f7b36a453eb (patch) | |
tree | 15f5f39fc9ab594b4fed749f6deec8f599086bdd /keyboards/kinesis | |
parent | 7aa466515e30ba1687039b42ae83245697411950 (diff) | |
parent | a8d440e4e043dc8427f17c07631556d0ff3efc20 (diff) |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/kinesis')
-rw-r--r-- | keyboards/kinesis/keymaps/default/rules.mk | 2 | ||||
-rw-r--r-- | keyboards/kinesis/keymaps/default_pretty/rules.mk | 2 | ||||
-rw-r--r-- | keyboards/kinesis/nguyenvietyen/rules.mk | 2 | ||||
-rw-r--r-- | keyboards/kinesis/rules.mk | 3 |
4 files changed, 4 insertions, 5 deletions
diff --git a/keyboards/kinesis/keymaps/default/rules.mk b/keyboards/kinesis/keymaps/default/rules.mk index e8c8974383..adb07adf7d 100644 --- a/keyboards/kinesis/keymaps/default/rules.mk +++ b/keyboards/kinesis/keymaps/default/rules.mk @@ -3,7 +3,7 @@ MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/kinesis/keymaps/default_pretty/rules.mk b/keyboards/kinesis/keymaps/default_pretty/rules.mk index e8c8974383..adb07adf7d 100644 --- a/keyboards/kinesis/keymaps/default_pretty/rules.mk +++ b/keyboards/kinesis/keymaps/default_pretty/rules.mk @@ -3,7 +3,7 @@ MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/kinesis/nguyenvietyen/rules.mk b/keyboards/kinesis/nguyenvietyen/rules.mk index 855c7072a5..65018bc3cc 100644 --- a/keyboards/kinesis/nguyenvietyen/rules.mk +++ b/keyboards/kinesis/nguyenvietyen/rules.mk @@ -11,7 +11,7 @@ BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite MOUSEKEY_ENABLE = yes EXTRAKEY_ENABLE = yes COMMAND_ENABLE = yes -NKRO_ENABLE = yes +NKRO_ENABLE = yes # Enable N-Key Rollover SLEEP_LED_ENABLE = yes CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/kinesis/rules.mk b/keyboards/kinesis/rules.mk index e57dce6962..129e08635d 100644 --- a/keyboards/kinesis/rules.mk +++ b/keyboards/kinesis/rules.mk @@ -12,8 +12,7 @@ MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no -# 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 AUDIO_ENABLE = no # Audio output |