diff options
| author | tmk <nobody@nowhere> | 2012-06-30 14:56:24 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2012-06-30 14:56:24 +0900 |
| commit | fca518f90dfc7f72132ff7950b000cfbd5709807 (patch) | |
| tree | 1c61e7b91f1f4986232a1fdca421b3346f8a9431 /common/keyboard.c | |
| parent | 76033dcd892a115240c5a990e5643cd53acbca87 (diff) | |
| parent | 2769f09d11a4c45362f2e6137f2469d057d8757e (diff) | |
Merge branch 'lufa'
Diffstat (limited to 'common/keyboard.c')
| -rw-r--r-- | common/keyboard.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/common/keyboard.c b/common/keyboard.c index 5c2643c951..25f32eb02f 100644 --- a/common/keyboard.c +++ b/common/keyboard.c @@ -49,6 +49,7 @@ void keyboard_proc(void) uint8_t fn_bits = 0; #ifdef EXTRAKEY_ENABLE uint16_t consumer_code = 0; + uint16_t system_code = 0; #endif matrix_scan(); @@ -89,22 +90,13 @@ void keyboard_proc(void) #ifdef HOST_PJRC if (suspend && remote_wakeup) { usb_remote_wakeup(); - } else { - host_system_send(SYSTEM_POWER_DOWN); } -#else - host_system_send(SYSTEM_POWER_DOWN); #endif - host_system_send(0); - _delay_ms(500); + system_code = SYSTEM_POWER_DOWN; } else if (code == KB_SYSTEM_SLEEP) { - host_system_send(SYSTEM_SLEEP); - host_system_send(0); - _delay_ms(500); + system_code = SYSTEM_SLEEP; } else if (code == KB_SYSTEM_WAKE) { - host_system_send(SYSTEM_WAKE_UP); - host_system_send(0); - _delay_ms(500); + system_code = SYSTEM_WAKE_UP; } // Consumer Page else if (code == KB_AUDIO_MUTE) { @@ -173,6 +165,7 @@ void keyboard_proc(void) host_send_keyboard_report(); #ifdef EXTRAKEY_ENABLE host_consumer_send(consumer_code); + host_system_send(system_code); #endif #ifdef DEBUG_LED // LED flash for debug |