rename overalys

zoriya · Apr 7, 2024 · f84f277 · f84f277
1 parent 8293e23
commit f84f277
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 35 deletions.
diff --git a/config/boards/shields/abyss/abyss_left.dtsi → ...g/boards/shields/abyss/abyss_left.overlay b/config/boards/shields/abyss/abyss_left.dtsi → ...g/boards/shields/abyss/abyss_left.overlay
diff --git a/config/boards/shields/abyss/abyss_right.dtsi → .../boards/shields/abyss/abyss_right.overlay b/config/boards/shields/abyss/abyss_right.dtsi → .../boards/shields/abyss/abyss_right.overlay
diff --git a/config/boards/shields/urchin/urchin.dtsi b/config/boards/shields/urchin/urchin.dtsi
@@ -1,12 +1,5 @@
-/*
- * Copyright (c) 2022 Duccio Breschi
- *
- * SPDX-License-Identifier: MIT
- */
-
 #include <dt-bindings/zmk/matrix_transform.h>
 
-
 / {
     chosen {
         zmk,kscan = &kscan0;
@@ -15,19 +8,25 @@
 
     default_transform: keymap_transform_0 {
         compatible = "zmk,matrix-transform";
-        columns = <10>;
+        columns = <12>;
         rows = <4>;
-
         map = <
-            RC(0,0)     RC(0,1)     RC(0,2)     RC(0,3)     RC(0,4)         RC(0,5)     RC(0,6)     RC(0,7)     RC(0,8 )    RC(0,9)
-            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(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(3,3)     RC(3,4)         RC(3,5)     RC(3,6)
+                    RC(0,1) RC(0,2) RC(0,3) RC(0,4)          RC(0,7) RC(0,8) RC(0,9) RC(0,10)
+            RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4)          RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11)
+            RC(2,0) RC(2,1) RC(2,2) RC(2,3)                          RC(2,8) RC(2,9) RC(2,10) RC(2,11)
+                                RC(3,3) RC(3,4) RC(3,5)  RC(3,6) RC(3,7) RC(3,8)
         >;
     };
 
-    kscan0: kscan {        
+    kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
-        label = "KSCAN0";
+
+        diode-direction = "col2row";
+        row-gpios
+            = <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+            ;
     };
 };
diff --git a/config/boards/shields/urchin/urchin_left.overlay b/config/boards/shields/urchin/urchin_left.overlay
@@ -1,24 +1,15 @@
-/*
- * Copyright (c) 2022 Duccio Breschi
- *
- * SPDX-License-Identifier: MIT
- */
-
-#include "urchin.dtsi"
+#include "abyss.dtsi"
 
 &kscan0 {
-    diode-direction = "col2row";
     col-gpios
-        = <&pro_micro 18 (GPIO_ACTIVE_HIGH)> // COL0
-        , <&pro_micro 15 (GPIO_ACTIVE_HIGH)> // COL1
-        , <&pro_micro 14 (GPIO_ACTIVE_HIGH)> // COL2
-        , <&pro_micro 16 (GPIO_ACTIVE_HIGH)> // COL3
-        , <&pro_micro 10 (GPIO_ACTIVE_HIGH)> // COL4
-    ;
-    row-gpios
-        = <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // ROW0
-        , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // ROW1
-        , <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // ROW2
-        , <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> // ROW3
-    ;
+        = <&pro_micro 21 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 20 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
+        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
+        ;
 };
+
+
+// vim: ft=d