Jacob/zmk
1
0
Fork 0
forked from kofal.net/zmk
Code Pull Requests Activity

feat(boards)!: refactor common layouts

Browse Source 
Removed the combined .dtsi file for each group of common layouts, and
split the position map across the files in each group. This makes
reading the position maps slightly more difficult, but it aligns the
common layouts with the keyboard-specific ones such as
foostan/corne.dtsi in that simply including each header adds the
layout, with no need to set status = "okay".
This commit is contained in:
Joel Spadin
2024-09-30 00:16:01 -05:00
committed by Pete Johanson
parent 73ca365530
commit 36f146226e
35 changed files with 318 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/boards/arm/bt60/bt60_v1.dts
View File

@@ -6,7 +6,10 @@
/dts-v1/;
#include "bt60.dtsi"
#include <layouts/common/60percent/60percent.dtsi>
#include <layouts/common/60percent/all1u.dtsi>
#include <layouts/common/60percent/ansi.dtsi>
#include <layouts/common/60percent/hhkb.dtsi>
#include <layouts/common/60percent/iso.dtsi>
/ {
@@ -102,21 +105,17 @@
};
&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>;
};

9
app/boards/arm/ckp/bt60_v2.dts
View File

@@ -6,7 +6,10 @@
/dts-v1/;
#include "ckp.dtsi"
#include <layouts/common/60percent/60percent.dtsi>
#include <layouts/common/60percent/all1u.dtsi>
#include <layouts/common/60percent/ansi.dtsi>
#include <layouts/common/60percent/hhkb.dtsi>
#include <layouts/common/60percent/iso.dtsi>
/ {
@@ -72,21 +75,17 @@
};
&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>;
};

9
app/boards/arm/ckp/bt65_v1.dts
View File

@@ -6,7 +6,10 @@
/dts-v1/;
#include "ckp.dtsi"
#include <layouts/common/65percent/65percent.dtsi>
#include <layouts/common/65percent/all1u.dtsi>
#include <layouts/common/65percent/ansi.dtsi>
#include <layouts/common/65percent/iso.dtsi>
#include <layouts/common/65percent/hhkb.dtsi>
/ {
@@ -72,21 +75,17 @@
};
&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>;
};

7
app/boards/arm/ckp/bt75_v1.dts
View File

@@ -6,7 +6,9 @@
/dts-v1/;
#include "ckp.dtsi"
#include <layouts/common/75percent/75percent.dtsi>
#include <layouts/common/75percent/all1u.dtsi>
#include <layouts/common/75percent/ansi.dtsi>
#include <layouts/common/75percent/iso.dtsi>
/ {
@@ -62,16 +64,13 @@
};
&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>;
};

7
app/boards/arm/planck/planck_rev6.dts
View File

@@ -9,7 +9,9 @@
#include <st/f3/stm32f303c(b-c)tx-pinctrl.dtsi>
#include <dt-bindings/zmk/matrix_transform.h>
#include <layouts/common/ortho_4x12/ortho_4x12.dtsi>
#include <layouts/common/ortho_4x12/1x2u.dtsi>
#include <layouts/common/ortho_4x12/2x2u.dtsi>
#include <layouts/common/ortho_4x12/all1u.dtsi>
/ {
@@ -142,16 +144,13 @@ zephyr_udc0: &usb {
};
&layout_ortho_4x12_all1u {
status = "okay";
transform = <&layout_grid_transform>;
};
&layout_ortho_4x12_1x2u {
status = "okay";
transform = <&layout_mit_transform>;
};
&layout_ortho_4x12_2x2u {
status = "okay";
transform = <&layout_2x2u_transform>;
};

7
app/boards/arm/preonic/preonic_rev3.dts
View File

@@ -9,7 +9,9 @@
#include <st/f3/stm32f303c(b-c)tx-pinctrl.dtsi>
#include <dt-bindings/zmk/matrix_transform.h>
#include <layouts/common/ortho_5x12/ortho_5x12.dtsi>
#include <layouts/common/ortho_5x12/1x2u.dtsi>
#include <layouts/common/ortho_5x12/2x2u.dtsi>
#include <layouts/common/ortho_5x12/all1u.dtsi>
/ {
model = "Preonic PCD, rev3";
@@ -134,16 +136,13 @@ zephyr_udc0: &usb {
};
&layout_ortho_5x12_all1u {
status = "okay";
transform = <&layout_grid_transform>;
};
&layout_ortho_5x12_1x2u {
status = "okay";
transform = <&layout_mit_transform>;
};
&layout_ortho_5x12_2x2u {
status = "okay";
transform = <&layout_2x2u_transform>;
};