zweihander-osx: Remove app keys, etc.

- add right command keys - add F16 on ;' for Siri - remove command-Q (too easy to hit)
author: Nathan Sharfi <adiabatic@users.noreply.github.com> 2017-10-29 21:19:57 -0700
committer: Jack Humbert <jack.humb@gmail.com> 2017-10-31 00:28:56 -0400
commit: c8fca10f0df3964d0c04b92212562ff231733236 (patch)
tree: 6aba80278b89eb34c5ef3228c41282b8458e7861
parent: 1f6002db3fc3670f11d2f346e5cde84bb1ee85d1 (diff)
download: qmk_firmware-c8fca10f0df3964d0c04b92212562ff231733236.tar.gz
qmk_firmware-c8fca10f0df3964d0c04b92212562ff231733236.zip
1 files changed, 13 insertions, 68 deletions
diff --git a/layouts/community/ergodox/zweihander-osx/keymap.c b/layouts/community/ergodox/zweihander-osx/keymap.c
index 2ace33ee2..8c216b09b 100644
--- a/layouts/community/ergodox/zweihander-osx/keymap.c
+++ b/layouts/community/ergodox/zweihander-osx/keymap.c
@@ -6,12 +6,7 @@
 #define SYMB 1 // symbols
 #define MDIA 2 // media keys
-#define SGWK 0 // "sagewick", ⌘S ⌘⇥
+// Best viewed in Xcode in Menlo Regular.
-#define SGWF 1 // "sagewick freshly", ⌘S ⌘⇥ ⌘R
-#define BBED 2 // BBEdit
-#define TMNL 3 // Terminal
-#define SAFA 4 // Safari
-#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
@@ -22,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * |   ⌦    |   Q  |   W  |   E  |   R  |   T  | ~L1  |           | ~L1  |   Y  |   U  |   I  |   O  |   P  |   \    |
 * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
 * |   ⌫    |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |; / L2| ' / L⌘ |
- * |--------+------+------+------+------+------|  L⌘  |           |  L⌘  |------+------+------+------+------+--------|
+ * |--------+------+------+------+------+------|  L⌘  |           |  R⌘  |------+------+------+------+------+--------|
 * |  L⇧    |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  | / / ⌃|  R⇧    |
 * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
 *   |  L⌃  |  L⌥  |  L⌘  |   ←  |   →  |                                       |   ↑  |   ↓  |   [  |   ]  |      |
@@ -51,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             TG(SYMB),  KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_MINS,
             MO(SYMB),  KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             KC_BSLS,
                        KC_H,   KC_J,   KC_K,   KC_L,   LT(MDIA, KC_SCLN),GUI_T(KC_QUOT),
-             KC_LGUI,   KC_N,   KC_M,   KC_COMM,KC_DOT, CTL_T(KC_SLSH),   KC_RSFT,
+             KC_RGUI,   KC_N,   KC_M,   KC_COMM,KC_DOT, CTL_T(KC_SLSH),   KC_RSFT,
                                KC_UP,  KC_DOWN,KC_LBRC,KC_RBRC,          KC_SPC ,
             KC_ESC,            KC_BSPC,
             KC_PGDN,
@@ -102,13 +97,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 2: Media keys
 *
 * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F14 |  F15 |PrtScr|SclLck| Pause|      |           |  ⌘Q  |  ⌘W  | ⌘⇧`  |  ⌘`  |      |      |  Power |
+ * |        |  F14 |  F15 |PrtScr|SclLck| Pause|      |           |      |  ⌘W  | ⌘⇧`  |  ⌘`  |      |      |  Power |
 * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | PgUp |⌘S⌘⇥⌘R| Term |      |           |      |  ⌘]  | ⌥⌘↑  |   ↑  | ⌥⌘↓  |      |        |
