From d3f2895744e2cbfc764db9c026dbf2651f181d99 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Thu, 10 Oct 2024 11:03:32 -0600 Subject: [PATCH] refactor: Give position map children labels. (#2544) * To make is easier to reuse layouts and override the position maps for them, add labels to all the position map children in our shared layouts. --- app/dts/layouts/common/60percent/all1u.dtsi | 2 +- app/dts/layouts/common/60percent/ansi.dtsi | 2 +- app/dts/layouts/common/60percent/hhkb.dtsi | 2 +- app/dts/layouts/common/60percent/iso.dtsi | 2 +- app/dts/layouts/common/65percent/all1u.dtsi | 2 +- app/dts/layouts/common/65percent/ansi.dtsi | 2 +- app/dts/layouts/common/65percent/hhkb.dtsi | 2 +- app/dts/layouts/common/65percent/iso.dtsi | 2 +- app/dts/layouts/common/75percent/all1u.dtsi | 2 +- app/dts/layouts/common/75percent/ansi.dtsi | 2 +- app/dts/layouts/common/75percent/iso.dtsi | 2 +- app/dts/layouts/common/ortho_4x12/1x2u.dtsi | 2 +- app/dts/layouts/common/ortho_4x12/2x2u.dtsi | 2 +- app/dts/layouts/common/ortho_4x12/all1u.dtsi | 2 +- app/dts/layouts/common/ortho_5x12/1x2u.dtsi | 2 +- app/dts/layouts/common/ortho_5x12/2x2u.dtsi | 2 +- app/dts/layouts/common/ortho_5x12/all1u.dtsi | 2 +- app/dts/layouts/foostan/corne/5column.dtsi | 2 +- app/dts/layouts/foostan/corne/6column.dtsi | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/dts/layouts/common/60percent/all1u.dtsi b/app/dts/layouts/common/60percent/all1u.dtsi index 45431689111..e99f75b54f5 100644 --- a/app/dts/layouts/common/60percent/all1u.dtsi +++ b/app/dts/layouts/common/60percent/all1u.dtsi @@ -78,7 +78,7 @@ }; &layouts_common_60_percent_position_map { - layout_60_all1u { + layout_60_all1u_posmap: layout_60_all1u { physical-layout = <&layout_60_all1u>; positions = < 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14> diff --git a/app/dts/layouts/common/60percent/ansi.dtsi b/app/dts/layouts/common/60percent/ansi.dtsi index b3b870c550f..0d6c6b9e5c9 100644 --- a/app/dts/layouts/common/60percent/ansi.dtsi +++ b/app/dts/layouts/common/60percent/ansi.dtsi @@ -73,7 +73,7 @@ }; &layouts_common_60_percent_position_map { - layout_60_ansi { + layout_60_ansi_posmap: layout_60_ansi { physical-layout = <&layout_60_ansi>; positions = < 0 1 2 3 4 5 6 7 8 9 10 11 12 13 61> diff --git a/app/dts/layouts/common/60percent/hhkb.dtsi b/app/dts/layouts/common/60percent/hhkb.dtsi index a3c271e7e5e..dcefbfc6975 100644 --- a/app/dts/layouts/common/60percent/hhkb.dtsi +++ b/app/dts/layouts/common/60percent/hhkb.dtsi @@ -72,7 +72,7 @@ }; &layouts_common_60_percent_position_map { - layout_60_hhkb { + layout_60_hhkb_posmap: layout_60_hhkb { physical-layout = <&layout_60_hhkb>; positions = < 0 1 2 3 4 5 6 7 8 9 10 11 12 13 60> diff --git a/app/dts/layouts/common/60percent/iso.dtsi b/app/dts/layouts/common/60percent/iso.dtsi index e1214b58d17..1f9ae26d060 100644 --- a/app/dts/layouts/common/60percent/iso.dtsi +++ b/app/dts/layouts/common/60percent/iso.dtsi @@ -74,7 +74,7 @@ }; &layouts_common_60_percent_position_map { - layout_60_iso { + layout_60_iso_posmap: layout_60_iso { physical-layout = <&layout_60_iso>; positions = < 0 1 2 3 4 5 6 7 8 9 10 11 12 13 62> diff --git a/app/dts/layouts/common/65percent/all1u.dtsi b/app/dts/layouts/common/65percent/all1u.dtsi index 7ff70358975..f5d3121d741 100644 --- a/app/dts/layouts/common/65percent/all1u.dtsi +++ b/app/dts/layouts/common/65percent/all1u.dtsi @@ -86,7 +86,7 @@ }; &layouts_common_65_percent_position_map { - layout_65_all1u { + layout_65_all1u_posmap: 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> diff --git a/app/dts/layouts/common/65percent/ansi.dtsi b/app/dts/layouts/common/65percent/ansi.dtsi index 991a672c5e7..d6938ce8d72 100644 --- a/app/dts/layouts/common/65percent/ansi.dtsi +++ b/app/dts/layouts/common/65percent/ansi.dtsi @@ -80,7 +80,7 @@ }; &layouts_common_65_percent_position_map { - layout_65_ansi { + layout_65_ansi_posmap: 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> diff --git a/app/dts/layouts/common/65percent/hhkb.dtsi b/app/dts/layouts/common/65percent/hhkb.dtsi index d0684f3c61d..a20fb6dc2d2 100644 --- a/app/dts/layouts/common/65percent/hhkb.dtsi +++ b/app/dts/layouts/common/65percent/hhkb.dtsi @@ -77,7 +77,7 @@ }; &layouts_common_65_percent_position_map { - layout_65_hhkb { + layout_65_hhkb_posmap: 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> diff --git a/app/dts/layouts/common/65percent/iso.dtsi b/app/dts/layouts/common/65percent/iso.dtsi index c94ee1d6a44..9117b70f5e4 100644 --- a/app/dts/layouts/common/65percent/iso.dtsi +++ b/app/dts/layouts/common/65percent/iso.dtsi @@ -81,7 +81,7 @@ }; &layouts_common_65_percent_position_map { - layout_65_iso { + layout_65_iso_posmap: 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> diff --git a/app/dts/layouts/common/75percent/all1u.dtsi b/app/dts/layouts/common/75percent/all1u.dtsi index fbba5df691e..702de021411 100644 --- a/app/dts/layouts/common/75percent/all1u.dtsi +++ b/app/dts/layouts/common/75percent/all1u.dtsi @@ -99,7 +99,7 @@ }; &layouts_common_75_percent_position_map { - layout_75_all1u { + layout_75_all1u_posmap: 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> diff --git a/app/dts/layouts/common/75percent/ansi.dtsi b/app/dts/layouts/common/75percent/ansi.dtsi index 8d949233675..0395bd69795 100644 --- a/app/dts/layouts/common/75percent/ansi.dtsi +++ b/app/dts/layouts/common/75percent/ansi.dtsi @@ -96,7 +96,7 @@ }; &layouts_common_75_percent_position_map { - layout_75_ansi { + layout_75_ansi_posmap: 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> diff --git a/app/dts/layouts/common/75percent/iso.dtsi b/app/dts/layouts/common/75percent/iso.dtsi index edbb4b40199..7002b89c7de 100644 --- a/app/dts/layouts/common/75percent/iso.dtsi +++ b/app/dts/layouts/common/75percent/iso.dtsi @@ -97,7 +97,7 @@ }; &layouts_common_75_percent_position_map { - layout_75_iso { + layout_75_iso_posmap: 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> diff --git a/app/dts/layouts/common/ortho_4x12/1x2u.dtsi b/app/dts/layouts/common/ortho_4x12/1x2u.dtsi index c3f0c30f467..451743ff87a 100644 --- a/app/dts/layouts/common/ortho_4x12/1x2u.dtsi +++ b/app/dts/layouts/common/ortho_4x12/1x2u.dtsi @@ -59,7 +59,7 @@ }; &layouts_common_ortho_4x12_position_map { - layout_ortho_4x12_1x2u { + layout_ortho_4x12_1x2u_posmap: layout_ortho_4x12_1x2u { physical-layout = <&layout_ortho_4x12_1x2u>; positions = < 0 1 2 3 4 5 6 7 8 9 10 11> diff --git a/app/dts/layouts/common/ortho_4x12/2x2u.dtsi b/app/dts/layouts/common/ortho_4x12/2x2u.dtsi index 5ee5d42321c..69afe35fcd2 100644 --- a/app/dts/layouts/common/ortho_4x12/2x2u.dtsi +++ b/app/dts/layouts/common/ortho_4x12/2x2u.dtsi @@ -58,7 +58,7 @@ }; &layouts_common_ortho_4x12_position_map { - layout_ortho_4x12_2x2u { + layout_ortho_4x12_2x2u_posmap: layout_ortho_4x12_2x2u { physical-layout = <&layout_ortho_4x12_2x2u>; positions = < 0 1 2 3 4 5 6 7 8 9 10 11> diff --git a/app/dts/layouts/common/ortho_4x12/all1u.dtsi b/app/dts/layouts/common/ortho_4x12/all1u.dtsi index 2829d5e3c62..00e4bded9e0 100644 --- a/app/dts/layouts/common/ortho_4x12/all1u.dtsi +++ b/app/dts/layouts/common/ortho_4x12/all1u.dtsi @@ -60,7 +60,7 @@ }; &layouts_common_ortho_4x12_position_map { - layout_ortho_4x12_all1u { + layout_ortho_4x12_all1u_posmap: layout_ortho_4x12_all1u { physical-layout = <&layout_ortho_4x12_all1u>; positions = < 0 1 2 3 4 5 6 7 8 9 10 11> diff --git a/app/dts/layouts/common/ortho_5x12/1x2u.dtsi b/app/dts/layouts/common/ortho_5x12/1x2u.dtsi index 5d12ea45af9..bbe101ba55f 100644 --- a/app/dts/layouts/common/ortho_5x12/1x2u.dtsi +++ b/app/dts/layouts/common/ortho_5x12/1x2u.dtsi @@ -71,7 +71,7 @@ }; &layouts_common_ortho_5x12_position_map { - layout_ortho_5x12_1x2u { + layout_ortho_5x12_1x2u_posmap: layout_ortho_5x12_1x2u { physical-layout = <&layout_ortho_5x12_1x2u>; positions = < 0 1 2 3 4 5 6 7 8 9 10 11> diff --git a/app/dts/layouts/common/ortho_5x12/2x2u.dtsi b/app/dts/layouts/common/ortho_5x12/2x2u.dtsi index 26079eb8f78..c2f7efb7ab2 100644 --- a/app/dts/layouts/common/ortho_5x12/2x2u.dtsi +++ b/app/dts/layouts/common/ortho_5x12/2x2u.dtsi @@ -70,7 +70,7 @@ }; &layouts_common_ortho_5x12_position_map { - layout_ortho_5x12_2x2u { + layout_ortho_5x12_2x2u_posmap: layout_ortho_5x12_2x2u { physical-layout = <&layout_ortho_5x12_2x2u>; positions = < 0 1 2 3 4 5 6 7 8 9 10 11> diff --git a/app/dts/layouts/common/ortho_5x12/all1u.dtsi b/app/dts/layouts/common/ortho_5x12/all1u.dtsi index 3b8f7501de3..e8648789159 100644 --- a/app/dts/layouts/common/ortho_5x12/all1u.dtsi +++ b/app/dts/layouts/common/ortho_5x12/all1u.dtsi @@ -72,7 +72,7 @@ }; &layouts_common_ortho_5x12_position_map { - layout_ortho_5x12_all1u { + layout_ortho_5x12_all1u_posmap: layout_ortho_5x12_all1u { physical-layout = <&layout_ortho_5x12_all1u>; positions = < 0 1 2 3 4 5 6 7 8 9 10 11> diff --git a/app/dts/layouts/foostan/corne/5column.dtsi b/app/dts/layouts/foostan/corne/5column.dtsi index 2d96d0b262f..fe2cd4d196e 100644 --- a/app/dts/layouts/foostan/corne/5column.dtsi +++ b/app/dts/layouts/foostan/corne/5column.dtsi @@ -48,7 +48,7 @@ }; &layouts_foostan_corne_position_map { - five_column { + foostan_corne_5col_posmap: five_column { physical-layout = <&foostan_corne_5col_layout>; positions = <36 0 1 2 3 4 5 6 7 8 9 37> diff --git a/app/dts/layouts/foostan/corne/6column.dtsi b/app/dts/layouts/foostan/corne/6column.dtsi index bc1a196d53d..4747a1e3a1f 100644 --- a/app/dts/layouts/foostan/corne/6column.dtsi +++ b/app/dts/layouts/foostan/corne/6column.dtsi @@ -54,7 +54,7 @@ }; &layouts_foostan_corne_position_map { - twelve { + foostan_corne_6col_posmap: six { physical-layout = <&foostan_corne_6col_layout>; positions = < 0 1 2 3 4 5 6 7 8 9 10 11>