Merge branch 'master' into meteor

author: stein3 <stein3@gmail.com> 2020-10-06 07:15:41 -0700
committer: stein3 <stein3@gmail.com> 2020-10-06 07:15:41 -0700
commit: 2e402741a89c5eec8cf30c966ce6f36d6ec9249b (patch)
tree: 3592e8c5e6bd19943ae55db7fc02a5f755afbb51 /docs/feature_advanced_keycodes.md
parent: 3e5e4f74272c610bb9fa737f674f8e65ed6100ca (diff)
parent: 2013f6313430b977e557e482d30daa279a46e75d (diff)
download: qmk_firmware-2e402741a89c5eec8cf30c966ce6f36d6ec9249b.tar.gz
qmk_firmware-2e402741a89c5eec8cf30c966ce6f36d6ec9249b.zip
1 files changed, 18 insertions, 15 deletions
diff --git a/docs/feature_advanced_keycodes.md b/docs/feature_advanced_keycodes.md
index b8664074a..745308b29 100644
--- a/docs/feature_advanced_keycodes.md
+++ b/docs/feature_advanced_keycodes.md
@@ -2,21 +2,24 @@
 These allow you to combine a modifier with a keycode. When pressed, the keydown event for the modifier, then `kc` will be sent. On release, the keyup event for `kc`, then the modifier will be sent.
-|Key       |Aliases                        |Description                                         |
+|Key       |Aliases                        |Description                                           |
-|----------|-------------------------------|----------------------------------------------------|
+|----------|-------------------------------|------------------------------------------------------|
-|`LCTL(kc)`|`C(kc)`                        |Hold Left Control and press `kc`                    |
+|`LCTL(kc)`|`C(kc)`                        |Hold Left Control and press `kc`                      |
-|`LSFT(kc)`|`S(kc)`                        |Hold Left Shift and press `kc`                      |
+|`LSFT(kc)`|`S(kc)`                        |Hold Left Shift and press `kc`                        |
-|`LALT(kc)`|`A(kc)`, `LOPT(kc)`            |Hold Left Alt and press `kc`                        |
+|`LALT(kc)`|`A(kc)`, `LOPT(kc)`            |Hold Left Alt and press `kc`                          |
-|`LGUI(kc)`|`G(kc)`, `LCMD(kc)`, `LWIN(kc)`|Hold Left GUI and press `kc`                        |
+|`LGUI(kc)`|`G(kc)`, `LCMD(kc)`, `LWIN(kc)`|Hold Left GUI and press `kc`                          |
-|`RCTL(kc)`|                               |Hold Right Control and press `kc`                   |
+|`RCTL(kc)`|                               |Hold Right Control and press `kc`                     |
-|`RSFT(kc)`|                               |Hold Right Shift and press `kc`                     |
+|`RSFT(kc)`|                               |Hold Right Shift and press `kc`                       |
-|`RALT(kc)`|`ROPT(kc)`, `ALGR(kc)`         |Hold Right Alt and press `kc`                       |
+|`RALT(kc)`|`ROPT(kc)`, `ALGR(kc)`         |Hold Right Alt and press `kc`                         |
-|`RGUI(kc)`|`RCMD(kc)`, `LWIN(kc)`         |Hold Right GUI and press `kc`                       |
+|`RGUI(kc)`|`RCMD(kc)`, `LWIN(kc)`         |Hold Right GUI and press `kc`                         |
-|`SGUI(kc)`|`SCMD(kc)`, `SWIN(kc)`         |Hold Left Shift and GUI and press `kc`              |
+|`SGUI(kc)`|`SCMD(kc)`, `SWIN(kc)`         |Hold Left Shift and GUI and press `kc`                |
-|`LCA(kc)` |                               |Hold Left Control and Alt and press `kc`            |
+|`LCA(kc)` |                               |Hold Left Control and Alt and press `kc`              |
-|`LCAG(kc)`|                               |Hold Left Control, Alt and GUI and press `kc`       |
+|`LSA(kc)` |                               |Hold Left Shift and Left Alt and press `kc`           |
-|`MEH(kc)` |                               |Hold Left Control, Shift and Alt and press `kc`     |
+|`RSA(kc)` |`SAGR(kc)`                     |Hold Right Shift and Right Alt (AltGr) and press `kc` |
-|`HYPR(kc)`|                               |Hold Left Control, Shift, Alt and GUI and press `kc`|
+|`RCS(kc)` |                               |Hold Right Control and Right Shift and press `kc`     |
+|`LCAG(kc)`|                               |Hold Left Control, Alt and GUI and press `kc`         |
+|`MEH(kc)` |                               |Hold Left Control, Shift and Alt and press `kc`       |
+|`HYPR(kc)`|                               |Hold Left Control, Shift, Alt and GUI and press `kc`  |
 You can also chain them, for example `LCTL(LALT(KC_DEL))` or `C(A(KC_DEL))` makes a key that sends Control+Alt+Delete with a single keypress.
