diff options
| author | Stephan Bösebeck <sb@caluga.de> | 2016-03-28 22:29:18 +0200 |
|---|---|---|
| committer | Stephan Bösebeck <sb@caluga.de> | 2016-03-28 22:29:18 +0200 |
| commit | 37e68596ddefcaa9ac0289a8e17672804e475327 (patch) | |
| tree | a7d9016e1dbbdd11cefa6a963d86e00595b2c71a /tmk_core/common/keyboard.c | |
| parent | 94e96456b87c28299b426e8d0f047033f6d93d42 (diff) | |
| parent | 4a43c5684476611370820bd9592712754c211c52 (diff) | |
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 eb7b096bed..e668084858 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 + } /* |