Merge remote-tracking branch 'origin/master' into develop

4 years ago · 706bceeff8
parent 1ac1f92000 f7a5ec2483
commit 706bceeff8
2 changed files with 2 additions and 0 deletions
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/config.h
@ -3,4 +3,5 @@

 #pragma once

+#define TAPPING_TERM 150
 #define UNICODE_SELECTED_MODES UC_LNX
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/rules.mk
@ -1,2 +1,3 @@
 MOUSEKEY_ENABLE = no
+NKRO_ENABLE = yes
 UNICODE_ENABLE = yes