uint8_t row;
} keypos_t;
-// TODO: need raw? keypos_t -> key_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;
-/* 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))
+/* equivalent test of keypos_t */
+#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 = (keypos_t){ .row = 255, .col = 255 }, \
.pressed = false, \
.time = (timer_read() | 1) \
}