Move the GAME layer up

This way other layers can be used from the game layer.
This commit is contained in:
Tom Willemse 2022-02-14 00:11:34 -08:00
parent ef89b5f777
commit 68affcf93b

View file

@ -9,10 +9,10 @@
enum layers { enum layers {
BASE, // Default layer BASE, // Default layer
GAME, /* Flipped for games */
SYMNUM, // Symbols and numbers SYMNUM, // Symbols and numbers
MOVEMENT, // Movement/Navigation keys MOVEMENT, // Movement/Navigation keys
UPPER, /* Fake capslock */ UPPER, /* Fake capslock */
GAME, /* Flipped for games */
}; };
enum custom_keycodes { enum custom_keycodes {
@ -58,7 +58,39 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_PGUP, KC_UP, KC_PGUP, KC_UP,
KC_SPC, KC_LGUI, KC_PGDN, KC_DOWN, KC_LGUI, KC_ENT 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 | * | 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, 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_NO, KC_NO, KC_WBAK 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 | | * | | 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,
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 // clang-format on
}; };