summaryrefslogtreecommitdiffstats
path: root/quantum/keymap_common.c
diff options
context:
space:
mode:
authorLuke Silva <lukemasilva@gmail.com>2017-01-27 00:28:42 +0100
committerLuke Silva <lukemasilva@gmail.com>2017-01-27 00:28:42 +0100
commitcfc4149712217625fcb75e50348094fd9df432f5 (patch)
treed1041e50f5c4e5dc643f6fb867ce327486b94a7c /quantum/keymap_common.c
parent87bc36253dd915c51571e1972b771f49db9673d3 (diff)
downloadqmk_firmware-cfc4149712217625fcb75e50348094fd9df432f5.tar.gz
qmk_firmware-cfc4149712217625fcb75e50348094fd9df432f5.tar.xz
Add ability to use tap macros without using functions
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);