author	stein3 <stein3@gmail.com>	2020-10-06 07:15:41 -0700
committer	stein3 <stein3@gmail.com>	2020-10-06 07:15:41 -0700
commit	2e402741a89c5eec8cf30c966ce6f36d6ec9249b (patch)
tree	3592e8c5e6bd19943ae55db7fc02a5f755afbb51 /docs/feature_advanced_keycodes.md
parent	3e5e4f74272c610bb9fa737f674f8e65ed6100ca (diff)
parent	2013f6313430b977e557e482d30daa279a46e75d (diff)
download	qmk_firmware-2e402741a89c5eec8cf30c966ce6f36d6ec9249b.tar.gz qmk_firmware-2e402741a89c5eec8cf30c966ce6f36d6ec9249b.zip

diff --git a/docs/feature_advanced_keycodes.md b/docs/feature_advanced_keycodes.md index b8664074a..745308b29 100644 --- a/docs/feature_advanced_keycodes.md +++ b/docs/feature_advanced_keycodes.md
@@ -2,21 +2,24 @@
2		2
3	These allow you to combine a modifier with a keycode. When pressed, the keydown event for the modifier, then `kc` will be sent. On release, the keyup event for `kc`, then the modifier will be sent.	3	These allow you to combine a modifier with a keycode. When pressed, the keydown event for the modifier, then `kc` will be sent. On release, the keyup event for `kc`, then the modifier will be sent.
4		4
5	\|Key \|Aliases \|Description \|	5	\|Key \|Aliases \|Description \|
6	\|----------\|-------------------------------\|----------------------------------------------------\|	6	\|----------\|-------------------------------\|------------------------------------------------------\|
7	\|`LCTL(kc)`\|`C(kc)` \|Hold Left Control and press `kc` \|	7	\|`LCTL(kc)`\|`C(kc)` \|Hold Left Control and press `kc` \|
8	\|`LSFT(kc)`\|`S(kc)` \|Hold Left Shift and press `kc` \|	8	\|`LSFT(kc)`\|`S(kc)` \|Hold Left Shift and press `kc` \|
9	\|`LALT(kc)`\|`A(kc)`, `LOPT(kc)` \|Hold Left Alt and press `kc` \|	9	\|`LALT(kc)`\|`A(kc)`, `LOPT(kc)` \|Hold Left Alt and press `kc` \|
10	\|`LGUI(kc)`\|`G(kc)`, `LCMD(kc)`, `LWIN(kc)`\|Hold Left GUI and press `kc` \|	10	\|`LGUI(kc)`\|`G(kc)`, `LCMD(kc)`, `LWIN(kc)`\|Hold Left GUI and press `kc` \|
11	\|`RCTL(kc)`\| \|Hold Right Control and press `kc` \|	11	\|`RCTL(kc)`\| \|Hold Right Control and press `kc` \|
12	\|`RSFT(kc)`\| \|Hold Right Shift and press `kc` \|	12	\|`RSFT(kc)`\| \|Hold Right Shift and press `kc` \|
13	\|`RALT(kc)`\|`ROPT(kc)`, `ALGR(kc)` \|Hold Right Alt and press `kc` \|	13	\|`RALT(kc)`\|`ROPT(kc)`, `ALGR(kc)` \|Hold Right Alt and press `kc` \|
14	\|`RGUI(kc)`\|`RCMD(kc)`, `LWIN(kc)` \|Hold Right GUI and press `kc` \|	14	\|`RGUI(kc)`\|`RCMD(kc)`, `LWIN(kc)` \|Hold Right GUI and press `kc` \|
15	\|`SGUI(kc)`\|`SCMD(kc)`, `SWIN(kc)` \|Hold Left Shift and GUI and press `kc` \|	15	\|`SGUI(kc)`\|`SCMD(kc)`, `SWIN(kc)` \|Hold Left Shift and GUI and press `kc` \|
16	\|`LCA(kc)` \| \|Hold Left Control and Alt and press `kc` \|	16	\|`LCA(kc)` \| \|Hold Left Control and Alt and press `kc` \|
17	\|`LCAG(kc)`\| \|Hold Left Control, Alt and GUI and press `kc` \|	17	\|`LSA(kc)` \| \|Hold Left Shift and Left Alt and press `kc` \|
18	\|`MEH(kc)` \| \|Hold Left Control, Shift and Alt and press `kc` \|	18	\|`RSA(kc)` \|`SAGR(kc)` \|Hold Right Shift and Right Alt (AltGr) and press `kc` \|
19	\|`HYPR(kc)`\| \|Hold Left Control, Shift, Alt and GUI and press `kc`\|	19	\|`RCS(kc)` \| \|Hold Right Control and Right Shift and press `kc` \|
		20	\|`LCAG(kc)`\| \|Hold Left Control, Alt and GUI and press `kc` \|
		21	\|`MEH(kc)` \| \|Hold Left Control, Shift and Alt and press `kc` \|
		22	\|`HYPR(kc)`\| \|Hold Left Control, Shift, Alt and GUI and press `kc` \|
20		23
21	You can also chain them, for example `LCTL(LALT(KC_DEL))` or `C(A(KC_DEL))` makes a key that sends Control+Alt+Delete with a single keypress.	24	You can also chain them, for example `LCTL(LALT(KC_DEL))` or `C(A(KC_DEL))` makes a key that sends Control+Alt+Delete with a single keypress.
22		25