summaryrefslogtreecommitdiff
path: root/quantum/keymap.h
diff options
context:
space:
mode:
authorFelix Uhl <iFreilicht@users.noreply.github.com>2016-08-18 12:02:31 +0200
committerGitHub <noreply@github.com>2016-08-18 12:02:31 +0200
commited6ecff292eae378eb89bf6a7b5b8dd4229b84b7 (patch)
treeb2290e1a983134e0d7fc2f328eb949c37d99961c /quantum/keymap.h
parent73f13c8f26f7f3777cec9d3036628a7dd6021ee9 (diff)
parent8144ce8852f690d5772d80ed2b96ae4af201e266 (diff)
Merge pull request #1 from jackhumbert/master
Merging from base Repo
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))