diff options
| author |  Jack Humbert <jack.humb@gmail.com> | 2016-03-28 11:51:38 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-03-28 11:51:38 -0400 |
| commit | 5e2c497d9a3aeb26e1ac9f3d9840fa213e67a339 (patch) | |
| tree | 72e1966c5c95f5559ad3c01974980cba00e55c91 /tmk_core/common/keyboard.c | |
| parent | 6a824df99cd7b5da1a4d2cb02ede55578b7965df (diff) | |
| parent | 577971ab07a49405e1dcd8e5f75b3ecb87e710b9 (diff) | |
| download | qmk_firmware-5e2c497d9a3aeb26e1ac9f3d9840fa213e67a339.tar.gz | |
Merge pull request #217 from IBNobody/master
Master
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..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 + } /* |