summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ergodox')
-rw-r--r--keyboards/ergodox/keymaps/algernon/keymap.c1
-rw-r--r--keyboards/ergodox/keymaps/default/keymap.c1
-rw-r--r--keyboards/ergodox/keymaps/j3rn/keymap.c39
-rw-r--r--keyboards/ergodox/keymaps/j3rn/readme.md9
-rw-r--r--keyboards/ergodox/keymaps/josh/keymap.c1
-rw-r--r--keyboards/ergodox/keymaps/sethbc/Makefile14
-rw-r--r--keyboards/ergodox/keymaps/sethbc/keymap.c102
-rw-r--r--keyboards/ergodox/keymaps/sethbc/readme.md3
-rw-r--r--keyboards/ergodox/keymaps/zweihander-osx/keymap.c26
-rw-r--r--keyboards/ergodox/keymaps/zweihander-osx/makefile.mk2
-rw-r--r--keyboards/ergodox/keymaps/zweihander-osx/readme.markdown2
-rw-r--r--keyboards/ergodox/keymaps/zweihander-osx/zweihander-osx.hex1151
-rw-r--r--keyboards/ergodox/readme.md15
13 files changed, 1321 insertions, 45 deletions
diff --git a/keyboards/ergodox/keymaps/algernon/keymap.c b/keyboards/ergodox/keymaps/algernon/keymap.c
index 6a14ef4676..c4de53da27 100644
--- a/keyboards/ergodox/keymaps/algernon/keymap.c
+++ b/keyboards/ergodox/keymaps/algernon/keymap.c
@@ -12,6 +12,7 @@
#include "keymap_plover.h"
#include "eeconfig.h"
#include "wait.h"
+#include "version.h"
/* Layers */
diff --git a/keyboards/ergodox/keymaps/default/keymap.c b/keyboards/ergodox/keymaps/default/keymap.c
index f1a83f4e79..1b80cb3a23 100644
--- a/keyboards/ergodox/keymaps/default/keymap.c
+++ b/keyboards/ergodox/keymaps/default/keymap.c
@@ -1,6 +1,7 @@
#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
+#include "version.h"
#define BASE 0 // default layer
#define SYMB 1 // symbols
diff --git a/keyboards/ergodox/keymaps/j3rn/keymap.c b/keyboards/ergodox/keymaps/j3rn/keymap.c
index 43c8f30a35..e6f6cf44ec 100644
--- a/keyboards/ergodox/keymaps/j3rn/keymap.c
+++ b/keyboards/ergodox/keymaps/j3rn/keymap.c
@@ -14,18 +14,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
* | Tab | Q | W | E | R | T | - | | = | Y | U | I | O | P | \ |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * |Ctrl/Esc|A / L2| S | D | F | G |------| |------| H | J | K | L | ; | ' |
+ * |Ctrl/Esc| A | S | D | F | G |------| |------| H | J | K | L | ; | ' |
* |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------|
* | LShift |Z/Ctrl| X | C | V | B | | | | N | M | , | . |//Ctrl| RShift |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | ~L1 | ~L2 |AltShf| Left | Right| | Up | Down | [ | ] | ~L1 |
+ * | ~L1 | Alt |AltShf| Left | Right| | Up | Down | [ | ] | ~L1 |
* `----------------------------------' `----------------------------------'
* ,-------------. ,-------------.
* | App | Home | | PgUp |Ctrl/Esc|
* ,------|------|------| |------+--------+------.
* | | | End | | PgDn | | |
* |Space | LGui |------| |------| Tab |Enter |
- * | | |Shift | | Alt | | |
+ * | | | ~L2 | | ~L1 | | |
* `--------------------' `----------------------'
*/
// If it accepts an argument (i.e, is a function), it doesn't need KC_.
@@ -34,13 +34,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// left hand
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LBRC,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_MINS,
- CTL_T(KC_ESC), LT(MDIA, KC_A),KC_S, KC_D, KC_F, KC_G,
+ CTL_T(KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G,
KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO),
- KC_FN1, KC_FN2, LALT(KC_LSFT), KC_LEFT,KC_RGHT,
+ KC_FN1, KC_LALT, LALT(KC_LSFT), KC_LEFT,KC_RGHT,
ALT_T(KC_APP), KC_HOME,
KC_END,
- KC_SPC, KC_LGUI, KC_LSHIFT,
+ KC_SPC, KC_LGUI, KC_FN2,
// right hand
KC_RBRC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
KC_EQL, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
@@ -50,20 +50,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_PGUP, CTL_T(KC_ESC),
KC_PGDN,
- KC_LALT, KC_TAB, KC_ENT
+ KC_FN1, KC_TAB, KC_ENT
),
/* Keymap 1: Symbol Layer
*
* ,--------------------------------------------------. ,--------------------------------------------------.
- * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 |
+ * | | | | | | | | | | | | | | | |
* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | ! | @ | { | } | | | | | | Up | 7 | 8 | 9 | * | F12 |
+ * | | ! | @ | { | } | | | | | | Up | 7 | 8 | 9 | * | |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | . | 0 | = | |
+ * | | | | | | | 0 | 0 | . | = | |
* `----------------------------------' `----------------------------------'
* ,-------------. ,-------------.
* | | | | | |
@@ -76,20 +76,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// SYMBOLS
[SYMB] = KEYMAP(
// left hand
- KC_TRNS,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
+ KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
KC_TRNS,KC_EXLM,KC_AT, KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+
KC_TRNS,KC_TRNS,
KC_TRNS,
KC_TRNS,KC_TRNS,KC_TRNS,
// right hand
- KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12,
+ KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_TRNS,
KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS,
KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS,
- KC_TRNS,KC_DOT, KC_0, KC_EQL, KC_TRNS,
+ KC_0, KC_0, KC_DOT, KC_EQL, KC_TRNS,
KC_TRNS, KC_TRNS,
KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS
@@ -97,9 +98,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap 2: Media and mouse keys
*
* ,--------------------------------------------------. ,--------------------------------------------------.
- * | | | | | | | | | | | | | | | |
+ * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 |
* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | | | | | | | | | | Lclk | Rclk | | |
+ * | | | | | | | | | | | | Lclk | Rclk | | F12 |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | | | | | | |------| |------|MsLeft|MsDown| MsUp |MsRght| | Play |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
@@ -117,7 +118,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_TRNS,
+ KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -126,8 +127,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
// right hand
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_TRNS, KC_F12,
KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_TRNS, KC_MPLY,
KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
diff --git a/keyboards/ergodox/keymaps/j3rn/readme.md b/keyboards/ergodox/keymaps/j3rn/readme.md
index fc4b640426..178aba7730 100644
--- a/keyboards/ergodox/keymaps/j3rn/readme.md
+++ b/keyboards/ergodox/keymaps/j3rn/readme.md
@@ -1,4 +1,4 @@
-# J3RN's Mac-centric ErgoDox EZ keymap
+# J3RN's Mac-Centric ErgoDox EZ keymap
## Motivation
@@ -14,6 +14,7 @@ This layout more closely resembles that of the Mac keyboard, and has some other
- **The key to the right of "0" is Backspace instead of "-"** (misleadingly labeled "delete" on the Mac's keyboard). There was no room to fit in "-" and "=" between "0" and Backspace, unfortunately.
- **The key to the left of "Q" is Tab instead of Delete.**
- **The rightmost big key on the left thumb is CMD (LGui) instead of Backspace.**
+- **The key to the left of Alt-Shift is an Alt key**. This is close to it's position on the Mac keyboard, though slightly further left.
### Other changes
@@ -23,7 +24,9 @@ This layout more closely resembles that of the Mac keyboard, and has some other
- **The Toggle L1 keys have been replaced by the otherwise displaced "-" and "=".** They are laid out, left-to-right, in the same order as on the Mac keyboard. Honestly, they are not terribly conveniently placed, and their placement might change in a later version. I found that I did not toggle L1 frequently at all, and found using the momentary keys to access L1 to fit my workflow better.
- **The "~"/L1 key in the bottom-left is now just momentary L1.** The "~" key was moved to the top-left as mentioned before, and I like to keep my multi-use keys to a minimum due to the latency for them to switch from "press" to "hold."
- **The Home and End buttons have been shifted up on the left thumb, and Shift inserted below them.** This makes doing Shift-5 and other such combinations less painful.
-- **The Page Up and Page Down buttons have been shifted up on the right thumb, and Alt was moved from above them to below them.** I use Alt more than Page Up or Page Down (mostly in terminal applications), and thought that it deserved a more accessible location.
-
+- **The Page Up and Page Down buttons have been shifted up on the right thumb.** I don't use either of these keys often, and wanted to free up some real estate.
+- **The bottommost-inner keys on the left and right thumb are momentary L2 and momentary L1, respectively**. I have found that both modes are useful, and this seemed like a reasonably accessible place to put these.
+- **Traditional numpad layout.** The base of most numpads is a double-wide "0" key to the left of a "." key. This is reflected in my layout by having two "0" keys to the left of a "." key.
+- **The function keys (F1-F12) have been moved to L2.** They were in the way in L1.
**I'm always open to feedback and/or suggestions!**
diff --git a/keyboards/ergodox/keymaps/josh/keymap.c b/keyboards/ergodox/keymaps/josh/keymap.c
index 488b214273..b5463873a9 100644
--- a/keyboards/ergodox/keymaps/josh/keymap.c
+++ b/keyboards/ergodox/keymaps/josh/keymap.c
@@ -1,6 +1,7 @@
#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
+#include "version.h"
#define BASE 0 // default layer
#define SYMB 1 // symbols
diff --git a/keyboards/ergodox/keymaps/sethbc/Makefile b/keyboards/ergodox/keymaps/sethbc/Makefile
new file mode 100644
index 0000000000..8c4ff87845
--- /dev/null
+++ b/keyboards/ergodox/keymaps/sethbc/Makefile
@@ -0,0 +1,14 @@
+BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
+CONSOLE_ENABLE = no # Console for debug(+400)
+COMMAND_ENABLE = no # Commands for debug and configuration
+CUSTOM_MATRIX = yes # Custom matrix file for the ErgoDox EZ
+SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
+NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+MIDI_ENABLE = no # MIDI controls
+UNICODE_ENABLE = yes # Unicode
+
+ifndef QUANTUM_DIR
+ include ../../../../Makefile
+endif
diff --git a/keyboards/ergodox/keymaps/sethbc/keymap.c b/keyboards/ergodox/keymaps/sethbc/keymap.c
new file mode 100644
index 0000000000..6846c4d529
--- /dev/null
+++ b/keyboards/ergodox/keymaps/sethbc/keymap.c
@@ -0,0 +1,102 @@
+#include "ergodox.h"
+#include "action_layer.h"
+
+#define BASE 0 // default layer
+#define FN1 1 // symbols
+#define FN2 2 // media keys
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[BASE] = KEYMAP( // layer 0 : default
+ // left hand
+ KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC,
+ KC_BSLS, KC_Q, KC_W, KC_E, KC_R, KC_T, MO(FN2),
+ KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, MO(FN1),
+ KC_LGUI, KC_GRV, KC_BSLS, KC_LEFT, KC_RGHT,
+ KC_LCTL, KC_LALT,
+ KC_HOME,
+ KC_SPC, KC_BSPC, KC_END,
+ // right hand
+ MO(FN2), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+ KC_LBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_RBRC,
+ KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+ MO(FN1), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+ KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_RGUI,
+ KC_RALT, KC_RCTL,
+ KC_PGUP,
+ KC_PGDN, KC_ENT, KC_SPC
+ ),
+// FN1
+[FN1] = KEYMAP(
+ // left hand
+ KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11,
+ 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_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_TRNS,
+ // right hand
+ KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, 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_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_TRNS, KC_TRNS
+),
+// FN2
+[FN2] = KEYMAP(
+ RESET, 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_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_TRNS,
+ KC_TRNS, KC_TRNS,
+ KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS,
+ // right hand
+ KC_TRNS, KC_NLCK, KC_PSLS, KC_PAST, KC_PAST, KC_PMNS, KC_BSPC,
+ KC_TRNS, KC_NO, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_BSPC,
+ KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_PENT,
+ KC_TRNS, KC_NO, KC_P1, KC_P2, KC_P3, KC_PPLS, KC_PENT,
+ KC_P0, KC_PDOT, KC_SLSH, KC_PENT, KC_PENT,
+ KC_TRNS, KC_TRNS,
+ KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS
+),
+};
+
+const uint16_t PROGMEM fn_actions[] = {
+};
+
+// Runs just one time when the keyboard initializes.
+void matrix_init_user(void) {
+
+};
+
+// Runs constantly in the background, in a loop.
+void matrix_scan_user(void) {
+
+ uint8_t layer = biton32(layer_state);
+
+ ergodox_board_led_off();
+ ergodox_right_led_1_off();
+ ergodox_right_led_2_off();
+ ergodox_right_led_3_off();
+ switch (layer) {
+ // TODO: Make this relevant to the ErgoDox EZ.
+ case 1:
+ ergodox_right_led_1_on();
+ break;
+ case 2:
+ ergodox_right_led_2_on();
+ break;
+ default:
+ // none
+ break;
+ }
+
+};
diff --git a/keyboards/ergodox/keymaps/sethbc/readme.md b/keyboards/ergodox/keymaps/sethbc/readme.md
new file mode 100644
index 0000000000..510b2f99c8
--- /dev/null
+++ b/keyboards/ergodox/keymaps/sethbc/readme.md
@@ -0,0 +1,3 @@
+# sethbc's Ergodox EZ keymap
+
+Largely based on the Ergodox Infinity default keymap
diff --git a/keyboards/ergodox/keymaps/zweihander-osx/keymap.c b/keyboards/ergodox/keymaps/zweihander-osx/keymap.c
index 40b1d7d6dd..d6d66fd55d 100644
--- a/keyboards/ergodox/keymaps/zweihander-osx/keymap.c
+++ b/keyboards/ergodox/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
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | `~ | '" | | ⎋ | ⌫ |
* ,------|------|------| |------+--------+------.
* | | | PgUp | | PgDn | | |
- * | | ⌫ |------| |------| ⇥ |Enter |
+ * | | ⇥ |------| |------| ⇥ |Enter |
* | | | L⌥ | | L⌃ | | |
* `--------------------' `----------------------'
*/
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LALT, KC_LGUI,KC_LEFT,KC_RGHT,
KC_GRV, KC_QUOT,
KC_PGUP,
- KC_SPC,KC_BSPC,KC_LALT,
+ KC_SPC,KC_TAB ,KC_LALT,
// right hand
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,
@@ -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
*
@@ -131,13 +131,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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,
+ LGUI(KC_Q), LGUI(KC_W), LGUI(LSFT(KC_GRV)), LGUI(KC_GRV), KC_TRNS, KC_TRNS, 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_END ,
LGUI(KC_X), LGUI(KC_C), LGUI(KC_V)
),
};
diff --git a/keyboards/ergodox/keymaps/zweihander-osx/makefile.mk b/keyboards/ergodox/keymaps/zweihander-osx/makefile.mk
new file mode 100644
index 0000000000..6e3d088a43
--- /dev/null
+++ b/keyboards/ergodox/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/keyboards/ergodox/keymaps/zweihander-osx/readme.markdown b/keyboards/ergodox/keymaps/zweihander-osx/readme.markdown
index 7bce7c6909..3b7f52941a 100644
--- a/keyboards/ergodox/keymaps/zweihander-osx/readme.markdown
+++ b/keyboards/ergodox/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/keyboards/ergodox/keymaps/zweihander-osx/zweihander-osx.hex b/keyboards/ergodox/keymaps/zweihander-osx/zweihander-osx.hex
new file mode 100644
index 0000000000..832504b02a
--- /dev/null
+++ b/keyboards/ergodox/keymaps/zweihander-osx/zweihander-osx.hex
@@ -0,0 +1,1151 @@
+:100000000C94D3020C941A030C941A030C941A0344
+:100010000C941A030C941A030C941A030C941A03EC
+:100020000C941A030C941A030C94B71F0C94892097
+:100030000C941A030C941A030C941A030C941A03CC
+:100040000C941A030C94FC1A0C941A030C941A03C3
+:100050000C941A030C9414160C941A030C941A039F
+:100060000C941A030C941A030C941A030C941A039C
+:100070000C941A030C941A030C941A030C941A038C
+:100080000C941A030C941A030C941A030C941A037C
+:100090000C941A030C941A030C941A030C941A036C
+:1000A0000C941A030C941A030C941A03730C730C1B
+:1000B000A20CA20CD80CF80C290E290E030D290E47
+:1000C000B30DB30D1A0E290E290E230EC00DC00D4F
+:1000D000C00DC00DC00DC00DC00DC00DC00DC00DB8
+:1000E000C00DC00DC00DC00DC00DC00DD20DDF0D77
+:1000F000E60DED0DF70DF620182106221821062237
+:100100005D2180210622D521E821750A01E2012C1A
+:10011000022C02E274FA011602160104020401091B
+:1001200002090104020401150215010C020C012848
+:10013000022800750A01E2012C022C02E274FA0185
+:10014000170217010802080115021501100210011B
+:100150000C020C0111021101040204010F020F0133
+:1001600028022800750A01E2012C022C02E274FA2E
+:100170000105020501050205010802080107020741
+:10018000010C020C011702170128022800750A0150
+:10019000E30116021602E301E3012B022B02E30145
+:1001A000E30115021502E300750A01E301160216C8
+:1001B00002E301E3012B022B02E3000000F0A12E79
+:1001C000004C002A00E100E00000001E00140004C2
+:1001D000001D00E200E2001F001A0016001B00E3F1
+:1001E000002B00200008000700060050002C002112
+:1001F000001500090019004F004B00220017000AEB
+:1002000000050000003500015301510000E300002B
+:10021000003400015301510000E3000000290023D5
+:10022000001C000B00110000002A00240018000D23
+:1002300000100052004E0025000C000E0036005148
+:10024000002800260012000F0037002F002B002787
+:10025000001300334238613000E0002D00310034DB
+:1002600068E5002C00000001000100010001000110
+:100270000000003A002F0036020100010001003B9F
+:1002800000300037020100010001003C002F02266F
+:10029000020100010001003D0030022702010001BF
+:1002A0000001003E00340234002E00000001000175
+:1002B0000001000000010000000100010001000039
+:1002C000000100000001003F0038002D0033020053
+:1002D0000001004000240021001E00270001004111
+:1002E00000250022001F00370001004200260023E5
+:1002F00000200050000100430025022E022E004F76
+:10030000000100440045000100010001000000015F
+:10031000000100010001000100000069000100016E
+:10032000000100010001006A000100043001000129
+:1003300000010001004B004E00010001000100011E
+:100340000001300100010001004A000100033001FA
+:100350000002300000010001000100000001000067
+:100360000001001408010000000100000001001A53
+:100370000830082F082C0200000100350A520C50EA
+:10038000002C00A9004D00350852005100AC00AA15
+:100390000019080100510C4F00AB00A8000608012D
+:1003A0000001000100010001001B08A5000100AED2
+:1003B000000100010000000000000000000000003B
+:1003C0000000010204060A0F17202C3A4A5D7187CB
+:1003D0009DB3C7DAE9F5FCFFFCF5E9DAC7B39D8701
+:1003E000715D4A3A2C20170F0A0604020100000032
+:1003F0000000000000000016034500720067006F57
+:100400000044006F007800200045005A00000016EC
+:10041000034500720067006F0044006F0078002001
+:100420000045005A0000000403090409026D00049D
+:100430000100A0FA090400000103010100092111D3
+:100440000100012240000705810308000A09040198
+:10045000000103010200092111010001224D0007E2
+:1004600005820308000A09040200010300000009D4
+:1004700021110100012236000705830308000A0943
+:1004800004030001030000000921110100012239C9
+:10049000000705840310000112011001000000088C
+:1004A000EDFE071301000102000105010906A1018B
+:1004B000050719E029E71500250195087501810256
+:1004C0000508190129059505750191029501750326
+:1004D0009101050719002977150025019578750107
+:1004E0008102C005010980A101850216810026B79D
+:1004F000001A81002AB700751095018100C0050C13
+:100500000901A1018503160100269C021A01002A97
+:100510009C02751095018100C005010902A1010925
+:1005200001A1000509190129051500250195057589
+:100530000181029501750381010501093009311519
+:1005400081257F95027508810609381581257F95DB
+:100550000175088106050C0A38021581257F950171
+:1005600075088106C0C005010906A101050719E04B
+:1005700029E7150025019508750181029501750887
+:10058000810105081901290595057501910295015B
+:10059000750391010507190029FF150026FF009535
+:1005A0000675088100C011241FBECFEFDAE0DEBF60
+:1005B000CDBF04B603FE27C08091010290910202D4
+:1005C000A0910302B09104028730904BA740B04B3A
+:1005D000D1F41092010210920202109203021092C2
+:1005E000040214BE84B7877F84BF0FB6F894A89521
+:1005F00080916000886180936000109260000FBE5F
+:10060000E0E0FFE3099511E0A0E0B1E0E0EAF7E403
+:1006100002C005900D92A433B107D9F712E0A4E30C
+:10062000B1E001C01D92A130B107E1F70E94FC1CAE
+:100630000C94CE230C9400001092B9008AE08093B1
+:10064000B800089594EA9093BC009091BC0097FF85
+:10065000FCCF9091B900987F983021F0903111F043
+:1006600081E008958093BB0084E88093BC00809172
+:10067000BC0087FFFCCF8091B900887F883111F0E2
+:10068000803471F780E0089584E98093BC00809104
+:10069000BC0084FDFCCF08958093BB0084E8809368
+:1006A000BC008091BC0087FFFCCF9091B900987F7F
+:1006B00081E0983209F480E0089584E88093BC00DA
+:1006C0008091BC0087FFFCCF8091BB00089580B370
+:1006D0008C7080BB81B3836F81BB089580910101D1
+:1006E000811115C080E40E942203809301018111D1
+:1006F0000CC082E10E944C0380930101811105C06E
+:100700008FEF0E944C03809301010E94440384B147
+:10071000807F84B985B1807F85B98AB1837F8AB9AA
+:100720008BB1837F8BB93E98469808950C94E4046E
+:100730000E942509809301010E946E030E946703B5
+:10074000A5E3B1E0E3E4F1E08EE08E0F11921D929B
+:100750008E13FCCF0C940F090E9425098093010190
+:100760000E946E030E946703A5E3B1E0E3E4F1E0B9
+:100770008EE08E0F11921D928E13FCCF0895BF92C2
+:10078000CF92DF92EF92FF920F931F93CF93DF935D
+:1007900080910101882379F0809134018F5F8093EB
+:1007A0003401811108C00E94250980930101811143
+:1007B00002C00E94B70805E311E0C0E0D0E0EE24DB
+:1007C000E394F12CDD24D39495E0C92EC730D105F4
+:1007D00000F58091010181113CC080E40E94220358
+:1007E00080930101811112C082E10E944C03809329
+:1007F000010181110BC0C7010C2E01C0880F0A94A2
+:10080000EAF780950E944C03809301010E94440303
+:1008100020C0CA30A1F028F4C83059F0C93061F0C6
+:1008200005C0CC3089F070F0CD3089F0209A28983E
+:1008300010C0219A29980DC0229A2A980AC0239A9A
+:100840002B9807C0529A01C0539A5B9802C03E9AF7
+:10085000469880EA8A95F1F7C730D10518F580915E
+:100860000101811144C080E40E94220380930101B0
+:10087000882311F0B12C12C083E10E944C038093B5
+:1008800001018111F7CF81E40E94220380930101CD
+:100890008111F0CF0E945D03B82EB0940E944403F2
+:1008A0008B2D26C08FB181708D25799902C092E081
+:1008B00001C090E0892B7C9902C024E001C020E0B7
+:1008C000822B7D9902C028E001C020E0822B7E9916
+:1008D00002C090E101C090E0892B9FB19095991FD3
+:1008E0009927991F9295990F907E892B01C080E0DE
+:1008F000F8019081981719F08083C09200010E943E
+:100900006E0321960F5F1F4FCE30D10509F05ECFE9
+:10091000809100018823A1F08150809300018823F9
+:1009200029F0F5E0FA95F1F700000AC0A3E4B1E080
+:10093000E5E3F1E0CF01825F91919D938E13FCCFAF
+:100940000E94410681E0DF91CF911F910F91FF90AE
+:10095000EF90DF90CF90BF900895E82FF0E0ED5B2F
+:10096000FE4F808108950895FC016230B9F028F4AB
+:10097000662341F0613061F023C06330A9F0643038
+:10098000C9F01EC082818823D9F088EA91E00895D9
+:1009900082818823A9F08DE891E0089582818823DF
+:1009A00079F084E691E008958281882349F083E319
+:1009B00091E008958281882319F08AE091E00895FA
+:1009C00080E090E0089508956091B0017091B101C8
+:1009D0008091B2019091B3010E94081556985E98DB
+:1009E00025982D9826982E9827982F98813019F0C1
+:1009F000823021F00895259A2D9A0895269A2E9AEC
+:100A0000089581E0089581E008950C9403050E9403
+:100A1000940E2FEF84E39CE0215080409040E1F75A
+:100A200000C000000C9439160F931F93CF93DF93EF
+:100A30008C01FC01C081D181CE010E948D13BE01C9
+:100A40000E94D807EC01B8010E940505882309F42B
+:100A500012C1B801CE010E946808882309F40BC1B5
+:100A6000B801CE010E948109882309F404C1C43170
+:100A7000F0E7DF0708F0CDC0C23080E7D80708F400
+:100A8000A3C0F8018281882309F4AAC00E947215CC
+:100A9000811102C00E9458150E94851590E0909324
+:100AA000F3018093F201C230F0E7DF0721F4809177
+:100AB000F201816082C0C33080E7D80721F48091C1
+:100AC000F20182607AC0C430E0E7DE0721F4809151
+:100AD000F201846072C0C530F0E7DF0719F480913D
+:100AE000F20127C0C63080E7D80721F48091F201D7
+:100AF000806163C0C730E0E7DE0721F48091F20136
+:100B000080625BC0C830F0E7DF0721F48091F2011A
+:100B1000806453C0C93080E7D80721F48091F20186
+:100B200080684BC0CA30E0E7DE0729F48091F2010B
+:100B30008460886042C0CB30F0E7DF0721F4809109
+:100B4000F2018E7F3AC0CC3080E7D80721F4809143
+:100B5000F2018D7F32C0CD30E0E7DE0721F48091D5
+:100B6000F2018B7F2AC0CE30F0E7DF0719F48091C5
+:100B7000F20122C0CF3080E7D80721F48091F20142
+:100B80008F7E1BC0C031E0E7DE0721F48091F201C7
+:100B90008F7D13C0C131F0E7DF0721F48091F201AE
+:100BA0008F7B0BC0C231D04721F48091F2018F7747
+:100BB00004C08091F2018B7F877F8093F201809146
+:100BC000F2010E94891557C0C115E0E7DE0779F0F0
+:100BD000C130D047A1F081E0809351018093520150
+:100BE000C801DF91CF911F910F910C940105F8017D
+:100BF0008281882309F43FC00E9407053CC0F801A8
+:100C000082818823C1F18091CD0181608093CD01E3
+:100C100032C0CB3380E7D807A1F4F8018281882362
+:100C200021F01092510182E016C080915101811192
+:100C300006C086E20E940C0B86E20E94DF0B82E077
+:100C400018C0CC33D04739F6F8018281882331F0BF
+:100C50001092520180E20E942E0C0DC08091520130
+:100C6000811106C087E20E940C0B87E20E94DF0B15
+:100C700080E20E94350C80E0DF91CF911F910F91AF
+:100C800008950C94960308950C9443060C9444061E
+:100C900026E0729FF001112444E5849FE00DF11DD0
+:100CA0001124E60FF11DEE0FFF1FE154FE4F859159
+:100CB00094910E94EA07811560E49607B0F58115CA
+:100CC00070E3970708F0E6C0803E9105D8F4803CB9
+:100CD000910508F06CC0883A910578F4853A910541
+:100CE00008F06BC08130910509F460C108F417C1A8
+:100CF0008430910508F05AC112C18D3B910508F46A
+:100D000067C00DC18F3F910509F048F4803F910500
+:100D100008F0B5C0883E910508F448C100C18115AE
+:100D200020E2920708F0ADC00895811543E59407CD
+:100D300090F4811562E5960708F0D0C0811571E541
+:100D4000970708F0C6C0811520E5920708F0A5C0F6
+:100D50009F70906A0895811545E59407D8F4811530
+:100D600064E5960708F0D0C0482F4695469570E296
+:100D7000479FA00111248370992721E030E0B90139
+:100D800002C0660F771F8A95E2F7CB01842B952B63
+:100D90009A680895811576E5970708F4BAC09C0112
+:100DA00030562115304108F0BAC09F70B6C0FC0122
+:100DB000EE0FFF1FE55CFF4F6AC0853A910509F40D
+:100DC000B1C0863A910509F0B0C082E890E4089578
+:100DD000883A910509F4ACC0893A910509F4ABC091
+:100DE0008A3A910509F4AAC08B3A910509F4A9C081
+:100DF0008C3A910509F4A8C08B3B910509F4A7C072
+:100E00008C3B910509F4A6C08D3A910509F4A5C063
+:100E1000803B910509F4A4C08E3A910509F4A3C062
+:100E20008F3A910509F4A2C0813B910509F4A1C054
+:100E3000823B910509F4A0C0833B910509F49FC052
+:100E4000843B910509F49EC0853B910509F49DC042
+:100E5000863B910509F49CC0873B910509F49BC032
+:100E6000883B910509F49AC0893B910509F499C022
+:100E70008A3B910509F498C080E094E40895906558
+:100E80000895FC01FF70EE0FFF1FE554FE4F8591A2
+:100E9000949108959927906C0895482F437021E00C
+:100EA00030E002C0220F331F4A95E2F73C68AC01E4
+:100EB00064E0569547956A95E1F74370342B8F703F
+:100EC0008695869560E2869FC0011124822B932B24
+:100ED0000895982F8827816F906A0895482F469526
+:100EE000469570E2479FA00111248370992721E065
+:100EF00030E0B90102C0660F771F8A95E2F7CB0197
+:100F0000842B952B9C680895982F8827846F906A6E
+:100F100008958F719927982F88279062089580E00F
+:100F200090E0089581E890E4089583E890E40895BE
+:100F300082EE94E4089589EE94E408958AEE94E4B0
+:100F4000089585EB94E4089586EB94E4089583EB8B
+:100F500094E4089584EB94E4089587EB94E4089571
+:100F60008CEC94E408958DEC94E4089583E895E482