summaryrefslogtreecommitdiffstats
path: root/layouts/community/ergodox
diff options
context:
space:
mode:
authorAlex Ong <the.onga@gmail.com>2019-01-04 09:39:14 +0100
committerAlex Ong <the.onga@gmail.com>2019-01-04 09:39:14 +0100
commit47c91fc7f75ae0a477e55b687aa0fc30da0a283c (patch)
tree65ad39452748ff2e6d4a83ce54ede6ca22c9ada9 /layouts/community/ergodox
parentac9b88e8ccbbf38762871504cd827ff0d941c426 (diff)
parent563ce3f225d981ce460c12ca5130dfe47af41df0 (diff)
downloadqmk_firmware-47c91fc7f75ae0a477e55b687aa0fc30da0a283c.tar.gz
qmk_firmware-47c91fc7f75ae0a477e55b687aa0fc30da0a283c.tar.xz
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Diffstat (limited to 'layouts/community/ergodox')
-rw-r--r--layouts/community/ergodox/333fred/keymap.c350
-rw-r--r--layouts/community/ergodox/333fred/visualizer.c14
-rw-r--r--layouts/community/ergodox/adam/config.h1
-rw-r--r--layouts/community/ergodox/adnw_p_u_q/config.h9
-rw-r--r--layouts/community/ergodox/adnw_p_u_q/keymap.c335
-rw-r--r--layouts/community/ergodox/adnw_p_u_q/readme.md17
-rw-r--r--layouts/community/ergodox/adnw_p_u_q/visualizer.c34
-rw-r--r--layouts/community/ergodox/albert/rules.mk3
-rw-r--r--layouts/community/ergodox/algernon/NEWS.md13
-rw-r--r--layouts/community/ergodox/algernon/images/adore-layer.pngbin0 -> 105611 bytes
-rw-r--r--layouts/community/ergodox/algernon/images/base-layer.pngbin0 -> 106956 bytes
-rw-r--r--layouts/community/ergodox/algernon/images/heatmap.pngbin0 -> 139351 bytes
-rw-r--r--layouts/community/ergodox/algernon/images/steno-layer.pngbin0 -> 64086 bytes
-rw-r--r--layouts/community/ergodox/algernon/keymap.c8
-rw-r--r--layouts/community/ergodox/algernon/readme.md12
-rw-r--r--layouts/community/ergodox/algernon/rules.mk4
-rw-r--r--layouts/community/ergodox/alphadox/config.h1
-rw-r--r--layouts/community/ergodox/alphadox/rules.mk4
-rw-r--r--layouts/community/ergodox/bepo/keymap.c2
-rw-r--r--layouts/community/ergodox/bepo_csa/keymap.c12
-rw-r--r--layouts/community/ergodox/bocaj/config.h6
-rw-r--r--layouts/community/ergodox/bocaj/keymap.c196
-rw-r--r--layouts/community/ergodox/bocaj/readme.md37
-rw-r--r--layouts/community/ergodox/bocaj/rules.mk11
-rw-r--r--layouts/community/ergodox/deadcyclo/rules.mk1
-rw-r--r--layouts/community/ergodox/drashna/config.h8
-rw-r--r--layouts/community/ergodox/drashna/keymap.c196
-rw-r--r--layouts/community/ergodox/drashna/rules.mk12
-rw-r--r--layouts/community/ergodox/drashna_glow/README.md1
-rw-r--r--layouts/community/ergodox/drashna_glow/config.h11
-rw-r--r--layouts/community/ergodox/drashna_glow/keymap.c67
-rw-r--r--layouts/community/ergodox/drashna_glow/rules.mk11
-rw-r--r--layouts/community/ergodox/dvorak_svorak_a5/keymap.c214
-rw-r--r--layouts/community/ergodox/dvorak_svorak_a5/readme.md42
-rw-r--r--layouts/community/ergodox/erez_experimental/rules.mk3
-rw-r--r--layouts/community/ergodox/familiar/rules.mk1
-rw-r--r--layouts/community/ergodox/mclennon_osx/README.md4
-rw-r--r--layouts/community/ergodox/meagerfindings/README.md109
-rw-r--r--layouts/community/ergodox/meagerfindings/config.h26
-rw-r--r--layouts/community/ergodox/meagerfindings/keymap.c558
-rw-r--r--layouts/community/ergodox/meagerfindings/rules.mk3
-rw-r--r--layouts/community/ergodox/qwerty_code_friendly/keymap.c28
-rw-r--r--layouts/community/ergodox/qwerty_code_friendly/readme.md29
-rw-r--r--layouts/community/ergodox/replicaJunction/config.h77
-rw-r--r--layouts/community/ergodox/replicaJunction/keymap.c693
-rw-r--r--layouts/community/ergodox/replicaJunction/readme.md93
-rw-r--r--layouts/community/ergodox/replicaJunction/rules.mk8
-rw-r--r--layouts/community/ergodox/swedish-lindhe/keymap.c2
-rw-r--r--layouts/community/ergodox/swedish/keymap.c2
-rw-r--r--layouts/community/ergodox/techtomas/readme.md2
50 files changed, 2595 insertions, 675 deletions
diff --git a/layouts/community/ergodox/333fred/keymap.c b/layouts/community/ergodox/333fred/keymap.c
index d7728a5bd..b203f42c6 100644
--- a/layouts/community/ergodox/333fred/keymap.c
+++ b/layouts/community/ergodox/333fred/keymap.c
@@ -11,28 +11,19 @@ enum custom_keycodes {
};
enum custom_macros {
- VERSION,
- EEPROM,
-
// Windows macros
DLEFT,
DRIGHT,
PSCREEN_APP,
LSFT_TAB,
- // VS Macros
- REFACTOR,
- TEST,
- DEBUG_TEST,
- FORMAT,
- BUILD,
- GO_TO_IMPL,
- FIND_ALL_REF,
- REMOVE_SORT_USINGS,
-
// KeePass macros
KEEPASS_OPEN,
KEEPASS_TYPE,
+
+ // Terminal Copy/Paste
+ TERM_CP,
+ TERM_PT
};
// NOTE: Cells marked with ACCESS must remain transparent, they're the keys that actually get to that layer
@@ -41,131 +32,111 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap 0: Basic layer
*
* ,--------------------------------------------------. ,--------------------------------------------------.
- * | ` | 1 | 2 | 3 | 4 | 5 | = | | L1 | 6 | 7 | 8 | 9 | 0 | - |
+ * | ` | 1 | 2 | 3 | 4 | 5 | F5 | | F6 | 6 | 7 | 8 | 9 | 0 | - |
* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | TAB | Q | W | E | R | T | L1 | | L2 | Y | U | I | O | P | \ |
+ * | TAB | Q | W | E | R | T | GAME | |GAMEA | Y | U | I | O | P | \ |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | Esc | A | S | D | F | G |------| |------| H | J | K | L | ; | ' |
- * |--------+------+------+------+------+------| L2 | |MO(3) |------+------+------+------+------+--------|
+ * |--------+------+------+------+------+------| SYMB | |MEDIA |------+------+------+------+------+--------|
* | LShift |Z/Ctrl| X | C | V | B | | | | N | M | , | . |//Ctrl| RShift |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * |LCTRL | F4 | F5 | LGUI | LALT | | Left | Down | Up | Right| RGUI |
+ * |LCTRL | F4 | F5 | LGUI | LALT | | Left | Down | = | Right| RGUI |
* `----------------------------------' `----------------------------------'
* ,-------------. ,-------------.
* | Copy | Paste| | Copy | Paste |
* ,------|------|------| |------+--------+------.
- * | | | PgUp | | PgDn | | |
+ * | | | PgUp | | Up | | |
* | Bcksp|OSL(2)|------| |------| Ent |Space |
- * | | VIM | Del | | RCtrl| | |
+ * | | VIM | Del | | Down | | |
* `--------------------' `----------------------'
*/
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox( // layer 0 : default
+[BASE] = LAYOUT_ergodox_pretty( // layer 0 : default
// left hand
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_EQL,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(CODE),
- KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G,
- OSM(MOD_LSFT), CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, TG(SYMB),
- OSM(MOD_LCTL), KC_F4, KC_F5, KC_LGUI,KC_LALT,
- LCTL(KC_C), LCTL(KC_V),
- KC_PGUP,
- KC_BSPC,TD(TD_SYM_VIM), KC_DEL,
- // right hand
- TG(CODE), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
- TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
- KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
- MO(MDIA), KC_N, KC_M, KC_COMM,KC_DOT, CTL_T(KC_SLSH), OSM(MOD_RSFT),
- KC_LEFT,KC_DOWN,KC_UP, KC_RIGHT, KC_RGUI,
- LCTL(KC_C), LCTL(KC_V),
- KC_PGDN,
- KC_RCTL, KC_ENT, KC_SPC
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_F5, KC_F6, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(GAME), TG(GAME_ARROW), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
+ KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+ OSM(MOD_LSFT), CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, TG(SYMB), MO(MDIA), KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLSH), OSM(MOD_RSFT),
+ OSM(MOD_LCTL), KC_F4, KC_F5, KC_LGUI, KC_LALT, KC_LEFT, KC_DOWN, KC_EQL, KC_RIGHT, KC_RGUI,
+ LCTL(KC_C), LCTL(KC_V), LCTL(KC_C), LCTL(KC_V),
+ KC_PGUP, KC_UP,
+ KC_BSPC, TD(TD_SYM_VIM), KC_DEL, KC_DOWN, KC_ENT, KC_SPC
),
-/* Keymap 1: Code Layer
+
+/* Keymap 2: Codeflow Layer
*
* ,--------------------------------------------------. ,--------------------------------------------------.
- * | | | | | | | | |ACCESS| | | | | | |
+ * | | | | | | | | | | | | | | | |
* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | | | | | F10 | | F11 | | | | | | |
+ * | | | | | | | | | | | | | | | |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | | | | | | |------| |------| | | | | | |
- * |--------+------+------+------+------+------| L2 | | |------+------+------+------+------+--------|
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | | | | | | | | | | | | | | | |
* `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | F12 |GoToIm| FAR | | |
+ * | | | | | | | F7 | F8 | | | |
* `----------------------------------' `----------------------------------'
* ,-------------. ,---------------.
- * |Format|Build | | Copy | Paste |
+ * | |ACCESS| | | |
* ,------|------|------| |------+--------+------.
- * | | |Refact| | Up | | |
- * | |ACCESS|------| |------| | |
- * | | | | | Down | | |
+ * | | | | | | | |
+ * | | |------| |------| | |
+ * | | | | | | | |
* `--------------------' `----------------------'
*/
// If it accepts an argument (i.e, is a function), it doesn't need KC_.
// Otherwise, it needs KC_*
-[CODE] = LAYOUT_ergodox( // layer 1 : code
+[CODEFLOW] = LAYOUT_ergodox( // layer 1 : code
// left hand
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_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, TG(SYMB),
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- M(FORMAT),M(BUILD),
- M(REFACTOR),
- KC_TRNS, KC_TRNS, KC_TRNS,
- // right hand
+ KC_TRNS, KC_TRNS,
+ KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS,
+ // right han
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- 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_F12, M(GO_TO_IMPL),M(FIND_ALL_REF),KC_TRNS, KC_TRNS,
- LCTL(KC_C), LCTL(KC_V),
- KC_UP,
- KC_DOWN, 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_F7, KC_F8, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS,
+ KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS
),
-/* Keymap 2: Symbol Layer
+/* Keymap 3: Symbol Layer
*
* ,---------------------------------------------------. ,--------------------------------------------------.
- * |Version | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 |
+ * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 |
* |---------+------+------+------+------+------+------| |------+------+------+------+------+------+--------|
- * | | ! | @ | ( | ) | | |ACCESS| |ACCESS| Up | 7 | 8 | 9 | * | F12 |
+ * | | ! | @ | ( | ) | | | | | | Up | 7 | 8 | 9 | * | F12 |
* |---------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | | # | $ | { | } | ` |------| |------| Down | 4 | 5 | 6 | + | |
* |---------+------+------+------+------+------|ACCESS| | |------+------+------+------+------+--------|
* | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | |
* `---------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | EPRM | | | | | | 0 | 0 | . | = | |
+ * | | | | | | | 0 | 0 | . | = | |
* `-----------------------------------' `----------------------------------'
* ,-------------. ,-------------.
- * | | Caps | | | |
+ * | | | | | |
* ,------|------|------| |------+------+------.
* | | |APScr | | | | |
* | |ACCESS|------| |------| | |
- * | | | PScr | |ACCESS| | |
+ * | | | PScr | | | | |
* `--------------------' `--------------------'
*/
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
+[SYMB] = LAYOUT_ergodox_pretty(
// left hand
- VRSN, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
- KC_TRNS,KC_EXLM,KC_AT, KC_LPRN,KC_RPRN,KC_PIPE,KC_TRNS,
- KC_TRNS,KC_HASH,KC_DLR, KC_LCBR,KC_RCBR,KC_GRV,
- KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
- EPRM,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
- KC_TRNS,KC_CAPS,
- M(PSCREEN_APP),
- KC_TRNS,KC_TRNS,KC_PSCR,
- // 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_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_0, KC_0, KC_DOT, KC_EQL, 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_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+ KC_TRNS, KC_EXLM, KC_AT, KC_LPRN, KC_RPRN, KC_PIPE, KC_TRNS, KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12,
+ KC_TRNS, KC_HASH, KC_DLR, KC_LCBR, KC_RCBR, KC_GRV, KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS,
+ KC_TRNS, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_TRNS, KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_0, KC_DOT, KC_EQL, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ M(PSCREEN_APP), KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS
),
/* Keymap 3: Media and mouse keys
*
@@ -188,32 +159,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | Back | | |
* `--------------------' `--------------------'
*/
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
- BL_INC, BL_DEC,
- BL_TOGG,
- 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_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_VOLU, KC_TRNS,
- KC_VOLD,
- KC_MPRV, KC_MPLY, KC_MNXT
+[MDIA] = LAYOUT_ergodox_pretty(
+ 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_MS_U, 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_MS_L, KC_MS_D, KC_MS_R, 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_BTN1, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ BL_INC, BL_DEC, KC_VOLU, KC_TRNS,
+ BL_TOGG, KC_VOLD,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT
),
/* Keymap 4: Movement
*
* ,--------------------------------------------------. ,--------------------------------------------------.
* | | | | | | | | | | | | | | | |
* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | |KOpen |KType |LSHFT | | | | | | Copy | | | | Paste| |
+ * | |KOpen |KType |TERMCP|TERMPT| | | | | Copy | | | | Paste| |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | |DLeft |DRight|LCTRL | LGUI | |------| |------| Left | Down | Up | Right| | |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
@@ -230,26 +191,84 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `--------------------' `--------------------'
*/
// MEDIA AND MOUSE
-[VIM] = LAYOUT_ergodox(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, M(KEEPASS_OPEN),M(KEEPASS_TYPE),KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, M(DLEFT), M(DRIGHT), KC_LCTL, KC_LGUI, KC_TRNS,
- KC_TRNS, M(LSFT_TAB), KC_TAB, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, LCTL(KC_C),KC_TRNS, KC_TRNS, KC_TRNS, LCTL(KC_V),KC_TRNS,
- KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,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_END,
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS
-
-)
+[VIM] = LAYOUT_ergodox_pretty(
+ 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, M(KEEPASS_OPEN), M(KEEPASS_TYPE), TERM_CP, TERM_PT, KC_TRNS, KC_TRNS, KC_TRNS, LCTL(KC_C), KC_TRNS, KC_TRNS, KC_TRNS, LCTL(KC_V), KC_TRNS,
+ KC_TRNS, M(DLEFT), M(DRIGHT), KC_LCTL, KC_LGUI, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, KC_TRNS,
+ KC_TRNS, M(LSFT_TAB), KC_TAB, 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_HOME, KC_END,
+ KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+),
+/* Keymap 1: Game Layer
+ *
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | ESC | | | | | | | | | | | | | | |
+ * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ * | | | | | | |ACCESS| | | | | | | | |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | CTRL | | | | | |------| |------| | | | | | |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | SHIFT | Z | | | | | | | | | | | | | |
+ * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * |ENTER | | | LOCK | BSPC | | | | | | |
+ * `----------------------------------' `----------------------------------'
+ * ,-------------. ,---------------.
+ * | F5 | F6 | | | |
+ * ,------|------|------| |------+--------+------.
+ * | | | | | | | |
+ * | ALT | SPC |------| |------| | |
+ * | | | SYMB | | | | |
+ * `--------------------' `----------------------'
+ */
+// If it accepts an argument (i.e, is a function), it doesn't need KC_.
+// Otherwise, it needs KC_*
+[GAME] = LAYOUT_ergodox_pretty( // layer 1 : code
+ // left hand
+ KC_ESC, 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_LCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_LSFT, KC_Z, 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_ENT, KC_TRNS, KC_TRNS, KC_LOCK, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_F5, KC_F6, LCTL(KC_C), LCTL(KC_V),
+ KC_TRNS, KC_UP,
+ KC_LALT, KC_SPC, OSM(SYMB), KC_DOWN, KC_TRNS, KC_TRNS
+ ),
+/* Keymap 1: Game Arrow Layer
+ *
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | ESC | | | | | | | | | | | | | | |
+ * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ * | | | Up | | | | | |ACCESS| | | | | | |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | CTRL | Left | Down |Right | | |------| |------| | | | | | |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | SHIFT | Z | | | | | | | | | | | | | |
+ * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * |ENTER | | | LOCK | BSPC | | | | | | |
+ * `----------------------------------' `----------------------------------'
+ * ,-------------. ,---------------.
+ * | F5 | F6 | | | |
+ * ,------|------|------| |------+--------+------.
+ * | | | | | | | |
+ * | ALT | SPC |------| |------| | |
+ * | | | SYMB | | | | |
+ * `--------------------' `----------------------'
+ */
+// If it accepts an argument (i.e, is a function), it doesn't need KC_.
+// Otherwise, it needs KC_*
+[GAME_ARROW] = LAYOUT_ergodox_pretty( // layer 1 : code
+ // left hand
+ KC_ESC, 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_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_LCTL, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_LSFT, KC_Z, 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_ENT, KC_TRNS, KC_TRNS, KC_LOCK, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_F5, KC_F6, LCTL(KC_C), LCTL(KC_V),
+ KC_TRNS, KC_UP,
+ KC_LALT, KC_SPC, OSM(SYMB), KC_DOWN, KC_TRNS, KC_TRNS
+ )
};
const uint16_t PROGMEM fn_actions[] = {
@@ -260,16 +279,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
{
// MACRODOWN only works in this function
switch(id) {
- case VERSION:
- if (record->event.pressed) {
- SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
- }
- break;
- case EEPROM:
- if (record->event.pressed) { // For resetting EEPROM
- eeconfig_init();
- }
- break;
case DLEFT:
if (record->event.pressed) { // Windows move desktop left
return MACRO(D(LCTL), D(LGUI), T(LEFT), U(LGUI), U(LCTL), END);
@@ -289,46 +298,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
if (record->event.pressed) {
return MACRO(D(LSFT), T(TAB), U(LSFT), END);
}
- case REFACTOR:
- if (record->event.pressed) { // VS Refactor CTRL+R, R
- return MACRO(D(LCTL), T(R), U(LCTL), T(R), END);
- }
- break;
- case TEST:
- if (record->event.pressed) { // VS Run Tests CTRL+R, T
- return MACRO(D(LCTL), T(R), U(LCTL), T(T), END);
- }
- break;
- case DEBUG_TEST:
- if (record->event.pressed) { // VS Debug Tests CTRL+R, CTRL+T
- return MACRO(D(LCTL), T(R), T(T), U(LCTL), END);
- }
- break;
- case FORMAT:
- if (record->event.pressed) { // VS Format Document, CTRL+K, CTRL+D
- return MACRO(D(LCTL), T(K), T(D), U(LCTL), END);
- }
- break;
- case BUILD:
- if (record->event.pressed) { // VS Build. Sends CTRL+SHFT+B
- return MACRO(D(LCTL), D(LSFT), T(B), U(LSFT), U(LCTL), END);
- }
- break;
- case GO_TO_IMPL:
- if (record->event.pressed) { // VS Go To Implementation. Sends CTRL+F12
- return MACRO(D(LCTL), T(F12), U(LCTL), END);
- }
- break;
- case FIND_ALL_REF:
- if (record->event.pressed) { // VS Find All References. Sends CTRL+K, R
- return MACRO(D(LCTL), T(K), U(LCTL), T(R), END);
- }
- break;
- case REMOVE_SORT_USINGS:
- if (record->event.pressed) {
- return MACRO(D(LCTL), T(R), T(G), U(LCTL), END);
- }
- break;
case KEEPASS_OPEN:
if (record->event.pressed) { // Keepass open application
return MACRO(D(LCTL), D(LALT), T(K), U(LALT), U(LCTL), END);
@@ -339,27 +308,22 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
return MACRO(D(LCTL), D(LALT), T(A), U(LALT), U(LCTL), END);
}
break;
+ case TERM_CP:
+ if (record->event.pressed) { // Terminal Copy
+ return MACRO(D(LCTL), T(INSERT), U(LCTL), END);
+ }
+ break;
+ case TERM_PT:
+ if (record->event.pressed) { // Terminal Paste
+ return MACRO(D(LSFT), T(INSERT), U(LSFT), END);
+ }
+ break;
}
return MACRO_NONE;
};
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
tap_dance_process_record(keycode);
- switch (keycode) {
- // dynamically generate these.
- case EPRM:
- if (record->event.pressed) {
- eeconfig_init();
- }
- return false;
- break;
- case VRSN:
- if (record->event.pressed) {
- SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
- }
- return false;
- break;
- }
return true;
}
diff --git a/layouts/community/ergodox/333fred/visualizer.c b/layouts/community/ergodox/333fred/visualizer.c
index 2a30562ae..d13b3cd79 100644
--- a/layouts/community/ergodox/333fred/visualizer.c
+++ b/layouts/community/ergodox/333fred/visualizer.c
@@ -14,16 +14,22 @@ static void get_visualizer_layer_and_color(visualizer_state_t* state) {
if (state->status.leds & (1u << USB_LED_CAPS_LOCK)) {
saturation = 255;
}
- if (state->status.layer & 0x10) {
+ if (state->status.layer & 0x80) {
+ state->target_lcd_color = LCD_COLOR(0, 255, 60);
+ state->layer_text = "Game Arrow";
+ } else if (state->status.layer & 0x40) {
+ state->target_lcd_color = LCD_COLOR(0, 255, 60);
+ state->layer_text = "Game";
+ } else if (state->status.layer & 0x20) {
state->target_lcd_color = LCD_COLOR(140, 100, 60);
state->layer_text = "Movement";
- } else if (state->status.layer & 0x8) {
+ } else if (state->status.layer & 0x10) {
state->target_lcd_color = LCD_COLOR(0, saturation, 0xFF);
state->layer_text = "Media";
- } else if (state->status.layer & 0x4) {
+ } else if (state->status.layer & 0x8) {
state->target_lcd_color = LCD_COLOR(168, saturation, 0xFF);
state->layer_text = "Symbol";
- } else if (state->status.layer & 0x2) {
+ } else if (state->status.layer & 0x2 || state->status.layer & 0x4) {
state->target_lcd_color = LCD_COLOR(216, 90, 0xFF);
state->layer_text = "Code";
} else {
diff --git a/layouts/community/ergodox/adam/config.h b/layouts/community/ergodox/adam/config.h
index 21af8c6b8..1a8fddb50 100644
--- a/layouts/community/ergodox/adam/config.h
+++ b/layouts/community/ergodox/adam/config.h
@@ -2,5 +2,4 @@
#undef TAPPING_TERM
#define TAPPING_TERM 300 //At 500 some bad logic takes hold
-#define PREVENT_STUCK_MODIFIERS
#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/layouts/community/ergodox/adnw_p_u_q/config.h b/layouts/community/ergodox/adnw_p_u_q/config.h
new file mode 100644
index 000000000..b1170aa78
--- /dev/null
+++ b/layouts/community/ergodox/adnw_p_u_q/config.h
@@ -0,0 +1,9 @@
+#pragma once
+
+// This is the ideal value for me but find your own
+#undef TAPPING_TERM
+#define TAPPING_TERM 145
+
+// more options here: https://docs.qmk.fm/config_options.html
+#define FORCE_NKRO
+#define PERMISSIVE_HOLD // tab/hold-Keys should work better with that
diff --git a/layouts/community/ergodox/adnw_p_u_q/keymap.c b/layouts/community/ergodox/adnw_p_u_q/keymap.c
new file mode 100644
index 000000000..a90fcbc2c
--- /dev/null
+++ b/layouts/community/ergodox/adnw_p_u_q/keymap.c
@@ -0,0 +1,335 @@
+#include QMK_KEYBOARD_H
+#include "keymap_german.h"
+
+
+#define BASE 0 // default layer / VIM
+#define ARW 1 // arrow layer / Terminal
+#define DIAK 2 // diakritika layer
+#define BRACK 3 // brackets layer
+#define SYMBOLS 4 // symbols
+#define MEDIA 5 // media keys / Mouse-Navigation
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Keymap 0: Basic layer / VIM
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | Media |
+ * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ * | | P | U | Dia-L| , | Q | | | | V | C | L | M | B | |
+ * |--------+------+------+------+------+------| G | | gg |------+------+------+------+------+--------|
+ * | Symbols| H | I | E | A | O |------| |------| D | T | R | N | S | ARW |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | LShift | K | Y | . | ' | X |str-D | |str-U | J | G | Z | W | F | RShift |
+ * * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * | Ctrl | Alt | | | | | H | J | K | L | Ctrl |
+ * `----------------------------------' `----------------------------------'
+ * LShift is Tab on Click
+ *
+ * ,-------------. ,-------------.
+ * | ^ | / | | ? | $ |
+ * ,------|------|------| |------+--------+------.
+ * | | |str+a | |str+c | | |
+ * | Brack| Space|------| |------| Enter |BSpace|
+ * | -Lay |/shift| Tab/ | | | | |
+ * | | | GUI | | ESC | | |
+ * `--------------------' `----------------------'
+ * GUI is one shot
+ * str + a is for tmux etc.
+ * str + c is for stopping programs
+ */
+[BASE] = LAYOUT_ergodox( // layer 0 : default
+ // left hand
+ KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, KC_NO,
+ TG(SYMBOLS), DE_P, DE_U, OSL(DIAK), DE_COMM, DE_Q, LSFT(DE_G),
+ OSL(SYMBOLS), DE_H, DE_I, DE_E, DE_A, DE_O,
+ SFT_T(KC_TAB), DE_K, DE_Y, DE_DOT, DE_QUOT, DE_X, LCTL(DE_D),
+ KC_LCTRL, KC_LALT, KC_NO, KC_NO, KC_NO,
+
+
+ // left hand thumb-cluster
+ DE_CIRC, DE_SLSH,
+ LCTL(DE_A),
+ OSL(BRACK), SFT_T(KC_SPACE), GUI_T(KC_TAB),
+
+
+ // right hand
+ KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, TG(MEDIA),
+ DE_G, DE_V, DE_C, DE_L, DE_M, DE_B, KC_NO,
+ DE_D, DE_T, DE_R, DE_N, DE_S, TG(ARW),
+ LCTL(DE_U), DE_J, DE_G, DE_Z, DE_W, DE_F, KC_RSFT,
+ KC_H, KC_J, KC_K, KC_L, KC_RCTRL,
+
+ // right thumb-cluster
+ DE_QST, DE_DLR,
+ LCTL(DE_C),
+ KC_ESCAPE, KC_ENTER, KC_BSPACE
+),
+
+
+/* Keymap 1: Arrow Layer / Terminal
+ *
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | | | | | | | | | | | | | | | |
+ * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ * | | | | | | | | | | | | | | | |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | | | | | |------| |------| | | | | | |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | | | | | |P-Down| |P-Up | | | | | | |
+ * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * | | | | | | | Left | Bot | Top | Right| |
+ * `----------------------------------' `----------------------------------'
+ * ,-------------. ,-------------.
+ * | Home | | | | End |
+ * ,------|------|------| |------+------+------.
+ * | | | | | | | |
+ * | | |------| |------| | |
+ * | | | | | | | |
+ * `--------------------' `--------------------'
+ */
+// Arrows
+[ARW] = LAYOUT_ergodox(
+ 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_PGDOWN,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_HOME, KC_TRNS,
+ 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS,
+ KC_TRNS, KC_END,
+ KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS
+),
+
+
+/* Keymap 2: Diakritika Layer
+ *
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | | | | | | | | | | | | | | | |
+ * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ * | | | Ü | | | | | | | | | | | | |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | | | | Ä | Ö |------| |------| | | | | ß | |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | | | | | | | | | | | | | | |
+ * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * | | | | | | | | | | | |
+ * `----------------------------------' `----------------------------------'
+ * ,-------------. ,-------------.
+ * | | | | | |
+ * ,------|------|------| |------+------+------.
+ * | | | | | | | |
+ * | | |------| |------| | |
+ * | | | | | | | |
+ * `--------------------' `--------------------'
+ */
+// Diakritika
+[DIAK] = LAYOUT_ergodox(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, DE_UE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DE_AE, DE_OE,
+ 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_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, DE_SS, 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
+),
+
+
+/* Keymap 3: Brackets Layer
+ *
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | | | | | | | | | | | | | | | |
+ * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ * | | | | | | | | | | | | | | | |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | | ( | { | [ | |------| |------| | ] | } | ) | | |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | | | | | | | | | | | | | | |
+ * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * | | | | | | | | | | | |
+ * `----------------------------------' `----------------------------------'
+ * ,-------------. ,-------------.
+ * | | | | | |
+ * ,------|------|------| |------+------+------.
+ * | | | | | | | |
+ * | | |------| |------| | |
+ * | | | | | | | |
+ * `--------------------' `--------------------'
+ */
+// BRACK
+[BRACK] = LAYOUT_ergodox(
+ 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, DE_LPRN, DE_LCBR, DE_LBRC, 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_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, DE_RBRC, DE_RCBR, DE_RPRN, 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
+),
+
+
+/* Keymap 4: Symbol Layer
+ *
+ *
+ * Original:
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | |
+ * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ * | | ² | ° | ~ | @ | ! | | | | ? | & | § | " | ³ | |
+ * |--------+------+------+------+------+------| ( | | ) |------+------+------+------+------+--------|
+ * | | ´ | ' | : | ^ | < |------| |------| > | $ | ; | | | ` | |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | € | + | = | * | / | { | | } | \ | % | # | - | _ | |
+ * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * | | | | | | | | | | | |
+ * `----------------------------------' `----------------------------------'
+ */
+// SYMBOLS
+[SYMBOLS] = LAYOUT_ergodox(
+ // left hand
+ KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, //DE_LBRC,
+ KC_TRNS,DE_SQ2, DE_RING, DE_TILD, DE_AT, DE_EXLM, DE_LPRN,
+ KC_TRNS,DE_ACUT,DE_QUOT, DE_COLN, DE_CIRC, DE_LESS,
+ KC_TRNS,DE_EURO,DE_PLUS, DE_EQL, DE_ASTR, DE_SLSH, DE_LCBR,
+ KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+
+ KC_TRNS,KC_TRNS,
+ KC_TRNS,
+ KC_TRNS,KC_TRNS,KC_TRNS,
+
+ // right hand
+ //DE_RBRC,
+ KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS,
+ DE_RPRN, DE_QST, DE_AMPR, DE_PARA, DE_DQOT, DE_SQ3, KC_TRNS,
+ DE_MORE, DE_DLR, DE_SCLN, DE_PIPE, DE_GRV, KC_TRNS,
+ DE_RCBR, DE_BSLS, DE_PERC, DE_HASH, DE_MINS, DE_UNDS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+
+ KC_TRNS, KC_TRNS,
+ KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS
+),
+
+/* Keymap 5: Numbers
+ *
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | | | | | | | | | | | | Num | / | * | - |
+ * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ * | | | | | | | | | | | | 7 | 8 | 9 | + |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | | | | | |------| |------| | | 4 | 5 | 6 | + |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | | | | | | | | | | | 1 | 2 | 3 | Enter |
+ * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * | | | | | | | 0 | , | | | Enter|
+ * `----------------------------------' `----------------------------------'
+ * ,-------------. ,-------------.
+ * | | | | | |
+ * ,------|------|------| |------+------+------.
+ * | | | | | | | |
+ * | | |------| |------| | |
+ * | | | | | | | |
+ * `--------------------' `--------------------'
+// NUMBERS
+[NUMBERS] = LAYOUT_ergodox(
+ 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, 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_7, KC_8, KC_9, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_4, KC_5, KC_8, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_1, KC_2, KC_3, KC_TRNS,
+ KC_0, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS,
+ KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS
+),
+
+
+*/
+
+/* Keymap 6: Media and mouse keys
+ *
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | | | | | | | | | | | | | | | |
+ * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ * | | Sleep| | | | | | | | | | | | | |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | Wake | | | | |------| |------| |MsLeft|MsDown| MsUp |MsRght| |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | | | | | | | | | | | | | | |
+ * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * | | | Mute| VolDn| VolUp| | Play| Prev | Next | Stop | |
+ * `----------------------------------' `----------------------------------'
+ * ,-------------. ,-------------.
+ * | | | | | |
+ * ,------|------|------| |------+------+------.
+ * | | | | | | | |
+ * | | Lclk|------| |------|Rclk | |
+ * | | | | | | | |
+ * `--------------------' `--------------------'
+ */
+// MEDIA AND MOUSE
+[MEDIA] = LAYOUT_ergodox(
+ KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_TRNS, KC_SLEP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_TRNS, KC_WAKE, KC_NO, KC_NO, KC_NO, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU,
+ KC_TRNS, KC_TRNS,
+ KC_TRNS,
+ KC_TRNS, KC_BTN1, KC_TRNS,
+ // right hand
+ KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
+ KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
+ KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_TRNS,
+ KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
+ KC_MPLY, KC_MPRV, KC_MNXT, KC_MSTP, KC_TRNS,
+ KC_TRNS, KC_TRNS,
+ KC_TRNS,
+ KC_TRNS, KC_BTN2, KC_TRNS
+),
+};
+
+// Runs constantly in the background, in a loop.
+void matrix_scan_user_keyboard(void) {
+ ergodox_board_led_on();
+ ergodox_led_all_on();
+}
diff --git a/layouts/community/ergodox/adnw_p_u_q/readme.md b/layouts/community/ergodox/adnw_p_u_q/readme.md
new file mode 100644
index 000000000..dc914a0aa
--- /dev/null
+++ b/layouts/community/ergodox/adnw_p_u_q/readme.md
@@ -0,0 +1,17 @@
+This is a fork of the adnw_k_o_y-Layout
+
+Features:
+- Diakritika-Layer for ADNW-PUQ-Layout
+- all basic-symbols of the german-layout can be found in the Symbol- and Diakritika-Layer
+- Symbol-Layer: Symbols are mirrored -- left = < and right = >
+- Basic-Layer-Keys which always be present in any Layer and allow the movement between layers
+- HJKL-Keys and Arrow-Keys can be switched, necessary for working with a terminal and vim
+- Number-Layer for Numpad-Emulation
+- Brackets-Layer for easier programming
+- Media-Layer for Mouse-Navigation
+
+Notes:
+- adnw is a layout optimised for usage with german and english language
+- PUQ is a variant of adnw: http://www.adnw.de/index.php?n=Main.OptimierungF%C3%BCrDieGeradeTastaturMitDaumen-Shift
+- This implementation is optimised for my workflow with vim/tmux/xmonad and ergodox
+- The OS must use the de_DE layout
diff --git a/layouts/community/ergodox/adnw_p_u_q/visualizer.c b/layouts/community/ergodox/adnw_p_u_q/visualizer.c
new file mode 100644
index 000000000..9a4d48538
--- /dev/null
+++ b/layouts/community/ergodox/adnw_p_u_q/visualizer.c
@@ -0,0 +1,34 @@
+/*
+Note: this is a modified copy of ../default/visualizer.c, originally licensed GPL.
+*/
+
+#include "simple_visualizer.h"
+
+// This function should be implemented by the keymap visualizer
+// Don't change anything else than state->target_lcd_color and state->layer_text as that's the only thing
+// that the simple_visualizer assumes that you are updating
+// Also make sure that the buffer passed to state->layer_text remains valid until the previous animation is
+// stopped. This can be done by either double buffering it or by using constant strings
+static void get_visualizer_layer_and_color(visualizer_state_t* state) {
+
+ if (state->status.layer & 0x20) {
+ state->target_lcd_color = LCD_COLOR(127, 0xFF, 0xFF);
+ state->layer_text = "Mouse";
+ } else if (state->status.layer & 0x10) {
+ state->target_lcd_color = LCD_COLOR(85, 0xFF, 0xFF);
+ state->layer_text = "Symbol";
+ } else if (state->status.layer & 0x8) {
+ state->target_lcd_color = LCD_COLOR(64, 0xFF, 0xFF);
+ state->layer_text = "Brackets";
+ } else if (state->status.layer & 0x4) {
+ state->target_lcd_color = LCD_COLOR(42, 0xFF, 0xFF);
+ state->layer_text = "Diak";
+ } else if (state->status.layer & 0x2) {
+ state->target_lcd_color = LCD_COLOR(21, 0xFF, 0xFF);
+ state->layer_text = "Terminal";
+ } else {
+ state->target_lcd_color = LCD_COLOR(192, 0xFF, 0xFF);
+ state->layer_text = "Vim";
+ }
+}
+
diff --git a/layouts/community/ergodox/albert/rules.mk b/layouts/community/ergodox/albert/rules.mk
index fcd019e83..47549b50f 100644
--- a/layouts/community/ergodox/albert/rules.mk
+++ b/layouts/community/ergodox/albert/rules.mk
@@ -1,3 +1,2 @@
COMMAND_ENABLE = no # Commands for debug and configuration
-
-
+LEADER_ENABLE = yes
diff --git a/layouts/community/ergodox/algernon/NEWS.md b/layouts/community/ergodox/algernon/NEWS.md
index 1bc2b5dc6..a6ce9813b 100644
--- a/layouts/community/ergodox/algernon/NEWS.md
+++ b/layouts/community/ergodox/algernon/NEWS.md
@@ -1,5 +1,18 @@
<!-- -*- mode: markdown; fill-column: 8192 -*- -->
+## v1.12
+
+*2018-11-22*
+
+### Overall changes
+
+* Updated to work with QMK master.
+
+### Miscellaneous
+
+* The `😂` symbol can be entered with UCIS.
+* `LEAD r` now inputs `Right Alt`.
+
## v1.11
*2017-10-01*
diff --git a/layouts/community/ergodox/algernon/images/adore-layer.png b/layouts/community/ergodox/algernon/images/adore-layer.png
new file mode 100644
index 000000000..75d2ca4f0
--- /dev/null
+++ b/layouts/community/ergodox/algernon/images/adore-layer.png
Binary files differ
diff --git a/layouts/community/ergodox/algernon/images/base-layer.png b/layouts/community/ergodox/algernon/images/base-layer.png
new file mode 100644
index 000000000..2ca7a273b
--- /dev/null
+++ b/layouts/community/ergodox/algernon/images/base-layer.png
Binary files differ
diff --git a/layouts/community/ergodox/algernon/images/heatmap.png b/layouts/community/ergodox/algernon/images/heatmap.png
new file mode 100644
index 000000000..4f55c5adf
--- /dev/null
+++ b/layouts/community/ergodox/algernon/images/heatmap.png
Binary files differ
diff --git a/layouts/community/ergodox/algernon/images/steno-layer.png b/layouts/community/ergodox/algernon/images/steno-layer.png
new file mode 100644
index 000000000..9a2ba55ef
--- /dev/null
+++ b/layouts/community/ergodox/algernon/images/steno-layer.png
Binary files differ
diff --git a/layouts/community/ergodox/algernon/keymap.c b/layouts/community/ergodox/algernon/keymap.c
index ebdc4ab4e..fb6de1b72 100644
--- a/layouts/community/ergodox/algernon/keymap.c
+++ b/layouts/community/ergodox/algernon/keymap.c
@@ -13,6 +13,7 @@
#include "eeconfig.h"
#include "wait.h"
#include "version.h"
+#include "print.h"
/* Layers */
@@ -1033,6 +1034,10 @@ void matrix_scan_user(void) {
}
#endif
+ SEQ_ONE_KEY (KC_R) {
+ ang_tap(KC_RALT, 0);
+ }
+
SEQ_ONE_KEY (KC_T) {
time_travel = !time_travel;
}
@@ -1126,7 +1131,8 @@ const qk_ucis_symbol_t ucis_symbol_table[] = UCIS_TABLE
UCIS_SYM("micro", 0x00b5),
UCIS_SYM("tm", 0x2122),
UCIS_SYM("child", 0x1f476),
- UCIS_SYM("family", 0x1F46A)
+ UCIS_SYM("family", 0x1F46A),
+ UCIS_SYM("joy", 0x1F602)
);
bool process_record_user (uint16_t keycode, keyrecord_t *record) {
diff --git a/layouts/community/ergodox/algernon/readme.md b/layouts/community/ergodox/algernon/readme.md
index 03b094edb..a25018a7b 100644
--- a/layouts/community/ergodox/algernon/readme.md
+++ b/layouts/community/ergodox/algernon/readme.md
@@ -3,7 +3,12 @@
algernon's layout
=======================
-This is an unconventional layout for the [ErgoDox EZ][ez]. For more details about the history of the layout, see my [blog posts about my ErgoDox journey][blog-ergodox].
+This is the layout I used to use on my [ErgoDox EZ][ez], while I was using [QMK][qmk]. I no longer do so, and this repository is obsolete, and not updated anymore. My current firmware is based on [Kaleidoscope][kaleidoscope], and is located [elsewhere][ergodox-sketch]. I'm keeping the repo around for historical and educational purposes.
+
+ [kaleidoscope]: https://github.com/keyboardio/Kaleidoscope
+ [ergodox-sketch]: https://git.madhouse-project.org/algernon/ErgoDox-sketch
+
+Nevertheless, this is an unconventional layout for the [ErgoDox EZ][ez]. For more details about the history of the layout, see my [blog posts about my ErgoDox journey][blog-ergodox].
[ez]: https://ergodox-ez.com/
[blog-ergodox]: https://asylum.madhouse-project.org/blog/tags/ergodox/
@@ -57,6 +62,7 @@ At its core, this is a Dvorak layout, with some minor changes. The more interest
- `LEAD d` toggles logging keypress positions to the HID console.
- `LEAD t` toggles time travel. Figuring out the current `date` is left as an exercise to the reader.
- `LEAD u` enters the [Unicode symbol input](#unicode-symbol-input) mode.
+ - `LEAD r` inputs `Right Alt`, which is the `Compose` key of my choice.
The symbols on the front in the image above have the same color as the key that activates them, with the exception of the **Arrow** layer, which is just black on the front.
@@ -128,13 +134,13 @@ $ git clone https://github.com/qmk/qmk_firmware.git
$ cd qmk_firmware
$ git clone https://github.com/algernon/ergodox-layout.git \
layouts/community/ergodox/algernon_master
-$ make ergodox_ez-algernon_master
+$ make ergodox_ez:algernon_master
```
From time to time, updates may be submitted back to the QMK repository. If you are reading it there, you can build the firmware like any other firmware included with it (assuming you are in the root directory of the firmware):
```
-$ make ergodox_ez-algernon
+$ make ergodox_ez:algernon
```
## Using on Windows
diff --git a/layouts/community/ergodox/algernon/rules.mk b/layouts/community/ergodox/algernon/rules.mk
index f795a8676..1b4c0995f 100644
--- a/layouts/community/ergodox/algernon/rules.mk
+++ b/layouts/community/ergodox/algernon/rules.mk
@@ -8,8 +8,10 @@ TAP_DANCE_ENABLE = yes
KEYLOGGER_ENABLE ?= yes
UCIS_ENABLE = yes
MOUSEKEY_ENABLE = no
+LEADER_ENABLE = yes
+RGBLIGHT_ENABLE = no
-AUTOLOG_ENABLE ?= no
+AUTOLOG_ENABLE ?= yes
ifeq (${FORCE_NKRO},yes)
OPT_DEFS += -DFORCE_NKRO
diff --git a/layouts/community/ergodox/alphadox/config.h b/layouts/community/ergodox/alphadox/config.h
index 6fc64f508..9e076dead 100644
--- a/layouts/community/ergodox/alphadox/config.h
+++ b/layouts/community/ergodox/alphadox/config.h
@@ -4,7 +4,6 @@
#include QMK_KEYBOARD_CONFIG_H
#define FORCE_NKRO
-#define PREVENT_STUCK_MODIFIERS
#undef TAPPING_TERM
#undef IGNORE_MOD_TAP_INTERRUPT
diff --git a/layouts/community/ergodox/alphadox/rules.mk b/layouts/community/ergodox/alphadox/rules.mk
index f93ff3bb6..57c62a5e6 100644
--- a/layouts/community/ergodox/alphadox/rules.mk
+++ b/layouts/community/ergodox/alphadox/rules.mk
@@ -9,7 +9,5 @@ MIDI_ENABLE = no # MIDI controls
AUDIO_ENABLE = no # Audio output on port C6
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
+RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
-
-
diff --git a/layouts/community/ergodox/bepo/keymap.c b/layouts/community/ergodox/bepo/keymap.c
index c33c3c255..6ea8cba68 100644
--- a/layouts/community/ergodox/bepo/keymap.c
+++ b/layouts/community/ergodox/bepo/keymap.c
@@ -50,7 +50,7 @@ KC_ESC, KC_INS, KC_LGUI, KC_LCTL, KC_LALT,
KC_CAPSLOCK, BP_DCRC, BP_V, BP_D, BP_L, BP_J, BP_Z,
BP_C, BP_T, BP_S, BP_R, BP_N, BP_M,
KC_NUMLOCK, BP_APOS, BP_Q, BP_G, BP_H, BP_F, BP_CCED,
- BP_ALGR, KC_RCTL, KC_RGUI, KC_PSCREEN, KC_PAUSE,
+ KC_ALGR, KC_RCTL, KC_RGUI, KC_PSCREEN, KC_PAUSE,
DF(AZ_B), DF(BEPO),
MO(NUMK),
MO(FNAV), KC_RSHIFT, KC_ENTER),
diff --git a/layouts/community/ergodox/bepo_csa/keymap.c b/layouts/community/ergodox/bepo_csa/keymap.c
index 9526ea3f7..125301d44 100644
--- a/layouts/community/ergodox/bepo_csa/keymap.c
+++ b/layouts/community/ergodox/bepo_csa/keymap.c
@@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_BSPC, BP_DCRC, BP_V, BP_D, BP_L, BP_J, BP_Z,
BP_C, BP_T, BP_S, BP_R, BP_N, BP_M,
KC_ENT, BP_APOS, BP_Q, BP_G, BP_H, BP_F, KC_RSFT,
- BP_ALGR, BP_PERC, KC_APP, BP_CCED, KC_RCTL,
+ KC_ALGR, BP_PERC, KC_APP, BP_CCED, KC_RCTL,
KC_LEFT, KC_RGHT,
KC_UP,
@@ -449,14 +449,14 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
register_code(KC_1 + (id - M_1));
break;
case M_DEGR:
- return MACRO(DOWN(CSA_ALTGR), D(SCLN), END);
+ return MACRO(DOWN(KC_ALGR), D(SCLN), END);
case M_SCLN:
return MACRO(D(SCLN), END);
case M_GRV:
- return MACRO(I(75), DOWN(CSA_ALTGR), TYPE(CSA_DCRC), UP(CSA_ALTGR), T(SPACE), END);
+ return MACRO(I(75), DOWN(KC_ALGR), TYPE(CSA_DCRC), UP(KC_ALGR), T(SPACE), END);
case M_NBSP:
// use weak mod such that pressing another key will not be affected
- add_weak_mods(MOD_BIT(CSA_ALTGR));
+ add_weak_mods(MOD_BIT(KC_ALGR));
return MACRO(D(SPACE), END);
}
} else {
@@ -466,11 +466,11 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
unregister_code(KC_1 + (id - M_1));
break;
case M_DEGR:
- return MACRO(UP(CSA_ALTGR), U(SCLN), END);
+ return MACRO(UP(KC_ALGR), U(SCLN), END);
case M_SCLN:
return MACRO(U(SCLN), END);
case M_NBSP:
- del_weak_mods(MOD_BIT(CSA_ALTGR));
+ del_weak_mods(MOD_BIT(KC_ALGR));
return MACRO(U(SPACE), END);
}
}
diff --git a/layouts/community/ergodox/bocaj/config.h b/layouts/community/ergodox/bocaj/config.h
new file mode 100644
index 000000000..bc1d20a62
--- /dev/null
+++ b/layouts/community/ergodox/bocaj/config.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#include QMK_KEYBOARD_CONFIG_H
+
+#define LEADER_TIMEOUT 250
+#define LEADER_PER_KEY_TIMING
diff --git a/layouts/community/ergodox/bocaj/keymap.c b/layouts/community/ergodox/bocaj/keymap.c
new file mode 100644
index 000000000..cb78e7aae
--- /dev/null
+++ b/layouts/community/ergodox/bocaj/keymap.c
@@ -0,0 +1,196 @@
+/*
+Copyright 2018 Jacob Jerrell <jacob.jerrell@gmail.com> @JacobJerrell
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+#include "bocaj.h"
+
+#define LAYOUT_ergodox_pretty_base( \
+ K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
+ K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
+ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
+ ) \
+ LAYOUT_ergodox_pretty_wrapper( \
+ KC_ESC, __________________NUMBER_LEFT_______________, JJ_ARRW, KC_MINS, __________________NUMBER_RIGHT______________, KC_EQUAL, \
+ KC_DEL, K01, K02, K03, K04, K05, KC_LPRN, KC_RPRN, K06, K07, K08, K09, K0A, KC_BSLASH, \
+ KC_NUMS, K11, SFT_T(K12), K13, ALT_T(K14), K15, K16, ALT_T(K17), K18, SFT_T(K19), K1A, KC_QUOT, \
+ OS_LSFT, CTL_T(K21), K22, K23, K24, K25, HYP_LBK, MEH_RBK, K26, K27, K28, K29, CTL_T(K2A), KC_RSFT, \
+ KC_GAME,KC_NUMS, TT(_LOWER), KC_UP, KC_LEFT, KC_RIGHT, KC_DOWN, UC_DISA,KC_GAME, KC_ADJS, \
+ KC_APP,KC_HOME, KC_END,KC_ESC, \
+ UC_FLIP, UC_TABL, \
+ KC_SPACE,KC_BSPACE,KC_LEAD, UC_SHRG,KC_TAB,KC_LWEN \
+)
+
+#define LAYOUT_ergodox_pretty_base_wrapper(...) LAYOUT_ergodox_pretty_base(__VA_ARGS__)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* Workman - http://www.keyboard-layout-editor.com/#/gists/7a07cb982ec3597ba3e3d947554225f1
+ .---------------------------------------------. .---------------------------------------------.
+ | ESC | 1 | 2 | 3 | 4 | 5 | -> | ! - | 6 | 7 | 8 | 9 | 0 | = |
+ !-------+-----+-----+-----+-----+-------------! !-------+-----+-----+-----+-----+-----+-------!
+ | DEL | Q | D | R | W | B | ( | ! ) | J | F | U | P | ; | \ |
+ !-------+-----+-----+-----x-----x-----! ! ! !-----x-----x-----+-----+-----+-------!
+ | NUMS | A | S | H | T | G |-------! !-------! Y | N | E | O | I | ' |
+ !-------+-----+-----+-----x-----x-----! HYP ! ! MEH !-----x-----x-----+-----+-----+-------!
+ | SHIFT | Z | X | M | C | V | [ | ! ] | K | L | , | . | / | SHIFT |
+ '-------+-----+-----+-----+-----+-------------' '-------------+-----+-----+-----+-----+-------'
+ | | NUM | LWR | UP | LFT | .---------------. .---------------. ! RGT | DWN | |GAME | ADJ |
+ '------------------------------' | APP | HOME | ! PGUP | ESC | '------------------------------'
+ .-------+-------+-------! !-------+-------+-------.
+ ! ! | END | ! PGDN | ! ENTER !
+ ! SPACE ! BSPCE !-------! !-------! TAB ! / !
+ | | | COPY | ! PASTE | | LOWER |
+ '-----------------------' '-----------------------'
+*/
+ [_WORKMAN] = LAYOUT_ergodox_pretty_base_wrapper(
+ _________________WORKMAN_L1_________________, _________________WORKMAN_R1_________________,
+ _________________WORKMAN_L2_________________, _________________WORKMAN_R2_________________,
+ _________________WORKMAN_L3_________________, _________________WORKMAN_R3_________________
+ ),
+ [_WINWORKMAN] = LAYOUT_ergodox_pretty_base_wrapper(
+ _________________WORKMAN_L1_________________, _________________WORKMAN_R1_________________,
+ ________________WWORKMAN_L2_________________, ________________WWORKMAN_R2_________________,
+ _________________WORKMAN_L3_________________, _________________WORKMAN_R3_________________
+ ),
+/* QWERTY - http://www.keyboard-layout-editor.com/#/gists/b6c016a22a9d31381a276a603a42fe5f
+ .---------------------------------------------. .---------------------------------------------.
+ | ESC | 1 | 2 | 3 | 4 | 5 | -> | ! - | 6 | 7 | 8 | 9 | 0 | = |
+ !-------+-----+-----+-----+-----+-------------! !-------+-----+-----+-----+-----+-----+-------!
+ | DEL | Q | W | E | R | T | ( | ! ) | Y | U | I | O | P | \ |
+ !-------+-----+-----+-----x-----x-----! ! ! !-----x-----x-----+-----+-----+-------!
+ | NUMS | A | S | D | F | G |-------! !-------! H | J | K | L | ; | ' |
+ !-------+-----+-----+-----x-----x-----! HYP ! ! MEH !-----x-----x-----+-----+-----+-------!
+ | SHIFT | Z | X | C | V | B | [ | ! ] | N | M | , | . | / | SHIFT |
+ '-------+-----+-----+-----+-----+-------------' '-------------+-----+-----+-----+-----+-------'
+ | GAME | NUM | LWR | UP | LFT | .---------------. .---------------. ! RGT | DWN | | | ADJ |
+ '------------------------------' | APP | HOME | ! PGUP | ESC | '------------------------------'
+ .-------+-------+-------! !-------+-------+-------.
+ ! ! | END | ! PGDN | ! ENTER !
+ ! SPACE ! BSPCE !-------! !-------! TAB ! / !
+ | | | COPY | ! PASTE | | LOWER |
+ '-----------------------' '-----------------------'
+*/
+ [_QWERTY] = LAYOUT_ergodox_pretty_base_wrapper(
+ _________________QWERTY_L1__________________, _________________QWERTY_R1__________________,
+ _________________QWERTY_L2__________________, _________________QWERTY_R2__________________,
+ _________________QWERTY_L3__________________, _________________QWERTY_R3__________________
+ ),
+ [_LOWER] = LAYOUT_ergodox_pretty_wrapper(
+ KC_F11 ,__________________FUNCTION_LEFT_____________, _______, _______, __________________FUNCTION_RIGHT____________, KC_F12,
+ _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_7, KC_8, KC_9, KC_PAST, _______,
+ LM_GRAVE, _______, KC_LEFT, KC_DOWN,KC_RIGHT, _______, _______, KC_4, KC_5, KC_6, KC_PPLS, _______,
+ OS_LSFT,____________________BLANK___________________, _______, _______, _______, KC_1, KC_2, KC_3, KC_PMNS, _______,
+ ____________________BLANK___________________, KC_0, KC_PDOT, KC_COMM,KC_PEQL, _______,
+ _______, _______, _______, _______,
+ _______, _______,
+ _______, _______, _______, _______, _______, _______
+ ),
+/* Adjust - http://www.keyboard-layout-editor.com/#/gists/dedeae17b35a5d5f745a42aaea78f007
+ .---------------------------------------------. .---------------------------------------------.
+ | MAKE | | | | | | RESET | ! EPRM | | | | | | |
+ !-------+-----+-----+-----+-----+-------------! !-------+-----+-----+-----+-----+-----+-------!
+ | | | | | | | | ! | | | | | | |
+ !-------+-----+-----+-----x-----x-----! ! ! !-----x-----x-----+-----+-----+-------!
+ | | 🔇 | 🔉 | 🔊 | LCK | |-------! !-------! | | | | | QWRTY |
+ !-------+-----+-----+-----x-----x-----! ! ! !-----x-----x-----+-----+-----+-------!
+ | | | | | | | | ! | | | | | WIN | WRKMN |
+ '-------+-----+-----+-----+-----+-------------' '-------------+-----+-----+-----+-----+-------'
+ | | | | | | .---------------. .---------------. ! | | | | |
+ '------------------------------' | | | ! | | '------------------------------'
+ .-------+-------+-------! !-------+-------+-------.
+ ! ! | | ! | ! !
+ ! ! !-------! !-------! ! !
+ | | | | ! | | |
+ '-----------------------' '-----------------------'
+*/
+ [_ADJUST] = LAYOUT_ergodox_pretty_wrapper(
+ KC_MAKE, ____________________BLANK___________________, KC_RST, KC_EPRM, ____________________BLANK___________________, XXXXXXX,
+ _______, ____________________BLANK___________________, _______, _______, ____________________BLANK___________________, XXXXXXX,
+ _______,KC__MUTE,KC__VOLDOWN,KC__VOLUP,MC_LOCK,_______, ____________________BLANK___________________, KC_MQWR,
+ _______, ____________________BLANK___________________, _______, _______, _______, _______, _______, _______, KC_WWRK, KC_MWRK,
+ ____________________BLANK___________________, ____________________BLANK___________________,
+ _______, _______, _______, _______,
+ _______, _______,
+ _______, _______, _______, _______, _______, _______
+ ),
+ [_DIABLO] = LAYOUT_ergodox_pretty_wrapper(
+ KC_ESC, KC_V, KC_D, KC_LALT, KC_NO, KC_NO, KC_NO, KC_NO, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO,
+ KC_TAB, KC_S, KC_F, KC_I, KC_M, KC_T, KC_ENTER, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_Q, KC_1, KC_2, KC_3, KC_4, KC_P, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_LCTL, KC_D3_1, KC_D3_2, KC_D3_3, KC_D3_4, KC_Z, KC_LOCK, KC_NO, KC_N, KC_M, KC_NO, KC_NO, KC_NO, KC_NO,
+ _______, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO,
+ KC_L, KC_J, KC_NO, KC_NO,
+ KC_F, KC_NO,
+ SFT_T(KC_SPACE), ALT_T(KC_Q), KC_DCLR, KC_PGDN, KC_DEL, KC_ENT
+ )
+};
+
+bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+ return true;
+}
+
+void matrix_init_keymap(void) {};
+
+void matrix_scan_keymap(void) {
+ uint8_t modifiers = get_mods();
+ uint8_t led_usb_state = host_keyboard_leds();
+ uint8_t one_shot = get_oneshot_mods();
+ 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) {
+ case _WORKMAN:
+ case _QWERTY:
+ case _WINWORKMAN:
+ if (modifiers & MODS_SHIFT_MASK || led_usb_state & (1<<USB_LED_CAPS_LOCK) || one_shot & MODS_SHIFT_MASK) {
+ ergodox_right_led_1_on();
+ ergodox_right_led_1_set( 25 );
+ }
+ if (modifiers & MODS_CTRL_MASK || one_shot & MODS_CTRL_MASK || modifiers & MODS_GUI_MASK || one_shot & MODS_GUI_MASK) {
+ if ((modifiers & MODS_CTRL_MASK || one_shot & MODS_CTRL_MASK) && (modifiers & MODS_GUI_MASK || one_shot & MODS_GUI_MASK)) {
+ ergodox_right_led_2_on();
+ ergodox_right_led_2_set( 50 );
+ } else {
+ ergodox_right_led_2_on();
+ ergodox_right_led_2_set( 10 );
+ }
+ }
+ if (modifiers & MODS_ALT_MASK || one_shot & MODS_ALT_MASK) {
+ ergodox_right_led_3_on();
+ ergodox_right_led_3_set( 10 );
+ }
+ break;
+ case _LOWER:
+ ergodox_right_led_3_on();
+ ergodox_right_led_3_set(10); // Default brightness is deadly in a dark room
+ break;
+ case _ADJUST:
+ ergodox_right_led_2_on();
+ ergodox_right_led_2_set(10);
+ break;
+ case _DIABLO:
+ ergodox_right_led_1_on();
+ ergodox_right_led_1_set(10);
+ break;
+ default:
+ // none
+ break;
+ }
+};
diff --git a/layouts/community/ergodox/bocaj/readme.md b/layouts/community/ergodox/bocaj/readme.md
new file mode 100644
index 000000000..901822722
--- /dev/null
+++ b/layouts/community/ergodox/bocaj/readme.md
@@ -0,0 +1,37 @@
+# Bocaj Layout
+
+While I've put my own spin on most things, much of the credit for these ideas belongs to Drashna and/or the people he derived things from. Please see his [layout](../drashna/) and [userspace](../../../../users/drashna/) for lots of ideas and inspiration.
+
+## Layers Overview
+
+* Default
+ * Workman
+ * Qwerty
+ * Windows Workman (swaps GUI and CTRL buttons)
+* Lower
+ * F1-12 Top Row
+ * Grave / Layer Switch macro at Caps Lock position
+ * Navigation at QWERTY 'ESDF' position
+ * Numpad under right hand
+* Adjust
+ * Volume Control
+ * Mac Lock Macro
+ * Make / Reset/ EEPROM keys
+ * Default Layer changing keys
+ * Diablo Layer
+ * Moved shortcuts within left hands reach
+ * Macros to spam 1-4 every ~1 second
+ * Shift in thumb cluster to prevent pinky fatique
+
+## LEDs Overview
+
+* Used for _LOWER, _ADJUST, and _DIABLO layer indication
+* Used for Ctrl/GUI, Shift, and Alt indication when on a default layer
+
+## Wrappers Overview
+
+While it isn't a novel idea, I feel the need to mention it because it really appeals to me as a person that doesn't like repetitive code.
+
+We've all come to know and love the pretty wrapper for Ergodox because it makes for such a beautiful, self-documenting keymap. In this keymap, we are building ontop of the pretty wrapper to wrap our default layers with our keys that aren't unique to the layer.
+
+Now you can wrap your keymap with `LAYOUT_ergodox_pretty_base_wrapper()` and only feed it the alpha keys, having the top, side, bottom, and thumb clusters automatically filled in. If you make a key to any of the top, side, bottom, or thumb cluster keys, it will propegate to all layers that have this wrapper, or have KC_TRNS keycodes in the same location
diff --git a/layouts/community/ergodox/bocaj/rules.mk b/layouts/community/ergodox/bocaj/rules.mk
new file mode 100644
index 000000000..aa67ad9e2
--- /dev/null
+++ b/layouts/community/ergodox/bocaj/rules.mk
@@ -0,0 +1,11 @@
+AUTO_SHIFT_ENABLE = no
+COMMAND_ENABLE = no
+SWAP_HANDS_ENABLE = no
+TAP_DANCE_ENABLE = yes
+EXTRAKEY_ENABLE = no
+KEY_LOCK_ENABLE = yes
+LEADER_ENABLE = yes
+
+UNICODE_ENABLE = yes
+UNICODEMAP_ENABLE = no
+UCIS_ENABLE = no
diff --git a/layouts/community/ergodox/deadcyclo/rules.mk b/layouts/community/ergodox/deadcyclo/rules.mk
index 039f07c8e..f5093529b 100644
--- a/layouts/community/ergodox/deadcyclo/rules.mk
+++ b/layouts/community/ergodox/deadcyclo/rules.mk
@@ -1 +1,2 @@
UNICODE_ENABLE = yes
+LEADER_ENABLE = yes
diff --git a/layouts/community/ergodox/drashna/config.h b/layouts/community/ergodox/drashna/config.h
index 9e2bd74f3..fee954d17 100644
--- a/layouts/community/ergodox/drashna/config.h
+++ b/layouts/community/ergodox/drashna/config.h
@@ -5,11 +5,15 @@
#ifdef RGBLIGHT_ENABLE
#undef RGBLIGHT_SAT_STEP
#define RGBLIGHT_SAT_STEP 12
-#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 7
-#define RGBLIGHT_EFFECT_SNAKE_LENGTH 7
+
+#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 3
+#define RGBLIGHT_EFFECT_SNAKE_LENGTH 3
#define RGBLIGHT_EFFECT_BREATHE_CENTER 1
#endif // RGBLIGHT_ENABLE
#undef PRODUCT
#define PRODUCT DrashnaDox - Hacked ErgoDox EZ Shine
+
+#undef DEBOUNCE
+#define DEBOUNCE 5
diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c
index 27d20d928..45860b874 100644
--- a/layouts/community/ergodox/drashna/keymap.c
+++ b/layouts/community/ergodox/drashna/keymap.c
@@ -21,7 +21,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "drashna_unicode.h"
#endif // UNICODEMAP_ENABLE
-
+#ifdef RGB_MATRIX_ENABLE
+extern bool g_suspend_state;
+extern rgb_config_t rgb_matrix_config;
+#endif
+extern userspace_config_t userspace_config;
//enum more_custom_keycodes {
// KC_P00 = NEW_SAFE_RANGE
@@ -30,6 +34,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//define layer change stuff for underglow indicator
bool skip_leds = false;
+#define LAYOUT_ergodox_pretty_base( \
+ K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
+ K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
+ K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \
+ ) \
+ LAYOUT_ergodox_pretty_wrapper( \
+ KC_ESC, ________________NUMBER_LEFT________________, UC_FLIP, UC_TABL, ________________NUMBER_RIGHT_______________, KC_MINS, \
+ KC_TAB, K01, K02, K03, K04, K05, TG(_DIABLO), TG(_DIABLO), K06, K07, K08, K09, K0A, KC_BSLS, \
+ KC_C1R3, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, KC_QUOT, \
+ KC_MLSF, CTL_T(K21), K22, K23, K24, K25, TG(_GAMEPAD), TG(_GAMEPAD), K26, K27, K28, K29, CTL_T(K2A), KC_MRSF, \
+ KC_GRV, OS_MEH, OS_HYPR, KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, UC(0x2E2E), \
+ OS_LALT, OS_LGUI, OS_RGUI, CTL_T(KC_ESCAPE), \
+ KC_HOME, KC_PGUP, \
+ LT(_LOWER, KC_SPACE),KC_BSPC, KC_END, KC_PGDN, KC_DEL, LT(_RAISE, KC_ENTER) \
+ )
+
+#define LAYOUT_ergodox_pretty_base_wrapper(...) LAYOUT_ergodox_pretty_base(__VA_ARGS__)
+
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -55,15 +77,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | End | | PgDn | | |
* `---------------------' `---------------------'
*/
- [_QWERTY] = LAYOUT_ergodox_pretty_wrapper(
- // left hand // right hand
- KC_EQL, ________________NUMBER_LEFT________________, _______, _______, ________________NUMBER_RIGHT_______________, KC_MINS,
- KC_TAB, _________________QWERTY_L1_________________, TG(_DIABLO), TG(_DIABLO), _________________QWERTY_R1_________________, KC_BSLS,
- KC_C1R3, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT,
- KC_MLSF, _________________QWERTY_L3_________________, TG(_GAMEPAD), TG(_GAMEPAD), _________________QWERTY_R3_________________, KC_MRSF,
- KC_GRV, ___________ERGODOX_BOTTOM_LEFT_____________, ___________ERGODOX_BOTTOM_RIGHT____________, KC_CCCV,
- __________________ERGODOX_THUMB_CLUSTER_____________________
- ),
+ [_QWERTY] = LAYOUT_ergodox_pretty_base_wrapper(
+ _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
+ _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
+ _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
+ ),
/* Keymap 0: COLEMAK layer
*
* ,--------------------------------------------------. ,--------------------------------------------------.
@@ -87,15 +105,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
// If it accepts an argument (i.e, is a function), it doesn't need KC_.
// Otherwise, it needs KC_*
- [_COLEMAK] = LAYOUT_ergodox_pretty_wrapper(
- // left hand // right hand
- KC_EQL, ________________NUMBER_LEFT________________, _______, _______, ________________NUMBER_RIGHT_______________, KC_MINS,
- KC_TAB, _________________COLEMAK_L1________________, TG(_DIABLO), TG(_DIABLO), _________________COLEMAK_R1________________, KC_BSLS,
- KC_C1R3, _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, KC_QUOT,
- KC_MLSF, _________________COLEMAK_L3________________, TG(_GAMEPAD), TG(_GAMEPAD), _________________COLEMAK_R3________________, KC_MRSF,
- KC_GRV, ___________ERGODOX_BOTTOM_LEFT_____________, ___________ERGODOX_BOTTOM_RIGHT____________, KC_CCCV,
- __________________ERGODOX_THUMB_CLUSTER_____________________
- ),
+ [_COLEMAK] = LAYOUT_ergodox_pretty_base_wrapper(
+ _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
+ _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
+ _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
+ ),
/* Keymap 0: DVORAK Layout
*
* ,--------------------------------------------------. ,--------------------------------------------------.
@@ -119,15 +133,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
// If it accepts an argument (i.e, is a function), it doesn't need KC_.
// Otherwise, it needs KC_*
- [_DVORAK] = LAYOUT_ergodox_pretty_wrapper(
- // left hand // right hand
- KC_EQL, ________________NUMBER_LEFT________________, _______, _______, ________________NUMBER_RIGHT_______________, KC_BSLS,
- KC_TAB, _________________DVORAK_L1_________________, TG(_DIABLO), TG(_DIABLO), _________________DVORAK_R1_________________, KC_SLSH,
- KC_C1R3, _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, KC_MINS,
- KC_MLSF, _________________DVORAK_L3_________________, TG(_GAMEPAD), TG(_GAMEPAD), _________________DVORAK_R3_________________, KC_MRSF,
- KC_GRV, ___________ERGODOX_BOTTOM_LEFT_____________, ___________ERGODOX_BOTTOM_RIGHT____________, KC_CCCV,
- __________________ERGODOX_THUMB_CLUSTER_____________________
- ),
+ [_DVORAK] = LAYOUT_ergodox_pretty_base_wrapper(
+ _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
+ _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
+ _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
+ ),
/* Keymap 0: WORKMAN layer
*
* ,--------------------------------------------------. ,--------------------------------------------------.
@@ -149,17 +159,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | |ace | End | | PgDn | | |
* `--------------------' `----------------------'
*/
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
- [_WORKMAN] = LAYOUT_ergodox_pretty_wrapper(
- // left hand
- KC_EQL, ________________NUMBER_LEFT________________, _______, _______, ________________NUMBER_RIGHT_______________, KC_MINS,
- KC_TAB, _________________WORKMAN_L1________________, TG(_DIABLO), TG(_DIABLO), _________________WORKMAN_R1________________, KC_BSLS,
- KC_C1R3, _________________WORKMAN_L2________________, _________________WORKMAN_R2________________, KC_QUOT,
- KC_MLSF, _________________WORKMAN_L3________________, TG(_GAMEPAD), TG(_GAMEPAD), _________________WORKMAN_R3________________, KC_MRSF,
- KC_GRV, ___________ERGODOX_BOTTOM_LEFT_____________, ___________ERGODOX_BOTTOM_RIGHT____________, KC_CCCV,
- __________________ERGODOX_THUMB_CLUSTER_____________________
- ),
+
+ [_WORKMAN] = LAYOUT_ergodox_pretty_base_wrapper(
+ _________________WORKMAN_L1________________, _________________WORKMAN_R1________________,
+ _________________WORKMAN_L2________________, _________________WORKMAN_R2________________,
+ _________________WORKMAN_L3________________, _________________WORKMAN_R3________________
+ ),
// Reverts OSM(Shift) to normal Shifts. However, may not need since we fixed the issue with RDP (LOCAL RESOURCES)
[_MODS] = LAYOUT_ergodox_pretty_wrapper(
@@ -197,7 +202,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_GAMEPAD] = LAYOUT_ergodox_pretty_wrapper(
KC_ESC, KC_NO, KC_1, KC_2, KC_3, HYPR(KC_Q), HYPR(KC_GRV), KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO,
- KC_F1, KC_K, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_F1, KC_K, KC_Q, KC_W, KC_E, KC_R, KC_T, UC_SHRG, UC_DISA, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_TAB, KC_G, KC_A, KC_S, KC_D, KC_F, KC_I, KC_O, KC_NO, KC_NO, KC_NO, KC_NO,
KC_LCTL, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_TRNS, TG(_GAMEPAD), KC_N, KC_M, KC_NO, KC_NO, KC_NO, KC_NO,
KC_GRV, KC_U, KC_I, KC_Y, KC_T, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO,
@@ -262,7 +267,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ADJUST] = LAYOUT_ergodox_pretty_wrapper(
KC_MAKE, _______, _______, _______, _______, _______, _______, KC_NUKE, _________________ADJUST_R1_________________, KC_RST,
- VRSN, _________________ADJUST_L1_________________, _______, _______, _______, _______, _______, _______, _______, EPRM,
+ VRSN, _________________ADJUST_L1_________________, _______, _______, _______, _______, _______, _______, _______, EEP_RST,
_______, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, TG(_MODS),
_______, _________________ADJUST_L3_________________, _______, _______, _________________ADJUST_R3_________________, KC_MPLY,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -289,12 +294,8 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
return true;
}
-void matrix_init_keymap(void) { // Runs boot tasks for keyboard
-};
-
-
void matrix_scan_keymap(void) { // runs frequently to update info
- uint8_t modifiders = get_mods();
+ uint8_t modifiers = get_mods();
uint8_t led_usb_state = host_keyboard_leds();
uint8_t one_shot = get_oneshot_mods();
@@ -307,15 +308,15 @@ void matrix_scan_keymap(void) { // runs frequently to update info
// Since we're not using the LEDs here for layer indication anymore,
// then lets use them for modifier indicators. Shame we don't have 4...
// Also, no "else", since we want to know each, independently.
- if (modifiders & MODS_SHIFT_MASK || led_usb_state & (1<<USB_LED_CAPS_LOCK) || one_shot & MODS_SHIFT_MASK) {
+ if (modifiers & MODS_SHIFT_MASK || led_usb_state & (1<<USB_LED_CAPS_LOCK) || one_shot & MODS_SHIFT_MASK) {
ergodox_right_led_2_on();
ergodox_right_led_2_set( 50 );
}
- if (modifiders & MODS_CTRL_MASK || one_shot & MODS_CTRL_MASK) {
+ if (modifiers & MODS_CTRL_MASK || one_shot & MODS_CTRL_MASK) {
ergodox_right_led_1_on();
ergodox_right_led_1_set( 10 );
}
- if (modifiders & MODS_ALT_MASK || one_shot & MODS_ALT_MASK) {
+ if (modifiers & MODS_ALT_MASK || one_shot & MODS_ALT_MASK) {
ergodox_right_led_3_on();
ergodox_right_led_3_set( 10 );
}
@@ -335,3 +336,100 @@ bool indicator_is_this_led_used_keyboard(uint8_t index) {
}
}
+
+#ifdef RGB_MATRIX_ENABLE
+
+void suspend_power_down_keymap(void) {
+ rgb_matrix_set_suspend_state(true);
+ rgb_matrix_config.enable = false;
+}
+
+void suspend_wakeup_init_keymap(void) {
+ rgb_matrix_config.enable = true;
+ rgb_matrix_set_suspend_state(false);
+}
+
+void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) {
+ rgb_led led;
+ for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+ led = g_rgb_leds[i];
+ if (led.matrix_co.raw < 0xFF) {
+ if (led.modifier) {
+ rgb_matrix_set_color( i, red, green, blue );
+ }
+ }
+ }
+}
+
+void rgb_matrix_indicators_user(void) {
+ if (g_suspend_state || !rgb_matrix_config.enable || !userspace_config.rgb_layer_change) return;
+
+ switch (biton32(layer_state)) {
+ case _MODS:
+ rgb_matrix_layer_helper(0xFF, 0xFF, 0x00); break;
+ case _GAMEPAD:
+ rgb_matrix_layer_helper(0xFF, 0x80, 0x00);
+ rgb_matrix_set_color(32, 0x00, 0xFF, 0x00); // Q
+ rgb_matrix_set_color(31, 0x00, 0xFF, 0xFF); // W
+ rgb_matrix_set_color(30, 0xFF, 0x00, 0x00); // E
+ rgb_matrix_set_color(29, 0xFF, 0x80, 0x00); // R
+ rgb_matrix_set_color(37, 0x00, 0xFF, 0xFF); // A
+ rgb_matrix_set_color(36, 0x00, 0xFF, 0xFF); // S
+ rgb_matrix_set_color(35, 0x00, 0xFF, 0xFF); // D
+ rgb_matrix_set_color(34, 0x7A, 0x00, 0xFF); // F
+
+ rgb_matrix_set_color(27, 0xFF, 0xFF, 0xFF); // 1
+ rgb_matrix_set_color(26, 0x00, 0xFF, 0x00); // 2
+ rgb_matrix_set_color(25, 0x7A, 0x00, 0xFF); // 3
+
+ break;
+ case _DIABLO:
+ rgb_matrix_layer_helper(0xFF, 0x00, 0x00); break;
+ case _RAISE:
+ rgb_matrix_layer_helper(0xFF, 0xFF, 0x00); break;
+ case _LOWER:
+ rgb_matrix_layer_helper(0x00, 0xFF, 0x00); break;
+ case _ADJUST:
+ rgb_matrix_layer_helper(0xFF, 0x00, 0x00); break;
+ default:
+ switch (biton32(default_layer_state)) {
+ case _QWERTY:
+ rgb_matrix_layer_helper(0x00, 0xFF, 0xFF); break;
+ case _COLEMAK:
+ rgb_matrix_layer_helper(0xFF, 0x00, 0xFF); break;
+ case _DVORAK:
+ rgb_matrix_layer_helper(0x00, 0xFF, 0x00); break;
+ case _WORKMAN:
+ rgb_matrix_layer_helper(0xD9, 0xA5, 0x21); break;
+ }
+ }
+#if 0
+ if (this_mod & MODS_SHIFT_MASK || this_led & (1<<USB_LED_CAPS_LOCK) || this_osm & MODS_SHIFT_MASK) {
+ rgb_matrix_set_color(24, 0x00, 0xFF, 0x00);
+ rgb_matrix_set_color(36, 0x00, 0xFF, 0x00);
+ }
+ if (this_mod & MODS_CTRL_MASK || this_osm & MODS_CTRL_MASK) {
+ rgb_matrix_set_color(25, 0xFF, 0x00, 0x00);
+ rgb_matrix_set_color(34, 0xFF, 0x00, 0x00);
+ rgb_matrix_set_color(37, 0xFF, 0x00, 0x00);
+
+ }
+ if (this_mod & MODS_GUI_MASK || this_osm & MODS_GUI_MASK) {
+ rgb_matrix_set_color(39, 0xFF, 0xD9, 0x00);
+ }
+ if (this_mod & MODS_ALT_MASK || this_osm & MODS_ALT_MASK) {
+ rgb_matrix_set_color(38, 0x00, 0x00, 0xFF);
+ }
+#endif
+}
+
+void matrix_init_keymap(void) {
+#if 0
+ #ifdef RGB_MATRIX_KEYPRESSES
+ rgblight_mode(RGB_MATRIX_MULTISPLASH);
+ #else
+ rgblight_mode(RGB_MATRIX_RAINBOW_MOVING_CHEVRON);
+ #endif
+#endif
+}
+#endif //RGB_MATRIX_INIT
diff --git a/layouts/community/ergodox/drashna/rules.mk b/layouts/community/ergodox/drashna/rules.mk
index f5d63c56f..31488108b 100644
--- a/layouts/community/ergodox/drashna/rules.mk
+++ b/layouts/community/ergodox/drashna/rules.mk
@@ -1,18 +1,16 @@
TAP_DANCE_ENABLE = yes
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
-COMMAND_ENABLE = yes # Commands for debug and configuration
-ifeq ("$(KEYBOARD)","ergodox_ez")
+COMMAND_ENABLE = no # Commands for debug and configuration
+ifneq (,$(findstring ergodox_ez,$(KEYBOARD)))
RGBLIGHT_ENABLE = yes
RGB_MATRIX_ENABLE = no
endif
CONSOLE_ENABLE = no
BOOTMAGIC_ENABLE = yes
-UNICODE_ENABLE = no
-UNICDOEMAP_ENABLE = yes
+UNICODE_ENABLE = yes
+UNICDOEMAP_ENABLE = no
MACROS_ENABLED = no
+RGBLIGHT_TWINKLE = no
INDICATOR_LIGHTS = no
-ifdef RGBLIGHT_ENABLE
- RGBLIGHT_TWINKLE = yes
-endif
diff --git a/layouts/community/ergodox/drashna_glow/README.md b/layouts/community/ergodox/drashna_glow/README.md
new file mode 100644
index 000000000..7d625a258
--- /dev/null
+++ b/layouts/community/ergodox/drashna_glow/README.md
@@ -0,0 +1 @@
+Note: This board will not flash if the "g_rgb_leds" const is not set to weak in the ergodox_ez.c file
diff --git a/layouts/community/ergodox/drashna_glow/config.h b/layouts/community/ergodox/drashna_glow/config.h
new file mode 100644
index 000000000..197acbc4a
--- /dev/null
+++ b/layouts/community/ergodox/drashna_glow/config.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "../drashna/config.h"
+
+#undef PRODUCT
+#define PRODUCT DrashnaDox - Hacked ErgoDox EZ Glow
+
+#undef DEBOUNCE
+#define DEBOUNCE 5
+
+// #define RGB_MATRIX_KEYPRESSES // reacts to keypresses (will slow down matrix scan by a lot)
diff --git a/layouts/community/ergodox/drashna_glow/keymap.c b/layouts/community/ergodox/drashna_glow/keymap.c
new file mode 100644
index 000000000..f2fb66545
--- /dev/null
+++ b/layouts/community/ergodox/drashna_glow/keymap.c
@@ -0,0 +1,67 @@
+/* placeholder file */
+#include QMK_KEYBOARD_H
+
+const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+
+ /*{row | col << 4}
+ | {x=0..224, y=0..64}
+ | | modifier
+ | | | */
+ {{0|(0<<4)}, {24.9*5, 16*0}, 0}, // LED 1 on right
+ {{0|(1<<4)}, {24.9*6, 16*0}, 0}, // LED 2
+ {{0|(2<<4)}, {24.9*7, 16*0}, 0}, // LED 3
+ {{0|(3<<4)}, {24.9*8, 16*0}, 0}, // LED 4
+ {{0|(4<<4)}, {24.9*9, 16*0}, 0}, // LED 5
+
+ {{1|(5<<4)}, {24.9*5, 16*1}, 0}, // LED 6
+ {{1|(6<<4)}, {24.9*6, 16*1}, 0}, // LED 7
+ {{1|(7<<4)}, {24.9*7, 16*1}, 0}, // LED 8
+ {{1|(8<<4)}, {24.9*8, 16*1}, 0}, // LED 9
+ {{1|(9<<4)}, {24.9*9, 16*1}, 0}, // LED 10
+
+ {{2|(5<<4)}, {24.9*5, 16*2}, 0}, // LED 11
+ {{2|(6<<4)}, {24.9*6, 16*2}, 0}, // LED 12
+ {{2|(7<<4)}, {24.9*7, 16*2}, 0}, // LED 13
+ {{2|(8<<4)}, {24.9*8, 16*2}, 0}, // LED 14
+ {{2|(9<<4)}, {24.9*9, 16*2}, 0}, // LED 15
+
+ {{3|(5<<4)}, {24.9*5, 16*2}, 0}, // LED 16
+ {{3|(6<<4)}, {24.9*6, 16*2}, 0}, // LED 17
+ {{3|(7<<4)}, {24.9*7, 16*2}, 0}, // LED 18
+ {{3|(8<<4)}, {24.9*8, 16*2}, 0}, // LED 19
+ {{3|(9<<4)}, {24.9*9, 16*2}, 0}, // LED 20
+
+ {{4|(6<<4)}, {24.9*6, 16*2}, 1}, // LED 21
+ {{4|(7<<4)}, {24.9*7, 16*2}, 1}, // LED 22
+ {{4|(8<<4)}, {24.9*8, 16*2}, 1}, // LED 23
+ {{4|(9<<4)}, {24.9*9, 16*2}, 1}, // LED 24
+
+ {{0|(0<<4)}, {24.9*4, 16*0}, 0}, // LED 1 on left
+ {{0|(1<<4)}, {24.9*3, 16*0}, 0}, // LED 2
+ {{0|(2<<4)}, {24.9*2, 16*0}, 0}, // LED 3
+ {{0|(3<<4)}, {24.9*1, 16*0}, 0}, // LED 4
+ {{0|(4<<4)}, {24.9*0, 16*0}, 0}, // LED 5
+
+ {{1|(5<<4)}, {24.9*4, 16*1}, 0}, // LED 6
+ {{1|(6<<4)}, {24.9*3, 16*1}, 0}, // LED 7
+ {{1|(7<<4)}, {24.9*2, 16*1}, 0}, // LED 8
+ {{1|(8<<4)}, {24.9*1, 16*1}, 0}, // LED 9
+ {{1|(9<<4)}, {24.9*0, 16*1}, 0}, // LED 10
+
+ {{2|(5<<4)}, {24.9*4, 16*2}, 0}, // LED 11
+ {{2|(6<<4)}, {24.9*3, 16*2}, 0}, // LED 12
+ {{2|(7<<4)}, {24.9*2, 16*2}, 0}, // LED 13
+ {{2|(8<<4)}, {24.9*1, 16*2}, 0}, // LED 14
+ {{2|(9<<4)}, {24.9*0, 16*2}, 0}, // LED 15
+
+ {{3|(5<<4)}, {24.9*4, 16*2}, 0}, // LED 16
+ {{3|(6<<4)}, {24.9*3, 16*2}, 0}, // LED 17
+ {{3|(7<<4)}, {24.9*2, 16*2}, 0}, // LED 18
+ {{3|(8<<4)}, {24.9*1, 16*2}, 0}, // LED 19
+ {{3|(9<<4)}, {24.9*0, 16*2}, 0}, // LED 20
+
+ {{4|(6<<4)}, {24.9*3, 16*2}, 1}, // LED 21
+ {{4|(7<<4)}, {24.9*2, 16*2}, 1}, // LED 22
+ {{4|(8<<4)}, {24.9*1, 16*2}, 1}, // LED 23
+ {{4|(9<<4)}, {24.9*0, 16*2}, 1}, // LED 24
+};
diff --git a/layouts/community/ergodox/drashna_glow/rules.mk b/layouts/community/ergodox/drashna_glow/rules.mk
new file mode 100644
index 000000000..c8941391e
--- /dev/null
+++ b/layouts/community/ergodox/drashna_glow/rules.mk
@@ -0,0 +1,11 @@
+USER_NAME := drashna
+SRC += ../drashna/keymap.c
+
+-include $$(LAYOUT_KEYMAP_PATH)/../drashna/rules.mk
+
+ifneq (,$(findstring ergodox_ez,$(KEYBOARD)))
+ RGBLIGHT_ENABLE = no
+ RGB_MATRIX_ENABLE = yes
+endif
+
+COMMAND_ENABLE = no
diff --git a/layouts/community/ergodox/dvorak_svorak_a5/keymap.c b/layouts/community/ergodox/dvorak_svorak_a5/keymap.c
new file mode 100644
index 000000000..98df73289
--- /dev/null
+++ b/layouts/community/ergodox/dvorak_svorak_a5/keymap.c
@@ -0,0 +1,214 @@
+#include QMK_KEYBOARD_H
+#include "debug.h"
+#include "action_layer.h"
+#include "keymap_swedish.h"
+
+#define BASE 0 // default layer
+#define SYMB 1 // symbols
+#define MOUS 2 // mouse keys
+#define QWRT 3 // qwerty layout
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Keymap 0: Basic layer
+ *
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | | 1 | 2 | 3 | 4 | 5 | ~MOUS| | QWRT | 6 | 7 | 8 | 9 | 0 | + |
+ * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ * | | Å | Ä | Ö | P | Y | | | Del | F | G | C | R | L | , |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | Escape | A | O | E | U | I |------| |------| D | H | T | N | S | -/_ |
+ * |--------+------+------+------+------+------| | | RCTRL|------+------+------+------+------+--------|
+ * | LShift | . | Q | J | K | X | | | | B | M | W | V | Z | RShift |
+ * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * | LCTRL | | | LAlt | Super| | ~SYMB| Left | Down | Up | Right |
+ * `-----------------------------------' `----------------------------------'
+ * ,-------------. ,-------------.
+ * | Ins | Del | | HOME | END |
+ * ,------|------|------| |------+--------+-------.
+ * | | | | | PgUp | | |
+ * | BSP | Tab |------| |------| Enter | Space |
+ * | | | | | PgDn | | |
+ * `--------------------' `-----------------------'
+ */
+[BASE] = LAYOUT_ergodox( // layer 0 : default
+ // left hand
+ KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, MO(MOUS),
+ KC_TAB, NO_AA, NO_AE, NO_OSLH, KC_P, KC_Y, KC_NO,
+ KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I,
+ KC_LSFT, KC_DOT, KC_Q, KC_J, KC_K, KC_X, KC_NO,
+ KC_LCTRL, KC_NO, KC_NO, KC_LALT, KC_LCMD,
+ KC_INSERT, KC_DEL,
+ KC_NO,
+ KC_BSPC, KC_TAB, KC_NO,
+ // right hand
+ TG(QWRT), KC_6, KC_7, KC_8, KC_9, KC_0, NO_PLUS,
+ KC_DEL, KC_F, KC_G, KC_C, KC_R, KC_L, KC_COMM,
+ KC_D, KC_H, KC_T, KC_N, KC_S, NO_MINS,
+ KC_RCTRL, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT,
+ MO(SYMB), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
+ KC_HOME, KC_END,
+ KC_PGUP,
+ KC_PGDN, KC_ENT, KC_SPACE
+ ),
+/* Keymap 1: Symbol Layer
+ *
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | | | | | | | | | | | | | | | |
+ * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ * | | { | } | [ | ] | $ | | | | " | ? | & | < | > | |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | ; | / | ( | ) | | |------| |------| # | ^ | # | " | ~ | |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | : | = | @ | ! | \ | | | | % | ´ | ' | * | | |
+ * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * | | | | | | | | | | | |
+ * `----------------------------------' `----------------------------------'
+ * ,-------------. ,-------------.
+ * | | | | | |
+ * ,------|------|------| |------+------+------.
+ * | | | | | | | |
+ * | BSP | |------| |------| | |
+ * | | | | | | | |
+ * `--------------------' `--------------------'
+ */
+// SYMBOLS
+[SYMB] = LAYOUT_ergodox(
+ // left hand
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, ALGR(KC_7), ALGR(KC_0), ALGR(KC_8), ALGR(KC_9), ALGR(KC_4), KC_NO,
+ KC_NO, LSFT(KC_COMM), KC_KP_SLASH, LSFT(KC_8), LSFT(KC_9), ALGR(KC_NUBS),
+ KC_NO, LSFT(KC_DOT), LSFT(KC_0), ALGR(KC_2), KC_EXLM, ALGR(KC_MINS), KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_NO,
+ KC_NO,
+ KC_TRNS, KC_NO, KC_NO,
+ // right hand
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, LSFT(KC_2), NO_QUES, LSFT(KC_6), NO_LESS, NO_GRTR, KC_NO,
+ KC_HASH, NO_CIRC, KC_HASH, LSFT(KC_2), NO_TILD, KC_NO,
+ KC_NO, KC_PERC, NO_ACUT, NO_APOS, NO_ASTR, NO_GRV, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_NO,
+ KC_NO,
+ KC_NO, KC_NO, KC_NO
+),
+/* Keymap 2: Media and mouse keys
+ *
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | |
+ * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ * | | F11 | F12 | | | | | | | | | | | | |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | | | | | |------| |------| | | | | | Vol Up |
+ * |--------+------+------+------+------+------| | | RCTRL|------+------+------+------+------+--------|
+ * | | | | | | | | | | | | | B1 | B2 |Vol Down|
+ * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * | LCTRL| | | LALT | | | | M_L | M_D | M_U | M_R |
+ * `----------------------------------' `----------------------------------'
+ * ,-------------. ,-------------.
+ * | | | | | |
+ * ,------|------|------| |------+------+------.
+ * | | | | | | | |
+ * | | |------| |------| | Play |
+ * | | | | | | | Pause|
+ * `--------------------' `--------------------'
+ */
+// MEDIA AND MOUSE
+[MOUS] = LAYOUT_ergodox(
+ KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO,
+ KC_NO, KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_NO,
+ KC_NO, KC_NO,
+ KC_NO,
+ KC_NO, KC_NO, KC_NO,
+ // right hand
+ KC_NO, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_VOLU,
+ KC_TRNS, KC_NO, KC_NO, KC_NO, KC_BTN1, KC_BTN2, KC_VOLD,
+ KC_NO, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R,
+ KC_NO, KC_NO,
+ KC_NO,
+ KC_NO, KC_NO, KC_MPLY
+),
+/* Keymap 3: QWERTY Layer
+ *
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | Print | ! | " | # | # | % | | |Middle| & | / | ( | ) | = | ? |
+ * | Screen | 1 | 2 @ | 3 £ | 4 $ | 5 | F11 | |Mouse | 6 | 7 { | 8 [ | 9 ] | 0 } | + \ |
+ * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ * | Tab | Q | W | E | R | T | | | | Y | U | I | O | P | Å |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | CapsLk | A | S | D | F | G |------| |------| H | J | K | L | Ö | Ä |
+ * |--------+------+------+------+------+------| ` | | Del |------+------+------+------+------+--------|
+ * | LShft | Z | X | C | V | B | ' | | | N | M | , | . | - | RShift |
+ * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * | LCtl | ^ | * | LAlt | LGui | | AltGr| Down | Up | Left | Right|
+ * | (') | " ~ | ' ´ | | | | | | | | |
+ * `----------------------------------' `----------------------------------'
+ * ,-------------. ,--------------.
+ * | LCtl | LAlt | | Home | End |
+ * ,------|------|------| |------+-------+------.
+ * | | | ~ | | PgUp | | |
+ * | BSP | TAB |------| |------| Enter | Space|
+ * | | | Esc | | PgDn | | |
+ * `--------------------' `---------------------'
+ */
+[QWRT] = LAYOUT_ergodox(
+ // left hand
+ KC_PSCR, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_TRNS,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, NO_ACUT,
+ CTL_T(NO_APOS), NO_CIRC, NO_ASTR, KC_LALT, KC_LGUI,
+ KC_LCTRL, KC_LALT,
+ NO_TILD,
+ KC_BSPC, KC_TAB, KC_ESC,
+ // right hand
+ KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, NO_PLUS,
+ KC_TRNS, KC_Y, KC_U, KC_I, KC_O, KC_P, NO_AA,
+ KC_H, KC_J, KC_K, KC_L, NO_OSLH, NO_AE,
+ KC_DELT, KC_N, KC_M, KC_COMM, KC_DOT, NO_MINS, KC_RSFT,
+ KC_ALGR, KC_DOWN, KC_UP, KC_LEFT, KC_RGHT,
+ KC_HOME, KC_END,
+ KC_PGUP,
+ KC_PGDN, KC_ENT, KC_SPACE
+),
+};
+
+const uint16_t PROGMEM fn_actions[] = {
+ [1] = ACTION_LAYER_TAP_TOGGLE(SYMB) // FN1 - Momentary Layer 1 (Symbols)
+};
+
+
+// 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) {
+ case 1:
+ ergodox_right_led_1_on();
+ break;
+ case 2:
+ ergodox_right_led_2_on();
+ break;
+ case 3:
+ ergodox_right_led_3_on();
+ break;
+ default:
+ break;
+ }
+
+};
diff --git a/layouts/community/ergodox/dvorak_svorak_a5/readme.md b/layouts/community/ergodox/dvorak_svorak_a5/readme.md
new file mode 100644
index 000000000..c4b918416
--- /dev/null
+++ b/layouts/community/ergodox/dvorak_svorak_a5/readme.md
@@ -0,0 +1,42 @@
+# ErgoDox EZ Svorak A5
+
+This layout is supposed to be an implementation of the [Svorak A5
+layout](http://aoeu.info/s/dvorak/svorak). Unfortunately, the Ergodox EZ lacks
+one column for the right hand, why the three buttons furthest to the right, on
+the right half, are missing. I have tried to move them around and have yet to
+find a perfect position for them.
+
+
+## Note
+
+The keyboard assumes that the operating system interprets your keyboard as
+Swedish. If you get weird issues (like, most letters work, but not all special
+characters) please make sure your operating system uses a Swedish keyboard
+layout.
+
+
+## Flashing
+
+In order to compile and flash your Ergodox EZ, invoke the following at the root
+of the repository.
+
+`make ergodox_ez:dvorak_svorak_a5:teensy`
+
+I haven't gotten the above to work on Windows. Instead I use
+[Msys2](https://www.msys2.org/) to compile the .hex-file (`make ergodox_ez:dvorak_svorak_a5`)
+and [Teensy Loader](https://www.pjrc.com/teensy/loader_win10.html) to flash the
+board.
+
+
+## Changelog
+
+* 2018-08-09
+ * Initial release
+* 2018-08-10
+ * Make special characters work in Windows
+ * Add QWERTY layer
+
+# Author
+Erik Thorsell
+erikthorsell @ github and twitter
+
diff --git a/layouts/community/ergodox/erez_experimental/rules.mk b/layouts/community/ergodox/erez_experimental/rules.mk
index 839dd82e1..f68b56f87 100644
--- a/layouts/community/ergodox/erez_experimental/rules.mk
+++ b/layouts/community/ergodox/erez_experimental/rules.mk
@@ -3,5 +3,4 @@
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
COMMAND_ENABLE = no # Commands for debug and configuration
-
-
+LEADER_ENABLE = yes
diff --git a/layouts/community/ergodox/familiar/rules.mk b/layouts/community/ergodox/familiar/rules.mk
index 31e0fcf29..4a3c58621 100644
--- a/layouts/community/ergodox/familiar/rules.mk
+++ b/layouts/community/ergodox/familiar/rules.mk
@@ -1 +1,2 @@
TAP_DANCE_ENABLE=yes
+LEADER_ENABLE = yes
diff --git a/layouts/community/ergodox/mclennon_osx/README.md b/layouts/community/ergodox/mclennon_osx/README.md
index 28cdb7c10..53b3d4841 100644
--- a/layouts/community/ergodox/mclennon_osx/README.md
+++ b/layouts/community/ergodox/mclennon_osx/README.md
@@ -1,5 +1,5 @@
# Ergodox EZ for OS X
-This keymapping is designed to be reasonably familiar to an ordinary Mac keyboard while taking advantage of the Ergodox EZ's features. Caps lock instead enables a layer which allows a user to use HJKL as arrow keys and to control media. Shift and control have additional mappings on S and D to provide easier access while holding down caps lock.
+This keymapping is designed to be reasonably familiar to an ordinary Mac keyboard while taking advantage of the Ergodox EZ's features. Caps lock instead enables a layer which allows a user to use HJKL as arrow keys and to control media. Shift and control have additional mappings on S and D to provide easier access while holding down caps lock.
-If you choose to compile this yourself, be sure to compile with `#define PREVENT_STUCK_MODIFIERS` in your `config.h`. Firmware built using [qmk_firmware](https://github.com/qmk/qmk_firmware/).
+Firmware built using [qmk_firmware](https://github.com/qmk/qmk_firmware/).
diff --git a/layouts/community/ergodox/meagerfindings/README.md b/layouts/community/ergodox/meagerfindings/README.md
new file mode 100644
index 000000000..e7e4270db
--- /dev/null
+++ b/layouts/community/ergodox/meagerfindings/README.md
@@ -0,0 +1,109 @@
+![Base](https://meagerfindings.com/assets/img/ergodox/base.png)
+
+# Meagerfinding's ErgoDox Layout
+
+<!-- TOC depthFrom:2 depthTo:6 withLinks:1 updateOnSave:1 orderedList:0 -->
+
+- [Overview](#overview)
+- [Credit where credit is due](#credit-where-credit-is-due)
+- [Features](#features)
+ - [Tap/Hold Macro Keys](#taphold-macro-keys)
+ - [TapDance Keys](#tapdance-keys)
+- [Base Layer](#base-layer)
+ - [Things to note:](#things-to-note)
+- [Old Base Layer](#old-base-layer)
+- [Symbols Layer](#symbols-layer)
+- [Mouse & Media Keys Layer](#mouse-media-keys-layer)
+- [Markdown Layer](#markdown-layer)
+- [Arrow/Movements Layer](#arrowmovements-layer)
+- [Numpad Layer](#numpad-layer)
+
+<!-- /TOC -->
+
+## Overview
+
+The overall goals of this layout are to:
+1. Use the Ergodox thumb clusters to eliminate pinky reach.
+2. Place as many useful keys under the home rows as possible.
+
+I first decided to build an ErgoDox as I wanted to use my thumbs for more with the added ergonomic benefits of a split board and ortholinear layout. I knew my hands were hurting from the weird contortions of copying and pasting constantly on my Mac, but I had no idea how strained I really was until I started moving as many modifier keys to the thumb clusters.
+
+## Credit where credit is due
+
+The initial layout used created on the [ErgoDox EZ Configurator](https://ergodox-ez.com/pages/graphical-configurator). I went through 26+ iterations within the configurator prior to beginning my journey with QMK itself. Much of the dual function/layer keys are influenced by and adapted from the EZ Configurator.
+
+Many features in this layout are either directly inspired by or are adaptations of [Algernon's incredible ErgoDox layout](https://github.com/algernon/ergodox-layout). Specifically: TapDance and its usage, and the brilliant idea of using TapDance to pair down the four keys for parens, brackets, and curly braces into just 2 keys.
+
+## Features
+
+### Tap/Hold Macro Keys
+* `Paste/Paste Special` key sends Paste on tap and Paste Special when held.
+* `Screen/Video` key sends `||scrn` when tapped and `||video` when held
+ - [Typinator](http://www.ergonis.com/products/typinator/) expands `||scrn` into `(Screenshot: <CLIPBOARD CONTENTS>)`, and `||video` into `(Video: <CLIPBOARD CONTENTS>)`, the QMK macro then moves back to before the last paren, inserts a space and removes a space to create a hyperlink for use in Zendesk.
+* When tapped, `Todoist` toggles quick add window for a new Todoist task (`CMD + Shift + A`) and switches to Todoist when held
+* The RubyMine key opens RubyMine by triggering spotlight, typing out `Rubymine`, and submitting the enter key.
+* `Zendesk` triggers spotlight and then calls Typinator expansion to open my Zendesk Agent dashboard in Chrome.
+
+
+### TapDance Keys
+* `Copy/Cut` key copies on tap, cut's on two taps.
+* One tap on `Snagit` key = sends `Ctrl + Shift + C` which is Snagit's selector and two taps on `Snagit` key = `Cmd + Shift + Opt + 4`, OS X cropping screenshot that is copied to the clipboard only.
+* Tapping the `[{(`/`)}]` keys once yields `[` or `{` when the shift key is engaged, tapping them twice yields `(`.
+
+## Base Layer
+
+![Base](https://meagerfindings.com/assets/img/ergodox/base.png)
+
+The base layer retains the alphas from the QWERTY layout without any modifications.
+
+### Things to note:
+
+- The shift key is a One Shot Modifier key, meaning shift is not submitted when the key is tapped, instead, it only submits when you either tap it again, or on the next key press.
+ - There is no CAPSLOCK key designated as it is pretty comfortable to simply hold down shift in this layout and continue typing.
+- There is only one layer that you can fully switch to on this layout, the [Old Base layer](#old-base-layer). All other layers require holding a key to reach them. For the most part, the key that toggles a layer, will be on the opposite hand that will be typing with that layer.
+ - For example: the symbols layer is reached by holding down the enter key with your right thumb, and most of the symbols are located on the left hand board.
+
+
+## Old Base Layer
+
+![Old Base](https://meagerfindings.com/assets/img/ergodox/old_base.png)
+
+I am moving into a new position (software engineering) at work from a Support position. My hope is to use my F keys more often and write fewer emails. This is my old base layer, still easily accessible, as I'm not used to having F key's on my top row quite yet.
+
+## Symbols Layer
+
+![Symbols](https://meagerfindings.com/assets/img/ergodox/symbols.png)
+
+Holding down the `enter` key with your right thumb toggles the symbol layer.
+
+I've placed my most used symbols under the homerow. Granted, right now I mainly right emails/support ticket responses, so this home row may need to change as I transition to software engineering.
+
+## Mouse & Media Keys Layer
+
+![Mouse & Media](https://meagerfindings.com/assets/img/ergodox/mouse_media.png)
+
+Holding down the `:` key on with your right pinky toggles the mouse and media layer. Your left hand controls the mouse directions just in a similar fashion to the keys used in the [movement layer](#arrowmovements-layer).
+
+The right hand has a media controls under the homerow for quick muting/pausing.
+
+* `XKCD #1319` Key that ironically partially-automates accessing the link to [XKCD #1319](https://xkcd.com/1319/).
+
+## Markdown Layer
+
+![Markdown](https://meagerfindings.com/assets/img/ergodox/markdown.png)
+
+This layer places most common markdown symbols under the right hand. You can reach this layer by holding down the `F` key on your left hand.
+
+## Arrow/Movements Layer
+
+![Movement](https://meagerfindings.com/assets/img/ergodox/movement_arrows.png)
+
+Toggled by holding down the space key with the right thumb. This isn't vim like movement, nope, it's `WASD` but over one column. So I guess it's actually `ESDF` on the left hand and `IJKL` on the right hand to better line up with the columns offset/staggered columns on the Dox.
+
+## Numpad Layer
+
+![Numpad](https://meagerfindings.com/assets/img/ergodox/numpad.png)
+
+My right hand is pretty comfortable with tenkey number input so this is easily accessible by holding down backspace with the left thumb.
+
+Also, on the left hand, there is a tap to copy and hold to cut macro under the `D` key, and a tap to paste and a hold to paste special macro on the `F` key. I guess I'm to too lazy to move my fingers when copying/pasting...
diff --git a/layouts/community/ergodox/meagerfindings/config.h b/layouts/community/ergodox/meagerfindings/config.h
new file mode 100644
index 000000000..3d4f11b43
--- /dev/null
+++ b/layouts/community/ergodox/meagerfindings/config.h
@@ -0,0 +1,26 @@
+#undef VENDOR_ID
+#define VENDOR_ID 0xFEED
+#undef PRODUCT_ID
+#define PRODUCT_ID 0x1307
+#undef DEVICE_VER
+#define DEVICE_VER 0x0001
+#undef MANUFACTURER
+#define MANUFACTURER meagerfindings
+#undef PRODUCT
+#define PRODUCT ErgoDox
+#undef DESCRIPTION
+#define DESCRIPTION meagerfindings firmware for Ergodox
+
+#define USB_MAX_POWER_CONSUMPTION 500
+
+#undef MOUSEKEY_INTERVAL
+#define MOUSEKEY_INTERVAL 20
+#undef MOUSEKEY_DELAY
+#define MOUSEKEY_DELAY 0
+#undef MOUSEKEY_TIME_TO_MAX
+#define MOUSEKEY_TIME_TO_MAX 18
+#undef MOUSEKEY_MAX_SPEED
+#define MOUSEKEY_MAX_SPEED 4
+
+#undef TAPPING_TERM
+#define TAPPING_TERM 200
diff --git a/layouts/community/ergodox/meagerfindings/keymap.c b/layouts/community/ergodox/meagerfindings/keymap.c
new file mode 100644
index 000000000..62504f966
--- /dev/null
+++ b/layouts/community/ergodox/meagerfindings/keymap.c
@@ -0,0 +1,558 @@
+#include QMK_KEYBOARD_H
+#include "version.h"
+
+enum {
+ BASE = 0,
+ OLD_BASE,
+ SYMBL,
+ MEDIA,
+ MKDWN,
+ ARROWS,
+ NUM,
+};
+
+enum custom_keycodes {
+ PLACEHOLDER = SAFE_RANGE, // can always be here
+ EPRM,
+ VRSN,
+ MD_LINK,
+ XKCD,
+ DBLE_ZER0,
+ L_ID_0,
+ L_ID_1,
+ L_ID_2,
+ PAST_PS,
+ TODO,
+ RUBYMINE,
+ ZENDESK,
+ DBLE_ASTR,
+ TRPLE_GRAVE,
+ H_ONE,
+ H_TWO,
+ H_THREE,
+ H_FOUR,
+ H_FIVE,
+ M_LINK,
+ M_GREATER,
+ TD_COPY_CUT = 6,
+ TD_SNAGIT = 8,
+ TD_B_L_SEL = 10,
+ CT_LBP = 11,
+ CT_RBP = 12
+};
+
+//Redefine Key Names for Readaibilty
+#define XXXXXXX KC_NO
+#define SCRN_CLIPB LCTL(LGUI(LSFT(KC_4)))
+#define CHRM_L LALT(LGUI(KC_LEFT)) //Move left one tab in Chrome
+#define CHRM_R LALT(LGUI(KC_RIGHT)) //Move right one tab in Chrome
+#define S_CMD_S LGUI_T(KC_S) //`S` when typing `CMD` when held
+#define D_CMD_OPT LGUI_T(LALT_T(KC_D)) //`D` when typing `CMD + Opt` when held
+
+static uint16_t key_timer; //key timer for macros
+
+//Tap Dance Definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+ //Tap once for Copy, twice for Paste, three times for Cut.
+ [TD_COPY_CUT] = ACTION_TAP_DANCE_DOUBLE(LGUI(KC_C),LGUI(KC_X)),
+ //Tap once for Snagit, twice for Cmd + Shift + Opt + 4 (OS X cropping screenshot that is copied to the clipboard only.)
+ [TD_SNAGIT] = ACTION_TAP_DANCE_DOUBLE(LCTL(LSFT(KC_C)), LCTL(LGUI(LSFT(KC_4)))),
+ [CT_LBP] = ACTION_TAP_DANCE_DOUBLE (KC_LBRC, KC_LPRN),
+ [CT_RBP] = ACTION_TAP_DANCE_DOUBLE (KC_RBRC, KC_RPRN)
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ /* Keymap 0: Basic layer
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | = | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 | - |
+ * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ * | Tab | Q | W | E | R | T | "> " | | []() | Y | U | I | O | P | \ |
+ * |--------+------+------+------+------+------| | | SCRN |------+------+------+------+------+--------|
+ * | Hyper | A |S /CMD|D/OPT | F /MD| G |------| |------| H | J |K/OPT |L /CMD| ; /L2| '/Hyper|
+ * |--------+------+------+------+------+------| ( | | ) |------+------+------+------+------+--------|
+ * |Shft Tab|Z/Ctrl|X/Alt | C | V | B | [ { | | ] } | N | M | , | ./Alt|//Ctrl|CMD+SHFT|
+ * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * | ` |Zendsk|RBMINE|CMD+S | ToDo | | _ | | 00 | 00 |OLD BASE|
+ * `----------------------------------' `----------------------------------'
+ * ,-------------. ,--------------.
+ * | Esc | Home | |Layer?| Esc |
+ * ,------|------|------| |------+-------+------.
+ * | | | End | | Undo | | |
+ * |Shift |Backsp|------| |------| Return|Space/|
+ * | OSM | /NUM | DEL | | Ctrl | /SYML |Arrows|
+ * `--------------------' `---------------------'
+ *
+ *Copy/Cut key copies on tap, cut's on two taps.
+ *
+ *One tap on Snagit key = is Ctrl + Shift + C which is Snagit's selector.
+ *Two taps on Snagit key = Cmd + Shift + Opt + 4 (OS X cropping screenshot that is copied to the clipboard only.)
+ */
+
+ [BASE] = LAYOUT_ergodox(
+ //left hand
+ KC_EQUAL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, M_GREATER,
+ OSM(MOD_HYPR), KC_A, S_CMD_S, ALT_T(KC_D), LT(MKDWN,KC_F), KC_G,
+ LSFT(KC_TAB), CTL_T(KC_Z), ALT_T(KC_X), KC_C, KC_V, KC_B, TD(CT_LBP),
+ KC_GRAVE, ZENDESK, RUBYMINE, LGUI(KC_S), TODO,
+ KC_ESCAPE, KC_HOME,
+ KC_END,
+ OSM(MOD_LSFT), LT(NUM,KC_BSPACE), LT(MKDWN,KC_DELETE),
+
+ //right hand
+ KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MINUS,
+ MD_LINK, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH,
+ KC_H, KC_J, ALT_T(KC_K), LGUI_T(KC_L), LT(MEDIA,KC_SCOLON), ALL_T(KC_QUOTE),
+ TD(CT_RBP), KC_N, KC_M, KC_COMMA, ALT_T(KC_DOT), CTL_T(KC_SLASH), SCMD_T(_______),
+ LSFT(KC_MINUS), _______, DBLE_ZER0, DBLE_ZER0, TO(OLD_BASE),
+ L_ID_0, KC_ESCAPE,
+ LGUI(KC_Z),
+ LT(MEDIA,KC_LCTL), LT(SYMBL,KC_ENTER), LT(ARROWS,KC_SPACE)),
+
+ /* Keymap 1: OLD Base layer
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | = | 1 | 2 | 3 | 4 | 5 | []() | |Snagit| 6 | 7 | 8 | 9 | 0 | - |
+ * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ * | Tab | Q | W | E | R | T | "> " | | []() | Y | U | I | O | P | \ |
+ * |--------+------+------+------+------+------| | | SCRN |------+------+------+------+------+--------|
+ * | Hyper | A |S /CMD| D | F | G |------| |------| H | J | K |L /CMD| ; /L2| '/Hyper|
+ * |--------+------+------+------+------+------| ( | | ) |------+------+------+------+------+--------|
+ * |Shft Tab|Z/Ctrl|X/Alt | C | V | B | [ { | | ] } | N | M | , | ./Alt|//Ctrl|CMD+SHFT|
+ * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * | ` |Zendsk|RBMINE|CMD+S | ToDo | | _ | | 00 | 00 |ToBase|
+ * `----------------------------------' `----------------------------------'
+ * ,-------------. ,--------------.
+ * | Esc | Home | |Layer?| Esc |
+ * ,------|------|------| |------+-------+------.
+ * | | | End | | Undo | | |
+ * |Shift |Backsp|------| |------| Return|Space/|
+ * | OSM | /L5 | DEL | | Ctrl | /LT1 |Arrows|
+ * `--------------------' `---------------------'
+ *
+ *Copy/Cut key copies on tap, cut's on two taps.
+ *
+ *One tap on Snagit key = is Ctrl + Shift + C which is Snagit's selector.
+ *Two taps on Snagit key = Cmd + Shift + Opt + 4 (OS X cropping screenshot that is copied to the clipboard only.)
+ */
+
+ [OLD_BASE] = LAYOUT_ergodox(
+ //left hand
+ KC_EQUAL, KC_1, KC_2, KC_3, KC_4, KC_5, M_LINK,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, M_GREATER,
+ OSM(MOD_HYPR), KC_A, S_CMD_S, D_CMD_OPT, LT(MKDWN,KC_F),KC_G,
+ LSFT(KC_TAB), CTL_T(KC_Z), ALT_T(KC_X), KC_C, KC_V, KC_B, TD(CT_LBP),
+ KC_GRAVE, ZENDESK, RUBYMINE, LGUI(KC_S), TODO,
+ KC_ESCAPE, KC_HOME,
+ KC_END,
+ OSM(MOD_LSFT), LT(NUM,KC_BSPACE), LT(MKDWN,KC_DELETE),
+
+ //right hand
+ TD(TD_SNAGIT), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS,
+ MD_LINK, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH,
+ KC_H, KC_J, KC_K, LGUI_T(KC_L), LT(MEDIA,KC_SCOLON), ALL_T(KC_QUOTE),
+ TD(CT_RBP), KC_N, KC_M, KC_COMMA, ALT_T(KC_DOT), CTL_T(KC_SLASH), SCMD_T(_______),
+ LSFT(KC_MINUS), _______, DBLE_ZER0, DBLE_ZER0, TO(BASE),
+ L_ID_0, KC_ESCAPE,
+ LGUI(KC_Z),
+ LT(MEDIA,KC_LCTL), LT(SYMBL,KC_ENTER), LT(ARROWS,KC_SPACE)),
+
+ /* Keymap 2: Symbol
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | | 1 | 2 | 3 | 4 | 5 | []() | |Snagit| 6 | 7 | 8 | 9 | 0 | - |
+ * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ * | | | $ | & | ` | | | Cmd | | | | | * | | | |
+ * |--------+------+------+------+------+------| + K | | |------+------+------+------+------+--------|
+ * | | # | $ | & | ! | @ |------| |------| - | [ | ] | ( | ) | |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | % | ^ | | | ~ | | | | | | | | | |
+ * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * | | | | | | | | | | | |
+ * `----------------------------------' `----------------------------------'
+ * ,-------------. ,-------------.
+ * | | | |Layer?| |
+ * ,------|------|------| |------+------+------.
+ * | | | | | | | |
+ * | | |------| |------| | |
+ * | | | | | | | |
+ * `--------------------' `--------------------'
+ */
+ // SYMBOLS
+ [SYMBL] = LAYOUT_ergodox(
+ //left hand
+ _______, KC_1, KC_2, KC_3, KC_4, KC_5, M_LINK,
+ _______, _______, KC_DLR, KC_AMPR, KC_GRAVE, KC_PIPE, LGUI(KC_K),
+ _______, KC_HASH, KC_DLR, KC_AMPR, KC_EXLM, KC_AT,
+ _______, KC_PERC, KC_CIRC, _______, _______, KC_TILD, _______,
+ _______, _______, _______, _______, _______,
+ _______, _______,
+ _______,
+ _______, _______, _______,
+
+ //right hand
+ TD(TD_SNAGIT), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS,
+ _______, _______, _______, KC_PAST, _______, _______, _______,
+ KC_MINUS, KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, _______,
+ _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______,
+ L_ID_1, _______,
+ _______,
+ _______, _______, _______),
+
+ /* Keymap 3: Media and mouse keys
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | | | | | | | | | XKCD | | | | | | F15 |
+ * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ * | | |Whl Up| MsUp |Whl Dn| | | | | | | | | | F14 |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | |Ctl L |MsLeft|MsDown|MsRght| Ctl R|------| |------| | Mute | VolDn| VolUp| TL 2 | Play |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | |WHL L | |Whl R | | | | | | | Prev | Next | | |
+ * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * | | | | | | | Mute | | | | |
+ * `----------------------------------' `----------------------------------'
+ * ,-------------. ,-------------.
+ * | | | |LAYER?| |
+ * ,------|------|------| |------+------+------.
+ * | Left |Right | | | |Copy/ | paste|
+ * | Click|Click |------| |------| cut |/paste|
+ * | | | | | | |spcial|
+ * `--------------------' `--------------------'
+ */
+ // MEDIA AND MOUSE
+
+ [MEDIA] = LAYOUT_ergodox(
+ //left hand
+ _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, KC_MS_WH_UP, KC_MS_UP, KC_MS_WH_DOWN, _______, _______,
+ _______, LCTL(KC_LEFT), KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, RCTL(KC_RIGHT),
+ XXXXXXX, _______, KC_MS_WH_LEFT, _______, KC_MS_WH_RIGHT, _______, _______,
+ _______, _______, _______, _______, _______,
+ _______, _______,
+ _______,
+ KC_MS_BTN1, KC_MS_BTN2, _______,
+
+ //right hand
+ XKCD, _______, _______, _______, _______, _______, KC_F15,
+ _______, _______, _______, _______, _______, _______, KC_F14,
+ _______, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, _______, KC_MEDIA_PLAY_PAUSE,
+ _______, _______, _______, KC_MEDIA_PREV_TRACK, KC_MEDIA_NEXT_TRACK, _______, XXXXXXX,
+ _______, _______, _______, _______, _______,
+ L_ID_2, _______,
+ _______,
+ _______, TD(TD_COPY_CUT), PAST_PS),
+
+ /* Keymap 4: Markdown Symbols
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | | | | | | | | |SCRNCL| | | | | | |
+ * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ * | | | | | | | | | | | ``` | ** | _ | ` | |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | | | | TL MD| |------| |------| - | [ | ] | ( | ) | |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | | | | | | | | | # | ## | ### | #### | #####| |
+ * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * | | | | | | | | | | | |
+ * `----------------------------------' `----------------------------------'
+ * ,-------------. ,-------------.
+ * | | | |Layer?| |
+ * ,------|------|------| |------+------+------.
+ * | | | | | | | |
+ * | | |------| |------| | |
+ * | | | | | | | |
+ * `--------------------' `--------------------'
+ * Sc cp = OS X cropping screenshot that is copied to the clipboard only.
+ */
+ // Markdown Layer
+ [MKDWN] = LAYOUT_ergodox(
+ //left hand
+ _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______,
+ _______, _______,
+ _______,
+ _______, _______, _______,
+
+ //right hand
+ SCRN_CLIPB, _______, _______, _______, _______, _______, _______,
+ _______, _______, TRPLE_GRAVE, DBLE_ASTR,LSFT(KC_MINUS), KC_GRAVE, _______,
+ KC_MINUS, KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, _______,
+ _______, H_ONE, H_TWO, H_THREE, H_FOUR, H_FIVE, _______,
+ _______, _______, _______, _______, _______,
+ _______, _______,
+ _______,
+ _______, _______, _______),
+
+ /* Keymap 5: Arrows
+ *
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | RESET | | | | | | | | | | | | | | |
+ * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ * | | | Opt+L| Up |Opt+R | | | | | | Opt+L| Up |Opt+R | | |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | |Ctrl+L| Left | Dn | Right|Ctrl+R|------| |------|Ctrl+L| Left | Dn | Right|Ctrl+R| |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | | | | | | | | | | | | | | |
+ * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * | | | | | | | | | | | |
+ * `----------------------------------' `----------------------------------'
+ * ,-------------. ,-------------.
+ * | | | | | |
+ * ,------|------|------| |------+------+------.
+ * | | | | | | | |
+ * | | |------| |------| | |
+ * | | | | | | | |
+ * `--------------------' `--------------------'
+ *
+ *
+ *
+ */
+ // Movement Layer
+
+ [ARROWS] = LAYOUT_ergodox(
+ //left hand
+ RESET, _______, _______, _______, _______, _______, _______,
+ _______, _______, CHRM_L, KC_UP, CHRM_R, _______, _______,
+ _______,LCTL(KC_LEFT), KC_LEFT, KC_DOWN, KC_RIGHT, LCTL(KC_RIGHT),
+ _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______,
+ _______, _______,
+ _______,
+ _______, _______, _______,
+ //right hand
+ _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, CHRM_L, KC_UP, CHRM_R, _______, _______,
+ LCTL(KC_LEFT), KC_LEFT, KC_DOWN, LGUI_T(KC_RIGHT), LCTL(KC_RIGHT), _______,
+ _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______,
+ _______, _______,
+ _______,
+ _______, _______, _______),
+
+ /* Keymap 6: Numpad
+ * ,--------------------------------------------------. ,--------------------------------------------------.
+ * | | | | | | | | | | | | | | | |
+ * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
+ * | | | | | | | | | | = | 7 | 8 | 9 | * | |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | | |Cp/Cut|paste | |------| |------| + | 4 | 5 | 6 | + | |
+ * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
+ * | | | | | | | | | | - | 1 | 2 | 3 | / | |
+ * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
+ * | | | | | | | 0 | . | 00 | 00 | Enter|
+ * `----------------------------------' `----------------------------------'
+ * ,-------------. ,-------------.
+ * | | | | | |
+ * ,------|------|------| |------+------+------.
+ * | | | | | |Nupmad| |
+ * | | |------| |------|Enter | |
+ * | | | | | | | |
+ * `--------------------' `--------------------'
+ */
+ // Numpad Layer
+ [NUM] = LAYOUT_ergodox(
+ //left hand
+ _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, TD(TD_COPY_CUT), PAST_PS, _______,
+ _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______,
+ _______, _______,
+ _______,
+ _______, _______, _______,
+
+ //right hand
+ _______, _______, _______, _______, _______, _______, _______,
+ _______, KC_EQUAL, KC_7, KC_8, KC_9, KC_ASTR, _______,
+ KC_PLUS, KC_4, KC_5, KC_6, KC_PLUS, _______,
+ _______, KC_MINUS, KC_1, KC_2, KC_3, KC_KP_SLASH, _______,
+ KC_KP_0, KC_DOT, DBLE_ZER0, DBLE_ZER0, KC_KP_ENTER,
+ _______, _______,
+ _______,
+ _______, KC_PENT, _______),
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+
+ switch (keycode) {
+ case EPRM:
+ if (record->event.pressed) {
+ eeconfig_init();
+ }
+ return false;
+ break;
+
+ case VRSN:
+ if (record->event.pressed) {
+ SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
+ }
+ return false;
+ break;
+
+ case MD_LINK:
+ if (record->event.pressed){
+ key_timer = timer_read();
+ } else {
+ if (timer_elapsed(key_timer) > 150) {
+ SEND_STRING ("([Video](");
+ } else {
+ SEND_STRING ("([Screenshot](");
+ }
+ SEND_STRING(SS_LGUI("v"));
+ SEND_STRING("))");
+ }
+ break;
+
+ case XKCD:
+ if (record->event.pressed) {
+ SEND_STRING ("https://xkcd.com/1319/");
+ }
+ break;
+
+ case DBLE_ZER0:
+ if (record->event.pressed){
+ SEND_STRING ("00");
+ }
+ break;
+
+ case DBLE_ASTR:
+ if (record->event.pressed){
+ SEND_STRING ("**");
+ SEND_STRING ("**");
+ SEND_STRING (SS_TAP(X_LEFT));
+ SEND_STRING (SS_TAP(X_LEFT));
+ }
+ break;
+
+ case TRPLE_GRAVE:
+ if (record->event.pressed){
+ SEND_STRING ("```");
+ }
+ break;
+
+ case L_ID_0:
+ if (record->event.pressed) {
+ SEND_STRING (SS_LGUI(" "));
+ SEND_STRING ("Layer 0: Base");
+ }
+ break;
+
+ case L_ID_1:
+ if (record->event.pressed) {
+ SEND_STRING (SS_LGUI(" "));
+ SEND_STRING ("Layer 1: Symbols");
+ }
+ break;
+
+ case L_ID_2:
+ if (record->event.pressed) {
+ SEND_STRING (SS_LGUI(" "));
+ SEND_STRING ("Layer 2: Media & Mousekeys");
+ }
+ break;
+
+ case PAST_PS:
+ if (record->event.pressed) {
+ key_timer = timer_read();
+ } else {
+ if (timer_elapsed(key_timer) > 150) {
+ SEND_STRING (SS_LGUI("V")); // Paste special
+ } else {
+ SEND_STRING (SS_LGUI("v")); // Paste
+ }
+ }
+ break;
+
+ case TODO:
+ if (record->event.pressed) {
+ key_timer = timer_read();
+ } else {
+ if (timer_elapsed(key_timer) > 150) { //switch to Todoist when held and released
+ SEND_STRING (SS_LGUI(" "));
+ SEND_STRING ("Todoist");
+ SEND_STRING (SS_TAP(X_ENTER));
+ } else {
+ SEND_STRING (SS_LGUI(SS_LCTRL("a"))); //macro to open Todoist new task dialog
+ }
+ }
+ break;
+
+ case RUBYMINE:
+ if (record->event.pressed){
+ SEND_STRING (SS_LGUI(" "));
+ SEND_STRING ("RUBYMINE");
+ SEND_STRING (SS_TAP(X_ENTER));
+ }
+ break;
+
+ case ZENDESK:
+ if (record->event.pressed){
+ SEND_STRING (SS_LGUI(" "));
+ SEND_STRING ("||ZEN");
+ SEND_STRING (SS_TAP(X_ENTER));
+ }
+ break;
+
+ case H_ONE:
+ if (record->event.pressed){
+ SEND_STRING ("# ");
+ }
+ break;
+
+ case H_TWO:
+ if (record->event.pressed){
+ SEND_STRING ("## ");
+ }
+ break;
+
+ case H_THREE:
+ if (record->event.pressed){
+ SEND_STRING ("### ");
+ }
+ break;
+
+ case H_FOUR:
+ if (record->event.pressed){
+ SEND_STRING ("#### ");
+ }
+ break;
+
+ case H_FIVE:
+ if (record->event.pressed){
+ SEND_STRING ("##### ");
+ }
+ break;
+ case M_LINK:
+ if (record->event.pressed){
+ SEND_STRING ("[]()");
+ }
+ break;
+ case M_GREATER:
+ if (record->event.pressed){
+ SEND_STRING ("> ");
+ }
+ break;
+ }
+ return true;
+};
+
+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) {
+ case 1:
+ ergodox_right_led_1_on();
+ break;
+ case 2:
+ ergodox_right_led_2_on();
+ break;
+ default:
+ break;
+ }
+};
diff --git a/layouts/community/ergodox/meagerfindings/rules.mk b/layouts/community/ergodox/meagerfindings/rules.mk
new file mode 100644
index 000000000..c775e1f6d
--- /dev/null
+++ b/layouts/community/ergodox/meagerfindings/rules.mk
@@ -0,0 +1,3 @@
+COMMAND_ENABLE = no
+TAP_DANCE_ENABLE = yes
+FORCE_NKRO = yes
diff --git a/layouts/community/ergodox/qwerty_code_friendly/keymap.c b/layouts/community/ergodox/qwerty_code_friendly/keymap.c
index f882d0e00..43a1d1ad8 100644
--- a/layouts/community/ergodox/qwerty_code_friendly/keymap.c
+++ b/layouts/community/ergodox/qwerty_code_friendly/keymap.c
@@ -403,16 +403,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, K80(L1K2), K80(L1K3),
KC_TRNS, KC_TRNS, KC_TRNS
),
-/* Keymap 2: Numbers, media and mouse keys
+/* Keymap 2: FKeys, media & mouse keys
*
* .--------------------------------------------------. .--------------------------------------------------.
- * | | 1 | 2 | 3 | 4 | 5 | | | Mute | 6 | 7 | 8 | 9 | 0 | |
+ * | | | | | | | | | Mute | | F10 | F11 | F12 | | |
* |--------+------+------+------+------+------+------| |------+------+------+------+------+------+--------|
- * | | | | MsUp | | |MWhlUp| |VolUp | | | | | | |
+ * | | | | MsUp | | |MWhlUp| |VolUp | | F7 | F8 | F9 | | |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | |MsLeft|MsDown|MsRght| |------| |------| Left | Down | Up |Right | | |
+ * | | |MsLeft|MsDown|MsRght| |------| |------| | F4 | F5 | F6 | | |
* |--------+------+------+------+------+------|MWhlDn| |VolDn |------+------+------+------+------+--------|
- * | | | Rclk | Mclk | Lclk | | | | | | | | | | |
+ * | | | Rclk | Mclk | Lclk | | | | | | F1 | F2 | F3 | | |
* '--------+------+------+------+------+-------------' '-------------+------+------+------+------+--------'
* | | | | | | | | | | | |
* '----------------------------------' '----------------------------------'
@@ -427,7 +427,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* MEDIA, MOUSE & NUMBERS */
[LAYER_MDIA] = LAYOUT_ergodox_76_or_80(
/* left hand */
- KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_WH_U,
KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
KC_TRNS, KC_TRNS, KC_BTN2, KC_BTN3, KC_BTN1, KC_TRNS, KC_WH_D,
@@ -436,19 +436,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
K80(L2K0), K80(L2K1), KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
/* right hand */
- KC_MUTE, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
- KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS,
- KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_MUTE, KC_TRNS, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
+ KC_VOLU, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_TRNS,
+ KC_VOLD, KC_TRNS, KC_F1, KC_F2, KC_F3, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_MRWD, KC_MFFD,
KC_MPRV, K80(L2K2), K80(L2K3),
KC_MNXT, KC_TRNS, KC_MPLY
),
-/* Keymap 3: Entire Words (one for each key)
+/* Keymap 3: Entire Words (one for each key) & Numbers
*
* .--------------------------------------------------. .--------------------------------------------------.
- * | | F1 | F2 | F3 | F4 | F5 | F11 | | F12 | F6 | F7 | F8 | F9 | F10 | |
+ * | | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | |
* |--------+------+------+------+------+------+------| |------+------+------+------+------+------+--------|
* | | Q | W | E | R | T | | | | Y | U | I | O | P | |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
@@ -470,7 +470,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* FKEY & WORDS */
[LAYER_FKEY] = LAYOUT_ergodox_76_or_80(
/* left hand */
- KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11,
+ KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS,
KC_TRNS, M_WORD_Q, M_WORD_W, M_WORD_E, M_WORD_R, M_WORD_T, KC_TRNS,
KC_TRNS, M_WORD_A, M_WORD_S, M_WORD_D, M_WORD_F, M_WORD_G,
KC_TRNS, M_WORD_Z, M_WORD_X, M_WORD_C, M_WORD_V, M_WORD_B, KC_TRNS,
@@ -479,7 +479,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
K80(L3K0), K80(L3K1), 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_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
KC_TRNS, M_WORD_Y, M_WORD_U, M_WORD_I, M_WORD_O, M_WORD_P, KC_TRNS,
M_WORD_H, M_WORD_J, M_WORD_K, M_WORD_L, KC_TRNS, KC_TRNS,
KC_TRNS, M_WORD_N, M_WORD_M, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/layouts/community/ergodox/qwerty_code_friendly/readme.md b/layouts/community/ergodox/qwerty_code_friendly/readme.md
index 8bc15dd31..9abd071b9 100644
--- a/layouts/community/ergodox/qwerty_code_friendly/readme.md
+++ b/layouts/community/ergodox/qwerty_code_friendly/readme.md
@@ -30,7 +30,7 @@ Some optional behavior is configurable without editing the code
using `CFQ_` prefixed defines which can be set by passing `EXTRAFLAGS` to make.
- `CFQ_USER_KEY0`
- (0..7) are used for custom-keys
+ (0..8) are used for custom-keys
- `CFQ_USE_MOMENTARY_LAYER_KEYS`
is used to prevent layer keys from toggling when tapped.
- `CFQ_USE_SHIFT_QUOTES`
@@ -122,22 +122,17 @@ Notes:
'--------------------' '--------------------'
```
-## Keymap 2: Media, Mouse Keys and Numbers
-
-Notes:
-
-- Numbers are included on this layer since some applications differentiate
- between numbers top row and keypad.
+## Keymap 2: F-Keys, Media & Mouse Keys
```
.--------------------------------------------------. .--------------------------------------------------.
-| | 1 | 2 | 3 | 4 | 5 | | | Mute | 6 | 7 | 8 | 9 | 0 | |
+| | | | | | | | | Mute | | F10 | F11 | F12 | | |
|--------+------+------+------+------+------+------| |------+------+------+------+------+------+--------|
-| | | | MsUp | | |MWhlUp| |VolUp | | | | | | |
+| | | | MsUp | | |MWhlUp| |VolUp | | F7 | F8 | F9 | | |
|--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
-| | |MsLeft|MsDown|MsRght| |------| |------| Left | Down | Up |Right | | |
+| | |MsLeft|MsDown|MsRght| |------| |------| | F4 | F5 | F6 | | |
|--------+------+------+------+------+------|MWhlDn| |VolDn |------+------+------+------+------+--------|
-| | | Rclk | Mclk | Lclk | | | | | | | | | | |
+| | | Rclk | Mclk | Lclk | | | | | | F1 | F2 | F3 | | |
'--------+------+------+------+------+-------------' '-------------+------+------+------+------+--------'
| | | | | | | | | | | |
'----------------------------------' '----------------------------------'
@@ -150,15 +145,20 @@ Notes:
'--------------------' '--------------------'
```
-## Keymap 3: F-Keys & User Defined Words
+## Keymap 3: User Defined Words & Numbers
This is for assigning whole words to single keys.
You can define the arguments (which must be quoted) using: `CFQ_WORD_[A-Z]`
eg: `-DCFQ_WORD_E=\"my@email.com\"`
+Notes:
+
+- Numbers are included on this layer since some applications differentiate
+ between numbers top row and keypad.
+
```
.--------------------------------------------------. .--------------------------------------------------.
-| | F1 | F2 | F3 | F4 | F5 | F11 | | F12 | F6 | F7 | F8 | F9 | F10 | |
+| | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | |
|--------+------+------+------+------+------+------| |------+------+------+------+------+------+--------|
| | Q | W | E | R | T | | | | Y | U | I | O | P | |
|--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
@@ -179,6 +179,9 @@ eg: `-DCFQ_WORD_E=\"my@email.com\"`
## Changelog
+- 2018/10/19
+ Move F-Keys to key-pad like layout.
+
- 2018/05/29
Add number keys for cases when keypad numbers are handled differently.
diff --git a/layouts/community/ergodox/replicaJunction/config.h b/layouts/community/ergodox/replicaJunction/config.h
index c69ce8cea..9ffd74dcc 100644
--- a/layouts/community/ergodox/replicaJunction/config.h
+++ b/layouts/community/ergodox/replicaJunction/config.h
@@ -1,64 +1,13 @@
-/*
-Config file - Ergodox QMK with replicaJunction layout
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef KEYBOARDS_ERGODOX_CONFIG_H_
-#define KEYBOARDS_ERGODOX_CONFIG_H_
-
-#include QMK_KEYBOARD_CONFIG_H
-
-
-#undef MOUSEKEY_DELAY
-#undef MOUSEKEY_INTERVAL
-#undef MOUSEKEY_MAX_SPEED
-#undef MOUSEKEY_TIME_TO_MAX
-
-#define MOUSEKEY_DELAY 100
-#define MOUSEKEY_INTERVAL 20
-#define MOUSEKEY_MAX_SPEED 3
-#define MOUSEKEY_TIME_TO_MAX 10
-
-#define TAPPING_TOGGLE 1
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-// MS the button needs to be held before a tap becomes a hold (default: 200)
-#define TAPPING_TERM 200
-
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
-
-// I don't have any locking keys, so I don't need these features
-
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-
-//#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-//#define LOCKING_RESYNC_ENABLE
-
-/* Prevent modifiers from sticking when switching layers */
-/* Uses 5 bytes of memory per 8 keys, but makes sure modifiers don't get "stuck" switching layers */
-#define PREVENT_STUCK_MODIFIERS
-
-/* key combination for command */
-#define IS_COMMAND() ( \
- keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
- keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
-)
-
-
-#endif /* KEYBOARDS_ERGODOX_CONFIG_H_ */
+#pragma once
+
+// Layer definitions
+
+#define L_COLEMAK 0
+#define L_QWERTY 1
+#define L_NUM 2
+#define L_EXTEND 3
+#define L_FUNC 4
+#define L_GAMING 5
+#define L_LL_R 6
+#define L_LL_E 7
+#define L_LL_I 8
diff --git a/layouts/community/ergodox/replicaJunction/keymap.c b/layouts/community/ergodox/replicaJunction/keymap.c
index fc8005927..ce0400be5 100644
--- a/layouts/community/ergodox/replicaJunction/keymap.c
+++ b/layouts/community/ergodox/replicaJunction/keymap.c
@@ -1,333 +1,424 @@
/*
* Keyboard: Ergodox
* Keymap: replicaJunction
- * Version: 1.2
- *
- * This keymap is designed to complement my Atreus keyboard layout, found in keyboards/atreus.
- * The Atreus keyboard is a 40% board whose design was heavily influenced by the Ergodox, and I now
- * have both keyboards, so I've designed these layouts in an effort to make switching between the
- * two as easy as possible.
- *
- * I've also tried to make use of the extra keys on the Ergodox in as logical of a manner as possible,
- * adding to the layers in the Atreus config without disturbing what's there already. This allows for
- * things like F11-F20, the Application (Menu) key, and better media key placement.
- *
- * The default key layout in this keymap is Colemak-ModDH. Information on that layout can be found
- * here: https://colemakmods.github.io/mod-dh/
+ * Version: 2.1
*/
#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-
-#define _CO 0 // Colemak
-#define _QW 1 // QWERTY
-#define _ME 2 // media keys
-#define _NU 3 // numpad
-#define _EX 4 // extend
-#define _GA 5 // mouse overlay for gaming
-
-// Some quick aliases, just to make it look pretty
-#define _______ KC_TRNS
-#define KCX_CGR LCTL(KC_GRV)
-#define KX_STAB LSFT(KC_TAB)
-#define KX_COPY LCTL(KC_C)
-#define KX_CUT LCTL(KC_X)
-#define KX_PAST LCTL(KC_V)
-#define KX_UNDO LCTL(KC_Z)
-
-; // This doesn't do anything. It's just for VSCode because its syntax highlighting is weird for the above #define statements.
+#include "config.h"
+#include "replicaJunction.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- /*
- * Keymap: Colemak-ModDH
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | ` | 1 | 2 | 3 | 4 | 5 | Esc | | | 6 | 7 | 8 | 9 | 0 | = |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | LCtrl | Q | W | F | P | B | Home | | BkSp | J | L | U | Y | ; | - |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | Tab | A | R | S | T | G |------| |------| M | N | E | I | O | ' |
- * |--------+------+------+------+------+------| Hyper| | \ |------+------+------+------+------+--------|
- * | LShft | Z | X | C | D | V | | | | K | H | , | , | / | RShft |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | LGui | [ | ] |CtlShf| LAlt | | _EX | - | ' | = | \ |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | LCtrl| ~GA | | Left | Right|
- * ,------|------|------| |------+------+------.
- * |LCtrl/| LAlt/| Home | | Up | Alt/| _NU/ |
- * | BkSp | Del |------| |------| Enter| Space|
- * | | | _NU | | Down | | |
- * `--------------------' `--------------------'
- */
-[_CO] = LAYOUT_ergodox(
- // left hand
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC,
- KC_LCTL,KC_Q, KC_W, KC_F, KC_P, KC_B, KC_HOME,
- KC_TAB, KC_A, KC_R, KC_S, KC_T, KC_G,
- KC_LSFT,KC_Z, KC_X, KC_C, KC_D, KC_V, ALL_T(KC_NO),
- KC_LGUI,KC_LBRC,KC_RBRC, LCTL(KC_LSFT), KC_LALT,
-
- KC_LCTL, TG(_GA),
- KC_HOME,
- CTL_T(KC_BSPC), ALT_T(KC_DEL), MO(_NU),
- // right hand
- KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL,
- KC_BSPC, KC_J, KC_L, KC_U, KC_Y, KC_SCLN,KC_MINS,
- KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT,
- KC_BSLS, KC_K, KC_H, KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,
- MO(_EX),KC_MINS,KC_QUOT,KC_EQL, KC_BSLS,
-
- KC_LEFT, KC_RGHT,
- KC_UP,
- KC_DOWN, ALT_T(KC_ENT), LT(_NU,KC_SPC)
- ),
-
- /*
- * Keymap: QWERTY layout.
- *
- * This is optimized for gaming, not typing, so there aren't as many macros
- * as the Dvorak layer. Some of the keys have also been moved to "game-
- * like" locations, such as making the spacebar available to the left thumb,
- * and repositioning the arrow keys at the bottom right corner.
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | ` | 1 | 2 | 3 | 4 | 5 | Esc | | | 6 | 7 | 8 | 9 | 0 | = |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | LCtrl | Q | W | E | R | T | Home | | BkSp | Y | U | I | O | P | - |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | Tab | A | S | D | F | G |------| |------| H | J | K | L | ; | ' |
- * |--------+------+------+------+------+------| Hyper| | \ |------+------+------+------+------+--------|
- * | LShft | Z | X | C | V | B | | | | N | M | , | . | / | RShft |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | LGui | ` | \ |CtlShf| _NU | | _EX | - | ' | = | \ |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | LCtrl| ~GA | | Left | Right|
- * ,------|------|------| |------+------+------.
- * |LCtrl/| LAlt/| Home | | Up | Alt/| _NU/ |
- * | BkSp | Del |------| |------| Enter| Space|
- * | | | _NU | | Down | | |
- * `--------------------' `--------------------'
- */
-[_QW] = LAYOUT_ergodox( // Layer1: QWERTY
- // left hand
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC,
- KC_LCTL,KC_Q, KC_W, KC_E, KC_R, KC_T, KC_HOME,
- KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LSFT,KC_Z, KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO),
- KC_LGUI,KC_GRV, KC_SLSH,LCTL(KC_LSFT), MO(_NU),
-
- KC_LCTL,TG(_GA),
- KC_HOME,
- CTL_T(KC_BSPC), ALT_T(KC_DEL), MO(_NU),
- // right hand
- KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL,
- KC_BSPC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS,
- KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT,
- KC_BSLS, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,
- MO(_EX),KC_MINS,KC_QUOT,KC_EQL, KC_BSLS,
-
- KC_LEFT, KC_RGHT,
- KC_UP,
- KC_DOWN, ALT_T(KC_ENT), LT(_NU,KC_SPC)
- ),
-
- /*
- * Keymap: Numbers and symbols
- *
- * Note that the number keys here are actually numpad keystrokes. This often doesn't matter, but it may be relevant in a few cases.
- * That's why the Num Lock key exists on this layer - just in case.
- *
- * This layer also contains the layout switches.
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | ! | @ | { | } | & | | | | / | 7 | 8 | 9 | * | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | # | $ | ( | ) | ~ |------| |------| | | 4 | 5 | 6 | - | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | % | ^ | [ | ] | ` | | | | \ | 1 | 2 | 3 | + | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | |QWERTY|Colemk| | | | 0 | . | = | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * |NumLck| RESET| | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-[_NU] = LAYOUT_ergodox(
- // left hand
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______,
- _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_AMPR, _______,
- _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_TILD,
- _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV, _______,
- _______, DF(_QW), DF(_CO), _______, _______,
-
- KC_NLCK,RESET,
- _______,
- _______,_______,_______,
- // right hand
- _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______,
- _______, KC_SLSH, KC_P7, KC_P8, KC_P9, KC_PAST, _______,
- KC_PIPE, KC_P4, KC_P5, KC_P6, KC_PMNS, _______,
- _______, KC_BSLS, KC_P1, KC_P2, KC_P3, KC_PPLS, _______,
- KC_P0, KC_PDOT, KC_EQL, _______, _______,
-
- _______, _______,
- _______,
- _______, _______, _______
- ),
-
- /*
- * Keymap: Extend
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | F11 | F12 | F13 | F14 | F15 | Mute | | | F16 | F17 | F18 | F19 | F20 | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | | | | Ctrl`| Vol | | | PgUp | Home | Up | End | Del | |
- * |--------+------+------+------+------+------| Up | | |------+------+------+------+------+--------|
- * | | | Gui | Alt | Ctrl | |------| |------| PgDn | Left | Down | Right| BkSp | Menu |
- * |--------+------+------+------+------+------| Vol | | |------+------+------+------+------+--------|
- * | | Undo | Cut | Copy | | Paste| Down | | | | ^Tab | Tab | |Insert| PrntScr|
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | | | | | | | | | | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | | | | |
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | | |------| |------| | |
- * | | | | | | | |
- * `--------------------' `--------------------'
- *
- * Ctrl+` is a keyboard shortcut for the program ConEmu, which provides a Quake-style drop-down command prompt.
- *
- */
-[_EX] = LAYOUT_ergodox(
- // left hand
- _______, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_MUTE,
- _______, _______, _______, _______, _______, KCX_CGR, KC_VOLU,
- _______, _______, KC_LGUI, KC_LALT, KC_LCTL, _______,
- _______, KX_UNDO, KX_CUT, KX_COPY, _______, KX_PAST, KC_VOLD,
- _______, _______, _______, _______, _______,
-
- _______,_______,
- _______,
- _______,_______,_______,
- // right hand
- _______, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, _______,
- _______, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_DEL, _______,
- KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC, KC_MENU,
- _______, _______, KX_STAB, KC_TAB, _______, KC_INS, KC_PSCR,
- _______, _______, _______, _______, _______,
- _______, _______,
- _______,
- _______, _______, _______
- ),
-
- /*
- * Keymap: Gaming
- *
- * Provides a mouse overlay for the right hand, and also moves some "gamer friendly" keys to the left, such as space.
- * This layer also removes a lot of dual-role keys, as when gaming, it's nicer not to need to keep track of those.
- *
- * ,--------------------------------------------------. ,--------------------------------------------------.
- * | | | | | | | | | | | | | | | |
- * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
- * | | | | | | | | | | |WhlUp | MsUp |WhlDn | | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | | |------| |------| |MsLeft|MsDown|MsRght| | |
- * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
- * | | | | | | | | | | | | | | | |
- * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------'
- * | LCtrl| | | | | | | | | | |
- * `----------------------------------' `----------------------------------'
- * ,-------------. ,-------------.
- * | | ~_GA | | |MClick|
- * ,------|------|------| |------+------+------.
- * | | | | | | | |
- * | Space| |------| |------|RClick|LClick|
- * | | | | | | | |
- * `--------------------' `--------------------'
- */
-[_GA] = LAYOUT_ergodox(
- // left hand
- _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______,
- KC_LCTL, _______, _______, _______, _______,
-
- _______,_______,
- _______,
- KC_SPC, _______,_______,
-
- // right hand
- _______, _______, _______, _______, _______, _______, _______,
- _______, _______, KC_WH_U, KC_MS_U, KC_WH_D, _______, _______,
- _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______,
- _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______,
- _______, KC_BTN3,
- _______,
- _______, KC_BTN2, KC_BTN1
- ),
-};
-const uint16_t PROGMEM fn_actions[] = {
- [1] = ACTION_LAYER_TAP_TOGGLE(_NU) // FN1 - Momentary Layer 1 (Numbers and symbols)
-};
+[L_COLEMAK] = LAYOUT_ergodox(
+//--------|--------|--------|--------|--------|--------|--------|
+ KC_ESC ,KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 ,KC_GRV ,
+//--------|--------|--------|--------|--------|--------|--------|
+ KX_ECTL ,KC_Q ,KC_W ,KC_F ,KC_P ,KC_B ,KC_LBRC ,
+//--------|--------|--------|--------|--------|--------|--------|
+ KC_TAB ,KC_A ,KC_R_LT ,KC_S_LT ,KC_T ,KC_G,
+//--------|--------|--------|--------|--------|--------|--------|
+ KC_LSFT ,KX_Z_MT ,KX_X_MT ,KX_C_MT ,KX_D_MT ,KC_V ,KC_RBRC ,
+//--------|--------|--------|--------|--------|--------|--------|
+ TD_LAYR ,KC_LGUI ,KC_HYPR ,KX_CTSF ,KC_LCTL ,
+//--------|--------|--------|--------|--------|--------|--------|
+ KC_HOME ,KC_END ,
+// |--------|--------|
+ KC_PGUP ,
+// |--------|--------|--------|
+ KX_BKNM ,KX_DCTL ,KC_PGDN ,
+// |--------|--------|--------|
+
+//--------|--------|--------|--------|--------|--------|-------|
+ TG_GAME ,KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_EQL ,
+//--------|--------|--------|--------|--------|--------|-------|
+ KC_DEL ,KC_J ,KC_L ,KC_U ,KC_Y ,KC_SCLN ,KC_BSLS,
+//--------|--------|--------|--------|--------|--------|-------|
+ KC_M ,KC_N ,KC_E_LT ,KC_I_LT ,KC_O ,KC_QUOT,
+//--------|--------|--------|--------|--------|--------|-------|
+ KC_LOCK ,KC_K ,KX_H_MT ,KX_COMT ,KX_DOMT ,KX_SLMT ,KC_RSFT,
+//--------|--------|--------|--------|--------|--------|-------|
+ KC_LALT ,KC_MINS ,KC_QUOT ,KC_EQL ,TT_NUM ,
+//--------|--------|--------|--------|--------|--------|-------|
+ KC_LEFT ,KC_RGHT ,
+//--------|--------|
+ KC_UP ,
+//--------|--------|--------|
+ KC_DOWN ,KX_NALT ,KX_SPAC
+//--------|--------|--------|
+
+),
+
+
+
+[L_QWERTY] = LAYOUT_ergodox(
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,KC_Q ,KC_W ,KC_E ,KC_R ,KC_T ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,KC_A ,KC_S ,KC_D ,KC_F ,KC_G ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,
+// |--------|--------|
+ _______ ,
+// |--------|--------|--------|
+ _______ ,_______ ,_______ ,
+// |--------|--------|--------|
+
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,KC_EQL ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ KC_H ,KC_J ,KC_K ,KC_L ,KC_SCLN ,KC_QUOT ,
+//--------|--------|--------|--------|--------|--------|--------|
+ KC_LOCK ,KC_N ,KC_M ,KC_COMM ,KC_DOT ,KC_SLSH ,KC_RSPC ,
+//--------|--------|--------|--------|--------|--------|--------|
+ KC_RALT ,KC_MINS ,KC_QUOT ,KC_EQL ,TT_NUM ,
+//--------|--------|--------|--------|--------|--------|--------|
+ KC_LEFT ,KC_RGHT ,
+//--------|--------|
+ KC_UP ,
+//--------|--------|--------|
+ KC_DOWN ,KX_NALT ,KX_SPAC
+//--------|--------|--------|
+),
+
+
+
+[L_NUM] = LAYOUT_ergodox(
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,KC_EXLM ,KC_AT ,KC_LCBR ,KC_RCBR ,KC_SLSH ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,KC_HASH ,KC_DLR ,KC_LPRN ,KC_RPRN ,KC_PIPE,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,KC_PERC ,KC_CIRC ,KC_LBRC ,KC_RBRC ,KC_BSLS ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,KC_AMPR ,KC_LABK ,KC_RABK,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,
+// |--------|--------|
+ _______ ,
+// |--------|--------|--------|
+ _______ ,_______ ,_______ ,
+// |--------|--------|--------|
+
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,KC_F6 ,KC_F7 ,KC_F8 ,KC_F9 ,KC_F10 ,KC_F11 ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,KC_COLN ,KC_P7 ,KC_P8 ,KC_P9 ,KC_PSLS ,KC_F12 ,
+//--------|--------|--------|--------|--------|--------|--------|
+ KC_HASH ,KC_P4 ,KC_P5 ,KC_P6 ,KC_PAST ,KC_BSPC ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,KC_BSPC ,KC_P1 ,KC_P2 ,KC_P3 ,KC_PMNS ,KC_TAB ,
+//--------|--------|--------|--------|--------|--------|--------|
+ KC_P0 ,KC_PDOT ,KC_PEQL ,KC_PPLS ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,
+//--------|--------|
+ _______ ,
+//--------|--------|--------|
+ _______ ,KC_PENT ,MO_FUNC
+//--------|--------|--------|
+),
+
+
+
+[L_EXTEND] = LAYOUT_ergodox(
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,KC_APP ,KX_CGR, KC_VOLU,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,KC_LGUI, KC_LSFT, KC_LALT, KC_LCTL, _______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,KX_SRCH, KX_PAST, KC_VOLD,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,
+// |--------|--------|--------|
+ _______ ,
+// |--------|--------|--------|
+ MO_FUNC, _______ ,_______ ,
+// |--------|--------|--------|
+
+//--------|--------|--------|--------|--------|--------|--------|
+ KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,KC_PGUP, KC_HOME, KC_UP, KC_END, KC_DEL, _______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC, KC_MENU,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,KX_STAB, KC_TAB, _______ ,KC_INS, KC_PSCR,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,KC_PSCR, _______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______
+//--------|--------|--------|--------|--------|--------|--------|
+),
+
+
+
+[L_FUNC] = LAYOUT_ergodox(
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,KC_F11 ,KC_F12 ,KC_F13 ,KC_F14 ,KC_F15 ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,M_LCLIK, M_RCLIK, M_MCLIK, _______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,KC_LGUI, KC_LSFT, KC_LALT, KC_LCTL, M_WHLUP,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,M_LEFT, M_DOWN, M_UP ,M_RIGHT, M_WHLDN, _______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,
+// |--------|--------|--------|
+ _______ ,
+// |--------|--------|--------|
+ _______ ,_______ ,_______ ,
+// |--------|--------|--------|
+
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,KC_F16 ,KC_F17 ,KC_F18 ,KC_F19 ,KC_F20 ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,KC_VOLU, KC_F9, KC_F10, KC_F11, KC_F12, _______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ KC_MUTE, KC_F5, KC_F6, KC_F7, KC_F8, _______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,KC_VOLD, KC_F1, KC_F2, KC_F3, KC_F4, _______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______
+//--------|--------|--------|--------|--------|--------|--------|
+),
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- // MACRODOWN only works in this function
- switch(id) {
- case 0:
- if (record->event.pressed) {
- register_code(KC_RSFT);
- } else {
- unregister_code(KC_RSFT);
- }
- break;
- }
- return MACRO_NONE;
-};
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
+
+[L_GAMING] = LAYOUT_ergodox(
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ KC_ESC ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,KC_R ,KC_S ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ KC_LSFT, _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,KC_LALT ,KC_LCTL ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,
+// |--------|--------|
+ _______ ,
+// |--------|--------|--------|
+ KC_SPC, KC_LSFT, _______ ,
+// |--------|--------|--------|
+
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,KC_E ,KC_I ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,_______ ,KC_UP, KC_SLSH,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,KC_LEFT, KC_DOWN, KC_RGHT,
+//--------|--------|--------|--------|--------|--------|--------|
+ M_MCLIK ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ M_RCLIK ,
+//--------|--------|--------|--------|--------|--------|--------|
+ M_LCLIK ,KC_ENT ,KC_BSPC
+//--------|--------|--------|--------|--------|--------|--------|
+)
+,
+
+// "Letter Layers"
+
+[L_LL_R] = LAYOUT_ergodox(
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,ooooooo ,KC_AMPR ,KC_PIPE ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,
+// |--------|--------|
+ _______ ,
+// |--------|--------|--------|
+ _______ ,_______ ,_______ ,
+// |--------|--------|--------|
+
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,KC_COLN ,KC_P7 ,KC_P8 ,KC_P9 ,KC_PSLS ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ KC_HASH ,KC_P4 ,KC_P5 ,KC_P6 ,KC_PAST ,KC_TAB ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,KC_BSPC ,KC_P1 ,KC_P2 ,KC_P3 ,KC_PMNS ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ KC_P0 ,KC_PDOT ,KC_PEQL ,KC_PPLS ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,
+//--------|--------|
+ _______ ,
+//--------|--------|--------|
+ _______ ,KC_PENT ,MO_FUNC
+//--------|--------|--------|
+)
+,
+
+[L_LL_E] = LAYOUT_ergodox(
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ RJ_QMKV ,RJ_MAKE ,RJ_EQ ,RJ_LEQ ,RJ_GEQ ,RJ_GEQR ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,RJ_SELS ,RJ_DUND ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,
+// |--------|--------|
+ _______ ,
+// |--------|--------|--------|
+ _______ ,_______ ,_______ ,
+// |--------|--------|--------|
+
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,ooooooo ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,
+//--------|--------|
+ _______ ,
+//--------|--------|--------|
+ _______ ,_______ ,_______
+//--------|--------|--------|
+)
+,
+
+[L_LL_I] = LAYOUT_ergodox(
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,KC_EXLM ,KC_AT ,KC_LCBR ,KC_RCBR ,KC_SLSH ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,KC_HASH ,KC_DLR ,KC_LPRN ,KC_RPRN ,KC_PIPE,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,KC_PERC ,KC_CIRC ,KC_LBRC ,KC_RBRC ,KC_BSLS ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,KC_AMPR ,KC_LABK ,KC_RABK,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,
+// |--------|--------|
+ _______ ,
+// |--------|--------|--------|
+ _______ ,_______ ,_______ ,
+// |--------|--------|--------|
+
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,KC_UNDS, KC_GRV ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,KC_MINS ,KC_QUOT ,ooooooo ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,KC_TILD, KC_DQT ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______ ,_______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,
+//--------|--------|--------|--------|--------|--------|--------|
+ _______ ,_______ ,_______
+//--------|--------|--------|--------|--------|--------|--------|
+)
+
};
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
+// The normal QMK functions ending in _user are overridden in the
+// replicaJunction userspace. Those functions handle my global
+// settings, and redirect to these _keymap functions if something
+// is unhandled. This allows me to keep most of my global preferences
+// in one place while still allowing keyboard-specific code.
+
+// The idea was shamelessly copied from the amazing Drashna.
+
+// Nothing to do here, so I've commented it out.
+// bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+// return true;
+// }
+
+// void matrix_init_keymap(void) {};
+
+void matrix_scan_keymap(void) {
uint8_t layer = biton32(layer_state);
// uint8_t default_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) {
- case _CO:
+ case L_COLEMAK:
ergodox_right_led_1_on();
+ ergodox_right_led_2_off();
+ ergodox_right_led_3_off();
break;
- case _QW:
+ case L_NUM:
+ ergodox_right_led_1_on();
ergodox_right_led_2_on();
+ ergodox_right_led_3_off();
break;
- case _NU:
+ case L_EXTEND:
+ ergodox_right_led_1_on();
+ ergodox_right_led_2_off();
ergodox_right_led_3_on();
break;
- case _GA:
+ case L_FUNC:
ergodox_right_led_1_on();
ergodox_right_led_2_on();
+ ergodox_right_led_3_on();
+ break;
+ case L_GAMING:
+ ergodox_right_led_1_off();
+ ergodox_right_led_2_on();
+ ergodox_right_led_3_on();
+ break;
default:
// none
break;
diff --git a/layouts/community/ergodox/replicaJunction/readme.md b/layouts/community/ergodox/replicaJunction/readme.md
index 8c4c03353..9a1c09550 100644
--- a/layouts/community/ergodox/replicaJunction/readme.md
+++ b/layouts/community/ergodox/replicaJunction/readme.md
@@ -1,5 +1,94 @@
# replicaJunction - Ergodox (EZ) Layout
-I designed this layout, along with my complimentary Atreus layout, to address the challenge of having an Ergodox as my primary home keyboard and an Atreus as my primary work board. I wanted a layout that provided symbols in comfortable locations on both keyboards - but didn't require me to learn two separate sets of symbols for the two keyboards.
+This keymap is designed to complement my Atreus keyboard layout, found in keyboards/atreus. The Atreus keyboard is a 40% board whose design was heavily influenced by the Ergodox. Since I use both keyboards, I've designed these layouts in an effort to make switching between the two as easy as possible.
-I had originally used several keys as dual-role keys, where a tap would send a keypress and a long press and hold would trigger a different layer. However, after several months of experimenting with those ideas, I've begun moving away from that design due to performance. It's very hard to strike a balance between the time it takes to press a key normally while typing and the "delay" in the typing motion needed to trigger the alternate layer. I was frequently getting strange characters and artifacts because I pressed the function key + the symbol key too quickly, and the layer never shifted. \ No newline at end of file
+I've also tried to make use of the extra keys on the Ergodox in as logical of a manner as possible, adding to the layers in the Atreus config without disturbing what's there already. This allows for things like F11-F20, the Application (Menu) key, and better media key placement.
+
+Because of this design philosophy, there are several cases where functionality is duplicated and keys are available in more than one place. I don't find that a bad thing.
+
+This layout makes heavy use of dual-role keys. Dual-role keys seemed to affect my typing speed for quite some time until I discovered the [`USE_PERMISSIVE_HOLD` flag](https://docs.qmk.fm/features/advanced-keycodes#permissive-hold). After applying this flag, I haven't had an issue with dual-role keys and typing quickly.
+
+The default letter layout in this keymap is [Colemak-ModDH](https://colemakmods.github.io/mod-dh/). I use the "matrix version" of that layout, which retains the M key on the home row as in normal Colemak.
+
+## Design Goals
+
+I designed this layout with the following goals in mind:
+
+* Atreus layout compatibility.
+* Nothing may interfere with ordinary typing.
+* Symbols need to be accessible quickly and organized in a manner I can remember.
+* Limit more difficult finger movements (and pinky usage in general).
+* Gaming should be easy.
+
+### Atreus layout compatibility
+
+Most of the functionality in this layout isn't strictly necessary - the Ergodox is a 76-key keyboard, and it's got plenty of room for extra keys and functionality compared to smaller boards like the Atreus. However, I've replicated a lot of 40% functionality on this layout in order to preserve my muscle memory.
+
+The biggest deviation is the Shift keys. My Atreus uses thumb keys for Shift, but the Ergodox doesn't have corresponding thumb keys in a comfortable enough location. I briefly tried using the outermost 1u keys in the bottom row as Shift keys, but they take a large enough thumb movement that it interfered with typing.
+
+### Nothing may interfere with ordinary typing
+
+For a long time, this meant that I couldn't use letters or home row keys as dual-role keys. I'm a fast typer, and I'm sometimes already typing the next letter before I've fully released the previous one. Normal keyboards don't care about this, but if I started adding dual-role functionality to letters, I found that I would sometimes type the next letter before releasing the layer toggle, and the letter I tried to send would still be sent under the layer I thought I'd left off.
+
+Fortunately, though, QMK has addressed this with the `PERMISSIVE_HOLD` flag. [Details are on the QMK docs page.](https://docs.qmk.fm/#/feature_advanced_keycodes?id=permissive-hold)
+
+Using that flag, I'm comfortable having layer shift keys on the home row, and this goes a long way to eliminate finger stress.
+
+### Sympols need to be accessible quickly
+
+Symbols are available under my left hand by holding the I key (on my right hand). I've grouped parenthesis, slashes, and braces together; the remaining symbols are ordered in the same way as they appear on USA keycap legends (for example, 1 is !, so that symbol is first in my lineup). Practically, I just had to get used to these other "misc" symbols.
+
+This also means that some symbols are accessible in more than one way. For example, the carats (greater than and less than) are available both in the "normal" location (Shift+Comma / Shift+Period) and on the symbol layer. I make regular changes to some of the symbols I don't use as commonly as I think of them.
+
+### Limit more difficult finger movements
+
+This is why I kept trying to put layer toggles on the home row keys instead of just placing them on random thumb keys. I suffer from RSI, and it's important for me to watch out for more "stressful" finger movements.
+
+The home row is the easiest row for your fingers to hit, followed by the upper row, and the lower row is noticeably more difficult to press. Because of this, I favored the upper row over the lower one any time I had the option to do so.
+
+### Gaming should be easy
+
+I've added a dedicated gaming layer accessible by pressing the upper-right key on the right hand (next to the 6 key). This layer disables most of the tap/hold functionality to allow keys to act normally. This layer also reverses Backspace and Space (so Space is available on the left thumb while the right hand is on the mouse).
+
+I've also added a lock key on the right hand's bottom 1.5u key and mouse keys on the right thumb cluster. This has been amazingly helpful for games that involve holding keys for extended times (for example, I can hold the left mouse button in Minecraft to continually mine).
+
+I strongly recommend using ESDF (QWERTY positions) for movement on the Ergodox rather than WASD. This makes the thumb keys much more accessible.
+
+Finally, I considered having the gaming layer revert to a QWERTY layout, but decided against it because it really threw me off when I needed to type in chat. I've accepted that I will need to rebind keys in most games as a reasonable compromise.
+
+## Features
+
+### ZXC Mods
+
+Keys on the bottom row of each half of this keyboard can be held to send modifier keys. I've tried to map this in a relatively logical manner:
+
+* Z / Slash: Ctrl
+* X / Period: GUI
+* C / Comma: Ctrl+Alt
+* D / H: Alt
+
+This is an example of maintaining compatibility with the Atreus layout. An Ergodox doesn't really need these keys, but I've grown accustomed to them on the Atreus, so they're copied here to preserve compatibility.
+
+### Layer Switching - Tap Dance
+
+The lower-left key on the left hand can be used to apply or remove layers based on a number of taps:
+
+* 1 tap sends Escape, and also disables any persistent layers.
+* 2 taps enables the Number pad layer.
+* 3 taps enables the QWERTY layer.
+* 5 or more taps resets the keyboard.
+
+## Extend Layer
+
+[Originally found on the Colemak forums](https://forum.colemak.com/topic/2014-extend-extra-extreme/), having a QMK-powered keyboard allows a super easy implementation of this concept. The idea is to place commonly-used keys under easy reach of your hands. Since I work with text often, my most common needs are things like Ctrl+Shift+arrow keys, and they're easy to access using this layer. (While technically it's four keypresses instead of just three, since it takes one key to enter the layer, that one key is a thumb button and the other three are all on the home row, so I find it much more comfortable than modifiers on a traditional keyboard.)
+
+Also featured in this layer is easy access to Tab, plus a Shift+Tab key. Alt-Tabbing back and forth, along with Ctrl-Tab, are super easy and friendly. When I need Ctrl+Alt+Delete, I typically use the ones found on this layer.
+
+## Credits
+
+* [Drashna](https://github.com/qmk/qmk_firmware/blob/master/users/drashna/readme.md)
+ * User / keymap function ideas
+* [Jeremy](https://github.com/qmk/qmk_firmware/blob/master/keyboards/atreus/keymaps/jeremy/readme.md)
+ * Sanity check on the Function keys (_of course they should be in rows of 4, not rows of 3 like a number pad. Why did I ever use anything else?_)
+* [DreymaR of the Colemak forums](https://forum.colemak.com/topic/2014-extend-extra-extreme/)
+ * Original idea of the Extend layer
diff --git a/layouts/community/ergodox/replicaJunction/rules.mk b/layouts/community/ergodox/replicaJunction/rules.mk
new file mode 100644
index 000000000..8a719766c
--- /dev/null
+++ b/layouts/community/ergodox/replicaJunction/rules.mk
@@ -0,0 +1,8 @@
+# https://docs.qmk.fm/getting_started_make_guide.html
+
+MOUSEKEY_ENABLE = yes
+TAP_DANCE_ENABLE = yes
+KEY_LOCK_ENABLE = yes
+RGBLIGHT_ENABLE = no
+# CONSOLE_ENABLE = no
+# COMMAND_ENABLE = no
diff --git a/layouts/community/ergodox/swedish-lindhe/keymap.c b/layouts/community/ergodox/swedish-lindhe/keymap.c
index e977ab994..a46408793 100644
--- a/layouts/community/ergodox/swedish-lindhe/keymap.c
+++ b/layouts/community/ergodox/swedish-lindhe/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, NO_AA,
KC_H, KC_J, KC_K, KC_L, NO_OSLH, NO_AE,
KC_DELT, KC_N, KC_M, KC_COMM, KC_DOT, NO_MINS, KC_RSFT,
- NO_ALGR, KC_DOWN, KC_UP, KC_LEFT, KC_RGHT,
+ KC_ALGR, KC_DOWN, KC_UP, KC_LEFT, KC_RGHT,
KC_HOME, KC_END,
KC_PGUP,
KC_PGDN, KC_TAB, LT(MDIA, KC_ENT)
diff --git a/layouts/community/ergodox/swedish/keymap.c b/layouts/community/ergodox/swedish/keymap.c
index d2b9b40d1..0cda8511f 100644
--- a/layouts/community/ergodox/swedish/keymap.c
+++ b/layouts/community/ergodox/swedish/keymap.c
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_H, KC_J, KC_K, KC_L, LT(MDIA, NO_OSLH), GUI_T(NO_AE),
MEH_T(KC_NO), KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(NO_MINS), KC_RSFT,
KC_UP, KC_DOWN, NO_CIRC, NO_ASTR, KC_FN1,
- NO_ALGR, CTL_T(KC_ESC),
+ KC_ALGR, CTL_T(KC_ESC),
KC_PGUP,
KC_PGDN,KC_TAB, KC_ENT
),
diff --git a/layouts/community/ergodox/techtomas/readme.md b/layouts/community/ergodox/techtomas/readme.md
index 36e0591a8..3d1bcb9e1 100644
--- a/layouts/community/ergodox/techtomas/readme.md
+++ b/layouts/community/ergodox/techtomas/readme.md
@@ -39,7 +39,7 @@ The right arrow key and End key toggle the control layer on the left board. Ther
On the left board you have mouse control with left & right click in the location of the G and B keys.
On the right board you have vim-style arrow keys using hjkl
-The left thumb cluster moves shift and alt within easy reach while holding the toggle (end). So far I've found this convient to navigate and skip around text when using the hjkl arrow keys. I found that it was easy to get the alt key stuck on depending on what key you released first so I added the PREVENT_STUCK_MODIFIERS to the config.h to help with that.
+The left thumb cluster moves shift and alt within easy reach while holding the toggle (end). So far I've found this convient to navigate and skip around text when using the hjkl arrow keys.
## Changelog