From 9508e33f325b262e7baf83d248fa92f65f7a5113 Mon Sep 17 00:00:00 2001 From: Peter Johanson Date: Wed, 9 Oct 2024 14:36:19 -0600 Subject: [PATCH] refactor: Give position map children labels. * 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 454316891111..e013d861ad42 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_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> diff --git a/app/dts/layouts/common/60percent/ansi.dtsi b/app/dts/layouts/common/60percent/ansi.dtsi index b3b870c550ff..89b9b9297f01 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_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> diff --git a/app/dts/layouts/common/60percent/hhkb.dtsi b/app/dts/layouts/common/60percent/hhkb.dtsi index a3c271e7e5ec..7d3ba24770e4 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_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> diff --git a/app/dts/layouts/common/60percent/iso.dtsi b/app/dts/layouts/common/60percent/iso.dtsi index e1214b58d17a..9dfd98a82f3a 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_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> diff --git a/app/dts/layouts/common/65percent/all1u.dtsi b/app/dts/layouts/common/65percent/all1u.dtsi index 7ff703589755..23796fc7fd70 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_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> diff --git a/app/dts/layouts/common/65percent/ansi.dtsi b/app/dts/layouts/common/65percent/ansi.dtsi index 991a672c5e7a..401bfecc0dc9 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_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> diff --git a/app/dts/layouts/common/65percent/hhkb.dtsi b/app/dts/layouts/common/65percent/hhkb.dtsi index d0684f3c61dd..f725ff17b0d5 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_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> diff --git a/app/dts/layouts/common/65percent/iso.dtsi b/app/dts/layouts/common/65percent/iso.dtsi index c94ee1d6a44d..efb9f4727c66 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_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> diff --git a/app/dts/layouts/common/75percent/all1u.dtsi b/app/dts/layouts/common/75percent/all1u.dtsi index fbba5df691e1..01193c5e80bb 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_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> diff --git a/app/dts/layouts/common/75percent/ansi.dtsi b/app/dts/layouts/common/75percent/ansi.dtsi index 8d9492336752..8cec2193fe6a 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_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> diff --git a/app/dts/layouts/common/75percent/iso.dtsi b/app/dts/layouts/common/75percent/iso.dtsi index edbb4b401990..2768de42d6c5 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_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> diff --git a/app/dts/layouts/common/ortho_4x12/1x2u.dtsi b/app/dts/layouts/common/ortho_4x12/1x2u.dtsi index c3f0c30f4679..e7675a2da9a3 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_map: 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 5ee5d42321ca..5001f44c3938 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_map: 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 2829d5e3c628..a5bd715d14d3 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_map: 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 5d12ea45af97..74a692fdff2d 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_map: 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 26079eb8f781..15711def4e5e 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_map: 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 3b8f7501de3d..92b96f0d8950 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_map: 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 2d96d0b262f8..07142a4ea685 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_mapping: 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 bc1a196d53d4..76be9606eb7d 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_mapping: six { physical-layout = <&foostan_corne_6col_layout>; positions = < 0 1 2 3 4 5 6 7 8 9 10 11>