Skip to content

ZoneMgmtCluster Migration PR#3 move structs#43590

Open
marybadalyan wants to merge 10 commits intoproject-chip:masterfrom
marybadalyan:move/zone-management
Open

ZoneMgmtCluster Migration PR#3 move structs#43590
marybadalyan wants to merge 10 commits intoproject-chip:masterfrom
marybadalyan:move/zone-management

Conversation

@marybadalyan
Copy link
Contributor

@marybadalyan marybadalyan commented Mar 14, 2026

Summary

Changes made:
This PR only does code movements and name changes in the codebase to make cluster migration more explicit .

Related issues

Fixes: #43194

Testing

No changes

@github-actions github-actions bot added the app label Mar 14, 2026
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request primarily involves refactoring by moving code and renaming components to prepare for a code-driven implementation of the Zone Management cluster. The changes are generally well-structured, but I've identified a circular dependency issue in the new header files that should be addressed. Additionally, there's a minor typo in a comment.

@github-actions
Copy link

github-actions bot commented Mar 14, 2026

PR #43590: Size comparison from 0d30044 to 8671a3d

Full report (10 builds for cc13x4_26x4, cc32xx, nrfconnect, realtek, stm32)
platform target config section 0d30044 8671a3d change % change
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 FLASH 780076 780076 0 0.0
RAM 103332 103332 0 0.0
lock-ftd LP_EM_CC1354P10_6 FLASH 787104 787104 0 0.0
RAM 108516 108516 0 0.0
pump-app LP_EM_CC1354P10_6 FLASH 733332 733332 0 0.0
RAM 97324 97324 0 0.0
pump-controller-app LP_EM_CC1354P10_6 FLASH 716752 716752 0 0.0
RAM 97484 97484 0 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL FLASH 558650 558650 0 0.0
RAM 204504 204504 0 0.0
lock CC3235SF_LAUNCHXL FLASH 591814 591814 0 0.0
RAM 204744 204744 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 858144 858144 0 0.0
RAM 162019 162019 0 0.0
realtek light-switch-app rtl8777g FLASH 721176 721176 0 0.0
RAM 113456 113456 0 0.0
lighting-app rtl8777g FLASH 768912 768912 0 0.0
RAM 114696 114696 0 0.0
stm32 light STM32WB5MM-DK FLASH 479728 479728 0 0.0
RAM 141324 141324 0 0.0

@marybadalyan marybadalyan marked this pull request as ready for review March 14, 2026 13:08
@marybadalyan
Copy link
Contributor Author

/gemini review

@github-actions
Copy link

github-actions bot commented Mar 14, 2026

PR #43590: Size comparison from 0d30044 to cd558eb

