summaryrefslogtreecommitdiff
path: root/quantum/keymap.h
diff options
context:
space:
mode:
authorToni <jeder@mail1a.de>2016-08-13 09:24:24 +0200
committerToni <jeder@mail1a.de>2016-08-13 09:24:24 +0200
commite0aa2169055f554a3cb87208b1e73a6b2707405b (patch)
tree6c74a1f7284f385b99a231ef0c1c805fab1083e5 /quantum/keymap.h
parentcafa528b88c097f02ae92a5b15b015f5653cefe7 (diff)
parent098951905d527c19043de75ef262ac9679ec452b (diff)
Merge remote-tracking branch 'origin/master' into iso_split_rshift
update from Upstream
Diffstat (limited to 'quantum/keymap.h')
-rw-r--r--quantum/keymap.h22
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))