diff options
| -rw-r--r-- | common/action.c | 2 | ||||
| -rw-r--r-- | common/keyboard.c | 2 | ||||
| -rw-r--r-- | common/keyboard.h | 14 | ||||
| -rw-r--r-- | common/keymap.c | 2 | ||||
| -rw-r--r-- | keyboard/gh60/keymap.c | 2 | ||||
| -rw-r--r-- | keyboard/hhkb/keymap.c | 2 |
6 files changed, 9 insertions, 15 deletions
diff --git a/common/action.c b/common/action.c index 840d70f34c..6528cd46c8 100644 --- a/common/action.c +++ b/common/action.c @@ -859,7 +859,7 @@ bool is_tap_key(key_t key) */ static void debug_event(keyevent_t event) { - debug_hex16(event.key.raw); + debug_hex16((event.key.row<<8) | event.key.col); if (event.pressed) debug("d("); else debug("u("); debug_dec(event.time); debug(")"); } diff --git a/common/keyboard.c b/common/keyboard.c index 2c88b3e437..e4bc3dc8c2 100644 --- a/common/keyboard.c +++ b/common/keyboard.c @@ -85,7 +85,7 @@ void keyboard_task(void) for (uint8_t c = 0; c < MATRIX_COLS; c++) { if (matrix_change & ((matrix_row_t)1<<c)) { action_exec((keyevent_t){ - .key.pos = (keypos_t){ .row = r, .col = c }, + .key = (key_t){ .row = r, .col = c }, .pressed = (matrix_row & (1<<c)), .time = (timer_read() | 1) /* time should not be 0 */ }); diff --git a/common/keyboard.h b/common/keyboard.h index e1cab31194..78cb24034f 100644 --- a/common/keyboard.h +++ b/common/keyboard.h @@ -30,12 +30,6 @@ extern "C" { typedef struct { 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 */ @@ -46,20 +40,20 @@ typedef struct { } keyevent_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 IS_NOEVENT(event) ((event).time == 0 || ((event).key.row == 255 && (event).key.col == 255)) #define NOEVENT (keyevent_t){ \ - .key.pos = (keypos_t){ .row = 255, .col = 255 }, \ + .key = (key_t){ .row = 255, .col = 255 }, \ .pressed = false, \ .time = 0 \ } /* tick event */ #define TICK (keyevent_t){ \ - .key.pos = (keypos_t){ .row = 255, .col = 255 }, \ + .key = (key_t){ .row = 255, .col = 255 }, \ .pressed = false, \ .time = (timer_read() | 1) \ } diff --git a/common/keymap.c b/common/keymap.c index 6bae17f993..078615814e 100644 --- a/common/keymap.c +++ b/common/keymap.c @@ -58,7 +58,7 @@ __attribute__ ((weak)) action_t action_for_key(uint8_t layer, key_t key) { /* convert from legacy keycode to action */ - uint8_t keycode = keymap_get_keycode(layer, key.pos.row, key.pos.col); + uint8_t keycode = keymap_get_keycode(layer, key.row, key.col); action_t action; switch (keycode) { case KC_FN0 ... KC_FN31: diff --git a/keyboard/gh60/keymap.c b/keyboard/gh60/keymap.c index 9cef2137b6..a17c11fc3b 100644 --- a/keyboard/gh60/keymap.c +++ b/keyboard/gh60/keymap.c @@ -165,7 +165,7 @@ static const uint16_t PROGMEM fn_actions[] = { /* translates key to keycode */ uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) { - return pgm_read_byte(&keymaps[(layer)][(key.pos.row)][(key.pos.col)]); + return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); } /* translates Fn index to action */ diff --git a/keyboard/hhkb/keymap.c b/keyboard/hhkb/keymap.c index b1407e1ad8..ef21282ff1 100644 --- a/keyboard/hhkb/keymap.c +++ b/keyboard/hhkb/keymap.c @@ -314,7 +314,7 @@ void keymap_call_function(keyrecord_t *record, uint8_t id, uint8_t opt) /* translates key to keycode */ uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) { - return pgm_read_byte(&keymaps[(layer)][(key.pos.row)][(key.pos.col)]); + return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); } /* translates Fn index to action */ |