summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Sharfi <me@ngalt.com>2016-05-25 17:25:04 -0700
committerNathan Sharfi <me@ngalt.com>2016-05-25 17:25:04 -0700
commit9d6debd9b23ffb045f63bc77dd44cafe2c7ce851 (patch)
tree03a7caa71deede81847b565fe0fa1c54512fdc3c
parentd06e940a179b2e81563cf6123461cfcad35f9045 (diff)
downloadqmk_firmware-9d6debd9b23ffb045f63bc77dd44cafe2c7ce851.tar.gz
qmk_firmware-9d6debd9b23ffb045f63bc77dd44cafe2c7ce851.zip
Add double quote for everyone; update Zweihander
-rw-r--r--README.md1
-rw-r--r--keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c15
-rw-r--r--quantum/keymap_common.h2
3 files changed, 14 insertions, 4 deletions
diff --git a/README.md b/README.md
index 021c2499f4..646fa6f2b1 100644
--- a/README.md
+++ b/README.md
@@ -85,6 +85,7 @@ The following shortcuts automatically add `LSFT()` to keycodes to get commonly u
KC_RPRN )
KC_UNDS _
KC_PLUS +
+ KC_DQUO "
KC_LCBR {
KC_RCBR }
KC_LABK <
diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c b/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
index e9963886be..91a60304a6 100644
--- a/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
@@ -6,6 +6,13 @@
#define SYMB 1 // symbols
#define MDIA 2 // media keys
+#define SGWK 0 // "sagewick", ⌘S ⌘⇥
+#define SGWF 1 // "sagewick freshly", ⌘S ⌘⇥ ⌘R
+#define BBED 2 // BBEdit
+#define TMNL 3 // Terminal
+#define SAFA 4 // Safari
+#define ALFRED_LEAD_TIME 100 // time, in milliseconds, to let Alfred come to the fore and accept keyboard input
+
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap 0: Basic layer
*
@@ -55,9 +62,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* ,--------------------------------------------------. ,--------------------------------------------------.
* | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 |
* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | [ | ] | { | } | | | | | / | 7 | 8 | 9 | * | F12 |
+ * | | [ | ] | { | } | " | | | | / | 7 | 8 | 9 | * | F12 |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | < | > | ( | ) | |------| |------| - | 4 | 5 | 6 | + | |
+ * | | < | > | ( | ) | ' |------| |------| - | 4 | 5 | 6 | + | |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | | | | | | | | | | & | 1 | 2 | 3 | = | |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
@@ -75,8 +82,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[SYMB] = KEYMAP(
// left hand
KC_TRNS,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
- KC_TRNS,KC_LBRC,KC_RBRC,KC_LCBR,KC_RCBR,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_LABK,KC_RABK,KC_LPRN,KC_RPRN,KC_TRNS,
+ KC_TRNS,KC_LBRC,KC_RBRC,KC_LCBR,KC_RCBR,KC_DQUO,KC_TRNS,
+ KC_TRNS,KC_LABK,KC_RABK,KC_LPRN,KC_RPRN,KC_QUOT,
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
KC_TRNS,KC_TRNS,
diff --git a/quantum/keymap_common.h b/quantum/keymap_common.h
index fafc93f7cd..db14e7d8ac 100644
--- a/quantum/keymap_common.h
+++ b/quantum/keymap_common.h
@@ -119,6 +119,8 @@ extern const uint16_t fn_actions[];
#define KC_PLUS LSFT(KC_EQL) // +
+#define KC_DQUO LSFT(KC_QUOT) // "
+#define KC_DOUBLE_QUOTE KC_DQUO
#define KC_LCBR LSFT(KC_LBRC) // {
#define KC_LEFT_CURLY_BRACE KC_LCBR