summaryrefslogtreecommitdiff
path: root/quantum/keymap_common.c
diff options
context:
space:
mode:
authormilestogo <milestogo@users.noreply.github.com>2017-03-08 15:51:30 -0800
committermilestogo <milestogo@users.noreply.github.com>2017-03-08 15:51:30 -0800
commitfeb858c5a9afff06ff54ec401359f8bfd5abdd73 (patch)
treecf61bfad47984bb4987540404f0ec349defbff1a /quantum/keymap_common.c
parentb5bfb5104b63766ab9a54509302a3f4b0b1d7b16 (diff)
parentffb04bad660ba7c487e4b923e4391b6c7dd5eddd (diff)
Merge branch 'master' into sculpt2
Diffstat (limited to 'quantum/keymap_common.c')
-rw-r--r--quantum/keymap_common.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index 5190f24e87..002eabd85e 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -119,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: