Fix remotewakeup of PJRC stack(Fix #121)

[tmk_firmware.git] / protocol / pjrc / usb.c

diff --git a/protocol/pjrc/usb.c b/protocol/pjrc/usb.c
index b09ad3f233ffa82b5c80108bb2509db02540197b..1e6ba8719a2a124ef687e63916bc30dd037df120 100644 (file)
--- a/protocol/pjrc/usb.c
+++ b/protocol/pjrc/usb.c
@@ -629,6 +629,7 @@ uint8_t usb_configured(void)
 void usb_remote_wakeup(void)
 {
     UDCON |= (1<<RMWKUP);
+    while (UDCON & (1<<RMWKUP));
 }
 
 
@@ -930,6 +931,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();