diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-06-27 14:21:42 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-06-27 14:21:42 -0400 |
| commit | 9f5b4e1d7a37f873acbc19b8385964121566653e (patch) | |
| tree | 78a51918d16a84148af5276170d2c30525dee661 /quantum/keymap_common.c | |
| parent | b82604dadad81872abdb9fdde18086ee69e66671 (diff) | |
| parent | 4ba9438c3f71e6ea3433be4f9e1a28d36471d247 (diff) | |
| download | qmk_firmware-9f5b4e1d7a37f873acbc19b8385964121566653e.tar.gz qmk_firmware-9f5b4e1d7a37f873acbc19b8385964121566653e.zip | |
Merge branch 'master' of https://github.com/qmk/qmk_firmware into dual_audio
Diffstat (limited to 'quantum/keymap_common.c')
| -rw-r--r-- | quantum/keymap_common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c index 9dafc8b51..b1460c53c 100644 --- a/quantum/keymap_common.c +++ b/quantum/keymap_common.c | |||
| @@ -123,7 +123,8 @@ action_t action_for_key(uint8_t layer, keypos_t key) | |||
| 123 | action.code = ACTION_LAYER_TAP_TOGGLE(keycode & 0xFF); | 123 | action.code = ACTION_LAYER_TAP_TOGGLE(keycode & 0xFF); |
| 124 | break; | 124 | break; |
| 125 | case QK_MOD_TAP ... QK_MOD_TAP_MAX: | 125 | case QK_MOD_TAP ... QK_MOD_TAP_MAX: |
| 126 | action.code = ACTION_MODS_TAP_KEY((keycode >> 0x8) & 0x1F, keycode & 0xFF); | 126 | mod = mod_config((keycode >> 0x8) & 0x1F); |
| 127 | action.code = ACTION_MODS_TAP_KEY(mod, keycode & 0xFF); | ||
| 127 | break; | 128 | break; |
| 128 | #ifdef BACKLIGHT_ENABLE | 129 | #ifdef BACKLIGHT_ENABLE |
| 129 | case BL_0 ... BL_15: | 130 | case BL_0 ... BL_15: |