diff options
author | cr3473 <[email protected]> | 2015-05-27 08:29:48 -0700 |
---|---|---|
committer | cr3473 <[email protected]> | 2015-05-27 08:29:48 -0700 |
commit | b36d1a87da2395fd5429e2817409c76f065387b5 (patch) | |
tree | 1e4a76822deaf92db83896548fa3c3003f7640f3 /common/keymap.c | |
parent | a4cf9ae660b16d1952738139ba8f788368b73eff (diff) | |
parent | d61d1f5ca3a7dcccc495ac6688e0632c601c0623 (diff) | |
download | qmk_firmware-b36d1a87da2395fd5429e2817409c76f065387b5.tar.gz qmk_firmware-b36d1a87da2395fd5429e2817409c76f065387b5.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'common/keymap.c')
-rw-r--r-- | common/keymap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/common/keymap.c b/common/keymap.c index 4c0b61b8c1..7b77972261 100644 --- a/common/keymap.c +++ b/common/keymap.c @@ -27,6 +27,7 @@ static action_t keycode_to_action(uint8_t keycode); /* converts key to action */ +__attribute__ ((weak)) action_t action_for_key(uint8_t layer, keypos_t key) { uint8_t keycode = keymap_key_to_keycode(layer, key); @@ -117,8 +118,6 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { } - - /* translates keycode to action */ static action_t keycode_to_action(uint8_t keycode) { |