Skip to content

Commit

Permalink
Merge pull request #1 from 280Zo/test/trackball-changes
Browse files Browse the repository at this point in the history 
Test/trackball changes
  • Loading branch information
@280Zo
280Zo committed Aug 1, 2024
2 parents 5aaf6e4 + 3508486 commit 4571d6e
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 23 deletions.
16 changes: 8 additions & 8 deletions config/boards/shields/charybdis-mini-wireless/charybdis_right.conf
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
# https://zmk.dev/docs/config/power#kconfig-2
CONFIG_ZMK_EXT_POWER=y

# https://github.com/inorichi/zmk-pmw3610-driver?tab=readme-ov-file
CONFIG_SPI=y
CONFIG_INPUT=y
CONFIG_ZMK_MOUSE=y
CONFIG_PMW3610=y

# https://zmk.dev/docs/config/power#kconfig-2
CONFIG_ZMK_EXT_POWER=y

# https://github.com/inorichi/zmk-pmw3610-driver/blob/main/Kconfig
CONFIG_PMW3610_SMART_ALGORITHM=y
CONFIG_PMW3610_CPI=1200
CONFIG_PMW3610_CPI_DIVIDOR=4
CONFIG_PMW3610_CPI=200
CONFIG_PMW3610_CPI_DIVIDOR=1
CONFIG_PMW3610_SNIPE_CPI=800
CONFIG_PMW3610_SNIPE_CPI_DIVIDOR=4
CONFIG_PMW3610_SNIPE_CPI_DIVIDOR=1
CONFIG_PMW3610_SCROLL_TICK=20
CONFIG_PMW3610_RUN_DOWNSHIFT_TIME_MS=3264
CONFIG_PMW3610_REST1_SAMPLE_TIME_MS=20
CONFIG_PMW3610_POLLING_RATE_125_SW=y
CONFIG_PMW3610_REST1_SAMPLE_TIME_MS=20
CONFIG_PMW3610_RUN_DOWNSHIFT_TIME_MS=2000
CONFIG_PMW3610_ORIENTATION_90=y
CONFIG_PMW3610_INVERT_X=y
CONFIG_PMW3610_INVERT_SCROLL_Y=n
Expand Down
2 changes: 1 addition & 1 deletion config/boards/shields/charybdis-mini-wireless/charybdis_right.overlay
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
irq-gpios = <&gpio0 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
/* optional features */
// snipe-layers = <1>;
scroll-layers = <2 3>;
scroll-layers = <1 2 5 6>;
automouse-layer = <4>;
};
};
Expand Down
41 changes: 27 additions & 14 deletions config/charybdis.keymap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,16 @@
};

/ {
hm: homerow_mod {
compatible = "zmk,behavior-hold-tap";
#binding-cells = <2>;
flavor = "tap-preferred";
tapping-term-ms = <250>;
quick-tap-ms = <150>;
require-prior-idle-ms = <125>;
bindings = <&kp>, <&kp>;
};

combos {
compatible = "zmk,combos";

Expand Down Expand Up @@ -47,23 +57,26 @@
};
};

behaviors {
};

