aboutsummaryrefslogtreecommitdiffstats
path: root/quantum/keymap.h
diff options
context:
space:
mode:
authordbroqua <dbroqua@mousur.org>2016-10-14 21:53:37 +0200
committerdbroqua <dbroqua@mousur.org>2016-10-14 21:53:37 +0200
commit28ca1f5345f665e262e8f5af88ac166afcd35add (patch)
tree608b09db4b9a09012d558e8352768b690900d407 /quantum/keymap.h
parent0320fbf6f4c3c6d079226bc49c7b4d3a3906f5d7 (diff)
parent2098b363eac81298ca51edc06970a767d991c78c (diff)
downloadfirmware-28ca1f5345f665e262e8f5af88ac166afcd35add.tar.gz
firmware-28ca1f5345f665e262e8f5af88ac166afcd35add.tar.bz2
firmware-28ca1f5345f665e262e8f5af88ac166afcd35add.zip
Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware
Diffstat (limited to 'quantum/keymap.h')
-rw-r--r--quantum/keymap.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/quantum/keymap.h b/quantum/keymap.h
index 98ddfd0c5..85c090972 100644
--- a/quantum/keymap.h
+++ b/quantum/keymap.h
@@ -191,6 +191,7 @@ enum quantum_keycodes {
#define HYPR(kc) (kc | QK_LCTL | QK_LSFT | QK_LALT | QK_LGUI)
#define MEH(kc) (kc | QK_LCTL | QK_LSFT | QK_LALT)
#define LCAG(kc) (kc | QK_LCTL | QK_LALT | QK_LGUI)
+#define ALTG(kc) (kc | QK_RCTL | QK_RALT)
#define MOD_HYPR 0xf
#define MOD_MEH 0x7
@@ -295,7 +296,10 @@ enum quantum_keycodes {
// ON_PRESS = 1
// ON_RELEASE = 2
// Unless you have a good reason not to do so, prefer ON_PRESS (1) as your default.
-#define TO(layer, when) (layer | QK_TO | (when << 0x4))
+// In fact, we changed it to assume ON_PRESS for sanity/simplicity. If needed, you can add your own
+// keycode modeled after the old version, kept below for this.
+/* #define TO(layer, when) (layer | QK_TO | (when << 0x4)) */
+#define TO(layer) (layer | QK_TO | (ON_PRESS << 0x4))
// Momentary switch layer - 256 layer max
#define MO(layer) (layer | QK_MOMENTARY)