diff --git a/README.md b/README.md index 4190b216..06521c25 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ All base layers share the same thumb cluster: ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── (⌘)│F9 │F10│F11│F12│ ¢ 0 │ 1 │ 2 │ 3 │ , │(⌘) ───┌───┬───┐ ┌───┬───┐─── - $ │Sft│(v)│ │Bsp│Spc│App + ¥ │Sft│(v)│ │Bsp│Spc│ $ ───└───┴───┘ └ATT┴─⇧─┘─── ``` diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keymaps/struckmb/readme.md b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keymaps/struckmb/readme.md index d60a5754..639ce63f 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keymaps/struckmb/readme.md +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keymaps/struckmb/readme.md @@ -94,7 +94,7 @@ All base layers share the same thumb cluster: ─── ───┼───┼───┼───┼─── ───┼───┼───┼───┼─── ─── (⌘)│F9 │F10│F11│F12│ ¢ 0 │ 1 │ 2 │ 3 │ , │(⌘) ───┌───┬───┐ ┌───┬───┐─── - $ │Sft│(v)│ │Bsp│Spc│App + ¥ │Sft│(v)│ │Bsp│Spc│ $ ───└───┴───┘ └ATT┴─⇧─┘─── ``` diff --git a/qmk.json b/qmk.json index 496033d3..71874cb3 100644 --- a/qmk.json +++ b/qmk.json @@ -4,4 +4,4 @@ ["cantor", "struckmb"], ["bastardkb/charybdis/3x6/v2/splinky_3", "struckmb"] ] -} \ No newline at end of file +} diff --git a/users/struckmb/struckmb.c b/users/struckmb/struckmb.c index a42f0d48..e4c3a3d1 100644 --- a/users/struckmb/struckmb.c +++ b/users/struckmb/struckmb.c @@ -63,13 +63,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { unregister_code16(KC_BRMD); } return false; -#ifdef MOUSEKEY_ENABLE +# ifdef MOUSEKEY_ENABLE case MS_CSB1: if (record->event.pressed) { tap_code16(S(G(KC_BTN1))); } return false; -#endif // MOUSEKEY_ENABLE +# endif // MOUSEKEY_ENABLE } break; @@ -279,6 +279,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { unregister_code16(ALGR(DE_N)); } return false; + case DE_YEN: + if (record->event.pressed) { + register_code16(S(ALGR(DE_Z))); + } else { + unregister_code16(S(ALGR(DE_Z))); + } + return false; case KC_CUT: if (record->event.pressed) { tap_code16(S(KC_DEL)); @@ -294,13 +301,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { tap_code16(S(KC_INS)); } return false; -#ifdef MOUSEKEY_ENABLE +# ifdef MOUSEKEY_ENABLE case MS_CSB1: if (record->event.pressed) { tap_code16(S(C(KC_BTN1))); } return false; -#endif // MOUSEKEY_ENABLE +# endif // MOUSEKEY_ENABLE } break; diff --git a/users/struckmb/struckmb.h b/users/struckmb/struckmb.h index 5f829b6f..301ac8d4 100644 --- a/users/struckmb/struckmb.h +++ b/users/struckmb/struckmb.h @@ -331,7 +331,7 @@ void symR_reset(tap_dance_state_t *state, void *user_data); # define _PR3_6_ _PR3_5_, _ADD_R_3_ // # define _PL4_2_ KC_BTN1, KC_BTN2 -# define _PL4_3_ MS_GSB1, _PL4_2_ +# define _PL4_3_ MS_CSB1, _PL4_2_ # define _PR4_2_ KC_BTN3, KC_BTN1 # define _PR4_3_ _PR4_2_, MS_CSB1 // @@ -355,9 +355,9 @@ void symR_reset(tap_dance_state_t *state, void *user_data); #define _LR3_6_ _LR3_5_, _ADD_R_3_ // #define _LL4_2_ KC_LSFT, KC_TRNS -#define _LL4_3_ DE_DLR, _LL4_2_ +#define _LL4_3_ DE_YEN, _LL4_2_ #define _LR4_2_ ATT(KC_BSPC), SFT_SPC -#define _LR4_3_ _LR4_2_, KC_APP +#define _LR4_3_ _LR4_2_, DE_DLR // #define _LOWER_3x5_ _LL1_5_, _LR1_5_, _LL2_5_, _LR2_5_, _LL3_5_, _LR3_5_ #define _LOWER_3x6_ _LL1_6_, _LR1_6_, _LL2_6_, _LR2_6_, _LL3_6_, _LR3_6_