keymap {
compatible = "zmk,keymap";

Base {
bindings = <
&kp C_AC_SEARCH &kp Q &kp W &kp F &kp P &kp B &kp J &kp L &kp U &kp Y &kp APOS &to 5
&kp TAB &mt LEFT_GUI A &mt LEFT_ALT R &mt LCTRL S &mt LEFT_SHIFT T &kp G &kp M &mt LEFT_SHIFT N &mt RCTRL E &mt RIGHT_ALT I &mt RIGHT_GUI O &kp DEL
&kp LA(LC(T)) &kp Z &mt LA(LS(LCTRL)) X &mt LC(LA(LS(LEFT_GUI))) C &kp D &kp V &kp K &kp H &mt LA(LS(LCTRL)) COMMA &mt LC(LA(LS(LEFT_GUI))) PERIOD &kp FSLH &to 6
&mkp LCLK &lt 1 BACKSPACE &lt 2 ESCAPE &lt 4 RETURN &lt 3 SPACE
&kp C_AC_SEARCH &kp Q &kp W &kp F &kp P &kp B &kp J &kp L &kp U &kp Y &kp APOS &to 5
&kp LG(E) &hm LEFT_GUI A &hm LEFT_ALT R &hm LCTRL S &hm LEFT_SHIFT T &kp G &kp M &hm LEFT_SHIFT N &hm RCTRL E &hm RIGHT_ALT I &hm RIGHT_GUI O &kp DEL
&kp LA(LC(T)) &kp Z &mt LC(LA(LEFT_SHIFT)) X &mt LA(LC(LG(LEFT_SHIFT))) C &kp D &kp V &kp K &kp H &mt LA(LC(LG(LEFT_SHIFT))) COMMA &mt LC(LA(LEFT_SHIFT)) PERIOD &kp FSLH &to 6
&hm LC(F10) TAB &lt 1 BACKSPACE &lt 2 ESCAPE &lt 4 RETURN &lt 3 SPACE
>;
};

Num {
bindings = <
&none &none &none &none &none &none &kp SLASH &mt F7 N7 &mt F8 N8 &mt F9 N9 &mt F10 MINUS &none
&none &none &none &none &kp BACKSPACE &none &kp ASTRK &mt F4 N4 &mt F5 N5 &mt F6 N6 &mt F11 PLUS &none
&none &none &none &none &none &none &kp DOT &mt F1 N1 &mt F2 N2 &mt F3 N3 &mt F12 EQUAL &none
&none &none &none &none &none &none &kp SLASH &hm F7 N7 &hm F8 N8 &hm F9 N9 &hm F10 MINUS &none
&none &none &none &none &kp BACKSPACE &none &kp ASTRK &hm F4 N4 &hm F5 N5 &hm F6 N6 &hm F11 PLUS &none
&none &none &none &none &none &none &kp DOT &hm F1 N1 &hm F2 N2 &hm F3 N3 &hm F12 EQUAL &none
&none &none &none &kp N0 &none
>;
};
Expand All @@ -88,10 +101,10 @@

Mouse {
bindings = <
&none &none &msc MOVE_DOWN &mmv MOVE_UP &msc MOVE_UP &none &none &kp K_UNDO &kp K_CUT &kp K_COPY &kp K_PASTE &none
&none &mkp MB4 &mmv MOVE_LEFT &mmv MOVE_DOWN &mmv MOVE_RIGHT &mkp MB5 &none &kp RIGHT_SHIFT &kp RCTRL &kp LEFT_ALT &kp RIGHT_META &none
&none &none &msc MOVE_LEFT &none &msc MOVE_RIGHT &none &none &none &none &none &none &none
&mkp MCLK &mkp LCLK &mkp RCLK &none &none
&none &msc MOVE_LEFT &msc MOVE_UP &mmv MOVE_UP &msc MOVE_DOWN &msc MOVE_RIGHT &none &none &none &none &none &none
&none &mkp MB4 &mmv MOVE_LEFT &mmv MOVE_DOWN &mmv MOVE_RIGHT &mkp MB5 &none &kp RIGHT_SHIFT &kp RCTRL &kp LEFT_ALT &kp RIGHT_META &none
&none &kp C_AC_UNDO &kp C_AC_CUT &kp C_AC_COPY &kp C_AC_PASTE &kp PRINTSCREEN &none &none &none &none &none &none
&mkp MCLK &mkp LCLK &mkp RCLK &none &none
>;
};

Expand All @@ -115,9 +128,9 @@

Extras {
bindings = <
&kp C_SLEEP &none &none &none &none &kp C_BRIGHTNESS_MAXIMUM &bt BT_CLR &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &kp K_COFFEE
&kp C_POWER &none &none &none &none &kp C_BRIGHTNESS_INC &out OUT_TOG &kp C_PREVIOUS &kp C_STOP &kp C_PLAY_PAUSE &kp C_NEXT &none
&bootloader &none &none &none &none &kp C_BRIGHTNESS_DEC &kp PRINTSCREEN &kp C_VOLUME_DOWN &kp C_VOLUME_UP &kp K_MUTE &none &bootloader
&kp C_SLEEP &none &none &none &none &kp C_BRIGHTNESS_MAXIMUM &bt BT_CLR &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &kp C_AL_COFFEE
&kp C_POWER &none &none &none &none &kp C_BRIGHTNESS_INC &out OUT_TOG &kp C_PREVIOUS &kp C_PLAY_PAUSE &kp C_STOP &kp C_NEXT &none
&bootloader &none &none &none &none &kp C_BRIGHTNESS_DEC &kp PRINTSCREEN &kp C_VOLUME_DOWN &kp C_VOLUME_UP &kp K_MUTE &none &bootloader
&none &none &none &none &none
>;
};
Expand Down

0 comments on commit 4571d6e

Please sign in to comment.