diff options
| author | Manuel Barkhau <mb@nexttuesday.de> | 2016-03-28 21:36:02 +0000 |
|---|---|---|
| committer | Manuel Barkhau <mb@nexttuesday.de> | 2016-03-28 21:36:02 +0000 |
| commit | 295036d4e3f11aa00392f3315f549b15fe66846f (patch) | |
| tree | 5e9144a61c12d8e26e93fbb16a5a79605702c7a4 /tmk_core/common/keyboard.c | |
| parent | 32c7832609414d02c19b6ec312daabc8c741b266 (diff) | |
| parent | 4a43c5684476611370820bd9592712754c211c52 (diff) | |
| download | qmk_firmware-295036d4e3f11aa00392f3315f549b15fe66846f.tar.gz qmk_firmware-295036d4e3f11aa00392f3315f549b15fe66846f.zip | |
Merge remote-tracking branch 'origin/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 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 + } /* |