From a214b2dd0e824a824ff97d30198be31cf675b776 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Wed, 31 Jan 2024 06:29:03 -0600 Subject: [PATCH 1/7] remap few keys --- qmk/yuanw/keymap.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/qmk/yuanw/keymap.c b/qmk/yuanw/keymap.c index 6a17530..51ece18 100644 --- a/qmk/yuanw/keymap.c +++ b/qmk/yuanw/keymap.c @@ -67,9 +67,9 @@ enum my_keycodes { RDO = SAFE_RANGE, // clang-format off /** \brief QWERTY layout (3 rows, 10 columns). */ #define LAYOUT_LAYER_BASE \ - KC_QUESTION, KC_W, KC_M, KC_P, KC_Q, KC_Z, KC_K, KC_COMM, KC_DOT, KC_SCLN, \ + KC_QUESTION, KC_W, KC_M, KC_P, KC_Q, KC_Z, KC_COMM, KC_SCLN, KC_DOT, KC_Z, \ KC_R, KC_S, KC_N, KC_T, KC_G, KC_V, KC_H, KC_A, KC_I, KC_O, \ - KC_X, KC_C, KC_F, KC_D, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, \ + KC_X, KC_C, KC_F, KC_D, KC_B, KC_J, KC_G, KC_U, KC_Y, KC_QUOT, \ ESC_MED, SPC_NAV, TAB_FUN, ENT_SYM, E_NUM /** Convenience row shorthands. */ @@ -96,7 +96,7 @@ enum my_keycodes { RDO = SAFE_RANGE, * from the base layer to enable auto-repeat. */ #define LAYOUT_LAYER_FUNCTION \ - _______________DEAD_HALF_ROW_______________, XXXXXXX, XXXXXXX, KC_LCBR, KC_BSLS, KC_RCBR, \ + _______________DEAD_HALF_ROW_______________, XXXXXXX, KC_LCBR, KC_BSLS, KC_RCBR, XXXXXXX, \ ______________HOME_ROW_GACS_L______________, KC_SCRL, LAG(KC_1), LAG(KC_2), LAG(KC_3), LAG(KC_4), \ _______________DEAD_HALF_ROW_______________, KC_PAUS, LSG(KC_1), LSG(KC_2), LSG(KC_3), LSG(KC_4), \ XXXXXXX, XXXXXXX, _______, XXXXXXX, KC_TAB @@ -107,8 +107,8 @@ enum my_keycodes { RDO = SAFE_RANGE, * symmetrical to accomodate the left- and right-hand trackball. */ #define LAYOUT_LAYER_MEDIA \ - XXXXXXX,RGB_RMOD, RGB_TOG, RGB_MOD, XXXXXXX, XXXXXXX, KC_V, KC_LBRC, KC_SLSH, KC_RBRC, \ - KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, QK_CAPS_WORD_TOGGLE, KC_H, KC_J, KC_K, KC_L, \ + XXXXXXX,RGB_RMOD, RGB_TOG, RGB_MOD, XXXXXXX, XXXXXXX, KC_LBRC, KC_SLSH, KC_RBRC, XXXXXXX, \ + KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, QK_CAPS_WORD_TOGGLE, KC_HOME, KC_PGDN, KC_PGUP, KC_END, \ XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR, QK_BOOT, QK_BOOT, KC_HOME, KC_PGDN, KC_PGUP, KC_END, \ _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_TAB @@ -128,7 +128,7 @@ enum my_keycodes { RDO = SAFE_RANGE, * base layer to avoid having to layer change mid edit and to enable auto-repeat. */ #define LAYOUT_LAYER_NAVIGATION \ - _______________DEAD_HALF_ROW_______________, XXXXXXX, XXXXXXX, KC_LPRN, KC_PIPE, KC_RPRN, \ + _______________DEAD_HALF_ROW_______________, XXXXXXX, KC_LPRN, KC_PIPE, KC_RPRN, XXXXXXX, \ ______________HOME_ROW_GACS_L______________, KC_CAPS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, \ _______________DEAD_HALF_ROW_______________, RDO, PST, CPY, CUT, UND, \ XXXXXXX, _______, XXXXXXX, ALTREP2 , ALTREP3 @@ -265,11 +265,13 @@ void rgb_matrix_update_pwm_buffers(void); enum combos { FD_B, - LU_J, + GU_J, MP_Q, - KCOMM_Z, + COMMSCLN_K, + SCLNDOT_Z, LEFT_QUESTION, CF_X, + UY_L, COMBO_LENGTH }; uint16_t COMBO_LEN = COMBO_LENGTH; // remove the COMBO_COUNT define and use this instead! @@ -277,17 +279,21 @@ uint16_t COMBO_LEN = COMBO_LENGTH; // remove the COMBO_COUNT define and use this const uint16_t PROGMEM b_combo[] = {KC_F, KC_D, COMBO_END}; const uint16_t PROGMEM j_combo[] = {KC_L, KC_U, COMBO_END}; const uint16_t PROGMEM q_combo[] = {KC_M, KC_P, COMBO_END}; -const uint16_t PROGMEM z_combo[] = {KC_K, KC_COMM, COMBO_END}; +const uint16_t PROGMEM k_combo[] = {KC_COMM, KC_SCLN, COMBO_END}; +const uint16_t PROGMEM z_combo[] = {KC_SCLN, KC_DOT, COMBO_END}; const uint16_t PROGMEM left_combo[] = {KC_W, KC_M, COMBO_END}; const uint16_t PROGMEM x_combo[] = {KC_C, KC_F, COMBO_END}; +const uint16_t PROGMEM l_combo[] = {KC_U, KC_Y, COMBO_END}; combo_t key_combos[] = { [FD_B] = COMBO(b_combo, KC_B), - [LU_J] = COMBO(j_combo, KC_J), + [GU_J] = COMBO(j_combo, KC_J), [MP_Q] = COMBO(q_combo, KC_Q), - [KCOMM_Z] = COMBO(z_combo, KC_Z), + [COMMSCLN_K] = COMBO(k_combo, KC_K), + [SCLNDOT_Z] = COMBO(z_combo, KC_Z), [LEFT_QUESTION] = COMBO(left_combo, KC_QUESTION), [CF_X] = COMBO(x_combo, KC_X), + [UY_L] = COMBO(l_combo, KC_l), }; // Use ALTREP2 and ALTREP3 in your layout... From fbd715376328e1a981922fc9d4788cd37cd16882 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Wed, 31 Jan 2024 07:03:56 -0600 Subject: [PATCH 2/7] fix typo --- qmk/yuanw/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qmk/yuanw/keymap.c b/qmk/yuanw/keymap.c index 51ece18..d7cb582 100644 --- a/qmk/yuanw/keymap.c +++ b/qmk/yuanw/keymap.c @@ -293,7 +293,7 @@ combo_t key_combos[] = { [SCLNDOT_Z] = COMBO(z_combo, KC_Z), [LEFT_QUESTION] = COMBO(left_combo, KC_QUESTION), [CF_X] = COMBO(x_combo, KC_X), - [UY_L] = COMBO(l_combo, KC_l), + [UY_L] = COMBO(l_combo, KC_L), }; // Use ALTREP2 and ALTREP3 in your layout... From 87ff6f728b69e7fb1f2b098686265f46975e6313 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Wed, 31 Jan 2024 07:24:13 -0600 Subject: [PATCH 3/7] fix j comb --- qmk/yuanw/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qmk/yuanw/keymap.c b/qmk/yuanw/keymap.c index d7cb582..1f74da8 100644 --- a/qmk/yuanw/keymap.c +++ b/qmk/yuanw/keymap.c @@ -277,7 +277,7 @@ enum combos { uint16_t COMBO_LEN = COMBO_LENGTH; // remove the COMBO_COUNT define and use this instead! const uint16_t PROGMEM b_combo[] = {KC_F, KC_D, COMBO_END}; -const uint16_t PROGMEM j_combo[] = {KC_L, KC_U, COMBO_END}; +const uint16_t PROGMEM j_combo[] = {KC_G, KC_U, COMBO_END}; const uint16_t PROGMEM q_combo[] = {KC_M, KC_P, COMBO_END}; const uint16_t PROGMEM k_combo[] = {KC_COMM, KC_SCLN, COMBO_END}; const uint16_t PROGMEM z_combo[] = {KC_SCLN, KC_DOT, COMBO_END}; From 726b0a78b8ce731aea586741f3d1fe8a1288d43d Mon Sep 17 00:00:00 2001 From: yuanwang Date: Wed, 31 Jan 2024 08:55:31 -0600 Subject: [PATCH 4/7] wip --- reiryoku.svg | 428 ++++++++++++++++++++++++-------------------------- reiryoku.yaml | 12 +- 2 files changed, 213 insertions(+), 227 deletions(-) diff --git a/reiryoku.svg b/reiryoku.svg index 2f7d81a..833c25a 100644 --- a/reiryoku.svg +++ b/reiryoku.svg @@ -100,8 +100,8 @@ path.combo { } /* End Tabler Icons Cleanup */ - -Base: + +L0: @@ -129,42 +129,39 @@ path.combo { -K +, -, -< +; . -> -; -: +Z R -⌘ +LGUI S -⌥ +LALT N -⌃ +LCTL T -⇧ +LSFT @@ -177,27 +174,29 @@ path.combo { H -⇧ +RSFT A -⌃ +RCTL I -⌥ +LALT O -⌘ +RGUI -x -Cursor + +LT(LAYERPOINTER, +X) + @@ -221,7 +220,7 @@ path.combo { -L +G @@ -233,62 +232,50 @@ path.combo { -' -Cursor + +LT(LAYERPOINTER, +QUOT) + -Esc -Media + +LT(LAYERMEDIA, +ESC) + -SPC -Nav + +LT(LAYERNAVIGATION, +SPC) + -⌫ -Fun + +LT(LAYERFUNCTION, +BSPC) + -⏎ -Sym + +LT(LAYERSYMBOLS, +ENT) + -e -Num - - - -? - - - -Q - - - -Z - - - -B - - - -X - - - -J + +LT(LAYERNUMERAL, +E) + - -Cursor: + +L1: @@ -310,57 +297,60 @@ path.combo { +{ +\ +} -⌘ +LGUI -⌥ +LALT -⌃ +LCTL -⇧ +LSFT +SCRL -⇧ +LAG(1) -⌃ +LAG(2) -⌥ +LAG(3) -⌘ +LAG(4) - - -▽ + + @@ -370,62 +360,51 @@ path.combo { - -EECLR - - -QKBOOT - - -QKBOOT - +PAUS - -EECLR - +LSG(1) +LSG(2) +LSG(3) - - -▽ + + +LSG(4) -BTN2 -BTN1 - - -BTN3 + + +▽ -BTN3 -BTN1 +TAB - -Fun: + +L2: @@ -447,57 +426,57 @@ path.combo { +( -{ +| -\ +) -} -⌘ +LGUI -⌥ +LALT -⌃ +LCTL -⇧ +LSFT -SCRL +CAPS -⌘⌥1 +LEFT -⌘⌥2 +DOWN -⌘⌥3 +UP -⌘⌥4 +RGHT @@ -516,45 +495,46 @@ path.combo { -PAUS +RDO -⌘⇧1 +PST -⌘⇧2 +CPY -⌘⇧3 +CUT -⌘⇧4 +UND - - - - + ▽ + + + +ALTREP2 -TAB +ALTREP3 - -Med: + +L3: @@ -585,61 +565,62 @@ path.combo { -V +[ -[ +/ -/ +] -] -⇤ +MPRV -🔉 +VOLD -🔇 +MUTE -🔊 +VOLU -⇥ +MNXT -CapsWord +QKCAPS +WORD +TOGGLE -H +HOME -J +PGDN -K +PGUP -L +END @@ -703,23 +684,28 @@ path.combo { - -Nav: + +L4: +[ +7 +8 +9 +] @@ -729,136 +715,130 @@ path.combo { -( -| -) -⌘ +; -⌥ +4 -⌃ +5 -⇧ +6 += -⇪ -◁ +LSFT -▽ +LCTL -△ +LALT -▷ +LGUI +` +1 +2 +3 +\ -RDO -PST -CPY -CUT -UND +. - - -▽ + + +0 +- - -↺2 - - - - -↺3 - + + +▽ - -Num: + +L5: -[ +{ -7 +& -8 +* -9 +( -] +} @@ -877,63 +857,62 @@ path.combo { -; -: +: -4 +$ -5 +% -6 +^ -= ++ -⇧ +LSFT -⌃ +LCTL -⌥ +LALT -⌘ +LGUI -` +~ -1 +! -2 +@ -3 +# -\ +| @@ -952,48 +931,46 @@ path.combo { -. -> + +QKREP + -0 + +QKAREP + -- - - - +_ - + ▽ + + + - -Sym: + +L6: -{ -& -* -( -} @@ -1012,68 +989,75 @@ path.combo { -: +LGUI -$ +LALT -% +LCTL -^ +LSFT -+ -⇧ +LSFT -⌃ +LCTL -⌥ +LALT -⌘ +LGUI - - -~ + + +▽ -! -@ -# + +EECLR + -| + +QKBOOT + + +QKBOOT + + +EECLR + @@ -1081,27 +1065,29 @@ path.combo { - - + + +▽ -↻ +BTN2 -↺ +BTN1 -_ +BTN3 - - -▽ + + +BTN3 +BTN1 diff --git a/reiryoku.yaml b/reiryoku.yaml index 710f6e8..d767ef5 100644 --- a/reiryoku.yaml +++ b/reiryoku.yaml @@ -1,7 +1,7 @@ layout: {qmk_keyboard: bastardkb/charybdis/3x5/v2/splinky_3, qmk_layout: LAYOUT} layers: L0: - - ['?', W, M, P, Q, Z, K, ',', ., ;] + - ['?', W, M, P, Q, Z, ',', ;, ., Z] - - {t: R, h: LGUI} - {t: S, h: LALT} - {t: N, h: LCTL} @@ -12,10 +12,10 @@ layers: - {t: A, h: RCTL} - {t: I, h: LALT} - {t: O, h: RGUI} - - ['LT(LAYER POINTER, X)', C, F, D, B, J, L, U, Y, 'LT(LAYER POINTER, QUOT)'] + - ['LT(LAYER POINTER, X)', C, F, D, B, J, G, U, Y, 'LT(LAYER POINTER, QUOT)'] - ['LT(LAYER MEDIA, ESC)', 'LT(LAYER NAVIGATION, SPC)', 'LT(LAYER FUNCTION, BSPC)', 'LT(LAYER SYMBOLS, ENT)', 'LT(LAYER NUMERAL, E)'] L1: - - ['', '', '', '', '', '', '', '{', \, '}'] + - ['', '', '', '', '', '', '{', \, '}', ''] - [LGUI, LALT, LCTL, LSFT, '', SCRL, LAG(1), LAG(2), LAG(3), LAG(4)] - ['', '', '', '', '', PAUS, LSG(1), LSG(2), LSG(3), LSG(4)] - - '' @@ -24,7 +24,7 @@ layers: - '' - TAB L2: - - ['', '', '', '', '', '', '', (, '|', )] + - ['', '', '', '', '', '', (, '|', ), ''] - [LGUI, LALT, LCTL, LSFT, '', CAPS, LEFT, DOWN, UP, RGHT] - ['', '', '', '', '', RDO, PST, CPY, CUT, UND] - - '' @@ -33,8 +33,8 @@ layers: - ALTREP2 - ALTREP3 L3: - - ['', RGB RMOD, RGB TOG, RGB MOD, '', '', V, '[', /, ']'] - - [MPRV, VOLD, MUTE, VOLU, MNXT, QK CAPS WORD TOGGLE, H, J, K, L] + - ['', RGB RMOD, RGB TOG, RGB MOD, '', '', '[', /, ']', ''] + - [MPRV, VOLD, MUTE, VOLU, MNXT, QK CAPS WORD TOGGLE, HOME, PGDN, PGUP, END] - ['', '', '', EE CLR, QK BOOT, QK BOOT, HOME, PGDN, PGUP, END] - - {t: ▽, type: trans} - '' From 60195edf3579d42e2489e23d56e3d93013804a27 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Wed, 31 Jan 2024 14:45:03 -0600 Subject: [PATCH 5/7] add this --- output.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/output.yaml b/output.yaml index a71fdda..008cd50 100644 --- a/output.yaml +++ b/output.yaml @@ -43,15 +43,15 @@ layers: - P - Q - Z - - K - s: < t: ',' - - &id002 - s: '>' - t: . - &id001 s: ':' t: ; + - &id002 + s: '>' + t: . + - Z - - h: "\u2318" t: R - h: "\u2325" @@ -77,7 +77,7 @@ layers: - D - B - J - - L + - G - U - Y - h: Cursor @@ -139,10 +139,10 @@ layers: - '' - '' - '' - - '' - '{' - \ - '}' + - '' - - "\u2318" - "\u2325" - "\u2303" @@ -177,20 +177,20 @@ layers: - RGB MOD - '' - '' - - V - '[' - / - ']' + - '' - - "\u21E4" - "\U0001F509" - "\U0001F507" - "\U0001F50A" - "\u21E5" - Caps Word - - H - - J - - K - - L + - HOME + - PGDN + - PGUP + - END - - '' - '' - '' @@ -215,10 +215,10 @@ layers: - '' - '' - '' - - '' - ( - '|' - ) + - '' - - "\u2318" - "\u2325" - "\u2303" From cd1a04feeef86f4c9262108cb87b9f1191cdf90d Mon Sep 17 00:00:00 2001 From: yuanwang Date: Wed, 31 Jan 2024 18:22:39 -0600 Subject: [PATCH 6/7] update svg --- output.yaml | 12 ++ qmk/yuanw/keymap.c | 14 +- reiryoku.svg | 417 ++++++++++++++++++++++++--------------------- 3 files changed, 240 insertions(+), 203 deletions(-) diff --git a/output.yaml b/output.yaml index 008cd50..d1e2441 100644 --- a/output.yaml +++ b/output.yaml @@ -35,6 +35,18 @@ combos: p: - 26 - 27 +- k: ition + l: + - Nav + p: + - 18 + - 33 +- k: ssion + l: + - Nav + p: + - 11 + - 33 layers: Base: - - '?' diff --git a/qmk/yuanw/keymap.c b/qmk/yuanw/keymap.c index 1f74da8..c296305 100644 --- a/qmk/yuanw/keymap.c +++ b/qmk/yuanw/keymap.c @@ -67,10 +67,10 @@ enum my_keycodes { RDO = SAFE_RANGE, // clang-format off /** \brief QWERTY layout (3 rows, 10 columns). */ #define LAYOUT_LAYER_BASE \ - KC_QUESTION, KC_W, KC_M, KC_P, KC_Q, KC_Z, KC_COMM, KC_SCLN, KC_DOT, KC_Z, \ - KC_R, KC_S, KC_N, KC_T, KC_G, KC_V, KC_H, KC_A, KC_I, KC_O, \ - KC_X, KC_C, KC_F, KC_D, KC_B, KC_J, KC_G, KC_U, KC_Y, KC_QUOT, \ - ESC_MED, SPC_NAV, TAB_FUN, ENT_SYM, E_NUM + XXXXXXX, KC_W, KC_M, KC_P, KC_Q, KC_Z, KC_COMM, KC_SCLN, KC_DOT, XXXXXXX, \ + KC_R, KC_S, KC_N, KC_T, KC_G, KC_V, KC_H, KC_A, KC_I, KC_O, \ + KC_X, KC_C, KC_F, KC_D, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, \ + ESC_MED, SPC_NAV, TAB_FUN, ENT_SYM, E_NUM /** Convenience row shorthands. */ #define _______________DEAD_HALF_ROW_______________ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX @@ -265,7 +265,7 @@ void rgb_matrix_update_pwm_buffers(void); enum combos { FD_B, - GU_J, + LU_J, MP_Q, COMMSCLN_K, SCLNDOT_Z, @@ -277,7 +277,7 @@ enum combos { uint16_t COMBO_LEN = COMBO_LENGTH; // remove the COMBO_COUNT define and use this instead! const uint16_t PROGMEM b_combo[] = {KC_F, KC_D, COMBO_END}; -const uint16_t PROGMEM j_combo[] = {KC_G, KC_U, COMBO_END}; +const uint16_t PROGMEM j_combo[] = {KC_L, KC_U, COMBO_END}; const uint16_t PROGMEM q_combo[] = {KC_M, KC_P, COMBO_END}; const uint16_t PROGMEM k_combo[] = {KC_COMM, KC_SCLN, COMBO_END}; const uint16_t PROGMEM z_combo[] = {KC_SCLN, KC_DOT, COMBO_END}; @@ -287,7 +287,7 @@ const uint16_t PROGMEM l_combo[] = {KC_U, KC_Y, COMBO_END}; combo_t key_combos[] = { [FD_B] = COMBO(b_combo, KC_B), - [GU_J] = COMBO(j_combo, KC_J), + [LU_J] = COMBO(j_combo, KC_J), [MP_Q] = COMBO(q_combo, KC_Q), [COMMSCLN_K] = COMBO(k_combo, KC_K), [SCLNDOT_Z] = COMBO(z_combo, KC_Z), diff --git a/reiryoku.svg b/reiryoku.svg index 833c25a..62db725 100644 --- a/reiryoku.svg +++ b/reiryoku.svg @@ -100,8 +100,8 @@ path.combo { } /* End Tabler Icons Cleanup */ - -L0: + +Base: @@ -130,14 +130,17 @@ path.combo { , +< ; +: . +> @@ -146,22 +149,22 @@ path.combo { R -LGUI +⌘ S -LALT +⌥ N -LCTL +⌃ T -LSFT +⇧ @@ -174,29 +177,27 @@ path.combo { H -RSFT +⇧ A -RCTL +⌃ I -LALT +⌥ O -RGUI +⌘ - -LT(LAYERPOINTER, -X) - +x +Cursor @@ -232,50 +233,62 @@ path.combo { - -LT(LAYERPOINTER, -QUOT) - +' +Cursor - -LT(LAYERMEDIA, -ESC) - +Esc +Media - -LT(LAYERNAVIGATION, -SPC) - +SPC +Nav - -LT(LAYERFUNCTION, -BSPC) - +⌫ +Fun - -LT(LAYERSYMBOLS, -ENT) - +⏎ +Sym - -LT(LAYERNUMERAL, -E) - +e +Num + + +? + + +Q - -L1: + + +Z + + + +B + + + +X + + + +J + + + + +Cursor: @@ -297,60 +310,57 @@ path.combo { -{ -\ -} -LGUI +⌘ -LALT +⌥ -LCTL +⌃ -LSFT +⇧ -SCRL -LAG(1) +⇧ -LAG(2) +⌃ -LAG(3) +⌥ -LAG(4) +⌘ - - + + +▽ @@ -360,51 +370,62 @@ path.combo { + +EECLR + + +QKBOOT + -PAUS + +QKBOOT + -LSG(1) + +EECLR + -LSG(2) -LSG(3) - - -LSG(4) + + +▽ +BTN2 +BTN1 - - -▽ + + +BTN3 +BTN3 -TAB +BTN1 - -L2: + +Fun: @@ -426,57 +447,57 @@ path.combo { -( +{ -| +\ -) +} -LGUI +⌘ -LALT +⌥ -LCTL +⌃ -LSFT +⇧ -CAPS +SCRL -LEFT +⌘⌥1 -DOWN +⌘⌥2 -UP +⌘⌥3 -RGHT +⌘⌥4 @@ -495,46 +516,45 @@ path.combo { -RDO +PAUS -PST +⌘⇧1 -CPY +⌘⇧2 -CUT +⌘⇧3 -UND +⌘⇧4 - + + + + ▽ - - - -ALTREP2 -ALTREP3 +TAB - -L3: + +Med: @@ -580,30 +600,28 @@ path.combo { -MPRV +⇤ -VOLD +🔉 -MUTE +🔇 -VOLU +🔊 -MNXT +⇥ -QKCAPS -WORD -TOGGLE +CapsWord @@ -684,161 +702,174 @@ path.combo { - -L4: + +Nav: -[ -7 -8 -9 -] +( +| +) -; +⌘ -4 +⌥ -5 +⌃ -6 +⇧ -= +⇪ -LSFT +◁ -LCTL +▽ -LALT +△ -LGUI +▷ -` -1 -2 -3 -\ +RDO +PST +CPY +CUT +UND -. - - -0 + + +▽ -- + +↺2 + - - -▽ + + + +↺3 + + + + + + +ition + + + + + +ssion - -L5: + +Num: -{ +[ -& +7 -* +8 -( +9 -} +] @@ -857,62 +888,63 @@ path.combo { -: +; +: -$ +4 -% +5 -^ +6 -+ += -LSFT +⇧ -LCTL +⌃ -LALT +⌥ -LGUI +⌘ -~ +` -! +1 -@ +2 -# +3 -| +\ @@ -931,46 +963,48 @@ path.combo { - -QKREP - +. +> - -QKAREP - +0 -_ +- - + + + + ▽ - - - - -L6: + +Sym: +{ +& +* +( +} @@ -989,75 +1023,68 @@ path.combo { -LGUI +: -LALT +$ -LCTL +% -LSFT +^ ++ -LSFT +⇧ -LCTL +⌃ -LALT +⌥ -LGUI +⌘ - - -▽ + + +~ +! +@ - -EECLR - +# - -QKBOOT - +| - -QKBOOT - - -EECLR - @@ -1065,29 +1092,27 @@ path.combo { - - -▽ + + -BTN2 +↻ -BTN1 +↺ -BTN3 +_ - - -BTN3 + + +▽ -BTN1 From aeb48c28db5bc2ee0953506098ce91fe2590aaab Mon Sep 17 00:00:00 2001 From: yuanwang Date: Wed, 31 Jan 2024 18:36:13 -0600 Subject: [PATCH 7/7] update svg --- output.yaml | 28 ++++++++++++++-------------- reiryoku.svg | 30 ++++++++++++------------------ reiryoku.yaml | 4 ++-- 3 files changed, 28 insertions(+), 34 deletions(-) diff --git a/output.yaml b/output.yaml index d1e2441..a4489ee 100644 --- a/output.yaml +++ b/output.yaml @@ -11,12 +11,18 @@ combos: p: - 2 - 3 -- k: Z +- k: K l: - Base p: - 6 - 7 +- k: Z + l: + - Base + p: + - 7 + - 8 - k: B l: - Base @@ -35,21 +41,15 @@ combos: p: - 26 - 27 -- k: ition - l: - - Nav - p: - - 18 - - 33 -- k: ssion +- k: L l: - - Nav + - Base p: - - 11 - - 33 + - 27 + - 28 layers: Base: - - - '?' + - - '' - W - M - P @@ -63,7 +63,7 @@ layers: - &id002 s: '>' t: . - - Z + - '' - - h: "\u2318" t: R - h: "\u2325" @@ -89,7 +89,7 @@ layers: - D - B - J - - G + - L - U - Y - h: Cursor diff --git a/reiryoku.svg b/reiryoku.svg index 62db725..07e7227 100644 --- a/reiryoku.svg +++ b/reiryoku.svg @@ -105,7 +105,6 @@ path.combo { -? @@ -144,7 +143,6 @@ path.combo { -Z @@ -221,7 +219,7 @@ path.combo { -G +L @@ -271,20 +269,28 @@ path.combo { -Z +K + +Z + + B - + X - + J + + +L + @@ -834,18 +840,6 @@ path.combo { ↺3 - - - - -ition - - - - - -ssion - diff --git a/reiryoku.yaml b/reiryoku.yaml index d767ef5..511b731 100644 --- a/reiryoku.yaml +++ b/reiryoku.yaml @@ -1,7 +1,7 @@ layout: {qmk_keyboard: bastardkb/charybdis/3x5/v2/splinky_3, qmk_layout: LAYOUT} layers: L0: - - ['?', W, M, P, Q, Z, ',', ;, ., Z] + - ['', W, M, P, Q, Z, ',', ;, ., ''] - - {t: R, h: LGUI} - {t: S, h: LALT} - {t: N, h: LCTL} @@ -12,7 +12,7 @@ layers: - {t: A, h: RCTL} - {t: I, h: LALT} - {t: O, h: RGUI} - - ['LT(LAYER POINTER, X)', C, F, D, B, J, G, U, Y, 'LT(LAYER POINTER, QUOT)'] + - ['LT(LAYER POINTER, X)', C, F, D, B, J, L, U, Y, 'LT(LAYER POINTER, QUOT)'] - ['LT(LAYER MEDIA, ESC)', 'LT(LAYER NAVIGATION, SPC)', 'LT(LAYER FUNCTION, BSPC)', 'LT(LAYER SYMBOLS, ENT)', 'LT(LAYER NUMERAL, E)'] L1: - ['', '', '', '', '', '', '{', \, '}', '']