Skip to content

Commit 44081b1

Browse files
authored
Merge pull request #2 from 280Zo/test/merge_branches
Test/merge branches
2 parents a9608a4 + 97d8e83 commit 44081b1

File tree

3 files changed

+19
-10
lines changed

3 files changed

+19
-10
lines changed

config/boards/shields/charybdis-mini-wireless/charybdis_right.conf

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ CONFIG_PMW3610=y
99

1010
# https://github.com/inorichi/zmk-pmw3610-driver/blob/main/Kconfig
1111
CONFIG_PMW3610_SMART_ALGORITHM=y
12-
CONFIG_PMW3610_CPI=200
13-
CONFIG_PMW3610_CPI_DIVIDOR=1
14-
CONFIG_PMW3610_SNIPE_CPI=800
12+
CONFIG_PMW3610_CPI=1600
13+
CONFIG_PMW3610_CPI_DIVIDOR=3
14+
CONFIG_PMW3610_SNIPE_CPI=200
1515
CONFIG_PMW3610_SNIPE_CPI_DIVIDOR=1
1616
CONFIG_PMW3610_SCROLL_TICK=20
1717
CONFIG_PMW3610_POLLING_RATE_125_SW=y

config/boards/shields/charybdis-mini-wireless/charybdis_right.overlay

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
spi-max-frequency = <2000000>;
5252
irq-gpios = <&gpio0 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
5353
/* optional features */
54-
// snipe-layers = <1>;
54+
snipe-layers = <8>;
5555
scroll-layers = <1 2 5 6>;
5656
automouse-layer = <4>;
5757
};

config/charybdis.keymap

+15-6
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@
103103
bindings = <
104104
&none &msc MOVE_LEFT &msc MOVE_UP &mmv MOVE_UP &msc MOVE_DOWN &msc MOVE_RIGHT &none &none &none &none &none &none
105105
&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
106-
&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
107-
&mkp MCLK &mkp LCLK &mkp RCLK &none &none
106+
&none &kp C_AC_UNDO &kp C_AC_CUT &kp C_AC_COPY &kp C_AC_PASTE &mkp MCLK &none &none &none &none &none &none
107+
&tog 8 &mkp LCLK &mkp RCLK &none &none
108108
>;
109109
};
110110

@@ -128,10 +128,19 @@
128128

129129
Extras {
130130
bindings = <
131-
&kp C_SLEEP &none &none &none &none &kp C_BRIGHTNESS_MAXIMUM &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_CLR &kp C_AL_COFFEE
132-
&kp C_POWER &none &none &none &kp C_AC_SCROLL_UP &kp C_BRIGHTNESS_INC &out OUT_TOG &kp C_PREVIOUS &kp C_PLAY_PAUSE &kp C_STOP &kp C_NEXT &none
133-
&bootloader &none &none &none &kp C_AC_SCROLL_DOWN &kp C_BRIGHTNESS_DEC &kp PRINTSCREEN &kp C_VOLUME_DOWN &kp C_VOLUME_UP &kp K_MUTE &none &bootloader
134-
&none &none &none &none &none
131+
&kp C_SLEEP &none &none &none &none &kp C_BRIGHTNESS_MAXIMUM &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_CLR &kp C_AL_COFFEE
132+
&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
133+
&bootloader &none &none &none &none &kp C_BRIGHTNESS_DEC &kp PRINTSCREEN &kp C_VOLUME_DOWN &kp C_VOLUME_UP &kp K_MUTE &none &bootloader
134+
&none &none &none &none &none
135+
>;
136+
};
137+
138+
slow_mouse {
139+
bindings = <
140+
&none &msc MOVE_LEFT &msc MOVE_UP &mmv MOVE_UP &msc MOVE_DOWN &msc MOVE_RIGHT &none &none &none &none &none &none
141+
&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
142+
&none &kp C_AC_UNDO &kp C_AC_CUT &kp C_AC_COPY &kp C_AC_PASTE &mkp MCLK &none &none &none &none &none &none
143+
&tog 8 &mkp LCLK &mkp RCLK &none &none
135144
>;
136145
};
137146
};

0 commit comments

Comments
 (0)