diff options
| author | tmk <nobody@nowhere> | 2013-02-13 13:31:01 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-02-13 13:31:01 +0900 |
| commit | 7a31451a077a55e1ad97cf8b31a111c7cd311a4d (patch) | |
| tree | 335730a0308cdb2e2ec094fe08ac63ee29ce4f80 /keyboard | |
| parent | 7054203e16af627a921b503a9508ce789913471d (diff) | |
| parent | c4421f585b085d3eef5e468ff1defcbc3b4ec8d3 (diff) | |
Merge branch 'actionfix'
Diffstat (limited to 'keyboard')
| -rw-r--r-- | keyboard/gh60/keymap.c | 7 | ||||
| -rw-r--r-- | keyboard/hhkb/keymap.c | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/keyboard/gh60/keymap.c b/keyboard/gh60/keymap.c index d2da50529e..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 */ @@ -181,11 +181,8 @@ action_t keymap_fn_to_action(uint8_t keycode) } /* convert key to action */ -action_t keymap_get_action(uint8_t layer, uint8_t row, uint8_t col) +action_t action_for_key(uint8_t layer, key_t key) { - key_t key; - key.pos.row = row; - key.pos.col = col; uint8_t keycode = keymap_key_to_keycode(layer, key); switch (keycode) { case KC_FN0 ... KC_FN31: diff --git a/keyboard/hhkb/keymap.c b/keyboard/hhkb/keymap.c index a5b6d3ace0..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 */ @@ -330,11 +330,8 @@ action_t keymap_fn_to_action(uint8_t keycode) } /* convert key to action */ -action_t keymap_get_action(uint8_t layer, uint8_t row, uint8_t col) +action_t action_for_key(uint8_t layer, key_t key) { - key_t key; - key.pos.row = row; - key.pos.col = col; uint8_t keycode = keymap_key_to_keycode(layer, key); switch (keycode) { case KC_FN0 ... KC_FN31: |