summaryrefslogtreecommitdiffstats
path: root/tmk_core/common/keyboard.c
diff options
context:
space:
mode:
authorIBNobody <ibnobody@gmail.com>2016-03-28 07:03:21 +0200
committerIBNobody <ibnobody@gmail.com>2016-03-28 07:03:21 +0200
commit577971ab07a49405e1dcd8e5f75b3ecb87e710b9 (patch)
tree802120d4417cbd8e56305f2153b11b54564ef9e9 /tmk_core/common/keyboard.c
parentb7f0110d71bade83609d7a5c0b4243e521882e31 (diff)
downloadqmk_firmware-577971ab07a49405e1dcd8e5f75b3ecb87e710b9.tar.gz
qmk_firmware-577971ab07a49405e1dcd8e5f75b3ecb87e710b9.tar.xz
Magic Key Overrides / Keyboard Lock / Forced NKRO
Added Magic Key Overrides / Magic Key Cleanup / Added Keyboard Lock option to template / Added forced NKRO option to template (disabled by default)
Diffstat (limited to 'tmk_core/common/keyboard.c')
-rw-r--r--tmk_core/common/keyboard.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c
index eb7b096be..e66808485 100644
--- a/tmk_core/common/keyboard.c
+++ b/tmk_core/common/keyboard.c
@@ -70,6 +70,7 @@ void keyboard_setup(void)
void keyboard_init(void)
{
+
timer_init();
matrix_init();
#ifdef PS2_MOUSE_ENABLE
@@ -90,6 +91,11 @@ void keyboard_init(void)
#ifdef BACKLIGHT_ENABLE
backlight_init();
#endif
+
+#ifdef FORCE_NKRO
+ keyboard_nkro = true;
+#endif
+
}
/*