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/pjrc/usb_keyboard.c | |
| parent | a10e100bd5e8bad73e1b04f54639a4cec36e4b9e (diff) | |
| parent | 35e6870e5c8943c044187256e01c96ef400ca067 (diff) | |
Merge branch 'master' into coderkun_neo2
Diffstat (limited to 'tmk_core/protocol/pjrc/usb_keyboard.c')
| -rw-r--r-- | tmk_core/protocol/pjrc/usb_keyboard.c | 8 |
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 |