Skip to content

Cleaning up the package order in .zap files #38958

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
Merged
mergify merged 1 commit into from
May 15, 2025
Merged

Cleaning up the package order in .zap files #38958

mergify merged 1 commit into from
May 15, 2025

Conversation

@brdandu
Copy link
Contributor

@brdandu brdandu commented May 14, 2025 •
edited
Loading

Cleaning up the package order path such that templates json paths come after zcl json paths for all .zap files when opened and saved.
The zap_convert_all.py has packages re-ordered. This specific change should make it deterministic and not change this order from now on.

Github: ZAP#1126

Testing

Existing tests should cover the changes here.

@brdandu
Cleaning up the package order path such that templates json paths com…
6d77890 
…e after zcl json paths for all .zap files when opened and saved

Github: ZAP#1126
@brdandu brdandu requested review from a team as code owners May 14, 2025 16:54
@brdandu brdandu linked an issue May 14, 2025 that may be closed by this pull request
[Feature request] Script to update zap files to match GUI output / policy to run script on zap update project-chip/zap#1126
Open
@github-actions
Copy link

github-actions bot commented May 14, 2025 •
edited
Loading

PR #38958: Size comparison from 162df09 to 6d77890

Full report (73 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
platform target config section 162df09 6d77890 change % change
bl602 lighting-app bl602+mfd+littlefs+rpc FLASH 1101678 1101678 0 0.0
RAM 178994 178994 0 0.0
bl702 lighting-app bl702+eth FLASH 654940 654940 0 0.0
RAM 134961 134961 0 0.0
bl702+wifi FLASH 832446 832446 0 0.0
RAM 124501 124501 0 0.0
bl706+mfd+rpc+littlefs FLASH 1064978 1064978 0 0.0
RAM 117365 117365 0 0.0
bl702l contact-sensor-app bl702l+mfd+littlefs FLASH 894160 894160 0 0.0
RAM 105660 105660 0 0.0
lighting-app bl702l+mfd+littlefs FLASH 978258 978258 0 0.0
RAM 109836 109836 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 FLASH 820196 820196 0 0.0
RAM 120208 120208 0 0.0
lock-ftd LP_EM_CC1354P10_6 FLASH 830232 830232 0 0.0
RAM 125376 125376 0 0.0
pump-app LP_EM_CC1354P10_6 FLASH 778472 778472 0 0.0
RAM 113780 113780 0 0.0
pump-controller-app LP_EM_CC1354P10_6 FLASH 762780 762780 0 0.0
RAM 113988 113988 0 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL FLASH 549050 549050 0 0.0
RAM 205192 205192 0 0.0
lock CC3235SF_LAUNCHXL FLASH 579738 579738 0 0.0
RAM 205376 205376 0 0.0
cyw30739 light CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 661709 661709 0 0.0
RAM 77236 77236 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 681561 681561 0 0.0
RAM 79876 79876 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 681561 681561 0 0.0
RAM 79876 79876 0 0.0
CYW930739M2EVB-02 unknown 2040 2040 0 0.0
FLASH 638501 638501 0 0.0
RAM 72304 72304 0 0.0
light-switch CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 622997 622997 0 0.0
RAM 73532 73532 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 642641 642641 0 0.0
RAM 76084 76084 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 642641 642641 0 0.0
RAM 76084 76084 0 0.0
lock CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 642405 642405 0 0.0
RAM 76532 76532 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 662121 662121 0 0.0
RAM 79084 79084 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 662121 662121 0 0.0
RAM 79084 79084 0 0.0
thermostat CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 618633 618633 0 0.0
RAM 70628 70628 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 638485 638485 0 0.0
RAM 73260 73260 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 638485 638485 0 0.0
RAM 73260 73260 0 0.0
efr32 lock-app BRD4187C FLASH 945148 945148 0 0.0
RAM 132024 132024 0 0.0
BRD4338a FLASH 771184 771176 -8 -0.0
RAM 173248 173248 0 0.0
window-app BRD4187C FLASH 1037144 1037144 0 0.0
RAM 128160 128160 0 0.0
esp32 all-clusters-app c3devkit DRAM 103320 103320 0 0.0
FLASH 1805488 1805488 0 0.0
IRAM 83846 83846 0 0.0
m5stack DRAM 121932 121932 0 0.0
FLASH 1770642 1770642 0 0.0
IRAM 117043 117043 0 0.0
linux air-purifier-app debug unknown 4848 4848 0 0.0
FLASH 2787094 2787094 0 0.0
RAM 115048 115048 0 0.0
all-clusters-app debug unknown 5656 5656 0 0.0
FLASH 6340786 6340786 0 0.0
RAM 533128 533128 0 0.0
all-clusters-minimal-app debug unknown 5528 5528 0 0.0
FLASH 5445078 5445078 0 0.0
RAM 225016 225016 0 0.0
bridge-app debug unknown 5560 5560 0 0.0
FLASH 4761514 4761514 0 0.0
RAM 204656 204656 0 0.0
camera-app debug unknown 8856 8856 0 0.0
FLASH 6883579 6883579 0 0.0
RAM 226168 226168 0 0.0
camera-controller debug unknown 9240 9240 0 0.0
FLASH 14309803 14309803 0 0.0
RAM 658448 658448 0 0.0
chip-tool debug unknown 6256 6256 0 0.0
FLASH 14591481 14591481 0 0.0
RAM 645184 645184 0 0.0
chip-tool-ipv6only arm64 unknown 40328 40328 0 0.0
FLASH 12572672 12572672 0 0.0
RAM 691472 691472 0 0.0
fabric-admin debug unknown 5936 5936 0 0.0
FLASH 12668867 12668867 0 0.0
RAM 644544 644544 0 0.0
fabric-bridge-app debug unknown 4808 4808 0 0.0
FLASH 4578448 4578448 0 0.0
RAM 190704 190704 0 0.0
fabric-sync debug unknown 5064 5064 0 0.0
FLASH 5718725 5718725 0 0.0
RAM 486560 486560 0 0.0
lighting-app debug+rpc+ui unknown 6264 6264 0 0.0
FLASH 5641905 5641905 0 0.0
RAM 207192 207192 0 0.0
lock-app debug unknown 5496 5496 0 0.0
FLASH 4813848 4813848 0 0.0
RAM 194456 194456 0 0.0
ota-provider-app debug unknown 4848 4848 0 0.0
FLASH 4439422 4439422 0 0.0
RAM 183888 183888 0 0.0
ota-requestor-app debug unknown 4800 4800 0 0.0
FLASH 4567186 4567186 0 0.0
RAM 187760 187760 0 0.0
shell debug unknown 4272 4272 0 0.0
FLASH 3078492 3078492 0 0.0
RAM 148088 148088 0 0.0
thermostat-no-ble arm64 unknown 9616 9616 0 0.0
FLASH 4224912 4224912 0 0.0
RAM 230864 230864 0 0.0
tv-app debug unknown 5832 5832 0 0.0
FLASH 6074661 6074661 0 0.0
RAM 611000 611000 0 0.0
tv-casting-app debug unknown 5416 5416 0 0.0
FLASH 12781037 12781037 0 0.0
RAM 765472 765472 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 919244 919244 0 0.0
RAM 167326 167326 0 0.0
nrf7002dk_nrf5340_cpuapp FLASH 911220 911220 0 0.0
RAM 145570 145570 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 FLASH 856468 856468 0 0.0
RAM 141089 141089 0 0.0
nxp contact k32w0+release FLASH 591920 591920 0 0.0
RAM 72848 72848 0 0.0
mcxw71+release FLASH 624688 624688 0 0.0
RAM 63188 63188 0 0.0
light k32w0+release FLASH 617852 617852 0 0.0
RAM 72144 72144 0 0.0
k32w1+release FLASH 709160 709160 0 0.0
RAM 72036 72036 0 0.0
lock mcxw71+release FLASH 774216 774216 0 0.0
RAM 67612 67612 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1665268 1665268 0 0.0
RAM 212328 212328 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1569764 1569764 0 0.0
RAM 208504 208504 0 0.0
light cy8ckit_062s2_43012 FLASH 1445228 1445228 0 0.0
RAM 197216 197216 0 0.0
lock cy8ckit_062s2_43012 FLASH 1475236 1475236 0 0.0
RAM 224936 224936 0 0.0
qpg lighting-app qpg6105+debug FLASH 666804 666804 0 0.0
RAM 105164 105164 0 0.0
lock-app qpg6105+debug FLASH 625208 625208 0 0.0
RAM 99792 99792 0 0.0
stm32 light STM32WB5MM-DK FLASH 464540 464540 0 0.0
RAM 141416 141416 0 0.0
telink bridge-app tl7218x FLASH 693548 693548 0 0.0
RAM 101828 101828 0 0.0
light-app-ota-compress-lzma-factory-data tl3218x FLASH 772934 772934 0 0.0
RAM 49980 49980 0 0.0
light-app-ota-shell-factory-data tl7218x FLASH 780040 780040 0 0.0
RAM 109160 109160 0 0.0
light-switch-app-ota-compress-lzma-factory-data tl7218x_retention FLASH 702308 702308 0 0.0
RAM 62544 62544 0 0.0
light-switch-app-ota-compress-lzma-shell-factory-data tlsr9528a FLASH 740262 740262 0 0.0
RAM 85724 85724 0 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 606362 606362 0 0.0
RAM 119376 119376 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 815350 815354 4 0.0
RAM 107428 107428 0 0.0
tizen all-clusters-app arm unknown 5216 5216 0 0.0
FLASH 1812316 1812316 0 0.0
RAM 94840 94840 0 0.0
chip-tool-ubsan arm unknown 20600 20600 0 0.0
FLASH 20823118 20823118 0 0.0
RAM 9060032 9060032 0 0.0

@mergify mergify bot merged commit 1125b84 into project-chip:master May 15, 2025
71 of 73 checks passed
heinsaar pushed a commit to heinsaar/connectedhomeip that referenced this pull request May 15, 2025
@brdandu @heinsaar
Cleaning up the package order path such that templates json paths com…
abe8485 
…e after zcl json paths for all .zap files when opened and saved (project-chip#38958)

Github: ZAP#1126
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@andy31415 andy31415 andy31415 approved these changes

@jmartinez-silabs jmartinez-silabs jmartinez-silabs 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.

[Feature request] Script to update zap files to match GUI output / policy to run script on zap update

3 participants

@brdandu @andy31415 @jmartinez-silabs