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/pjrc/usb_keyboard.c | |
| parent | 94af0194ddfe8f8a3069c926170d8995de5c1781 (diff) | |
| parent | c438a2a265b366c8e4594ce561feb896018983f0 (diff) | |
Merge remote-tracking branch 'origin/master'
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 |