Removed unneeded layers from xyverz keymaps (qmk#21008)

shieldsd · May 24, 2023 · 618d0f0 · 618d0f0
1 parent 725c9f3
commit 618d0f0
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 202 deletions.
diff --git a/keyboards/atreus/keymaps/xyverz/keymap.c b/keyboards/atreus/keymaps/xyverz/keymap.c
@@ -11,35 +11,29 @@
 
 enum layer_names {
  _DVORAK,
- _QWERTY,
- _COLEMAK,
- _DVORMAC,
  _LOWER,
  _RAISE,
  _ADJUST
 };
 
 enum planck_keycodes {
- DVORAK = SAFE_RANGE,
- QWERTY,
- COLEMAK,
- DVORMAC,
- LOWER,
+ LOWER = SAFE_RANGE,
  RAISE,
  ADJUST
 };
 
 // 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 +42,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 +61,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 +78,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 +93,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;
-}
+};