diff options
| author | Priyadi Iman Nurcahyo <priyadi@priyadi.net> | 2017-02-09 01:01:24 +0700 |
|---|---|---|
| committer | Priyadi Iman Nurcahyo <priyadi@priyadi.net> | 2017-02-09 01:01:24 +0700 |
| commit | 3f2c0bfa86150c9fc91d8f467ed3728beecbb480 (patch) | |
| tree | d262d74a36b2be52199f976121365c83e536d4fa /quantum/keymap_common.c | |
| parent | 3835b4bfcc0ef296a94c9fe78f27d5cada1ab73b (diff) | |
| parent | 0a9fda968da521e373564895d6ea6774cd1480d9 (diff) | |
Merge branch 'master' into promethium
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); |