Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: feat(boards)!: refactor common layouts #2517

Merged
merged 2 commits into from
Oct 3, 2024
Merged

WIP: feat(boards)!: refactor common layouts #2517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
868f081
feat(boards)!: refactor common layouts
joelspadin Sep 30, 2024
d129930
feat(boards)!: refactor Corne layouts
joelspadin Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions app/boards/arm/bt60/bt60_v1.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>


/ {
Expand Down Expand Up @@ -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 changes: 4 additions & 5 deletions app/boards/arm/ckp/bt60_v2.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>


/ {
Expand Down Expand Up @@ -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 changes: 4 additions & 5 deletions app/boards/arm/ckp/bt65_v1.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>


/ {
Expand Down Expand Up @@ -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 changes: 3 additions & 4 deletions app/boards/arm/ckp/bt75_v1.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>


/ {
Expand Down Expand Up @@ -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 changes: 3 additions & 4 deletions app/boards/arm/planck/planck_rev6.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>


/ {
Expand Down Expand Up @@ -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 changes: 3 additions & 4 deletions app/boards/arm/preonic/preonic_rev3.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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>;
};
3 changes: 2 additions & 1 deletion app/boards/shields/corne/corne.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

#include <dt-bindings/zmk/matrix_transform.h>

#include <layouts/foostan/corne.dtsi>
#include <layouts/foostan/corne/5column.dtsi>
#include <layouts/foostan/corne/6column.dtsi>

&foostan_corne_6col_layout {
transform = <&default_transform>;
Expand Down
3 changes: 2 additions & 1 deletion app/boards/shields/splitkb_aurora_corne/splitkb_aurora_corne.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

#include <dt-bindings/zmk/matrix_transform.h>

#include <layouts/foostan/corne.dtsi>
#include <layouts/foostan/corne/5column.dtsi>
#include <layouts/foostan/corne/6column.dtsi>

&foostan_corne_6col_layout {
transform = <&default_transform>;
Expand Down
72 changes: 0 additions & 72 deletions app/dts/layouts/common/60percent/60percent.dtsi
View file
Open in desktop

This file was deleted.

16 changes: 15 additions & 1 deletion app/dts/layouts/common/60percent/all1u.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <layouts/common/60percent/position_map.dtsi>
#include <physical_layouts.dtsi>

/ {
Expand Down Expand Up @@ -74,4 +75,17 @@
, <&key_physical_attrs 100 100 1400 400 0 0 0>
;
};
};
};

&layouts_common_60_percent_position_map {
layout_60_all1u {
physical-layout = <&layout_60_all1u>;
positions
= < 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14>
, <15 16 17 18 19 20 21 22 23 24 25 26 27 28>
, <29 30 31 32 33 34 35 36 37 38 39 40 41>
, <42 43 44 45 46 47 48 49 50 51 52 53 54 55 56>
, <57 58 59 60 61 62 64 63 65>
;
};
};
16 changes: 15 additions & 1 deletion app/dts/layouts/common/60percent/ansi.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <layouts/common/60percent/position_map.dtsi>
#include <physical_layouts.dtsi>

/ {
Expand Down Expand Up @@ -69,4 +70,17 @@
, <&key_physical_attrs 125 100 1375 400 0 0 0>
;
};
};
};

&layouts_common_60_percent_position_map {
layout_60_ansi {
physical-layout = <&layout_60_ansi>;
positions
= < 0 1 2 3 4 5 6 7 8 9 10 11 12 13 61>
, <14 15 16 17 18 19 20 21 22 23 24 25 26 27>
, <28 29 30 31 32 33 34 35 36 37 38 39 40>
, <41 62 42 43 44 45 46 47 48 49 50 51 52 63 64>
, <53 54 55 56 57 58 60 59 65>
;
};
};
16 changes: 15 additions & 1 deletion app/dts/layouts/common/60percent/hhkb.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <layouts/common/60percent/position_map.dtsi>
#include <physical_layouts.dtsi>

/ {
Expand Down Expand Up @@ -68,4 +69,17 @@
, <&key_physical_attrs 150 100 1350 400 0 0 0>
;
};
};
};

&layouts_common_60_percent_position_map {
layout_60_hhkb {
physical-layout = <&layout_60_hhkb>;
positions
= < 0 1 2 3 4 5 6 7 8 9 10 11 12 13 60>
, <14 15 16 17 18 19 20 21 22 23 24 25 26 27>
, <28 29 30 31 32 33 34 35 36 37 38 39 40>
, <41 61 42 43 44 45 46 47 48 49 50 51 52 62 63>
, <53 54 55 56 57 58 59 64 65>
;
};
};
16 changes: 15 additions & 1 deletion app/dts/layouts/common/60percent/iso.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <layouts/common/60percent/position_map.dtsi>
#include <physical_layouts.dtsi>

/ {
Expand Down Expand Up @@ -70,4 +71,17 @@
, <&key_physical_attrs 125 100 1375 400 0 0 0>
;
};
};
};

&layouts_common_60_percent_position_map {
layout_60_iso {
physical-layout = <&layout_60_iso>;
positions
= < 0 1 2 3 4 5 6 7 8 9 10 11 12 13 62>
, <14 15 16 17 18 19 20 21 22 23 24 25 26 63>
, <27 28 29 30 31 32 33 34 35 36 37 38 40>
, <41 42 43 44 45 46 47 48 49 50 51 52 53 64 65>
, <54 55 56 57 58 59 61 60 39>
;
};
};
7 changes: 7 additions & 0 deletions app/dts/layouts/common/60percent/position_map.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/ {
layouts_common_60_percent_position_map: layouts_common_60_percent_position_map {
compatible = "zmk,physical-layout-position-map";

complete;
};
};
Loading