diff options
| author | Xyverz <xyverz@gmail.com> | 2017-02-10 23:34:27 -0800 |
|---|---|---|
| committer | Xyverz <xyverz@gmail.com> | 2017-02-10 23:34:27 -0800 |
| commit | 902d5077cd54f3a964e3276d7858212d975818ec (patch) | |
| tree | cddf5a379614f421908bbe57ae5d396cc1e2ed37 /quantum/keymap_common.c | |
| parent | 4d7105c2cf47c7604b54cdf488b4eb9d08c1f1cf (diff) | |
| parent | 835556da9111d91b71c545d6a273e843f07631ae (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'quantum/keymap_common.c')
| -rw-r--r-- | quantum/keymap_common.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c index eced3d2bba..5190f24e87 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); |