diff options
| author | Callum Oakley <c.oakley108@gmail.com> | 2016-09-01 18:55:00 +0200 |
|---|---|---|
| committer | Callum Oakley <c.oakley108@gmail.com> | 2016-09-01 18:55:00 +0200 |
| commit | 9c3193f22555119eb15f63f5ae5efe45e6d7358c (patch) | |
| tree | a0dcfb3ed442c12a66b444c4c579711660c30657 /quantum/keymap.h | |
| parent | 993d72b11fca8d50296570dc85e9354f8045c4a6 (diff) | |
| parent | e28d151a8a1d458f3c18897c6095decc17b0c3a1 (diff) | |
| download | qmk_firmware-9c3193f22555119eb15f63f5ae5efe45e6d7358c.tar.gz qmk_firmware-9c3193f22555119eb15f63f5ae5efe45e6d7358c.tar.xz | |
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 a15865183..f2d94d75c 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)) |