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/matrix/m12og | |
parent | 7aa466515e30ba1687039b42ae83245697411950 (diff) | |
parent | a8d440e4e043dc8427f17c07631556d0ff3efc20 (diff) |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/matrix/m12og')
-rw-r--r-- | keyboards/matrix/m12og/rev1/rules.mk | 3 | ||||
-rw-r--r-- | keyboards/matrix/m12og/rev2/rules.mk | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/keyboards/matrix/m12og/rev1/rules.mk b/keyboards/matrix/m12og/rev1/rules.mk index ba9cf10cb2..0e0584b8c9 100644 --- a/keyboards/matrix/m12og/rev1/rules.mk +++ b/keyboards/matrix/m12og/rev1/rules.mk @@ -13,8 +13,7 @@ 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 -# 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 = yes # HAS TO BE ON! Otherwise the custom matrix doesn't work AUDIO_ENABLE = no # Audio output diff --git a/keyboards/matrix/m12og/rev2/rules.mk b/keyboards/matrix/m12og/rev2/rules.mk index 5d302da8b8..6970f247fe 100644 --- a/keyboards/matrix/m12og/rev2/rules.mk +++ b/keyboards/matrix/m12og/rev2/rules.mk @@ -12,7 +12,7 @@ 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 BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no RGBLIGHT_ENABLE = yes |