From 41631882799bd1a0144317bccfeddbb41916100d Mon Sep 17 00:00:00 2001 From: jasmine Date: Fri, 25 Apr 2025 22:37:45 +0800 Subject: [PATCH] update keymap --- keyboards/ferris/keymaps/sajenim/combos.def | 52 +++++++++++++-------- keyboards/ferris/keymaps/sajenim/config.h | 5 +- keyboards/ferris/keymaps/sajenim/keymap.c | 43 ++++++++++------- 3 files changed, 60 insertions(+), 40 deletions(-) diff --git a/keyboards/ferris/keymaps/sajenim/combos.def b/keyboards/ferris/keymaps/sajenim/combos.def index 77da0d9..e075c2e 100644 --- a/keyboards/ferris/keymaps/sajenim/combos.def +++ b/keyboards/ferris/keymaps/sajenim/combos.def @@ -1,28 +1,40 @@ // clang-format off // name result 1st chord key 2nd chord key 3rd chord key -COMB(WC_1, KC_1, KC_W, KC_C) -COMB(LR_2, KC_2, KC_L, LCTL_T(KC_R)) -COMB(YS_3, KC_3, KC_Y, LALT_T(KC_S)) -COMB(PT_4, KC_4, KC_P, LGUI_T(KC_T)) -COMB(BG_5, KC_5, KC_B, KC_G) -COMB(ZM_6, KC_6, KC_Z, KC_M) -COMB(FN_7, KC_7, KC_F, RGUI_T(KC_N)) -COMB(OE_8, KC_8, KC_O, RALT_T(KC_E)) -COMB(UI_9, KC_9, KC_U, RCTL_T(KC_I)) -COMB(QOUTA_0, KC_0, KC_QUOT, KC_A) -COMB(RS_TAB, KC_TAB, LCTL_T(KC_R), LALT_T(KC_S)) -COMB(ST_BSPC, LCTL(KC_BSPC), LALT_T(KC_S), LGUI_T(KC_T)) -COMB(NE_ESC, KC_ESC, RGUI_T(KC_N), RALT_T(KC_E)) -COMB(EI_ENT, KC_ENT, RALT_T(KC_E), RCTL_T(KC_I)) -SUBS(YP_HOME, "~/", KC_Y, KC_P) -SUBS(FO_UPDIR, "../", KC_F, KC_O) -COMB(VD_COLN, KC_COLN, KC_V, LT(SYM, KC_D)) -COMB(HSLSH_BSLS, KC_BSLS, LT(SYM, KC_H), KC_SLSH) -SUBS(NEI_SAVE, SS_TAP(X_ESC)":w"SS_TAP(X_ENT), RGUI_T(KC_N), RALT_T(KC_E), RCTL_T(KC_I)) +// vertical +COMB(NUM_1, KC_1, KC_W, LSFT_T(KC_C)) +COMB(NUM_2, KC_2, KC_L, LCTL_T(KC_R)) +COMB(NUM_3, KC_3, KC_Y, LALT_T(KC_S)) +COMB(NUM_4, KC_4, KC_P, LGUI_T(KC_T)) +COMB(NUM_5, KC_5, KC_B, KC_G) +COMB(NUM_6, KC_6, KC_Z, KC_M) +COMB(NUM_7, KC_7, KC_F, RGUI_T(KC_N)) +COMB(NUM_8, KC_8, KC_O, RALT_T(KC_E)) +COMB(NUM_9, KC_9, KC_U, RCTL_T(KC_I)) +COMB(NUM_0, KC_0, KC_QUOT, RSFT_T(KC_A)) -COMB(CAPSWRD, CW_TOGG, LSFT_T(KC_SPC), RSFT_T(KC_BSPC)) +// top row +COMB(FORWRD_WRD, C(KC_RGHT), KC_F, KC_O) +COMB(GO_END, KC_END, KC_O, KC_U) +COMB(BCKWRD_WRD, C(KC_LEFT), KC_Y, KC_P) +COMB(GO_HOME, KC_HOME, KC_L, KC_Y) + +// middle row +COMB(TAB, KC_TAB, LCTL_T(KC_R), LALT_T(KC_S)) +COMB(DELWRD, C(KC_BSPC), LALT_T(KC_S), LGUI_T(KC_T)) +COMB(ESCAPE, KC_ESC, RGUI_T(KC_N), RALT_T(KC_E)) +COMB(ENTER, KC_ENT, RALT_T(KC_E), RCTL_T(KC_I)) +COMB(CAPSWRD, CW_TOGG, LCTL_T(KC_R), LALT_T(KC_S), LGUI_T(KC_T)) +SUBS(VIM_SAVE, SS_TAP(X_ESC)":w"SS_TAP(X_ENT), RGUI_T(KC_N), RALT_T(KC_E), RCTL_T(KC_I)) + +// bottom row +COMB(COLN, KC_COLN, KC_J, KC_V) +COMB(OS_LSFT, OSM(MOD_LSFT), KC_V, LT(SYM, KC_D)) +COMB(BACKSLASH, KC_BSLS, KC_SLSH, KC_COMM) +COMB(OS_RSFT, OSM(MOD_RSFT), LT(SYM, KC_H), KC_SLSH) + +// thumb COMB(SLEEP, KC_SLEP, LT(NAV, QK_REP), LT(NUM, QK_AREP)) /* vim: set filetype=c: */ diff --git a/keyboards/ferris/keymaps/sajenim/config.h b/keyboards/ferris/keymaps/sajenim/config.h index bdebd5b..93e9f77 100644 --- a/keyboards/ferris/keymaps/sajenim/config.h +++ b/keyboards/ferris/keymaps/sajenim/config.h @@ -6,11 +6,12 @@ // Tap-Hold configuration for home row mods. #define TAPPING_TERM 175 #define PERMISSIVE_HOLD +#define CHORDAL_HOLD #define QUICK_TAP_TERM 0 // Timeouts -#define ONESHOT_TIMEOUT 3000 -#define CAPS_WORD_IDlE_TIMEOUT 3000 +#define ONESHOT_TIMEOUT 5000 +#define CAPS_WORD_IDlE_TIMEOUT 5000 // Combo keys are always checked from layer 0. #define COMBO_ONLY_FROM_LAYER 0 diff --git a/keyboards/ferris/keymaps/sajenim/keymap.c b/keyboards/ferris/keymaps/sajenim/keymap.c index 6725030..3aff9f0 100644 --- a/keyboards/ferris/keymaps/sajenim/keymap.c +++ b/keyboards/ferris/keymaps/sajenim/keymap.c @@ -26,8 +26,11 @@ enum layers { #include "g/keymap_combo.h" // layer names must be defined before engine include enum custom_keycodes { + HOME = SAFE_RANGE, + UPDIR, + // Magic Keycodes - MG_EFORE = SAFE_RANGE, + MG_EFORE, MG_ON, MG_UST, MG_ENT, @@ -45,8 +48,6 @@ enum custom_keycodes { #define NAV_REP LT(NAV, QK_REP) #define NUM_MAG LT(NUM, QK_AREP) -#define SPC_SFT LSFT_T(KC_SPC) -#define BAK_SFT RSFT_T(KC_BSPC) /* Home Row Mods: * https://precondition.github.io/home-row-mods */ @@ -59,8 +60,8 @@ enum custom_keycodes { #define HRM_E RALT_T(KC_E) #define HRM_I RCTL_T(KC_I) #define HRM_A RSFT_T(KC_A) -#define HRM_D LT(SYM, KC_D) -#define HRM_H LT(SYM, KC_H) +#define SYM_D LT(SYM, KC_D) +#define SYM_H LT(SYM, KC_H) /* One Shot Keys: * https://github.com/qmk/qmk_firmware/blob/master/docs/one_shot_keys.md */ @@ -89,23 +90,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,--------------------------------------------. ,--------------------------------------------. KC_W, KC_L, KC_Y, KC_P, KC_B, KC_Z, KC_F, KC_O, KC_U, KC_QUOT, //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------| - KC_C, HRM_R, HRM_S, HRM_T, KC_G, KC_M, HRM_N, HRM_E, HRM_I, KC_A, + HRM_C, HRM_R, HRM_S, HRM_T, KC_G, KC_M, HRM_N, HRM_E, HRM_I, HRM_A, //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------| - KC_Q, KC_J, KC_V, HRM_D, KC_K, KC_X, HRM_H, KC_SLSH, KC_COMM, KC_DOT, + KC_Q, KC_J, KC_V, SYM_D, KC_K, KC_X, SYM_H, KC_SLSH, KC_COMM, KC_DOT, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - NAV_REP, SPC_SFT, BAK_SFT, NUM_MAG + NAV_REP, KC_SPC, KC_BSPC, NUM_MAG //`-----------------' `-----------------' ), [NAV] = LAYOUT_split_3x5_2( //,--------------------------------------------. ,--------------------------------------------. - KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, KC_PGUP, KC_HOME, KC_UP, KC_END, XXXXXXX, + XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU, KC_PGUP, KC_HOME, KC_UP, KC_END, XXXXXXX, //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------| - KC_VOLD, OS_LCTL, OS_LALT, OS_LGUI, XXXXXXX, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, + OS_LSFT, OS_LCTL, OS_LALT, OS_LGUI, KC_VOLD, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------| CK_UNDO, CK_CUT, CK_COPY, CK_PSTE, XXXXXXX, XXXXXXX, KC_BSPC, XXXXXXX, XXXXXXX, XXXXXXX, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - _______, XXXXXXX, OS_RSFT, _______ + _______, XXXXXXX, XXXXXXX, _______ //`-----------------' `-----------------' ), @@ -113,17 +114,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //,--------------------------------------------. ,--------------------------------------------. KC_LPRN, KC_7, KC_8, KC_9, KC_RPRN, XXXXXXX, KC_ASTR, KC_PERC, KC_SLSH, XXXXXXX, //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------| - KC_0, KC_4, KC_5, KC_6, KC_DOT, XXXXXXX, OS_RGUI, OS_RALT, OS_RCTL, XXXXXXX, + KC_0, KC_4, KC_5, KC_6, KC_DOT, XXXXXXX, OS_RGUI, OS_RALT, OS_RCTL, OS_RSFT, //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------| KC_LABK, KC_1, KC_2, KC_3, KC_RABK, XXXXXXX, KC_PLUS, KC_EQL, KC_MINS, XXXXXXX, //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| - _______, OS_LSFT, XXXXXXX, _______ + _______, XXXXXXX, XXXXXXX, _______ //`-----------------' `-----------------' ), [SYM] = LAYOUT_split_3x5_2( //,--------------------------------------------. ,--------------------------------------------. - KC_GRV, KC_LABK, KC_MINS, KC_RABK, XXXXXXX, XXXXXXX, KC_LBRC, KC_UNDS, KC_RBRC, KC_PLUS, + KC_GRV, KC_LABK, KC_MINS, KC_RABK, HOME, UPDIR, KC_LBRC, KC_UNDS, KC_RBRC, KC_PLUS, //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------| KC_EXLM, KC_LPRN, KC_EQL, KC_RPRN, KC_HASH, KC_PERC, KC_LCBR, KC_DLR, KC_RCBR, KC_SCLN, //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------| @@ -167,7 +168,7 @@ uint16_t get_alt_repeat_key_keycode_user(uint16_t keycode, uint8_t mods) { case KC_O: return KC_E; // "OE" sfb (0.060%) case KC_P: return KC_T; // "PT" sfb (0.050%) case HRM_S: return KC_Y; // "SY" sfb (0.024%) - case HRM_D: return KC_G; // "DG" sfb (0.021%) + case SYM_D: return KC_G; // "DG" sfb (0.021%) // Magic Keycodes case KC_B: return MG_EFORE; @@ -180,7 +181,7 @@ uint16_t get_alt_repeat_key_keycode_user(uint16_t keycode, uint8_t mods) { case KC_W: return MG_HICH; case KC_X: return MG_ES; case KC_COMM: return MG_BUT; - case SPC_SFT: return MG_THE; + case KC_SPC: return MG_THE; } return KC_TRNS; // clang-format on @@ -196,17 +197,23 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { process_repeat_key(QK_REP, record); return false; } + return true; case NUM_MAG: if (record->tap.count) { process_repeat_key(QK_AREP, record); return false; } + return true; } // clang-format off if (record->event.pressed) { int rep_count = get_repeat_key_count(); switch (keycode) { + case HOME: SEND_STRING("~/" ); return false; + case UPDIR: SEND_STRING("../" ); return false; + + // Magic keycodes case MG_EFORE: SEND_STRING(/*b*/ "efore"); return false; case MG_ON: SEND_STRING(/*i*/ "on" ); return false; case MG_UST: SEND_STRING(/*j*/ "ust" ); return false; @@ -222,7 +229,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (rep_count > 0) { switch (keycode) { // Repeat Key Overrides - case KC_A: SEND_STRING(/*a*/ "nd" ); return false; // "and" trigram (3.293%) + case HRM_A: SEND_STRING(/*a*/ "nd" ); return false; // "and" trigram (3.293%) case HRM_I: SEND_STRING(/*i*/ "ng" ); return false; // "ing" trigram (3.476%) case KC_Y: SEND_STRING(/*y*/ "ou" ); return false; // "you" trigram (3.492%) case HRM_N: SEND_STRING(/*n*/ "f" ); return false; // "nf" sfb (0.036%) @@ -230,7 +237,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case KC_W: SEND_STRING(/*w*/ "ould" ); return false; // "would" brief case KC_COMM: SEND_STRING(/*,*/ " and" ); return false; // ", and" brief case KC_DOT: SEND_STRING(/*.*/ "org" ); return false; // ".org" brief - case SPC_SFT: SEND_STRING(/* */ "for" ); return false; // " for" brief + case KC_SPC: SEND_STRING(/* */ "for" ); return false; // " for" brief } } }