aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Jack Humbert <jack.humb@gmail.com>2016-10-10 00:22:12 -0400
committerGravatar GitHub <noreply@github.com>2016-10-10 00:22:12 -0400
commitaa8aa6af75f7c7a6a66d83930f9bca306dfb8578 (patch)
tree8f850f344b0bc731f84c34f3c53ce3799bd39b67
parent49fe93fbb3a8ba1b960a1ebc7d590f9c57aac897 (diff)
parent628a48c7887e20a69b5a8c84cff956ba2ec7fed2 (diff)
downloadqmk_firmware-aa8aa6af75f7c7a6a66d83930f9bca306dfb8578.tar.gz
Merge pull request #808 from npoirey/master
Altgr quick combination and updated readme
-rw-r--r--quantum/keymap.h1
-rw-r--r--readme.md3
2 files changed, 4 insertions, 0 deletions
diff --git a/quantum/keymap.h b/quantum/keymap.h
index 98ddfd0c5..4b2192cb2 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
diff --git a/readme.md b/readme.md
index d28d7c3ff..f20ab41b1 100644
--- a/readme.md
+++ b/readme.md
@@ -140,6 +140,9 @@ If this is a bit complex for you, Docker might be the turn-key solution you need
docker run -e keymap=gwen -e keyboard=ergodox --rm -v $('pwd'):/qmk:rw edasque/qmk_firmware
+# On windows docker seems to have issue with VOLUME tag in Dockerfile, and $('pwd') won't print a windows compliant path, use full path instead like this
+docker run -e keymap=default -e keyboard=ergobop --rm -v D:/Users/Sacapuces/Documents/Repositories/qmk:/qmk:rw edasque/qmk_firmware
+
```
This will compile the targetted keyboard/keymap and leave it in your QMK directory for you to flash.