summaryrefslogtreecommitdiff
path: root/keyboard
diff options
context:
space:
mode:
authorNathan Sharfi <me@ngalt.com>2016-05-01 15:12:38 -0700
committerNathan Sharfi <me@ngalt.com>2016-05-01 15:12:38 -0700
commitfe022a508fdd39696e3b2b188df27d60b32f0d63 (patch)
treeca108130f23a17c116515367e7cb70c387c55f61 /keyboard
parent9b163d2feb332107794a0f6e3573afe92c40b7fe (diff)
zweihander: move dim/brighten to 1/2, add ⌘Q
Diffstat (limited to 'keyboard')
-rw-r--r--keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c16
-rw-r--r--keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex6
2 files changed, 11 insertions, 11 deletions
diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c b/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
index f53232c3cd..d019b731f2 100644
--- a/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
@@ -93,9 +93,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_END , KC_TRNS, KC_TRNS
),
/* Keymap 2: Media keys
- * dim brighten
+ *
* ,--------------------------------------------------. ,--------------------------------------------------.
- * | | | | | | | F14 | | F15 | ⌘W | ⌘⇧` | ⌘` | ⌥⇧⇥ | ⌥⇥ | Power |
+ * | | F14 | F15 | | | | | | ⌘Q | ⌘W | ⌘⇧` | ⌘` | ⌥⇧⇥ | ⌥⇥ | Power |
* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
* | | | | PgUp | | | | | | ⌘] | ⌥⌘↑ | ↑ | ⌥⌘↓ | | |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
// MEDIA AND MOUSE
[MDIA] = KEYMAP(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F14, /* F14 dims screen, F15 brightens */
+ KC_TRNS, KC_F14 , KC_F15 , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, /* F14 dims screen, F15 brightens */
KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, 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, KC_TRNS, KC_TRNS,
@@ -124,11 +124,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
// right hand
- KC_F15 , LGUI(KC_W), LGUI(LSFT(KC_GRV)), LGUI(KC_GRV), LALT(LSFT(KC_TAB)), LALT(KC_TAB), KC_PWR,
- 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,
- 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,
+ LGUI(KC_Q), LGUI(KC_W), LGUI(LSFT(KC_GRV)), LGUI(KC_GRV), LALT(LSFT(KC_TAB)), LALT(KC_TAB), KC_PWR,
+ 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,
+ 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_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex b/keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
index 3e313c3724..b76c3ec8e8 100644
--- a/keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
+++ b/keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
@@ -34,11 +34,11 @@
:100210004200260023002000500001004300250278
:100220002E022E004F004D00440045000100010049
:1002300001000000010001000100010001000000B8
-:1002400001000100010001000100010001000100A6
+:100240006900010001000100010001006A000100D5
:100250004A0001000100010001004B004E000100B6
:1002600001000100010001004D000100010001003A
-:10027000010001000100010000000100690001000F
-:1002800000000100000001006A0001000000010000
+:100270000100010001000100000001000100010077
+:10028000000001000000010014080100000001004E
:10029000000001001A0830082F082C02000001009D
:1002A000350A520C50002C00A900010035085200FC
:1002B0005100AC00AA0001002B06510C4F00AB000E