diff options
| author | coderkun <olli@coderkun.de> | 2016-10-02 10:04:29 +0200 |
|---|---|---|
| committer | coderkun <olli@coderkun.de> | 2016-10-02 10:04:29 +0200 |
| commit | 8655677584483e46d9b45873aa50ec6e860486dd (patch) | |
| tree | 3f1037d47607fd40be82fe9169795978f8f3551f /tmk_core/protocol/lufa/lufa.c | |
| parent | a10e100bd5e8bad73e1b04f54639a4cec36e4b9e (diff) | |
| parent | 35e6870e5c8943c044187256e01c96ef400ca067 (diff) | |
Merge branch 'master' into coderkun_neo2
Diffstat (limited to 'tmk_core/protocol/lufa/lufa.c')
| -rw-r--r-- | tmk_core/protocol/lufa/lufa.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c index 9b201374a2..01c0e45b0b 100644 --- a/tmk_core/protocol/lufa/lufa.c +++ b/tmk_core/protocol/lufa/lufa.c @@ -52,6 +52,13 @@ #include "descriptor.h" #include "lufa.h" +#ifdef NKRO_ENABLE + #include "keycode_config.h" + + extern keymap_config_t keymap_config; +#endif + + #ifdef AUDIO_ENABLE #include <audio.h> #endif @@ -502,7 +509,7 @@ static void send_keyboard(report_keyboard_t *report) /* Select the Keyboard Report Endpoint */ #ifdef NKRO_ENABLE - if (keyboard_protocol && keyboard_nkro) { + if (keyboard_protocol && keymap_config.nkro) { /* Report protocol - NKRO */ Endpoint_SelectEndpoint(NKRO_IN_EPNUM); |