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/keymap.h | |
| parent | 79840c678e13f9a737f80048bc3b9c9c55e3fc77 (diff) | |
| parent | a9f5f201ad6b009675fdf16c4447033cc2ac0995 (diff) | |
Merge branch 'mbed' into dev
Diffstat (limited to 'common/keymap.h')
| -rw-r--r-- | common/keymap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/keymap.h b/common/keymap.h index 4c3019a364..e1a6f992e6 100644 --- a/common/keymap.h +++ b/common/keymap.h @@ -43,7 +43,7 @@ keymap_config_t keymap_config; /* translates key to keycode */ -uint8_t keymap_key_to_keycode(uint8_t layer, key_t key); +uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key); /* translates Fn keycode to action */ action_t keymap_fn_to_action(uint8_t keycode); |