diff options
| author | milestogo <milestogo@users.noreply.github.com> | 2017-02-09 23:28:15 -0800 |
|---|---|---|
| committer | milestogo <milestogo@users.noreply.github.com> | 2017-02-09 23:28:15 -0800 |
| commit | 41c93575a838e9b201ca113165085f47198e109d (patch) | |
| tree | 897558fe82aa473d9461ba350c939c75a3ac6b5f /quantum/keymap_common.c | |
| parent | b0dfb037dc0b8b20fd87b3c88449a2ce20ff80e1 (diff) | |
| parent | 6c462e0c0155a892a6efd0881086f8a7032316d2 (diff) | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
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); |