diff options
author | tmk <nobody@nowhere> | 2013-07-28 17:55:49 +0200 |
---|---|---|
committer | tmk <nobody@nowhere> | 2013-07-28 17:55:49 +0200 |
commit | 893ff0a799d7d42452cd8d09934380e90d8d3935 (patch) | |
tree | 2252465e60650562ad7edd91ab4fbba991da429c /protocol/pjrc/usb_keyboard.c | |
parent | c7d309e34bf5d05f245811389bea495d814e2111 (diff) | |
parent | e7c2af78b704bfddb581559d42cc7cc31ffab0bf (diff) | |
download | qmk_firmware-893ff0a799d7d42452cd8d09934380e90d8d3935.tar.gz qmk_firmware-893ff0a799d7d42452cd8d09934380e90d8d3935.tar.xz |
Merge branch 'lufa_nkro'
Diffstat (limited to 'protocol/pjrc/usb_keyboard.c')
-rw-r--r-- | protocol/pjrc/usb_keyboard.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/protocol/pjrc/usb_keyboard.c b/protocol/pjrc/usb_keyboard.c index 49b85c179..de798fcc2 100644 --- a/protocol/pjrc/usb_keyboard.c +++ b/protocol/pjrc/usb_keyboard.c @@ -57,12 +57,12 @@ int8_t usb_keyboard_send_report(report_keyboard_t *report) #ifdef NKRO_ENABLE if (keyboard_nkro) - result = send_report(report, KBD2_ENDPOINT, 0, KBD2_REPORT_KEYS); + result = send_report(report, KBD2_ENDPOINT, 0, KBD2_SIZE); else #endif { if (usb_keyboard_protocol) - result = send_report(report, KBD_ENDPOINT, 0, KBD_REPORT_KEYS); + result = send_report(report, KBD_ENDPOINT, 0, KBD_SIZE); else result = send_report(report, KBD_ENDPOINT, 0, 6); } @@ -104,15 +104,8 @@ static inline int8_t send_report(report_keyboard_t *report, uint8_t endpoint, ui cli(); UENUM = endpoint; } - UEDATX = report->mods; -#ifdef NKRO_ENABLE - if (!keyboard_nkro) - UEDATX = 0; -#else - UEDATX = 0; -#endif for (uint8_t i = keys_start; i < keys_end; i++) { - UEDATX = report->keys[i]; + UEDATX = report->raw[i]; } UEINTX = 0x3A; SREG = intr_state; |