From 026be009a62017049a172048a0cdcf6295cdd0be Mon Sep 17 00:00:00 2001
From: ReFil <31960031+ReFil@users.noreply.github.com>
Date: Thu, 26 Sep 2024 14:22:47 +0100
Subject: [PATCH] feat(boards): CKP physical layout

---
 app/boards/arm/ckp/bt60_v2.dts    | 23 ++++++++++++++++++++++-
 app/boards/arm/ckp/bt60_v2.keymap |  8 ++++----
 app/boards/arm/ckp/bt65_v1.dts    | 23 ++++++++++++++++++++++-
 app/boards/arm/ckp/bt65_v1.keymap |  8 ++++----
 app/boards/arm/ckp/bt75_v1.dts    | 18 +++++++++++++++++-
 app/boards/arm/ckp/bt75_v1.keymap |  6 +++---
 6 files changed, 72 insertions(+), 14 deletions(-)

diff --git a/app/boards/arm/ckp/bt60_v2.dts b/app/boards/arm/ckp/bt60_v2.dts
index a3ef75fb3..751cad098 100644
--- a/app/boards/arm/ckp/bt60_v2.dts
+++ b/app/boards/arm/ckp/bt60_v2.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 #include "ckp.dtsi"
+#include <layouts/common/60percent/60percent.dtsi>
 
 
 / {
@@ -13,7 +14,7 @@
   compatible = "polarityworks,bt60_v2";
 
   chosen {
-    zmk,matrix-transform = &ansi_transform;
+    zmk,physical-layout = &layout_60_ansi;
   };
 
 
@@ -69,3 +70,23 @@
     >;
   };
 };
+
+&layout_60_ansi {
+  status = "okay";
+  transform = <&ansi_transform>;
+};
+
+&layout_60_iso {
+  status = "okay";
+  transform = <&iso_transform>;
+};
+
+&layout_60_all1u {
+  status = "okay";
+  transform = <&all_1u_transform>;
+};
+
+&layout_60_hhkb {
+  status = "okay";
+  transform = <&hhkb_transform>;
+};
diff --git a/app/boards/arm/ckp/bt60_v2.keymap b/app/boards/arm/ckp/bt60_v2.keymap
index f72401f67..478cf7bde 100644
--- a/app/boards/arm/ckp/bt60_v2.keymap
+++ b/app/boards/arm/ckp/bt60_v2.keymap
@@ -12,13 +12,13 @@
 / {
   chosen {
   #ifdef ANSI
-    zmk,matrix-transform = &ansi_transform;
+    zmk,physical-layout = &layout_60_ansi;
   #elif defined(ISO)
-    zmk,matrix-transform = &iso_transform;
+    zmk,physical-layout = &layout_60_iso;
   #elif defined(ALL_1U)
-    zmk,matrix-transform = &all_1u_transform;
+    zmk,physical-layout = &layout_60_all1u;
   #elif defined(HHKB)
-    zmk,matrix-transform = &hhkb_transform;
+    zmk,physical-layout = &layout_60_hhkb;
   #else
   #error "Layout not defined, please define a layout by uncommenting the appropriate line in bt60_v2.keymap"
   #endif
diff --git a/app/boards/arm/ckp/bt65_v1.dts b/app/boards/arm/ckp/bt65_v1.dts
index f79587ce1..cdea235f5 100644
--- a/app/boards/arm/ckp/bt65_v1.dts
+++ b/app/boards/arm/ckp/bt65_v1.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 #include "ckp.dtsi"
+#include <layouts/common/65percent/65percent.dtsi>
 
 
 / {
@@ -13,7 +14,7 @@
   compatible = "polarityworks,bt65_v1";
 
   chosen {
-    zmk,matrix-transform = &ansi_transform;
+    zmk,physical-layout = &layout_65_ansi;
   };
 
 
@@ -69,3 +70,23 @@
     >;
   };
 };
+
+&layout_65_ansi {
+  status = "okay";
+  transform = <&ansi_transform>;
+};
+
+&layout_65_iso {
+  status = "okay";
+  transform = <&iso_transform>;
+};
+
+&layout_65_all1u {
+  status = "okay";
+  transform = <&all_1u_transform>;
+};
+
+&layout_65_hhkb {
+  status = "okay";
+  transform = <&hhkb_transform>;
+};
diff --git a/app/boards/arm/ckp/bt65_v1.keymap b/app/boards/arm/ckp/bt65_v1.keymap
index a40410844..da4941438 100644
--- a/app/boards/arm/ckp/bt65_v1.keymap
+++ b/app/boards/arm/ckp/bt65_v1.keymap
@@ -12,13 +12,13 @@
 / {
   chosen {
   #ifdef ANSI
-    zmk,matrix-transform = &ansi_transform;
+    zmk,physical-layout = &layout_65_ansi;
   #elif defined(ISO)
-    zmk,matrix-transform = &iso_transform;
+    zmk,physical-layout = &layout_65_iso;
   #elif defined(ALL_1U)
-    zmk,matrix-transform = &all_1u_transform;
+    zmk,physical-layout = &layout_65_all1u;
   #elif defined(HHKB)
-    zmk,matrix-transform = &hhkb_transform;
+    zmk,physical-layout = &layout_65_hhkb;
   #else
   #error "Layout not defined, please define a layout by uncommenting the appropriate line in bt65_v1.keymap"
   #endif
diff --git a/app/boards/arm/ckp/bt75_v1.dts b/app/boards/arm/ckp/bt75_v1.dts
index 412810865..7077aa1de 100644
--- a/app/boards/arm/ckp/bt75_v1.dts
+++ b/app/boards/arm/ckp/bt75_v1.dts
@@ -6,6 +6,7 @@
 
 /dts-v1/;
 #include "ckp.dtsi"
+#include <layouts/common/75percent/75percent.dtsi>
 
 
 / {
@@ -13,7 +14,7 @@
   compatible = "polarityworks,bt75_v1";
 
   chosen {
-    zmk,matrix-transform = &ansi_transform;
+    zmk,physical-layout = &layout_75_ansi;
   };
 
 
@@ -59,3 +60,18 @@
     >;
   };
 };
+
+&layout_75_ansi {
+  status = "okay";
+  transform = <&ansi_transform>;
+};
+
+&layout_75_iso {
+  status = "okay";
+  transform = <&iso_transform>;
+};
+
+&layout_75_all1u {
+  status = "okay";
+  transform = <&all_1u_transform>;
+};
diff --git a/app/boards/arm/ckp/bt75_v1.keymap b/app/boards/arm/ckp/bt75_v1.keymap
index 888dcb643..ff0db7b0c 100644
--- a/app/boards/arm/ckp/bt75_v1.keymap
+++ b/app/boards/arm/ckp/bt75_v1.keymap
@@ -11,11 +11,11 @@
 / {
   chosen {
   #ifdef ANSI
-    zmk,matrix-transform = &ansi_transform;
+    zmk,physical-layout = &layout_75_ansi;
   #elif defined(ISO)
-    zmk,matrix-transform = &iso_transform;
+    zmk,physical-layout = &layout_75_iso;
   #elif defined(ALL_1U)
-    zmk,matrix-transform = &all_1u_transform;
+    zmk,physical-layout = &layout_75_all1u;
   #else
   #error "Layout not defined, please define a layout using by uncommenting the appropriate line in bt75_v1.keymap"
   #endif