diff options
| author | IBNobody <IBNobody@users.noreply.github.com> | 2016-09-06 23:19:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-06 23:19:01 -0500 |
| commit | 558f3ec1eb325caf706efc15e2fab26121aba442 (patch) | |
| tree | a14b00c189492426beadc69c2094055f833b811f /tmk_core/protocol/lufa/lufa.c | |
| parent | f0388a5b1334ce0b8c8a359a0a8a1460e456b8c5 (diff) | |
| download | qmk_firmware-558f3ec1eb325caf706efc15e2fab26121aba442.tar.gz qmk_firmware-558f3ec1eb325caf706efc15e2fab26121aba442.zip | |
Use keyboard config for nkro (#7)
* removing nkro references - wip
* changed NKRO to be defined by keymap_config
Diffstat (limited to 'tmk_core/protocol/lufa/lufa.c')
| -rw-r--r-- | tmk_core/protocol/lufa/lufa.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c index 9b201374a..01c0e45b0 100644 --- a/tmk_core/protocol/lufa/lufa.c +++ b/tmk_core/protocol/lufa/lufa.c | |||
| @@ -52,6 +52,13 @@ | |||
| 52 | #include "descriptor.h" | 52 | #include "descriptor.h" |
| 53 | #include "lufa.h" | 53 | #include "lufa.h" |
| 54 | 54 | ||
| 55 | #ifdef NKRO_ENABLE | ||
| 56 | #include "keycode_config.h" | ||
| 57 | |||
| 58 | extern keymap_config_t keymap_config; | ||
| 59 | #endif | ||
| 60 | |||
| 61 | |||
| 55 | #ifdef AUDIO_ENABLE | 62 | #ifdef AUDIO_ENABLE |
| 56 | #include <audio.h> | 63 | #include <audio.h> |
| 57 | #endif | 64 | #endif |
| @@ -502,7 +509,7 @@ static void send_keyboard(report_keyboard_t *report) | |||
| 502 | 509 | ||
| 503 | /* Select the Keyboard Report Endpoint */ | 510 | /* Select the Keyboard Report Endpoint */ |
| 504 | #ifdef NKRO_ENABLE | 511 | #ifdef NKRO_ENABLE |
| 505 | if (keyboard_protocol && keyboard_nkro) { | 512 | if (keyboard_protocol && keymap_config.nkro) { |
| 506 | /* Report protocol - NKRO */ | 513 | /* Report protocol - NKRO */ |
| 507 | Endpoint_SelectEndpoint(NKRO_IN_EPNUM); | 514 | Endpoint_SelectEndpoint(NKRO_IN_EPNUM); |
| 508 | 515 | ||
