diff options
author | tmk <nobody@nowhere> | 2013-02-11 12:48:49 +0900 |
---|---|---|
committer | tmk <nobody@nowhere> | 2013-02-11 12:48:49 +0900 |
commit | 8c80deb775ac151001dc1592a2e94e8677b49964 (patch) | |
tree | aa62c5cbef8419d9cdded26440cfdb42f7d806fd /common/keyboard.h | |
parent | 4701b08b71b187cb3d015bec7e05d30e35c344ac (diff) | |
parent | 39d093339393e1758eede06f736b1f99a68ac74c (diff) | |
download | qmk_firmware-8c80deb775ac151001dc1592a2e94e8677b49964.tar.gz qmk_firmware-8c80deb775ac151001dc1592a2e94e8677b49964.zip |
Merge branch 'keymap2'
Conflicts:
common/keyboard.c
Diffstat (limited to 'common/keyboard.h')
-rw-r--r-- | common/keyboard.h | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/common/keyboard.h b/common/keyboard.h index 2353805e17..e1cab31194 100644 --- a/common/keyboard.h +++ b/common/keyboard.h @@ -1,5 +1,5 @@ /* -Copyright 2011 Jun Wako <[email protected]> +Copyright 2011,2012,2013 Jun Wako <[email protected]> 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,28 +26,44 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. extern "C" { #endif +/* key matrix position */ typedef struct { - uint8_t row; uint8_t col; + 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; bool pressed; + uint16_t time; } keyevent_t; -typedef struct { - keyevent_t event; - uint8_t code; - uint8_t mods; - uint16_t time; -} keyrecord_t; +/* equivalent test of key_t */ +#define KEYEQ(keya, keyb) ((keya).raw == (keyb).raw) -#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.pos.row == 255 && (event).key.pos.col == 255)) +#define NOEVENT (keyevent_t){ \ + .key.pos = (keypos_t){ .row = 255, .col = 255 }, \ + .pressed = false, \ + .time = 0 \ +} + +/* tick event */ +#define TICK (keyevent_t){ \ + .key.pos = (keypos_t){ .row = 255, .col = 255 }, \ + .pressed = false, \ + .time = (timer_read() | 1) \ +} -extern uint8_t current_layer; -extern uint8_t default_layer; void keyboard_init(void); void keyboard_task(void); |