X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=common%2Fkeyboard.h;h=60f8a89d1d3a5703fe686286aaed8b3cc6d50338;hb=fa545c87f74833856761572ef631d20accc1d026;hp=84f03c9a682d23869a8cc27946ceb0d64a4e2221;hpb=d8dddf9f25181e29e3fb82250833a00a11921452;p=tmk_firmware.git

diff --git a/common/keyboard.h b/common/keyboard.h
index 84f03c9..60f8a89 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,34 +26,38 @@ 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;
 } keypos_t;
 
-typedef union {
-    uint16_t raw;
-    keypos_t pos;
-} key_t;
-
+/* key event */
 typedef struct {
-    key_t    key;
+    keypos_t key;
     bool     pressed;
     uint16_t time;
 } keyevent_t;
 
-#define KEYEQ(keya, keyb)       (keya.raw == keyb.raw)
-#define IS_NOEVENT(event)       (event.time == 0)
-#define NOEVENT                 (keyevent_t){           \
-    .key.pos = (keypos_t){ .row = 255, .col = 255 },    \
+/* equivalent test of keypos_t */
+#define KEYEQ(keya, keyb)       ((keya).row == (keyb).row && (keya).col == (keyb).col)
+
+/* Rules for No Event:
+ * 1) (time == 0) to handle (keyevent_t){} as empty event
+ * 2) Matrix(255, 255) to make TICK event available
+ */
+static inline bool IS_NOEVENT(keyevent_t event) { return event.time == 0 || (event.key.row == 255 && event.key.col == 255); }
+static inline bool IS_PRESSED(keyevent_t event) { return (!IS_NOEVENT(event) && event.pressed); }
+static inline bool IS_RELEASED(keyevent_t event) { return (!IS_NOEVENT(event) && !event.pressed); }
+
+/* Tick event */
+#define TICK                    (keyevent_t){           \
+    .key = (keypos_t){ .row = 255, .col = 255 },           \
     .pressed = false,                                   \
-    .time = 0                                           \
+    .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);