summaryrefslogtreecommitdiffstats
path: root/tmk_core/protocol/pjrc/usb_keyboard.c
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-09-08 17:48:54 -0400
committerGitHub <noreply@github.com>2016-09-08 17:48:54 -0400
commit4a54ece4684478e29187d3b40ee07d6fa2c767f4 (patch)
tree6a0ab69e67fe3e8027ecc9b1bb1985965a50cb5b /tmk_core/protocol/pjrc/usb_keyboard.c
parent0f111182a6bf217a37513d5c39fdb3d2a715996e (diff)
parentfe2aed0d1c8d1535c160755b76186972071aed02 (diff)
Merge pull request #730 from IBNobody/master
Change NKRO Report Size = 32, User Print
Diffstat (limited to 'tmk_core/protocol/pjrc/usb_keyboard.c')
-rw-r--r--tmk_core/protocol/pjrc/usb_keyboard.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/tmk_core/protocol/pjrc/usb_keyboard.c b/tmk_core/protocol/pjrc/usb_keyboard.c
index 4b87b5d7b5..05f4797340 100644
--- a/tmk_core/protocol/pjrc/usb_keyboard.c
+++ b/tmk_core/protocol/pjrc/usb_keyboard.c
@@ -30,6 +30,12 @@
#include "util.h"
#include "host.h"
+#ifdef NKRO_ENABLE
+ #include "keycode_config.h"
+
+ extern keymap_config_t keymap_config;
+#endif
+
// protocol setting from the host. We use exactly the same report
// either way, so this variable only stores the setting since we
@@ -56,7 +62,7 @@ int8_t usb_keyboard_send_report(report_keyboard_t *report)
int8_t result = 0;
#ifdef NKRO_ENABLE
- if (keyboard_nkro)
+ if (keymap_config.nkro)
result = send_report(report, KBD2_ENDPOINT, 0, KBD2_SIZE);
else
#endif