diff options
| author | Ole Anders <git@swoy.org> | 2017-03-07 19:39:00 +0100 |
|---|---|---|
| committer | Ole Anders <git@swoy.org> | 2017-03-07 19:39:00 +0100 |
| commit | 25a7c941746d077d246468bec6bebdb01e478090 (patch) | |
| tree | 906b491bb1465be287ec4dc02e9857437f7582a6 /quantum/keymap_common.c | |
| parent | d1fb51976aeef8eeea5975c5bf75b6b1aa649826 (diff) | |
| parent | f5c8c5d4c854c5ae4dc586066c9b03557786c4c2 (diff) | |
Merge remote-tracking branch 'refs/remotes/qmk/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); |