aboutsummaryrefslogtreecommitdiff
path: root/common/keyboard.c
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-01-28 14:06:42 +0900
committertmk <nobody@nowhere>2013-01-28 14:06:42 +0900
commit1e3e41a2c9ed8b2f7d44be0aed5d96ed557fa13d (patch)
tree4846c3d3f8144b3796322ac669d13837f4e09f17 /common/keyboard.c
parent854c803fdda30d7f7905c18d777ea85cac9b74d9 (diff)
downloadqmk_firmware-1e3e41a2c9ed8b2f7d44be0aed5d96ed557fa13d.tar.gz
qmk_firmware-1e3e41a2c9ed8b2f7d44be0aed5d96ed557fa13d.zip
Clean code.
Diffstat (limited to 'common/keyboard.c')
-rw-r--r--common/keyboard.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/common/keyboard.c b/common/keyboard.c
index 2422fb758..5e9945baf 100644
--- a/common/keyboard.c
+++ b/common/keyboard.c
@@ -1,5 +1,5 @@
1/* 1/*
2Copyright 2011,2012 Jun Wako <wakojun@gmail.com> 2Copyright 2011,2012,2013 Jun Wako <wakojun@gmail.com>
3 3
4This program is free software: you can redistribute it and/or modify 4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by 5it under the terms of the GNU General Public License as published by
@@ -34,8 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
34 34
35void keyboard_init(void) 35void keyboard_init(void)
36{ 36{
37 // TODO: to enable debug print magic key bind on boot time
38
39 // TODO: configuration of sendchar impl 37 // TODO: configuration of sendchar impl
40 print_sendchar_func = sendchar; 38 print_sendchar_func = sendchar;
41 39
@@ -80,7 +78,7 @@ void keyboard_task(void)
80 action_exec((keyevent_t){ 78 action_exec((keyevent_t){
81 .key.pos = (keypos_t){ .row = r, .col = c }, 79 .key.pos = (keypos_t){ .row = r, .col = c },
82 .pressed = (matrix_row & (1<<c)), 80 .pressed = (matrix_row & (1<<c)),
83 .time = timer_read() 81 .time = (timer_read() | 1) /* time should not be 0 */
84 }); 82 });
85 // record a processed key 83 // record a processed key
86 matrix_prev[r] ^= ((matrix_row_t)1<<c); 84 matrix_prev[r] ^= ((matrix_row_t)1<<c);
@@ -94,19 +92,15 @@ void keyboard_task(void)
94 action_exec(TICK); 92 action_exec(TICK);
95 93
96MATRIX_LOOP_END: 94MATRIX_LOOP_END:
97
98#ifdef MOUSEKEY_ENABLE 95#ifdef MOUSEKEY_ENABLE
99 // mousekey repeat & acceleration 96 // mousekey repeat & acceleration
100 mousekey_task(); 97 mousekey_task();
101#endif 98#endif
102
103 // update LED 99 // update LED
104 if (led_status != host_keyboard_leds()) { 100 if (led_status != host_keyboard_leds()) {
105 led_status = host_keyboard_leds(); 101 led_status = host_keyboard_leds();
106 keyboard_set_leds(led_status); 102 keyboard_set_leds(led_status);
107 } 103 }
108
109 return;
110} 104}
111 105
112void keyboard_set_leds(uint8_t leds) 106void keyboard_set_leds(uint8_t leds)