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.

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

Switch to having only one struct named LabelStruct. #13380

Merged
merged 1 commit into from
Jan 10, 2022

Conversation

bzbarsky-apple
Copy link
Contributor

This is shared across the fixed label and user label clusters.

The struct definition is in the "detail" namespace, with alias
namespaces in the two clusters that use it. Consumers are generally
expected to use the per-cluster aliases.

Problem

Multiple structs with the same name are a problem, because various places look up structs by name.

Change overview

Have only one struct with that name in XML.

Also have only one struct with that name in C++, so C++ consumers who only have a name without the cluster context (if any) don't necessarily have to guess the right cluster name and we can't get weird divergence between the per-cluster views of this struct.

Testing

Tree compiles, extra assignments are gone in Darwin code.

@github-actions
Copy link

github-actions bot commented Jan 7, 2022

PR #13380: Size comparison from 585cdcb to 2d4dbe9

Decreases (25 builds for efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 585cdcb 2d4dbe9 change % change
efr32 lighting-app BRD4161A (read only) 828876 828748 -128 -0.0
.text 828868 828740 -128 -0.0
BRD4161A+rpc (read only) 816072 815944 -128 -0.0
.text 816064 815936 -128 -0.0
window-app BRD4161A (read only) 802324 802196 -128 -0.0
.text 802316 802188 -128 -0.0
esp32 all-clusters-app c3devkit (read only) 891834 891756 -78 -0.0
.flash.text 891834 891756 -78 -0.0
m5stack (read only) 951779 951735 -44 -0.0
.flash.text 946395 946351 -44 -0.0
k32w light k32w061+release (read/write) 655308 655212 -96 -0.0
.text 570884 570788 -96 -0.0
lock k32w061+release (read/write) 659584 659488 -96 -0.0
.text 574844 574748 -96 -0.0
linux chip-tool-ipv6only arm64 (read only) 7039468 7027900 -11568 -0.2
(read/write) 325985 325777 -208 -0.1
.data.rel.ro 209296 209136 -160 -0.1
.got 57040 56992 -48 -0.1
.rodata 384404 384308 -96 -0.0
.text 5961492 5950452 -11040 -0.2
thermostat-no-ble arm64 (read only) 2033468 2031436 -2032 -0.1
.text 1690800 1688768 -2032 -0.1
mbed all-clusters-app CY8CPROTO_062_4343W+release (read/write) 2348496 2348432 -64 -0.0
.text 1311072 1311008 -64 -0.0
lighting-app CY8CPROTO_062_4343W+release (read/write) 2330392 2330328 -64 -0.0
.text 1292992 1292928 -64 -0.0
lock-app CY8CPROTO_062_4343W+release (read/write) 2303544 2303480 -64 -0.0
.text 1266144 1266080 -64 -0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 937083 936987 -96 -0.0
text 633292 633200 -92 -0.0
nrf52840dk_nrf52840+rpc (read/write) 922551 922455 -96 -0.0
text 628644 628548 -96 -0.0
nrf5340dk_nrf5340_cpuapp (read/write) 848062 847966 -96 -0.0
text 550228 550132 -96 -0.0
lock-app nrf52840dk_nrf52840 (read/write) 909227 909131 -96 -0.0
text 611160 611064 -96 -0.0
nrf5340dk_nrf5340_cpuapp (read/write) 820386 820290 -96 -0.0
text 528132 528040 -92 -0.0
pump-app nrf52840dk_nrf52840 (read/write) 910491 910411 -80 -0.0
text 612372 612280 -92 -0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 907307 907211 -96 -0.0
text 609908 609812 -96 -0.0
p6 all-clusters-app default (read/write) 2401624 2401496 -128 -0.0
.text 1359888 1359760 -128 -0.0
light-app default (read/write) 2323648 2323520 -128 -0.0
.text 1281912 1281784 -128 -0.0
lock-app default (read/write) 2295872 2295744 -128 -0.0
.text 1254136 1254008 -128 -0.0
qpg lighting-app qpg6105+debug (read only) 533160 533064 -96 -0.0
.text 527840 527744 -96 -0.0
lock-app qpg6105+debug (read only) 504936 504840 -96 -0.0
.text 499616 499520 -96 -0.0
telink lighting-app tlsr9518adk80d (read/write) 834466 834378 -88 -0.0
text 582710 582624 -86 -0.0
Full report (31 builds for efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 585cdcb 2d4dbe9 change % change
efr32 lighting-app BRD4161A (read only) 828876 828748 -128 -0.0
(read/write) 126996 126996 0 0.0
.bss 125120 125120 0 0.0
.data 1876 1876 0 0.0
.text 828868 828740 -128 -0.0
BRD4161A+rpc (read only) 816072 815944 -128 -0.0
(read/write) 143656 143656 0 0.0
.bss 141680 141680 0 0.0
.data 1976 1976 0 0.0
.text 816064 815936 -128 -0.0
window-app BRD4161A (read only) 802324 802196 -128 -0.0
(read/write) 125936 125936 0 0.0
.bss 124104 124104 0 0.0
.data 1832 1832 0 0.0
.text 802316 802188 -128 -0.0
esp32 all-clusters-app c3devkit (read only) 891834 891756 -78 -0.0
(read/write) 1314010 1314010 0 0.0
.dram0.bss 69464 69464 0 0.0
.dram0.data 14236 14236 0 0.0
.flash.rodata 177248 177248 0 0.0
.flash.text 891834 891756 -78 -0.0
.iram0.text 62254 62254 0 0.0
m5stack (read only) 951779 951735 -44 -0.0
(read/write) 445592 445592 0 0.0
.dram0.bss 73960 73960 0 0.0
.dram0.data 34064 34064 0 0.0
.flash.rodata 206560 206560 0 0.0
.flash.text 946395 946351 -44 -0.0
.iram0.text 122671 122671 0 0.0
k32w light k32w061+release (read/write) 655308 655212 -96 -0.0
.bss 76776 76776 0 0.0
.data 1848 1848 0 0.0
.text 570884 570788 -96 -0.0
lock k32w061+release (read/write) 659584 659488 -96 -0.0
.bss 77072 77072 0 0.0
.data 1868 1868 0 0.0
.text 574844 574748 -96 -0.0
linux chip-tool-ipv6only arm64 (read only) 7039468 7027900 -11568 -0.2
(read/write) 325985 325777 -208 -0.1
.bss 54865 54865 0 0.0
.data 1096 1096 0 0.0
.data.rel.ro 209296 209136 -160 -0.1
.dynamic 560 560 0 0.0
.got 57040 56992 -48 -0.1
.init 24 24 0 0.0
.init_array 168 168 0 0.0
.rodata 384404 384308 -96 -0.0
.text 5961492 5950452 -11040 -0.2
thermostat-no-ble arm64 (read only) 2033468 2031436 -2032 -0.1
(read/write) 145105 145105 0 0.0
.bss 64657 64657 0 0.0
.data 880 880 0 0.0
.data.rel.ro 72624 72624 0 0.0
.dynamic 560 560 0 0.0
.got 4008 4008 0 0.0
.init 24 24 0 0.0
.init_array 296 296 0 0.0
.rodata 128988 128988 0 0.0
.text 1690800 1688768 -2032 -0.1
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2348496 2348432 -64 -0.0
.bss 188724 188724 0 0.0
.data 5312 5312 0 0.0
.text 1311072 1311008 -64 -0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2330392 2330328 -64 -0.0
.bss 180544 180544 0 0.0
.data 5552 5552 0 0.0
.text 1292992 1292928 -64 -0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2303544 2303480 -64 -0.0
.bss 179592 179592 0 0.0
.data 5544 5544 0 0.0
.text 1266144 1266080 -64 -0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139712 1139712 0 0.0
.bss 11756 11756 0 0.0
.data 4368 4368 0 0.0
.text 103096 103096 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2054256 2054256 0 0.0
.bss 157060 157060 0 0.0
.data 4864 4864 0 0.0
.text 1016856 1016856 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 937083 936987 -96 -0.0
bss 118112 118112 0 0.0
rodata 108120 108120 0 0.0
text 633292 633200 -92 -0.0
nrf52840dk_nrf52840+rpc (read/write) 922551 922455 -96 -0.0
bss 115156 115156 0 0.0
rodata 100572 100572 0 0.0
text 628644 628548 -96 -0.0
nrf5340dk_nrf5340_cpuapp (read/write) 848062 847966 -96 -0.0
bss 116004 116004 0 0.0
rodata 101296 101296 0 0.0
text 550228 550132 -96 -0.0
lock-app nrf52840dk_nrf52840 (read/write) 909227 909131 -96 -0.0
bss 117300 117300 0 0.0
rodata 103392 103392 0 0.0
text 611160 611064 -96 -0.0
nrf5340dk_nrf5340_cpuapp (read/write) 820386 820290 -96 -0.0
bss 115220 115220 0 0.0
rodata 96620 96620 0 0.0
text 528132 528040 -92 -0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 541835 541835 0 0.0
bss 52588 52588 0 0.0
rodata 50104 50104 0 0.0
text 376940 376940 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 910491 910411 -80 -0.0
bss 117060 117060 0 0.0
rodata 103608 103608 0 0.0
text 612372 612280 -92 -0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 907307 907211 -96 -0.0
bss 117088 117088 0 0.0
rodata 102864 102864 0 0.0
text 609908 609812 -96 -0.0
shell nrf52840dk_nrf52840 (read/write) 797919 797919 0 0.0
bss 109768 109768 0 0.0
rodata 78148 78148 0 0.0
text 533496 533496 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 710734 710734 0 0.0
bss 107656 107656 0 0.0
rodata 72448 72448 0 0.0
text 451172 451172 0 0.0
p6 all-clusters-app default (read/write) 2401624 2401496 -128 -0.0
.bss 116804 116804 0 0.0
.data 2592 2592 0 0.0
.text 1359888 1359760 -128 -0.0
light-app default (read/write) 2323648 2323520 -128 -0.0
.bss 105672 105672 0 0.0
.data 2384 2384 0 0.0
.text 1281912 1281784 -128 -0.0
lock-app default (read/write) 2295872 2295744 -128 -0.0
.bss 104552 104552 0 0.0
.data 2336 2336 0 0.0
.text 1254136 1254008 -128 -0.0
qpg lighting-app qpg6105+debug (read only) 533160 533064 -96 -0.0
(read/write) 146936 146936 0 0.0
.bss 86624 86624 0 0.0
.data 1004 1004 0 0.0
.text 527840 527744 -96 -0.0
lock-app qpg6105+debug (read only) 504936 504840 -96 -0.0
(read/write) 146940 146940 0 0.0
.bss 85760 85760 0 0.0
.data 952 952 0 0.0
.text 499616 499520 -96 -0.0
persistent-storage-app qpg6105+debug (read only) 106448 106448 0 0.0
(read/write) 146938 146938 0 0.0
.bss 36146 36146 0 0.0
.data 288 288 0 0.0
.text 101128 101128 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 834466 834378 -88 -0.0
bss 86924 86924 0 0.0
noinit 37160 37160 0 0.0
text 582710 582624 -86 -0.0

Copy link
Contributor

@austinh0 austinh0 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe the "Application" struct for ApplicationBasicCluster and ApplicationLauncherCluster is also duplicated, is it possible to fix that struct here as well?

@andy31415
Copy link
Contributor

/rebase

This is shared across the fixed label and user label clusters.

The struct definition is in the "detail" namespace, with alias
namespaces in the two clusters that use it.  Consumers are generally
expected to use the per-cluster aliases.
@github-actions
Copy link

github-actions bot commented Jan 7, 2022

PR #13380: Size comparison from c25c4b3 to 9fc02bf

Decreases (25 builds for efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section c25c4b3 9fc02bf change % change
efr32 lighting-app BRD4161A (read only) 829196 829084 -112 -0.0
.text 829188 829076 -112 -0.0
BRD4161A+rpc (read only) 816840 816712 -128 -0.0
.text 816832 816704 -128 -0.0
window-app BRD4161A (read only) 802660 802532 -128 -0.0
.text 802652 802524 -128 -0.0
esp32 all-clusters-app c3devkit (read only) 891834 891756 -78 -0.0
.flash.text 891834 891756 -78 -0.0
m5stack (read only) 951779 951735 -44 -0.0
.flash.text 946395 946351 -44 -0.0
k32w light k32w061+release (read/write) 655308 655212 -96 -0.0
.text 570884 570788 -96 -0.0
lock k32w061+release (read/write) 659584 659488 -96 -0.0
.text 574844 574748 -96 -0.0
linux chip-tool-ipv6only arm64 (read only) 7039660 7028092 -11568 -0.2
(read/write) 325985 325777 -208 -0.1
.data.rel.ro 209296 209136 -160 -0.1
.got 57040 56992 -48 -0.1
.rodata 384404 384308 -96 -0.0
.text 5961684 5950644 -11040 -0.2
thermostat-no-ble arm64 (read only) 2033708 2031676 -2032 -0.1
.text 1691040 1689008 -2032 -0.1
mbed all-clusters-app CY8CPROTO_062_4343W+release (read/write) 2348496 2348432 -64 -0.0
.text 1311072 1311008 -64 -0.0
lighting-app CY8CPROTO_062_4343W+release (read/write) 2330688 2330624 -64 -0.0
.text 1293288 1293224 -64 -0.0
lock-app CY8CPROTO_062_4343W+release (read/write) 2303840 2303776 -64 -0.0
.text 1266440 1266376 -64 -0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 937083 936987 -96 -0.0
text 633292 633200 -92 -0.0
nrf52840dk_nrf52840+rpc (read/write) 923479 923383 -96 -0.0
text 628604 628512 -92 -0.0
nrf5340dk_nrf5340_cpuapp (read/write) 848062 847966 -96 -0.0
text 550228 550132 -96 -0.0
lock-app nrf52840dk_nrf52840 (read/write) 909227 909131 -96 -0.0
text 611160 611064 -96 -0.0
nrf5340dk_nrf5340_cpuapp (read/write) 820386 820290 -96 -0.0
text 528132 528040 -92 -0.0
pump-app nrf52840dk_nrf52840 (read/write) 910491 910411 -80 -0.0
text 612372 612280 -92 -0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 907307 907211 -96 -0.0
text 609908 609812 -96 -0.0
p6 all-clusters-app default (read/write) 2401624 2401496 -128 -0.0
.text 1359888 1359760 -128 -0.0
light-app default (read/write) 2323648 2323520 -128 -0.0
.text 1281912 1281784 -128 -0.0
lock-app default (read/write) 2295872 2295744 -128 -0.0
.text 1254136 1254008 -128 -0.0
qpg lighting-app qpg6105+debug (read only) 533160 533064 -96 -0.0
.text 527840 527744 -96 -0.0
lock-app qpg6105+debug (read only) 504936 504840 -96 -0.0
.text 499616 499520 -96 -0.0
telink lighting-app tlsr9518adk80d (read/write) 834466 834378 -88 -0.0
text 582710 582624 -86 -0.0
Full report (31 builds for efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section c25c4b3 9fc02bf change % change
efr32 lighting-app BRD4161A (read only) 829196 829084 -112 -0.0
(read/write) 126996 126996 0 0.0
.bss 125120 125120 0 0.0
.data 1876 1876 0 0.0
.text 829188 829076 -112 -0.0
BRD4161A+rpc (read only) 816840 816712 -128 -0.0
(read/write) 143656 143656 0 0.0
.bss 141680 141680 0 0.0
.data 1976 1976 0 0.0
.text 816832 816704 -128 -0.0
window-app BRD4161A (read only) 802660 802532 -128 -0.0
(read/write) 125936 125936 0 0.0
.bss 124104 124104 0 0.0
.data 1832 1832 0 0.0
.text 802652 802524 -128 -0.0
esp32 all-clusters-app c3devkit (read only) 891834 891756 -78 -0.0
(read/write) 1314010 1314010 0 0.0
.dram0.bss 69464 69464 0 0.0
.dram0.data 14236 14236 0 0.0
.flash.rodata 177248 177248 0 0.0
.flash.text 891834 891756 -78 -0.0
.iram0.text 62254 62254 0 0.0
m5stack (read only) 951779 951735 -44 -0.0
(read/write) 445592 445592 0 0.0
.dram0.bss 73960 73960 0 0.0
.dram0.data 34064 34064 0 0.0
.flash.rodata 206560 206560 0 0.0
.flash.text 946395 946351 -44 -0.0
.iram0.text 122671 122671 0 0.0
k32w light k32w061+release (read/write) 655308 655212 -96 -0.0
.bss 76776 76776 0 0.0
.data 1848 1848 0 0.0
.text 570884 570788 -96 -0.0
lock k32w061+release (read/write) 659584 659488 -96 -0.0
.bss 77072 77072 0 0.0
.data 1868 1868 0 0.0
.text 574844 574748 -96 -0.0
linux chip-tool-ipv6only arm64 (read only) 7039660 7028092 -11568 -0.2
(read/write) 325985 325777 -208 -0.1
.bss 54865 54865 0 0.0
.data 1096 1096 0 0.0
.data.rel.ro 209296 209136 -160 -0.1
.dynamic 560 560 0 0.0
.got 57040 56992 -48 -0.1
.init 24 24 0 0.0
.init_array 168 168 0 0.0
.rodata 384404 384308 -96 -0.0
.text 5961684 5950644 -11040 -0.2
thermostat-no-ble arm64 (read only) 2033708 2031676 -2032 -0.1
(read/write) 145105 145105 0 0.0
.bss 64657 64657 0 0.0
.data 880 880 0 0.0
.data.rel.ro 72624 72624 0 0.0
.dynamic 560 560 0 0.0
.got 4008 4008 0 0.0
.init 24 24 0 0.0
.init_array 296 296 0 0.0
.rodata 128988 128988 0 0.0
.text 1691040 1689008 -2032 -0.1
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2348496 2348432 -64 -0.0
.bss 188724 188724 0 0.0
.data 5312 5312 0 0.0
.text 1311072 1311008 -64 -0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2330688 2330624 -64 -0.0
.bss 180544 180544 0 0.0
.data 5552 5552 0 0.0
.text 1293288 1293224 -64 -0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2303840 2303776 -64 -0.0
.bss 179592 179592 0 0.0
.data 5544 5544 0 0.0
.text 1266440 1266376 -64 -0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1140008 1140008 0 0.0
.bss 11756 11756 0 0.0
.data 4368 4368 0 0.0
.text 103392 103392 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2054256 2054256 0 0.0
.bss 157060 157060 0 0.0
.data 4864 4864 0 0.0
.text 1016856 1016856 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 937083 936987 -96 -0.0
bss 118112 118112 0 0.0
rodata 108120 108120 0 0.0
text 633292 633200 -92 -0.0
nrf52840dk_nrf52840+rpc (read/write) 923479 923383 -96 -0.0
bss 115156 115156 0 0.0
rodata 101548 101548 0 0.0
text 628604 628512 -92 -0.0
nrf5340dk_nrf5340_cpuapp (read/write) 848062 847966 -96 -0.0
bss 116004 116004 0 0.0
rodata 101296 101296 0 0.0
text 550228 550132 -96 -0.0
lock-app nrf52840dk_nrf52840 (read/write) 909227 909131 -96 -0.0
bss 117300 117300 0 0.0
rodata 103392 103392 0 0.0
text 611160 611064 -96 -0.0
nrf5340dk_nrf5340_cpuapp (read/write) 820386 820290 -96 -0.0
bss 115220 115220 0 0.0
rodata 96620 96620 0 0.0
text 528132 528040 -92 -0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 542351 542351 0 0.0
bss 52588 52588 0 0.0
rodata 50668 50668 0 0.0
text 376892 376892 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 910491 910411 -80 -0.0
bss 117060 117060 0 0.0
rodata 103608 103608 0 0.0
text 612372 612280 -92 -0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 907307 907211 -96 -0.0
bss 117088 117088 0 0.0
rodata 102864 102864 0 0.0
text 609908 609812 -96 -0.0
shell nrf52840dk_nrf52840 (read/write) 797919 797919 0 0.0
bss 109768 109768 0 0.0
rodata 78148 78148 0 0.0
text 533496 533496 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 710734 710734 0 0.0
bss 107656 107656 0 0.0
rodata 72448 72448 0 0.0
text 451172 451172 0 0.0
p6 all-clusters-app default (read/write) 2401624 2401496 -128 -0.0
.bss 116804 116804 0 0.0
.data 2592 2592 0 0.0
.text 1359888 1359760 -128 -0.0
light-app default (read/write) 2323648 2323520 -128 -0.0
.bss 105672 105672 0 0.0
.data 2384 2384 0 0.0
.text 1281912 1281784 -128 -0.0
lock-app default (read/write) 2295872 2295744 -128 -0.0
.bss 104552 104552 0 0.0
.data 2336 2336 0 0.0
.text 1254136 1254008 -128 -0.0
qpg lighting-app qpg6105+debug (read only) 533160 533064 -96 -0.0
(read/write) 146936 146936 0 0.0
.bss 86624 86624 0 0.0
.data 1004 1004 0 0.0
.text 527840 527744 -96 -0.0
lock-app qpg6105+debug (read only) 504936 504840 -96 -0.0
(read/write) 146940 146940 0 0.0
.bss 85760 85760 0 0.0
.data 952 952 0 0.0
.text 499616 499520 -96 -0.0
persistent-storage-app qpg6105+debug (read only) 106448 106448 0 0.0
(read/write) 146938 146938 0 0.0
.bss 36146 36146 0 0.0
.data 288 288 0 0.0
.text 101128 101128 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 834466 834378 -88 -0.0
bss 86924 86924 0 0.0
noinit 37160 37160 0 0.0
text 582710 582624 -86 -0.0

@bzbarsky-apple
Copy link
Contributor Author

I believe the "Application" struct for ApplicationBasicCluster and ApplicationLauncherCluster is also duplicated, is it possible to fix that struct here as well?

That's a different situation: those are different struct definitions in the spec, not a single struct definition used in both clusters. For that one, we should leave them as separate structs in the XML, to match the spec, and I guess we need to change one of the names to disambiguate them...

@bzbarsky-apple bzbarsky-apple merged commit 7d2771f into project-chip:master Jan 10, 2022
@bzbarsky-apple bzbarsky-apple deleted the label-structs branch January 10, 2022 20:57
step0035 pushed a commit to hank820/connectedhomeip that referenced this pull request Feb 8, 2022
This is shared across the fixed label and user label clusters.

The struct definition is in the "detail" namespace, with alias
namespaces in the two clusters that use it.  Consumers are generally
expected to use the per-cluster aliases.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants