Switch driver to inorichi/zmk-pmw3610-driver

trentrand · Jul 5, 2024 · 0209b7a · 0209b7a
1 parent 3710da8
commit 0209b7a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ on:
   pull_request:
   workflow_dispatch:
   repository_dispatch:
-    types: [pmw3360-driver-updated]
+    types: [pmw3610-driver-updated]
 jobs:
   build:
     uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main
diff --git a/boards/shields/dactyl_manuform_5x7/dactyl_manuform_5x7_right.overlay b/boards/shields/dactyl_manuform_5x7/dactyl_manuform_5x7_right.overlay
@@ -26,17 +26,17 @@
 &pinctrl {
     spi0_default: spi0_default {
         group1 {
-            psels = <NRF_PSEL(SPIM_SCK, 0, 22)>,
-                    <NRF_PSEL(SPIM_MOSI, 0, 24)>,
-                    <NRF_PSEL(SPIM_MISO, 0, 24)>;
+            psels = <NRF_PSEL(SPIM_SCK, 0, 24)>,
+                    <NRF_PSEL(SPIM_MOSI, 1, 0)>,
+                    <NRF_PSEL(SPIM_MISO, 1, 0)>;
         };
     };
 
     spi0_sleep: spi0_sleep {
         group1 {
-            psels = <NRF_PSEL(SPIM_SCK, 0, 22)>,
-                    <NRF_PSEL(SPIM_MOSI, 0, 24)>,
-                    <NRF_PSEL(SPIM_MISO, 0, 24)>;
+            psels = <NRF_PSEL(SPIM_SCK, 0, 24)>,
+                    <NRF_PSEL(SPIM_MOSI, 1, 0)>,
+                    <NRF_PSEL(SPIM_MISO, 1, 0)>;
             low-power-enable;
         };
     };
@@ -48,19 +48,23 @@
     pinctrl-0 = <&spi0_default>;
     pinctrl-1 = <&spi0_sleep>;
     pinctrl-names = "default", "sleep";
-    cs-gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
+    cs-gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;
 
-    pmw3610: pmw3610@0 {
+    trackball: trackball@0 {
+        status = "okay";
         compatible = "pixart,pmw3610";
         reg = <0>;
-        irq-gpios = <&gpio0 17 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
         spi-max-frequency = <2000000>;
+        irq-gpios = <&gpio0 20 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
+        // snipe-layers = <1>;
+        // scroll-layers = <2 3>;
+        // automouse-layer = <4>;
     };
 };
 
 / {
   trackball_listener {
     compatible = "zmk,input-listener";
-    device = <&pmw3610>;
+    device = <&trackball>;
   };
 };
diff --git a/config/west.yml b/config/west.yml
@@ -2,15 +2,15 @@ manifest:
   remotes:
     - name: zmkfirmware
       url-base: https://github.com/petejohanson
-    - name: pmw3360-driver
-      url-base: https://github.com/trentrand
+    - name: pmw3610-driver
+      url-base: https://github.com/inorichi
   projects:
     - name: zmk
       remote: zmkfirmware
       revision: feat/pointers-move-scroll
       import: app/west.yml
-    - name: zmk-pmw3360-driver
-      remote: pmw3360-driver
+    - name: zmk-pmw3610-driver
+      remote: pmw3610-driver
       revision: main
   self:
     path: config