diff options
| author |  Christopher Browne <cbbrowne@ca.afilias.info> | 2016-03-30 13:14:01 -0400 |
|---|---|---|
| committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-03-30 13:14:01 -0400 |
| commit | 5bbcc484a8e14ffb13354df4efdd460ebe7200e1 (patch) | |
| tree | 65b0a4c4e659b60038ec63706c46fb21de153598 /tmk_core/common/keyboard.c | |
| parent | 95a88c09e18a7531a64838ceaa52df37bad8dc0d (diff) | |
| parent | ae47275bf34549a0f66cb2f37daca299fd4ecdee (diff) | |
| download | qmk_firmware-5bbcc484a8e14ffb13354df4efdd460ebe7200e1.tar.gz | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'tmk_core/common/keyboard.c')
| -rw-r--r-- | tmk_core/common/keyboard.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c index eb7b096be..302b3ec87 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 + +#if defined(NKRO_ENABLE) && defined(FORCE_NKRO) + keyboard_nkro = true; +#endif + } /* |