aboutsummaryrefslogtreecommitdiffstats
path: root/quantum/keymap.h
diff options
context:
space:
mode:
authorOlivier <olivier@gid0.org>2016-08-20 18:07:02 +0200
committerOlivier <olivier@gid0.org>2016-08-20 18:07:02 +0200
commit009ab77d3e26bd348e45a9a8102b2737c9367979 (patch)
treeb01491320736c818584098c4b7a6dce8de53f405 /quantum/keymap.h
parent4cfb262faab653247f4d66d44bf5f3339d82bd36 (diff)
parenta3f726174c0f8f358f7970767a1bf743fd9ad761 (diff)
downloadfirmware-009ab77d3e26bd348e45a9a8102b2737c9367979.tar.gz
firmware-009ab77d3e26bd348e45a9a8102b2737c9367979.tar.bz2
firmware-009ab77d3e26bd348e45a9a8102b2737c9367979.zip
Merge https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'quantum/keymap.h')
-rw-r--r--quantum/keymap.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/quantum/keymap.h b/quantum/keymap.h
index 73f99f821..f2d94d75c 100644
--- a/quantum/keymap.h
+++ b/quantum/keymap.h
@@ -157,6 +157,16 @@ enum quantum_keycodes {
BL_TOGG,
BL_STEP,
+ // RGB functionality
+ RGB_TOG,
+ RGB_MOD,
+ RGB_HUI,
+ RGB_HUD,
+ RGB_SAI,
+ RGB_SAD,
+ RGB_VAI,
+ RGB_VAD,
+
// Left shift, open paren
KC_LSPO,
@@ -299,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))