modify config

Amos698 · Sep 4, 2023 · b144c5f · b144c5f
1 parent bc3feff
commit b144c5f
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 36 deletions.
diff --git a/app/boards/shields/charybdis/Kconfig.defconfig b/app/boards/shields/charybdis/Kconfig.defconfig
@@ -17,7 +17,7 @@ endif
 
 config MOUSE_LAYER_INDEX
  int "Index of mouse layer"
- default 4
+ default 3
 
 config SCROLL_LAYER_INDEX
  int "Index of scroll layer"

diff --git a/app/boards/shields/charybdis/charybdis.conf b/app/boards/shields/charybdis/charybdis.conf
@@ -0,0 +1,9 @@
+# enable auto-sleeping after being idle for 15 mins (unit: ms)
+CONFIG_ZMK_SLEEP=y
+CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=900000
+
+# set transmission power to max
+CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
+
+CONFIG_ZMK_RGB_UNDERGLOW=y
+CONFIG_WS2812_STRIP=y
diff --git a/app/boards/shields/charybdis/charybdis.dtsi b/app/boards/shields/charybdis/charybdis.dtsi
@@ -7,31 +7,18 @@
  };
 
  default_transform: keymap_transform_0 {
- compatible = "zmk,matrix-transform";
- columns = <12>;
- rows = <4>;
-
- map = <
- RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,11) RC(0,10) RC(0,9) RC(0,8) RC(0,7) RC(0,6)
- RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,11) RC(1,10) RC(1,9) RC(1,8) RC(1,7) RC(1,6)
- RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,11) RC(2,10) RC(2,9) RC(2,8) RC(2,7) RC(2,6)
- RC(3,3) RC(3,4) RC(3,1) RC(3,7) RC(3,9)
- >;
- };
-
- five_column_transform: keymap_transform_1 {
  compatible = "zmk,matrix-transform";
  columns = <10>;
  rows = <4>;
 
  map = <
- RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,10) RC(0,9) RC(0,8) RC(0,7) RC(0,6)
- RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,10) RC(1,9) RC(1,8) RC(1,7) RC(1,6)
- RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,10) RC(2,9) RC(2,8) RC(2,7) RC(2,6)
- RC(3,3) RC(3,4) RC(3,1) RC(3,6) RC(3,8)
+ RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,9) RC(0,8) RC(0,7) RC(0,6) RC(0,5)
+ RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,9) RC(1,8) RC(1,7) RC(1,6) RC(1,5)
+ RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,9) RC(2,8) RC(2,7) RC(2,6) RC(2,5)
+ RC(3,2) RC(3,3) RC(3,0) RC(3,5) RC(3,7)
  >;
  };
- 
+
  kscan0: kscan {
  compatible = "zmk,kscan-gpio-matrix";
  label = "KSCAN";

diff --git a/app/boards/shields/charybdis/charybdis.keymap b/app/boards/shields/charybdis/charybdis.keymap
@@ -12,34 +12,43 @@
  Base {
  label = "Base";
  bindings = <
- &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC
- &kp ESC &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 RSHIFT
-  &kp LCTRL &mo 1 &kp SPACE &kp RET &mo 2
+ &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P
+ &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI
+ &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH
+ &kp LCTRL &mo 1 &kp SPACE &kp RET &mo 2
  >;
  trackball-bindings = <&tmv_coarse>;
  };
 
  Lower {
  label = "Lower";
  bindings = <
- &trans &kp K_PP &kp UP &kp N1 &kp N2 &kp N3 &kp N7 &kp N8 &kp N9 &kp N0 &kp HOME &trans
- &trans &kp LEFT &kp DOWN &kp RIGHT &kp N4 &kp N5 &kp N4 &kp N5 &kp N6 &kp RIGHT &trans &kp F10
- &kp LEFT_ALT &trans &trans &trans &kp MINUS &kp PLUS &kp N1 &kp N2 &kp N3 &kp DOT  &trans &trans
-  &kp LGUI &trans &kp SPACE &kp RET &kp RCTRL
+ &kp K_PP &kp UP &kp N1 &kp N2 &kp N3 &kp N7 &kp N8 &kp N9 &kp N0 &kp HOME
+ &kp LEFT &kp DOWN &kp RIGHT &kp N4 &kp N5 &kp N4 &kp N5 &kp N6 &kp RIGHT &trans
+ &trans &trans &trans &kp MINUS &kp PLUS &kp N1 &kp N2 &kp N3 &kp DOT &trans
+ &kp LGUI &trans &kp SPACE &kp RET &kp RCTRL
  >;
  trackball-bindings = <&tmv_fine>;
  };
 
  Raise {
  label = "Raise";
  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 &bt BT_SEL 0 &to 3 &kp UNDER &kp EQUAL &kp LBKT &kp RBKT &kp BSLH &kp GRAVE
- &trans &out OUT_TOG &trans &trans &trans &trans &kp MINUS &kp PLUS &kp LBRC &kp RBRC &kp PIPE &kp TILDE
-  &kp LGUI &kp LEFT_ALT &kp SPACE &kp RET &trans
+ &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR
+ &bt BT_CLR &bt BT_PRV &bt BT_NXT &bt BT_SEL 0 &to 3 &kp UNDER &kp EQUAL &kp LBKT &kp RBKT &kp BSLH
+ &out OUT_TOG &trans &trans &trans &trans &kp MINUS &kp PLUS &kp LBRC &kp RBRC &kp PIPE
+ &kp LGUI &kp LEFT_ALT &kp SPACE &kp RET &trans
  >;
  trackball-bindings = <&tsl_fine>;
  };
+
+ mouse_layer {
+ bindings = <
+ &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
+ &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
+ &mkp MCLK &trans &trans &trans &trans &trans &trans &trans &trans &mkp LCLK
+ &mkp LCLK &trans &mkp RCLK &trans &trans
+ >;
+ };
  };
 };
diff --git a/app/boards/shields/charybdis/charybdis_left.overlay b/app/boards/shields/charybdis/charybdis_left.overlay
@@ -8,11 +8,14 @@
 
 &kscan0 {
  col-gpios
- = <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
- , <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+ = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
  , <&pro_micro 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
  , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
  , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
  , <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
  ;
-};
+};
+
+&led_strip {
+ chain-length = <18>;
+}
diff --git a/app/boards/shields/charybdis/charybdis_right.conf b/app/boards/shields/charybdis/charybdis_right.conf
@@ -12,8 +12,9 @@ CONFIG_ZMK_MOUSE_WORK_QUEUE_DEDICATED=y
 CONFIG_ZMK_MOUSE_DEDICATED_THREAD_PRIORITY=1
 
 CONFIG_PMW3610=y
-#CONFIG_PMW3610_CPI=1600
-#CONFIG_PMW3610_CPI_DIVIDOR=4
+CONFIG_PMW3610_CPI=1600
+CONFIG_PMW3610_CPI_DIVIDOR=4
+CONFIG_PMW3610_SMART_ALGORITHM=y
 CONFIG_PMW3610_ORIENTATION_90=y
 CONFIG_PMW3610_INVERT_X=y
 CONFIG_PMW3610_REST1_SAMPLE_TIME_MS=100