From ba1149d9cbd719252339daf8aa837d5e0bbc4a4b Mon Sep 17 00:00:00 2001 From: Michael Petschek Date: Tue, 17 Jan 2023 11:04:04 -0500 Subject: [PATCH] Clean up keymap --- .../crkbd/keymaps/omniczechcolemak/keymap.c | 50 +++++++++++++++---- keyboards/idobao/id87/v2/info.json | 2 +- 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/keyboards/crkbd/keymaps/omniczechcolemak/keymap.c b/keyboards/crkbd/keymaps/omniczechcolemak/keymap.c index f9f71b003aae..482b83bba820 100644 --- a/keyboards/crkbd/keymaps/omniczechcolemak/keymap.c +++ b/keyboards/crkbd/keymaps/omniczechcolemak/keymap.c @@ -25,6 +25,7 @@ along with this program. If not, see . #define _LAYER3 3 #define _LAYER4 4 #define _LAYER5 5 +#define _LAYER6 6 enum custom_keycodes { LAYER0 = SAFE_RANGE, @@ -33,11 +34,26 @@ enum custom_keycodes { LAYER3, LAYER4, LAYER5, + LAYER6, }; #define KC_CAPP LGUI(LSFT(KC_4)) #define MP_SFT OSM(MOD_LSFT) +#define MP_A LCTL_T(KC_A) +#define MP_R LALT_T(KC_R) +#define MP_S LGUI_T(KC_S) +#define MP_T LSFT_T(KC_T) +#define MP_N LSFT_T(KC_N) +#define MP_E LGUI_T(KC_E) +#define MP_I LALT_T(KC_I) +#define MP_O LCTL_T(KC_O) +#define MP_L1 LT(_LAYER1, KC_ESC) +#define MP_L2 LT(_LAYER2, KC_TAB) +#define MP_L3 LT(_LAYER3, KC_SPC) +#define MP_L4 LT(_LAYER4, KC_ENT) +#define MP_L5 LT(_LAYER5, KC_BSPC) +#define MP_L6 LT(_LAYER6, OSM(MOD_LGUI)) enum combos { @@ -62,15 +78,15 @@ combo_t key_combos[COMBO_COUNT] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LAYER0] = LAYOUT( - //,---------+---------------+---------------+---------------+---------------+-------------. .--------------+---------------+---------------+---------------+---------------+---------, - DF(2), KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_EQL, - //,---------+---------------+---------------+---------------+---------------+-------------. .--------------+---------------+---------------+---------------+---------------+---------, - KC_GRAVE, LCTL_T(KC_A), LALT_T(KC_R), LGUI_T(KC_S), LSFT_T(KC_T), KC_G, KC_M, LSFT_T(KC_N), LGUI_T(KC_E), LALT_T(KC_I), LCTL_T(KC_O), KC_QUOT, - //,---------+---------------+---------------+---------------+---------------+-------------. .--------------+---------------+---------------+---------------+---------------+---------, - MP_SFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_MINS, - //,--------------+---------------+-------------. .--------------+---------------+--------, - LT(1,KC_ESC), LT(2,KC_TAB), LT(3,KC_SPC), LT(4,KC_ENT), LT(5,KC_BSPC), KC_RGUI - //,--------------+---------------+-------------. .--------------+---------------+--------, + //,--------+--------+-------+-------+-------+-------. .-------+--------+---------+-------+---------+--------, + DF(2), KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_EQL, + //,--------+--------+-------+-------+-------+-------. .-------+--------+---------+-------+---------+--------, + KC_GRAVE, MP_A, MP_R, MP_S, MP_T, KC_G, KC_M, MP_N, MP_E, MP_I, MP_O, KC_QUOT, + //,--------+--------+-------+-------+-------+-------. .-------+--------+---------+-------+---------+--------, + MP_SFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_MINS, + //,-------+-------+-------. .-------+--------+--------, + MP_L1, MP_L2, MP_L3, MP_L4, MP_L5, MP_L6 + //,-------+-------+-------. .-------+--------+--------, ), [_LAYER1] = LAYOUT( @@ -81,7 +97,7 @@ combo_t key_combos[COMBO_COUNT] = { //,---------+---------------+---------------+---------------+---------------+-------------. .--------------+---------------+---------------+---------------+---------------+---------, MP_SFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, //,--------------+---------------+-------------. .--------------+---------------+--------, - KC_ESC, KC_TAB, KC_SPC, KC_ENT, KC_BSPC, KC_ESC + KC_ESC, KC_TAB, KC_SPC, KC_ENT, KC_BSPC, - KC_ESC //,--------------+---------------+-------------. .--------------+---------------+--------, ), @@ -131,5 +147,17 @@ combo_t key_combos[COMBO_COUNT] = { //,--------------+---------------+-------------. .--------------+---------------+--------, KC_NO, KC_NO, KC_NO, KC_ENT, KC_BSPC, KC_LGUI //,--------------+---------------+-------------. .--------------+---------------+--------, - ) + ), +[_LAYER6] = LAYOUT( + //,---------+---------------+---------------+---------------+---------------+-------------. .--------------+---------------+---------------+---------------+---------------+---------, + 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, + //,---------+---------------+---------------+---------------+---------------+-------------. .--------------+---------------+---------------+---------------+---------------+---------, + MP_SFT, 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 + //,--------------+---------------+-------------. .--------------+---------------+--------, + +) }; \ No newline at end of file diff --git a/keyboards/idobao/id87/v2/info.json b/keyboards/idobao/id87/v2/info.json index 7292ce29ca19..f51d96b9ca75 100644 --- a/keyboards/idobao/id87/v2/info.json +++ b/keyboards/idobao/id87/v2/info.json @@ -16,7 +16,7 @@ }, "debounce": 5, "matrix_pins": { - "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "cols": ["D0", "D1", "D2-", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"] }, "processor": "atmega32u4",