diff options
| author |  Jack Humbert <jack.humb@gmail.com> | 2016-03-30 00:45:48 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-03-30 00:45:48 -0400 |
| commit | e7377dc24b4aaf97f9c48ef7db78b7b6cbabe748 (patch) | |
| tree | 7774668076bb8c8d2331028bb540510c078e60be /tmk_core/common/keyboard.c | |
| parent | b8ac5095708b5023f5e3e375b22534f8b395741f (diff) | |
| parent | 4a676746a6d8c9b47956f863ead335e995677c53 (diff) | |
| download | qmk_firmware-e7377dc24b4aaf97f9c48ef7db78b7b6cbabe748.tar.gz | |
Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard
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 + } /* |