summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBalz Guenat <balz.guenat@gmail.com>2017-08-11 22:20:36 +0200
committerJack Humbert <jack.humb@gmail.com>2017-08-11 22:54:10 +0200
commit5ad103fa51083cb26d3516e5598b7b2a099b1521 (patch)
tree1c2c1d85598d7b1332e2e82b6276a49b2dc2d2b0
parent188ed682e37dba98a8ba86240abf182a8a6d4268 (diff)
downloadqmk_firmware-5ad103fa51083cb26d3516e5598b7b2a099b1521.tar.gz
qmk_firmware-5ad103fa51083cb26d3516e5598b7b2a099b1521.tar.xz
add description of new option to docs and add option (commented out) into template.
-rw-r--r--docs/faq_keymap.md4
-rw-r--r--quantum/template/config.h5
2 files changed, 8 insertions, 1 deletions
diff --git a/docs/faq_keymap.md b/docs/faq_keymap.md
index d6442ac53..3c2795816 100644
--- a/docs/faq_keymap.md
+++ b/docs/faq_keymap.md
@@ -116,7 +116,9 @@ https://github.com/tekezo/Karabiner/issues/403
## Esc and `~ on a key
-Use `GRAVE_ESC` or `KC_GESC` in your keymap.
+Use `GRAVE_ESC` or `KC_GESC` in your keymap. `GUI`+`GRAVE_ESC` results in `\`` and `SHIFT`+`GRAVE_ESC` results in `~`.
+
+Note that this will break the CTRL+SHIFT+ESC shortcut to the Windows task manager. Use `#define GRAVE_ESC_CTRL_OVERRIDE` in your `config.h` to get the shortcut back. With this option, `ESC_GRAVE` results in `ESC` if `CTRL` is held, even if `SHIFT` or `GUI` are also held.
## Arrow on Right Modifier keys with Dual-Role
This turns right modifer keys into arrow keys when the keys are tapped while still modifiers when the keys are hold. In TMK the dual-role function is dubbed **TAP**.
diff --git a/quantum/template/config.h b/quantum/template/config.h
index dbca45765..700a56f52 100644
--- a/quantum/template/config.h
+++ b/quantum/template/config.h
@@ -67,6 +67,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
/*
* Force NKRO
*