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

Update CommissionerControlCluster xml definition to align with spec #35272

Merged
merged 2 commits into from
Aug 29, 2024

Conversation

yufengwangca
Copy link
Contributor

Update CommissionerControlCluster xml definition to align with spec change:
https://github.com/CHIP-Specifications/connectedhomeip-spec/pull/10342

Copy link

semanticdiff-com bot commented Aug 29, 2024

Review changes with SemanticDiff.

Analyzed 5 of 19 files.

Overall, the semantic diff is 1% smaller than the GitHub diff.

Filename Status
zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h Unsupported file format
zzz_generated/chip-tool/zap-generated/cluster/Commands.h Unsupported file format
zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp Unsupported file format
zzz_generated/app-common/app-common/zap-generated/cluster-objects.h Unsupported file format
src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h Unsupported file format
src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm Unsupported file format
✔️ src/controller/python/chip/clusters/CHIPClusters.py Analyzed
✔️ src/controller/python/chip/clusters/Objects.py Analyzed
src/controller/java/generated/java/matter/controller/cluster/clusters/CommissionerControlCluster.kt Unsupported file format
✔️ src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java 0.24% smaller
✔️ src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java Analyzed
✔️ src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java Analyzed
src/controller/data_model/controller-clusters.matter Unsupported file format
src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml Unsupported file format
src/app/clusters/commissioner-control-server/commissioner-control-server.cpp Unsupported file format
src/app/clusters/commissioner-control-server/commissioner-control-server.h Unsupported file format
examples/fabric-bridge-app/linux/CommissionerControl.cpp Unsupported file format
examples/fabric-bridge-app/linux/include/CommissionerControl.h Unsupported file format
examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.matter Unsupported file format

Copy link

github-actions bot commented Aug 29, 2024

PR #35272: Size comparison from c14a370 to 3a88fed

