From 6338805b83286b527f7bfcba6c5b7ca56b15f11c Mon Sep 17 00:00:00 2001 From: Ian Sterling Date: Sat, 20 May 2023 23:22:02 -0700 Subject: [PATCH 1/7] removed unneeded layers --- keyboards/atreus/keymaps/xyverz/keymap.c | 115 +++--------------- keyboards/keebio/iris/keymaps/xyverz/keymap.c | 53 ++------ .../keyboardio/atreus/keymaps/xyverz/keymap.c | 113 ++--------------- 3 files changed, 40 insertions(+), 241 deletions(-) diff --git a/keyboards/atreus/keymaps/xyverz/keymap.c b/keyboards/atreus/keymaps/xyverz/keymap.c index b6cc5a68908c..347124659e0d 100644 --- a/keyboards/atreus/keymaps/xyverz/keymap.c +++ b/keyboards/atreus/keymaps/xyverz/keymap.c @@ -11,9 +11,6 @@ enum layer_names { _DVORAK, - _QWERTY, - _COLEMAK, - _DVORMAC, _LOWER, _RAISE, _ADJUST @@ -21,9 +18,6 @@ enum layer_names { enum planck_keycodes { DVORAK = SAFE_RANGE, - QWERTY, - COLEMAK, - DVORMAC, LOWER, RAISE, ADJUST @@ -31,15 +25,16 @@ enum planck_keycodes { // Adding macros to make the keymaps below much easier to read. #define SFTSCLN SFT_T(KC_SCLN) -#define SFTSLSH SFT_T(KC_SLSH) #define SFTZED SFT_T(KC_Z) #define ALTENT ALT_T(KC_ENT) +#define DELGUI GUI_T(KC_DEL) #define ESCTRL CTL_T(KC_ESC) #define TABALT ALT_T(KC_TAB) #define ADJUST MO(_ADJUST) #define LOWER MO(_LOWER) #define RAISE MO(_RAISE) #define MACLOCK LGUI(LCTL(KC_Q)) +#define WINLOCK LGUI(KC_L) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Dvorak Layer @@ -48,66 +43,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |------+------+------+------+------| |------+------+------+------+------| | A | O | E | U | I | | D | H | T | N | S | |------+------+------+------+------|------.,------|------+------+------+------+------| - |SFT/ ;| Q | J | K | X | CTRL ||Alt / | B | M | W | V |SFT/ Z| - |------+------+------+------+------| ||Enter |------+------+------+------+------| + |SFT/ ;| Q | J | K | X |Delete||Enter | B | M | W | V |SFT/ Z| + |------+------+------+------+------| / GUI|| / ALT|------+------+------+------+------| | Esc | Tab | GUI | LOWER| BkSp |------'`------| Spc | RAISE| - | / | \ | `----------------------------------' `----------------------------------' */ [_DVORAK] = LAYOUT( KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L , KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S , SFTSCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, SFTZED , - ESCTRL, TABALT, KC_LGUI, LOWER, KC_BSPC, KC_LCTL, ALTENT, KC_SPC, RAISE, KC_MINS, KC_SLSH, KC_BSLS - ), - - /* QWERTY Layer - ,----------------------------------. ,----------------------------------. - | Q | W | E | R | T | | Y | U | I | O | P | - |------+------+------+------+------| |------+------+------+------+------| - | A | S | D | F | G | | H | J | K | L | ; | - |------+------+------+------+------|------.,------|------+------+------+------+------| - |SFT/ Z| X | C | V | B | CTRL ||Alt / | N | M | , | . |SFT/ /| - |------+------+------+------+------| ||Enter |------+------+------+------+------| - | Esc | Tab | GUI | LOWER| BkSp |------'`------| Spc | RAISE| - | ' | \ | - `----------------------------------' `----------------------------------' */ - [_QWERTY] = LAYOUT( - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P , - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, - SFTZED, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, SFTSLSH, - ESCTRL, TABALT, KC_LGUI, LOWER, KC_BSPC, KC_LCTL, ALTENT, KC_SPC, RAISE, KC_MINS, KC_QUOT, KC_BSLS - ), - - /* Colemak Layer - ,----------------------------------. ,----------------------------------. - | Q | W | F | P | G | | J | L | U | Y | L | - |------+------+------+------+------| |------+------+------+------+------| - | A | R | S | T | D | | H | N | E | I | S | - |------+------+------+------+------|------.,------|------+------+------+------+------| - |SFT/ Z| X | C | V | B | CTRL ||Alt / | K | M | , | . |SFT/ /| - |------+------+------+------+------| ||Enter |------+------+------+------+------| - | Esc | Tab | GUI | LOWER| BkSp |------'`------| Spc | RAISE| - | ' | \ | - `----------------------------------' `----------------------------------'*/ - [_COLEMAK] = LAYOUT( - KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, - KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O , - SFTZED, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, SFTSLSH, - ESCTRL, TABALT, KC_LGUI, LOWER, KC_BSPC, KC_LCTL, ALTENT, KC_SPC, RAISE, KC_MINS, KC_QUOT, KC_BSLS - ), - - /* Dvorak Layer with Command key on left thumb instead of Control - ,----------------------------------. ,----------------------------------. - | ' | , | . | P | Y | | F | G | C | R | L | - |------+------+------+------+------| |------+------+------+------+------| - | A | O | E | U | I | | D | H | T | N | S | - |------+------+------+------+------|------.,------|------+------+------+------+------| - |SFT/ ;| Q | J | K | X | CMD ||Alt / | B | M | W | V |SFT/ Z| - |------+------+------+------+------| ||Enter |------+------+------+------+------| - | Esc | Tab | GUI | LOWER| BkSp |------'`------| Spc | RAISE| - | / | \ | - `----------------------------------' `----------------------------------' */ - [_DVORMAC] = LAYOUT( - KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L , - KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S , - SFTSCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, SFTZED , - ESCTRL, TABALT, KC_LGUI, LOWER, KC_BSPC, KC_LGUI, ALTENT, KC_SPC, RAISE, KC_MINS, KC_SLSH, KC_BSLS + ESCTRL, TABALT, KC_LGUI, LOWER, KC_BSPC, DELGUI, ALTENT, KC_SPC, RAISE, KC_MINS, KC_SLSH, KC_BSLS ), /* LOWER Layer @@ -118,13 +62,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |------+------+------+------+------|------.,------|------+------+------+------+------| | | Left | Down | Right| End | || | PgUp | Mute | Vol- | Vol+ | | |------+------+------+------+------| || |------+------+------+------+------| - | ~ | | | | Del |------'`------| Ins | | | |MACLCK| + | ~ | | | | Del |------'`------| Ins | | | | | `----------------------------------' `----------------------------------'*/ [_LOWER] = LAYOUT( KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_CAPS, _______, KC_UP, _______, KC_HOME, KC_PGUP, _______, KC_PLUS, KC_LCBR, KC_RCBR, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, - KC_TILD, _______, _______, _______, KC_DEL, _______, _______, KC_INS, _______, _______, _______, MACLOCK + KC_TILD, _______, _______, _______, KC_DEL, _______, _______, KC_INS, ADJUST, _______, _______, _______ ), /* RAISE Layer @@ -135,13 +79,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |------+------+------+------+------|------.,------|------+------+------+------+------| | | Left | Down | Right| End | || | PgUp | Prev | Play | Next | | |------+------+------+------+------| || |------+------+------+------+------| - | ` | | | | Del |------'`------| Ins | | | |MACLCK| + | ` | | | | Del |------'`------| Ins | | | | | `----------------------------------' `----------------------------------'*/ [_RAISE] = LAYOUT( KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0 , KC_CAPS, _______, KC_UP, _______, KC_HOME, KC_PGUP, _______, KC_EQL, KC_LBRC, KC_RBRC, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_PGDN, KC_MPRV, KC_MPLY, KC_MNXT, _______, - KC_GRV, _______, _______, _______, KC_DEL, _______, _______, KC_INS, _______, _______, _______, MACLOCK + KC_GRV, _______, _______, ADJUST, KC_DEL, _______, _______, KC_INS, _______, _______, _______, _______ ), /* ADJUST Layer @@ -150,43 +94,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |------+------+------+------+------| |------+------+------+------+------| | F11 | | | | | | | PrSc | ScLk | Paus | F12 | |------+------+------+------+------|------.,------|------+------+------+------+------| - | |QWERTY|COLEMK|DVORAK|DVORMC| || | | | | | | - |------+------+------+------+------| || |------+------+------+------+------| - | | | | | |------'`------| | | | | QK_BOOT| + | | | | | | || | | | | | | + |------+------+------+------+------|MACLCK||WINLCK|------+------+------+------+------| + | | | | | |------'`------| | | | |QKBOOT| `----------------------------------' `----------------------------------'*/ [_ADJUST] = LAYOUT( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 , KC_F11, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_F12 , - _______, QWERTY, COLEMAK, DVORAK, DVORMAC, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, MACLOCK, WINLOCK, _______, _______, _______, _______, QK_BOOT ), -}; - -layer_state_t layer_state_set_user(layer_state_t state) { - return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); -} -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case DVORAK: - if (record->event.pressed) { - set_single_persistent_default_layer(_DVORAK); - } - return false; - case COLEMAK: - if (record->event.pressed) { - set_single_persistent_default_layer(_COLEMAK); - } - return false; - case QWERTY: - if (record->event.pressed) { - set_single_persistent_default_layer(_QWERTY); - } - return false; - case DVORMAC: - if (record->event.pressed) { - set_single_persistent_default_layer(_DVORMAC); - } - return false; - } - return true; -} +}; \ No newline at end of file diff --git a/keyboards/keebio/iris/keymaps/xyverz/keymap.c b/keyboards/keebio/iris/keymaps/xyverz/keymap.c index d59fd8fedfef..9f6fb446d1dc 100644 --- a/keyboards/keebio/iris/keymaps/xyverz/keymap.c +++ b/keyboards/keebio/iris/keymaps/xyverz/keymap.c @@ -5,9 +5,7 @@ extern keymap_config_t keymap_config; enum layer_names { _DVORAK, - _QWERTY, - _COLEMAK, - _WOW, + _DESTINY, _LOWER, _RAISE, _ADJUST @@ -15,9 +13,7 @@ enum layer_names { enum custom_keycodes { DVORAK = SAFE_RANGE, - QWERTY, - COLEMAK, - WOW, + DESTINY, LOWER, RAISE, ADJUST @@ -27,14 +23,15 @@ enum custom_keycodes { #define KC_RASE RAISE #define KC_RST QK_BOOT #define KC_BL_S BL_STEP -#define KC_QWRT QWERTY -#define KC_CLMK COLEMAK #define KC_DVRK DVORAK -#define KC_WOW WOW +#define KC_DSTN DESTINY +#define GUI_ENT GUI_T(KC_ENT) #define KC_BSLT ALT_T(KC_BSPC) #define ADJUST MO(_ADJUST) #define LOWER MO(_LOWER) #define RAISE MO(_RAISE) +#define MACLOCK LGUI_T(LCTL_T(KC_Q)) +#define WINLOCK LGUI_T(KC_L) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -47,28 +44,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL,KC_BSLT,KC_LGUI, KC_ENT ,KC_SPC ,KC_LALT ), - [_QWERTY] = LAYOUT ( - KC_EQL , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,KC_MINS, - KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_BSLS, - KC_ESC , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L ,KC_SCLN,KC_QUOT, - KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B ,KC_LOWR, KC_RASE, KC_N , KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT, - KC_LCTL,KC_BSPC,KC_LGUI, KC_ENT ,KC_SPC ,KC_LALT - ), - - [_COLEMAK] = LAYOUT ( - KC_EQL , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,KC_MINS, - KC_TAB , KC_Q , KC_W , KC_F , KC_P , KC_G , KC_J , KC_L , KC_U , KC_Y ,KC_SCLN,KC_BSPC, - KC_ESC , KC_A , KC_R , KC_S , KC_T , KC_D , KC_H , KC_N , KC_E , KC_I , KC_O ,KC_QUOT, - KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B ,KC_LOWR, KC_RASE, KC_K , KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT, - KC_LCTL,KC_BSPC,KC_LGUI, KC_ENT ,KC_SPC ,KC_LALT - ), - - [_WOW] = LAYOUT ( + [_DESTINY] = LAYOUT ( KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,KC_BSLS, KC_TAB ,KC_QUOT,KC_COMM,KC_DOT , KC_P , KC_Y , KC_F , KC_G , KC_C , KC_R , KC_L ,KC_SLSH, KC_ESC , KC_A , KC_O , KC_E , KC_U , KC_I , KC_D , KC_H , KC_T , KC_N , KC_S ,KC_MINS, - KC_LSFT,KC_SCLN, KC_Q , KC_J , KC_K , KC_X ,KC_LALT, KC_RGUI, KC_B , KC_M , KC_W , KC_V , KC_Z ,KC_RSFT, - KC_LOWR,KC_BSPC,KC_LCTL, KC_ENT ,KC_SPC ,KC_RASE + KC_LSFT,KC_SCLN, KC_Q , KC_J , KC_K , KC_X ,KC_LALT, RAISE, KC_B , KC_M , KC_W , KC_V , KC_Z ,KC_RSFT, + KC_LCTL,KC_BSPC,KC_DEL, GUI_ENT,KC_SPC ,ADJUST ), [_LOWER] = LAYOUT ( @@ -90,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT ( KC_F11 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F12 , _______,KC_RST ,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, - _______,_______,_______,_______,_______,_______, _______,KC_QWRT,KC_CLMK,KC_DVRK,KC_WOW ,_______, + _______,_______,_______,_______,_______,_______, _______,KC_DVRK,KC_DSTN,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______, _______,_______,_______, _______,_______,_______ ) @@ -119,19 +100,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { set_single_persistent_default_layer(_DVORAK); } return false; - case COLEMAK: - if (record->event.pressed) { - set_single_persistent_default_layer(_COLEMAK); - } - return false; - case QWERTY: - if (record->event.pressed) { - set_single_persistent_default_layer(_QWERTY); - } - return false; - case WOW: + case DESTINY: if (record->event.pressed) { - set_single_persistent_default_layer(_WOW); + set_single_persistent_default_layer(_DESTINY); } return false; } diff --git a/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c b/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c index 3a3fbd6d7115..7a6283e6eb4d 100644 --- a/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c +++ b/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c @@ -12,21 +12,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - */ - -// This is the personal keymap of Ian Sterling (@xyverz). It is based on the keymap by -// Chris Gerber (@gerbercj), with the addition of persistent layers like the Planck and -// Preonic keyboards by Jack Humbert. + */ #include QMK_KEYBOARD_H -// Initial keymap for Xyverz's Keyboardio Atreus +// Xyverz's Keyboardio Atreus keymap enum layer_names { _DVORAK, - _QWERTY, - _COLEMAK, - _DVORMAC, _LOWER, _RAISE, _ADJUST @@ -34,9 +27,6 @@ enum layer_names { enum planck_keycodes { DVORAK = SAFE_RANGE, - QWERTY, - COLEMAK, - DVORMAC, LOWER, RAISE, ADJUST @@ -44,70 +34,18 @@ enum planck_keycodes { // Adding macros to make the keymaps below much easier to read. #define SFTSCLN SFT_T(KC_SCLN) -#define SFTSLSH SFT_T(KC_SLSH) #define SFTZED SFT_T(KC_Z) #define ALTENT ALT_T(KC_ENT) #define ESCTRL CTL_T(KC_ESC) #define TABALT ALT_T(KC_TAB) #define DELGUI GUI_T(KC_DEL) -#define DELCTL CTL_T(KC_DEL) #define MACLOCK LGUI(LCTL(KC_Q)) +#define WINLOCK LGUI(KC_L) #define ADJUST MO(_ADJUST) #define LOWER MO(_LOWER) #define RAISE MO(_RAISE) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Dvorak Layer - ,----------------------------------. ,----------------------------------. - | ' | , | . | P | Y | | F | G | C | R | L | - |------+------+------+------+------| |------+------+------+------+------| - | A | O | E | U | I | | D | H | T | N | S | - |------+------+------+------+------+------.,------+------+------+------+------+------| - |SFT/ ;| Q | J | K | X | Home || End | B | M | W | V |SFT/ Z| - |------+------+------+------+------+------||------+------+------+------+------+------| - | Esc | Tab | GUI | LOWER| BkSp |DELCTL||ALTENT| Spc | RAISE| - | / | \ | - `-----------------------------------------'`-----------------------------------------' */ - [_DVORAK] = LAYOUT( - KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L , - KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S , - SFTSCLN, KC_Q, KC_J, KC_K, KC_X, KC_HOME, KC_END, KC_B, KC_M, KC_W, KC_V, SFTZED , - ESCTRL, TABALT, KC_LGUI, LOWER, KC_BSPC, DELCTL, ALTENT, KC_SPC, RAISE, KC_MINS, KC_SLSH, KC_BSLS - ), - - /* QWERTY Layer - ,----------------------------------. ,----------------------------------. - | Q | W | E | R | T | | Y | U | I | O | P | - |------+------+------+------+------| |------+------+------+------+------| - | A | S | D | F | G | | H | J | K | L | ; | - |------+------+------+------+------+------.,------+------+------+------+------+------| - |SFT/ Z| X | C | V | B | Home || End | N | M | , | . |SFT/ /| - |------+------+------+------+------+------||------+------+------+------+------+------| - | Esc | Tab | GUI | LOWER| BkSp | LCTL ||ALTENT| Spc | RAISE| - | ' | \ | - `-----------------------------------------'`-----------------------------------------' */ - [_QWERTY] = LAYOUT( - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P , - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, - SFTZED, KC_X, KC_C, KC_V, KC_B, KC_HOME, KC_END, KC_N, KC_M, KC_COMM, KC_DOT, SFTSLSH, - ESCTRL, TABALT, KC_LGUI, LOWER, KC_BSPC, KC_LCTL, ALTENT, KC_SPC, RAISE, KC_MINS, KC_QUOT, KC_BSLS - ), - - /* Colemak Layer - ,----------------------------------. ,----------------------------------. - | Q | W | F | P | G | | J | L | U | Y | L | - |------+------+------+------+------| |------+------+------+------+------| - | A | R | S | T | D | | H | N | E | I | S | - |------+------+------+------+------+------.,------+------+------+------+------+------| - |SFT/ Z| X | C | V | B | Home || End | K | M | , | . |SFT/ /| - |------+------+------+------+------+------||------+------+------+------+------+------| - | Esc | Tab | GUI | LOWER| BkSp | LCTL ||ALTENT| Spc | RAISE| - | ' | \ | - `-----------------------------------------'`-----------------------------------------'*/ - [_COLEMAK] = LAYOUT( - KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, - KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O , - SFTZED, KC_X, KC_C, KC_V, KC_B, KC_HOME, KC_END, KC_K, KC_M, KC_COMM, KC_DOT, SFTSLSH, - ESCTRL, TABALT, KC_LGUI, LOWER, KC_BSPC, KC_LCTL, ALTENT, KC_SPC, RAISE, KC_MINS, KC_QUOT, KC_BSLS - ), - /* Dvorak Layer with Command key on left thumb instead of Control ,----------------------------------. ,----------------------------------. | ' | , | . | P | Y | | F | G | C | R | L | @@ -118,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |------+------+------+------+------+------||------+------+------+------+------+------| | Esc | Tab | GUI | LOWER| BkSp | LGUI ||ALTENT| Spc | RAISE| - | / | \ | `-----------------------------------------'`-----------------------------------------' */ - [_DVORMAC] = LAYOUT( + [_DVORAK] = LAYOUT( KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L , KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S , SFTSCLN, KC_Q, KC_J, KC_K, KC_X, KC_HOME, KC_END, KC_B, KC_M, KC_W, KC_V, SFTZED , @@ -131,14 +69,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |------+------+------+------+------| |------+------+------+------+------| | CAPS | | UP | | Home | | PgDn | | + | { | } | |------+------+------+------+------+------.,------+------+------+------+------+------| - | | Left | Down | Right| End | || | PgUp | Mute | Vol- | Vol+ | | + | | Left | Down | Right| End |MacLck||WinLck| PgUp | Mute | Vol- | Vol+ | | |------+------+------+------+------+------||------+------+------+------+------+------| | ~ | | | | Del | || | Ins | | | | | `-----------------------------------------'`-----------------------------------------'*/ [_LOWER] = LAYOUT( KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_CAPS, _______, KC_UP, _______, KC_HOME, KC_PGUP, _______, KC_PLUS, KC_LCBR, KC_RCBR, - _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, _______, _______, KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, MACLOCK, WINLOCK, KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_TILD, KC_LEFT, KC_RGHT, _______, KC_DEL, _______, _______, KC_INS, _______, KC_UP, KC_DOWN, _______ ), @@ -148,14 +86,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |------+------+------+------+------| |------+------+------+------+------| | CAPS | | UP | | Home | | PgDn | | = | [ | ] | |------+------+------+------+------+------.,------+------+------+------+------+------| - | | Left | Down | Right| End |MacLck|| | PgUp | Prev | Play | Next | | + | | Left | Down | Right| End |MacLck||WinLck| PgUp | Prev | Play | Next | | |------+------+------+------+------+------||------+------+------+------+------+------| | ` | | | | Del | || | Ins | | | | | `-----------------------------------------'`-----------------------------------------'*/ [_RAISE] = LAYOUT( KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0 , KC_CAPS, _______, KC_UP, _______, KC_HOME, KC_PGUP, _______, KC_EQL, KC_LBRC, KC_RBRC, - _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, MACLOCK, _______, KC_PGDN, KC_MPRV, KC_MPLY, KC_MNXT, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, MACLOCK, WINLOCK, KC_PGDN, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_GRV, KC_LEFT, KC_RGHT, _______, KC_DEL, _______, _______, KC_INS, _______, KC_UP, KC_DOWN, _______ ), @@ -163,45 +101,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ,----------------------------------. ,----------------------------------. | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | |------+------+------+------+------| |------+------+------+------+------| - | F11 | | | | | | | PrSc | ScLk | Paus | F12 | + | F11 | | |DVORAK|DVORMC| | | PrSc | ScLk | Paus | F12 | |------+------+------+------+------+------.,------+------+------+------+------+------| - | |QWERTY|COLEMK|DVORAK|DVORMC| || | | | | | | + | | | | | | || | | | | | | |------+------+------+------+------+------||------+------+------+------+------+------| - | | | | | | || | | | | | QK_BOOT| + | | | | | | || | | | | |QKBOOT| `-----------------------------------------'`-----------------------------------------'*/ [_ADJUST] = LAYOUT( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 , - KC_F11, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_F12 , - _______, QWERTY, COLEMAK, DVORAK, DVORMAC, _______, _______, _______, _______, _______, _______, _______, + KC_F11, _______, DVORAK, DVORMAC, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_F12 , + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT ), }; layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); -} -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case DVORAK: - if (record->event.pressed) { - set_single_persistent_default_layer(_DVORAK); - } - return false; - case COLEMAK: - if (record->event.pressed) { - set_single_persistent_default_layer(_COLEMAK); - } - return false; - case QWERTY: - if (record->event.pressed) { - set_single_persistent_default_layer(_QWERTY); - } - return false; - case DVORMAC: - if (record->event.pressed) { - set_single_persistent_default_layer(_DVORMAC); - } - return false; - } - return true; } \ No newline at end of file From bca0ec6f1fc0d2784bce71839f52e3aaf513eee7 Mon Sep 17 00:00:00 2001 From: Ian Sterling Date: Sat, 20 May 2023 23:41:57 -0700 Subject: [PATCH 2/7] Reverting my iris keymap --- keyboards/keebio/iris/keymaps/xyverz/keymap.c | 53 ++++++++++++++----- 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/keyboards/keebio/iris/keymaps/xyverz/keymap.c b/keyboards/keebio/iris/keymaps/xyverz/keymap.c index 9f6fb446d1dc..d59fd8fedfef 100644 --- a/keyboards/keebio/iris/keymaps/xyverz/keymap.c +++ b/keyboards/keebio/iris/keymaps/xyverz/keymap.c @@ -5,7 +5,9 @@ extern keymap_config_t keymap_config; enum layer_names { _DVORAK, - _DESTINY, + _QWERTY, + _COLEMAK, + _WOW, _LOWER, _RAISE, _ADJUST @@ -13,7 +15,9 @@ enum layer_names { enum custom_keycodes { DVORAK = SAFE_RANGE, - DESTINY, + QWERTY, + COLEMAK, + WOW, LOWER, RAISE, ADJUST @@ -23,15 +27,14 @@ enum custom_keycodes { #define KC_RASE RAISE #define KC_RST QK_BOOT #define KC_BL_S BL_STEP +#define KC_QWRT QWERTY +#define KC_CLMK COLEMAK #define KC_DVRK DVORAK -#define KC_DSTN DESTINY -#define GUI_ENT GUI_T(KC_ENT) +#define KC_WOW WOW #define KC_BSLT ALT_T(KC_BSPC) #define ADJUST MO(_ADJUST) #define LOWER MO(_LOWER) #define RAISE MO(_RAISE) -#define MACLOCK LGUI_T(LCTL_T(KC_Q)) -#define WINLOCK LGUI_T(KC_L) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -44,12 +47,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL,KC_BSLT,KC_LGUI, KC_ENT ,KC_SPC ,KC_LALT ), - [_DESTINY] = LAYOUT ( + [_QWERTY] = LAYOUT ( + KC_EQL , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,KC_MINS, + KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_BSLS, + KC_ESC , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L ,KC_SCLN,KC_QUOT, + KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B ,KC_LOWR, KC_RASE, KC_N , KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT, + KC_LCTL,KC_BSPC,KC_LGUI, KC_ENT ,KC_SPC ,KC_LALT + ), + + [_COLEMAK] = LAYOUT ( + KC_EQL , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,KC_MINS, + KC_TAB , KC_Q , KC_W , KC_F , KC_P , KC_G , KC_J , KC_L , KC_U , KC_Y ,KC_SCLN,KC_BSPC, + KC_ESC , KC_A , KC_R , KC_S , KC_T , KC_D , KC_H , KC_N , KC_E , KC_I , KC_O ,KC_QUOT, + KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B ,KC_LOWR, KC_RASE, KC_K , KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT, + KC_LCTL,KC_BSPC,KC_LGUI, KC_ENT ,KC_SPC ,KC_LALT + ), + + [_WOW] = LAYOUT ( KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,KC_BSLS, KC_TAB ,KC_QUOT,KC_COMM,KC_DOT , KC_P , KC_Y , KC_F , KC_G , KC_C , KC_R , KC_L ,KC_SLSH, KC_ESC , KC_A , KC_O , KC_E , KC_U , KC_I , KC_D , KC_H , KC_T , KC_N , KC_S ,KC_MINS, - KC_LSFT,KC_SCLN, KC_Q , KC_J , KC_K , KC_X ,KC_LALT, RAISE, KC_B , KC_M , KC_W , KC_V , KC_Z ,KC_RSFT, - KC_LCTL,KC_BSPC,KC_DEL, GUI_ENT,KC_SPC ,ADJUST + KC_LSFT,KC_SCLN, KC_Q , KC_J , KC_K , KC_X ,KC_LALT, KC_RGUI, KC_B , KC_M , KC_W , KC_V , KC_Z ,KC_RSFT, + KC_LOWR,KC_BSPC,KC_LCTL, KC_ENT ,KC_SPC ,KC_RASE ), [_LOWER] = LAYOUT ( @@ -71,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT ( KC_F11 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F12 , _______,KC_RST ,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______, - _______,_______,_______,_______,_______,_______, _______,KC_DVRK,KC_DSTN,_______,_______,_______, + _______,_______,_______,_______,_______,_______, _______,KC_QWRT,KC_CLMK,KC_DVRK,KC_WOW ,_______, _______,_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______, _______,_______,_______, _______,_______,_______ ) @@ -100,9 +119,19 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { set_single_persistent_default_layer(_DVORAK); } return false; - case DESTINY: + case COLEMAK: + if (record->event.pressed) { + set_single_persistent_default_layer(_COLEMAK); + } + return false; + case QWERTY: + if (record->event.pressed) { + set_single_persistent_default_layer(_QWERTY); + } + return false; + case WOW: if (record->event.pressed) { - set_single_persistent_default_layer(_DESTINY); + set_single_persistent_default_layer(_WOW); } return false; } From c58b48341bebeb24730fc5d619bf25303e0ed73f Mon Sep 17 00:00:00 2001 From: Ian Sterling Date: Sun, 21 May 2023 10:23:46 -0700 Subject: [PATCH 3/7] fixed error in keymap Fixed an error in the keyboardio Atreus keymap that broke the compilation process. --- keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c b/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c index 7a6283e6eb4d..108bba3cc98d 100644 --- a/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c +++ b/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c @@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ,----------------------------------. ,----------------------------------. | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | |------+------+------+------+------| |------+------+------+------+------| - | F11 | | |DVORAK|DVORMC| | | PrSc | ScLk | Paus | F12 | + | F11 | | | | | | | PrSc | ScLk | Paus | F12 | |------+------+------+------+------+------.,------+------+------+------+------+------| | | | | | | || | | | | | | |------+------+------+------+------+------||------+------+------+------+------+------| @@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { `-----------------------------------------'`-----------------------------------------'*/ [_ADJUST] = LAYOUT( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 , - KC_F11, _______, DVORAK, DVORMAC, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_F12 , + KC_F11, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_F12 , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT ), From 6768bf005e557bf7ee12db85f4397aa2bf378da0 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Tue, 23 May 2023 21:53:45 -0700 Subject: [PATCH 4/7] Update keyboards/atreus/keymaps/xyverz/keymap.c Co-authored-by: Joel Challis --- keyboards/atreus/keymaps/xyverz/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/atreus/keymaps/xyverz/keymap.c b/keyboards/atreus/keymaps/xyverz/keymap.c index 347124659e0d..391c1b734fbc 100644 --- a/keyboards/atreus/keymaps/xyverz/keymap.c +++ b/keyboards/atreus/keymaps/xyverz/keymap.c @@ -18,7 +18,7 @@ enum layer_names { enum planck_keycodes { DVORAK = SAFE_RANGE, - LOWER, + LOWER = SAFE_RANGE, RAISE, ADJUST }; From 9e9b1226fb883287cd4ba5becc46d29759dbdd61 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Tue, 23 May 2023 21:53:58 -0700 Subject: [PATCH 5/7] Update keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c Co-authored-by: Joel Challis --- keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c b/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c index 108bba3cc98d..2ba4651ded4c 100644 --- a/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c +++ b/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c @@ -27,7 +27,7 @@ enum layer_names { enum planck_keycodes { DVORAK = SAFE_RANGE, - LOWER, + LOWER = SAFE_RANGE, RAISE, ADJUST }; From 50d9805cd5ec955533efa43a59e48237d795e622 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Tue, 23 May 2023 21:57:13 -0700 Subject: [PATCH 6/7] Update keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c Co-authored-by: Joel Challis --- keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c b/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c index 2ba4651ded4c..dde786cd309f 100644 --- a/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c +++ b/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c @@ -26,7 +26,6 @@ enum layer_names { }; enum planck_keycodes { - DVORAK = SAFE_RANGE, LOWER = SAFE_RANGE, RAISE, ADJUST From 0442c2a6c7d2a3100e3cfa9eaf5485691b6633c9 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Tue, 23 May 2023 21:57:20 -0700 Subject: [PATCH 7/7] Update keyboards/atreus/keymaps/xyverz/keymap.c Co-authored-by: Joel Challis --- keyboards/atreus/keymaps/xyverz/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/atreus/keymaps/xyverz/keymap.c b/keyboards/atreus/keymaps/xyverz/keymap.c index 391c1b734fbc..3fea40287313 100644 --- a/keyboards/atreus/keymaps/xyverz/keymap.c +++ b/keyboards/atreus/keymaps/xyverz/keymap.c @@ -17,7 +17,6 @@ enum layer_names { }; enum planck_keycodes { - DVORAK = SAFE_RANGE, LOWER = SAFE_RANGE, RAISE, ADJUST