hana: kscan refactor

keeb-it · Jun 10, 2024 · 13855cc · 13855cc
1 parent 4d3704b
commit 13855cc
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 22 deletions.
diff --git a/boards/shields/hana/hana.dtsi b/boards/shields/hana/hana.dtsi
@@ -36,8 +36,18 @@
             , <&xiao_d 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
             ;
 
-        // NOTE: columns are different for both halves
-        col-gpios;
+        // NOTE: Below are LHS columns, RHS columns are different
+        col-gpios
+            = <&shift_reg 6 (GPIO_ACTIVE_HIGH)>
+            , <&shift_reg 5 (GPIO_ACTIVE_HIGH)>
+            , <&shift_reg 4 (GPIO_ACTIVE_HIGH)>
+            , <&shift_reg 3 (GPIO_ACTIVE_HIGH)>
+            , <&shift_reg 2 (GPIO_ACTIVE_HIGH)>
+            , <&shift_reg 0 (GPIO_ACTIVE_HIGH)>
+            , <&shift_reg 7 (GPIO_ACTIVE_HIGH)>
+            , <&shift_reg 1 (GPIO_ACTIVE_HIGH)>
+            ;
+
     };
 
     default_transform: default_transform {

diff --git a/boards/shields/hana/hana_central_dongle.overlay b/boards/shields/hana/hana_central_dongle.overlay
@@ -19,6 +19,8 @@
     };
 }; 
 
+/delete-node/ &kscan0;
+
 / {
     chosen {
         zmk,kscan = &mock_kscan;

diff --git a/boards/shields/hana/hana_central_left.overlay b/boards/shields/hana/hana_central_left.overlay
@@ -1 +1,5 @@
-#include "hana_left.dtsi"
+#include "hana.dtsi"
+
+&left_encoder {
+    status = "okay";
+};
diff --git a/boards/shields/hana/hana_left.dtsi b/boards/shields/hana/hana_left.dtsi
diff --git a/boards/shields/hana/hana_peripheral_left.overlay b/boards/shields/hana/hana_peripheral_left.overlay
@@ -1 +1,5 @@
-#include "hana_left.dtsi"
+#include "hana.dtsi"
+
+&left_encoder {
+    status = "okay";
+};