From fe23431290334b35df67bd0dec1134ff1f41ba73 Mon Sep 17 00:00:00 2001
From: numToStr <24727447+numToStr@users.noreply.github.com>
Date: Mon, 9 Sep 2024 12:32:19 +0000
Subject: [PATCH] point to upstream

---
 .../acorn/acorn_central_dongle.overlay        |  2 +-
 boards/shields/acorn/acorn_matrix.dtsi        | 24 +++++++++----------
 .../acorn/acorn_peripheral_right.overlay      |  8 +++++--
 config/west.yml                               |  4 +---
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/boards/shields/acorn/acorn_central_dongle.overlay b/boards/shields/acorn/acorn_central_dongle.overlay
index d9e3cfe..5f707b4 100644
--- a/boards/shields/acorn/acorn_central_dongle.overlay
+++ b/boards/shields/acorn/acorn_central_dongle.overlay
@@ -1,6 +1,6 @@
 #include "acorn_matrix.dtsi"
 
-/delete-node/ &default_kscan;
+/delete-node/ &kscan;
 
 / {
     chosen {
diff --git a/boards/shields/acorn/acorn_matrix.dtsi b/boards/shields/acorn/acorn_matrix.dtsi
index 330fb58..cbb535d 100644
--- a/boards/shields/acorn/acorn_matrix.dtsi
+++ b/boards/shields/acorn/acorn_matrix.dtsi
@@ -3,15 +3,15 @@
 
 / {
     chosen {
-        zmk,physical-layout = &default_layout;
+        zmk,physical-layout = &six_col_layout;
     };
 
-    default_layout: default_layout {
+    six_col_layout: six_col_layout {
         compatible = "zmk,physical-layout";
         display-name = "6-col";
 
-        kscan = <&default_kscan>;
-        transform = <&default_transform>;
+        kscan = <&kscan>;
+        transform = <&six_col_transform>;
 
         keys  //                     w   h    x    y     rot    rx    ry
             = <&key_physical_attrs 100 100    0   37       0     0     0>
@@ -59,12 +59,12 @@
             ;
     };
 
-    five_column_layout: five_column_layout {
+    five_col_layout: five_col_layout {
         compatible = "zmk,physical-layout";
         display-name = "5-col";
 
-        kscan = <&default_kscan>;
-        transform = <&five_column_transform>;
+        kscan = <&kscan>;
+        transform = <&five_col_transform>;
 
         keys  //                     w   h    x    y     rot    rx    ry
             = <&key_physical_attrs 100 100    0   37       0     0     0>
@@ -112,7 +112,7 @@
         complete;
 
         twelve {
-            physical-layout = <&default_layout>;
+            physical-layout = <&six_col_layout>;
             positions
                 = < 1  2  3  4  5  6  7  8  9 10>
                 , <13 14 15 16 17 18 19 20 21 22>
@@ -121,7 +121,7 @@
         };
 
         ten {
-            physical-layout = <&five_column_layout>;
+            physical-layout = <&five_col_layout>;
             positions
                 = < 0  1  2  3  4  5  6  7  8  9>
                 , <10 11 12 13 14 15 16 17 18 19>
@@ -130,7 +130,7 @@
         };
     };
 
-    default_kscan: default_kscan {
+    kscan: kscan {
         compatible = "zmk,kscan-gpio-matrix";
         wakeup-source;
 
@@ -154,7 +154,7 @@
             ;
     };
 
-    default_transform: default_transform {
+    six_col_transform: six_col_transform {
         compatible = "zmk,matrix-transform";
         columns = <12>;
         rows = <4>;
@@ -166,7 +166,7 @@
         >;
     };
     
-    five_column_transform: five_column_transform {
+    five_col_transform: five_col_transform {
         compatible = "zmk,matrix-transform";
         columns = <10>;
         rows = <4>;
diff --git a/boards/shields/acorn/acorn_peripheral_right.overlay b/boards/shields/acorn/acorn_peripheral_right.overlay
index 526714e..5568ff4 100644
--- a/boards/shields/acorn/acorn_peripheral_right.overlay
+++ b/boards/shields/acorn/acorn_peripheral_right.overlay
@@ -1,10 +1,14 @@
 #include "acorn.dtsi"
 
-&default_transform {
+&six_col_transform {
     col-offset = <6>;
 };
 
-&default_kscan {
+&five_col_transform {
+    col-offset = <5>;
+};
+
+&kscan {
     col-gpios
         = <&pro_micro 18 (GPIO_ACTIVE_HIGH)>
         , <&pro_micro 15 (GPIO_ACTIVE_HIGH)>
diff --git a/config/west.yml b/config/west.yml
index 58a7e09..ee9ee63 100644
--- a/config/west.yml
+++ b/config/west.yml
@@ -2,12 +2,10 @@ manifest:
   remotes:
     - name: zmkfirmware
       url-base: https://github.com/zmkfirmware
-    - name: petejohanson
-      url-base: https://github.com/petejohanson
   projects:
     - name: zmk
       remote: petejohanson
-      revision: studio/keymap-subsystem
+      revision: main
       import: app/west.yml
   self:
     path: config