diff options
| author | Joshua T <joshua@sonofone.net> | 2016-08-24 23:46:52 -0500 |
|---|---|---|
| committer | Joshua T <joshua@sonofone.net> | 2016-08-24 23:46:52 -0500 |
| commit | 42fa91a57dad18ccc3f6bf308f50b3f1e882dadd (patch) | |
| tree | dae1290be66b6af1d498b0cf68fbef44f90d02be /quantum/keymap.h | |
| parent | cac69cb58029bf246b22038f034205afbedbc695 (diff) | |
| parent | ad206155aa6f87de3fb9f0aefe60685ec12905a8 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'quantum/keymap.h')
| -rw-r--r-- | quantum/keymap.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/quantum/keymap.h b/quantum/keymap.h index a158651839..f2d94d75c3 100644 --- a/quantum/keymap.h +++ b/quantum/keymap.h @@ -156,16 +156,16 @@ enum quantum_keycodes { BL_INC, BL_TOGG, BL_STEP, - - // RGB functionality - RGB_TOG, - RGB_MOD, - RGB_HUI, - RGB_HUD, - RGB_SAI, - RGB_SAD, - RGB_VAI, - RGB_VAD, + + // RGB functionality + RGB_TOG, + RGB_MOD, + RGB_HUI, + RGB_HUD, + RGB_SAI, + RGB_SAD, + RGB_VAI, + RGB_VAD, // Left shift, open paren KC_LSPO, @@ -309,7 +309,7 @@ enum quantum_keycodes { #define OSL(layer) (layer | QK_ONE_SHOT_LAYER) // One-shot mod -#define OSM(layer) (layer | QK_ONE_SHOT_MOD) +#define OSM(mod) (mod | QK_ONE_SHOT_MOD) // M-od, T-ap - 256 keycode max #define MT(mod, kc) (kc | QK_MOD_TAP | ((mod & 0xF) << 8)) |