+ * |        |      |      | PgUp |      |      |      |           |      |  ⌘]  | ⌥⌘↑  |   ↑  | ⌥⌘↓  |      |        |
 * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |Safari| PgDn |      |      |------|           |------|  ⌘[  |   ←  |   ↓  |   →  |      |    ⏯  |
+ * |        |      | Home | PgDn |  End |      |------|           |------|  ⌘[  |   ←  |   ↓  |   →  |      |   F16  |
 * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |BBEdit|      |           |      |      |  ⏯  |  ⏮  |   ⏭ |      |        |
+ * |        |      |      |      |      |      |      |           |      |      |  ⏯  |  ⏮  |   ⏭ |      |        |
 * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
 *   |      |      |      |      |      |                                       |VolUp |VolDn | Mute |      |      |
 *   `----------------------------------'                                       `----------------------------------'
@@ -123,17 +118,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // MEDIA AND MOUSE
 [MDIA] = LAYOUT_ergodox(
       KC_TRNS, KC_F14 , KC_F15 , KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,  /* F14 dims screen, F15 brightens */
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, M(SGWF), M(TMNL), KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, M(SAFA), KC_PGDN, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END , KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, M(BBED), 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, KC_TRNS,
                                                    KC_HOME,
                                  KC_TRNS, KC_TRNS, KC_TRNS,
    // right hand
-       LGUI(KC_Q),  LGUI(KC_W),     LGUI(LSFT(KC_GRV)), LGUI(KC_GRV),   KC_TRNS,                KC_TRNS,        KC_PWR ,
+       KC_TRNS,     LGUI(KC_W),     LGUI(LSFT(KC_GRV)), LGUI(KC_GRV),   KC_TRNS,                KC_TRNS,        KC_POWER,
       KC_TRNS,     LGUI(KC_RBRC),  LGUI(LALT(KC_UP)),  KC_UP  ,        LGUI(LALT(KC_DOWN)),    KC_TRNS,        KC_TRNS,
-                    LGUI(KC_LBRC),  KC_LEFT,            KC_DOWN,        KC_RGHT,                KC_TRNS,        KC_MPLY,
+                    LGUI(KC_LBRC),  KC_LEFT,            KC_DOWN,        KC_RGHT,                KC_TRNS,        KC_F16 ,
       KC_TRNS,     KC_TRNS,        KC_MPLY,            KC_MPRV,        KC_MNXT,                KC_TRNS,        KC_TRNS,
                                    KC_VOLU,            KC_VOLD,        KC_MUTE,                KC_TRNS,        KC_TRNS,
       KC_TRNS,     KC_TRNS,
@@ -149,57 +144,7 @@ const uint16_t PROGMEM fn_actions[] = {
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 {
  // MACRODOWN only works in this function
-      switch(id) {
-          case SGWK:
-              if (record->event.pressed) {
-                  return MACRO(
-                               I(10),
-                               D(LGUI), T(S),   U(LGUI),
-                               D(LGUI), T(TAB), U(LGUI),
-                               END);
-              }
-              break;
-          case SGWF:
-              if (record->event.pressed) {
-                  return MACRO(
-                               I(10),
-                               D(LGUI), T(S),   U(LGUI),
-                               D(LGUI), T(TAB), U(LGUI),
-                               D(LGUI), T(R),   U(LGUI),
-                               END);
-              }
-              break;
-          case BBED:
-              if (record->event.pressed) {
-                  return MACRO(
-                               I(10),
-                               D(LALT), T(SPC),   U(LALT), W(ALFRED_LEAD_TIME),
-                               T(B), T(B), T(E), T(D), T(I), T(T),
-                               T(ENT),
-                               END);
-              }
-              break;
-          case TMNL:
-              if (record->event.pressed) {
-                  return MACRO(
-                               I(10),
-                               D(LALT), T(SPC),   U(LALT), W(ALFRED_LEAD_TIME),
-                               T(T), T(E), T(R), T(M), T(I), T(N), T(A), T(L),
-                               T(ENT),
-                               END);
-              }
-              break;
-          case SAFA:
-              if (record->event.pressed) {
-                  return MACRO(
-                               I(10),
-                               D(LALT), T(SPC),   U(LALT), W(ALFRED_LEAD_TIME),
-                               T(S), T(A), T(F), T(A), T(R), T(I),
-                               T(ENT),
-                               END);
-              }
-              break;
-      }
    return MACRO_NONE;
 };
author	Nathan Sharfi <adiabatic@users.noreply.github.com>	2017-10-29 21:19:57 -0700
committer	Jack Humbert <jack.humb@gmail.com>	2017-10-31 00:28:56 -0400
commit	c8fca10f0df3964d0c04b92212562ff231733236 (patch)
tree	6aba80278b89eb34c5ef3228c41282b8458e7861
parent	1f6002db3fc3670f11d2f346e5cde84bb1ee85d1 (diff)
download	qmk_firmware-c8fca10f0df3964d0c04b92212562ff231733236.tar.gz qmk_firmware-c8fca10f0df3964d0c04b92212562ff231733236.zip

diff --git a/layouts/community/ergodox/zweihander-osx/keymap.c b/layouts/community/ergodox/zweihander-osx/keymap.c index 2ace33ee2..8c216b09b 100644 --- a/layouts/community/ergodox/zweihander-osx/keymap.c +++ b/layouts/community/ergodox/zweihander-osx/keymap.c
@@ -6,12 +6,7 @@
6	#define SYMB 1 // symbols	6	#define SYMB 1 // symbols
7	#define MDIA 2 // media keys	7	#define MDIA 2 // media keys
8		8
9	#define SGWK 0 // "sagewick", ⌘S ⌘⇥	9	// Best viewed in Xcode in Menlo Regular.
10	#define SGWF 1 // "sagewick freshly", ⌘S ⌘⇥ ⌘R
11	#define BBED 2 // BBEdit
12	#define TMNL 3 // Terminal
13	#define SAFA 4 // Safari
14	#define ALFRED_LEAD_TIME 250 // time, in milliseconds, to let Alfred come to the fore and accept keyboard input
15		10
16	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	11	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
17	/* Keymap 0: Basic layer	12	/* Keymap 0: Basic layer
@@ -22,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
22	* \| ⌦ \| Q \| W \| E \| R \| T \| ~L1 \| \| ~L1 \| Y \| U \| I \| O \| P \| \ \|	17	* \| ⌦ \| Q \| W \| E \| R \| T \| ~L1 \| \| ~L1 \| Y \| U \| I \| O \| P \| \ \|
23	* \|--------+------+------+------+------+------\| \| \| \|------+------+------+------+------+--------\|	18	* \|--------+------+------+------+------+------\| \| \| \|------+------+------+------+------+--------\|
24	* \| ⌫ \| A \| S \| D \| F \| G \|------\| \|------\| H \| J \| K \| L \|; / L2\| ' / L⌘ \|	19	* \| ⌫ \| A \| S \| D \| F \| G \|------\| \|------\| H \| J \| K \| L \|; / L2\| ' / L⌘ \|
25	* \|--------+------+------+------+------+------\| L⌘ \| \| L⌘ \|------+------+------+------+------+--------\|	20	* \|--------+------+------+------+------+------\| L⌘ \| \| R⌘ \|------+------+------+------+------+--------\|
26	* \| L⇧ \| Z \| X \| C \| V \| B \| \| \| \| N \| M \| , \| . \| / / ⌃\| R⇧ \|	21	* \| L⇧ \| Z \| X \| C \| V \| B \| \| \| \| N \| M \| , \| . \| / / ⌃\| R⇧ \|
27	* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'	22	* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
28	* \| L⌃ \| L⌥ \| L⌘ \| ← \| → \| \| ↑ \| ↓ \| [ \| ] \| \|	23	* \| L⌃ \| L⌥ \| L⌘ \| ← \| → \| \| ↑ \| ↓ \| [ \| ] \| \|
@@ -51,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
51	TG(SYMB), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,	46	TG(SYMB), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
52	MO(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,	47	MO(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
53	KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN),GUI_T(KC_QUOT),	48	KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN),GUI_T(KC_QUOT),
54	KC_LGUI, KC_N, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), KC_RSFT,	49	KC_RGUI, KC_N, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), KC_RSFT,
55	KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, KC_SPC ,	50	KC_UP, KC_DOWN,KC_LBRC,KC_RBRC, KC_SPC ,
56	KC_ESC, KC_BSPC,	51	KC_ESC, KC_BSPC,
57	KC_PGDN,	52	KC_PGDN,
@@ -102,13 +97,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
102	/* Keymap 2: Media keys	97	/* Keymap 2: Media keys
103	*	98	*
104	* ,--------------------------------------------------. ,--------------------------------------------------.	99	* ,--------------------------------------------------. ,--------------------------------------------------.
105	* \| \| F14 \| F15 \|PrtScr\|SclLck\| Pause\| \| \| ⌘Q \| ⌘W \| ⌘⇧` \| ⌘` \| \| \| Power \|	100	* \| \| F14 \| F15 \|PrtScr\|SclLck\| Pause\| \| \| \| ⌘W \| ⌘⇧` \| ⌘` \| \| \| Power \|
106	* \|--------+------+------+------+------+-------------\| \|------+------+------+------+------+------+--------\|	101	* \|--------+------+------+------+------+-------------\| \|------+------+------+------+------+------+--------\|
107	* \| \| \| \| PgUp \|⌘S⌘⇥⌘R\| Term \| \| \| \| ⌘] \| ⌥⌘↑ \| ↑ \| ⌥⌘↓ \| \| \|	102	* \| \| \| \| PgUp \| \| \| \| \| \| ⌘] \| ⌥⌘↑ \| ↑ \| ⌥⌘↓ \| \| \|
108	* \|--------+------+------+------+------+------\| \| \| \|------+------+------+------+------+--------\|	103	* \|--------+------+------+------+------+------\| \| \| \|------+------+------+------+------+--------\|
109	* \| \| \|Safari\| PgDn \| \| \|------\| \|------\| ⌘[ \| ← \| ↓ \| → \| \| ⏯ \|	104	* \| \| \| Home \| PgDn \| End \| \|------\| \|------\| ⌘[ \| ← \| ↓ \| → \| \| F16 \|
110	* \|--------+------+------+------+------+------\| \| \| \|------+------+------+------+------+--------\|	105	* \|--------+------+------+------+------+------\| \| \| \|------+------+------+------+------+--------\|
111	* \| \| \| \| \| \|BBEdit\| \| \| \| \| ⏯ \| ⏮ \| ⏭ \| \| \|	106	* \| \| \| \| \| \| \| \| \| \| \| ⏯ \| ⏮ \| ⏭ \| \| \|
112	* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'	107	* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
113	* \| \| \| \| \| \| \|VolUp \|VolDn \| Mute \| \| \|	108	* \| \| \| \| \| \| \|VolUp \|VolDn \| Mute \| \| \|
114	* `----------------------------------' `----------------------------------'	109	* `----------------------------------' `----------------------------------'
@@ -123,17 +118,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
123	// MEDIA AND MOUSE	118	// MEDIA AND MOUSE
124	[MDIA] = LAYOUT_ergodox(	119	[MDIA] = LAYOUT_ergodox(
125	KC_TRNS, KC_F14 , KC_F15 , KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, /* F14 dims screen, F15 brightens */	120	KC_TRNS, KC_F14 , KC_F15 , KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, /* F14 dims screen, F15 brightens */
126	KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, M(SGWF), M(TMNL), KC_TRNS,	121	KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS,
127	KC_TRNS, KC_TRNS, M(SAFA), KC_PGDN, KC_TRNS, KC_TRNS,	122	KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END , KC_TRNS,
128	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, M(BBED), KC_TRNS,	123	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
129	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,	124	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
130	KC_TRNS, KC_TRNS,	125	KC_TRNS, KC_TRNS,
131	KC_HOME,	126	KC_HOME,
132	KC_TRNS, KC_TRNS, KC_TRNS,	127	KC_TRNS, KC_TRNS, KC_TRNS,
133	// right hand	128	// right hand
134	LGUI(KC_Q), LGUI(KC_W), LGUI(LSFT(KC_GRV)), LGUI(KC_GRV), KC_TRNS, KC_TRNS, KC_PWR ,	129	KC_TRNS, LGUI(KC_W), LGUI(LSFT(KC_GRV)), LGUI(KC_GRV), KC_TRNS, KC_TRNS, KC_POWER,
135	KC_TRNS, LGUI(KC_RBRC), LGUI(LALT(KC_UP)), KC_UP , LGUI(LALT(KC_DOWN)), KC_TRNS, KC_TRNS,	130	KC_TRNS, LGUI(KC_RBRC), LGUI(LALT(KC_UP)), KC_UP , LGUI(LALT(KC_DOWN)), KC_TRNS, KC_TRNS,
136	LGUI(KC_LBRC), KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_MPLY,	131	LGUI(KC_LBRC), KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_F16 ,
137	KC_TRNS, KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,	132	KC_TRNS, KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
138	KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,	133	KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
139	KC_TRNS, KC_TRNS,	134	KC_TRNS, KC_TRNS,
@@ -149,57 +144,7 @@ const uint16_t PROGMEM fn_actions[] = {
149	const macro_t action_get_macro(keyrecord_t record, uint8_t id, uint8_t opt)	144	const macro_t action_get_macro(keyrecord_t record, uint8_t id, uint8_t opt)
150	{	145	{
151	// MACRODOWN only works in this function	146	// MACRODOWN only works in this function
152	switch(id) {	147
153	case SGWK:
154	if (record->event.pressed) {
155	return MACRO(
156	I(10),
157	D(LGUI), T(S), U(LGUI),
158	D(LGUI), T(TAB), U(LGUI),
159	END);
160	}
161	break;
162	case SGWF:
163	if (record->event.pressed) {
164	return MACRO(
165	I(10),
166	D(LGUI), T(S), U(LGUI),
167	D(LGUI), T(TAB), U(LGUI),
168	D(LGUI), T(R), U(LGUI),
169	END);
170	}
171	break;
172	case BBED:
173	if (record->event.pressed) {
174	return MACRO(
175	I(10),
176	D(LALT), T(SPC), U(LALT), W(ALFRED_LEAD_TIME),
177	T(B), T(B), T(E), T(D), T(I), T(T),
178	T(ENT),
179	END);
180	}
181	break;
182	case TMNL:
183	if (record->event.pressed) {
184	return MACRO(
185	I(10),
186	D(LALT), T(SPC), U(LALT), W(ALFRED_LEAD_TIME),
187	T(T), T(E), T(R), T(M), T(I), T(N), T(A), T(L),
188	T(ENT),
189	END);
190	}
191	break;
192	case SAFA:
193	if (record->event.pressed) {
194	return MACRO(
195	I(10),
196	D(LALT), T(SPC), U(LALT), W(ALFRED_LEAD_TIME),
197	T(S), T(A), T(F), T(A), T(R), T(I),
198	T(ENT),
199	END);
200	}
201	break;
202	}
203	return MACRO_NONE;	148	return MACRO_NONE;
204	};	149	};
205		150