Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Merge pull request #217 from SaskatoonTechworks/tmk_core_action

Browse source 
Make action_for_key a weak symbol
This commit is contained in:
tmk 2015-05-21 10:35:56 +09:00
commit 63c07c9a0f
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tmk_core/common/action.h
View file

@ -51,6 +51,7 @@ void action_exec(keyevent_t event);
/* action for key */ /* action for key */
action_t action_for_key(uint8_t layer, keypos_t key); action_t action_for_key(uint8_t layer, keypos_t key);
action_t action_for_key_default(uint8_t layer, keypos_t key);
/* macro */ /* macro */
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt); const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt);

5
tmk_core/common/keymap.c
View file

@ -27,8 +27,13 @@ static action_t keycode_to_action(uint8_t keycode);
/* converts key to action */ /* converts key to action */
__attribute__((__weak__))
action_t action_for_key(uint8_t layer, keypos_t key) action_t action_for_key(uint8_t layer, keypos_t key)
{ {
return action_for_key_default(layer, key);
}
action_t action_for_key_default(uint8_t layer, keypos_t key)
uint8_t keycode = keymap_key_to_keycode(layer, key); uint8_t keycode = keymap_key_to_keycode(layer, key);
switch (keycode) { switch (keycode) {
case KC_FN0 ... KC_FN31: case KC_FN0 ... KC_FN31: