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/ergodox_stm32 | |
| 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/ergodox_stm32')
| -rw-r--r-- | keyboards/ergodox_stm32/rules.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/keyboards/ergodox_stm32/rules.mk b/keyboards/ergodox_stm32/rules.mk index 598a92a076..3a035cee01 100644 --- a/keyboards/ergodox_stm32/rules.mk +++ b/keyboards/ergodox_stm32/rules.mk @@ -12,9 +12,8 @@ MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # USB Nkey Rollover +NKRO_ENABLE = yes # Enable N-Key Rollover CUSTOM_MATRIX = yes # Custom matrix file -NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work UNICODE_ENABLE = yes # Unicode # Enter lower-power sleep mode when on the ChibiOS idle thread |