From a49f373c55a8f9ec4e379e45dcd88ef06c22b3b1 Mon Sep 17 00:00:00 2001 From: reeve <150582459+grassfedreeve@users.noreply.github.com> Date: Wed, 10 Apr 2024 14:22:55 +1000 Subject: [PATCH 01/26] Update charybdis.keymap --- config/charybdis.keymap | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/charybdis.keymap b/config/charybdis.keymap index a115b36..ce488c5 100644 --- a/config/charybdis.keymap +++ b/config/charybdis.keymap @@ -1,8 +1,7 @@ -#include -#include #include #include #include +#include #include < { From dea1cfccbb7c7fdc033208f6b7b4de32b33dab7b Mon Sep 17 00:00:00 2001 From: reeve <150582459+grassfedreeve@users.noreply.github.com> Date: Wed, 10 Apr 2024 14:22:58 +1000 Subject: [PATCH 02/26] Update charybdis.conf --- config/charybdis.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/config/charybdis.conf b/config/charybdis.conf index f6660af..19a993d 100644 --- a/config/charybdis.conf +++ b/config/charybdis.conf @@ -1,4 +1,5 @@ CONFIG_BT_CTLR_TX_PWR_PLUS_8=y +CONFIG_ZMK_MOUSE=y CONFIG_BT_PERIPHERAL_PREF_MAX_INT=9 CONFIG_BT_PERIPHERAL_PREF_LATENCY=16 From 501cd30ceaa7aa3c6fb48c0e00a46646e4459b1e Mon Sep 17 00:00:00 2001 From: "keymap-editor[bot]" <91849743+keymap-editor[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 18:44:59 +0000 Subject: [PATCH 03/26] Add homerow mods --- config/charybdis.keymap | 42 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/config/charybdis.keymap b/config/charybdis.keymap index f308ac1..ebbb103 100644 --- a/config/charybdis.keymap +++ b/config/charybdis.keymap @@ -1,8 +1,8 @@ -#include #include #include #include #include +#include #include < { @@ -94,46 +94,46 @@ BASE { bindings = < - &kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC - &kp LCTRL &kp A &kp S &kp D &mt LALT F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp APOS - &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp LGUI - &mo 4 &kp SPACE < 1 TAB &mo 2 &Shift_Enter RIGHT_SHIFT ENTER +&kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC +&kp LCTRL &mt LEFT_GUI A &mt LEFT_ALT S &mt LCTRL D &mt LEFT_SHIFT F &kp G &kp H &mt LEFT_SHIFT J &mt RCTRL K &mt RIGHT_ALT L &mt RIGHT_GUI SEMI &kp APOS +&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp LGUI + &mo 4 &kp SPACE < 1 TAB &mo 2 &Shift_Enter RIGHT_SHIFT ENTER >; }; NAV { bindings = < - &trans &trans &kp UP &trans &trans &trans &kp N7 &kp N8 &kp N9 &kp N0 &kp HOME &kp F1 - &trans &kp LEFT &kp DOWN &kp RIGHT &trans &trans &kp N4 &kp N5 &kp N6 &trans &trans &kp F10 - &trans &trans &trans &trans &trans &trans &kp N1 &kp N2 &kp N3 &trans &trans &kp F20 - &trans &trans &trans < 3 BACKSPACE &kp LSHFT +&trans &trans &kp UP &trans &trans &trans &kp N7 &kp N8 &kp N9 &kp N0 &kp HOME &kp F1 +&trans &kp LEFT &kp DOWN &kp RIGHT &trans &trans &kp N4 &kp N5 &kp N6 &trans &trans &kp F10 +&trans &trans &trans &trans &trans &trans &kp N1 &kp N2 &kp N3 &trans &trans &kp F20 + &trans &trans &trans < 3 BACKSPACE &kp LSHFT >; }; SYMNUM { bindings = < - &trans &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp DEL - &trans &bt BT_CLR &bt BT_PRV &bt BT_NXT &trans &trans &kp UNDER &kp EQUAL &kp LBKT &kp RBKT &kp BSLH &kp GRAVE - &trans &out OUT_TOG &bootloader &trans &trans &trans &kp MINUS &kp PLUS &kp LBRC &kp RBRC &kp PIPE &kp TILDE - &trans &trans < 3 TAB &trans &trans +&trans &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp DEL +&trans &bt BT_CLR &bt BT_PRV &bt BT_NXT &trans &trans &kp UNDER &mt RIGHT_SHIFT EQUAL &mt RCTRL LBKT &mt RIGHT_ALT RBKT &mt RIGHT_GUI BSLH &kp GRAVE +&trans &out OUT_TOG &bootloader &trans &trans &trans &kp MINUS &kp PLUS &kp LBRC &kp RBRC &kp PIPE &kp TILDE + &trans &trans < 3 TAB &trans &trans >; }; FUN { bindings = < - &trans &trans &kp F1 &kp F2 &kp F3 &kp F4 &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_CLR - &trans &kp DEL &kp F5 &kp F6 &kp F7 &kp F8 &out OUT_TOG &kp K_PLAY_PAUSE &kp C_VOLUME_DOWN &kp C_VOLUME_UP &kp C_MUTE &kp LALT - &trans &trans &kp F9 &kp F10 &kp F11 &kp F12 &trans &trans &trans &trans &trans &to 0 - &trans &trans &trans &trans &trans +&trans &trans &kp F1 &kp F2 &kp F3 &kp F4 &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_CLR +&trans &kp DEL &kp F5 &kp F6 &kp F7 &kp F8 &out OUT_TOG &kp K_PLAY_PAUSE &kp C_VOLUME_DOWN &kp C_VOLUME_UP &kp C_MUTE &kp LALT +&trans &trans &kp F9 &kp F10 &kp F11 &kp F12 &trans &trans &trans &trans &trans &to 0 + &trans &trans &trans &trans &trans >; }; SCROLL { bindings = < - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &trans &trans &trans &trans &trans +&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans +&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans +&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans >; }; }; From 8d91d3ee7373f3518922da6215f8dfbf75d0f466 Mon Sep 17 00:00:00 2001 From: "keymap-editor[bot]" <91849743+keymap-editor[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 21:18:57 +0000 Subject: [PATCH 04/26] add homerow for other layers --- config/charybdis.keymap | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/charybdis.keymap b/config/charybdis.keymap index ebbb103..a2dc84b 100644 --- a/config/charybdis.keymap +++ b/config/charybdis.keymap @@ -103,9 +103,9 @@ NAV { bindings = < -&trans &trans &kp UP &trans &trans &trans &kp N7 &kp N8 &kp N9 &kp N0 &kp HOME &kp F1 -&trans &kp LEFT &kp DOWN &kp RIGHT &trans &trans &kp N4 &kp N5 &kp N6 &trans &trans &kp F10 -&trans &trans &trans &trans &trans &trans &kp N1 &kp N2 &kp N3 &trans &trans &kp F20 +&trans &trans &kp UP &trans &trans &trans &kp N7 &kp N8 &kp N9 &kp N0 &kp HOME &kp F1 +&trans &kp LEFT &kp DOWN &kp RIGHT &trans &trans &kp N4 &mt RIGHT_SHIFT N5 &mt RCTRL N6 &trans &trans &kp F10 +&trans &trans &trans &trans &trans &trans &kp N1 &kp N2 &kp N3 &trans &trans &kp F20 &trans &trans &trans < 3 BACKSPACE &kp LSHFT >; }; From 746eb2256cc2a8812b2e864dab30695993f14dc7 Mon Sep 17 00:00:00 2001 From: Eren Atas Date: Sun, 7 Apr 2024 14:42:59 +0200 Subject: [PATCH 05/26] Initial commit for conversion to 3x6 efforts Signed-off-by: Eren Atas --- config/charybdis.keymap | 66 ++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/config/charybdis.keymap b/config/charybdis.keymap index ce488c5..b4ec9dc 100644 --- a/config/charybdis.keymap +++ b/config/charybdis.keymap @@ -18,7 +18,7 @@ }; / { - chosen { zmk,matrix_transform = &five_column_transform; }; + chosen { zmk,matrix_transform = &default_column_transform; }; }; / { @@ -27,52 +27,52 @@ LeftClickRight { bindings = <&mkp LCLK>; - key-positions = <16 17>; + key-positions = <19 20>; }; RightClickRight { bindings = <&mkp RCLK>; - key-positions = <17 18>; + key-positions = <20 21>; }; ParaLeft { bindings = <&kp LEFT_PARENTHESIS>; - key-positions = <3 13>; + key-positions = <4 16>; }; ParaRight { bindings = <&kp RIGHT_PARENTHESIS>; - key-positions = <6 16>; + key-positions = <7 18>; }; BrakLeft { bindings = <&kp LEFT_BRACKET>; - key-positions = <2 12>; + key-positions = <3 15>; }; BrakRight { bindings = <&kp RIGHT_BRACKET>; - key-positions = <7 17>; + key-positions = <8 19>; }; BraceLeft { bindings = <&kp LEFT_BRACE>; - key-positions = <1 11>; + key-positions = <2 14>; }; BraceRight { bindings = <&kp RIGHT_BRACE>; - key-positions = <8 18>; + key-positions = <9 20>; }; Delete { bindings = <&kp DELETE>; - key-positions = <7 8>; + key-positions = <8 9>; }; CapsWord { bindings = <&caps_word>; - key-positions = <14 15>; + key-positions = <17 18>; }; }; @@ -83,7 +83,7 @@ bindings = <&kp>, <&kp>; #binding-cells = <2>; - hold-trigger-key-positions = <34>; + hold-trigger-key-positions = <40>; tapping-term-ms = <100>; }; }; @@ -91,48 +91,48 @@ keymap { compatible = "zmk,keymap"; - COLEMAK { + BASE { bindings = < - &kp Q &kp W &kp F &kp P &kp B &kp J &kp L &kp U &kp Y &kp APOS - &mt LEFT_SHIFT A &mt LEFT_CONTROL R &mt LEFT_ALT S &mt LEFT_GUI T &kp G &kp M &kp N &kp E &kp I &kp O - &kp Z &kp X &kp C &kp D &kp V &kp K &kp H &kp COMMA &kp DOT &kp SLASH - &mo 4 &kp SPACE < 1 TAB < 2 BACKSPACE &Shift_Enter RIGHT_SHIFT ENTER + &kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC + &kp LCTRL &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp APOS + &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp LGUI + &mo 4 &kp SPACE < 1 TAB &mo 2 &Shift_Enter RIGHT_SHIFT ENTER >; }; NAV { bindings = < - &kp LA(F4) &kp LG(UP_ARROW) &kp LG(LEFT) &kp LG(RIGHT) &kp LC(W) &kp PRINTSCREEN &kp BACKSPACE &kp ENTER &kp DELETE &trans - &kp LC(Z) &kp RC(RS(T)) &kp LS(LC(TAB)) &kp LC(TAB) &kp LC(A) &kp ENTER &kp LEFT &kp DOWN &kp UP_ARROW &kp RIGHT - &kp LC(Z) &kp LC(X) &kp LC(C) &mt LC(LS(V)) LC(V) &kp LC(Y) &trans &kp LC(LS(LEFT)) &kp LS(LC(RIGHT)) &trans &trans - &trans &trans &trans < 3 BACKSPACE &kp LSHFT + &trans &trans &kp UP &trans &trans &trans &kp N7 &kp N8 &kp N9 &kp N0 &kp HOME &kp F1 + &trans &kp LEFT &kp DOWN &kp RIGHT &trans &trans &kp N4 &kp N5 &kp N6 &trans &trans &kp F10 + &trans &trans &trans &trans &trans &trans &kp N1 &kp N2 &kp N3 &trans &trans &kp F20 + &trans &trans &trans < 3 BACKSPACE &kp LSHFT >; }; SYMNUM { bindings = < - &kp GRAVE &kp EXCL &kp AT &kp POUND &kp DOLLAR &kp EQUAL &kp N1 &kp N2 &kp N3 &kp SEMI - &kp TILDE &kp STAR &kp PIPE &kp UNDER &kp MINUS &kp N0 &kp N4 &kp N5 &kp N6 &kp COLON - &trans &kp CARET &kp PERCENT &kp AMPERSAND &trans &trans &kp N7 &kp N8 &kp N9 &trans - &trans &kp LEFT_SHIFT < 3 TAB &trans &trans + &trans &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp DEL + &trans &bt BT_CLR &bt BT_PRV &bt BT_NXT &trans &trans &kp UNDER &kp EQUAL &kp LBKT &kp RBKT &kp BSLH &kp GRAVE + &trans &out OUT_TOG &bootloader &trans &trans &trans &kp MINUS &kp PLUS &kp LBRC &kp RBRC &kp PIPE &kp TILDE + &trans &trans < 3 TAB &trans &trans >; }; FUN { bindings = < - &kp ESC &kp F1 &kp F2 &kp F3 &kp F10 &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 - &kp F12 &kp F4 &kp F5 &kp F6 &kp F11 &out OUT_TOG &kp K_PLAY_PAUSE &kp C_VOLUME_DOWN &kp C_VOLUME_UP &bt BT_CLR - &trans &kp F7 &kp F8 &kp F9 &kp F12 &trans &trans &trans &trans &trans - &trans &trans &trans &trans &trans + &trans &trans &kp F1 &kp F2 &kp F3 &kp F4 &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_CLR + &trans &trans &kp F5 &kp F6 &kp F7 &kp F8 &out OUT_TOG &kp K_PLAY_PAUSE &kp C_VOLUME_DOWN &kp C_VOLUME_UP C_MUTE &trans + &trans &trans &kp F9 &kp F10 &kp F11 &kp F12 &trans &trans &trans &trans &trans &to 0 + &trans &trans &trans &trans &trans >; }; SCROLL { bindings = < - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans >; }; }; From 79a76c86bd3b75e6dbde40e53da58ec41b348147 Mon Sep 17 00:00:00 2001 From: Eren Atas Date: Sun, 7 Apr 2024 14:47:23 +0200 Subject: [PATCH 06/26] Fix typo for transform Signed-off-by: Eren Atas --- config/charybdis.keymap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/charybdis.keymap b/config/charybdis.keymap index b4ec9dc..70bde2f 100644 --- a/config/charybdis.keymap +++ b/config/charybdis.keymap @@ -18,7 +18,7 @@ }; / { - chosen { zmk,matrix_transform = &default_column_transform; }; + chosen { zmk,matrix_transform = &default_transform; }; }; / { From 24796575f05cda6ae59904f4210d9b7848af5948 Mon Sep 17 00:00:00 2001 From: Eren Atas Date: Sun, 7 Apr 2024 15:09:37 +0200 Subject: [PATCH 07/26] Try K_MUTE instead of C_MUTE Signed-off-by: Eren Atas --- config/charybdis.keymap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/charybdis.keymap b/config/charybdis.keymap index 70bde2f..b1c2c9f 100644 --- a/config/charybdis.keymap +++ b/config/charybdis.keymap @@ -83,7 +83,7 @@ bindings = <&kp>, <&kp>; #binding-cells = <2>; - hold-trigger-key-positions = <40>; + hold-trigger-key-positions = <34>; tapping-term-ms = <100>; }; }; @@ -121,7 +121,7 @@ FUN { bindings = < &trans &trans &kp F1 &kp F2 &kp F3 &kp F4 &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_CLR - &trans &trans &kp F5 &kp F6 &kp F7 &kp F8 &out OUT_TOG &kp K_PLAY_PAUSE &kp C_VOLUME_DOWN &kp C_VOLUME_UP C_MUTE &trans + &trans &trans &kp F5 &kp F6 &kp F7 &kp F8 &out OUT_TOG &kp K_PLAY_PAUSE &kp C_VOLUME_DOWN &kp C_VOLUME_UP K_MUTE &trans &trans &trans &kp F9 &kp F10 &kp F11 &kp F12 &trans &trans &trans &trans &trans &to 0 &trans &trans &trans &trans &trans >; From db59e9196068ea957c37ca5a12b02fe1c17083ae Mon Sep 17 00:00:00 2001 From: Eren Atas Date: Sun, 7 Apr 2024 15:10:58 +0200 Subject: [PATCH 08/26] forgot to add &kp Signed-off-by: Eren Atas --- config/charybdis.keymap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/charybdis.keymap b/config/charybdis.keymap index b1c2c9f..06d45a3 100644 --- a/config/charybdis.keymap +++ b/config/charybdis.keymap @@ -121,7 +121,7 @@ FUN { bindings = < &trans &trans &kp F1 &kp F2 &kp F3 &kp F4 &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_CLR - &trans &trans &kp F5 &kp F6 &kp F7 &kp F8 &out OUT_TOG &kp K_PLAY_PAUSE &kp C_VOLUME_DOWN &kp C_VOLUME_UP K_MUTE &trans + &trans &trans &kp F5 &kp F6 &kp F7 &kp F8 &out OUT_TOG &kp K_PLAY_PAUSE &kp C_VOLUME_DOWN &kp C_VOLUME_UP &kp C_MUTE &trans &trans &trans &kp F9 &kp F10 &kp F11 &kp F12 &trans &trans &trans &trans &trans &to 0 &trans &trans &trans &trans &trans >; From fb350b8448df1f4d3981c857bd0ec516883c8c32 Mon Sep 17 00:00:00 2001 From: Eren Atas Date: Sun, 7 Apr 2024 15:17:33 +0200 Subject: [PATCH 09/26] Update info.json and remove extra whitespace Signed-off-by: Eren Atas --- config/charybdis.keymap | 2 +- config/info.json | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/config/charybdis.keymap b/config/charybdis.keymap index 06d45a3..853a99f 100644 --- a/config/charybdis.keymap +++ b/config/charybdis.keymap @@ -121,7 +121,7 @@ FUN { bindings = < &trans &trans &kp F1 &kp F2 &kp F3 &kp F4 &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_CLR - &trans &trans &kp F5 &kp F6 &kp F7 &kp F8 &out OUT_TOG &kp K_PLAY_PAUSE &kp C_VOLUME_DOWN &kp C_VOLUME_UP &kp C_MUTE &trans + &trans &trans &kp F5 &kp F6 &kp F7 &kp F8 &out OUT_TOG &kp K_PLAY_PAUSE &kp C_VOLUME_DOWN &kp C_VOLUME_UP &kp C_MUTE &trans &trans &trans &kp F9 &kp F10 &kp F11 &kp F12 &trans &trans &trans &trans &trans &to 0 &trans &trans &trans &trans &trans >; diff --git a/config/info.json b/config/info.json index 435f3bb..630f8ed 100644 --- a/config/info.json +++ b/config/info.json @@ -4,6 +4,7 @@ "layouts": { "default": { "layout": [ + { "label": "Tab", "row": 0, "col": 0, "x": 0, "y": 0.36 }, { "label": "Q", "row": 0, "col": 1, "x": 1, "y": 0.36 }, { "label": "W", "row": 0, "col": 2, "x": 2, "y": 0.11 }, { "label": "E", "row": 0, "col": 3, "x": 3, "y": -0.015 }, @@ -14,7 +15,9 @@ { "label": "I", "row": 0, "col": 9, "x": 11, "y": -0.015 }, { "label": "O", "row": 0, "col": 10, "x": 12, "y": 0.11 }, { "label": "P", "row": 0, "col": 11, "x": 13, "y": 0.36 }, + { "label": "BSPC", "row": 0, "col": 12, "x": 14, "y": 0.36 }, + { "label": "Ctrl", "row": 1, "col": 0, "x": 0, "y": 1.36 }, { "label": "A", "row": 1, "col": 1, "x": 1, "y": 1.36 }, { "label": "S", "row": 1, "col": 2, "x": 2, "y": 1.11 }, { "label": "D", "row": 1, "col": 3, "x": 3, "y": 0.985 }, @@ -25,7 +28,9 @@ { "label": "K", "row": 1, "col": 9, "x": 11, "y": 0.985 }, { "label": "L", "row": 1, "col": 10, "x": 12, "y": 1.11 }, { "label": ";", "row": 1, "col": 11, "x": 13, "y": 1.36 }, + { "label": "'", "row": 1, "col": 12, "x": 14, "y": 1.36 }, + { "label": "LShift", "row": 2, "col": 0, "x": 0, "y": 2.36 }, { "label": "Z", "row": 2, "col": 1, "x": 1, "y": 2.36 }, { "label": "X", "row": 2, "col": 2, "x": 2, "y": 2.11 }, { "label": "C", "row": 2, "col": 3, "x": 3, "y": 1.985 }, @@ -36,6 +41,7 @@ { "label": ",", "row": 2, "col": 9, "x": 11, "y": 1.985 }, { "label": ".", "row": 2, "col": 10, "x": 12, "y": 2.11 }, { "label": "/", "row": 2, "col": 11, "x": 13, "y": 2.36 }, + { "label": "Esc", "row": 2, "col": 12, "x": 14, "y": 2.36 }, { "label": "GUI", "row": 3, "col": 3, "x": 3.48, "y": 3.13, "r": 0 }, { "label": "LWR", "row": 3, "col": 4, "x": 3.48, "y": 3.13, "r": 15, "rx": 3.98, "ry": 7.63 }, @@ -46,4 +52,4 @@ } }, "sensors": [] -} +} \ No newline at end of file From 596cab8c184b51e876b7a8fdc0f6303bca94317b Mon Sep 17 00:00:00 2001 From: Eren Atas Date: Sun, 7 Apr 2024 15:21:41 +0200 Subject: [PATCH 10/26] Fix combo positions Signed-off-by: Eren Atas --- config/charybdis.keymap | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/charybdis.keymap b/config/charybdis.keymap index 853a99f..130cce3 100644 --- a/config/charybdis.keymap +++ b/config/charybdis.keymap @@ -42,7 +42,7 @@ ParaRight { bindings = <&kp RIGHT_PARENTHESIS>; - key-positions = <7 18>; + key-positions = <7 19>; }; BrakLeft { @@ -52,7 +52,7 @@ BrakRight { bindings = <&kp RIGHT_BRACKET>; - key-positions = <8 19>; + key-positions = <8 20>; }; BraceLeft { @@ -62,7 +62,7 @@ BraceRight { bindings = <&kp RIGHT_BRACE>; - key-positions = <9 20>; + key-positions = <9 21>; }; Delete { From c64b54475a03ec8059b24dd43333d23718ca7673 Mon Sep 17 00:00:00 2001 From: Eren Atas Date: Sun, 7 Apr 2024 15:45:05 +0200 Subject: [PATCH 11/26] try lowering down CPI, too sensitive Signed-off-by: Eren Atas --- config/boards/shields/charybdis/charybdis_right.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/boards/shields/charybdis/charybdis_right.conf b/config/boards/shields/charybdis/charybdis_right.conf index ea75b1c..6500c77 100644 --- a/config/boards/shields/charybdis/charybdis_right.conf +++ b/config/boards/shields/charybdis/charybdis_right.conf @@ -5,7 +5,7 @@ CONFIG_ZMK_MOUSE=y CONFIG_ZMK_EXT_POWER=y CONFIG_PMW3610=y -CONFIG_PMW3610_CPI=3000 +CONFIG_PMW3610_CPI=2000 CONFIG_PMW3610_CPI_DIVIDOR=4 CONFIG_PMW3610_ORIENTATION_90=y CONFIG_PMW3610_SNIPE_CPI=800 From 315ab73e3f8891000ef36aeb5283cdc3ed523c1d Mon Sep 17 00:00:00 2001 From: Eren Atas Date: Sun, 7 Apr 2024 15:52:52 +0200 Subject: [PATCH 12/26] try lowering CPI more Signed-off-by: Eren Atas --- config/boards/shields/charybdis/charybdis_right.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/boards/shields/charybdis/charybdis_right.conf b/config/boards/shields/charybdis/charybdis_right.conf index 6500c77..6f188f8 100644 --- a/config/boards/shields/charybdis/charybdis_right.conf +++ b/config/boards/shields/charybdis/charybdis_right.conf @@ -5,7 +5,7 @@ CONFIG_ZMK_MOUSE=y CONFIG_ZMK_EXT_POWER=y CONFIG_PMW3610=y -CONFIG_PMW3610_CPI=2000 +CONFIG_PMW3610_CPI=1200 CONFIG_PMW3610_CPI_DIVIDOR=4 CONFIG_PMW3610_ORIENTATION_90=y CONFIG_PMW3610_SNIPE_CPI=800 From dc1cbbab7e10e91210d5cbcae7431c295f8db59e Mon Sep 17 00:00:00 2001 From: Eren Atas Date: Sun, 7 Apr 2024 16:02:23 +0200 Subject: [PATCH 13/26] Try to find sweet spot Signed-off-by: Eren Atas --- config/boards/shields/charybdis/charybdis_right.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/boards/shields/charybdis/charybdis_right.conf b/config/boards/shields/charybdis/charybdis_right.conf index 6f188f8..acb06ce 100644 --- a/config/boards/shields/charybdis/charybdis_right.conf +++ b/config/boards/shields/charybdis/charybdis_right.conf @@ -5,7 +5,7 @@ CONFIG_ZMK_MOUSE=y CONFIG_ZMK_EXT_POWER=y CONFIG_PMW3610=y -CONFIG_PMW3610_CPI=1200 +CONFIG_PMW3610_CPI=1500 CONFIG_PMW3610_CPI_DIVIDOR=4 CONFIG_PMW3610_ORIENTATION_90=y CONFIG_PMW3610_SNIPE_CPI=800 From ab71f3a2690d1a299b5737a9640733a418e0bfde Mon Sep 17 00:00:00 2001 From: Eren Atas Date: Sun, 7 Apr 2024 16:18:27 +0200 Subject: [PATCH 14/26] Add ALT and DEL keys as well Signed-off-by: Eren Atas --- config/charybdis.keymap | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/config/charybdis.keymap b/config/charybdis.keymap index 130cce3..8261419 100644 --- a/config/charybdis.keymap +++ b/config/charybdis.keymap @@ -93,10 +93,10 @@ BASE { bindings = < - &kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC - &kp LCTRL &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp APOS - &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp LGUI - &mo 4 &kp SPACE < 1 TAB &mo 2 &Shift_Enter RIGHT_SHIFT ENTER + &kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC + &kp LCTRL &kp A &kp S &kp D < LALT F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp APOS + &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp LGUI + &mo 4 &kp SPACE < 1 TAB &mo 2 &Shift_Enter RIGHT_SHIFT ENTER >; }; @@ -120,10 +120,10 @@ FUN { bindings = < - &trans &trans &kp F1 &kp F2 &kp F3 &kp F4 &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_CLR - &trans &trans &kp F5 &kp F6 &kp F7 &kp F8 &out OUT_TOG &kp K_PLAY_PAUSE &kp C_VOLUME_DOWN &kp C_VOLUME_UP &kp C_MUTE &trans - &trans &trans &kp F9 &kp F10 &kp F11 &kp F12 &trans &trans &trans &trans &trans &to 0 - &trans &trans &trans &trans &trans + &trans &trans &kp F1 &kp F2 &kp F3 &kp F4 &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_CLR + &trans &kp DEL &kp F5 &kp F6 &kp F7 &kp F8 &out OUT_TOG &kp K_PLAY_PAUSE &kp C_VOLUME_DOWN &kp C_VOLUME_UP &kp C_MUTE &kp LALT + &trans &trans &kp F9 &kp F10 &kp F11 &kp F12 &trans &trans &trans &trans &trans &to 0 + &trans &trans &trans &trans &trans >; }; From 3748c1a99ca624a13a2a294a54da59be6bda5c52 Mon Sep 17 00:00:00 2001 From: Eren Atas Date: Sun, 7 Apr 2024 16:33:18 +0200 Subject: [PATCH 15/26] Add behavior for F_ALT Signed-off-by: Eren Atas --- config/charybdis.keymap | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/config/charybdis.keymap b/config/charybdis.keymap index 8261419..d7a5024 100644 --- a/config/charybdis.keymap +++ b/config/charybdis.keymap @@ -86,6 +86,16 @@ hold-trigger-key-positions = <34>; tapping-term-ms = <100>; }; + + F_Alt: F_Alt { + compatible = "zmk,behavior-hold-tap"; + label = "F_ALT"; + bindings = <&kp>, <&kp>; + + #binding-cells = <2>; + hold-trigger-key-positions = <16>; + tapping-term-ms = <100>; + }; }; keymap { @@ -93,10 +103,10 @@ BASE { bindings = < - &kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC - &kp LCTRL &kp A &kp S &kp D < LALT F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp APOS - &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp LGUI - &mo 4 &kp SPACE < 1 TAB &mo 2 &Shift_Enter RIGHT_SHIFT ENTER + &kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC + &kp LCTRL &kp A &kp S &kp D &F_Alt LALT F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp APOS + &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp LGUI + &mo 4 &kp SPACE < 1 TAB &mo 2 &Shift_Enter RIGHT_SHIFT ENTER >; }; From a20faa6bf081670c6dc14283d6e79f98149d977d Mon Sep 17 00:00:00 2001 From: Eren Atas Date: Sun, 7 Apr 2024 16:38:55 +0200 Subject: [PATCH 16/26] &mt should be enough for LALT/F Signed-off-by: Eren Atas --- config/charybdis.keymap | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/config/charybdis.keymap b/config/charybdis.keymap index d7a5024..dfec72b 100644 --- a/config/charybdis.keymap +++ b/config/charybdis.keymap @@ -83,17 +83,7 @@ bindings = <&kp>, <&kp>; #binding-cells = <2>; - hold-trigger-key-positions = <34>; - tapping-term-ms = <100>; - }; - - F_Alt: F_Alt { - compatible = "zmk,behavior-hold-tap"; - label = "F_ALT"; - bindings = <&kp>, <&kp>; - - #binding-cells = <2>; - hold-trigger-key-positions = <16>; + hold-trigger-key-positions = <40>; tapping-term-ms = <100>; }; }; @@ -103,10 +93,10 @@ BASE { bindings = < - &kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC - &kp LCTRL &kp A &kp S &kp D &F_Alt LALT F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp APOS - &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp LGUI - &mo 4 &kp SPACE < 1 TAB &mo 2 &Shift_Enter RIGHT_SHIFT ENTER + &kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC + &kp LCTRL &kp A &kp S &kp D &mt LALT F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp APOS + &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp LGUI + &mo 4 &kp SPACE < 1 TAB &mo 2 &Shift_Enter RIGHT_SHIFT ENTER >; }; From 15f4ab48f6c99af3dffd333ddf480fe742ae3106 Mon Sep 17 00:00:00 2001 From: "keymap-editor[bot]" <91849743+keymap-editor[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 18:44:59 +0000 Subject: [PATCH 17/26] Add homerow mods --- config/charybdis.keymap | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/config/charybdis.keymap b/config/charybdis.keymap index dfec72b..ebbb103 100644 --- a/config/charybdis.keymap +++ b/config/charybdis.keymap @@ -1,3 +1,4 @@ +#include #include #include #include @@ -93,46 +94,46 @@ BASE { bindings = < - &kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC - &kp LCTRL &kp A &kp S &kp D &mt LALT F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp APOS - &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp LGUI - &mo 4 &kp SPACE < 1 TAB &mo 2 &Shift_Enter RIGHT_SHIFT ENTER +&kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC +&kp LCTRL &mt LEFT_GUI A &mt LEFT_ALT S &mt LCTRL D &mt LEFT_SHIFT F &kp G &kp H &mt LEFT_SHIFT J &mt RCTRL K &mt RIGHT_ALT L &mt RIGHT_GUI SEMI &kp APOS +&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp LGUI + &mo 4 &kp SPACE < 1 TAB &mo 2 &Shift_Enter RIGHT_SHIFT ENTER >; }; NAV { bindings = < - &trans &trans &kp UP &trans &trans &trans &kp N7 &kp N8 &kp N9 &kp N0 &kp HOME &kp F1 - &trans &kp LEFT &kp DOWN &kp RIGHT &trans &trans &kp N4 &kp N5 &kp N6 &trans &trans &kp F10 - &trans &trans &trans &trans &trans &trans &kp N1 &kp N2 &kp N3 &trans &trans &kp F20 - &trans &trans &trans < 3 BACKSPACE &kp LSHFT +&trans &trans &kp UP &trans &trans &trans &kp N7 &kp N8 &kp N9 &kp N0 &kp HOME &kp F1 +&trans &kp LEFT &kp DOWN &kp RIGHT &trans &trans &kp N4 &kp N5 &kp N6 &trans &trans &kp F10 +&trans &trans &trans &trans &trans &trans &kp N1 &kp N2 &kp N3 &trans &trans &kp F20 + &trans &trans &trans < 3 BACKSPACE &kp LSHFT >; }; SYMNUM { bindings = < - &trans &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp DEL - &trans &bt BT_CLR &bt BT_PRV &bt BT_NXT &trans &trans &kp UNDER &kp EQUAL &kp LBKT &kp RBKT &kp BSLH &kp GRAVE - &trans &out OUT_TOG &bootloader &trans &trans &trans &kp MINUS &kp PLUS &kp LBRC &kp RBRC &kp PIPE &kp TILDE - &trans &trans < 3 TAB &trans &trans +&trans &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp DEL +&trans &bt BT_CLR &bt BT_PRV &bt BT_NXT &trans &trans &kp UNDER &mt RIGHT_SHIFT EQUAL &mt RCTRL LBKT &mt RIGHT_ALT RBKT &mt RIGHT_GUI BSLH &kp GRAVE +&trans &out OUT_TOG &bootloader &trans &trans &trans &kp MINUS &kp PLUS &kp LBRC &kp RBRC &kp PIPE &kp TILDE + &trans &trans < 3 TAB &trans &trans >; }; FUN { bindings = < - &trans &trans &kp F1 &kp F2 &kp F3 &kp F4 &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_CLR - &trans &kp DEL &kp F5 &kp F6 &kp F7 &kp F8 &out OUT_TOG &kp K_PLAY_PAUSE &kp C_VOLUME_DOWN &kp C_VOLUME_UP &kp C_MUTE &kp LALT - &trans &trans &kp F9 &kp F10 &kp F11 &kp F12 &trans &trans &trans &trans &trans &to 0 - &trans &trans &trans &trans &trans +&trans &trans &kp F1 &kp F2 &kp F3 &kp F4 &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_CLR +&trans &kp DEL &kp F5 &kp F6 &kp F7 &kp F8 &out OUT_TOG &kp K_PLAY_PAUSE &kp C_VOLUME_DOWN &kp C_VOLUME_UP &kp C_MUTE &kp LALT +&trans &trans &kp F9 &kp F10 &kp F11 &kp F12 &trans &trans &trans &trans &trans &to 0 + &trans &trans &trans &trans &trans >; }; SCROLL { bindings = < - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &trans &trans &trans &trans &trans +&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans +&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans +&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans >; }; }; From 975a9e841a660c7291620fabc1b98f282e742dd1 Mon Sep 17 00:00:00 2001 From: "keymap-editor[bot]" <91849743+keymap-editor[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 21:18:57 +0000 Subject: [PATCH 18/26] add homerow for other layers --- config/charybdis.keymap | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/charybdis.keymap b/config/charybdis.keymap index ebbb103..a2dc84b 100644 --- a/config/charybdis.keymap +++ b/config/charybdis.keymap @@ -103,9 +103,9 @@ NAV { bindings = < -&trans &trans &kp UP &trans &trans &trans &kp N7 &kp N8 &kp N9 &kp N0 &kp HOME &kp F1 -&trans &kp LEFT &kp DOWN &kp RIGHT &trans &trans &kp N4 &kp N5 &kp N6 &trans &trans &kp F10 -&trans &trans &trans &trans &trans &trans &kp N1 &kp N2 &kp N3 &trans &trans &kp F20 +&trans &trans &kp UP &trans &trans &trans &kp N7 &kp N8 &kp N9 &kp N0 &kp HOME &kp F1 +&trans &kp LEFT &kp DOWN &kp RIGHT &trans &trans &kp N4 &mt RIGHT_SHIFT N5 &mt RCTRL N6 &trans &trans &kp F10 +&trans &trans &trans &trans &trans &trans &kp N1 &kp N2 &kp N3 &trans &trans &kp F20 &trans &trans &trans < 3 BACKSPACE &kp LSHFT >; }; From b1526dd04acb627ff7a18495296ae84930cf99ac Mon Sep 17 00:00:00 2001 From: "keymap-editor[bot]" <91849743+keymap-editor[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 21:47:38 +0000 Subject: [PATCH 19/26] Add layer for testing auto-mouse --- config/charybdis.keymap | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/config/charybdis.keymap b/config/charybdis.keymap index a2dc84b..d9a0a35 100644 --- a/config/charybdis.keymap +++ b/config/charybdis.keymap @@ -94,10 +94,10 @@ BASE { bindings = < -&kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC -&kp LCTRL &mt LEFT_GUI A &mt LEFT_ALT S &mt LCTRL D &mt LEFT_SHIFT F &kp G &kp H &mt LEFT_SHIFT J &mt RCTRL K &mt RIGHT_ALT L &mt RIGHT_GUI SEMI &kp APOS -&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp LGUI - &mo 4 &kp SPACE < 1 TAB &mo 2 &Shift_Enter RIGHT_SHIFT ENTER +&kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC +&kp LCTRL &mt LEFT_GUI A &mt LEFT_ALT S &mt LCTRL D &mt LEFT_SHIFT F &kp G &kp H &mt LEFT_SHIFT J &mt RCTRL K &mt RIGHT_ALT L &mt RIGHT_GUI SEMI &kp APOS +&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp LGUI + &mo 4 &kp SPACE < 1 TAB &mo 2 &kp RET >; }; @@ -136,5 +136,14 @@ &trans &trans &trans &trans &trans >; }; + + AUTO-MOUSE { + bindings = < +&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans +&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans +&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &mkp LCLK &mo 4 &mkp RCLK &trans &trans + >; + }; }; }; From afd504975b5a61eb9dffaf253a1a2228f4d93a25 Mon Sep 17 00:00:00 2001 From: Eren Atas Date: Wed, 10 Apr 2024 23:57:03 +0200 Subject: [PATCH 20/26] Add auto-mouse config for testing --- config/boards/shields/charybdis/charybdis_right.conf | 9 +++++---- config/boards/shields/charybdis/charybdis_right.overlay | 3 +++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/config/boards/shields/charybdis/charybdis_right.conf b/config/boards/shields/charybdis/charybdis_right.conf index acb06ce..dc4740c 100644 --- a/config/boards/shields/charybdis/charybdis_right.conf +++ b/config/boards/shields/charybdis/charybdis_right.conf @@ -5,10 +5,10 @@ CONFIG_ZMK_MOUSE=y CONFIG_ZMK_EXT_POWER=y CONFIG_PMW3610=y -CONFIG_PMW3610_CPI=1500 -CONFIG_PMW3610_CPI_DIVIDOR=4 +CONFIG_PMW3610_CPI=1500 # default 800 +CONFIG_PMW3610_CPI_DIVIDOR=4 # default 1 CONFIG_PMW3610_ORIENTATION_90=y -CONFIG_PMW3610_SNIPE_CPI=800 +CONFIG_PMW3610_SNIPE_CPI=800 # default 200 CONFIG_PMW3610_SNIPE_CPI_DIVIDOR=4 CONFIG_PMW3610_SCROLL_TICK=32 CONFIG_PMW3610_INVERT_X=y @@ -23,4 +23,5 @@ CONFIG_PMW3610_REST1_SAMPLE_TIME_MS=20 #CONFIG_PMW3610_FORCE_AWAKE=n CONFIG_PMW3610_POLLING_RATE_125_SW=y -CONFIG_PMW3610_SMART_ALGORITHM=y +CONFIG_PMW3610_SMART_ALGORITHM=y # default y +CONFIG_PMW3610_AUTOMOUSE_TIMEOUT_MS=400 # default 400 diff --git a/config/boards/shields/charybdis/charybdis_right.overlay b/config/boards/shields/charybdis/charybdis_right.overlay index 6894a12..2916502 100644 --- a/config/boards/shields/charybdis/charybdis_right.overlay +++ b/config/boards/shields/charybdis/charybdis_right.overlay @@ -58,7 +58,10 @@ reg = <0>; spi-max-frequency = <2000000>; irq-gpios = <&gpio0 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + /* optional features */ scroll-layers = <4>; + automouse-layer = <5>; + // snipe-layers = <1>; }; }; From 4b9f4792bcf398278cb07cc4f6fccffa5718395a Mon Sep 17 00:00:00 2001 From: Eren Atas Date: Thu, 11 Apr 2024 09:20:51 +0200 Subject: [PATCH 21/26] remove comments, add the link for descriptions --- config/boards/shields/charybdis/charybdis_right.conf | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/config/boards/shields/charybdis/charybdis_right.conf b/config/boards/shields/charybdis/charybdis_right.conf index dc4740c..a5caaa1 100644 --- a/config/boards/shields/charybdis/charybdis_right.conf +++ b/config/boards/shields/charybdis/charybdis_right.conf @@ -5,10 +5,12 @@ CONFIG_ZMK_MOUSE=y CONFIG_ZMK_EXT_POWER=y CONFIG_PMW3610=y -CONFIG_PMW3610_CPI=1500 # default 800 -CONFIG_PMW3610_CPI_DIVIDOR=4 # default 1 + +# https://github.com/inorichi/zmk-pmw3610-driver/blob/main/Kconfig +CONFIG_PMW3610_CPI=1500 +CONFIG_PMW3610_CPI_DIVIDOR=4 CONFIG_PMW3610_ORIENTATION_90=y -CONFIG_PMW3610_SNIPE_CPI=800 # default 200 +CONFIG_PMW3610_SNIPE_CPI=800 CONFIG_PMW3610_SNIPE_CPI_DIVIDOR=4 CONFIG_PMW3610_SCROLL_TICK=32 CONFIG_PMW3610_INVERT_X=y From ad98dc895d31df327063ecd61e2a3355723e4838 Mon Sep 17 00:00:00 2001 From: Eren Atas Date: Thu, 11 Apr 2024 09:28:15 +0200 Subject: [PATCH 22/26] Remove comments in line --- config/boards/shields/charybdis/charybdis_right.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/boards/shields/charybdis/charybdis_right.conf b/config/boards/shields/charybdis/charybdis_right.conf index a5caaa1..1ef2c7c 100644 --- a/config/boards/shields/charybdis/charybdis_right.conf +++ b/config/boards/shields/charybdis/charybdis_right.conf @@ -25,5 +25,5 @@ CONFIG_PMW3610_REST1_SAMPLE_TIME_MS=20 #CONFIG_PMW3610_FORCE_AWAKE=n CONFIG_PMW3610_POLLING_RATE_125_SW=y -CONFIG_PMW3610_SMART_ALGORITHM=y # default y -CONFIG_PMW3610_AUTOMOUSE_TIMEOUT_MS=400 # default 400 +CONFIG_PMW3610_SMART_ALGORITHM=y +CONFIG_PMW3610_AUTOMOUSE_TIMEOUT_MS=400 From 9f43d07f7aae8786a02b42d8aa61693255e96046 Mon Sep 17 00:00:00 2001 From: Eren Atas Date: Sat, 13 Apr 2024 18:51:37 +0200 Subject: [PATCH 23/26] Use NAV layer as scroll layer --- config/boards/shields/charybdis/charybdis_right.overlay | 4 ++-- config/charybdis.keymap | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/config/boards/shields/charybdis/charybdis_right.overlay b/config/boards/shields/charybdis/charybdis_right.overlay index 2916502..0be25e9 100644 --- a/config/boards/shields/charybdis/charybdis_right.overlay +++ b/config/boards/shields/charybdis/charybdis_right.overlay @@ -59,8 +59,8 @@ spi-max-frequency = <2000000>; irq-gpios = <&gpio0 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* optional features */ - scroll-layers = <4>; - automouse-layer = <5>; + scroll-layers = <1>; + // automouse-layer = <4>; // snipe-layers = <1>; }; }; diff --git a/config/charybdis.keymap b/config/charybdis.keymap index d9a0a35..04411a7 100644 --- a/config/charybdis.keymap +++ b/config/charybdis.keymap @@ -128,15 +128,6 @@ >; }; - SCROLL { - bindings = < -&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans -&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans -&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &trans &trans &trans &trans &trans - >; - }; - AUTO-MOUSE { bindings = < &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans From 91955a942819ad86c6213a1fc94a45505ba44b14 Mon Sep 17 00:00:00 2001 From: "keymap-editor[bot]" <91849743+keymap-editor[bot]@users.noreply.github.com> Date: Sat, 13 Apr 2024 17:01:26 +0000 Subject: [PATCH 24/26] Change keymap (WIP) --- config/charybdis.keymap | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/charybdis.keymap b/config/charybdis.keymap index 04411a7..fc967f3 100644 --- a/config/charybdis.keymap +++ b/config/charybdis.keymap @@ -94,10 +94,10 @@ BASE { bindings = < -&kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC -&kp LCTRL &mt LEFT_GUI A &mt LEFT_ALT S &mt LCTRL D &mt LEFT_SHIFT F &kp G &kp H &mt LEFT_SHIFT J &mt RCTRL K &mt RIGHT_ALT L &mt RIGHT_GUI SEMI &kp APOS -&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp LGUI - &mo 4 &kp SPACE < 1 TAB &mo 2 &kp RET +&kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC +&kp TAB &mt LEFT_GUI A &mt LEFT_ALT S &mt LCTRL D &mt LEFT_SHIFT F &kp G &kp H &mt LEFT_SHIFT J &mt RCTRL K &mt RIGHT_ALT L &mt RIGHT_GUI SEMI &kp APOS +&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp LGUI + &mkp LCLK &kp SPACE &mo 1 &mo 2 &kp RET >; }; From 16492cb5dd30c2727374fee5a1c85e0dba7ed047 Mon Sep 17 00:00:00 2001 From: Eren Atas Date: Sun, 14 Apr 2024 00:39:10 +0200 Subject: [PATCH 25/26] Add scroll layer and try auto-mouse layer again Signed-off-by: Eren Atas --- .../shields/charybdis/charybdis_right.overlay | 4 +- config/charybdis.keymap | 65 ++++++++++++------- 2 files changed, 44 insertions(+), 25 deletions(-) diff --git a/config/boards/shields/charybdis/charybdis_right.overlay b/config/boards/shields/charybdis/charybdis_right.overlay index 0be25e9..6ff8fd2 100644 --- a/config/boards/shields/charybdis/charybdis_right.overlay +++ b/config/boards/shields/charybdis/charybdis_right.overlay @@ -59,8 +59,8 @@ spi-max-frequency = <2000000>; irq-gpios = <&gpio0 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* optional features */ - scroll-layers = <1>; - // automouse-layer = <4>; + scroll-layers = <5>; + automouse-layer = <4>; // snipe-layers = <1>; }; }; diff --git a/config/charybdis.keymap b/config/charybdis.keymap index fc967f3..aa18786 100644 --- a/config/charybdis.keymap +++ b/config/charybdis.keymap @@ -5,18 +5,7 @@ #include #include -< { - tapping-term-ms = <240>; - flavor = "tap-preferred"; - quick-tap-ms = <150>; - require-prior-idle-ms = <10>; -}; - -&mt { - tapping-term-ms = <250>; - flavor = "tap-preferred"; - require-prior-idle-ms = <250>; -}; +#define U_TAPPING_TERM 200 / { chosen { zmk,matrix_transform = &default_transform; }; @@ -36,6 +25,11 @@ key-positions = <20 21>; }; + MiddleClickRight { + bindings = <&mkp MCLK>; + key-positions = <21 22>; + }; + ParaLeft { bindings = <&kp LEFT_PARENTHESIS>; key-positions = <4 16>; @@ -78,6 +72,22 @@ }; behaviors { + u_mt: u_mt { + compatible = "zmk,behavior-hold-tap"; + label = "u_mt"; + #binding-cells = <2>; + tapping_term_ms = ; + flavor = "tap-preferred"; + bindings = <&kp>, <&kp>; + }; + u_lt: u_lt { + compatible = "zmk,behavior-hold-tap"; + label = "u_lt"; + #binding-cells = <2>; + tapping_term_ms = ; + flavor = "tap-preferred"; + bindings = <&mo>, <&kp>; + }; Shift_Enter: Shift_Enter { compatible = "zmk,behavior-hold-tap"; label = "SHIFT_ENTER"; @@ -94,27 +104,27 @@ BASE { bindings = < -&kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC -&kp TAB &mt LEFT_GUI A &mt LEFT_ALT S &mt LCTRL D &mt LEFT_SHIFT F &kp G &kp H &mt LEFT_SHIFT J &mt RCTRL K &mt RIGHT_ALT L &mt RIGHT_GUI SEMI &kp APOS -&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp LGUI - &mkp LCLK &kp SPACE &mo 1 &mo 2 &kp RET +&kp ESC &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC +&kp TAB &u_mt LEFT_GUI A &u_mt LEFT_ALT S &u_mt LCTRL D &u_mt LEFT_SHIFT F &kp G &kp H &u_mt LEFT_SHIFT J &u_mt RCTRL K &u_mt RIGHT_ALT L &u_mt RIGHT_GUI SEMI &kp APOS +&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp LGUI + &kp LGUI &kp SPACE &mo 1 &mo 2 &kp RET >; }; NAV { bindings = < -&trans &trans &kp UP &trans &trans &trans &kp N7 &kp N8 &kp N9 &kp N0 &kp HOME &kp F1 -&trans &kp LEFT &kp DOWN &kp RIGHT &trans &trans &kp N4 &mt RIGHT_SHIFT N5 &mt RCTRL N6 &trans &trans &kp F10 -&trans &trans &trans &trans &trans &trans &kp N1 &kp N2 &kp N3 &trans &trans &kp F20 - &trans &trans &trans < 3 BACKSPACE &kp LSHFT +&trans &trans &kp UP &trans &trans &trans &kp N7 &kp N8 &kp N9 &kp N0 &kp HOME &kp F1 +&trans &kp LEFT &kp DOWN &kp RIGHT &trans &trans &kp N4 &u_mt RIGHT_SHIFT N5 &u_mt RCTRL N6 &trans &trans &kp F10 +&trans &trans &trans &trans &trans &trans &kp N1 &kp N2 &kp N3 &trans &trans &kp F20 + &trans &trans &trans < 3 BACKSPACE &kp LSHFT >; }; SYMNUM { bindings = < -&trans &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp DEL -&trans &bt BT_CLR &bt BT_PRV &bt BT_NXT &trans &trans &kp UNDER &mt RIGHT_SHIFT EQUAL &mt RCTRL LBKT &mt RIGHT_ALT RBKT &mt RIGHT_GUI BSLH &kp GRAVE -&trans &out OUT_TOG &bootloader &trans &trans &trans &kp MINUS &kp PLUS &kp LBRC &kp RBRC &kp PIPE &kp TILDE +&trans &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp DEL +&trans &bt BT_CLR &bt BT_PRV &bt BT_NXT &trans &trans &kp UNDER &u_mt RIGHT_SHIFT EQUAL &u_mt RCTRL LBKT &u_mt RIGHT_ALT RBKT &u_mt RIGHT_GUI BSLH &kp GRAVE +&trans &out OUT_TOG &bootloader &trans &trans &trans &kp MINUS &kp PLUS &kp LBRC &kp RBRC &kp PIPE &kp TILDE &trans &trans < 3 TAB &trans &trans >; }; @@ -136,5 +146,14 @@ &mkp LCLK &mo 4 &mkp RCLK &trans &trans >; }; + + SCROLL { + bindings = < +&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans +&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans +&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans + >; + }; }; }; From b753cc30edfad7ce9d8c4a41b0c91c04353bba6d Mon Sep 17 00:00:00 2001 From: Eren Atas Date: Sun, 14 Apr 2024 10:06:13 +0200 Subject: [PATCH 26/26] forgot to mo to scroll on base Signed-off-by: Eren Atas --- config/charybdis.keymap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/charybdis.keymap b/config/charybdis.keymap index aa18786..36895be 100644 --- a/config/charybdis.keymap +++ b/config/charybdis.keymap @@ -143,7 +143,7 @@ &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &mkp LCLK &mo 4 &mkp RCLK &trans &trans + &mkp LCLK &mo 5 &mkp RCLK &trans &trans >; };