Add oneshot modifier action.

[tmk_firmware.git] / common / keyboard.h

diff --git a/common/keyboard.h b/common/keyboard.h
index 907ee1f97ee63c13c42e1f9d62ac99b42e2cf139..dd1ebb2bd007bd87bfd59ae87d2057549889ca0b 100644 (file)
--- a/common/keyboard.h
+++ b/common/keyboard.h
@@ -26,24 +26,33 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 extern "C" {
 #endif
 
-// TODO: union {raw = row:col}
 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 {
-    keypos_t key;
+    key_t    key;
     bool     pressed;
     uint16_t time;
 } keyevent_t;
 
-#define KEYEQ(keya, keyb)       (keya.row == keyb.row && keya.col == keyb.col)
-#define IS_NOEVENT(event)       (event.time == 0)
-#define NOEVENT                 (keyevent_t) {      \
-    .key = (keypos_t){ .row = 255, .col = 255 },    \
-    .pressed = false,                               \
-    .time = 0,                                      \
+#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()                                \
 }