aboutsummaryrefslogtreecommitdiffstats
path: root/quantum/quantum_keycodes.h
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-06-27 14:21:42 -0400
committerJack Humbert <jack.humb@gmail.com>2017-06-27 14:21:42 -0400
commit9f5b4e1d7a37f873acbc19b8385964121566653e (patch)
tree78a51918d16a84148af5276170d2c30525dee661 /quantum/quantum_keycodes.h
parentb82604dadad81872abdb9fdde18086ee69e66671 (diff)
parent4ba9438c3f71e6ea3433be4f9e1a28d36471d247 (diff)
downloadfirmware-9f5b4e1d7a37f873acbc19b8385964121566653e.tar.gz
firmware-9f5b4e1d7a37f873acbc19b8385964121566653e.tar.bz2
firmware-9f5b4e1d7a37f873acbc19b8385964121566653e.zip
Merge branch 'master' of https://github.com/qmk/qmk_firmware into dual_audio
Diffstat (limited to 'quantum/quantum_keycodes.h')
-rw-r--r--quantum/quantum_keycodes.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index c34ecafa5..6038e31c4 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -550,13 +550,13 @@ enum quantum_keycodes {
#define OSL(layer) (layer | QK_ONE_SHOT_LAYER)
// One-shot mod
-#define OSM(mod) (mod | QK_ONE_SHOT_MOD)
+#define OSM(mod) ((mod) | QK_ONE_SHOT_MOD)
// Layer tap-toggle
#define TT(layer) (layer | QK_LAYER_TAP_TOGGLE)
// M-od, T-ap - 256 keycode max
-#define MT(mod, kc) (kc | QK_MOD_TAP | ((mod & 0x1F) << 8))
+#define MT(mod, kc) (kc | QK_MOD_TAP | (((mod) & 0x1F) << 8))
#define CTL_T(kc) MT(MOD_LCTL, kc)
#define LCTL_T(kc) MT(MOD_LCTL, kc)