From 5657d9ea67655d0f5700d8a129dd7b05d702b26c Mon Sep 17 00:00:00 2001 From: jasmine Date: Wed, 14 May 2025 22:50:07 +0800 Subject: [PATCH] remove prefixes and quot macros --- assets/img/keymaps/ferris-sajenim.svg | 54 ++++++++----------- assets/keymap-drawer/ferris-sajenim.yaml | 6 +-- .../ferris/sweep/keymaps/sajenim/combos.def | 8 +-- 3 files changed, 27 insertions(+), 41 deletions(-) diff --git a/assets/img/keymaps/ferris-sajenim.svg b/assets/img/keymaps/ferris-sajenim.svg index 31778d3..fd22919 100644 --- a/assets/img/keymaps/ferris-sajenim.svg +++ b/assets/img/keymaps/ferris-sajenim.svg @@ -299,74 +299,66 @@ path.combo { stroke: #7f7f7f; } 3 - -M-a - - 4 - + 5 - + 6 - + 7 - - -M1-a - - + 8 - + 9 - + 0 - + Tab - + C-w - + Esc - + Ent - + : + + + +OSShift + + + + + +OSShift + + - - -OSShift - - - - - -OSShift - - - \ diff --git a/assets/keymap-drawer/ferris-sajenim.yaml b/assets/keymap-drawer/ferris-sajenim.yaml index 016ee7d..f5c25c5 100644 --- a/assets/keymap-drawer/ferris-sajenim.yaml +++ b/assets/keymap-drawer/ferris-sajenim.yaml @@ -42,9 +42,7 @@ combos: - {p: [16, 17], k: "Esc", l: ["CANARY"]} - {p: [17, 18], k: "Ent", l: ["CANARY"]} - {p: [21, 22], k: ":", l: ["CANARY"]} - - {p: [22, 23], k: "M-a", l: ["CANARY"]} - - {p: [23, 24], k: "OS Shift", l: ["CANARY"]} - - {p: [25, 26], k: "OS Shift", l: ["CANARY"]} - - {p: [26, 27], k: "M1-a", l: ["CANARY"]} + - {p: [22, 23], k: "OS Shift", l: ["CANARY"]} + - {p: [26, 27], k: "OS Shift", l: ["CANARY"]} - {p: [27, 28], k: "\\", l: ["CANARY"]} diff --git a/keyboards/ferris/sweep/keymaps/sajenim/combos.def b/keyboards/ferris/sweep/keymaps/sajenim/combos.def index b781e42..e96edad 100644 --- a/keyboards/ferris/sweep/keymaps/sajenim/combos.def +++ b/keyboards/ferris/sweep/keymaps/sajenim/combos.def @@ -14,21 +14,17 @@ COMB(NUM_0, KC_0, KC_QUOT, HRM_A) // middle row COMB(rs_tab, KC_TAB, HRM_R, HRM_S) -SUBS(rt_dquo, "\"\"\ei", HRM_R, HRM_T) COMB(st_delwrd, C(KC_BSPC), HRM_S, HRM_T) COMB(ne_esc, KC_ESC, HRM_N, HRM_E) -SUBS(ni_quot, "\'\'\ei", HRM_N, HRM_I) COMB(ei_ent, KC_ENT, HRM_E, HRM_I) SUBS(nei_write, "\e:w\n", HRM_N, HRM_E, HRM_I) // bottom row COMB(jv_coln, KC_COLN, KC_J, KC_V) -COMB(vd_m1a, G(KC_A), KC_V, SYM_D) -COMB(dk_shift, OSM(MOD_LSFT), SYM_D, KC_K) +COMB(vd_shift, OSM(MOD_LSFT), KC_V, SYM_D) -COMB(xh_shift, OSM(MOD_RSFT), KC_X, SYM_H) -COMB(h_slsh_m4a, A(KC_A), SYM_H, KC_SLSH) +COMB(h_slash_shift, OSM(MOD_RSFT), SYM_H, KC_SLSH) COMB(h_comm_lead, QK_LEAD, SYM_H, KC_COMM) COMB(slsh_comm_bsls, KC_BSLS, KC_SLSH, KC_COMM)