diff options
| author | Luiz Ribeiro <luizribeiro@gmail.com> | 2017-07-04 17:17:28 +0200 |
|---|---|---|
| committer | Luiz Ribeiro <luizribeiro@gmail.com> | 2017-07-04 17:17:28 +0200 |
| commit | d5486265b8afcada68306c815b08c225fce287af (patch) | |
| tree | 8fb7f8fee4aa3937003bd69d5c77ca867c010d12 /quantum/quantum_keycodes.h | |
| parent | 738b072bb0f25d0369a998c550c369e4f64cc7a5 (diff) | |
| parent | 34c8bf47a76c8a2dcd3b1a19dd608f8fb2fafb31 (diff) | |
| download | qmk_firmware-d5486265b8afcada68306c815b08c225fce287af.tar.gz qmk_firmware-d5486265b8afcada68306c815b08c225fce287af.tar.xz | |
Merge branch 'master' into ps2avrGB
Diffstat (limited to 'quantum/quantum_keycodes.h')
| -rw-r--r-- | quantum/quantum_keycodes.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index 7354ae0da..6038e31c4 100644 --- a/quantum/quantum_keycodes.h +++ b/quantum/quantum_keycodes.h @@ -104,6 +104,7 @@ enum quantum_keycodes { MAGIC_UNHOST_NKRO, MAGIC_UNSWAP_ALT_GUI, MAGIC_TOGGLE_NKRO, + GRAVE_ESC, // Leader key #ifndef DISABLE_LEADER @@ -514,6 +515,8 @@ enum quantum_keycodes { #define MACROTAP(kc) (kc | QK_MACRO | FUNC_TAP<<8) #define MACRODOWN(...) (record->event.pressed ? MACRO(__VA_ARGS__) : MACRO_NONE) +#define KC_GESC GRAVE_ESC + // L-ayer, T-ap - 256 keycode max, 16 layer max #define LT(layer, kc) (kc | QK_LAYER_TAP | ((layer & 0xF) << 8)) @@ -547,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) |