diff options
author | fauxpark <[email protected]> | 2021-12-09 17:24:05 +1100 |
---|---|---|
committer | fauxpark <[email protected]> | 2021-12-09 17:24:05 +1100 |
commit | c394bf1c986c15d486a004f264e06f7b36a453eb (patch) | |
tree | 15f5f39fc9ab594b4fed749f6deec8f599086bdd /keyboards/basekeys/slice | |
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/basekeys/slice')
-rw-r--r-- | keyboards/basekeys/slice/rev1/rules.mk | 3 | ||||
-rw-r--r-- | keyboards/basekeys/slice/rev1_rgb/rules.mk | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/keyboards/basekeys/slice/rev1/rules.mk b/keyboards/basekeys/slice/rev1/rules.mk index 4c0cd010f3..01089b4529 100644 --- a/keyboards/basekeys/slice/rev1/rules.mk +++ b/keyboards/basekeys/slice/rev1/rules.mk @@ -15,5 +15,4 @@ 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 diff --git a/keyboards/basekeys/slice/rev1_rgb/rules.mk b/keyboards/basekeys/slice/rev1_rgb/rules.mk index 1000b7bf54..d4dade7602 100644 --- a/keyboards/basekeys/slice/rev1_rgb/rules.mk +++ b/keyboards/basekeys/slice/rev1_rgb/rules.mk @@ -15,8 +15,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 RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow OLED_ENABLE = yes OLED_DRIVER = SSD1306 # Disable OLED driver. |