diff options
| author | dbroqua <dbroqua@mousur.org> | 2016-09-19 13:26:18 +0200 |
|---|---|---|
| committer | dbroqua <dbroqua@mousur.org> | 2016-09-19 13:26:18 +0200 |
| commit | 21b6e4c1f3225fed55926a4e6be2888d17fe5fd2 (patch) | |
| tree | 63504b528703a65c4addda6658a701e405bba44c /tmk_core/protocol/lufa/lufa.c | |
| parent | 94af0194ddfe8f8a3069c926170d8995de5c1781 (diff) | |
| parent | c438a2a265b366c8e4594ce561feb896018983f0 (diff) | |
Merge remote-tracking branch 'origin/master'
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); |