diff options
| author | Damien <Dbroqua@users.noreply.github.com> | 2017-03-05 22:58:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-05 22:58:13 +0100 |
| commit | 24ec8f509703cbaf9de7b41d251dbb7fcd339559 (patch) | |
| tree | 90f4f9adf406d92c6817c412256904a97c716daf /quantum/keymap_common.c | |
| parent | b7b94bfb132aa5f2f79b587fcfa6b1197485db27 (diff) | |
| parent | 615bfc4eca8204b73c592a076ca02aeaeceb7e1e (diff) | |
| download | firmware-24ec8f509703cbaf9de7b41d251dbb7fcd339559.tar.gz firmware-24ec8f509703cbaf9de7b41d251dbb7fcd339559.tar.bz2 firmware-24ec8f509703cbaf9de7b41d251dbb7fcd339559.zip | |
Merge pull request #18 from qmk/master
Merge from qmk
Diffstat (limited to 'quantum/keymap_common.c')
| -rw-r--r-- | quantum/keymap_common.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c index eced3d2bb..002eabd85 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); @@ -116,8 +119,11 @@ action_t action_for_key(uint8_t layer, keypos_t key) mod = keycode & 0xFF; action.code = ACTION_MODS_ONESHOT(mod); break; + case QK_LAYER_TAP_TOGGLE ... QK_LAYER_TAP_TOGGLE_MAX: + action.code = ACTION_LAYER_TAP_TOGGLE(keycode & 0xFF); + break; case QK_MOD_TAP ... QK_MOD_TAP_MAX: - action.code = ACTION_MODS_TAP_KEY((keycode >> 0x8) & 0xF, keycode & 0xFF); + action.code = ACTION_MODS_TAP_KEY((keycode >> 0x8) & 0x1F, keycode & 0xFF); break; #ifdef BACKLIGHT_ENABLE case BL_0 ... BL_15: |