Skip to content

Fix handling of global enums in ZAP templates.#38733

Merged
mergify[bot] merged 1 commit into
project-chip:masterfrom
bzbarsky-apple:fix-templates-enums-bitmaps
May 5, 2025
Merged

Fix handling of global enums in ZAP templates.#38733
mergify[bot] merged 1 commit into
project-chip:masterfrom
bzbarsky-apple:fix-templates-enums-bitmaps

Conversation

@bzbarsky-apple
Copy link
Copy Markdown
Contributor

@bzbarsky-apple bzbarsky-apple commented May 2, 2025

We were passing in different information for the enum declaration and the cast to the enum type that initializes it. Should be passing the same information.

Testing

Checked that with the ZAP updates in project-chip/zap#1593 this does the right thing for enums/bitmaps.

@bzbarsky-apple
Fix handling of global enums in ZAP templates.
f897b14 
We were passing in different information for the enum declaration and the cast
to the enum type that initializes it.  Should be passing the same information.
@github-actions github-actions Bot added the app label May 2, 2025
@bzbarsky-apple bzbarsky-apple mentioned this pull request May 2, 2025
Merged
@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 2, 2025 •
edited
Loading

PR #38733: Size comparison from 0623029 to f897b14

Full report (72 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nxp, psoc6, qpg, stm32, telink, tizen)
platform target config section 0623029 f897b14 change % change
bl602 lighting-app bl602+mfd+littlefs+rpc FLASH 1102926 1102926 0 0.0
RAM 94866 94866 0 0.0
bl702 lighting-app bl702+eth FLASH 657772 657772 0 0.0
RAM 33637 33637 0 0.0
bl702+wifi FLASH 834770 834770 0 0.0
RAM 22361 22361 0 0.0
bl706+mfd+rpc+littlefs FLASH 1067550 1067550 0 0.0
RAM 32285 32285 0 0.0
bl702l contact-sensor-app bl702l+mfd+littlefs FLASH 898438 898438 0 0.0
RAM 27024 27024 0 0.0
lighting-app bl702l+mfd+littlefs FLASH 980970 980970 0 0.0
RAM 24772 24772 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 FLASH 822180 822180 0 0.0
RAM 120296 120296 0 0.0
lock-ftd LP_EM_CC1354P10_6 FLASH 831952 831952 0 0.0
RAM 125432 125432 0 0.0
pump-app LP_EM_CC1354P10_6 FLASH 778360 778360 0 0.0
RAM 113780 113780 0 0.0
pump-controller-app LP_EM_CC1354P10_6 FLASH 762684 762684 0 0.0
RAM 113988 113988 0 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL FLASH 549042 549042 0 0.0
RAM 205192 205192 0 0.0
lock CC3235SF_LAUNCHXL FLASH 581090 581090 0 0.0
RAM 205440 205440 0 0.0
cyw30739 light CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 664341 664341 0 0.0
RAM 77304 77304 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 684193 684193 0 0.0
RAM 79944 79944 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 684193 684193 0 0.0
RAM 79944 79944 0 0.0
CYW930739M2EVB-02 unknown 2040 2040 0 0.0
FLASH 641133 641133 0 0.0
RAM 72372 72372 0 0.0
light-switch CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 624565 624565 0 0.0
RAM 73544 73544 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 644201 644201 0 0.0
RAM 76096 76096 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 644201 644201 0 0.0
RAM 76096 76096 0 0.0
lock CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 644829 644829 0 0.0
RAM 76568 76568 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 664537 664537 0 0.0
RAM 79120 79120 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 664537 664537 0 0.0
RAM 79120 79120 0 0.0
thermostat CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 621233 621233 0 0.0
RAM 70664 70664 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 641085 641085 0 0.0
RAM 73296 73296 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 641085 641085 0 0.0
RAM 73296 73296 0 0.0
efr32 lock-app BRD4187C FLASH 946348 946348 0 0.0
RAM 132096 132096 0 0.0
BRD4338a FLASH 741240 741240 0 0.0
RAM 206996 206996 0 0.0
window-app BRD4187C FLASH 1039048 1039040 -8 -0.0
RAM 128232 128232 0 0.0
esp32 all-clusters-app c3devkit DRAM 103328 103328 0 0.0
FLASH 1805914 1805914 0 0.0
IRAM 83846 83846 0 0.0
m5stack DRAM 121916 121916 0 0.0
FLASH 1771126 1771126 0 0.0
IRAM 117043 117043 0 0.0
linux air-purifier-app debug unknown 4848 4848 0 0.0
FLASH 2781645 2781645 0 0.0
RAM 114616 114616 0 0.0
all-clusters-app debug unknown 5656 5656 0 0.0
FLASH 6334504 6334504 0 0.0
RAM 529624 529624 0 0.0
all-clusters-minimal-app debug unknown 5528 5528 0 0.0
FLASH 5439664 5439664 0 0.0
RAM 224616 224616 0 0.0
bridge-app debug unknown 5560 5560 0 0.0
FLASH 4756192 4756192 0 0.0
RAM 204240 204240 0 0.0
camera-app debug unknown 8856 8856 0 0.0
FLASH 6885147 6885147 0 0.0
RAM 226448 226448 0 0.0
camera-controller debug unknown 9240 9240 0 0.0
FLASH 14013483 14013483 0 0.0
RAM 645136 645136 0 0.0
chip-tool debug unknown 6256 6256 0 0.0
FLASH 14231809 14231809 0 0.0
RAM 631696 631696 0 0.0
chip-tool-ipv6only arm64 unknown 39432 39432 0 0.0
FLASH 12284624 12284624 0 0.0
RAM 677760 677760 0 0.0
fabric-admin debug unknown 5936 5936 0 0.0
FLASH 12378017 12378017 0 0.0
RAM 631056 631056 0 0.0
fabric-bridge-app debug unknown 4808 4808 0 0.0
FLASH 4573040 4573040 0 0.0
RAM 190280 190280 0 0.0
fabric-sync debug unknown 5064 5064 0 0.0
FLASH 5712677 5712677 0 0.0
RAM 483000 483000 0 0.0
lighting-app debug+rpc+ui unknown 6264 6264 0 0.0
FLASH 5642577 5642577 0 0.0
RAM 207256 207256 0 0.0
lock-app debug unknown 5496 5496 0 0.0
FLASH 4816026 4816026 0 0.0
RAM 194488 194488 0 0.0
ota-provider-app debug unknown 4848 4848 0 0.0
FLASH 4435848 4435848 0 0.0
RAM 183720 183720 0 0.0
ota-requestor-app debug unknown 4800 4800 0 0.0
FLASH 4563558 4563558 0 0.0
RAM 187624 187624 0 0.0
shell debug unknown 4272 4272 0 0.0
FLASH 3075132 3075132 0 0.0
RAM 148008 148008 0 0.0
thermostat-no-ble arm64 unknown 9552 9552 0 0.0
FLASH 4227888 4227888 0 0.0
RAM 230992 230992 0 0.0
tv-app debug unknown 5832 5832 0 0.0
FLASH 6069813 6069813 0 0.0
RAM 607680 607680 0 0.0
tv-casting-app debug unknown 5416 5416 0 0.0
FLASH 12410205 12410205 0 0.0
RAM 749448 749448 0 0.0
nxp contact k32w0+release FLASH 592304 592304 0 0.0
RAM 72848 72848 0 0.0
mcxw71+release FLASH 624568 624568 0 0.0
RAM 63188 63188 0 0.0
light k32w0+release FLASH 618268 618268 0 0.0
RAM 72144 72144 0 0.0
k32w1+release FLASH 709032 709032 0 0.0
RAM 72036 72036 0 0.0
lock mcxw71+release FLASH 774048 774048 0 0.0
RAM 67612 67612 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1666060 1666060 0 0.0
RAM 212328 212328 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1570348 1570348 0 0.0
RAM 208504 208504 0 0.0
light cy8ckit_062s2_43012 FLASH 1447620 1447620 0 0.0
RAM 197320 197320 0 0.0
lock cy8ckit_062s2_43012 FLASH 1477476 1477476 0 0.0
RAM 225016 225016 0 0.0
qpg lighting-app qpg6105+debug FLASH 669196 669196 0 0.0
RAM 105200 105200 0 0.0
lock-app qpg6105+debug FLASH 627632 627632 0 0.0
RAM 99820 99820 0 0.0
stm32 light STM32WB5MM-DK FLASH 466540 466540 0 0.0
RAM 141504 141504 0 0.0
telink bridge-app tl7218x FLASH 677132 677132 0 0.0
700250 700250 0 0.0
RAM 90672 90672 0 0.0
101820 101820 0 0.0
light-app-ota-compress-lzma-factory-data tl3218x FLASH 781332 781332 0 0.0
RAM 50052 50052 0 0.0
light-app-ota-compress-lzma-shell-factory-data tl3218x FLASH 771592 771592 0 0.0
RAM 40352 40352 0 0.0
light-app-ota-shell-factory-data tl7218x FLASH 760066 760066 0 0.0
787984 787984 0 0.0
RAM 97472 97472 0 0.0
109240 109240 0 0.0
light-switch-app-ota-compress-lzma-factory-data tl7218x_retention FLASH 687100 687100 0 0.0
709210 709210 0 0.0
RAM 51520 51520 0 0.0
62552 62552 0 0.0
light-switch-app-ota-compress-lzma-shell-factory-data tlsr9528a FLASH 715550 715550 0 0.0
745392 745392 0 0.0
RAM 73340 73340 0 0.0
85740 85740 0 0.0
light-switch-app-ota-shell-factory-data tl3218x_retention FLASH 713080 713080 0 0.0
RAM 36976 36976 0 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 607570 607570 0 0.0
607112 607112 0 0.0
RAM 138572 138572 0 0.0
148636 148636 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 795068 795072 4 0.0
822598 822602 4 0.0
RAM 96328 96328 0 0.0
107500 107500 0 0.0
tizen all-clusters-app arm unknown 5176 5176 0 0.0
FLASH 1809216 1809216 0 0.0
RAM 94640 94640 0 0.0
chip-tool-ubsan arm unknown 20152 20152 0 0.0
FLASH 20261774 20261774 0 0.0
RAM 8823236 8823236 0 0.0

cecille
cecille approved these changes May 3, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@cecille cecille left a comment

Choose a reason for hiding this comment

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

This seems correct, but does zap need to be updated for this to work?

@bzbarsky-apple
Copy link
Copy Markdown
Contributor Author

bzbarsky-apple commented May 3, 2025

This seems correct, but does zap need to be updated for this to work?

Yes, that's project-chip/zap#1593

@mergify mergify Bot merged commit fae23dd into project-chip:master May 5, 2025
72 checks passed
@bzbarsky-apple bzbarsky-apple deleted the fix-templates-enums-bitmaps branch May 5, 2025 16:34
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

@cecille cecille cecille approved these changes

@kiel-apple kiel-apple kiel-apple approved these changes

Assignees

No one assigned

Labels

app review - approved

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@bzbarsky-apple @andy31415 @cecille @kiel-apple