diff --git a/keyboards/crkbd/keymaps/aleksbrgt/config.h b/keyboards/crkbd/keymaps/aleksbrgt/config.h index 5998e551..23c735ab 100644 --- a/keyboards/crkbd/keymaps/aleksbrgt/config.h +++ b/keyboards/crkbd/keymaps/aleksbrgt/config.h @@ -4,4 +4,4 @@ #define USE_SERIAL_PD2 -#define COMBO_COUNT 2 +#define COMBO_COUNT 1 diff --git a/keyboards/crkbd/keymaps/aleksbrgt/keymap.c b/keyboards/crkbd/keymaps/aleksbrgt/keymap.c index 4a30bfaa..b90c915a 100644 --- a/keyboards/crkbd/keymaps/aleksbrgt/keymap.c +++ b/keyboards/crkbd/keymaps/aleksbrgt/keymap.c @@ -1,48 +1,68 @@ #include QMK_KEYBOARD_H #include -enum custom_layers { - BSE, // Base - NUM, // Numbers and symbols - NAV, // Navigation - MED, // Media keys - FUN, // Function keys - OTH, // "Other", caps, menu context, rctrl (rctrl is supposed to be used as the compose key https://en.wikipedia.org/wiki/Compose_key), - PRN +enum { + // Home + // > qwerty + // > home row with modifiers + HME, + // Numbers and symbols + // > keypad like layout on the right side + // > uses the number row key codes to easily combine numbers and symbols + // > frames the numbers with remaining symbols + NUM, + // Cursor movement + // > vi style arrow keys + // > home / end, page up / page down + CUR, + // Media keys + // > volume up, down, mute + // > previous, next, pause + MED, + // Function keys + // > F1 to F9 reuse the NUM layer numbers + // > F10 to F12 on the outer right column + FUN, + // Misc, keys that don't fit well in other layout + // > Caps Lock + // > App Menu + // > Include the right ctrl key with the intent to use it as the Compose Key + // > See https://en.wikipedia.org/wiki/Compose_key), + MSC }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [BSE] = LAYOUT_split_3x5_3( + [HME] = LAYOUT_split_3x5_3( // --------------------------------------- --------------------------------------- - // | Q MED W | E | R | T | | Y | U | I | 0 | P | + // | Q | W | E | R | T | | Y | U | I | 0 | P | // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| // | A GUI | S ALT | D CTL | F SFT | G | | H | J SFT | K CTL | L ALT | ' GUI | // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| // | Z | X | C | V | B | | N | M | , | . | / | // -------+-------+-------+-------+-------+------- -------+-------+-------+-------+-------+------- - // |ESC OTH|SPC NUM|TAB NAV| |ENT FUN| BSP | DEL | + // |ESC MED|SPC NUM|TAB MSC| |ENT CUR|BSP FUN| DEL | // -------+-------+------- -------+-------+------- KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, - LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, RSFT_T(KC_J), LCTL_T(KC_K), RALT_T(KC_L), RGUI_T(KC_QUOT), + LGUI_T(KC_A), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, LSFT_T(KC_J), LCTL_T(KC_K), LALT_T(KC_L), LGUI_T(KC_QUOT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, - LT(OTH, KC_ESC), LT(NUM, KC_SPC), LT(NAV, KC_TAB), LT(FUN, KC_ENT), KC_BSPC, KC_DEL + LT(MED, KC_ESC), LT(NUM, KC_SPC), LT(MSC, KC_TAB), LT(CUR, KC_ENT), LT(FUN, KC_BSPC), KC_DEL ), [NUM] = LAYOUT_split_3x5_3( // --------------------------------------- --------------------------------------- - // | | | ( | ) | | | [ { | 7 & | 8 * | 9 ( | ] } | + // | | ( | ) | | | | [ { | 7 & | 8 * | 9 | ] } | // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| - // | GUI | CTL | ALT | SFT | - | | = + | 4 $ | 5 % | 6 ^ | ; | + // | GUI | ALT | CTRL | SFT | - | | = + | 4 $ | 5 % | 6 ^ | ; : | // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| - // | | | | | _ | | \ | | 1 ! | 2 @ | 3 # | ` | + // | | | | | _ | | \ | | 1 ! | 2 @ | 3 # | ` ~ | // -------+-------+-------+-------+-------+------- -------+-------+-------+-------+-------+------- - // | ESC | SPC | TAB | | | 0 ) | | + // | ESC | SPC | TAB | | | 0 | | // -------+-------+------- -------+-------+------- - XXXXXXX, XXXXXXX, KC_LPRN, KC_RPRN, XXXXXXX, KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, + XXXXXXX, KC_LPRN, KC_RPRN, XXXXXXX, XXXXXXX, KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, KC_MINS, KC_EQL, KC_4, KC_5, KC_6, KC_SCLN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UNDS, KC_BSLS, KC_1, KC_2, KC_3, KC_GRV, KC_ESC, KC_SPC, KC_TAB, XXXXXXX, KC_0, XXXXXXX ), - [NAV] = LAYOUT_split_3x5_3( + [CUR] = LAYOUT_split_3x5_3( // --------------------------------------- --------------------------------------- // | | | | | | | | | | | | // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| @@ -74,11 +94,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [FUN] = LAYOUT_split_3x5_3( // --------------------------------------- --------------------------------------- - // | | | | | | | | F 7 | F 8 | F 9 | | + // | | | | | | | | F 7 | F 8 | F 9 | F10 | // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| - // | GUI | ALT | CTL | SFT | | | | F 4 | F 5 | F 6 | | + // | GUI | ALT | CTL | SFT | | | | F 4 | F 5 | F 6 | F11 | // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| - // | | | | | | | | F 1 | F 2 | F 3 | | + // | | | | | | | | F 1 | F 2 | F 3 | F12 | // -------+-------+-------+-------+-------+------- -------+-------+-------+-------+-------+------- // | ESC | SPC | TAB | | | | | // -------+-------+------- -------+-------+------- @@ -87,42 +107,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F12, KC_ESC, KC_SPC, KC_TAB, XXXXXXX, XXXXXXX, XXXXXXX ), - [OTH] = LAYOUT_split_3x5_3( + [MSC] = LAYOUT_split_3x5_3( // --------------------------------------- --------------------------------------- - // | | | | | | | | | | | | + // | | | | | | | | | | | PSCR | // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| - // | CAPS | | | | | | | | | | R CTL | + // | CAPS | | | | | | | | | | RCTL | // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| - // | | | | | | | | | | | APP | + // | | CUT | COPY | PASTE | | | | | | | APP | // -------+-------+-------+-------+-------+------- -------+-------+-------+-------+-------+------- // | ESC | SPC | TAB | | | | | // -------+-------+------- -------+-------+------- - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_CAPS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RCTL, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_APP, + XXXXXXX, KC_CUT, KC_COPY, KC_PASTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_APP, KC_ESC, KC_SPC, KC_TAB, XXXXXXX, XXXXXXX, XXXXXXX - ), - [PRN] = LAYOUT_split_3x5_3( - // --------------------------------------- --------------------------------------- - // | | | | | | | | | | | | - // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| - // | CAPS | | | | | | | | | | R CTL | - // |-------+-------+-------+-------+-------| |-------+-------+-------+-------+-------| - // | | | | | | | | | | | APP | - // -------+-------+-------+-------+-------+------- -------+-------+-------+-------+-------+------- - // | ESC | SPC | TAB | | | | | - // -------+-------+------- -------+-------+------- - KC_Q, XXXXXXX, KC_E, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, - XXXXXXX, XXXXXXX, KC_F, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - KC_ESC, KC_SPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX - ), + ) }; -const uint16_t PROGMEM combo_media[] = {KC_Q, KC_W, COMBO_END}; -const uint16_t PROGMEM combo_prn[] = {KC_Q, KC_E, COMBO_END}; +const uint16_t PROGMEM combo_ralt[] = {KC_I, KC_O, COMBO_END}; combo_t key_combos[COMBO_COUNT] = { - COMBO(combo_media, MO(MED)), - COMBO(combo_prn, TG(PRN)), + COMBO(combo_ralt, KC_RALT) }; diff --git a/keyboards/crkbd/keymaps/aleksbrgt/rules.mk b/keyboards/crkbd/keymaps/aleksbrgt/rules.mk index b62cfc83..d70b592f 100644 --- a/keyboards/crkbd/keymaps/aleksbrgt/rules.mk +++ b/keyboards/crkbd/keymaps/aleksbrgt/rules.mk @@ -1,18 +1,3 @@ -AUTO_SHIFT_ENABLE = no -BACKLIGHT_ENABLE = no -RGBLIGHT_ENABLE = no -UNICODE_ENABLE = no -CONSOLE_ENABLE = no -COMMAND_ENABLE = no -RGBLIGHT_SUPPORTED = no RGB_MATRIX_SUPPORTED = no - - COMBO_ENABLE = yes - BOOTLOADER = atmel-dfu - -BOOTMAGIC_ENABLE = noss -LTO_ENABLE = yes - -WPM_ENABLE = yes