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

Jump to bottom

Include missing Descriptor cluster in Secondary Network Commissioning… #22105

Merged
merged 1 commit into from
Aug 24, 2022
Merged

Include missing Descriptor cluster in Secondary Network Commissioning… #22105

merged 1 commit into from
Aug 24, 2022

Conversation

yufengwangca
Copy link
Contributor

… Device Type

Problem

What is being fixed? Examples:

  • According spec, we have five base clusters defined for Matter
Base Cluster Requirements for Matter
Each device type definition SHALL include these clusters, as a minimum set, based on the conformance defined below. This conformance table SHALL assume the Matter conformance condition is TRUE (in Conformance column).
Descriptor
Binding
FixedLabel
UserLabel

Among those 5 Matter base clusters, Descriptor is mandatory and we need to include this cluster for each Device Type defination.

Change overview

Include missing Descriptor cluster in Secondary Network Commissioning Device Type

Testing

How was this tested? (at least one bullet point required)

  • xml update only.

@github-actions github-actions bot added the app label Aug 23, 2022
@github-actions
Copy link

github-actions bot commented Aug 23, 2022 •
edited
Loading

PR #22105: Size comparison from 0f9615d to 75d5d3f

Increases (8 builds for bl602, cc13x2_26x2, psoc6, telink)
platform target config section 0f9615d 75d5d3f change % change
bl602 lighting-app bl602+rpc (read/write) 1429578 1429586 8 0.0
.text 1082852 1082856 4 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 672995 673003 8 0.0
.text 583844 583852 8 0.0
lock-mtd LP_CC2652R7 (read/write) 180512 180520 8 0.0
pump-app LP_CC2652R7 (read only) 684783 684791 8 0.0
.text 594340 594348 8 0.0
psoc6 all-clusters-minimal cy8ckit_062s2_43012 .debug_info 26381240 26381241 1 0.0
lock cy8ckit_062s2_43012 .debug_info 22200965 22200966 1 0.0
telink light-switch-app tlsr9518adk80d text 571318 571320 2 0.0
lighting-app tlsr9518adk80d text 589410 589412 2 0.0
Decreases (5 builds for cc13x2_26x2, cyw30739, esp32)
platform target config section 0f9615d 75d5d3f change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read/write) 178500 178492 -8 -0.0
lock-mtd LP_CC2652R7 (read only) 656879 656871 -8 -0.0
.text 554632 554624 -8 -0.0
pump-app LP_CC2652R7 (read/write) 157728 157720 -8 -0.0
cyw30739 ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 599682 599674 -8 -0.0
.app_xip_area 477060 477052 -8 -0.0
esp32 all-clusters-app c3devkit (read only) 1031288 1031286 -2 -0.0
.flash.text 1031288 1031286 -2 -0.0
Full report (43 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, telink)
platform target config section 0f9615d 75d5d3f change % change
bl602 lighting-app bl602 (read/write) 1383930 1383930 0 0.0
.bss 120266 120266 0 0.0
.data 4480 4480 0 0.0
.text 1051096 1051096 0 0.0
bl602+rpc (read/write) 1429578 1429586 8 0.0
.bss 127706 127706 0 0.0
.data 4600 4600 0 0.0
.text 1082852 1082856 4 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 672995 673003 8 0.0
(read/write) 178500 178492 -8 -0.0
.bss 74388 74388 0 0.0
.data 3372 3372 0 0.0
.rodata 88835 88835 0 0.0
.text 583844 583852 8 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 637723 637723 0 0.0
(read/write) 157948 157948 0 0.0
.bss 73660 73660 0 0.0
.data 3372 3372 0 0.0
.rodata 77979 77979 0 0.0
.text 559420 559420 0 0.0
lock-ftd LP_CC2652R7 (read only) 674119 674119 0 0.0
(read/write) 167584 167584 0 0.0
.bss 71484 71484 0 0.0
.data 3296 3296 0 0.0
.rodata 76671 76671 0 0.0
.text 596968 596968 0 0.0
lock-mtd LP_CC2652R7 (read only) 656879 656871 -8 -0.0
(read/write) 180512 180520 8 0.0
.bss 67172 67172 0 0.0
.data 3296 3296 0 0.0
.rodata 101767 101767 0 0.0
.text 554632 554624 -8 -0.0
pump-app LP_CC2652R7 (read only) 684783 684791 8 0.0
(read/write) 157728 157720 -8 -0.0
.bss 71524 71524 0 0.0
.data 3296 3296 0 0.0
.rodata 89959 89959 0 0.0
.text 594340 594348 8 0.0
pump-controller-app LP_CC2652R7 (read only) 669299 669299 0 0.0
(read/write) 173332 173332 0 0.0
.bss 71644 71644 0 0.0
.data 3292 3292 0 0.0
.rodata 85515 85515 0 0.0
.text 583304 583304 0 0.0
shell LP_CC2652R7 (read only) 665694 665694 0 0.0
(read/write) 181320 181320 0 0.0
.bss 76708 76708 0 0.0
.data 3376 3376 0 0.0
.rodata 85782 85782 0 0.0
.text 579596 579596 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 586754 586754 0 0.0
.app_xip_area 463412 463412 0 0.0
.bss 65776 65776 0 0.0
.data 744 744 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 592546 592546 0 0.0
.app_xip_area 464420 464420 0 0.0
.bss 70560 70560 0 0.0
.data 748 748 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 599682 599674 -8 -0.0
.app_xip_area 477060 477052 -8 -0.0
.bss 65088 65088 0 0.0
.data 716 716 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read/write) 1107636 1107636 0 0.0
.bss 136332 136332 0 0.0
.data 2072 2072 0 0.0
.text 969212 969212 0 0.0
BRD4161A+rpc (read/write) 971588 971588 0 0.0
.bss 150844 150844 0 0.0
.data 2252 2252 0 0.0
.text 818468 818468 0 0.0
BRD4161A+rs911x (read/write) 1000248 1000248 0 0.0
.bss 169088 169088 0 0.0
.data 2056 2056 0 0.0
.text 829084 829084 0 0.0
lock-app BRD4161A+wf200 (read/write) 1149420 1149420 0 0.0
.bss 152168 152168 0 0.0
.data 2064 2064 0 0.0
.text 995168 995168 0 0.0
window-app BRD4161A (read/write) 1098932 1098932 0 0.0
.bss 137772 137772 0 0.0
.data 2096 2096 0 0.0
.text 959044 959044 0 0.0
esp32 all-clusters-app c3devkit (read only) 1031288 1031286 -2 -0.0
(read/write) 1489642 1489642 0 0.0
.dram0.bss 71144 71144 0 0.0
.dram0.data 14600 14600 0 0.0
.flash.rodata 218456 218456 0 0.0
.flash.text 1031288 1031286 -2 -0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1084403 1084403 0 0.0
(read/write) 491560 491560 0 0.0
.dram0.bss 76648 76648 0 0.0
.dram0.data 34144 34144 0 0.0
.flash.rodata 248772 248772 0 0.0
.flash.text 1079019 1079019 0 0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w0+release (read/write) 646676 646676 0 0.0
.bss 70400 70400 0 0.0
.data 2068 2068 0 0.0
.text 571480 571480 0 0.0
lock k32w0+release (read/write) 704220 704220 0 0.0
.bss 70864 70864 0 0.0
.data 2076 2076 0 0.0
.text 628552 628552 0 0.0
linux all-clusters-app debug (read only) 3038505 3038505 0 0.0
(read/write) 156024 156024 0 0.0
.bss 61920 61920 0 0.0
.data 2096 2096 0 0.0
.data.rel.ro 85624 85624 0 0.0
.dynamic 608 608 0 0.0
.got 4568 4568 0 0.0
.init 27 27 0 0.0
.init_array 1168 1168 0 0.0
.rodata 274667 274667 0 0.0
.text 2584690 2584690 0 0.0
all-clusters-minimal-app debug (read only) 2874369 2874369 0 0.0
(read/write) 147624 147624 0 0.0
.bss 61152 61152 0 0.0
.data 2064 2064 0 0.0
.data.rel.ro 78120 78120 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 1152 1152 0 0.0
.rodata 274859 274859 0 0.0
.text 2423138 2423138 0 0.0
bridge-app debug+rpc (read only) 2373017 2373017 0 0.0
(read/write) 127584 127584 0 0.0
.bss 50656 50656 0 0.0
.data 3600 3600 0 0.0
.data.rel.ro 67464 67464 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 824 824 0 0.0
.rodata 203496 203496 0 0.0
.text 2006898 2006898 0 0.0
chip-tool debug (read only) 10878753 10878753 0 0.0
(read/write) 651328 651328 0 0.0
.bss 25240 25240 0 0.0
.data 3266 3266 0 0.0
.data.rel.ro 616312 616312 0 0.0
.dynamic 608 608 0 0.0
.got 5096 5096 0 0.0
.init 27 27 0 0.0
.init_array 768 768 0 0.0
.rodata 562965 562965 0 0.0
.text 8809060 8809060 0 0.0
chip-tool-ipv6only arm64 (read only) 10261012 10261012 0 0.0
(read/write) 699169 699169 0 0.0
.bss 33297 33297 0 0.0
.data 3272 3272 0 0.0
.data.rel.ro 643848 643848 0 0.0
.dynamic 560 560 0 0.0
.got 13784 13784 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 493572 493572 0 0.0
.text 8129284 8129284 0 0.0
lighting-app debug+rpc (read only) 2597849 2597849 0 0.0
(read/write) 130304 130304 0 0.0
.bss 49760 49760 0 0.0
.data 2096 2096 0 0.0
.data.rel.ro 72488 72488 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 920 920 0 0.0
.rodata 220400 220400 0 0.0
.text 2206546 2206546 0 0.0
lock-app debug (read only) 2580945 2580945 0 0.0
(read/write) 125512 125512 0 0.0
.bss 48288 48288 0 0.0
.data 1712 1712 0 0.0
.data.rel.ro 69512 69512 0 0.0
.dynamic 608 608 0 0.0
.got 4464 4464 0 0.0
.init 27 27 0 0.0
.init_array 896 896 0 0.0
.rodata 237360 237360 0 0.0
.text 2176930 2176930 0 0.0
ota-provider-app debug (read only) 2358105 2358105 0 0.0
(read/write) 118976 118976 0 0.0
.bss 47808 47808 0 0.0
.data 1936 1936 0 0.0
.data.rel.ro 63336 63336 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 760 760 0 0.0
.rodata 209336 209336 0 0.0
.text 1985298 1985298 0 0.0
ota-requestor-app debug (read only) 2523705 2523705 0 0.0
(read/write) 127384 127384 0 0.0
.bss 50368 50368 0 0.0
.data 2304 2304 0 0.0
.data.rel.ro 68744 68744 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 848 848 0 0.0
.rodata 216160 216160 0 0.0
.text 2134930 2134930 0 0.0
shell debug (read only) 2606809 2606809 0 0.0
(read/write) 142144 142144 0 0.0
.bss 57832 57832 0 0.0
.data 1264 1264 0 0.0
.data.rel.ro 77224 77224 0 0.0
.dynamic 608 608 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 1040 1040 0 0.0
.rodata 234770 234770 0 0.0
.text 2213618 2213618 0 0.0
thermostat-no-ble arm64 (read only) 2357300 2357300 0 0.0
(read/write) 141825 141825 0 0.0
.bss 55345 55345 0 0.0
.data 1672 1672 0 0.0
.data.rel.ro 75984 75984 0 0.0
.dynamic 560 560 0 0.0
.got 5048 5048 0 0.0
.init 24 24 0 0.0
.init_array 408 408 0 0.0
.rodata 140620 140620 0 0.0
.text 1978960 1978960 0 0.0
tv-app debug (read only) 3183433 3183433 0 0.0
(read/write) 257968 257968 0 0.0
.bss 167480 167480 0 0.0
.data 4736 4736 0 0.0
.data.rel.ro 79184 79184 0 0.0
.dynamic 608 608 0 0.0
.got 4856 4856 0 0.0
.init 27 27 0 0.0
.init_array 1072 1072 0 0.0
.rodata 259112 259112 0 0.0
.text 2734578 2734578 0 0.0
tv-casting-app debug (read only) 5503985 5503985 0 0.0
(read/write) 160464 160464 0 0.0
.bss 51480 51480 0 0.0
.data 2432 2432 0 0.0
.data.rel.ro 100120 100120 0 0.0
.dynamic 608 608 0 0.0
.got 4776 4776 0 0.0
.init 27 27 0 0.0
.init_array 1040 1040 0 0.0
.rodata 344305 344305 0 0.0
.text 4888066 4888066 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2454536 2454536 0 0.0
.bss 215044 215044 0 0.0
.data 5872 5872 0 0.0
.text 1417180 1417180 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1180799 1180799 0 0.0
bss 143745 143745 0 0.0
rodata 143360 143360 0 0.0
text 814736 814736 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1159883 1159883 0 0.0
bss 142972 142972 0 0.0
rodata 134948 134948 0 0.0
text 803144 803144 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 (read only) 881000 881000 0 0.0
(read/write) 1700996 1700996 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 149688 149688 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2656 2656 0 0.0
.debug_abbrev 1217459 1217459 0 0.0
.debug_aranges 111544 111544 0 0.0
.debug_frame 372408 372408 0 0.0
.debug_info 26644546 26644546 0 0.0
.debug_line 3647170 3647170 0 0.0
.debug_loc 3562765 3562765 0 0.0
.debug_ranges 336664 336664 0 0.0
.debug_str 3394161 3394161 0 0.0
.heap 881000 881000 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 569346 569346 0 0.0
.symtab 420416 420416 0 0.0
.text 1540264 1540264 0 0.0
.zero.table 8 8 0 0.0
text 0 0 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 (read only) 881736 881736 0 0.0
(read/write) 1644204 1644204 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 148952 148952 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2656 2656 0 0.0
.debug_abbrev 1209298 1209298 0 0.0
.debug_aranges 111016 111016 0 0.0
.debug_frame 375488 375488 0 0.0
.debug_info 26381240 26381241 1 0.0
.debug_line 3667574 3667574 0 0.0
.debug_loc 3550402 3550402 0 0.0
.debug_ranges 335280 335280 0 0.0
.debug_str 3383150 3383150 0 0.0
.heap 881736 881736 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 533820 533820 0 0.0
.symtab 407008 407008 0 0.0
.text 1484208 1484208 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
light cy8ckit_062s2_43012 (read only) 890080 890080 0 0.0
(read/write) 1561436 1561436 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 140816 140816 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2448 2448 0 0.0
.debug_abbrev 1043971 1043971 0 0.0
.debug_aranges 103184 103184 0 0.0
.debug_frame 345732 345732 0 0.0
.debug_info 21845798 21845798 0 0.0
.debug_line 3238758 3238758 0 0.0
.debug_loc 3249979 3249979 0 0.0
.debug_ranges 301120 301120 0 0.0
.debug_str 3189244 3189244 0 0.0
.heap 890080 890080 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 467101 467101 0 0.0
.symtab 374064 374064 0 0.0
.text 1409784 1409784 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
lock cy8ckit_062s2_43012 (read only) 885584 885584 0 0.0
(read/write) 1598724 1598724 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 145296 145296 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2464 2464 0 0.0
.debug_abbrev 1051147 1051147 0 0.0
.debug_aranges 103856 103856 0 0.0
.debug_frame 348556 348556 0 0.0
.debug_info 22200965 22200966 1 0.0
.debug_line 3247442 3247442 0 0.0
.debug_loc 3290068 3290068 0 0.0
.debug_ranges 304536 304536 0 0.0
.debug_str 3216675 3216675 0 0.0
.heap 885584 885584 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 473342 473342 0 0.0
.symtab 377248 377248 0 0.0
.text 1442576 1442576 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 808744 808744 0 0.0
bss 71448 71448 0 0.0
noinit 43488 43488 0 0.0
text 571318 571320 2 0.0
lighting-app tlsr9518adk80d (read/write) 830680 830680 0 0.0
bss 72304 72304 0 0.0
noinit 43488 43488 0 0.0
text 589410 589412 2 0.0

