Merge branch 'rhaberkorn-serial-mouse'

[tmk_firmware.git] / common / keyboard.h

diff --git a/common/keyboard.h b/common/keyboard.h
index 32c1bf464cdc49c4318e430cee360ae58e68ec8c..d1a922420b8483e01c6f50eedfcae4c83e96b711 100644 (file)
--- a/common/keyboard.h
+++ b/common/keyboard.h
@@ -30,11 +30,6 @@ extern "C" {
 typedef struct {
     uint8_t col;
     uint8_t row;
-} keypos_t;
-
-typedef union {
-    uint16_t raw;
-    keypos_t pos;
 } key_t;
 
 /* key event */
@@ -45,20 +40,19 @@ typedef struct {
 } keyevent_t;
 
 /* equivalent test of key_t */
-#define KEYEQ(keya, keyb)       ((keya).raw == (keyb).raw)
-
-/* (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 KEYEQ(keya, keyb)       ((keya).row == (keyb).row && (keya).col == (keyb).col)
 
-#define NOEVENT                 (keyevent_t){           \
-    .key.pos = (keypos_t){ .row = 255, .col = 255 },    \
-    .pressed = false,                                   \
-    .time = 0                                           \
-}
+/* 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 */
+/* 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() | 1)                          \
 }