Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keep in sync w/ upstream #3

Merged
merged 16 commits into from
Apr 10, 2024
Merged

Keep in sync w/ upstream #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a49f373
Update charybdis.keymap
grassfedreeve Apr 10, 2024
dea1cfc
Update charybdis.conf
grassfedreeve Apr 10, 2024
746eb22
Initial commit for conversion to 3x6 efforts
erenatas Apr 7, 2024
79a76c8
Fix typo for transform
erenatas Apr 7, 2024
2479657
Try K_MUTE instead of C_MUTE
erenatas Apr 7, 2024
db59e91
forgot to add &kp
erenatas Apr 7, 2024
fb350b8
Update info.json and remove extra whitespace
erenatas Apr 7, 2024
596cab8
Fix combo positions
erenatas Apr 7, 2024
c64b544
try lowering down CPI, too sensitive
erenatas Apr 7, 2024
315ab73
try lowering CPI more
erenatas Apr 7, 2024
dc1cbba
Try to find sweet spot
erenatas Apr 7, 2024
ab71f3a
Add ALT and DEL keys as well
erenatas Apr 7, 2024
3748c1a
Add behavior for F_ALT
erenatas Apr 7, 2024
a20faa6
&mt should be enough for LALT/F
erenatas Apr 7, 2024
15f4ab4
Add homerow mods
keymap-editor[bot] Apr 10, 2024
975a9e8
add homerow for other layers
keymap-editor[bot] Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/boards/shields/charybdis/charybdis_right.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ CONFIG_ZMK_MOUSE=y
CONFIG_ZMK_EXT_POWER=y

CONFIG_PMW3610=y
CONFIG_PMW3610_CPI=3000
CONFIG_PMW3610_CPI=1500
CONFIG_PMW3610_CPI_DIVIDOR=4
CONFIG_PMW3610_ORIENTATION_90=y
CONFIG_PMW3610_SNIPE_CPI=800
Expand Down
1 change: 1 addition & 0 deletions config/charybdis.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
68 changes: 34 additions & 34 deletions config/charybdis.keymap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <dt-bindings/zmk/mouse.h>
#include <behaviors/mouse_keys.dtsi>
#include <behaviors.dtsi>
#include <dt-bindings/zmk/bt.h>
#include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/mouse.h>
#include <dt-bindings/zmk/outputs.h>

&lt {
Expand All @@ -19,7 +19,7 @@
};

/ {
chosen { zmk,matrix_transform = &five_column_transform; };
chosen { zmk,matrix_transform = &default_transform; };
};

/ {
Expand All @@ -28,52 +28,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 19>;
};

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 20>;
};

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 21>;
};

Delete {
bindings = <&kp DELETE>;
key-positions = <7 8>;
key-positions = <8 9>;
};

CapsWord {
bindings = <&caps_word>;
key-positions = <14 15>;
key-positions = <17 18>;
};
};

Expand All @@ -84,56 +84,56 @@
bindings = <&kp>, <&kp>;

#binding-cells = <2>;
hold-trigger-key-positions = <34>;
hold-trigger-key-positions = <40>;
tapping-term-ms = <100>;
};
};

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 &lt 1 TAB &lt 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 &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 &lt 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 &lt 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 &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 &lt 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 &lt 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 &lt 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 &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
>;
};
};
Expand Down
8 changes: 7 additions & 1 deletion config/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand All @@ -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 },
Expand All @@ -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 },
Expand All @@ -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 },
Expand All @@ -46,4 +52,4 @@
}
},
"sensors": []
}
}