diff options
| author | Damien <Dbroqua@users.noreply.github.com> | 2016-09-19 13:25:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-19 13:25:37 +0200 |
| commit | c438a2a265b366c8e4594ce561feb896018983f0 (patch) | |
| tree | f310e72223a25414f69c2dec70509fed26dc3960 /tmk_core/protocol/pjrc/usb_keyboard.c | |
| parent | af24ea558a65fea549bd9f57a9704b904972d2f7 (diff) | |
| parent | 5f9c2f63ffb2c58db73e67442134be58bfe2c129 (diff) | |
Merge pull request #4 from jackhumbert/master
Merge from jackhumbert
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 |