X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=protocol%2Fpjrc%2Fusb.c;h=1e6ba8719a2a124ef687e63916bc30dd037df120;hb=eb90ed6238426db9367e294abfaefb5de07564f5;hp=b09ad3f233ffa82b5c80108bb2509db02540197b;hpb=5e3f2d2b2e5065a04495f2c55fae0849966b5d23;p=max%2Ftmk_keyboard.git

diff --git a/protocol/pjrc/usb.c b/protocol/pjrc/usb.c
index b09ad3f2..1e6ba871 100644
--- 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();