summaryrefslogtreecommitdiff
path: root/quantum/keymap_common.c
diff options
context:
space:
mode:
authorOle Anders <git@swoy.org>2017-03-28 15:55:33 +0200
committerOle Anders <git@swoy.org>2017-03-28 15:55:33 +0200
commit62faa20ef6ddab7dacc74123b2253cf25b5c20f7 (patch)
tree281ae30283f7491b2529465da4897dc2ddd7088c /quantum/keymap_common.c
parentd5ee0194abf5cc9df4086a89ad78cf188352028a (diff)
parent5e4daf1c6db980fad269fe7b013205008bfe701e (diff)
Merge remote-tracking branch 'refs/remotes/qmk/master'
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: