From 22854eb71b84a10ebad0f85841f2b99d38e1da8c Mon Sep 17 00:00:00 2001 From: tmk Date: Sun, 27 Apr 2014 05:07:27 +0900 Subject: NKRO is disable when SET_PROTOCOL(boot) - Command can force to enable NKRO even when boot mode - After boot keyboard may be in boot mode due to BIOS' request --- protocol/pjrc/usb.c | 3 +++ protocol/pjrc/usb_keyboard.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'protocol/pjrc') diff --git a/protocol/pjrc/usb.c b/protocol/pjrc/usb.c index b09ad3f233..2b267d4800 100644 --- a/protocol/pjrc/usb.c +++ b/protocol/pjrc/usb.c @@ -930,6 +930,9 @@ ISR(USB_COM_vect) } if (bRequest == HID_SET_PROTOCOL) { keyboard_protocol = wValue; +#ifdef NKRO_ENABLE + keyboard_nkro = !!keyboard_protocol; +#endif clear_keyboard(); //usb_wait_in_ready(); usb_send_in(); diff --git a/protocol/pjrc/usb_keyboard.c b/protocol/pjrc/usb_keyboard.c index c11995db6f..d168331879 100644 --- a/protocol/pjrc/usb_keyboard.c +++ b/protocol/pjrc/usb_keyboard.c @@ -56,7 +56,7 @@ int8_t usb_keyboard_send_report(report_keyboard_t *report) int8_t result = 0; #ifdef NKRO_ENABLE - if (keyboard_nkro && keyboard_protocol) + if (keyboard_nkro) result = send_report(report, KBD2_ENDPOINT, 0, KBD2_SIZE); else #endif -- cgit v1.2.3