From 86d86f952e77dd9c0892bd46376b75b91bd1d04b Mon Sep 17 00:00:00 2001
From: Victor <lucachi.victor@gmail.com>
Date: Tue, 10 Dec 2024 14:51:12 +0200
Subject: [PATCH] feat: pointing merged, update config

---
 boards/shields/charybdis/charybdis.dtsi       | 10 ++++
 boards/shields/charybdis/charybdis.keymap     |  2 +-
 .../shields/charybdis/charybdis_dongle.conf   |  4 +-
 .../charybdis/charybdis_dongle.overlay        | 12 -----
 .../shields/charybdis/charybdis_left.overlay  |  7 ++-
 boards/shields/charybdis/charybdis_right.conf |  2 +-
 .../shields/charybdis/charybdis_right.overlay | 13 ++----
 boards/shields/charybdis/charybsid.zmk.yml    | 13 ++++++
 config/charybdis.keymap                       | 46 ++-----------------
 config/west.yml                               |  9 +---
 10 files changed, 40 insertions(+), 78 deletions(-)
 create mode 100644 boards/shields/charybdis/charybsid.zmk.yml

diff --git a/boards/shields/charybdis/charybdis.dtsi b/boards/shields/charybdis/charybdis.dtsi
index 0ea9a02..7321b25 100644
--- a/boards/shields/charybdis/charybdis.dtsi
+++ b/boards/shields/charybdis/charybdis.dtsi
@@ -158,4 +158,14 @@
                 ;
         };
     };
+
+    split_inputs {
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        trackball_split: trackball_split@0 {
+            compatible = "zmk,input-split";
+            reg = <0>;
+        };
+    };
 };
\ No newline at end of file
diff --git a/boards/shields/charybdis/charybdis.keymap b/boards/shields/charybdis/charybdis.keymap
index e2bef93..1c7a412 100644
--- a/boards/shields/charybdis/charybdis.keymap
+++ b/boards/shields/charybdis/charybdis.keymap
@@ -6,7 +6,7 @@
 / {
     trackball_listener {
         compatible = "zmk,input-listener";
-        device = <&vtrackball>;
+        device = <&trackball_split>;
     };
 
     keymap {
diff --git a/boards/shields/charybdis/charybdis_dongle.conf b/boards/shields/charybdis/charybdis_dongle.conf
index c087e81..da1e129 100644
--- a/boards/shields/charybdis/charybdis_dongle.conf
+++ b/boards/shields/charybdis/charybdis_dongle.conf
@@ -2,7 +2,7 @@ CONFIG_ZMK_SPLIT_BLE_CENTRAL_PERIPHERALS=2
 CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
 
 CONFIG_INPUT=y
-CONFIG_ZMK_MOUSE=y
-CONFIG_ZMK_MOUSE_SMOOTH_SCROLLING=y
+CONFIG_ZMK_POINTING=y
+CONFIG_ZMK_POINTING_SMOOTH_SCROLLING=y
 
 CONFIG_ZMK_SLEEP=n
\ No newline at end of file
diff --git a/boards/shields/charybdis/charybdis_dongle.overlay b/boards/shields/charybdis/charybdis_dongle.overlay
index 27f7f2c..908cd0b 100644
--- a/boards/shields/charybdis/charybdis_dongle.overlay
+++ b/boards/shields/charybdis/charybdis_dongle.overlay
@@ -11,16 +11,4 @@
         rows = <0>;
         events = <0>;
     };
-};
-
-/ {
-	vtrackball: virtual_input_trackball {
-		compatible = "zmk,virtual-input";
-	};
-
-	input_relay_config_trackball {
-		compatible = "zmk,split-peripheral-input-relay";
-		device = <&vtrackball>;
-		relay-channel = <102>;
-	};
 };
\ No newline at end of file
diff --git a/boards/shields/charybdis/charybdis_left.overlay b/boards/shields/charybdis/charybdis_left.overlay
index 5e2887a..5b80c3f 100644
--- a/boards/shields/charybdis/charybdis_left.overlay
+++ b/boards/shields/charybdis/charybdis_left.overlay
@@ -3,6 +3,7 @@
 
 &kscan0 {
 	compatible = "zmk,kscan-gpio-matrix";
+	wakeup-source;
 	
 	col-gpios
 		= <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
@@ -21,8 +22,6 @@
 		;
 };
 
-/ {
-	vtrackball: virtual_input_trackball {
-		compatible = "zmk,virtual-input";
-	};
+&trackball_split {
+	status = "disabled";
 };
\ No newline at end of file
diff --git a/boards/shields/charybdis/charybdis_right.conf b/boards/shields/charybdis/charybdis_right.conf
index 720e630..3046b7a 100644
--- a/boards/shields/charybdis/charybdis_right.conf
+++ b/boards/shields/charybdis/charybdis_right.conf
@@ -1,7 +1,7 @@
 CONFIG_SPI=y
 CONFIG_INPUT=y
 CONFIG_PMW3610=y
-CONFIG_ZMK_MOUSE=y
+CONFIG_ZMK_POINTING=y
 CONFIG_ZMK_EXT_POWER=y
 
 CONFIG_PMW3610_INVERT_X=y
diff --git a/boards/shields/charybdis/charybdis_right.overlay b/boards/shields/charybdis/charybdis_right.overlay
index 5c41819..34d69f4 100644
--- a/boards/shields/charybdis/charybdis_right.overlay
+++ b/boards/shields/charybdis/charybdis_right.overlay
@@ -37,14 +37,7 @@
     status = "okay";
 };
 
