diff options
| author | Alex Johnstone <alexjj@gmail.com> | 2016-04-05 07:44:37 -0700 |
|---|---|---|
| committer | Alex Johnstone <alexjj@gmail.com> | 2016-04-05 07:44:37 -0700 |
| commit | 1facc53a26294df7fb2a42f8f3d025176b8c384a (patch) | |
| tree | 98eebfa4beb49524c1345c2dd9e93d1fb8aa445a /tmk_core/common/keyboard.c | |
| parent | 48899673af8b82638d601455f405f03db165bd57 (diff) | |
| parent | 931b0a79fc071498c229b0051be0ebadd934a549 (diff) | |
Merge pull request #5 from jackhumbert/master
Sync with upstream
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 eb7b096bed..302b3ec87c 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 + } /* |