Merge remote-tracking branch 'origin/master' into develop

1 files changed, 35 insertions, 0 deletions

diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index a2a86e175c..515386756d 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -128,6 +128,41 @@
 #define OSM(mod) (QK_ONE_SHOT_MOD | ((mod)&0x1F))
 #define QK_ONE_SHOT_MOD_GET_MODS(kc) ((kc)&0x1F)
 
+#define OS_LCTL OSM(MOD_LCTL)
+#define OS_LSFT OSM(MOD_LSFT)
+#define OS_LALT OSM(MOD_LALT)
+#define OS_LGUI OSM(MOD_LGUI)
+
+#define OS_LCS OSM(MOD_LCTL | MOD_LSFT)
+#define OS_LCA OSM(MOD_LCTL | MOD_LALT)
+#define OS_LCG OSM(MOD_LCTL | MOD_LGUI)
+#define OS_LSA OSM(MOD_LSFT | MOD_LALT)
+#define OS_LSG OSM(MOD_LSFT | MOD_LGUI)
+#define OS_LAG OSM(MOD_LALT | MOD_LGUI)
+
+#define OS_LCSG OSM(MOD_LCTL | MOD_LSFT | MOD_LGUI)
+#define OS_LCAG OSM(MOD_LCTL | MOD_LALT | MOD_LGUI)
+#define OS_LSAG OSM(MOD_LSFT | MOD_LALT | MOD_LGUI)
+
+#define OS_RCTL OSM(MOD_RCTL)
+#define OS_RSFT OSM(MOD_RSFT)
+#define OS_RALT OSM(MOD_RALT)
+#define OS_RGUI OSM(MOD_RGUI)
+
+#define OS_RCS OSM(MOD_RCTL | MOD_RSFT)
+#define OS_RCA OSM(MOD_RCTL | MOD_RALT)
+#define OS_RCG OSM(MOD_RCTL | MOD_RGUI)
+#define OS_RSA OSM(MOD_RSFT | MOD_RALT)
+#define OS_RSG OSM(MOD_RSFT | MOD_RGUI)
+#define OS_RAG OSM(MOD_RALT | MOD_RGUI)
+
+#define OS_RCSG OSM(MOD_RCTL | MOD_RSFT | MOD_RGUI)
+#define OS_RCAG OSM(MOD_RCTL | MOD_RALT | MOD_RGUI)
+#define OS_RSAG OSM(MOD_RSFT | MOD_RALT | MOD_RGUI)
+
+#define OS_MEH OSM(MOD_LCTL | MOD_LSFT | MOD_LALT)
+#define OS_HYPR OSM(MOD_LCTL | MOD_LSFT | MOD_LALT | MOD_LGUI)
+
 // Layer tap-toggle - 32 layer max
 #define TT(layer) (QK_LAYER_TAP_TOGGLE | ((layer)&0x1F))
 #define QK_LAYER_TAP_TOGGLE_GET_LAYER(kc) ((kc)&0x1F)