di0ib/tmk_keyboard
1
0
Fork 0
Code Releases Activity

Change struct key_t

Browse Source
This commit is contained in:
tmk 2013-02-13 12:16:24 +09:00
parent 9bc82bf61c
commit c4421f585b
6 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/action.c
View File

@ -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(")");
}

2
common/keyboard.c
View File

@ -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 */
});

14
common/keyboard.h
View File

@ -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) \
}

2
common/keymap.c
View File

@ -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:

2
keyboard/gh60/keymap.c
View File

@ -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 */

2
keyboard/hhkb/keymap.c
View File

@ -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 */