diff options
| author | tmk <nobody@nowhere> | 2014-07-30 14:37:05 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2014-07-30 14:37:05 +0900 |
| commit | adbb86b1ec8b07e86ae7425374e95b82122e48a7 (patch) | |
| tree | 0a02e89376f69ef975096af9490034725d8eb751 /common/keyboard.h | |
| parent | 79840c678e13f9a737f80048bc3b9c9c55e3fc77 (diff) | |
| parent | a9f5f201ad6b009675fdf16c4447033cc2ac0995 (diff) | |
| download | firmware-adbb86b1ec8b07e86ae7425374e95b82122e48a7.tar.gz firmware-adbb86b1ec8b07e86ae7425374e95b82122e48a7.tar.bz2 firmware-adbb86b1ec8b07e86ae7425374e95b82122e48a7.zip | |
Merge branch 'mbed' into dev
Diffstat (limited to 'common/keyboard.h')
| -rw-r--r-- | common/keyboard.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/keyboard.h b/common/keyboard.h index d1a922420..60f8a89d1 100644 --- a/common/keyboard.h +++ b/common/keyboard.h @@ -30,16 +30,16 @@ extern "C" { typedef struct { uint8_t col; uint8_t row; -} key_t; +} keypos_t; /* key event */ typedef struct { - key_t key; + keypos_t key; bool pressed; uint16_t time; } keyevent_t; -/* equivalent test of key_t */ +/* equivalent test of keypos_t */ #define KEYEQ(keya, keyb) ((keya).row == (keyb).row && (keya).col == (keyb).col) /* Rules for No Event: @@ -52,7 +52,7 @@ static inline bool IS_RELEASED(keyevent_t event) { return (!IS_NOEVENT(event) && /* Tick event */ #define TICK (keyevent_t){ \ - .key = (key_t){ .row = 255, .col = 255 }, \ + .key = (keypos_t){ .row = 255, .col = 255 }, \ .pressed = false, \ .time = (timer_read() | 1) \ } |