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/hhkb | |
| parent | 7aa466515e30ba1687039b42ae83245697411950 (diff) | |
| parent | a8d440e4e043dc8427f17c07631556d0ff3efc20 (diff) | |
| download | qmk_firmware-c394bf1c986c15d486a004f264e06f7b36a453eb.tar.gz qmk_firmware-c394bf1c986c15d486a004f264e06f7b36a453eb.zip | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/hhkb')
| -rw-r--r-- | keyboards/hhkb/ansi/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/hhkb/jp/rules.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/hhkb/ansi/rules.mk b/keyboards/hhkb/ansi/rules.mk index a7b43baad9..1eed08104e 100644 --- a/keyboards/hhkb/ansi/rules.mk +++ b/keyboards/hhkb/ansi/rules.mk @@ -13,7 +13,7 @@ EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = yes # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration CUSTOM_MATRIX = yes # Custom matrix file for the HHKB -# NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # Enable N-Key Rollover # BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality # HHKB_RN42_ENABLE = yes # Enable support for hasu's BT alt controller -- code borrowed from tmk source tree. diff --git a/keyboards/hhkb/jp/rules.mk b/keyboards/hhkb/jp/rules.mk index f7df5ba65b..4a42e974db 100644 --- a/keyboards/hhkb/jp/rules.mk +++ b/keyboards/hhkb/jp/rules.mk @@ -13,7 +13,7 @@ EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = yes # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration CUSTOM_MATRIX = yes # Custom matrix file for the HHKB -# NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # Enable N-Key Rollover # BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality # HHKB_RN42_ENABLE = yes # Enable support for hasu's BT alt controller -- code borrowed from tmk source tree. |