summaryrefslogtreecommitdiff
path: root/quantum/keymap_common.c
diff options
context:
space:
mode:
authorDavid Olsson2017-02-11 10:50:37 +0100
committerDavid Olsson2017-02-11 10:50:37 +0100
commit052f81aacaa3b5afa93f9db3667f31f9365348ce (patch)
treedcfde5c6fed00e248535ac4d975831f33316cc8a /quantum/keymap_common.c
parentaa69337cf563d7b37722aabfcd1c5bae6c185208 (diff)
parent835556da9111d91b71c545d6a273e843f07631ae (diff)
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'quantum/keymap_common.c')
-rw-r--r--quantum/keymap_common.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index eced3d2bb..5190f24e8 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -80,7 +80,10 @@ action_t action_for_key(uint8_t layer, keypos_t key)
action.code = keymap_function_id_to_action( (int)keycode & 0xFFF );
break;
case QK_MACRO ... QK_MACRO_MAX:
- action.code = ACTION_MACRO(keycode & 0xFF);
+ if (keycode & 0x800) // tap macros have upper bit set
+ action.code = ACTION_MACRO_TAP(keycode & 0xFF);
+ else
+ action.code = ACTION_MACRO(keycode & 0xFF);
break;
case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
action.code = ACTION_LAYER_TAP_KEY((keycode >> 0x8) & 0xF, keycode & 0xFF);