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

[Fabric-Bridge] Rename CommissionerControl to CommissionerControlDelegate #36280

Merged
merged 1 commit into from
Oct 29, 2024
Merged

[Fabric-Bridge] Rename CommissionerControl to CommissionerControlDelegate #36280

merged 1 commit into from
Oct 29, 2024

Conversation

yufengwangca
Copy link
Contributor

Both the fabric-admin and fabric-bridge apps contain CommissionerControl.h/cpp. There is no conflict when they are in separate apps; however, merging them into a single app causes a conflict. Rename CommissionerControl to CommissionerControlDelegate to resolve this.

@semanticdiff-com SemanticDiff.com
Copy link

Review changes with SemanticDiff.

@github-actions GitHub Actions
Copy link

github-actions bot commented Oct 29, 2024 •
edited
Loading

PR #36280: Size comparison from c18a6de to 583dff3

Full report (68 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
platform target config section c18a6de 583dff3 change % change
bl602 lighting-app bl602+mfd+littlefs+rpc FLASH 1349984 1349984 0 0.0
RAM 104120 104120 0 0.0
bl702 lighting-app bl702+eth FLASH 647380 647380 0 0.0
RAM 25233 25233 0 0.0
bl702+wifi FLASH 824944 824944 0 0.0
RAM 13965 13965 0 0.0
bl706+mfd+rpc+littlefs FLASH 1053678 1053678 0 0.0
RAM 23821 23821 0 0.0
bl702l lighting-app bl702l+mfd+littlefs FLASH 974462 974462 0 0.0
RAM 16468 16468 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 FLASH 836412 836412 0 0.0
RAM 123676 123676 0 0.0
lock-ftd LP_EM_CC1354P10_6 FLASH 821832 821832 0 0.0
RAM 125556 125556 0 0.0
pump-app LP_EM_CC1354P10_6 FLASH 768404 768404 0 0.0
RAM 114048 114048 0 0.0
pump-controller-app LP_EM_CC1354P10_6 FLASH 752664 752664 0 0.0
RAM 114240 114240 0 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL FLASH 626506 626506 0 0.0
RAM 206132 206132 0 0.0
lock CC3235SF_LAUNCHXL FLASH 666482 666482 0 0.0
RAM 206284 206284 0 0.0
cyw30739 light CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 678381 678381 0 0.0
RAM 78692 78692 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 698233 698233 0 0.0
RAM 81324 81324 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 698233 698233 0 0.0
RAM 81324 81324 0 0.0
CYW930739M2EVB-02 unknown 2040 2040 0 0.0
FLASH 655161 655161 0 0.0
RAM 73760 73760 0 0.0
light-switch CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 614829 614829 0 0.0
RAM 71644 71644 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 634457 634457 0 0.0
RAM 74196 74196 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 634457 634457 0 0.0
RAM 74196 74196 0 0.0
lock CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 634181 634181 0 0.0
RAM 74692 74692 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 653897 653897 0 0.0
RAM 77244 77244 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 653897 653897 0 0.0
RAM 77244 77244 0 0.0
thermostat CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 609445 609445 0 0.0
RAM 68780 68780 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 629297 629297 0 0.0
RAM 71412 71412 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 629297 629297 0 0.0
RAM 71412 71412 0 0.0
efr32 lock-app BRD4187C FLASH 926100 926100 0 0.0
RAM 159920 159920 0 0.0
BRD4338a FLASH 741256 741256 0 0.0
RAM 232580 232580 0 0.0
window-app BRD4187C FLASH 1018040 1018040 0 0.0
RAM 128264 128264 0 0.0
esp32 all-clusters-app c3devkit DRAM 95256 95256 0 0.0
FLASH 1538746 1538746 0 0.0
IRAM 82538 82538 0 0.0
m5stack DRAM 116192 116192 0 0.0
FLASH 1548958 1548958 0 0.0
IRAM 117039 117039 0 0.0
linux air-purifier-app debug unknown 4688 4688 0 0.0
FLASH 2737039 2737039 0 0.0
RAM 129616 129616 0 0.0
all-clusters-app debug unknown 5528 5528 0 0.0
FLASH 6039312 6039312 0 0.0
RAM 523872 523872 0 0.0
all-clusters-minimal-app debug unknown 5424 5424 0 0.0
FLASH 5371938 5371938 0 0.0
RAM 242448 242448 0 0.0
bridge-app debug unknown 5408 5408 0 0.0
FLASH 4705468 4705468 0 0.0
RAM 218416 218416 0 0.0
chip-tool debug unknown 5960 5960 0 0.0
FLASH 12979326 12979326 0 0.0
RAM 584466 584466 0 0.0
chip-tool-ipv6only arm64 unknown 21416 21416 0 0.0
FLASH 11114536 11114536 0 0.0
RAM 635408 635408 0 0.0
fabric-admin debug unknown 5792 5792 0 0.0
FLASH 11309149 11309149 0 0.0
RAM 584954 584954 0 0.0
fabric-bridge-app debug unknown 4632 4632 0 0.0
FLASH 4531898 4531898 0 0.0
RAM 205400 205400 0 0.0
fabric-sync debug unknown 4840 4840 0 0.0
FLASH 5244389 5244389 0 0.0
RAM 465448 465448 0 0.0
lighting-app debug+rpc+ui unknown 6056 6056 0 0.0
FLASH 5646593 5646593 0 0.0
RAM 228552 228552 0 0.0
lock-app debug unknown 5344 5344 0 0.0
FLASH 4754344 4754344 0 0.0
RAM 204536 204536 0 0.0
ota-provider-app debug unknown 4720 4720 0 0.0
FLASH 4381116 4381116 0 0.0
RAM 198256 198256 0 0.0
ota-requestor-app debug unknown 4656 4656 0 0.0
FLASH 4520156 4520156 0 0.0
RAM 202824 202824 0 0.0
shell debug unknown 4216 4216 0 0.0
FLASH 3064061 3064061 0 0.0
RAM 160368 160368 0 0.0
thermostat-no-ble arm64 unknown 9456 9456 0 0.0
FLASH 4124152 4124152 0 0.0
RAM 242944 242944 0 0.0
tv-app debug unknown 5624 5624 0 0.0
FLASH 5980805 5980805 0 0.0
RAM 596320 596320 0 0.0
tv-casting-app debug unknown 5208 5208 0 0.0
FLASH 11187789 11187789 0 0.0
RAM 694568 694568 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 914360 914360 0 0.0
RAM 143357 143357 0 0.0
nrf7002dk_nrf5340_cpuapp FLASH 885896 885896 0 0.0
RAM 141496 141496 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 FLASH 847928 847928 0 0.0
RAM 142265 142265 0 0.0
nxp contact k32w0+release FLASH 582296 582296 0 0.0
RAM 71092 71092 0 0.0
mcxw71+release FLASH 596776 596776 0 0.0
RAM 63184 63184 0 0.0
light k32w0+release FLASH 618900 618900 0 0.0
RAM 70556 70556 0 0.0
k32w1+release FLASH 682992 682992 0 0.0
RAM 48816 48816 0 0.0
lock mcxw71+release FLASH 746576 746576 0 0.0
RAM 67340 67340 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1643620 1643620 0 0.0
RAM 212408 212408 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1550588 1550588 0 0.0
RAM 209208 209208 0 0.0
light cy8ckit_062s2_43012 FLASH 1466564 1466564 0 0.0
RAM 201200 201200 0 0.0
lock cy8ckit_062s2_43012 FLASH 1464004 1464004 0 0.0
RAM 225560 225560 0 0.0
qpg lighting-app qpg6105+debug FLASH 660392 660392 0 0.0
RAM 105420 105420 0 0.0
lock-app qpg6105+debug FLASH 618468 618468 0 0.0
RAM 99880 99880 0 0.0
stm32 light STM32WB5MM-DK FLASH 481680 481680 0 0.0
RAM 144844 144844 0 0.0
telink bridge-app tlsr9258a FLASH 680902 680902 0 0.0
RAM 91304 91304 0 0.0
contact-sensor-app tlsr9528a_retention FLASH 620500 620500 0 0.0
RAM 50600 50600 0 0.0
light-switch-app-ota-shell-factory-data tlsr9528a FLASH 708438 708438 0 0.0
RAM 73940 73940 0 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 625344 625344 0 0.0
RAM 144468 144468 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 811354 811354 0 0.0
RAM 99100 99100 0 0.0
tizen all-clusters-app arm unknown 4912 4912 0 0.0
FLASH 1722356 1722356 0 0.0
RAM 90140 90140 0 0.0
chip-tool-ubsan arm unknown 10792 10792 0 0.0
FLASH 18157782 18157782 0 0.0
RAM 7915456 7915456 0 0.0

@yufengwangca yufengwangca enabled auto-merge (squash) October 29, 2024 16:33
@github-actions GitHub Actions
Copy link

github-actions bot commented Oct 29, 2024 •
edited
Loading

PR #36280: Size comparison from 3d80093 to 3ac8c2e

Full report (68 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
platform target config section 3d80093 3ac8c2e change % change
bl602 lighting-app bl602+mfd+littlefs+rpc FLASH 1349924 1349924 0 0.0
RAM 104120 104120 0 0.0
bl702 lighting-app bl702+eth FLASH 647346 647346 0 0.0
RAM 25233 25233 0 0.0
bl702+wifi FLASH 824910 824910 0 0.0
RAM 13965 13965 0 0.0
bl706+mfd+rpc+littlefs FLASH 1053644 1053644 0 0.0
RAM 23821 23821 0 0.0
bl702l lighting-app bl702l+mfd+littlefs FLASH 974428 974428 0 0.0
RAM 16468 16468 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 FLASH 836396 836396 0 0.0
RAM 123676 123676 0 0.0
lock-ftd LP_EM_CC1354P10_6 FLASH 821824 821824 0 0.0
RAM 125556 125556 0 0.0
pump-app LP_EM_CC1354P10_6 FLASH 768388 768388 0 0.0
RAM 114048 114048 0 0.0
pump-controller-app LP_EM_CC1354P10_6 FLASH 752648 752648 0 0.0
RAM 114240 114240 0 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL FLASH 626450 626450 0 0.0
RAM 206132 206132 0 0.0
lock CC3235SF_LAUNCHXL FLASH 666426 666426 0 0.0
RAM 206284 206284 0 0.0
cyw30739 light CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 678365 678365 0 0.0
RAM 78692 78692 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 698217 698217 0 0.0
RAM 81324 81324 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 698217 698217 0 0.0
RAM 81324 81324 0 0.0
CYW930739M2EVB-02 unknown 2040 2040 0 0.0
FLASH 655153 655153 0 0.0
RAM 73760 73760 0 0.0
light-switch CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 614813 614813 0 0.0
RAM 71644 71644 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 634449 634449 0 0.0
RAM 74196 74196 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 634449 634449 0 0.0
RAM 74196 74196 0 0.0
lock CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 634173 634173 0 0.0
RAM 74692 74692 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 653889 653889 0 0.0
RAM 77244 77244 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 653889 653889 0 0.0
RAM 77244 77244 0 0.0
thermostat CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 609429 609429 0 0.0
RAM 68780 68780 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 629281 629281 0 0.0
RAM 71412 71412 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 629281 629281 0 0.0
RAM 71412 71412 0 0.0
efr32 lock-app BRD4187C FLASH 926100 926100 0 0.0
RAM 159920 159920 0 0.0
BRD4338a FLASH 741208 741208 0 0.0
RAM 232580 232580 0 0.0
window-app BRD4187C FLASH 1018008 1018008 0 0.0
RAM 128264 128264 0 0.0
esp32 all-clusters-app c3devkit DRAM 95256 95256 0 0.0
FLASH 1538710 1538710 0 0.0
IRAM 82538 82538 0 0.0
m5stack DRAM 116192 116192 0 0.0
FLASH 1548950 1548950 0 0.0
IRAM 117039 117039 0 0.0
linux air-purifier-app debug unknown 4688 4688 0 0.0
FLASH 2736743 2736743 0 0.0
RAM 129616 129616 0 0.0
all-clusters-app debug unknown 5528 5528 0 0.0
FLASH 6039048 6039048 0 0.0
RAM 523872 523872 0 0.0
all-clusters-minimal-app debug unknown 5424 5424 0 0.0
FLASH 5371642 5371642 0 0.0
RAM 242448 242448 0 0.0
bridge-app debug unknown 5408 5408 0 0.0
FLASH 4705204 4705204 0 0.0
RAM 218400 218400 0 0.0
chip-tool debug unknown 5960 5960 0 0.0
FLASH 12979062 12979062 0 0.0
RAM 584466 584466 0 0.0
chip-tool-ipv6only arm64 unknown 21416 21416 0 0.0
FLASH 11114184 11114184 0 0.0
RAM 635400 635400 0 0.0
fabric-admin debug unknown 5792 5792 0 0.0
FLASH 11308853 11308853 0 0.0
RAM 584922 584922 0 0.0
fabric-bridge-app debug unknown 4632 4632 0 0.0
FLASH 4531634 4531634 0 0.0
RAM 205368 205368 0 0.0
fabric-sync debug unknown 4840 4840 0 0.0
FLASH 5244117 5244117 0 0.0
RAM 465432 465432 0 0.0
lighting-app debug+rpc+ui unknown 6056 6056 0 0.0
FLASH 5646289 5646289 0 0.0
RAM 228520 228520 0 0.0
lock-app debug unknown 5344 5344 0 0.0
FLASH 4754080 4754080 0 0.0
RAM 204520 204520 0 0.0
ota-provider-app debug unknown 4720 4720 0 0.0
FLASH 4380820 4380820 0 0.0
RAM 198240 198240 0 0.0
ota-requestor-app debug unknown 4656 4656 0 0.0
FLASH 4519860 4519860 0 0.0
RAM 202808 202808 0 0.0
shell debug unknown 4216 4216 0 0.0
FLASH 3063773 3063773 0 0.0
RAM 160336 160336 0 0.0
thermostat-no-ble arm64 unknown 9456 9456 0 0.0
FLASH 4123816 4123816 0 0.0
RAM 242936 242936 0 0.0
tv-app debug unknown 5624 5624 0 0.0
FLASH 5980517 5980517 0 0.0
RAM 596304 596304 0 0.0
tv-casting-app debug unknown 5208 5208 0 0.0
FLASH 11187469 11187469 0 0.0
RAM 694552 694552 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 914348 914348 0 0.0
RAM 143357 143357 0 0.0
nrf7002dk_nrf5340_cpuapp FLASH 885884 885884 0 0.0
RAM 141496 141496 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 FLASH 847916 847916 0 0.0
RAM 142265 142265 0 0.0
nxp contact k32w0+release FLASH 582280 582280 0 0.0
RAM 71092 71092 0 0.0
mcxw71+release FLASH 596768 596768 0 0.0
RAM 63184 63184 0 0.0
light k32w0+release FLASH 618884 618884 0 0.0
RAM 70556 70556 0 0.0
k32w1+release FLASH 682976 682976 0 0.0
RAM 48816 48816 0 0.0
lock mcxw71+release FLASH 746568 746568 0 0.0
RAM 67340 67340 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1643572 1643572 0 0.0
RAM 212408 212408 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1550524 1550524 0 0.0
RAM 209208 209208 0 0.0
light cy8ckit_062s2_43012 FLASH 1466516 1466516 0 0.0
RAM 201200 201200 0 0.0
lock cy8ckit_062s2_43012 FLASH 1463956 1463956 0 0.0
RAM 225560 225560 0 0.0
qpg lighting-app qpg6105+debug FLASH 660376 660376 0 0.0
RAM 105420 105420 0 0.0
lock-app qpg6105+debug FLASH 618460 618460 0 0.0
RAM 99880 99880 0 0.0
stm32 light STM32WB5MM-DK FLASH 481672 481672 0 0.0
RAM 144844 144844 0 0.0
telink bridge-app tlsr9258a FLASH 680868 680868 0 0.0
RAM 91304 91304 0 0.0
contact-sensor-app tlsr9528a_retention FLASH 620466 620466 0 0.0
RAM 50600 50600 0 0.0
light-switch-app-ota-shell-factory-data tlsr9528a FLASH 708404 708404 0 0.0
RAM 73940 73940 0 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 625310 625310 0 0.0
RAM 144468 144468 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 811320 811320 0 0.0
RAM 99100 99100 0 0.0
tizen all-clusters-app arm unknown 4912 4912 0 0.0
FLASH 1722268 1722268 0 0.0
RAM 90140 90140 0 0.0
chip-tool-ubsan arm unknown 10792 10792 0 0.0
FLASH 18157678 18157678 0 0.0
RAM 7915516 7915516 0 0.0

@yufengwangca yufengwangca merged commit 1285f6b into project-chip:master Oct 29, 2024
67 checks passed
yyzhong-g pushed a commit to yyzhong-g/connectedhomeip that referenced this pull request Dec 12, 2024
@yufengwangca @yyzhong-g
Rename CommissionerControl to CommissionerControlDelegate (project-ch…
d072237 
…ip#36280)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tehampson tehampson tehampson approved these changes

@saurabhst saurabhst saurabhst approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@yufengwangca @saurabhst @tehampson