summaryrefslogtreecommitdiff
path: root/keyboard/ergodox_ez/keymaps/zweihander-osx
diff options
context:
space:
mode:
Diffstat (limited to 'keyboard/ergodox_ez/keymaps/zweihander-osx')
-rw-r--r--keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c20
-rw-r--r--keyboard/ergodox_ez/keymaps/zweihander-osx/makefile.mk2
-rw-r--r--keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown2
-rw-r--r--keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex6
4 files changed, 16 insertions, 14 deletions
diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c b/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
index 3444152bc3..0dfc1f68cd 100644
--- a/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
@@ -11,7 +11,7 @@
#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
+#define ALFRED_LEAD_TIME 250 // 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
@@ -66,25 +66,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | | < | > | ( | ) | ' |------| |------| - | 4 | 5 | 6 | + | |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | | | | | | & | 1 | 2 | 3 | = | |
+ * | | | | | | = | | | | : | 1 | 2 | 3 | = | |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
* | | | | | | | 0 | . | ← | → | |
* `----------------------------------' `----------------------------------'
* ,-------------. ,-------------.
* | | | | | |
* ,------|------|------| |------+------+------.
- * | | | | | Home | | |
+ * | | | | | | | |
* | | |------| |------| | |
- * | | | | | End | | |
+ * | | | | | | | |
* `--------------------' `--------------------'
*/
// SYMBOLS
[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_DQUO,KC_TRNS,
+ KC_TRNS,KC_LBRC,KC_RBRC,KC_LCBR,KC_RCBR,KC_DQT ,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_EQL ,KC_TRNS,
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
KC_TRNS,KC_TRNS,
KC_TRNS,
@@ -93,11 +93,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
KC_TRNS, KC_SLSH, KC_7, KC_8, KC_9, KC_ASTR, KC_F12,
KC_MINS, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS,
- KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_EQL, KC_TRNS,
+ KC_TRNS, KC_COLN, KC_1, KC_2, KC_3, KC_EQL, KC_TRNS,
KC_0, KC_DOT, KC_LEFT, KC_RGHT, KC_TRNS,
KC_TRNS, KC_TRNS,
- KC_HOME,
- KC_END , KC_TRNS, KC_TRNS
+ KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS
),
/* Keymap 2: Media keys
*
@@ -137,7 +137,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, LSFT(KC_SPC), KC_SPC , KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS,
- KC_TRNS,
+ KC_END ,
LGUI(KC_X), LGUI(KC_C), LGUI(KC_V)
),
};
diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/makefile.mk b/keyboard/ergodox_ez/keymaps/zweihander-osx/makefile.mk
new file mode 100644
index 0000000000..6e3d088a43
--- /dev/null
+++ b/keyboard/ergodox_ez/keymaps/zweihander-osx/makefile.mk
@@ -0,0 +1,2 @@
+# Don’t do a tricolor wave when the computer is shut down in Windows
+SLEEP_LED_ENABLE = no
diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown b/keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown
index 7bce7c6909..3b7f52941a 100644
--- a/keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown
+++ b/keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown
@@ -42,4 +42,4 @@ I press C-a, C-e, and C-k all the time. It’s difficult to press these key comb
## use spreadsheets
-All the common spreadsheet operations (+-*/=) are now on the right side of the symbol layer.
+All the common spreadsheet operations (+-*/=) are now on the right side of the symbol layer. There’s also a colon there for entering times and maybe IPv6 addresses. Not that I expect people to type IPv6 addresses into a spreadsheet, but, y’know.
diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex b/keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
index 599d581fe4..d505d617f1 100644
--- a/keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
+++ b/keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
@@ -15,12 +15,12 @@
:1000E0001C141C141C141C141C141C141C141C1490
:1000F0001C141C141C141C141C141C141C141C1480
:100100002E143B14421449145314750A01E2012CB5
-:10011000022C02E2746401160216010402040109B1
+:10011000022C02E274FA011602160104020401091B
:1001200002090104020401150215010C020C012848
-:10013000022800750A01E2012C022C02E27464011B
+:10013000022800750A01E2012C022C02E274FA0185
:10014000170217010802080115021501100210011B
:100150000C020C0111021101040204010F020F0133
-:1001600028022800750A01E2012C022C02E27464C4
+:1001600028022800750A01E2012C022C02E274FA2E
:100170000105020501050205010802080107020741
:10018000010C020C011702170128022800750A0150
:10019000E30116021602E301E3012B022B02E30145