diff options
author | tmk <nobody@nowhere> | 2011-01-06 07:37:14 +0100 |
---|---|---|
committer | tmk <nobody@nowhere> | 2011-01-06 07:37:14 +0100 |
commit | 3e56e80c7d938c2b03bafb0606978b715c2ee0ee (patch) | |
tree | 670aa9f1c1a3710a743e882ceae75f8df54c2c83 /key_process.c | |
parent | fd49c69d1a173b9d273b2b53eb6a22eda920223a (diff) | |
download | qmk_firmware-3e56e80c7d938c2b03bafb0606978b715c2ee0ee.tar.gz qmk_firmware-3e56e80c7d938c2b03bafb0606978b715c2ee0ee.tar.xz |
changed signature of keymap_fn_layer() in keymap_skel.h.
FIX: name of mousekey macros usb_keycodes.h.
Diffstat (limited to 'key_process.c')
-rw-r--r-- | key_process.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/key_process.c b/key_process.c index 2d4e78819..9c9ea26c4 100644 --- a/key_process.c +++ b/key_process.c @@ -57,7 +57,6 @@ void proc_matrix(void) { for (int col = 0; col < matrix_cols(); col++) { if (!matrix_is_on(row, col)) continue; - // TODO: clean code uint8_t code = layer_get_keycode(row, col); if (code == KB_NO) { // do nothing @@ -65,12 +64,12 @@ void proc_matrix(void) { usb_keyboard_add_mod(code); } else if (IS_FN(code)) { fn_bits |= FN_BIT(code); - } else if (IS_MOUSE(code)) { + } #ifdef MOUSEKEY_ENABLE + else if (IS_MOUSEKEY(code)) { mousekey_decode(code); -#endif } - +#endif #ifdef USB_EXTRA_ENABLE // audio control & system control else if (code == KB_MUTE) { @@ -94,10 +93,11 @@ void proc_matrix(void) { _delay_ms(1000); } #endif - - // normal keys - else { + // normal key + else if (IS_KEY(code)) { usb_keyboard_add_key(code); + } else { + debug("ignore keycode: "); debug_hex(code); debug("\n"); } } } @@ -317,12 +317,10 @@ void proc_matrix(void) { } #ifdef MOUSEKEY_ENABLE - // mouse keys mousekey_usb_send(); #endif #ifdef PS2_MOUSE_ENABLE - // ps2 mouse if (ps2_mouse_read() == 0) ps2_mouse_usb_send(); #endif |