refactor moudle

tokyo2006 · Dec 14, 2024 · 0d65a60 · 0d65a60
1 parent 4583962
commit 0d65a60
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/config/boards/shields/oddball/oddball.dtsi b/config/boards/shields/oddball/oddball.dtsi
@@ -21,16 +21,7 @@
     };
 
     kscan0: kscan {
-        compatible = "zmk,kscan-gpio-matrix";
-        label = "KSCAN";
-
         diode-direction = "col2row";
-		row-gpios
-			= <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-			, <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-            ;
     };
 };
 

diff --git a/config/boards/shields/oddball/oddball_central_dongle.overlay b/config/boards/shields/oddball/oddball_central_dongle.overlay
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 #include "oddball.dtsi"
-#include "oddball_trackball.dtsi"
+#include "split_input_common.dtsi"
 
 / {
     chosen {
@@ -57,5 +57,6 @@
 	};
 };
 
-
-
+&trackball_listener {
+    status = "okay";
+};
diff --git a/config/boards/shields/oddball/oddball_peripheral_left.overlay b/config/boards/shields/oddball/oddball_peripheral_left.overlay
@@ -7,6 +7,13 @@
 #include "oddball.dtsi"
 
 &kscan0 {
+	compatible = "zmk,kscan-gpio-matrix";
+	row-gpios
+		= <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+		, <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+		, <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+		, <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        ;
 	col-gpios
 		= <&pro_micro 19 GPIO_ACTIVE_HIGH>
 		, <&pro_micro 20 GPIO_ACTIVE_HIGH>

diff --git a/config/boards/shields/oddball/oddball_peripheral_right.overlay b/config/boards/shields/oddball/oddball_peripheral_right.overlay
@@ -13,6 +13,13 @@
 };
 
 &kscan0 {
+	compatible = "zmk,kscan-gpio-matrix";
+	row-gpios
+		= <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+		, <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+		, <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+		, <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+        ;
 	col-gpios
 		= <&pro_micro 8 GPIO_ACTIVE_HIGH>
 		, <&pro_micro 7 GPIO_ACTIVE_HIGH>