Full report (34 builds for bl602, bl616, bl702, bl702l, cc13x4_26x4, cc32xx, efr32, esp32, nrfconnect, nxp, psoc6, qpg, realtek, stm32, telink)
platform target config section 0d30044 cd558eb change % change
bl602 lighting-app bl602+mfd+littlefs+rpc FLASH 1090298 1090298 0 0.0
RAM 144778 144778 0 0.0
bl616 lighting-app bl616+thread FLASH 1100804 1100804 0 0.0
RAM 104216 104216 0 0.0
bl616+wifi+shell FLASH 1587676 1587676 0 0.0
RAM 98080 98080 0 0.0
bl702 lighting-app bl702+eth FLASH 1053234 1053234 0 0.0
RAM 108381 108381 0 0.0
bl702l contact-sensor-app bl702l+mfd+littlefs FLASH 891244 891244 0 0.0
RAM 105756 105756 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 FLASH 780076 780076 0 0.0
RAM 103332 103332 0 0.0
lock-ftd LP_EM_CC1354P10_6 FLASH 787104 787104 0 0.0
RAM 108516 108516 0 0.0
pump-app LP_EM_CC1354P10_6 FLASH 733332 733332 0 0.0
RAM 97324 97324 0 0.0
pump-controller-app LP_EM_CC1354P10_6 FLASH 716752 716752 0 0.0
RAM 97484 97484 0 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL FLASH 558650 558650 0 0.0
RAM 204504 204504 0 0.0
lock CC3235SF_LAUNCHXL FLASH 591814 591814 0 0.0
RAM 204744 204744 0 0.0
efr32 lock-app BRD4187C FLASH 971764 971764 0 0.0
RAM 125828 125828 0 0.0
BRD4338a FLASH 769948 769948 0 0.0
RAM 236552 236552 0 0.0
window-app BRD4187C FLASH 1075368 1075360 -8 -0.0
RAM 126440 126440 0 0.0
esp32 all-clusters-app c3devkit DRAM 98372 98372 0 0.0
FLASH 1597182 1597182 0 0.0
IRAM 93514 93514 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 858144 858144 0 0.0
RAM 162019 162019 0 0.0
nxp contact mcxw71+release FLASH 736456 736456 0 0.0
RAM 66944 66944 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1709172 1709172 0 0.0
RAM 213948 213948 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1607868 1607868 0 0.0
RAM 210820 210820 0 0.0
light cy8ckit_062s2_43012 FLASH 1471620 1471620 0 0.0
RAM 196996 196996 0 0.0
lock cy8ckit_062s2_43012 FLASH 1497756 1497756 0 0.0
RAM 224740 224740 0 0.0
qpg lighting-app qpg6200+debug FLASH 841228 841228 0 0.0
RAM 127788 127788 0 0.0
lock-app qpg6200+debug FLASH 779920 779920 0 0.0
RAM 118736 118736 0 0.0
realtek light-switch-app rtl8777g FLASH 721176 721176 0 0.0
RAM 113456 113456 0 0.0
lighting-app rtl8777g FLASH 768912 768912 0 0.0
RAM 114696 114696 0 0.0
stm32 light STM32WB5MM-DK FLASH 479728 479728 0 0.0
RAM 141324 141324 0 0.0
telink bridge-app tl7218x FLASH 729288 729288 0 0.0
RAM 95772 95772 0 0.0
light-app-ota-compress-lzma-shell-factory-data tl3218x FLASH 853768 853768 0 0.0
RAM 44188 44188 0 0.0
tl7218x FLASH 845178 845178 0 0.0
RAM 99576 99576 0 0.0
light-switch-app-ota-compress-lzma-factory-data tl7218x_retention FLASH 726100 726100 0 0.0
RAM 55752 55752 0 0.0
light-switch-app-ota-compress-lzma-shell-factory-data tlsr9528a FLASH 788668 788668 0 0.0
RAM 74928 74928 0 0.0
light-switch-app-ota-factory-data tl3218x_retention FLASH 726094 726094 0 0.0
RAM 33232 33232 0 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 617176 617176 0 0.0
RAM 118244 118244 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 843948 843952 4 0.0
RAM 97284 97284 0 0.0

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request primarily refactors the Zone Management cluster by moving several structs and the delegate into separate header files, and relocating the ZoneMgmtServer class. These changes are a good step towards improving modularity. However, there is a critical inconsistency in the renaming of the delegate class. It has been renamed to ZoneMgmtDelegate in one file but remains Delegate in its new header and in the ZoneMgmtServer declaration. This will cause compilation failures and needs to be corrected.

@codecov
Copy link

codecov bot commented Mar 14, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 54.12%. Comparing base (708056c) to head (9baa205).

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #43590   +/-   ##
=======================================
  Coverage   54.12%   54.12%           
=======================================
  Files        1550     1550           
  Lines      106947   106947           
  Branches    13312    13312           
=======================================
  Hits        57888    57888           
  Misses      49059    49059           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@marybadalyan marybadalyan changed the title ZoneMgmtCluster Migration PR#3 Code-Driven Implementation ZoneMgmtCluster Migration PR#3 move structs Mar 14, 2026
using ZoneTriggerControlStruct = Structs::ZoneTriggerControlStruct::Type;
using ZoneInformationStruct = Structs::ZoneInformationStruct::Type;