-/ {
-	vtrackball: virtual_input_trackball {
-		compatible = "zmk,virtual-input";
-	};
-
-	input_relay_config_trackball {
-		compatible = "zmk,split-peripheral-input-relay";
-		device = <&trackball>;
-		relay-channel = <102>;
-	};
+&trackball_split {
+	device = <&trackball>;
+    input-processors = <&zip_xy_transform (INPUT_TRANSFORM_XY_SWAP | INPUT_TRANSFORM_X_INVERT | INPUT_TRANSFORM_Y_INVERT)>;
 };
\ No newline at end of file
diff --git a/boards/shields/charybdis/charybsid.zmk.yml b/boards/shields/charybdis/charybsid.zmk.yml
new file mode 100644
index 0000000..fbeb1c8
--- /dev/null
+++ b/boards/shields/charybdis/charybsid.zmk.yml
@@ -0,0 +1,13 @@
+file_format: "1"
+id: charybdis
+name: Charybdis
+type: shield
+url: https://github.com/Bastardkb/Charybdis/
+requires: [pro_micro]
+features:
+  - keys
+  - pointer
+siblings:
+  - charybdis_left
+  - charybdis_right
+  - charybdis_dongle
\ No newline at end of file
diff --git a/config/charybdis.keymap b/config/charybdis.keymap
index 1942a9b..d97a196 100644
--- a/config/charybdis.keymap
+++ b/config/charybdis.keymap
@@ -19,55 +19,19 @@
 / {
     trackball_listener {
         compatible = "zmk,input-listener";
-        device = <&vtrackball>;
+        device = <&trackball_split>;
 
         snipe {
-            layers = <Button>;
-            input-processors = <&xy_scaler 1 3>;
+            layers = <MSE>;
+            input-processors = <&zip_xy_scaler 1 3>;
         };
 
         scroll {
-            layers = <Nav>;
-            input-processors = <&xy_invert (INPUT_TRANSFORM_Y_INVERT)>, <&xy_scaler 1 3>, <&x_scaler 0 1>, <&mouse_to_wheel_mapper>;
+            layers = <NAV>;
+            input-processors = <&zip_xy_scaler 1 3>, <&zip_xy_to_scroll_mapper>, <&zip_scroll_transform (INPUT_TRANSFORM_Y_INVERT)>;
         };
     };
 
-    xy_scaler: xy_scaler {
-        compatible = "zmk,input-processor-scaler";
-        #input-processor-cells = <2>;
-        type = <INPUT_EV_REL>;
-        codes = <INPUT_REL_X>, <INPUT_REL_Y>;
-    };
-
-    x_scaler: x_scaler {
-        compatible = "zmk,input-processor-scaler";
-        #input-processor-cells = <2>;
-        type = <INPUT_EV_REL>;
-        codes = <INPUT_REL_X>;
-    };
-
-    y_scaler: y_scaler {
-        compatible = "zmk,input-processor-scaler";
-        #input-processor-cells = <2>;
-        type = <INPUT_EV_REL>;
-        codes = <INPUT_REL_Y>;
-    };
-
-    xy_invert: xy_invert {
-        compatible = "zmk,input-processor-transform";
-        #input-processor-cells = <1>;
-        type = <INPUT_EV_REL>;
-        x-codes = <INPUT_REL_X>, <INPUT_REL_WHEEL>;
-        y-codes = <INPUT_REL_Y>, <INPUT_REL_HWHEEL>;
-    };
-
-    mouse_to_wheel_mapper: mouse_to_wheel_mapper {
-        compatible = "zmk,input-processor-code-mapper";
-        #input-processor-cells = <0>;
-        type = <INPUT_EV_REL>;
-        map = <INPUT_REL_X INPUT_REL_MISC>, <INPUT_REL_Y INPUT_REL_WHEEL>;
-    };
-
     behaviors {
         hm: homerow_mods {
             compatible = "zmk,behavior-hold-tap";
diff --git a/config/west.yml b/config/west.yml
index 1f2a44a..48a0594 100644
--- a/config/west.yml
+++ b/config/west.yml
@@ -2,22 +2,17 @@ manifest:
   remotes:
     - name: zmkfirmware
       url-base: https://github.com/zmkfirmware
-    - name: petejohanson
-      url-base: https://github.com/petejohanson
     - name: badjeff
       url-base: https://github.com/badjeff
     # Additional modules containing boards/shields/custom code can be listed here as well
     # See https://docs.zephyrproject.org/3.2.0/develop/west/manifest.html#projects
   projects:
     - name: zmk
-      remote: petejohanson
-      revision: feat/pointers-with-input-processors
+      remote: zmkfirmware
+      revision: main
       import: app/west.yml
     - name: zmk-pmw3610-driver
       remote: badjeff
       revision: main
-    - name: zmk-split-peripheral-input-relay
-      remote: badjeff
-      revision: main
   self:
     path: config