aboutsummaryrefslogtreecommitdiffstats
path: root/protocol/pjrc
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-11-28 10:42:41 +0900
committertmk <nobody@nowhere>2013-11-28 11:31:48 +0900
commit532e100450615ef1e63e2eed548c38d0c4fa688b (patch)
treef09b8e4dc51fdca6a6ba0647b92cd672c7008ce9 /protocol/pjrc
parent9d26053f1c14da79336a64f800305660d1a71180 (diff)
downloadfirmware-532e100450615ef1e63e2eed548c38d0c4fa688b.tar.gz
firmware-532e100450615ef1e63e2eed548c38d0c4fa688b.tar.bz2
firmware-532e100450615ef1e63e2eed548c38d0c4fa688b.zip
Add ps2_usart.c and fix set_led at USB wake
Diffstat (limited to 'protocol/pjrc')
-rw-r--r--protocol/pjrc/usb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/protocol/pjrc/usb.c b/protocol/pjrc/usb.c
index 84c99972f..393b36f78 100644
--- a/protocol/pjrc/usb.c
+++ b/protocol/pjrc/usb.c
@@ -662,8 +662,9 @@ ISR(USB_GEN_vect)
suspend_wakeup_init();
#ifdef SLEEP_LED_ENABLE
sleep_led_disable();
-#endif
+ // NOTE: converters may not accept this
led_set(host_keyboard_leds());
+#endif
UDIEN |= (1<<SUSPE);
UDIEN &= ~(1<<WAKEUPE);