@yufengwangca yufengwangca merged commit 83e1bbf into project-chip:master Aug 24, 2022
@yufengwangca yufengwangca deleted the pr/devicetype/descriptor branch August 24, 2022 17:59
isiu-apple pushed a commit to isiu-apple/connectedhomeip that referenced this pull request Sep 16, 2022
@yufengwangca @isiu-apple
Include missing Descriptor cluster in Secondary Network Commissioning…
951af23 
… Device Type (project-chip#22105)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mrjerryjohns mrjerryjohns mrjerryjohns left review comments

@jmartinez-silabs jmartinez-silabs jmartinez-silabs approved these changes

@andy31415 andy31415 andy31415 approved these changes

@anush-apple anush-apple Awaiting requested review from anush-apple

@arkq arkq Awaiting requested review from arkq

@Byungjoo-Lee Byungjoo-Lee Awaiting requested review from Byungjoo-Lee

@bzbarsky-apple bzbarsky-apple Awaiting requested review from bzbarsky-apple

@carol-apple carol-apple Awaiting requested review from carol-apple

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@Damian-Nordic Damian-Nordic Awaiting requested review from Damian-Nordic

@dhrishi dhrishi Awaiting requested review from dhrishi

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@erjiaqing erjiaqing Awaiting requested review from erjiaqing

@franck-apple franck-apple Awaiting requested review from franck-apple

@gjc13 gjc13 Awaiting requested review from gjc13

@harimau-qirex harimau-qirex Awaiting requested review from harimau-qirex

@harsha-rajendran harsha-rajendran Awaiting requested review from harsha-rajendran

@hawk248 hawk248 Awaiting requested review from hawk248

@isiu-apple isiu-apple Awaiting requested review from isiu-apple

@jelderton jelderton Awaiting requested review from jelderton

@jepenven-silabs jepenven-silabs Awaiting requested review from jepenven-silabs

@jtung-apple jtung-apple Awaiting requested review from jtung-apple

@kghost kghost Awaiting requested review from kghost

@lazarkov lazarkov Awaiting requested review from lazarkov

@LuDuda LuDuda Awaiting requested review from LuDuda

@mlepage-google mlepage-google Awaiting requested review from mlepage-google

@msandstedt msandstedt Awaiting requested review from msandstedt

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tcarmelveilleux tcarmelveilleux Awaiting requested review from tcarmelveilleux

@tecimovic tecimovic Awaiting requested review from tecimovic

@tehampson tehampson Awaiting requested review from tehampson

@turon turon Awaiting requested review from turon

@vijs vijs Awaiting requested review from vijs

@vivien-apple vivien-apple Awaiting requested review from vivien-apple

@wbschiller wbschiller Awaiting requested review from wbschiller

@woody-apple woody-apple Awaiting requested review from woody-apple

@xylophone21 xylophone21 Awaiting requested review from xylophone21

@yunhanw-google yunhanw-google Awaiting requested review from yunhanw-google

Assignees
No one assigned
Labels
app review - approved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Audit matter-devices.xml for sanity
4 participants
@yufengwangca @andy31415 @mrjerryjohns @jmartinez-silabs