summaryrefslogtreecommitdiff
path: root/common/keyboard.h
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.h
parent854c803fdda30d7f7905c18d777ea85cac9b74d9 (diff)
Clean code.
Diffstat (limited to 'common/keyboard.h')
-rw-r--r--common/keyboard.h17
1 files changed, 11 insertions, 6 deletions
diff --git a/common/keyboard.h b/common/keyboard.h
index dd1ebb2bd0..32c1bf464c 100644
--- a/common/keyboard.h
+++ b/common/keyboard.h
@@ -1,5 +1,5 @@
/*
-Copyright 2011 Jun Wako <wakojun@gmail.com>
+Copyright 2011,2012,2013 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
extern "C" {
#endif
+/* key matrix position */
typedef struct {
uint8_t col;
uint8_t row;
@@ -36,29 +37,33 @@ typedef union {
keypos_t pos;
} key_t;
+/* key event */
typedef struct {
key_t key;
bool pressed;
uint16_t time;
} keyevent_t;
+/* equivalent test of key_t */
#define KEYEQ(keya, keyb) ((keya).raw == (keyb).raw)
-#define IS_NOEVENT(event) ((event).key.pos.row == 255 && (event).key.pos.col == 255)
+
+/* (time == 0) means no event and assumes matrix has no 255 line. */
+#define IS_NOEVENT(event) ((event).time == 0 || ((event).key.pos.row == 255 && (event).key.pos.col == 255))
+
#define NOEVENT (keyevent_t){ \
.key.pos = (keypos_t){ .row = 255, .col = 255 }, \
.pressed = false, \
.time = 0 \
}
+
+/* tick event */
#define TICK (keyevent_t){ \
.key.pos = (keypos_t){ .row = 255, .col = 255 }, \
.pressed = false, \
- .time = timer_read() \
+ .time = (timer_read() | 1) \
}
-extern uint8_t current_layer;
-extern uint8_t default_layer;
-
void keyboard_init(void);
void keyboard_task(void);
void keyboard_set_leds(uint8_t leds);