Full report (61 builds for bl602, bl702, bl702l, cyw30739, efr32, esp32, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
platform target config section c14a370 3a88fed change % change
bl602 lighting-app bl602 FLASH 1279022 1279022 0 0.0
RAM 95880 95880 0 0.0
bl602+mfd FLASH 1292876 1292876 0 0.0
RAM 96024 96024 0 0.0
bl602+rpc FLASH 1317986 1317986 0 0.0
RAM 104304 104304 0 0.0
bl702 lighting-app bl702 FLASH 944636 944636 0 0.0
RAM 15209 15209 0 0.0
bl702+mfd FLASH 947036 947036 0 0.0
RAM 15353 15353 0 0.0
bl702+rpc FLASH 1039692 1039692 0 0.0
RAM 24221 24221 0 0.0
bl706-eth FLASH 647452 647452 0 0.0
RAM 25305 25305 0 0.0
bl706-wifi FLASH 894866 894866 0 0.0
RAM 14525 14525 0 0.0
bl702l lighting-app bl702l FLASH 961040 961040 0 0.0
RAM 16868 16868 0 0.0
bl702l+mfd FLASH 963662 963662 0 0.0
RAM 17012 17012 0 0.0
cyw30739 light CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 672673 672673 0 0.0
RAM 78300 78300 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 692533 692533 0 0.0
RAM 80932 80932 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 692533 692533 0 0.0
RAM 80932 80932 0 0.0
CYW930739M2EVB-02 unknown 2040 2040 0 0.0
FLASH 649469 649469 0 0.0
RAM 73368 73368 0 0.0
light-switch CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 611113 611113 0 0.0
RAM 71292 71292 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 630749 630749 0 0.0
RAM 73844 73844 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 630749 630749 0 0.0
RAM 73844 73844 0 0.0
lock CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 629153 629153 0 0.0
RAM 74308 74308 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 648861 648861 0 0.0
RAM 76860 76860 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 648861 648861 0 0.0
RAM 76860 76860 0 0.0
thermostat CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 603093 603093 0 0.0
RAM 68348 68348 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 622953 622953 0 0.0
RAM 70980 70980 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 622953 622953 0 0.0
RAM 70980 70980 0 0.0
efr32 lighting-app BRD4187C FLASH 930748 930740 -8 -0.0
RAM 135096 135096 0 0.0
lock-app BRD4338a FLASH 740732 740724 -8 -0.0
RAM 209516 209516 0 0.0
window-app BRD4187C FLASH 1015808 1015800 -8 -0.0
RAM 127036 127036 0 0.0
esp32 all-clusters-app c3devkit DRAM 94200 94200 0 0.0
FLASH 1534376 1534376 0 0.0
IRAM 82538 82538 0 0.0
m5stack DRAM 115136 115136 0 0.0
FLASH 1544390 1544382 -8 -0.0
IRAM 117039 117039 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 910676 910676 0 0.0
RAM 142219 142219 0 0.0
nrf7002dk_nrf5340_cpuapp FLASH 882632 882632 0 0.0
RAM 140358 140358 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 FLASH 841616 841616 0 0.0
RAM 141038 141038 0 0.0
nxp contact k32w0+release FLASH 577732 577732 0 0.0
RAM 70444 70444 0 0.0
k32w1+release FLASH 590352 590352 0 0.0
RAM 62488 62488 0 0.0
light k32w0+release FLASH 613160 613160 0 0.0
RAM 69916 69916 0 0.0
k32w1+release FLASH 675024 675024 0 0.0
RAM 71472 71472 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1641596 1641596 0 0.0
RAM 210920 210920 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1545132 1545132 0 0.0
RAM 207632 207632 0 0.0
light cy8ckit_062s2_43012 FLASH 1464636 1464636 0 0.0
RAM 200728 200728 0 0.0
lock cy8ckit_062s2_43012 FLASH 1463524 1463524 0 0.0
RAM 225064 225064 0 0.0
qpg lighting-app qpg6105+debug FLASH 656300 656300 0 0.0
RAM 105128 105128 0 0.0
lock-app qpg6105+debug FLASH 614144 614144 0 0.0
RAM 99612 99612 0 0.0
stm32 light STM32WB5MM-DK FLASH 478640 478640 0 0.0
RAM 144716 144716 0 0.0
telink air-quality-sensor-app tlsr9528a_retention FLASH 620414 620414 0 0.0
RAM 50932 50932 0 0.0
all-clusters-app tlsr9118bdk40d FLASH 682574 682574 0 0.0
RAM 149552 149552 0 0.0
all-clusters-minimal-app tlsr9528a FLASH 774652 774652 0 0.0
RAM 110712 110712 0 0.0
bridge-app tlsr9258a FLASH 679144 679144 0 0.0
RAM 91588 91588 0 0.0
contact-sensor-app tlsr9528a_retention FLASH 622006 622006 0 0.0
RAM 50972 50972 0 0.0
light-switch-app-ota-shell-factory-data tlsr9528a FLASH 708016 708016 0 0.0
RAM 74312 74312 0 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 620950 620950 0 0.0
RAM 145532 145532 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 807082 807082 0 0.0
RAM 99456 99456 0 0.0
lock-app-dfu tlsr9528a FLASH 654988 654988 0 0.0
RAM 67008 67008 0 0.0
ota-requestor-app tlsr9258a FLASH 697272 697272 0 0.0
RAM 91272 91272 0 0.0
pump-app-usb tlsr9518adk80d FLASH 631452 631452 0 0.0
RAM 55752 55752 0 0.0
pump-controller-app tlsr9518adk80d FLASH 608962 608962 0 0.0
RAM 52996 52996 0 0.0
shell tlsr9518adk80d FLASH 466890 466890 0 0.0
RAM 68660 68660 0 0.0
smoke_co_alarm-app tlsr9528a_retention FLASH 628792 628792 0 0.0
RAM 52692 52692 0 0.0
temperature-measurement-app-mars-ota tlsr9518adk80d FLASH 652944 652944 0 0.0
RAM 56632 56632 0 0.0
thermostat tlsr9518adk80d FLASH 635450 635450 0 0.0
RAM 53400 53400 0 0.0
window-covering tlsr9118bdk40d FLASH 522948 522948 0 0.0
RAM 98532 98532 0 0.0
tizen all-clusters-app arm unknown 4848 4848 0 0.0
FLASH 1710388 1710388 0 0.0
RAM 89376 89376 0 0.0
chip-tool-ubsan arm unknown 10272 10272 0 0.0
FLASH 17508630 17507342 -1288 -0.0
RAM 7600684 7600020 -664 -0.0

@tehampson
Copy link
Contributor

I am assuming update to src/app/clusters/commissioner-control-server/commissioner-control-server.h and example apps will be done in a follow up PR?

@bzbarsky-apple
Copy link
Contributor

The changes to .cpp to stop using the now-nonexistent fields have to happen in this PR to pass CI.

Copy link

github-actions bot commented Aug 29, 2024

PR #35272: Size comparison from c14a370 to 1311f3b

Full report (77 builds for bl602, bl702, bl702l, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
platform target config section c14a370 1311f3b change % change
bl602 lighting-app bl602 FLASH 1279022 1279022 0 0.0
RAM 95880 95880 0 0.0
bl602+mfd FLASH 1292876 1292876 0 0.0
RAM 96024 96024 0 0.0
bl602+rpc FLASH 1317986 1317986 0 0.0
RAM 104304 104304 0 0.0
bl702 lighting-app bl702 FLASH 944636 944636 0 0.0
RAM 15209 15209 0 0.0
bl702+mfd FLASH 947036 947036 0 0.0
RAM 15353 15353 0 0.0
bl702+rpc FLASH 1039692 1039692 0 0.0
RAM 24221 24221 0 0.0
bl706-eth FLASH 647452 647452 0 0.0
RAM 25305 25305 0 0.0
bl706-wifi FLASH 894866 894866 0 0.0
RAM 14525 14525 0 0.0
bl702l lighting-app bl702l FLASH 961040 961040 0 0.0
RAM 16868 16868 0 0.0
bl702l+mfd FLASH 963662 963662 0 0.0
RAM 17012 17012 0 0.0
cyw30739 light CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 672673 672673 0 0.0
RAM 78300 78300 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 692533 692533 0 0.0
RAM 80932 80932 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 692533 692533 0 0.0
RAM 80932 80932 0 0.0
CYW930739M2EVB-02 unknown 2040 2040 0 0.0
FLASH 649469 649469 0 0.0
RAM 73368 73368 0 0.0
light-switch CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 611113 611113 0 0.0
RAM 71292 71292 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 630749 630749 0 0.0
RAM 73844 73844 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 630749 630749 0 0.0
RAM 73844 73844 0 0.0
lock CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 629153 629153 0 0.0
RAM 74308 74308 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 648861 648861 0 0.0
RAM 76860 76860 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 648861 648861 0 0.0
RAM 76860 76860 0 0.0
thermostat CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 603093 603093 0 0.0
RAM 68348 68348 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 622953 622953 0 0.0
RAM 70980 70980 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 622953 622953 0 0.0
RAM 70980 70980 0 0.0
efr32 lighting-app BRD4187C FLASH 930748 930740 -8 -0.0
RAM 135096 135096 0 0.0
lock-app BRD4338a FLASH 740732 740724 -8 -0.0
RAM 209516 209516 0 0.0
window-app BRD4187C FLASH 1015808 1015800 -8 -0.0
RAM 127036 127036 0 0.0
esp32 all-clusters-app c3devkit DRAM 94200 94200 0 0.0
FLASH 1534376 1534376 0 0.0
IRAM 82538 82538 0 0.0
m5stack DRAM 115136 115136 0 0.0
FLASH 1544390 1544382 -8 -0.0
IRAM 117039 117039 0 0.0
linux air-purifier-app debug unknown 4624 4624 0 0.0
FLASH 2760195 2760195 0 0.0
RAM 128520 128520 0 0.0
all-clusters-app debug unknown 5408 5408 0 0.0
FLASH 6053622 6053590 -32 -0.0
RAM 510376 510312 -64 -0.0
all-clusters-minimal-app debug unknown 5304 5304 0 0.0
FLASH 5383170 5383170 0 0.0
RAM 240232 240232 0 0.0
bridge-app debug unknown 5288 5288 0 0.0
FLASH 4730458 4730458 0 0.0
RAM 216952 216952 0 0.0
chip-tool debug unknown 5832 5832 0 0.0
FLASH 12648900 12648598 -302 -0.0
RAM 558418 558354 -64 -0.0
chip-tool-ipv6only arm64 unknown 20352 20352 0 0.0
FLASH 11321036 11320764 -272 -0.0
RAM 608488 608424 -64 -0.0
fabric-admin debug unknown 5664 5664 0 0.0
FLASH 10927255 10926921 -334 -0.0
RAM 556634 556570 -64 -0.0
fabric-bridge-app debug unknown 4520 4520 0 0.0
FLASH 4554366 4552770 -1596 -0.0
RAM 203856 203856 0 0.0
lighting-app debug+rpc+ui unknown 5936 5936 0 0.0
FLASH 5666705 5666705 0 0.0
RAM 228056 228056 0 0.0
lock-app debug unknown 5224 5224 0 0.0
FLASH 4785804 4785804 0 0.0
RAM 203768 203768 0 0.0
ota-provider-app debug unknown 4600 4600 0 0.0
FLASH 4425278 4425278 0 0.0
RAM 197752 197752 0 0.0
ota-requestor-app debug unknown 4536 4536 0 0.0
FLASH 4563896 4563896 0 0.0
RAM 202288 202288 0 0.0
shell debug unknown 4176 4176 0 0.0
FLASH 3085661 3085661 0 0.0
RAM 159040 159040 0 0.0
thermostat-no-ble arm64 unknown 9296 9296 0 0.0
FLASH 4323356 4323356 0 0.0
RAM 241888 241888 0 0.0
tv-app debug unknown 5504 5504 0 0.0
FLASH 6010325 6010293 -32 -0.0
RAM 583256 583192 -64 -0.0
tv-casting-app debug unknown 5168 5168 0 0.0
FLASH 10853725 10853421 -304 -0.0
RAM 645832 645768 -64 -0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 910676 910676 0 0.0
RAM 142219 142219 0 0.0
nrf7002dk_nrf5340_cpuapp FLASH 882632 882632 0 0.0
RAM 140358 140358 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 FLASH 841616 841616 0 0.0
RAM 141038 141038 0 0.0
nxp contact k32w0+release FLASH 577732 577732 0 0.0
RAM 70444 70444 0 0.0
k32w1+release FLASH 590352 590352 0 0.0
RAM 62488 62488 0 0.0
light k32w0+release FLASH 613160 613160 0 0.0
RAM 69916 69916 0 0.0
k32w1+release FLASH 675024 675024 0 0.0
RAM 71472 71472 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1641596 1641596 0 0.0
RAM 210920 210920 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1545132 1545132 0 0.0
RAM 207632 207632 0 0.0
light cy8ckit_062s2_43012 FLASH 1464636 1464636 0 0.0
RAM 200728 200728 0 0.0
lock cy8ckit_062s2_43012 FLASH 1463524 1463524 0 0.0
RAM 225064 225064 0 0.0
qpg lighting-app qpg6105+debug FLASH 656300 656300 0 0.0
RAM 105128 105128 0 0.0
lock-app qpg6105+debug FLASH 614144 614144 0 0.0
RAM 99612 99612 0 0.0
stm32 light STM32WB5MM-DK FLASH 478640 478640 0 0.0
RAM 144716 144716 0 0.0
telink air-quality-sensor-app tlsr9528a_retention FLASH 620414 620414 0 0.0
RAM 50932 50932 0 0.0
all-clusters-app tlsr9118bdk40d FLASH 682574 682574 0 0.0
RAM 149552 149552 0 0.0
all-clusters-minimal-app tlsr9528a FLASH 774652 774652 0 0.0
RAM 110712 110712 0 0.0
bridge-app tlsr9258a FLASH 679144 679144 0 0.0
RAM 91588 91588 0 0.0
contact-sensor-app tlsr9528a_retention FLASH 622006 622006 0 0.0
RAM 50972 50972 0 0.0
light-switch-app-ota-shell-factory-data tlsr9528a FLASH 708016 708016 0 0.0
RAM 74312 74312 0 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 620950 620950 0 0.0
RAM 145532 145532 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 807082 807082 0 0.0
RAM 99456 99456 0 0.0
lock-app-dfu tlsr9528a FLASH 654988 654988 0 0.0
RAM 67008 67008 0 0.0
ota-requestor-app tlsr9258a FLASH 697272 697272 0 0.0
RAM 91272 91272 0 0.0
pump-app-usb tlsr9518adk80d FLASH 631452 631452 0 0.0
RAM 55752 55752 0 0.0
pump-controller-app tlsr9518adk80d FLASH 608962 608962 0 0.0
RAM 52996 52996 0 0.0
shell tlsr9518adk80d FLASH 466890 466890 0 0.0
RAM 68660 68660 0 0.0
smoke_co_alarm-app tlsr9528a_retention FLASH 628792 628792 0 0.0
RAM 52692 52692 0 0.0
temperature-measurement-app-mars-ota tlsr9518adk80d FLASH 652944 652944 0 0.0
RAM 56632 56632 0 0.0
thermostat tlsr9518adk80d FLASH 635450 635450 0 0.0
RAM 53400 53400 0 0.0
window-covering tlsr9118bdk40d FLASH 522948 522948 0 0.0
RAM 98532 98532 0 0.0
tizen all-clusters-app arm unknown 4848 4848 0 0.0
FLASH 1710388 1710388 0 0.0
RAM 89376 89376 0 0.0
chip-tool-ubsan arm unknown 10272 10272 0 0.0
FLASH 17508630 17507342 -1288 -0.0
RAM 7600684 7600020 -664 -0.0

@mergify mergify bot merged commit 203f03a into project-chip:master Aug 29, 2024
70 checks passed
@yufengwangca yufengwangca deleted the pr/cluster/cctrl branch August 29, 2024 14:51
shgutte pushed a commit to shgutte/connectedhomeip that referenced this pull request Sep 10, 2024
…roject-chip#35272)

* Update CommissionerControlCluster xml defination to align with spec

* Clean up commissioner-control-server
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants