From 36f146226e598c788a76367686aac3af7c4deccb Mon Sep 17 00:00:00 2001 From: Joel Spadin Date: Mon, 30 Sep 2024 00:16:01 -0500 Subject: [PATCH] feat(boards)!: refactor common layouts 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". --- app/boards/arm/bt60/bt60_v1.dts | 9 ++- app/boards/arm/ckp/bt60_v2.dts | 9 ++- app/boards/arm/ckp/bt65_v1.dts | 9 ++- app/boards/arm/ckp/bt75_v1.dts | 7 +- app/boards/arm/planck/planck_rev6.dts | 7 +- app/boards/arm/preonic/preonic_rev3.dts | 7 +- .../layouts/common/60percent/60percent.dtsi | 72 ------------------- app/dts/layouts/common/60percent/all1u.dtsi | 16 ++++- app/dts/layouts/common/60percent/ansi.dtsi | 16 ++++- app/dts/layouts/common/60percent/hhkb.dtsi | 16 ++++- app/dts/layouts/common/60percent/iso.dtsi | 16 ++++- .../common/60percent/position_map.dtsi | 7 ++ .../layouts/common/65percent/65percent.dtsi | 72 ------------------- app/dts/layouts/common/65percent/all1u.dtsi | 16 ++++- app/dts/layouts/common/65percent/ansi.dtsi | 16 ++++- app/dts/layouts/common/65percent/hhkb.dtsi | 16 ++++- app/dts/layouts/common/65percent/iso.dtsi | 16 ++++- .../common/65percent/position_map.dtsi | 7 ++ .../layouts/common/75percent/75percent.dtsi | 59 --------------- app/dts/layouts/common/75percent/all1u.dtsi | 17 ++++- app/dts/layouts/common/75percent/ansi.dtsi | 17 ++++- app/dts/layouts/common/75percent/iso.dtsi | 17 ++++- .../common/75percent/position_map.dtsi | 7 ++ app/dts/layouts/common/ortho_4x12/1x2u.dtsi | 15 +++- app/dts/layouts/common/ortho_4x12/2x2u.dtsi | 15 +++- app/dts/layouts/common/ortho_4x12/all1u.dtsi | 15 +++- .../layouts/common/ortho_4x12/ortho_4x12.dtsi | 53 -------------- .../common/ortho_4x12/position_map.dtsi | 7 ++ app/dts/layouts/common/ortho_5x12/1x2u.dtsi | 16 ++++- app/dts/layouts/common/ortho_5x12/2x2u.dtsi | 16 ++++- app/dts/layouts/common/ortho_5x12/all1u.dtsi | 14 ++++ .../layouts/common/ortho_5x12/ortho_5x12.dtsi | 56 --------------- .../common/ortho_5x12/position_map.dtsi | 7 ++ app/dts/layouts/common/tkl/ansi.dtsi | 1 + app/dts/layouts/common/tkl/position_map.dtsi | 7 ++ 35 files changed, 318 insertions(+), 355 deletions(-) delete mode 100644 app/dts/layouts/common/60percent/60percent.dtsi create mode 100644 app/dts/layouts/common/60percent/position_map.dtsi delete mode 100644 app/dts/layouts/common/65percent/65percent.dtsi create mode 100644 app/dts/layouts/common/65percent/position_map.dtsi delete mode 100644 app/dts/layouts/common/75percent/75percent.dtsi create mode 100644 app/dts/layouts/common/75percent/position_map.dtsi delete mode 100644 app/dts/layouts/common/ortho_4x12/ortho_4x12.dtsi create mode 100644 app/dts/layouts/common/ortho_4x12/position_map.dtsi delete mode 100644 app/dts/layouts/common/ortho_5x12/ortho_5x12.dtsi create mode 100644 app/dts/layouts/common/ortho_5x12/position_map.dtsi create mode 100644 app/dts/layouts/common/tkl/position_map.dtsi diff --git a/app/boards/arm/bt60/bt60_v1.dts b/app/boards/arm/bt60/bt60_v1.dts index d7ecb5aeac..5790458d0d 100644 --- a/app/boards/arm/bt60/bt60_v1.dts +++ b/app/boards/arm/bt60/bt60_v1.dts @@ -6,7 +6,10 @@ /dts-v1/; #include "bt60.dtsi" -#include +#include +#include +#include +#include / { @@ -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>; }; diff --git a/app/boards/arm/ckp/bt60_v2.dts b/app/boards/arm/ckp/bt60_v2.dts index 751cad0989..1cdb0307a2 100644 --- a/app/boards/arm/ckp/bt60_v2.dts +++ b/app/boards/arm/ckp/bt60_v2.dts @@ -6,7 +6,10 @@ /dts-v1/; #include "ckp.dtsi" -#include +#include +#include +#include +#include / { @@ -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>; }; diff --git a/app/boards/arm/ckp/bt65_v1.dts b/app/boards/arm/ckp/bt65_v1.dts index cdea235f5e..77e81289f0 100644 --- a/app/boards/arm/ckp/bt65_v1.dts +++ b/app/boards/arm/ckp/bt65_v1.dts @@ -6,7 +6,10 @@ /dts-v1/; #include "ckp.dtsi" -#include +#include +#include +#include +#include / { @@ -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>; }; diff --git a/app/boards/arm/ckp/bt75_v1.dts b/app/boards/arm/ckp/bt75_v1.dts index 7077aa1de6..7c9ab664e3 100644 --- a/app/boards/arm/ckp/bt75_v1.dts +++ b/app/boards/arm/ckp/bt75_v1.dts @@ -6,7 +6,9 @@ /dts-v1/; #include "ckp.dtsi" -#include +#include +#include +#include / { @@ -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>; }; diff --git a/app/boards/arm/planck/planck_rev6.dts b/app/boards/arm/planck/planck_rev6.dts index d3aaf8fed6..2f34571fab 100644 --- a/app/boards/arm/planck/planck_rev6.dts +++ b/app/boards/arm/planck/planck_rev6.dts @@ -9,7 +9,9 @@ #include #include -#include +#include +#include +#include / { @@ -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>; }; diff --git a/app/boards/arm/preonic/preonic_rev3.dts b/app/boards/arm/preonic/preonic_rev3.dts index 8032e45948..0bb0e2ce32 100644 --- a/app/boards/arm/preonic/preonic_rev3.dts +++ b/app/boards/arm/preonic/preonic_rev3.dts @@ -9,7 +9,9 @@ #include #include -#include +#include +#include +#include / { 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>; }; diff --git a/app/dts/layouts/common/60percent/60percent.dtsi b/app/dts/layouts/common/60percent/60percent.dtsi deleted file mode 100644 index 03f42e2a1b..0000000000 --- a/app/dts/layouts/common/60percent/60percent.dtsi +++ /dev/null @@ -1,72 +0,0 @@ -#include -#include -#include -#include - -&layout_60_ansi { - status = "disabled"; -}; - -&layout_60_iso { - status = "disabled"; -}; - -&layout_60_all1u { - status = "disabled"; -}; - -&layout_60_hhkb { - status = "disabled"; -}; - -/ { - layouts_common_60_percent_position_map: layouts_common_60_percent_position_map { - compatible = "zmk,physical-layout-position-map"; - - complete; - - 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> - ; - }; - - 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> - ; - }; - - 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> - ; - }; - - 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> - ; - }; - }; -}; \ No newline at end of file diff --git a/app/dts/layouts/common/60percent/all1u.dtsi b/app/dts/layouts/common/60percent/all1u.dtsi index 47e3ad3824..4543168911 100644 --- a/app/dts/layouts/common/60percent/all1u.dtsi +++ b/app/dts/layouts/common/60percent/all1u.dtsi @@ -1,3 +1,4 @@ +#include #include / { @@ -74,4 +75,17 @@ , <&key_physical_attrs 100 100 1400 400 0 0 0> ; }; -}; \ No newline at end of file +}; + +&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> + ; + }; +}; diff --git a/app/dts/layouts/common/60percent/ansi.dtsi b/app/dts/layouts/common/60percent/ansi.dtsi index 2c8074bc72..b3b870c550 100644 --- a/app/dts/layouts/common/60percent/ansi.dtsi +++ b/app/dts/layouts/common/60percent/ansi.dtsi @@ -1,3 +1,4 @@ +#include #include / { @@ -69,4 +70,17 @@ , <&key_physical_attrs 125 100 1375 400 0 0 0> ; }; -}; \ No newline at end of file +}; + +&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> + ; + }; +}; diff --git a/app/dts/layouts/common/60percent/hhkb.dtsi b/app/dts/layouts/common/60percent/hhkb.dtsi index f14e72be46..a3c271e7e5 100644 --- a/app/dts/layouts/common/60percent/hhkb.dtsi +++ b/app/dts/layouts/common/60percent/hhkb.dtsi @@ -1,3 +1,4 @@ +#include #include / { @@ -68,4 +69,17 @@ , <&key_physical_attrs 150 100 1350 400 0 0 0> ; }; -}; \ No newline at end of file +}; + +&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> + ; + }; +}; diff --git a/app/dts/layouts/common/60percent/iso.dtsi b/app/dts/layouts/common/60percent/iso.dtsi index 2e3a00d820..e1214b58d1 100644 --- a/app/dts/layouts/common/60percent/iso.dtsi +++ b/app/dts/layouts/common/60percent/iso.dtsi @@ -1,3 +1,4 @@ +#include #include / { @@ -70,4 +71,17 @@ , <&key_physical_attrs 125 100 1375 400 0 0 0> ; }; -}; \ No newline at end of file +}; + +&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> + ; + }; +}; diff --git a/app/dts/layouts/common/60percent/position_map.dtsi b/app/dts/layouts/common/60percent/position_map.dtsi new file mode 100644 index 0000000000..b8db2d01c9 --- /dev/null +++ b/app/dts/layouts/common/60percent/position_map.dtsi @@ -0,0 +1,7 @@ +/ { + layouts_common_60_percent_position_map: layouts_common_60_percent_position_map { + compatible = "zmk,physical-layout-position-map"; + + complete; + }; +}; diff --git a/app/dts/layouts/common/65percent/65percent.dtsi b/app/dts/layouts/common/65percent/65percent.dtsi deleted file mode 100644 index 9e46d315e9..0000000000 --- a/app/dts/layouts/common/65percent/65percent.dtsi +++ /dev/null @@ -1,72 +0,0 @@ -#include -#include -#include -#include - -&layout_65_ansi { - status = "disabled"; -}; - -&layout_65_iso { - status = "disabled"; -}; - -&layout_65_all1u { - status = "disabled"; -}; - -&layout_65_hhkb { - status = "disabled"; -}; - -/ { - layouts_common_65_percent_position_map: layouts_common_65_percent_position_map { - compatible = "zmk,physical-layout-position-map"; - - complete; - - layout_65_all1u { - physical-layout = <&layout_65_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 63 64 65 66 67 68 69 70> - ; - }; - - layout_65_ansi { - physical-layout = <&layout_65_ansi>; - positions - = < 0 1 2 3 4 5 6 7 8 9 10 11 12 13 68 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 69 45 46 47 48 49 50 51 52 53 54 55 70 56 57> - , <58 59 60 61 62 63 64 65 66 67> - ; - }; - - layout_65_hhkb { - physical-layout = <&layout_65_hhkb>; - positions - = < 0 1 2 3 4 5 6 7 8 9 10 11 12 13 65 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 66 45 46 47 48 49 50 51 52 53 54 55 67 68 56> - , <57 58 59 60 61 62 63 69 70 64> - ; - }; - - layout_65_iso { - physical-layout = <&layout_65_iso>; - positions - = < 0 1 2 3 4 5 6 7 8 9 10 11 12 13 69 14> - , <15 16 17 18 19 20 21 22 23 24 25 26 27 70 28> - , <29 30 31 32 33 34 35 36 37 38 39 40 42 43> - , <44 45 46 47 48 49 50 51 52 53 54 55 56 41 57 58> - , <59 60 61 62 63 64 65 66 67 68> - ; - }; - }; -}; \ No newline at end of file diff --git a/app/dts/layouts/common/65percent/all1u.dtsi b/app/dts/layouts/common/65percent/all1u.dtsi index 8ab62ef286..7ff7035897 100644 --- a/app/dts/layouts/common/65percent/all1u.dtsi +++ b/app/dts/layouts/common/65percent/all1u.dtsi @@ -1,3 +1,4 @@ +#include #include / { @@ -82,4 +83,17 @@ , <&key_physical_attrs 100 100 1500 400 0 0 0> ; }; -}; \ No newline at end of file +}; + +&layouts_common_65_percent_position_map { + layout_65_all1u { + physical-layout = <&layout_65_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 63 64 65 66 67 68 69 70> + ; + }; +}; diff --git a/app/dts/layouts/common/65percent/ansi.dtsi b/app/dts/layouts/common/65percent/ansi.dtsi index 9685515c4b..991a672c5e 100644 --- a/app/dts/layouts/common/65percent/ansi.dtsi +++ b/app/dts/layouts/common/65percent/ansi.dtsi @@ -1,3 +1,4 @@ +#include #include / { @@ -76,4 +77,17 @@ , <&key_physical_attrs 100 100 1500 400 0 0 0> ; }; -}; \ No newline at end of file +}; + +&layouts_common_65_percent_position_map { + layout_65_ansi { + physical-layout = <&layout_65_ansi>; + positions + = < 0 1 2 3 4 5 6 7 8 9 10 11 12 13 68 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 69 45 46 47 48 49 50 51 52 53 54 55 70 56 57> + , <58 59 60 61 62 63 64 65 66 67> + ; + }; +}; diff --git a/app/dts/layouts/common/65percent/hhkb.dtsi b/app/dts/layouts/common/65percent/hhkb.dtsi index cbadad96e5..d0684f3c61 100644 --- a/app/dts/layouts/common/65percent/hhkb.dtsi +++ b/app/dts/layouts/common/65percent/hhkb.dtsi @@ -1,3 +1,4 @@ +#include #include / { @@ -73,4 +74,17 @@ , <&key_physical_attrs 100 100 1500 400 0 0 0> ; }; -}; \ No newline at end of file +}; + +&layouts_common_65_percent_position_map { + layout_65_hhkb { + physical-layout = <&layout_65_hhkb>; + positions + = < 0 1 2 3 4 5 6 7 8 9 10 11 12 13 65 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 66 45 46 47 48 49 50 51 52 53 54 55 67 68 56> + , <57 58 59 60 61 62 63 69 70 64> + ; + }; +}; diff --git a/app/dts/layouts/common/65percent/iso.dtsi b/app/dts/layouts/common/65percent/iso.dtsi index 3395c614e3..c94ee1d6a4 100644 --- a/app/dts/layouts/common/65percent/iso.dtsi +++ b/app/dts/layouts/common/65percent/iso.dtsi @@ -1,3 +1,4 @@ +#include #include / { @@ -77,4 +78,17 @@ , <&key_physical_attrs 100 100 1500 400 0 0 0> ; }; -}; \ No newline at end of file +}; + +&layouts_common_65_percent_position_map { + layout_65_iso { + physical-layout = <&layout_65_iso>; + positions + = < 0 1 2 3 4 5 6 7 8 9 10 11 12 13 69 14> + , <15 16 17 18 19 20 21 22 23 24 25 26 27 70 28> + , <29 30 31 32 33 34 35 36 37 38 39 40 42 43> + , <44 45 46 47 48 49 50 51 52 53 54 55 56 41 57 58> + , <59 60 61 62 63 64 65 66 67 68> + ; + }; +}; diff --git a/app/dts/layouts/common/65percent/position_map.dtsi b/app/dts/layouts/common/65percent/position_map.dtsi new file mode 100644 index 0000000000..b761b8580c --- /dev/null +++ b/app/dts/layouts/common/65percent/position_map.dtsi @@ -0,0 +1,7 @@ +/ { + layouts_common_65_percent_position_map: layouts_common_65_percent_position_map { + compatible = "zmk,physical-layout-position-map"; + + complete; + }; +}; diff --git a/app/dts/layouts/common/75percent/75percent.dtsi b/app/dts/layouts/common/75percent/75percent.dtsi deleted file mode 100644 index 1781fbd3ba..0000000000 --- a/app/dts/layouts/common/75percent/75percent.dtsi +++ /dev/null @@ -1,59 +0,0 @@ -#include -#include -#include - -&layout_75_ansi { - status = "disabled"; -}; - -&layout_75_iso { - status = "disabled"; -}; - -&layout_75_all1u { - status = "disabled"; -}; - -/ { - layouts_common_75_percent_position_map: layouts_common_75_percent_position_map { - compatible = "zmk,physical-layout-position-map"; - - complete; - - layout_75_all1u { - physical-layout = <&layout_75_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 63 64 65 66 67 68 69 70 71 72 73 74 75 76> - , <77 78 79 80 81 82 83 84 85 86> - ; - }; - - layout_75_ansi { - physical-layout = <&layout_75_ansi>; - 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 84 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 85 61 62 63 64 65 66 67 68 69 70 71 86 72 73> - , <74 75 76 77 78 79 80 81 82 83> - ; - }; - - layout_75_iso { - physical-layout = <&layout_75_iso>; - 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 85 30> - , <31 32 33 34 35 36 37 38 39 40 41 42 43 86 44> - , <45 46 47 48 49 50 51 52 53 54 55 56 58 59> - , <60 61 62 63 64 65 66 67 68 69 70 71 72 57 73 74> - , <75 76 77 78 79 80 81 82 83 84> - ; - }; - }; -}; \ No newline at end of file diff --git a/app/dts/layouts/common/75percent/all1u.dtsi b/app/dts/layouts/common/75percent/all1u.dtsi index 04c12bdbb1..fbba5df691 100644 --- a/app/dts/layouts/common/75percent/all1u.dtsi +++ b/app/dts/layouts/common/75percent/all1u.dtsi @@ -1,3 +1,4 @@ +#include #include / { @@ -95,4 +96,18 @@ , <&key_physical_attrs 100 100 1500 500 0 0 0> ; }; -}; \ No newline at end of file +}; + +&layouts_common_75_percent_position_map { + layout_75_all1u { + physical-layout = <&layout_75_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 63 64 65 66 67 68 69 70 71 72 73 74 75 76> + , <77 78 79 80 81 82 83 84 85 86> + ; + }; +}; diff --git a/app/dts/layouts/common/75percent/ansi.dtsi b/app/dts/layouts/common/75percent/ansi.dtsi index 6c9a65c765..8d94923367 100644 --- a/app/dts/layouts/common/75percent/ansi.dtsi +++ b/app/dts/layouts/common/75percent/ansi.dtsi @@ -1,3 +1,4 @@ +#include #include / { @@ -92,4 +93,18 @@ , <&key_physical_attrs 100 100 1500 500 0 0 0> ; }; -}; \ No newline at end of file +}; + +&layouts_common_75_percent_position_map { + layout_75_ansi { + physical-layout = <&layout_75_ansi>; + 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 84 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 85 61 62 63 64 65 66 67 68 69 70 71 86 72 73> + , <74 75 76 77 78 79 80 81 82 83> + ; + }; +}; diff --git a/app/dts/layouts/common/75percent/iso.dtsi b/app/dts/layouts/common/75percent/iso.dtsi index f3ee0c5107..edbb4b4019 100644 --- a/app/dts/layouts/common/75percent/iso.dtsi +++ b/app/dts/layouts/common/75percent/iso.dtsi @@ -1,3 +1,4 @@ +#include #include / { @@ -93,4 +94,18 @@ , <&key_physical_attrs 100 100 1500 500 0 0 0> ; }; -}; \ No newline at end of file +}; + +&layouts_common_75_percent_position_map { + layout_75_iso { + physical-layout = <&layout_75_iso>; + 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 85 30> + , <31 32 33 34 35 36 37 38 39 40 41 42 43 86 44> + , <45 46 47 48 49 50 51 52 53 54 55 56 58 59> + , <60 61 62 63 64 65 66 67 68 69 70 71 72 57 73 74> + , <75 76 77 78 79 80 81 82 83 84> + ; + }; +}; diff --git a/app/dts/layouts/common/75percent/position_map.dtsi b/app/dts/layouts/common/75percent/position_map.dtsi new file mode 100644 index 0000000000..d5f9cdbb69 --- /dev/null +++ b/app/dts/layouts/common/75percent/position_map.dtsi @@ -0,0 +1,7 @@ +/ { + layouts_common_75_percent_position_map: layouts_common_75_percent_position_map { + compatible = "zmk,physical-layout-position-map"; + + complete; + }; +}; diff --git a/app/dts/layouts/common/ortho_4x12/1x2u.dtsi b/app/dts/layouts/common/ortho_4x12/1x2u.dtsi index 23646afc9c..c3f0c30f46 100644 --- a/app/dts/layouts/common/ortho_4x12/1x2u.dtsi +++ b/app/dts/layouts/common/ortho_4x12/1x2u.dtsi @@ -1,3 +1,4 @@ +#include #include / { @@ -55,4 +56,16 @@ , <&key_physical_attrs 100 100 1100 300 0 0 0> ; }; -}; \ No newline at end of file +}; + +&layouts_common_ortho_4x12_position_map { + layout_ortho_4x12_1x2u { + physical-layout = <&layout_ortho_4x12_1x2u>; + 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 47 42 43 44 45 46> + ; + }; +}; diff --git a/app/dts/layouts/common/ortho_4x12/2x2u.dtsi b/app/dts/layouts/common/ortho_4x12/2x2u.dtsi index d091786938..5ee5d42321 100644 --- a/app/dts/layouts/common/ortho_4x12/2x2u.dtsi +++ b/app/dts/layouts/common/ortho_4x12/2x2u.dtsi @@ -1,3 +1,4 @@ +#include #include / { @@ -54,4 +55,16 @@ , <&key_physical_attrs 100 100 1100 300 0 0 0> ; }; -}; \ No newline at end of file +}; + +&layouts_common_ortho_4x12_position_map { + layout_ortho_4x12_2x2u { + physical-layout = <&layout_ortho_4x12_2x2u>; + 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 46 47 41 42 43 44 45> + ; + }; +}; diff --git a/app/dts/layouts/common/ortho_4x12/all1u.dtsi b/app/dts/layouts/common/ortho_4x12/all1u.dtsi index 323821d466..2829d5e3c6 100644 --- a/app/dts/layouts/common/ortho_4x12/all1u.dtsi +++ b/app/dts/layouts/common/ortho_4x12/all1u.dtsi @@ -1,3 +1,4 @@ +#include #include / { @@ -56,4 +57,16 @@ , <&key_physical_attrs 100 100 1100 300 0 0 0> ; }; -}; \ No newline at end of file +}; + +&layouts_common_ortho_4x12_position_map { + layout_ortho_4x12_all1u { + physical-layout = <&layout_ortho_4x12_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> + ; + }; +}; diff --git a/app/dts/layouts/common/ortho_4x12/ortho_4x12.dtsi b/app/dts/layouts/common/ortho_4x12/ortho_4x12.dtsi deleted file mode 100644 index 0c361b109b..0000000000 --- a/app/dts/layouts/common/ortho_4x12/ortho_4x12.dtsi +++ /dev/null @@ -1,53 +0,0 @@ -#include -#include -#include - -&layout_ortho_4x12_all1u { - status = "disabled"; -}; - -&layout_ortho_4x12_1x2u { - status = "disabled"; -}; - -&layout_ortho_4x12_2x2u { - status = "disabled"; -}; - -/ { - layouts_common_ortho_4x12_position_map: layouts_common_ortho_4x12_position_map { - compatible = "zmk,physical-layout-position-map"; - - complete; - - layout_ortho_4x12_all1u { - physical-layout = <&layout_ortho_4x12_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> - ; - }; - - layout_ortho_4x12_2x2u { - physical-layout = <&layout_ortho_4x12_2x2u>; - 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 46 47 41 42 43 44 45> - ; - }; - - layout_ortho_4x12_1x2u { - physical-layout = <&layout_ortho_4x12_1x2u>; - 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 47 42 43 44 45 46> - ; - }; - }; -}; \ No newline at end of file diff --git a/app/dts/layouts/common/ortho_4x12/position_map.dtsi b/app/dts/layouts/common/ortho_4x12/position_map.dtsi new file mode 100644 index 0000000000..c93a32bdf7 --- /dev/null +++ b/app/dts/layouts/common/ortho_4x12/position_map.dtsi @@ -0,0 +1,7 @@ +/ { + layouts_common_ortho_4x12_position_map: layouts_common_ortho_4x12_position_map { + compatible = "zmk,physical-layout-position-map"; + + complete; + }; +}; diff --git a/app/dts/layouts/common/ortho_5x12/1x2u.dtsi b/app/dts/layouts/common/ortho_5x12/1x2u.dtsi index 2072cc35dd..5d12ea45af 100644 --- a/app/dts/layouts/common/ortho_5x12/1x2u.dtsi +++ b/app/dts/layouts/common/ortho_5x12/1x2u.dtsi @@ -1,3 +1,4 @@ +#include #include / { @@ -67,4 +68,17 @@ , <&key_physical_attrs 100 100 1100 400 0 0 0> ; }; -}; \ No newline at end of file +}; + +&layouts_common_ortho_5x12_position_map { + layout_ortho_5x12_1x2u { + physical-layout = <&layout_ortho_5x12_1x2u>; + 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 59 54 55 56 57 58> + ; + }; +}; diff --git a/app/dts/layouts/common/ortho_5x12/2x2u.dtsi b/app/dts/layouts/common/ortho_5x12/2x2u.dtsi index 5e55f734e1..26079eb8f7 100644 --- a/app/dts/layouts/common/ortho_5x12/2x2u.dtsi +++ b/app/dts/layouts/common/ortho_5x12/2x2u.dtsi @@ -1,3 +1,4 @@ +#include #include / { @@ -66,4 +67,17 @@ , <&key_physical_attrs 100 100 1100 400 0 0 0> ; }; -}; \ No newline at end of file +}; + +&layouts_common_ortho_5x12_position_map { + layout_ortho_5x12_2x2u { + physical-layout = <&layout_ortho_5x12_2x2u>; + 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 58 59 53 54 55 56 57> + ; + }; +}; diff --git a/app/dts/layouts/common/ortho_5x12/all1u.dtsi b/app/dts/layouts/common/ortho_5x12/all1u.dtsi index 53afb469f8..3b8f7501de 100644 --- a/app/dts/layouts/common/ortho_5x12/all1u.dtsi +++ b/app/dts/layouts/common/ortho_5x12/all1u.dtsi @@ -1,3 +1,4 @@ +#include #include / { @@ -69,3 +70,16 @@ ; }; }; + +&layouts_common_ortho_5x12_position_map { + layout_ortho_5x12_all1u { + physical-layout = <&layout_ortho_5x12_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> + ; + }; +}; diff --git a/app/dts/layouts/common/ortho_5x12/ortho_5x12.dtsi b/app/dts/layouts/common/ortho_5x12/ortho_5x12.dtsi deleted file mode 100644 index d1a6df7e81..0000000000 --- a/app/dts/layouts/common/ortho_5x12/ortho_5x12.dtsi +++ /dev/null @@ -1,56 +0,0 @@ -#include -#include -#include - -&layout_ortho_5x12_all1u { - status = "disabled"; -}; - -&layout_ortho_5x12_1x2u { - status = "disabled"; -}; - -&layout_ortho_5x12_2x2u { - status = "disabled"; -}; - -/ { - layouts_common_ortho_5x12_position_map: layouts_common_ortho_5x12_position_map { - compatible = "zmk,physical-layout-position-map"; - - complete; - - layout_ortho_5x12_all1u { - physical-layout = <&layout_ortho_5x12_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> - ; - }; - - layout_ortho_5x12_2x2u { - physical-layout = <&layout_ortho_5x12_2x2u>; - 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 58 59 53 54 55 56 57> - ; - }; - - layout_ortho_5x12_1x2u { - physical-layout = <&layout_ortho_5x12_1x2u>; - 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 59 54 55 56 57 58> - ; - }; - }; -}; \ No newline at end of file diff --git a/app/dts/layouts/common/ortho_5x12/position_map.dtsi b/app/dts/layouts/common/ortho_5x12/position_map.dtsi new file mode 100644 index 0000000000..e292b4e7a9 --- /dev/null +++ b/app/dts/layouts/common/ortho_5x12/position_map.dtsi @@ -0,0 +1,7 @@ +/ { + layouts_common_ortho_5x12_position_map: layouts_common_ortho_5x12_position_map { + compatible = "zmk,physical-layout-position-map"; + + complete; + }; +}; diff --git a/app/dts/layouts/common/tkl/ansi.dtsi b/app/dts/layouts/common/tkl/ansi.dtsi index 639ac471a6..83354c4f55 100644 --- a/app/dts/layouts/common/tkl/ansi.dtsi +++ b/app/dts/layouts/common/tkl/ansi.dtsi @@ -1,3 +1,4 @@ +#include #include / { diff --git a/app/dts/layouts/common/tkl/position_map.dtsi b/app/dts/layouts/common/tkl/position_map.dtsi new file mode 100644 index 0000000000..8ac528e39b --- /dev/null +++ b/app/dts/layouts/common/tkl/position_map.dtsi @@ -0,0 +1,7 @@ +/ { + layouts_common_tkl_position_map: layouts_common_tkl_position_map { + compatible = "zmk,physical-layout-position-map"; + + complete; + }; +};