full hana

keeb-it · May 12, 2024 · dfbd7cb · dfbd7cb
1 parent 77ac0df
commit dfbd7cb
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 34 deletions.
diff --git a/boards/shields/hana/hana.conf b/boards/shields/hana/hana.conf
@@ -1,2 +1,6 @@
 # Set NFC Pins on Xiao as GPIO
-CONFIG_NFCT_PINS_AS_GPIOS=y
+CONFIG_NFCT_PINS_AS_GPIOS=y
+
+# Enable I2C and SPI
+CONFIG_I2C=y
+CONFIG_SPI=y
diff --git a/boards/shields/hana/hana.dtsi b/boards/shields/hana/hana.dtsi
@@ -24,10 +24,28 @@
 //     // pinctrl-names = "default";
 // };
 
+&xiao_spi {
+    status = "okay";
+    cs-gpios = <&xiao_d 7 GPIO_ACTIVE_LOW>;
+    shift_reg: 74HC595@0 {
+        compatible = "zmk,gpio-595";
+        status = "okay";
+        gpio-controller;
+        spi-max-frequency = <200000>;
+        reg = <0>;
+        #gpio-cells = <2>;
+        ngpios = <8>;
+    };
+};
+
+&xiao_serial { status = "disabled"; };
+
+&xiao_i2c { status = "disabled"; };
+
 / {
     chosen {
         zmk,kscan = &kscan0;
-        zmk,matrix_transform = &test_transform;
+        zmk,matrix_transform = &default_transform;
         // zmk,split-uart = &uart0;
     };
 
@@ -40,6 +58,7 @@
         row-gpios
             = <&xiao_d 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
             , <&xiao_d 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&xiao_d 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
             ;
     };
 
@@ -48,19 +67,10 @@
         columns = <16>;
         rows = <3>;
         map = <
-            RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6)                 RC(0,9) RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,15)
-            RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12) RC(1,13) RC(1,14) RC(1,15)
-            RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12) RC(2,13) RC(2,14) RC(2,15)
-        >;
-    };
-
-    test_transform: test_transform {
-        compatible = "zmk,matrix-transform";
-        columns = <6>;
-        rows = <2>;
-        map = <
-            RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) 
-            RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) 
-        >;
-    };
+            RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5)                 RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,15)
+            RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5)                 RC(1,10) RC(1,11) RC(1,12) RC(1,13) RC(1,14) RC(1,15)
+            RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(1,7) RC(1,8) RC(2,10) RC(2,11) RC(2,12) RC(2,13) RC(2,14) RC(2,15)
+                            RC(0,6) RC(1,6) RC(2,6) RC(2,7)                 RC(2,8)  RC(0,9)  RC(1,9)  RC(2,9)
+          >;
+      };
 };
diff --git a/boards/shields/hana/hana.keymap b/boards/shields/hana/hana.keymap
@@ -3,15 +3,17 @@
 #include <dt-bindings/zmk/bt.h>
 
 / {
-        keymap {
-                compatible = "zmk,keymap";
+    keymap {
+        compatible = "zmk,keymap";
 
-                default_layer {
-                        display-name = "base";
-                        bindings = <
-                            &kp TAB   &kp Q &kp W &kp E &kp H &kp J
-                            &kp LCTRL &kp A &kp S &kp D &kp K &kp L
-                        >;
-                };
+        default_layer {
+            display-name = "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 LCTRL &kp A &kp S  &kp D    &kp F   &kp G                   &kp H   &kp J &kp K     &kp L   &kp SEMI &kp SQT
+                &kp LSHFT &kp Z &kp X  &kp C    &kp V   &kp B &kp C_MUTE  &none &kp N   &kp M &kp COMMA &kp DOT &kp FSLH &kp ESC
+                                &trans &kp LGUI &kp ESC &kp SPACE               &kp RET &mo 2 &kp LALT  &trans
+            >;
         };
+    };
 };
diff --git a/boards/shields/hana/hana_left.overlay b/boards/shields/hana/hana_left.overlay
@@ -2,8 +2,13 @@
 
 &kscan0 {
     col-gpios
-        = <&xiao_d 10 GPIO_ACTIVE_HIGH>
-        , <&xiao_d 9 GPIO_ACTIVE_HIGH>
-        , <&xiao_d 8 GPIO_ACTIVE_HIGH>
+        = <&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>
         ;
 };
diff --git a/boards/shields/hana/hana_right.overlay b/boards/shields/hana/hana_right.overlay
@@ -1,13 +1,18 @@
 #include "hana.dtsi"
 
-&test_transform {
-    col-offset = <3>;
+&default_transform {
+    col-offset = <8>;
 };
 
 &kscan0 {
     col-gpios
-        = <&xiao_d 10 GPIO_ACTIVE_HIGH>
-        , <&xiao_d 9 GPIO_ACTIVE_HIGH>
-        , <&xiao_d 8 GPIO_ACTIVE_HIGH>
+        = <&shift_reg 1 GPIO_ACTIVE_HIGH>
+        , <&shift_reg 2 GPIO_ACTIVE_HIGH>
+        , <&shift_reg 0 GPIO_ACTIVE_HIGH>
+        , <&shift_reg 7 GPIO_ACTIVE_HIGH>
+        , <&shift_reg 6 GPIO_ACTIVE_HIGH>
+        , <&shift_reg 5 GPIO_ACTIVE_HIGH>
+        , <&shift_reg 4 GPIO_ACTIVE_HIGH>
+        , <&shift_reg 3 GPIO_ACTIVE_HIGH>
         ;
 };