From b4f13229f734feb9545701528825f5584ff9ab96 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Fri, 4 Dec 2020 21:51:07 -0800 Subject: [PATCH 01/22] Initial commit --- default.png.md | 1 + default_highres.png.md | 1 + keymap.c | 208 +++++++++++++++++++++++++++++++++++++++++ readme.md | 15 +++ 4 files changed, 225 insertions(+) create mode 100644 default.png.md create mode 100644 default_highres.png.md create mode 100644 keymap.c create mode 100644 readme.md diff --git a/default.png.md b/default.png.md new file mode 100644 index 0000000..744e7d1 --- /dev/null +++ b/default.png.md @@ -0,0 +1 @@ +https://i.imgur.com/fKX0Zbs.png diff --git a/default_highres.png.md b/default_highres.png.md new file mode 100644 index 0000000..074e063 --- /dev/null +++ b/default_highres.png.md @@ -0,0 +1 @@ +https://i.imgur.com/giAc3M9.jpg diff --git a/keymap.c b/keymap.c new file mode 100644 index 0000000..9079e48 --- /dev/null +++ b/keymap.c @@ -0,0 +1,208 @@ +#include QMK_KEYBOARD_H +#include "version.h" + +enum layers { + BASE, // default layer + SYMB, // symbols + MDIA, // media keys +}; + +enum custom_keycodes { +#ifdef ORYX_CONFIGURATOR + VRSN = EZ_SAFE_RANGE, +#else + VRSN = SAFE_RANGE, +#endif + RGB_SLD +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Keymap 0: Basic layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | - | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | Del | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | \ | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | BkSp | A | S | D | F | G |------| |------| H | J | K | L |; / L2|' / Cmd | + * |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------| + * | LShift |Z/Ctrl| X | C | V | B | | | | N | M | , | . |//Ctrl| RShift | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * |Grv/L1| '" |AltShf| Left | Right| | Up | Down | [ | ] | ~L1 | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | App | LGui | | Alt |Ctrl/Esc| + * ,------|------|------| |------+--------+------. + * | | | Home | | PgUp | | | + * | Space|Backsp|------| |------| Tab |Enter | + * | |ace | End | | PgDn | | | + * `--------------------' `----------------------' + */ +[BASE] = LAYOUT_ergodox_pretty( + // left hand + KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT, KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + KC_DEL, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB), TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN), GUI_T(KC_QUOT), + KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO), MEH_T(KC_NO), KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLSH), KC_RSFT, + LT(SYMB,KC_GRV), KC_QUOT, LALT(KC_LSFT), KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, KC_LBRC, KC_RBRC, TT(SYMB), + ALT_T(KC_APP), KC_LGUI, KC_LALT, CTL_T(KC_ESC), + KC_HOME, KC_PGUP, + KC_SPC, KC_BSPC, KC_END, KC_PGDN, KC_TAB, KC_ENT +), +/* Keymap 1: Symbol Layer + * + * ,---------------------------------------------------. ,--------------------------------------------------. + * |Version | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 | + * |---------+------+------+------+------+------+------| |------+------+------+------+------+------+--------| + * | | ! | @ | { | } | | | | | | Up | 7 | 8 | 9 | * | F12 | + * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | | + * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | | + * `---------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | EPRM | | | | | | | . | 0 | = | | + * `-----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * |Animat| | |Toggle|Solid | + * ,------|------|------| |------+------+------. + * |Bright|Bright| | | |Hue- |Hue+ | + * |ness- |ness+ |------| |------| | | + * | | | | | | | | + * `--------------------' `--------------------' + */ +[SYMB] = LAYOUT_ergodox_pretty( + // left hand + VRSN, 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_LCBR, KC_RCBR, 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_LPRN, KC_RPRN, 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, + EEP_RST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT, KC_0, KC_EQL, KC_TRNS, + RGB_MOD, KC_TRNS, RGB_TOG, RGB_SLD, + KC_TRNS, KC_TRNS, + RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, RGB_HUD, RGB_HUI +), +/* Keymap 2: Media and mouse keys + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | | | MsUp | | | | | | | | | | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | |MsLeft|MsDown|MsRght| |------| |------| | | | | | Play | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | | | | | | | | | | | Prev | Next | | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | Lclk | Rclk | |VolUp |VolDn | Mute | | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | |Brwser| + * | | |------| |------| |Back | + * | | | | | | | | + * `--------------------' `--------------------' + */ +[MDIA] = LAYOUT_ergodox_pretty( + // 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_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_MPLY, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, + + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WBAK +), +}; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + if (record->event.pressed) { + switch (keycode) { + case VRSN: + SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); + return false; + #ifdef RGBLIGHT_ENABLE + case RGB_SLD: + rgblight_mode(1); + return false; + #endif + } + } + return true; +} + +// Runs just one time when the keyboard initializes. +void keyboard_post_init_user(void) { +#ifdef RGBLIGHT_COLOR_LAYER_0 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_0); +#endif +}; + +// Runs whenever there is a layer state change. +layer_state_t layer_state_set_user(layer_state_t state) { + ergodox_board_led_off(); + ergodox_right_led_1_off(); + ergodox_right_led_2_off(); + ergodox_right_led_3_off(); + + uint8_t layer = get_highest_layer(state); + switch (layer) { + case 0: + #ifdef RGBLIGHT_COLOR_LAYER_0 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_0); + #endif + break; + case 1: + ergodox_right_led_1_on(); + #ifdef RGBLIGHT_COLOR_LAYER_1 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_1); + #endif + break; + case 2: + ergodox_right_led_2_on(); + #ifdef RGBLIGHT_COLOR_LAYER_2 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_2); + #endif + break; + case 3: + ergodox_right_led_3_on(); + #ifdef RGBLIGHT_COLOR_LAYER_3 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_3); + #endif + break; + case 4: + ergodox_right_led_1_on(); + ergodox_right_led_2_on(); + #ifdef RGBLIGHT_COLOR_LAYER_4 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_4); + #endif + break; + case 5: + ergodox_right_led_1_on(); + ergodox_right_led_3_on(); + #ifdef RGBLIGHT_COLOR_LAYER_5 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_5); + #endif + break; + case 6: + ergodox_right_led_2_on(); + ergodox_right_led_3_on(); + #ifdef RGBLIGHT_COLOR_LAYER_6 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_6); + #endif + break; + case 7: + ergodox_right_led_1_on(); + ergodox_right_led_2_on(); + ergodox_right_led_3_on(); + #ifdef RGBLIGHT_COLOR_LAYER_7 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_7); + #endif + break; + default: + break; + } + + return state; +}; diff --git a/readme.md b/readme.md new file mode 100644 index 0000000..1150a4f --- /dev/null +++ b/readme.md @@ -0,0 +1,15 @@ +# ErgoDox EZ Default Configuration + +## Changelog + +* Dec 2016: + * Added LED keys + * Refreshed layout graphic, comes from http://configure.ergodox-ez.com now. +* Sep 22, 2016: + * Created a new key in layer 1 (bottom-corner key) that resets the EEPROM. +* Feb 2, 2016 (V1.1): + * Made the right-hand quote key double as Cmd/Win on hold. So you get ' when you tap it, " when you tap it with Shift, and Cmd or Win when you hold it. You can then use it as a modifier, or just press and hold it for a moment (and then let go) to send a single Cmd or Win keystroke (handy for opening the Start menu on Windows). + +This is what we ship with out of the factory. :) The image says it all: + +![Default](https://i.imgur.com/Be53jH7.png) \ No newline at end of file From a2c518e1d8ff497fafec1f65796ab5f2d4e66d45 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Fri, 4 Dec 2020 22:49:44 -0800 Subject: [PATCH 02/22] Update first layer to my usual keyboard layout --- keymap.c | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/keymap.c b/keymap.c index 9079e48..bc94215 100644 --- a/keymap.c +++ b/keymap.c @@ -2,9 +2,11 @@ #include "version.h" enum layers { - BASE, // default layer - SYMB, // symbols - MDIA, // media keys + BASE, // Default layer + SYMNUM, // Symbols and numbers + MOVEMENT, // Movement/Navigation keys + UPPER, /* Fake capslock */ + GAME, /* Flipped for games */ }; enum custom_keycodes { @@ -20,34 +22,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap 0: Basic layer * * ,--------------------------------------------------. ,--------------------------------------------------. - * | = | 1 | 2 | 3 | 4 | 5 | LEFT | | RIGHT| 6 | 7 | 8 | 9 | 0 | - | + * | ESC | 1 | 2 | 3 | 4 | 5 | L4 | | L3 | 6 | 7 | 8 | 9 | 0 | DEL | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | Del | Q | W | E | R | T | L1 | | L1 | Y | U | I | O | P | \ | + * | | Q | W | E | R | T | APP | | | Y | U | I | O | P | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | BkSp | A | S | D | F | G |------| |------| H | J | K | L |; / L2|' / Cmd | - * |--------+------+------+------+------+------| Hyper| | Meh |------+------+------+------+------+--------| - * | LShift |Z/Ctrl| X | C | V | B | | | | N | M | , | . |//Ctrl| RShift | + * | Meh | A | S | D | F | G |------| |------| H | J | K | L | ; | Meh | + * |--------+------+------+------+------+------| TAB | | Back |------+------+------+------+------+--------| + * | Hyper | Z | X | C | V | B | | | space| N | M | , | . | ' | Hyper | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * |Grv/L1| '" |AltShf| Left | Right| | Up | Down | [ | ] | ~L1 | + * | ~L1 | ~L2 | LAlt |LShift| LCtrl| | RCtrl|RShift| LAlt | ~L1 | ~L2 | * `----------------------------------' `----------------------------------' - * ,-------------. ,-------------. - * | App | LGui | | Alt |Ctrl/Esc| + * ,-------------. ,--------------. + * | Home | End | | Left | Right | * ,------|------|------| |------+--------+------. - * | | | Home | | PgUp | | | - * | Space|Backsp|------| |------| Tab |Enter | - * | |ace | End | | PgDn | | | + * | | | PgUp | | Up | | | + * | Space| LGui |------| |------| RGui |Enter | + * | | | PgDn | | Down | | | * `--------------------' `----------------------' */ [BASE] = LAYOUT_ergodox_pretty( // left hand - KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT, KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, - KC_DEL, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB), TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, - KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN), GUI_T(KC_QUOT), - KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO), MEH_T(KC_NO), KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLSH), KC_RSFT, - LT(SYMB,KC_GRV), KC_QUOT, LALT(KC_LSFT), KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, KC_LBRC, KC_RBRC, TT(SYMB), - ALT_T(KC_APP), KC_LGUI, KC_LALT, CTL_T(KC_ESC), - KC_HOME, KC_PGUP, - KC_SPC, KC_BSPC, KC_END, KC_PGDN, KC_TAB, KC_ENT + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, TG(GAME), TG(UPPER), KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, + KC_TRNS, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_APP, KC_TRNS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_TRNS, + KC_MEH, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_MEH, + ALL_T(KC_NO), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_TAB, KC_BSPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_QUOT, ALL_T(KC_NO), + MO(MOVEMENT), MO(SYMNUM), KC_LALT, KC_LSHIFT, KC_LCTRL, KC_RCTRL, KC_RSHIFT, KC_LALT, MO(SYMNUM), MO(MOVEMENT), + KC_HOME, KC_END, KC_LEFT, KC_RIGHT, + KC_PGUP, KC_UP, + KC_SPC, KC_LGUI, KC_PGDN, KC_DOWN, KC_RGUI, KC_ENT ), /* Keymap 1: Symbol Layer * @@ -70,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | * `--------------------' `--------------------' */ -[SYMB] = LAYOUT_ergodox_pretty( +[SYMNUM] = LAYOUT_ergodox_pretty( // left hand VRSN, 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_LCBR, KC_RCBR, KC_PIPE, KC_TRNS, KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, @@ -102,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | * `--------------------' `--------------------' */ -[MDIA] = LAYOUT_ergodox_pretty( +[MOVEMENT] = LAYOUT_ergodox_pretty( // 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_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, From fab002efcb37f32a249c2f81ff8b81b8b16d8093 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Sat, 5 Dec 2020 00:00:49 -0800 Subject: [PATCH 03/22] Update second layer to my usual keyboard layout --- keymap.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/keymap.c b/keymap.c index bc94215..f2f6ff4 100644 --- a/keymap.c +++ b/keymap.c @@ -51,37 +51,37 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_PGUP, KC_UP, KC_SPC, KC_LGUI, KC_PGDN, KC_DOWN, KC_RGUI, KC_ENT ), -/* Keymap 1: Symbol Layer +/* Keymap 1: Symbol and numbers layer * * ,---------------------------------------------------. ,--------------------------------------------------. - * |Version | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 | + * | F1 | F2 | F3 | F4 | F5 | F6 | | | | F7 | F8 | F9 | F10 | F11 | F12 | * |---------+------+------+------+------+------+------| |------+------+------+------+------+------+--------| - * | | ! | @ | { | } | | | | | | Up | 7 | 8 | 9 | * | F12 | + * | | - | = | { | } | | | | | | | & | * | ( | | | * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | # | $ | ( | ) | ` |------| |------| Down | 4 | 5 | 6 | + | | + * | | _ | ? | \ | / | ` |------| |------| , | $ | % | ^ | | | * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | % | ^ | [ | ] | ~ | | | | & | 1 | 2 | 3 | \ | | + * | | + | | [ | ] | ~ | | | | 6 | ! | @ | # | 8 | | * `---------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | EPRM | | | | | | | . | 0 | = | | + * | | | | | | | | . | ) | 5 | | * `-----------------------------------' `----------------------------------' * ,-------------. ,-------------. - * |Animat| | |Toggle|Solid | + * | | | | | | * ,------|------|------| |------+------+------. - * |Bright|Bright| | | |Hue- |Hue+ | - * |ness- |ness+ |------| |------| | | + * | | | | | | | | + * | | |------| |------| | | * | | | | | | | | * `--------------------' `--------------------' */ [SYMNUM] = LAYOUT_ergodox_pretty( // left hand - VRSN, 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_LCBR, KC_RCBR, 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_LPRN, KC_RPRN, 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, - EEP_RST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT, KC_0, KC_EQL, KC_TRNS, - RGB_MOD, KC_TRNS, RGB_TOG, RGB_SLD, - KC_TRNS, KC_TRNS, - RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, RGB_HUD, RGB_HUI + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_TRNS, KC_MINUS, KC_EQUAL, S(KC_LBRACKET), S(KC_RBRACKET), KC_PIPE, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_7), S(KC_8), S(KC_9), KC_TRNS, KC_TRNS, + KC_TRNS, S(KC_MINUS), S(KC_SLASH), KC_BSLASH, KC_SLASH, KC_GRV, KC_COMMA, S(KC_4), S(KC_5), S(KC_6), KC_TRNS, KC_TRNS, + KC_TRNS, S(KC_EQUAL), KC_TRNS, KC_LBRACKET, KC_RBRACKET, KC_TILD, KC_TRNS, KC_TRNS, KC_6, S(KC_1), S(KC_2), S(KC_3), KC_8, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT, S(KC_0), 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_TRNS, KC_TRNS ), /* Keymap 2: Media and mouse keys * From 2eabba33581009fa95b9bd3686c956fbac12c267 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Mon, 7 Dec 2020 23:10:13 -0800 Subject: [PATCH 04/22] =?UTF-8?q?Set=20up=203rd=20layer=20the=20way=20I?= =?UTF-8?q?=E2=80=99m=20used=20to?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- keymap.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/keymap.c b/keymap.c index f2f6ff4..d28294d 100644 --- a/keymap.c +++ b/keymap.c @@ -83,18 +83,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), -/* Keymap 2: Media and mouse keys +/* Keymap 2: Movement mouse keys * * ,--------------------------------------------------. ,--------------------------------------------------. * | | | | | | | | | | | | | | | | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | | | MsUp | | | | | | | | | | | | + * | | | Lclk | MsUp | Rclk | WhUp | | | | PgUp | Home | Up | End | | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | |MsLeft|MsDown|MsRght| |------| |------| | | | | | Play | + * | | |MsLeft|MsDown|MsRght| WhDn |------| |------| PgDn | Left | Down | Right| | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | | | | | | | | | | | Prev | Next | | | + * | | | | | | | | | | | | | | | | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | | | | Lclk | Rclk | |VolUp |VolDn | Mute | | | + * | | | | | | | | | | | | * `----------------------------------' `----------------------------------' * ,-------------. ,-------------. * | | | | | | @@ -106,15 +106,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [MOVEMENT] = LAYOUT_ergodox_pretty( // 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_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_MPLY, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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_BTN1, KC_MS_U, KC_MS_BTN_2, KC_MS_WH_UP, KC_TRNS, KC_TRNS, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_MS_WH_DOWN, KC_PGDOWN, KC_LEFT, KC_DOWN, 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_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WBAK + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WBAK ), }; From bb374a3593e83525806c155884e146a2af515de2 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Mon, 7 Dec 2020 23:43:13 -0800 Subject: [PATCH 05/22] Add my UPPER layer --- keymap.c | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/keymap.c b/keymap.c index d28294d..160a2e1 100644 --- a/keymap.c +++ b/keymap.c @@ -106,15 +106,47 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [MOVEMENT] = LAYOUT_ergodox_pretty( // 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_TRNS, - KC_TRNS, KC_TRNS, KC_MS_BTN1, KC_MS_U, KC_MS_BTN_2, KC_MS_WH_UP, KC_TRNS, KC_TRNS, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_MS_WH_DOWN, KC_PGDOWN, KC_LEFT, KC_DOWN, 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_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_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_BTN1, KC_MS_U, KC_MS_BTN2, KC_MS_WH_UP, KC_TRNS, KC_TRNS, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_MS_WH_DOWN, KC_PGDOWN, KC_LEFT, KC_DOWN, 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_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WBAK + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WBAK +), +/* Keymap 3: UPPER layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | L0 | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | Q | W | E | R | T | | | | Y | U | I | O | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | A | S | D | F | G |------| |------| H | J | K | L | ; | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | Z | X | C | V | B | | | | N | M | | | | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | | | | | | [ | | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,--------------. + * | | | | | | + * ,------|------|------| |------+--------+------. + * | | | | | | | | + * | | |------| |------| | | + * | | | | | | | | + * `--------------------' `----------------------' + */ +[UPPER] = LAYOUT_ergodox_pretty( + // left hand + TO(BASE), S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), KC_TRNS, KC_TRNS, S(KC_6), S(KC_7), S(KC_8), S(KC_9), S(KC_0), KC_TRNS, + KC_TRNS, S(KC_Q), S(KC_W), S(KC_E), S(KC_R), S(KC_T), KC_TRNS, KC_TRNS, S(KC_Y), S(KC_U), S(KC_I), S(KC_O), KC_TRNS, KC_TRNS, + KC_TRNS, S(KC_A), S(KC_S), S(KC_D), S(KC_F), S(KC_G), S(KC_H), S(KC_J), S(KC_K), S(KC_L), S(KC_SCLN), KC_TRNS, + KC_TRNS, S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), KC_TRNS, KC_TRNS, S(KC_N), S(KC_M), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), }; From 1b873646373d56f9b01388cc54e4636e00ca23fa Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Mon, 7 Dec 2020 23:57:42 -0800 Subject: [PATCH 06/22] Add my game layer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This layer is layed out so that when using a colemak keymap it turns into a mirrored QWERTY, with the WASD mirrored a second time. This is so that I don’t have to keep rebinding all of my keyboard keys when playing games and can use my left-handed mouse. --- keymap.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/keymap.c b/keymap.c index 160a2e1..a5ee374 100644 --- a/keymap.c +++ b/keymap.c @@ -148,6 +148,38 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), +/* Keymap 4: Game layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | | | | | | L4 | | | | | | | | | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | R | ; | L | I | O | | | | F | S | K | W | Q | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | P | U | N | Y | H |------| |------| T | E | A | D | G | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | ' | . | , | M | J | | | | B | V | C | X | Z | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | | | | | | | | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,--------------. + * | | | | | | + * ,------|------|------| |------+--------+------. + * | | | | | | | | + * | | |------| |------| | | + * | | | | | | | | + * `--------------------' `----------------------' + */ +[GAME] = LAYOUT_ergodox_pretty( + // left hand + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(GAME), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_R, KC_SCLN, KC_L, KC_I, KC_O, KC_TRNS, KC_TRNS, KC_F, KC_S, KC_K, KC_W, KC_Q, KC_TRNS, + KC_TRNS, KC_P, KC_U, KC_N, KC_Y, KC_H, KC_T, KC_E, KC_A, KC_D, KC_G, KC_TRNS, + KC_TRNS, KC_QUOT, KC_DOT, KC_COMMA, KC_M, KC_J, KC_TRNS, KC_TRNS, KC_B, KC_V, KC_C, KC_X, 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_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS +), }; bool process_record_user(uint16_t keycode, keyrecord_t *record) { From cac39771e2e952a9d775f92a8a2cc64e4d7f1d4b Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Mon, 7 Dec 2020 23:59:18 -0800 Subject: [PATCH 07/22] Fix indentation --- keymap.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/keymap.c b/keymap.c index a5ee374..bf08990 100644 --- a/keymap.c +++ b/keymap.c @@ -139,14 +139,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [UPPER] = LAYOUT_ergodox_pretty( // left hand - TO(BASE), S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), KC_TRNS, KC_TRNS, S(KC_6), S(KC_7), S(KC_8), S(KC_9), S(KC_0), KC_TRNS, - KC_TRNS, S(KC_Q), S(KC_W), S(KC_E), S(KC_R), S(KC_T), KC_TRNS, KC_TRNS, S(KC_Y), S(KC_U), S(KC_I), S(KC_O), KC_TRNS, KC_TRNS, - KC_TRNS, S(KC_A), S(KC_S), S(KC_D), S(KC_F), S(KC_G), S(KC_H), S(KC_J), S(KC_K), S(KC_L), S(KC_SCLN), KC_TRNS, - KC_TRNS, S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), KC_TRNS, KC_TRNS, S(KC_N), S(KC_M), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + TO(BASE), S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), KC_TRNS, KC_TRNS, S(KC_6), S(KC_7), S(KC_8), S(KC_9), S(KC_0), KC_TRNS, + KC_TRNS, S(KC_Q), S(KC_W), S(KC_E), S(KC_R), S(KC_T), KC_TRNS, KC_TRNS, S(KC_Y), S(KC_U), S(KC_I), S(KC_O), KC_TRNS, KC_TRNS, + KC_TRNS, S(KC_A), S(KC_S), S(KC_D), S(KC_F), S(KC_G), S(KC_H), S(KC_J), S(KC_K), S(KC_L), S(KC_SCLN), KC_TRNS, + KC_TRNS, S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), KC_TRNS, KC_TRNS, S(KC_N), S(KC_M), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + 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: Game layer * From c7c08394010cb12ca644551c023dce829a448e9c Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Thu, 25 Mar 2021 21:44:46 -0700 Subject: [PATCH 08/22] Reformat --- keymap.c | 440 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 221 insertions(+), 219 deletions(-) diff --git a/keymap.c b/keymap.c index bf08990..d4179ef 100644 --- a/keymap.c +++ b/keymap.c @@ -2,11 +2,11 @@ #include "version.h" enum layers { - BASE, // Default layer - SYMNUM, // Symbols and numbers - MOVEMENT, // Movement/Navigation keys - UPPER, /* Fake capslock */ - GAME, /* Flipped for games */ + BASE, // Default layer + SYMNUM, // Symbols and numbers + MOVEMENT, // Movement/Navigation keys + UPPER, /* Fake capslock */ + GAME, /* Flipped for games */ }; enum custom_keycodes { @@ -19,28 +19,29 @@ enum custom_keycodes { }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* Keymap 0: Basic layer - * - * ,--------------------------------------------------. ,--------------------------------------------------. - * | ESC | 1 | 2 | 3 | 4 | 5 | L4 | | L3 | 6 | 7 | 8 | 9 | 0 | DEL | - * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | Q | W | E | R | T | APP | | | Y | U | I | O | P | | - * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | Meh | A | S | D | F | G |------| |------| H | J | K | L | ; | Meh | - * |--------+------+------+------+------+------| TAB | | Back |------+------+------+------+------+--------| - * | Hyper | Z | X | C | V | B | | | space| N | M | , | . | ' | Hyper | - * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | ~L1 | ~L2 | LAlt |LShift| LCtrl| | RCtrl|RShift| LAlt | ~L1 | ~L2 | - * `----------------------------------' `----------------------------------' - * ,-------------. ,--------------. - * | Home | End | | Left | Right | - * ,------|------|------| |------+--------+------. - * | | | PgUp | | Up | | | - * | Space| LGui |------| |------| RGui |Enter | - * | | | PgDn | | Down | | | - * `--------------------' `----------------------' - */ -[BASE] = LAYOUT_ergodox_pretty( + // clang-format off + /* Keymap 0: Basic layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | ESC | 1 | 2 | 3 | 4 | 5 | L4 | | L3 | 6 | 7 | 8 | 9 | 0 | DEL | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | Q | W | E | R | T | APP | | | Y | U | I | O | P | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | Meh | A | S | D | F | G |------| |------| H | J | K | L | ; | Meh | + * |--------+------+------+------+------+------| TAB | | Back |------+------+------+------+------+--------| + * | Hyper | Z | X | C | V | B | | | space| N | M | , | . | ' | Hyper | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | ~L1 | ~L2 | LAlt |LShift| LCtrl| | RCtrl|RShift| LAlt | ~L1 | ~L2 | + * `----------------------------------' `----------------------------------' + * ,-------------. ,--------------. + * | Home | End | | Left | Right | + * ,------|------|------| |------+--------+------. + * | | | PgUp | | Up | | | + * | Space| LGui |------| |------| RGui |Enter | + * | | | PgDn | | Down | | | + * `--------------------' `----------------------' + */ + [BASE] = LAYOUT_ergodox_pretty( // left hand KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, TG(GAME), TG(UPPER), KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_TRNS, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_APP, KC_TRNS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_TRNS, @@ -50,149 +51,150 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_HOME, KC_END, KC_LEFT, KC_RIGHT, KC_PGUP, KC_UP, KC_SPC, KC_LGUI, KC_PGDN, KC_DOWN, KC_RGUI, KC_ENT -), -/* Keymap 1: Symbol and numbers layer - * - * ,---------------------------------------------------. ,--------------------------------------------------. - * | F1 | F2 | F3 | F4 | F5 | F6 | | | | F7 | F8 | F9 | F10 | F11 | F12 | - * |---------+------+------+------+------+------+------| |------+------+------+------+------+------+--------| - * | | - | = | { | } | | | | | | | & | * | ( | | | - * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | _ | ? | \ | / | ` |------| |------| , | $ | % | ^ | | | - * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | + | | [ | ] | ~ | | | | 6 | ! | @ | # | 8 | | - * `---------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | | | | | | | | . | ) | 5 | | - * `-----------------------------------' `----------------------------------' - * ,-------------. ,-------------. - * | | | | | | - * ,------|------|------| |------+------+------. - * | | | | | | | | - * | | |------| |------| | | - * | | | | | | | | - * `--------------------' `--------------------' - */ -[SYMNUM] = LAYOUT_ergodox_pretty( - // left hand - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - KC_TRNS, KC_MINUS, KC_EQUAL, S(KC_LBRACKET), S(KC_RBRACKET), KC_PIPE, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_7), S(KC_8), S(KC_9), KC_TRNS, KC_TRNS, - KC_TRNS, S(KC_MINUS), S(KC_SLASH), KC_BSLASH, KC_SLASH, KC_GRV, KC_COMMA, S(KC_4), S(KC_5), S(KC_6), KC_TRNS, KC_TRNS, - KC_TRNS, S(KC_EQUAL), KC_TRNS, KC_LBRACKET, KC_RBRACKET, KC_TILD, KC_TRNS, KC_TRNS, KC_6, S(KC_1), S(KC_2), S(KC_3), KC_8, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT, S(KC_0), 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_TRNS, KC_TRNS -), -/* Keymap 2: Movement mouse keys - * - * ,--------------------------------------------------. ,--------------------------------------------------. - * | | | | | | | | | | | | | | | | - * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | | Lclk | MsUp | Rclk | WhUp | | | | PgUp | Home | Up | End | | | - * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | |MsLeft|MsDown|MsRght| WhDn |------| |------| PgDn | Left | Down | Right| | | - * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | | | | | | | | | | | | | | | - * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | | | | | | | | | | | | - * `----------------------------------' `----------------------------------' - * ,-------------. ,-------------. - * | | | | | | - * ,------|------|------| |------+------+------. - * | | | | | | |Brwser| - * | | |------| |------| |Back | - * | | | | | | | | - * `--------------------' `--------------------' - */ -[MOVEMENT] = LAYOUT_ergodox_pretty( - // 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_TRNS, - KC_TRNS, KC_TRNS, KC_MS_BTN1, KC_MS_U, KC_MS_BTN2, KC_MS_WH_UP, KC_TRNS, KC_TRNS, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_MS_WH_DOWN, KC_PGDOWN, KC_LEFT, KC_DOWN, 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_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + ), + /* Keymap 1: Symbol and numbers layer + * + * ,---------------------------------------------------. ,--------------------------------------------------. + * | F1 | F2 | F3 | F4 | F5 | F6 | | | | F7 | F8 | F9 | F10 | F11 | F12 | + * |---------+------+------+------+------+------+------| |------+------+------+------+------+------+--------| + * | | - | = | { | } | | | | | | | & | * | ( | | | + * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | _ | ? | \ | / | ` |------| |------| , | $ | % | ^ | | | + * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | + | | [ | ] | ~ | | | | 6 | ! | @ | # | 8 | | + * `---------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | | | | | . | ) | 5 | | + * `-----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | | | + * | | |------| |------| | | + * | | | | | | | | + * `--------------------' `--------------------' + */ + [SYMNUM] = LAYOUT_ergodox_pretty( + // left hand + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_TRNS, KC_MINUS, KC_EQUAL, S(KC_LBRACKET), S(KC_RBRACKET), KC_PIPE, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_7), S(KC_8), S(KC_9), KC_TRNS, KC_TRNS, + KC_TRNS, S(KC_MINUS), S(KC_SLASH), KC_BSLASH, KC_SLASH, KC_GRV, KC_COMMA, S(KC_4), S(KC_5), S(KC_6), KC_TRNS, KC_TRNS, + KC_TRNS, S(KC_EQUAL), KC_TRNS, KC_LBRACKET, KC_RBRACKET, KC_TILD, KC_TRNS, KC_TRNS, KC_6, S(KC_1), S(KC_2), S(KC_3), KC_8, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT, S(KC_0), 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_TRNS, KC_TRNS + ), + /* Keymap 2: Movement mouse keys + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | | Lclk | MsUp | Rclk | WhUp | | | | PgUp | Home | Up | End | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | |MsLeft|MsDown|MsRght| WhDn |------| |------| PgDn | Left | Down | Right| | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | | | | | | | | | | | | | | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | | | | | | | | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | |Brwser| + * | | |------| |------| |Back | + * | | | | | | | | + * `--------------------' `--------------------' + */ + [MOVEMENT] = LAYOUT_ergodox_pretty( + // 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_TRNS, + KC_TRNS, KC_TRNS, KC_MS_BTN1, KC_MS_U, KC_MS_BTN2, KC_MS_WH_UP, KC_TRNS, KC_TRNS, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_MS_WH_DOWN, KC_PGDOWN, KC_LEFT, KC_DOWN, 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_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WBAK -), -/* Keymap 3: UPPER layer - * - * ,--------------------------------------------------. ,--------------------------------------------------. - * | L0 | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | | - * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | Q | W | E | R | T | | | | Y | U | I | O | | | - * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | A | S | D | F | G |------| |------| H | J | K | L | ; | | - * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | Z | X | C | V | B | | | | N | M | | | | | - * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | | | | | | | | | [ | | | - * `----------------------------------' `----------------------------------' - * ,-------------. ,--------------. - * | | | | | | - * ,------|------|------| |------+--------+------. - * | | | | | | | | - * | | |------| |------| | | - * | | | | | | | | - * `--------------------' `----------------------' - */ -[UPPER] = LAYOUT_ergodox_pretty( - // left hand - TO(BASE), S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), KC_TRNS, KC_TRNS, S(KC_6), S(KC_7), S(KC_8), S(KC_9), S(KC_0), KC_TRNS, - KC_TRNS, S(KC_Q), S(KC_W), S(KC_E), S(KC_R), S(KC_T), KC_TRNS, KC_TRNS, S(KC_Y), S(KC_U), S(KC_I), S(KC_O), KC_TRNS, KC_TRNS, - KC_TRNS, S(KC_A), S(KC_S), S(KC_D), S(KC_F), S(KC_G), S(KC_H), S(KC_J), S(KC_K), S(KC_L), S(KC_SCLN), KC_TRNS, - KC_TRNS, S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), KC_TRNS, KC_TRNS, S(KC_N), S(KC_M), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - 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: Game layer - * - * ,--------------------------------------------------. ,--------------------------------------------------. - * | | | | | | | L4 | | | | | | | | | - * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | R | ; | L | I | O | | | | F | S | K | W | Q | | - * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | P | U | N | Y | H |------| |------| T | E | A | D | G | | - * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | ' | . | , | M | J | | | | B | V | C | X | Z | | - * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | | | | | | | | | | | | - * `----------------------------------' `----------------------------------' - * ,-------------. ,--------------. - * | | | | | | - * ,------|------|------| |------+--------+------. - * | | | | | | | | - * | | |------| |------| | | - * | | | | | | | | - * `--------------------' `----------------------' - */ -[GAME] = LAYOUT_ergodox_pretty( - // left hand - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(GAME), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_R, KC_SCLN, KC_L, KC_I, KC_O, KC_TRNS, KC_TRNS, KC_F, KC_S, KC_K, KC_W, KC_Q, KC_TRNS, - KC_TRNS, KC_P, KC_U, KC_N, KC_Y, KC_H, KC_T, KC_E, KC_A, KC_D, KC_G, KC_TRNS, - KC_TRNS, KC_QUOT, KC_DOT, KC_COMMA, KC_M, KC_J, KC_TRNS, KC_TRNS, KC_B, KC_V, KC_C, KC_X, 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_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS -), + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WBAK + ), + /* Keymap 3: UPPER layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | L0 | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | Q | W | E | R | T | | | | Y | U | I | O | | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | A | S | D | F | G |------| |------| H | J | K | L | ; | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | Z | X | C | V | B | | | | N | M | | | | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | | | | | | [ | | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,--------------. + * | | | | | | + * ,------|------|------| |------+--------+------. + * | | | | | | | | + * | | |------| |------| | | + * | | | | | | | | + * `--------------------' `----------------------' + */ + [UPPER] = LAYOUT_ergodox_pretty( + // left hand + TO(BASE), S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), KC_TRNS, KC_TRNS, S(KC_6), S(KC_7), S(KC_8), S(KC_9), S(KC_0), KC_TRNS, + KC_TRNS, S(KC_Q), S(KC_W), S(KC_E), S(KC_R), S(KC_T), KC_TRNS, KC_TRNS, S(KC_Y), S(KC_U), S(KC_I), S(KC_O), KC_TRNS, KC_TRNS, + KC_TRNS, S(KC_A), S(KC_S), S(KC_D), S(KC_F), S(KC_G), S(KC_H), S(KC_J), S(KC_K), S(KC_L), S(KC_SCLN), KC_TRNS, + KC_TRNS, S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), KC_TRNS, KC_TRNS, S(KC_N), S(KC_M), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + 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: Game layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | | | | | | L4 | | | | | | | | | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | R | ; | L | I | O | | | | F | S | K | W | Q | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | P | U | N | Y | H |------| |------| T | E | A | D | G | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | ' | . | , | M | J | | | | B | V | C | X | Z | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | | | | | | | | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,--------------. + * | | | | | | + * ,------|------|------| |------+--------+------. + * | | | | | | | | + * | | |------| |------| | | + * | | | | | | | | + * `--------------------' `----------------------' + */ + [GAME] = LAYOUT_ergodox_pretty( + // left hand + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(GAME), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_R, KC_SCLN, KC_L, KC_I, KC_O, KC_TRNS, KC_TRNS, KC_F, KC_S, KC_K, KC_W, KC_Q, KC_TRNS, + KC_TRNS, KC_P, KC_U, KC_N, KC_Y, KC_H, KC_T, KC_E, KC_A, KC_D, KC_G, KC_TRNS, + KC_TRNS, KC_QUOT, KC_DOT, KC_COMMA, KC_M, KC_J, KC_TRNS, KC_TRNS, KC_B, KC_V, KC_C, KC_X, 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_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + // clang-format on }; bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { switch (keycode) { - case VRSN: - SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); - return false; - #ifdef RGBLIGHT_ENABLE - case RGB_SLD: - rgblight_mode(1); - return false; - #endif + case VRSN: + SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); + return false; +#ifdef RGBLIGHT_ENABLE + case RGB_SLD: + rgblight_mode(1); + return false; +#endif } } return true; @@ -214,61 +216,61 @@ layer_state_t layer_state_set_user(layer_state_t state) { uint8_t layer = get_highest_layer(state); switch (layer) { - case 0: - #ifdef RGBLIGHT_COLOR_LAYER_0 - rgblight_setrgb(RGBLIGHT_COLOR_LAYER_0); - #endif - break; - case 1: - ergodox_right_led_1_on(); - #ifdef RGBLIGHT_COLOR_LAYER_1 - rgblight_setrgb(RGBLIGHT_COLOR_LAYER_1); - #endif - break; - case 2: - ergodox_right_led_2_on(); - #ifdef RGBLIGHT_COLOR_LAYER_2 - rgblight_setrgb(RGBLIGHT_COLOR_LAYER_2); - #endif - break; - case 3: - ergodox_right_led_3_on(); - #ifdef RGBLIGHT_COLOR_LAYER_3 - rgblight_setrgb(RGBLIGHT_COLOR_LAYER_3); - #endif - break; - case 4: - ergodox_right_led_1_on(); - ergodox_right_led_2_on(); - #ifdef RGBLIGHT_COLOR_LAYER_4 - rgblight_setrgb(RGBLIGHT_COLOR_LAYER_4); - #endif - break; - case 5: - ergodox_right_led_1_on(); - ergodox_right_led_3_on(); - #ifdef RGBLIGHT_COLOR_LAYER_5 - rgblight_setrgb(RGBLIGHT_COLOR_LAYER_5); - #endif - break; - case 6: - ergodox_right_led_2_on(); - ergodox_right_led_3_on(); - #ifdef RGBLIGHT_COLOR_LAYER_6 - rgblight_setrgb(RGBLIGHT_COLOR_LAYER_6); - #endif - break; - case 7: - ergodox_right_led_1_on(); - ergodox_right_led_2_on(); - ergodox_right_led_3_on(); - #ifdef RGBLIGHT_COLOR_LAYER_7 - rgblight_setrgb(RGBLIGHT_COLOR_LAYER_7); - #endif - break; - default: - break; - } + case 0: +#ifdef RGBLIGHT_COLOR_LAYER_0 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_0); +#endif + break; + case 1: + ergodox_right_led_1_on(); +#ifdef RGBLIGHT_COLOR_LAYER_1 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_1); +#endif + break; + case 2: + ergodox_right_led_2_on(); +#ifdef RGBLIGHT_COLOR_LAYER_2 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_2); +#endif + break; + case 3: + ergodox_right_led_3_on(); +#ifdef RGBLIGHT_COLOR_LAYER_3 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_3); +#endif + break; + case 4: + ergodox_right_led_1_on(); + ergodox_right_led_2_on(); +#ifdef RGBLIGHT_COLOR_LAYER_4 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_4); +#endif + break; + case 5: + ergodox_right_led_1_on(); + ergodox_right_led_3_on(); +#ifdef RGBLIGHT_COLOR_LAYER_5 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_5); +#endif + break; + case 6: + ergodox_right_led_2_on(); + ergodox_right_led_3_on(); +#ifdef RGBLIGHT_COLOR_LAYER_6 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_6); +#endif + break; + case 7: + ergodox_right_led_1_on(); + ergodox_right_led_2_on(); + ergodox_right_led_3_on(); +#ifdef RGBLIGHT_COLOR_LAYER_7 + rgblight_setrgb(RGBLIGHT_COLOR_LAYER_7); +#endif + break; + default: + break; + } return state; }; From e5ffccee42cceb3d3a0368206e07ccaab8c0981c Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Thu, 25 Mar 2021 21:44:52 -0700 Subject: [PATCH 09/22] Add clang-format settings --- .clang-format | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .clang-format diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..0d6d3bd --- /dev/null +++ b/.clang-format @@ -0,0 +1,3 @@ +--- +BasedOnStyle: LLVM +IndentWidth: 2 From 0dfac53b6e295cbba7d0a02fd4634b073208f964 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Thu, 25 Mar 2021 22:28:37 -0700 Subject: [PATCH 10/22] Update keyboard layout --- keymap.c | 84 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/keymap.c b/keymap.c index d4179ef..7d102d6 100644 --- a/keymap.c +++ b/keymap.c @@ -23,13 +23,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap 0: Basic layer * * ,--------------------------------------------------. ,--------------------------------------------------. - * | ESC | 1 | 2 | 3 | 4 | 5 | L4 | | L3 | 6 | 7 | 8 | 9 | 0 | DEL | + * | ESC | [ | { | } | ( | = | L4 | | L3 | * | ) | + | ] | ! | DEL | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | Q | W | E | R | T | APP | | | Y | U | I | O | P | | + * | | Q | W | F | P | G | APP | | | J | L | U | Y | ; | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | Meh | A | S | D | F | G |------| |------| H | J | K | L | ; | Meh | + * | Meh | A | R | S | T | D |------| |------| H | N | E | I | O | Meh | * |--------+------+------+------+------+------| TAB | | Back |------+------+------+------+------+--------| - * | Hyper | Z | X | C | V | B | | | space| N | M | , | . | ' | Hyper | + * | Hyper | Z | X | C | V | B | | | space| K | M | , | . | ' | Hyper | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' * | ~L1 | ~L2 | LAlt |LShift| LCtrl| | RCtrl|RShift| LAlt | ~L1 | ~L2 | * `----------------------------------' `----------------------------------' @@ -42,28 +42,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `--------------------' `----------------------' */ [BASE] = LAYOUT_ergodox_pretty( - // left hand - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, TG(GAME), TG(UPPER), KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, - KC_TRNS, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_APP, KC_TRNS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_TRNS, - KC_MEH, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_MEH, - ALL_T(KC_NO), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_TAB, KC_BSPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_QUOT, ALL_T(KC_NO), - MO(MOVEMENT), MO(SYMNUM), KC_LALT, KC_LSHIFT, KC_LCTRL, KC_RCTRL, KC_RSHIFT, KC_LALT, MO(SYMNUM), MO(MOVEMENT), - KC_HOME, KC_END, KC_LEFT, KC_RIGHT, - KC_PGUP, KC_UP, - KC_SPC, KC_LGUI, KC_PGDN, KC_DOWN, KC_RGUI, KC_ENT + // left hand right hand + KC_ESC, KC_LBRACKET, S(KC_LBRACKET), S(KC_RBRACKET), S(KC_9), KC_EQUAL, TG(GAME), TG(UPPER), S(KC_8), S(KC_0), S(KC_EQUAL), KC_RBRACKET, S(KC_1), KC_DEL, + KC_TRNS, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_APP, KC_TRNS, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_TRNS, + KC_MEH, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_MEH, + ALL_T(KC_NO), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_TAB, KC_BSPC, KC_K, KC_M, KC_COMM, KC_DOT, KC_QUOT, ALL_T(KC_NO), + MO(MOVEMENT), MO(SYMNUM), KC_LALT, KC_LSHIFT, KC_LCTRL, KC_RCTRL, KC_RSHIFT, KC_LALT, MO(SYMNUM), MO(MOVEMENT), + KC_HOME, KC_END, KC_LEFT, KC_RIGHT, + KC_PGUP, KC_UP, + KC_SPC, KC_LGUI, KC_PGDN, KC_DOWN, KC_RGUI, KC_ENT ), /* Keymap 1: Symbol and numbers layer * * ,---------------------------------------------------. ,--------------------------------------------------. * | F1 | F2 | F3 | F4 | F5 | F6 | | | | F7 | F8 | F9 | F10 | F11 | F12 | * |---------+------+------+------+------+------+------| |------+------+------+------+------+------+--------| - * | | - | = | { | } | | | | | | | & | * | ( | | | + * | | # | @ | | | & | ^ | | | | | 7 | 8 | 9 | * | | * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | _ | ? | \ | / | ` |------| |------| , | $ | % | ^ | | | + * | | ` | ? | $ | - | |------| |------| , | 4 | 5 | 6 | + | | * |---------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | + | | [ | ] | ~ | | | | 6 | ! | @ | # | 8 | | + * | | ~ | \ | / | _ | % | | | | & | 1 | 2 | 3 | \ | | * `---------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | | | | | | | | . | ) | 5 | | + * | | | | | | | | . | 0 | = | | * `-----------------------------------' `----------------------------------' * ,-------------. ,-------------. * | | | | | | @@ -75,14 +75,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [SYMNUM] = LAYOUT_ergodox_pretty( // left hand - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - KC_TRNS, KC_MINUS, KC_EQUAL, S(KC_LBRACKET), S(KC_RBRACKET), KC_PIPE, KC_TRNS, KC_TRNS, KC_TRNS, S(KC_7), S(KC_8), S(KC_9), KC_TRNS, KC_TRNS, - KC_TRNS, S(KC_MINUS), S(KC_SLASH), KC_BSLASH, KC_SLASH, KC_GRV, KC_COMMA, S(KC_4), S(KC_5), S(KC_6), KC_TRNS, KC_TRNS, - KC_TRNS, S(KC_EQUAL), KC_TRNS, KC_LBRACKET, KC_RBRACKET, KC_TILD, KC_TRNS, KC_TRNS, KC_6, S(KC_1), S(KC_2), S(KC_3), KC_8, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT, S(KC_0), 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_TRNS, KC_TRNS + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_TRNS, S(KC_3), S(KC_2), KC_PIPE, S(KC_7), S(KC_6), KC_TRNS, KC_TRNS, KC_TRNS, KC_7, KC_8, KC_9, S(KC_8), KC_TRNS, + KC_TRNS, S(KC_TILD), S(KC_SLASH), S(KC_4), KC_MINUS, KC_TRNS, KC_COMMA, KC_4, KC_5, KC_6, S(KC_EQUAL), KC_TRNS, + KC_TRNS, KC_TILD, KC_BSLASH, KC_SLASH, S(KC_MINUS), S(KC_5), KC_TRNS, KC_TRNS, S(KC_7), KC_1, KC_2, KC_3, KC_BSLASH, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT, S(KC_0), 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_TRNS, KC_TRNS ), /* Keymap 2: Movement mouse keys * @@ -120,15 +120,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap 3: UPPER layer * * ,--------------------------------------------------. ,--------------------------------------------------. - * | L0 | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | | + * | | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | Q | W | E | R | T | | | | Y | U | I | O | | | + * | | Q | W | F | P | G | | | | J | L | U | Y | | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | A | S | D | F | G |------| |------| H | J | K | L | ; | | + * | | A | R | S | T | D |------| |------| H | N | E | I | O | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | Z | X | C | V | B | | | | N | M | | | | | + * | | Z | X | C | V | B | | | | K | M | | | | | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | | | | | | | | | [ | | | + * | | | | | | | | | | | | * `----------------------------------' `----------------------------------' * ,-------------. ,--------------. * | | | | | | @@ -140,11 +140,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [UPPER] = LAYOUT_ergodox_pretty( // left hand - TO(BASE), S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), KC_TRNS, KC_TRNS, S(KC_6), S(KC_7), S(KC_8), S(KC_9), S(KC_0), KC_TRNS, - KC_TRNS, S(KC_Q), S(KC_W), S(KC_E), S(KC_R), S(KC_T), KC_TRNS, KC_TRNS, S(KC_Y), S(KC_U), S(KC_I), S(KC_O), KC_TRNS, KC_TRNS, - KC_TRNS, S(KC_A), S(KC_S), S(KC_D), S(KC_F), S(KC_G), S(KC_H), S(KC_J), S(KC_K), S(KC_L), S(KC_SCLN), KC_TRNS, - KC_TRNS, S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), KC_TRNS, KC_TRNS, S(KC_N), S(KC_M), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, + KC_TRNS, S(KC_Q), S(KC_W), S(KC_F), S(KC_P), S(KC_G), KC_TRNS, KC_TRNS, S(KC_J), S(KC_L), S(KC_U), S(KC_Y), KC_TRNS, KC_TRNS, + KC_TRNS, S(KC_A), S(KC_R), S(KC_S), S(KC_T), S(KC_D), S(KC_H), S(KC_N), S(KC_E), S(KC_I), S(KC_O), KC_TRNS, + KC_TRNS, S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), KC_TRNS, KC_TRNS, S(KC_K), S(KC_M), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS @@ -152,13 +152,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap 4: Game layer * * ,--------------------------------------------------. ,--------------------------------------------------. - * | | | | | | | L4 | | | | | | | | | + * | | | | | | | | | | | | | | | | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | R | ; | L | I | O | | | | F | S | K | W | Q | | + * | | P | O | I | U | Y | | | | T | R | E | W | Q | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | P | U | N | Y | H |------| |------| T | E | A | D | G | | + * | | H | J | K | L | ; |------| |------| G | F | A | S | D | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | ' | . | , | M | J | | | | B | V | C | X | Z | | + * | | N | M | , | . | ' | | | | B | V | C | X | Z | | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' * | | | | | | | | | | | | * `----------------------------------' `----------------------------------' @@ -173,9 +173,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [GAME] = LAYOUT_ergodox_pretty( // left hand KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(GAME), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_R, KC_SCLN, KC_L, KC_I, KC_O, KC_TRNS, KC_TRNS, KC_F, KC_S, KC_K, KC_W, KC_Q, KC_TRNS, - KC_TRNS, KC_P, KC_U, KC_N, KC_Y, KC_H, KC_T, KC_E, KC_A, KC_D, KC_G, KC_TRNS, - KC_TRNS, KC_QUOT, KC_DOT, KC_COMMA, KC_M, KC_J, KC_TRNS, KC_TRNS, KC_B, KC_V, KC_C, KC_X, KC_Z, KC_TRNS, + KC_TRNS, KC_P, KC_O, KC_I, KC_U, KC_Y, KC_TRNS, KC_TRNS, KC_T, KC_R, KC_E, KC_W, KC_Q, KC_TRNS, + KC_TRNS, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_G, KC_F, KC_A, KC_S, KC_D, KC_TRNS, + KC_TRNS, KC_N, KC_M, KC_COMMA, KC_DOT, KC_QUOT, KC_TRNS, KC_TRNS, KC_B, KC_V, KC_C, KC_X, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, From 0c47fb57e265f15953d3ed365448f1ec2cebae85 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Thu, 25 Mar 2021 22:44:37 -0700 Subject: [PATCH 11/22] Fix 0 and . for symbols layer --- keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keymap.c b/keymap.c index 7d102d6..8b7480e 100644 --- a/keymap.c +++ b/keymap.c @@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, S(KC_3), S(KC_2), KC_PIPE, S(KC_7), S(KC_6), KC_TRNS, KC_TRNS, KC_TRNS, KC_7, KC_8, KC_9, S(KC_8), KC_TRNS, KC_TRNS, S(KC_TILD), S(KC_SLASH), S(KC_4), KC_MINUS, KC_TRNS, KC_COMMA, KC_4, KC_5, KC_6, S(KC_EQUAL), KC_TRNS, KC_TRNS, KC_TILD, KC_BSLASH, KC_SLASH, S(KC_MINUS), S(KC_5), KC_TRNS, KC_TRNS, S(KC_7), KC_1, KC_2, KC_3, KC_BSLASH, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT, S(KC_0), KC_5, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT, KC_0, KC_EQUAL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS From 10bc8ec914d08d649d2d1898efd841a652b50cc4 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Fri, 26 Mar 2021 00:04:53 -0700 Subject: [PATCH 12/22] Fix the accent grave character on the symbols layout --- keymap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keymap.c b/keymap.c index 8b7480e..c1c6efb 100644 --- a/keymap.c +++ b/keymap.c @@ -75,11 +75,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [SYMNUM] = LAYOUT_ergodox_pretty( // left hand - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - KC_TRNS, S(KC_3), S(KC_2), KC_PIPE, S(KC_7), S(KC_6), KC_TRNS, KC_TRNS, KC_TRNS, KC_7, KC_8, KC_9, S(KC_8), KC_TRNS, - KC_TRNS, S(KC_TILD), S(KC_SLASH), S(KC_4), KC_MINUS, KC_TRNS, KC_COMMA, KC_4, KC_5, KC_6, S(KC_EQUAL), KC_TRNS, - KC_TRNS, KC_TILD, KC_BSLASH, KC_SLASH, S(KC_MINUS), S(KC_5), KC_TRNS, KC_TRNS, S(KC_7), KC_1, KC_2, KC_3, KC_BSLASH, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT, KC_0, KC_EQUAL, KC_TRNS, + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_TRNS, S(KC_3), S(KC_2), KC_PIPE, S(KC_7), S(KC_6), KC_TRNS, KC_TRNS, KC_TRNS, KC_7, KC_8, KC_9, S(KC_8), KC_TRNS, + KC_TRNS, KC_GRV, S(KC_SLASH), S(KC_4), KC_MINUS, KC_TRNS, KC_COMMA, KC_4, KC_5, KC_6, S(KC_EQUAL), KC_TRNS, + KC_TRNS, KC_TILD, KC_BSLASH, KC_SLASH, S(KC_MINUS), S(KC_5), KC_TRNS, KC_TRNS, S(KC_7), KC_1, KC_2, KC_3, KC_BSLASH, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT, KC_0, KC_EQUAL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS From 212524c8ce9f87b99915ef332087fef5d4020ee2 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Fri, 26 Mar 2021 16:29:12 -0700 Subject: [PATCH 13/22] =?UTF-8?q?Add=20=E2=80=98-=E2=80=99=20and=20?= =?UTF-8?q?=E2=80=98=5F=E2=80=99=20to=20the=20UPPER=20layout?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since the UPPER layout is meant to help typing in CONSTANT_IDENTIFIERS_LIKE_THIS, and meta syntactic variables LIKE-THIS (mostly in Emacs Lisp docstrings), it’s important to have the ‘-’ and ‘_’ easily accessible on the layer. --- keymap.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/keymap.c b/keymap.c index c1c6efb..80d21e2 100644 --- a/keymap.c +++ b/keymap.c @@ -122,10 +122,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,--------------------------------------------------. ,--------------------------------------------------. * | | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | Q | W | F | P | G | | | | J | L | U | Y | | | + * | | Q | W | F | P | G | - | | | J | L | U | Y | | | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * | | A | R | S | T | D |------| |------| H | N | E | I | O | | - * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * |--------+------+------+------+------+------| _ | | |------+------+------+------+------+--------| * | | Z | X | C | V | B | | | | K | M | | | | | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' * | | | | | | | | | | | | @@ -140,14 +140,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [UPPER] = LAYOUT_ergodox_pretty( // left hand - KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, - KC_TRNS, S(KC_Q), S(KC_W), S(KC_F), S(KC_P), S(KC_G), KC_TRNS, KC_TRNS, S(KC_J), S(KC_L), S(KC_U), S(KC_Y), KC_TRNS, KC_TRNS, + KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, + KC_TRNS, S(KC_Q), S(KC_W), S(KC_F), S(KC_P), S(KC_G), KC_MINUS, KC_TRNS, S(KC_J), S(KC_L), S(KC_U), S(KC_Y), KC_TRNS, KC_TRNS, KC_TRNS, S(KC_A), S(KC_R), S(KC_S), S(KC_T), S(KC_D), S(KC_H), S(KC_N), S(KC_E), S(KC_I), S(KC_O), KC_TRNS, - KC_TRNS, S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), KC_TRNS, KC_TRNS, S(KC_K), S(KC_M), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), S(KC_MINUS), KC_TRNS, S(KC_K), S(KC_M), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + 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: Game layer * From 8e356bb3d54a5e8e38e1ac22633630d8acaaee7d Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Tue, 6 Apr 2021 19:34:29 -0700 Subject: [PATCH 14/22] Use US ANSI Shifted Symbols This makes the configuration a bit cleaner and easier to read. --- keymap.c | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/keymap.c b/keymap.c index 80d21e2..51ac795 100644 --- a/keymap.c +++ b/keymap.c @@ -42,15 +42,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `--------------------' `----------------------' */ [BASE] = LAYOUT_ergodox_pretty( - // left hand right hand - KC_ESC, KC_LBRACKET, S(KC_LBRACKET), S(KC_RBRACKET), S(KC_9), KC_EQUAL, TG(GAME), TG(UPPER), S(KC_8), S(KC_0), S(KC_EQUAL), KC_RBRACKET, S(KC_1), KC_DEL, - KC_TRNS, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_APP, KC_TRNS, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_TRNS, - KC_MEH, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_MEH, - ALL_T(KC_NO), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_TAB, KC_BSPC, KC_K, KC_M, KC_COMM, KC_DOT, KC_QUOT, ALL_T(KC_NO), - MO(MOVEMENT), MO(SYMNUM), KC_LALT, KC_LSHIFT, KC_LCTRL, KC_RCTRL, KC_RSHIFT, KC_LALT, MO(SYMNUM), MO(MOVEMENT), - KC_HOME, KC_END, KC_LEFT, KC_RIGHT, - KC_PGUP, KC_UP, - KC_SPC, KC_LGUI, KC_PGDN, KC_DOWN, KC_RGUI, KC_ENT + // left hand right hand + KC_ESC, KC_LBRACKET, KC_LEFT_CURLY_BRACE, KC_RIGHT_CURLY_BRACE, KC_LEFT_PAREN, KC_EQUAL, TG(GAME), TG(UPPER), KC_ASTERISK, KC_RIGHT_PAREN, KC_PLUS, KC_RBRACKET, KC_EXCLAIM, KC_DEL, + KC_TRNS, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_APP, KC_TRNS, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_TRNS, + KC_MEH, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_MEH, + ALL_T(KC_NO), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_TAB, KC_BSPC, KC_K, KC_M, KC_COMM, KC_DOT, KC_QUOT, ALL_T(KC_NO), + MO(MOVEMENT), MO(SYMNUM), KC_LALT, KC_LSHIFT, KC_LCTRL, KC_RCTRL, KC_RSHIFT, KC_LALT, MO(SYMNUM), MO(MOVEMENT), + KC_HOME, KC_END, KC_LEFT, KC_RIGHT, + KC_PGUP, KC_UP, + KC_SPC, KC_LGUI, KC_PGDN, KC_DOWN, KC_RGUI, KC_ENT ), /* Keymap 1: Symbol and numbers layer * @@ -75,14 +75,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [SYMNUM] = LAYOUT_ergodox_pretty( // left hand - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - KC_TRNS, S(KC_3), S(KC_2), KC_PIPE, S(KC_7), S(KC_6), KC_TRNS, KC_TRNS, KC_TRNS, KC_7, KC_8, KC_9, S(KC_8), KC_TRNS, - KC_TRNS, KC_GRV, S(KC_SLASH), S(KC_4), KC_MINUS, KC_TRNS, KC_COMMA, KC_4, KC_5, KC_6, S(KC_EQUAL), KC_TRNS, - KC_TRNS, KC_TILD, KC_BSLASH, KC_SLASH, S(KC_MINUS), S(KC_5), KC_TRNS, KC_TRNS, S(KC_7), KC_1, KC_2, KC_3, KC_BSLASH, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT, KC_0, KC_EQUAL, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - 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_F6, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_TRNS, KC_HASH, KC_AT, KC_PIPE, KC_AMPERSAND, KC_CIRCUMFLEX, KC_TRNS, KC_TRNS, KC_TRNS, KC_7, KC_8, KC_9, KC_ASTERISK, KC_TRNS, + KC_TRNS, KC_GRV, KC_QUESTION, KC_DOLLAR, KC_MINUS, KC_TRNS, KC_COMMA, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS, + KC_TRNS, KC_TILDE, KC_BSLASH, KC_SLASH, KC_UNDERSCORE, KC_PERCENT, KC_TRNS, KC_TRNS, KC_AMPERSAND, KC_1, KC_2, KC_3, KC_BSLASH, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT, KC_0, KC_EQUAL, KC_TRNS, + 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 2: Movement mouse keys * @@ -140,14 +140,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [UPPER] = LAYOUT_ergodox_pretty( // left hand - KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, - KC_TRNS, S(KC_Q), S(KC_W), S(KC_F), S(KC_P), S(KC_G), KC_MINUS, KC_TRNS, S(KC_J), S(KC_L), S(KC_U), S(KC_Y), KC_TRNS, KC_TRNS, - KC_TRNS, S(KC_A), S(KC_R), S(KC_S), S(KC_T), S(KC_D), S(KC_H), S(KC_N), S(KC_E), S(KC_I), S(KC_O), KC_TRNS, - KC_TRNS, S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), S(KC_MINUS), KC_TRNS, S(KC_K), S(KC_M), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TRNS, KC_TRNS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, + KC_TRNS, S(KC_Q), S(KC_W), S(KC_F), S(KC_P), S(KC_G), KC_MINUS, KC_TRNS, S(KC_J), S(KC_L), S(KC_U), S(KC_Y), KC_TRNS, KC_TRNS, + KC_TRNS, S(KC_A), S(KC_R), S(KC_S), S(KC_T), S(KC_D), S(KC_H), S(KC_N), S(KC_E), S(KC_I), S(KC_O), KC_TRNS, + KC_TRNS, S(KC_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), KC_UNDERSCORE, KC_TRNS, S(KC_K), S(KC_M), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + 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: Game layer * From 5996b0eed548e29976262880f695f008f566eb1e Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Sun, 30 Jan 2022 19:46:46 -0800 Subject: [PATCH 15/22] =?UTF-8?q?Replace=20=E2=80=9CHyper=E2=80=9D=20key?= =?UTF-8?q?=20with=20right=20Gui=20key?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xmodmap translates this to a “real” Hyper keypress. --- keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keymap.c b/keymap.c index 51ac795..642a9a7 100644 --- a/keymap.c +++ b/keymap.c @@ -46,11 +46,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_LBRACKET, KC_LEFT_CURLY_BRACE, KC_RIGHT_CURLY_BRACE, KC_LEFT_PAREN, KC_EQUAL, TG(GAME), TG(UPPER), KC_ASTERISK, KC_RIGHT_PAREN, KC_PLUS, KC_RBRACKET, KC_EXCLAIM, KC_DEL, KC_TRNS, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_APP, KC_TRNS, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_TRNS, KC_MEH, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_MEH, - ALL_T(KC_NO), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_TAB, KC_BSPC, KC_K, KC_M, KC_COMM, KC_DOT, KC_QUOT, ALL_T(KC_NO), + KC_RGUI, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_TAB, KC_BSPC, KC_K, KC_M, KC_COMM, KC_DOT, KC_QUOT, KC_RGUI, MO(MOVEMENT), MO(SYMNUM), KC_LALT, KC_LSHIFT, KC_LCTRL, KC_RCTRL, KC_RSHIFT, KC_LALT, MO(SYMNUM), MO(MOVEMENT), KC_HOME, KC_END, KC_LEFT, KC_RIGHT, KC_PGUP, KC_UP, - KC_SPC, KC_LGUI, KC_PGDN, KC_DOWN, KC_RGUI, KC_ENT + KC_SPC, KC_LGUI, KC_PGDN, KC_DOWN, KC_LGUI, KC_ENT ), /* Keymap 1: Symbol and numbers layer * From e296b90940e610da71a44d0bcd2c45a3718791ce Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Sun, 30 Jan 2022 20:38:20 -0800 Subject: [PATCH 16/22] Shrink the base layout --- keymap.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/keymap.c b/keymap.c index 642a9a7..15e2c11 100644 --- a/keymap.c +++ b/keymap.c @@ -1,6 +1,12 @@ #include QMK_KEYBOARD_H #include "version.h" +#define TG_GAME TG(GAME) +#define TG_UPPER TG(UPPER) + +#define MO_MOV MO(MOVEMENT) +#define MO_SYM MO(SYMNUM) + enum layers { BASE, // Default layer SYMNUM, // Symbols and numbers @@ -42,15 +48,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `--------------------' `----------------------' */ [BASE] = LAYOUT_ergodox_pretty( - // left hand right hand - KC_ESC, KC_LBRACKET, KC_LEFT_CURLY_BRACE, KC_RIGHT_CURLY_BRACE, KC_LEFT_PAREN, KC_EQUAL, TG(GAME), TG(UPPER), KC_ASTERISK, KC_RIGHT_PAREN, KC_PLUS, KC_RBRACKET, KC_EXCLAIM, KC_DEL, - KC_TRNS, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_APP, KC_TRNS, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_TRNS, - KC_MEH, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_MEH, - KC_RGUI, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_TAB, KC_BSPC, KC_K, KC_M, KC_COMM, KC_DOT, KC_QUOT, KC_RGUI, - MO(MOVEMENT), MO(SYMNUM), KC_LALT, KC_LSHIFT, KC_LCTRL, KC_RCTRL, KC_RSHIFT, KC_LALT, MO(SYMNUM), MO(MOVEMENT), - KC_HOME, KC_END, KC_LEFT, KC_RIGHT, - KC_PGUP, KC_UP, - KC_SPC, KC_LGUI, KC_PGDN, KC_DOWN, KC_LGUI, KC_ENT + // left hand \\ // right hand + KC_ESC, KC_LBRC, KC_LCBR, KC_RCBR, KC_LPRN, KC_EQL, TG_GAME, TG_UPPER, KC_ASTR, KC_RPRN, KC_PLUS, KC_RBRC, KC_EXLM, KC_DEL, + KC_NO, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_APP, KC_NO, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_NO, + KC_MEH, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_MEH, + KC_RGUI, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_TAB, KC_BSPC, KC_K, KC_M, KC_COMM, KC_DOT, KC_QUOT, KC_RGUI, + MO_MOV, MO_SYM, KC_LALT, KC_LSFT, KC_LCTL, KC_RCTL, KC_RSFT, KC_LALT, MO_SYM, MO_MOV, + KC_HOME, KC_END, KC_LEFT, KC_RGHT, + KC_PGUP, KC_UP, + KC_SPC, KC_LGUI, KC_PGDN, KC_DOWN, KC_LGUI, KC_ENT ), /* Keymap 1: Symbol and numbers layer * From 349fdfe763c4c8866dcfb4acae136c55609ad2b2 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Tue, 1 Feb 2022 11:51:41 -0800 Subject: [PATCH 17/22] Shrink the Symbols and Numpad layout --- keymap.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/keymap.c b/keymap.c index 15e2c11..f3696e7 100644 --- a/keymap.c +++ b/keymap.c @@ -80,15 +80,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `--------------------' `--------------------' */ [SYMNUM] = LAYOUT_ergodox_pretty( - // left hand - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - KC_TRNS, KC_HASH, KC_AT, KC_PIPE, KC_AMPERSAND, KC_CIRCUMFLEX, KC_TRNS, KC_TRNS, KC_TRNS, KC_7, KC_8, KC_9, KC_ASTERISK, KC_TRNS, - KC_TRNS, KC_GRV, KC_QUESTION, KC_DOLLAR, KC_MINUS, KC_TRNS, KC_COMMA, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS, - KC_TRNS, KC_TILDE, KC_BSLASH, KC_SLASH, KC_UNDERSCORE, KC_PERCENT, KC_TRNS, KC_TRNS, KC_AMPERSAND, KC_1, KC_2, KC_3, KC_BSLASH, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT, KC_0, KC_EQUAL, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + // left hand \\ // right hand + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_NO, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_NO, KC_HASH, KC_AT, KC_PIPE, KC_AMPR, KC_CIRC, KC_NO, KC_NO, KC_NO, KC_7, KC_8, KC_9, KC_ASTR, KC_NO, + KC_NO, KC_GRV, KC_QUES, KC_DLR, KC_MINS, KC_NO, KC_COMM, KC_4, KC_5, KC_6, KC_PLUS, KC_NO, + KC_NO, KC_TILD, KC_BSLS, KC_SLSH, KC_UNDS, KC_PERC, KC_NO, KC_NO, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_DOT, KC_0, KC_EQL, 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 ), /* Keymap 2: Movement mouse keys * From ef89b5f77702597660794643ced9efbe96d0a48a Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Tue, 1 Feb 2022 12:00:03 -0800 Subject: [PATCH 18/22] Shrink the Movement layout --- keymap.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/keymap.c b/keymap.c index f3696e7..bdef7ba 100644 --- a/keymap.c +++ b/keymap.c @@ -113,15 +113,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [MOVEMENT] = LAYOUT_ergodox_pretty( // 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_TRNS, - KC_TRNS, KC_TRNS, KC_MS_BTN1, KC_MS_U, KC_MS_BTN2, KC_MS_WH_UP, KC_TRNS, KC_TRNS, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_MS_WH_DOWN, KC_PGDOWN, KC_LEFT, KC_DOWN, 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_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WBAK + 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_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_NO, KC_NO, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_NO, KC_NO, + KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, 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_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_NO, KC_NO, KC_NO, KC_WBAK ), /* Keymap 3: UPPER layer * From 68affcf93bc28b6b7d61633ca04d198157f0698e Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Mon, 14 Feb 2022 00:11:34 -0800 Subject: [PATCH 19/22] Move the GAME layer up This way other layers can be used from the game layer. --- keymap.c | 72 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/keymap.c b/keymap.c index bdef7ba..00544e2 100644 --- a/keymap.c +++ b/keymap.c @@ -9,10 +9,10 @@ enum layers { BASE, // Default layer + GAME, /* Flipped for games */ SYMNUM, // Symbols and numbers MOVEMENT, // Movement/Navigation keys UPPER, /* Fake capslock */ - GAME, /* Flipped for games */ }; enum custom_keycodes { @@ -58,7 +58,39 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_PGUP, KC_UP, KC_SPC, KC_LGUI, KC_PGDN, KC_DOWN, KC_LGUI, KC_ENT ), - /* Keymap 1: Symbol and numbers layer + /* Keymap 1: Game layer + * + * ,--------------------------------------------------. ,--------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| + * | | P | O | I | U | Y | | | | T | R | E | W | Q | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | H | J | K | L | ; |------| |------| G | F | A | S | D | | + * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | N | M | , | . | ' | | | | B | V | C | X | Z | | + * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' + * | | | | | | | | | | | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,--------------. + * | | | | | | + * ,------|------|------| |------+--------+------. + * | | | | | | | | + * | | |------| |------| | | + * | | | | | | | | + * `--------------------' `----------------------' + */ + [GAME] = LAYOUT_ergodox_pretty( + // left hand + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(GAME), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_P, KC_O, KC_I, KC_U, KC_Y, KC_TRNS, KC_TRNS, KC_T, KC_R, KC_E, KC_W, KC_Q, KC_TRNS, + KC_TRNS, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_G, KC_F, KC_A, KC_S, KC_D, KC_TRNS, + KC_TRNS, KC_N, KC_M, KC_COMMA, KC_DOT, KC_QUOT, KC_TRNS, KC_TRNS, KC_B, KC_V, KC_C, KC_X, 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_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO_SYM, KC_TRNS + ), + /* Keymap 2: Symbol and numbers layer * * ,---------------------------------------------------. ,--------------------------------------------------. * | F1 | F2 | F3 | F4 | F5 | F6 | | | | F7 | F8 | F9 | F10 | F11 | F12 | @@ -90,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO ), - /* Keymap 2: Movement mouse keys + /* Keymap 3: Movement mouse keys * * ,--------------------------------------------------. ,--------------------------------------------------. * | | | | | | | | | | | | | | | | @@ -122,7 +154,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_WBAK ), - /* Keymap 3: UPPER layer + /* Keymap 4: UPPER layer * * ,--------------------------------------------------. ,--------------------------------------------------. * | | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | | @@ -153,38 +185,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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: Game layer - * - * ,--------------------------------------------------. ,--------------------------------------------------. - * | | | | | | | | | | | | | | | | - * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | P | O | I | U | Y | | | | T | R | E | W | Q | | - * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | H | J | K | L | ; |------| |------| G | F | A | S | D | | - * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | N | M | , | . | ' | | | | B | V | C | X | Z | | - * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | | | | | | | | | | | | - * `----------------------------------' `----------------------------------' - * ,-------------. ,--------------. - * | | | | | | - * ,------|------|------| |------+--------+------. - * | | | | | | | | - * | | |------| |------| | | - * | | | | | | | | - * `--------------------' `----------------------' - */ - [GAME] = LAYOUT_ergodox_pretty( - // left hand - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(GAME), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_P, KC_O, KC_I, KC_U, KC_Y, KC_TRNS, KC_TRNS, KC_T, KC_R, KC_E, KC_W, KC_Q, KC_TRNS, - KC_TRNS, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_G, KC_F, KC_A, KC_S, KC_D, KC_TRNS, - KC_TRNS, KC_N, KC_M, KC_COMMA, KC_DOT, KC_QUOT, KC_TRNS, KC_TRNS, KC_B, KC_V, KC_C, KC_X, 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_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), // clang-format on }; From 38b8e20657f0f265bcc6d372cc9272d155376e4c Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Mon, 27 Jun 2022 21:33:26 -0700 Subject: [PATCH 20/22] Bring back the modifier keys on symnum and movement layouts Having to press the buttons in the right order is annoying and gets in my way. --- keymap.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/keymap.c b/keymap.c index 00544e2..37eb528 100644 --- a/keymap.c +++ b/keymap.c @@ -113,14 +113,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [SYMNUM] = LAYOUT_ergodox_pretty( // left hand \\ // right hand - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_NO, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - KC_NO, KC_HASH, KC_AT, KC_PIPE, KC_AMPR, KC_CIRC, KC_NO, KC_NO, KC_NO, KC_7, KC_8, KC_9, KC_ASTR, KC_NO, - KC_NO, KC_GRV, KC_QUES, KC_DLR, KC_MINS, KC_NO, KC_COMM, KC_4, KC_5, KC_6, KC_PLUS, KC_NO, - KC_NO, KC_TILD, KC_BSLS, KC_SLSH, KC_UNDS, KC_PERC, KC_NO, KC_NO, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_DOT, KC_0, KC_EQL, 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_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_NO, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, + KC_NO, KC_HASH, KC_AT, KC_PIPE, KC_AMPR, KC_CIRC, KC_NO, KC_NO, KC_NO, KC_7, KC_8, KC_9, KC_ASTR, KC_NO, + KC_NO, KC_GRV, KC_QUES, KC_DLR, KC_MINS, KC_NO, KC_COMM, KC_4, KC_5, KC_6, KC_PLUS, KC_NO, + KC_NO, KC_TILD, KC_BSLS, KC_SLSH, KC_UNDS, KC_PERC, KC_NO, KC_NO, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_NO, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_EQL, 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 ), /* Keymap 3: Movement mouse keys * @@ -145,14 +145,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [MOVEMENT] = LAYOUT_ergodox_pretty( // left hand - 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_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_NO, KC_NO, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_NO, KC_NO, - KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, 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_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_NO, KC_NO, KC_NO, KC_WBAK + 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_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_NO, KC_NO, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_NO, KC_NO, + KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, + KC_NO, KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_WBAK ), /* Keymap 4: UPPER layer * From 32daab6d0bd5fccf09a83195f83511b8722e600d Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Fri, 9 Sep 2022 23:51:07 -0700 Subject: [PATCH 21/22] =?UTF-8?q?Fix=20=E2=80=98.=E2=80=99=20on=20symbols?= =?UTF-8?q?=20layer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keymap.c b/keymap.c index 37eb528..09faf25 100644 --- a/keymap.c +++ b/keymap.c @@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_NO, KC_HASH, KC_AT, KC_PIPE, KC_AMPR, KC_CIRC, KC_NO, KC_NO, KC_NO, KC_7, KC_8, KC_9, KC_ASTR, KC_NO, KC_NO, KC_GRV, KC_QUES, KC_DLR, KC_MINS, KC_NO, KC_COMM, KC_4, KC_5, KC_6, KC_PLUS, KC_NO, KC_NO, KC_TILD, KC_BSLS, KC_SLSH, KC_UNDS, KC_PERC, KC_NO, KC_NO, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_NO, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_EQL, KC_NO, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT, KC_0, KC_EQL, 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 From 9ff421c84c5892223ae5b88fd47b4f40b8dd6704 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Tue, 10 Oct 2023 23:24:36 -0700 Subject: [PATCH 22/22] Make backspace and delete symmetric keys --- keymap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keymap.c b/keymap.c index 09faf25..572c772 100644 --- a/keymap.c +++ b/keymap.c @@ -29,10 +29,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap 0: Basic layer * * ,--------------------------------------------------. ,--------------------------------------------------. - * | ESC | [ | { | } | ( | = | L4 | | L3 | * | ) | + | ] | ! | DEL | + * | ESC | [ | { | } | ( | = | L4 | | L3 | * | ) | + | ] | ! | APP | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | Q | W | F | P | G | APP | | | J | L | U | Y | ; | | - * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| + * | | Q | W | F | P | G | Back | | DEL | J | L | U | Y | ; | | + * |--------+------+------+------+------+------| space| | |------+------+------+------+------+--------| * | Meh | A | R | S | T | D |------| |------| H | N | E | I | O | Meh | * |--------+------+------+------+------+------| TAB | | Back |------+------+------+------+------+--------| * | Hyper | Z | X | C | V | B | | | space| K | M | , | . | ' | Hyper | @@ -49,8 +49,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [BASE] = LAYOUT_ergodox_pretty( // left hand \\ // right hand - KC_ESC, KC_LBRC, KC_LCBR, KC_RCBR, KC_LPRN, KC_EQL, TG_GAME, TG_UPPER, KC_ASTR, KC_RPRN, KC_PLUS, KC_RBRC, KC_EXLM, KC_DEL, - KC_NO, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_APP, KC_NO, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_NO, + KC_ESC, KC_LBRC, KC_LCBR, KC_RCBR, KC_LPRN, KC_EQL, TG_GAME, TG_UPPER, KC_ASTR, KC_RPRN, KC_PLUS, KC_RBRC, KC_EXLM, KC_APP, + KC_NO, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_BSPC, KC_DEL, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_NO, KC_MEH, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_MEH, KC_RGUI, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_TAB, KC_BSPC, KC_K, KC_M, KC_COMM, KC_DOT, KC_QUOT, KC_RGUI, MO_MOV, MO_SYM, KC_LALT, KC_LSFT, KC_LCTL, KC_RCTL, KC_RSFT, KC_LALT, MO_SYM, MO_MOV,