Add oneshot modifier action.

[tmk_firmware.git] / common / keyboard.h

diff --git a/common/keyboard.h b/common/keyboard.h
old mode 100755 (executable)
new mode 100644 (file)
index 2353805..dd1ebb2
--- a/common/keyboard.h
+++ b/common/keyboard.h
@@ -27,23 +27,33 @@ extern "C" {
 #endif
 
 typedef struct {
-    uint8_t row;
     uint8_t col;
+    uint8_t row;
+} keypos_t;
+
+typedef union {
+    uint16_t raw;
+    keypos_t pos;
 } key_t;
 
 typedef struct {
     key_t    key;
     bool     pressed;
+    uint16_t time;
 } keyevent_t;
 
-typedef struct {
-    keyevent_t  event;
-    uint8_t     code;
-    uint8_t     mods;
-    uint16_t    time;
-} keyrecord_t;
-
-#define KEYEQ(keya, keyb)     (keya.row == keyb.row && keya.col == keyb.col)
+#define KEYEQ(keya, keyb)       ((keya).raw == (keyb).raw)
+#define IS_NOEVENT(event)       ((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                                           \
+}
+#define TICK                    (keyevent_t){           \
+    .key.pos = (keypos_t){ .row = 255, .col = 255 },    \
+    .pressed = false,                                   \
+    .time = timer_read()                                \
+}
 
 
 extern uint8_t current_layer;