aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2011-07-01 01:10:55 +0900
committertmk <nobody@nowhere>2011-07-01 01:10:55 +0900
commit1bda8a8c69e7b1e5e62233d9f5a63d0dca0ef4fb (patch)
tree26ce61a480fd4dced76f73fcc6824c67e5e083a8
parent6d45e05ede8ea1a96df9a04d58a7d7ede51afd9b (diff)
downloadqmk_firmware-1bda8a8c69e7b1e5e62233d9f5a63d0dca0ef4fb.tar.gz
qmk_firmware-1bda8a8c69e7b1e5e62233d9f5a63d0dca0ef4fb.zip
Add special keycodes for media control. Fix power down command.
-rwxr-xr-x[-rw-r--r--]command.c6
-rw-r--r--usb_keycodes.h17
2 files changed, 23 insertions, 0 deletions
diff --git a/command.c b/command.c
index ca149dbd0..2d065ed28 100644..100755
--- a/command.c
+++ b/command.c
@@ -122,14 +122,20 @@ uint8_t command_proc(void)
122#endif 122#endif
123#ifdef USB_EXTRA_ENABLE 123#ifdef USB_EXTRA_ENABLE
124 case KB_ESC: 124 case KB_ESC:
125 host_clear_keyboard_report();
126 host_send_keyboard_report();
125#ifdef HOST_PJRC 127#ifdef HOST_PJRC
126 if (suspend && remote_wakeup) { 128 if (suspend && remote_wakeup) {
127 usb_remote_wakeup(); 129 usb_remote_wakeup();
128 } else { 130 } else {
129 host_system_send(SYSTEM_POWER_DOWN); 131 host_system_send(SYSTEM_POWER_DOWN);
132 host_system_send(0);
133 _delay_ms(500);
130 } 134 }
131#else 135#else
132 host_system_send(SYSTEM_POWER_DOWN); 136 host_system_send(SYSTEM_POWER_DOWN);
137 host_system_send(0);
138 _delay_ms(500);
133#endif 139#endif
134 break; 140 break;
135#endif 141#endif
diff --git a/usb_keycodes.h b/usb_keycodes.h
index bdec95391..e39a847bf 100644
--- a/usb_keycodes.h
+++ b/usb_keycodes.h
@@ -91,9 +91,26 @@
91#define KB_WH_R KB_MS_WH_RIGHT 91#define KB_WH_R KB_MS_WH_RIGHT
92/* Sytem Control & Consumer usage */ 92/* Sytem Control & Consumer usage */
93#define KB_PWR KB_SYSTEM_POWER 93#define KB_PWR KB_SYSTEM_POWER
94#define KB_SLEP KB_SYSTEM_SLEEP
95#define KB_WAKE KB_SYSTEM_WAKE
94#define KB_MUTE KB_AUDIO_MUTE 96#define KB_MUTE KB_AUDIO_MUTE
95#define KB_VOLU KB_AUDIO_VOL_UP 97#define KB_VOLU KB_AUDIO_VOL_UP
96#define KB_VOLD KB_AUDIO_VOL_DOWN 98#define KB_VOLD KB_AUDIO_VOL_DOWN
99#define KB_MNXT KB_MEDIA_NEXT_TRACK
100#define KB_MPRV KB_MEDIA_PREV_TRACK
101#define KB_MSTP KB_MEDIA_STOP
102#define KB_MPLY KB_MEDIA_PLAY_PAUSE
103#define KB_MSEL KB_MEDIA_SELECT
104#define KB_MAIL KB_MAIL
105#define KB_CALC KB_CALCULATOR
106#define KB_MYCM KB_MY_COMPUTER
107#define KB_WSCH KB_WWW_SEARCH
108#define KB_WHOM KB_WWW_HOME
109#define KB_WBAK KB_WWW_BACK
110#define KB_WFWD KB_WWW_FORWARD
111#define KB_WSTP KB_WWW_STOP
112#define KB_WREF KB_WWW_REFRESH
113#define KB_WFAV KB_WWW_FAVORITES
97 114
98 115
99/* Special keycode */ 116/* Special keycode */