aboutsummaryrefslogtreecommitdiff
path: root/protocol/lufa
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-11-28 16:02:29 +0900
committertmk <nobody@nowhere>2013-11-28 16:02:29 +0900
commitbc5b64d83259715667356770965a33aa620a8030 (patch)
tree074377caef4d838ac3890f39e9ff67f346aab506 /protocol/lufa
parent4e36159be226e544dfebbe06b1955261951209a4 (diff)
parent0b9c0f6012a90eeb8cced9feccf3a65d8b4e5535 (diff)
downloadqmk_firmware-bc5b64d83259715667356770965a33aa620a8030.tar.gz
qmk_firmware-bc5b64d83259715667356770965a33aa620a8030.zip
Merge branch 'ps2_keyboard_fix'
Diffstat (limited to 'protocol/lufa')
-rw-r--r--protocol/lufa/lufa.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/protocol/lufa/lufa.c b/protocol/lufa/lufa.c
index 04e8e78f3..eca51c878 100644
--- a/protocol/lufa/lufa.c
+++ b/protocol/lufa/lufa.c
@@ -148,7 +148,6 @@ static void Console_Task(void)
148*/ 148*/
149void EVENT_USB_Device_Connect(void) 149void EVENT_USB_Device_Connect(void)
150{ 150{
151 led_set(0x1f); // all on
152} 151}
153 152
154void EVENT_USB_Device_Disconnect(void) 153void EVENT_USB_Device_Disconnect(void)
@@ -172,8 +171,9 @@ void EVENT_USB_Device_WakeUp()
172 171
173#ifdef SLEEP_LED_ENABLE 172#ifdef SLEEP_LED_ENABLE
174 sleep_led_disable(); 173 sleep_led_disable();
175#endif 174 // NOTE: converters may not accept this
176 led_set(host_keyboard_leds()); 175 led_set(host_keyboard_leds());
176#endif
177} 177}
178 178
179void EVENT_USB_Device_StartOfFrame(void) 179void EVENT_USB_Device_StartOfFrame(void)