aboutsummaryrefslogtreecommitdiff
path: root/quantum/keymap_common.c
diff options
context:
space:
mode:
authorXyverz <xyverz@gmail.com>2017-02-20 23:54:09 -0800
committerXyverz <xyverz@gmail.com>2017-02-20 23:54:09 -0800
commitbf6f7a623dbe4e3bba4bcc6d86ac28b842226825 (patch)
tree59ce47b0d4b21a2606e1f6d367317af8bdbd06ae /quantum/keymap_common.c
parentca1ec7b121c973fae614e69093f40ee9ba25e629 (diff)
parent7ff41df32c29bca4e3a6efc3047b8fa93bb99b92 (diff)
downloadqmk_firmware-bf6f7a623dbe4e3bba4bcc6d86ac28b842226825.tar.gz
qmk_firmware-bf6f7a623dbe4e3bba4bcc6d86ac28b842226825.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'quantum/keymap_common.c')
-rw-r--r--quantum/keymap_common.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index 54b872d49..002eabd85 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -119,6 +119,9 @@ action_t action_for_key(uint8_t layer, keypos_t key)
119 mod = keycode & 0xFF; 119 mod = keycode & 0xFF;
120 action.code = ACTION_MODS_ONESHOT(mod); 120 action.code = ACTION_MODS_ONESHOT(mod);
121 break; 121 break;
122 case QK_LAYER_TAP_TOGGLE ... QK_LAYER_TAP_TOGGLE_MAX:
123 action.code = ACTION_LAYER_TAP_TOGGLE(keycode & 0xFF);
124 break;
122 case QK_MOD_TAP ... QK_MOD_TAP_MAX: 125 case QK_MOD_TAP ... QK_MOD_TAP_MAX:
123 action.code = ACTION_MODS_TAP_KEY((keycode >> 0x8) & 0x1F, keycode & 0xFF); 126 action.code = ACTION_MODS_TAP_KEY((keycode >> 0x8) & 0x1F, keycode & 0xFF);
124 break; 127 break;