diff options
| author | Balz Guenat <balz.guenat@gmail.com> | 2017-08-12 12:14:33 +0200 |
|---|---|---|
| committer | Balz Guenat <balz.guenat@gmail.com> | 2017-08-12 12:14:33 +0200 |
| commit | 430151dd51b8b0d925850ad4d52c8bae41d3c154 (patch) | |
| tree | f3d13283dd812277bc30d75dff32ea16508b58c8 /docs/quantum_keycodes.md | |
| parent | 175db1a549a46518c2f2511ac1624d594eb07216 (diff) | |
| parent | 5ad103fa51083cb26d3516e5598b7b2a099b1521 (diff) | |
| download | qmk_firmware-430151dd51b8b0d925850ad4d52c8bae41d3c154.tar.gz qmk_firmware-430151dd51b8b0d925850ad4d52c8bae41d3c154.zip | |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# docs/faq_keymap.md
Diffstat (limited to 'docs/quantum_keycodes.md')
| -rw-r--r-- | docs/quantum_keycodes.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/quantum_keycodes.md b/docs/quantum_keycodes.md index 36dbda7a9..f13801ef5 100644 --- a/docs/quantum_keycodes.md +++ b/docs/quantum_keycodes.md | |||
| @@ -17,6 +17,7 @@ On this page we have documented keycodes between `0x00FF` and `0xFFFF` which are | |||
| 17 | |`FUNC(n)`/`F(n)`|Call `fn_action(n)`| | 17 | |`FUNC(n)`/`F(n)`|Call `fn_action(n)`| |
| 18 | |`M(n)`|to call macro n| | 18 | |`M(n)`|to call macro n| |
| 19 | |`MACROTAP(n)`|to macro-tap n idk FIXME| | 19 | |`MACROTAP(n)`|to macro-tap n idk FIXME| |
| 20 | |`KC_LOCK`|The [lock key](key_lock.md)| | ||
| 20 | 21 | ||
| 21 | ## Bootmagic Keycodes | 22 | ## Bootmagic Keycodes |
| 22 | 23 | ||