ZoneMgmtServer::ZoneMgmtServer(ZoneMgmtDelegate & aDelegate, EndpointId aEndpointId, const BitFlags<Feature> aFeatures,
Copy link
Contributor

Choose a reason for hiding this comment

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

Arm64 compile fails:

INFO    ../../examples/camera-app/linux/third_party/connectedhomeip/src/app/clusters/zone-management-server/ZoneManagementCluster.cpp:47:32: error: unknown type name 'ZoneMgmtDelegate'
INFO       47 | ZoneMgmtServer::ZoneMgmtServer(ZoneMgmtDelegate & aDelegate, EndpointId aEndpointId, const BitFlags<Feature> aFeatures,
INFO     

Make sure locally you try to compile camera app (or see if any other app includes this cluster).

@github-actions
Copy link

github-actions bot commented Mar 15, 2026

PR #43590: Size comparison from 708056c to 9baa205

Full report (34 builds for bl602, bl616, bl702, bl702l, cc13x4_26x4, cc32xx, efr32, esp32, nrfconnect, nxp, psoc6, qpg, realtek, stm32, telink)
platform target config section 708056c 9baa205 change % change
bl602 lighting-app bl602+mfd+littlefs+rpc FLASH 1090298 1090298 0 0.0
RAM 144778 144778 0 0.0
bl616 lighting-app bl616+thread FLASH 1100804 1100804 0 0.0
RAM 104216 104216 0 0.0
bl616+wifi+shell FLASH 1587676 1587676 0 0.0
RAM 98080 98080 0 0.0
bl702 lighting-app bl702+eth FLASH 1053234 1053234 0 0.0
RAM 108381 108381 0 0.0
bl702l contact-sensor-app bl702l+mfd+littlefs FLASH 891244 891244 0 0.0
RAM 105756 105756 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 FLASH 780076 780076 0 0.0
RAM 103332 103332 0 0.0
lock-ftd LP_EM_CC1354P10_6 FLASH 787104 787104 0 0.0
RAM 108516 108516 0 0.0
pump-app LP_EM_CC1354P10_6 FLASH 733332 733332 0 0.0
RAM 97324 97324 0 0.0
pump-controller-app LP_EM_CC1354P10_6 FLASH 716752 716752 0 0.0
RAM 97484 97484 0 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL FLASH 558650 558650 0 0.0
RAM 204504 204504 0 0.0
lock CC3235SF_LAUNCHXL FLASH 591814 591814 0 0.0
RAM 204744 204744 0 0.0
efr32 lock-app BRD4187C FLASH 971764 971764 0 0.0
RAM 125828 125828 0 0.0
BRD4338a FLASH 769948 769948 0 0.0
RAM 236552 236552 0 0.0
window-app BRD4187C FLASH 1075368 1075360 -8 -0.0
RAM 126440 126440 0 0.0
esp32 all-clusters-app c3devkit DRAM 98372 98372 0 0.0
FLASH 1597182 1597182 0 0.0
IRAM 93514 93514 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 858144 858144 0 0.0
RAM 162019 162019 0 0.0
nxp contact mcxw71+release FLASH 736456 736456 0 0.0
RAM 66944 66944 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1709172 1709172 0 0.0
RAM 213948 213948 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1607868 1607868 0 0.0
RAM 210820 210820 0 0.0
light cy8ckit_062s2_43012 FLASH 1471620 1471620 0 0.0
RAM 196996 196996 0 0.0
lock cy8ckit_062s2_43012 FLASH 1497756 1497756 0 0.0
RAM 224740 224740 0 0.0
qpg lighting-app qpg6200+debug FLASH 841228 841228 0 0.0
RAM 127788 127788 0 0.0
lock-app qpg6200+debug FLASH 779920 779920 0 0.0
RAM 118736 118736 0 0.0
realtek light-switch-app rtl8777g FLASH 721176 721176 0 0.0
RAM 113456 113456 0 0.0
lighting-app rtl8777g FLASH 768912 768912 0 0.0
RAM 114696 114696 0 0.0
stm32 light STM32WB5MM-DK FLASH 479728 479728 0 0.0
RAM 141324 141324 0 0.0
telink bridge-app tl7218x FLASH 729310 729310 0 0.0
RAM 95772 95772 0 0.0
light-app-ota-compress-lzma-shell-factory-data tl3218x FLASH 853790 853790 0 0.0
RAM 44188 44188 0 0.0
tl7218x FLASH 845200 845200 0 0.0
RAM 99576 99576 0 0.0
light-switch-app-ota-compress-lzma-factory-data tl7218x_retention FLASH 726122 726122 0 0.0
RAM 55752 55752 0 0.0
light-switch-app-ota-compress-lzma-shell-factory-data tlsr9528a FLASH 788690 788690 0 0.0
RAM 74928 74928 0 0.0
light-switch-app-ota-factory-data tl3218x_retention FLASH 726116 726116 0 0.0
RAM 33232 33232 0 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 617198 617198 0 0.0
RAM 118244 118244 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 843970 843974 4 0.0
RAM 97284 97284 0 0.0

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