X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=common%2Fkeyboard.h;h=78cb24034f51586940bc9a0f1b34028ec44f09e9;hb=1385058fc21f80347c7afd2b818e38795ce9d55a;hp=dd1ebb2bd007bd87bfd59ae87d2057549889ca0b;hpb=ef873791bdbff5cc6971705544e120c69ca94212;p=max%2Ftmk_keyboard.git

diff --git a/common/keyboard.h b/common/keyboard.h
index dd1ebb2b..78cb2403 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,39 +26,39 @@ 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;
     bool     pressed;
     uint16_t time;
 } keyevent_t;
 
-#define KEYEQ(keya, keyb)       ((keya).raw == (keyb).raw)
-#define IS_NOEVENT(event)       ((event).key.pos.row == 255 && (event).key.pos.col == 255)
+/* equivalent test of key_t */
+#define KEYEQ(keya, keyb)       ((keya).row == (keyb).row && (keya).col == (keyb).col)
+
+/* (time == 0) means no event and assumes matrix has no 255 line. */
+#define IS_NOEVENT(event)       ((event).time == 0 || ((event).key.row == 255 && (event).key.col == 255))
+
 #define NOEVENT                 (keyevent_t){           \
-    .key.pos = (keypos_t){ .row = 255, .col = 255 },    \
+    .key = (key_t){ .row = 255, .col = 255 },           \
     .pressed = false,                                   \
     .time = 0                                           \
 }
+
+/* tick event */
 #define TICK                    (keyevent_t){           \
-    .key.pos = (keypos_t){ .row = 255, .col = 255 },    \
+    .key = (key_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);