aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/protocol/lufa/lufa.c
diff options
context:
space:
mode:
authorJoshua T <[email protected]>2016-10-15 15:14:10 -0500
committerJoshua T <[email protected]>2016-10-15 15:14:10 -0500
commit2e6a1a53d73607030c470b88d3ed7223db5e0004 (patch)
treefd8ff310f0dba21f9135cdead49482af2276329b /tmk_core/protocol/lufa/lufa.c
parent5520b0022fc6cd3dff805eb31ed4bb7e4385ee2a (diff)
parent0a9ad8f335f5b5b9d184d9e5e9ece6cda149df7e (diff)
downloadqmk_firmware-2e6a1a53d73607030c470b88d3ed7223db5e0004.tar.gz
qmk_firmware-2e6a1a53d73607030c470b88d3ed7223db5e0004.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core/protocol/lufa/lufa.c')
-rw-r--r--tmk_core/protocol/lufa/lufa.c9
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);