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

Ensure all derived clusters have the base enum values #35489

Merged
merged 1 commit into from
Sep 10, 2024
Merged

Ensure all derived clusters have the base enum values #35489

merged 1 commit into from
Sep 10, 2024

Conversation

tcarmelveilleux
Copy link
Contributor

  • OperationalState and ModeBase cluster enum values did not include the base enums values. This causes all sorts of pain for anything based on .matter files or code-gened enum values.
  • This PR fixes the situation in the short term by having the ZAP XML include the necessary values

Testing done:

  • No changes of values, only added values

@tcarmelveilleux
Ensure all derived clusters have the base enum values
bec5e53 
- OperationalState and ModeBase cluster enum values did not
  include the base enums values. This causes all sorts of
  pain for anything based on .matter files or code-gened
  enum values.
- This PR fixes the situation in the short term by having the ZAP
  XML include the necessary values

Testing done:

- No changes of values, only added values
@semanticdiff-com SemanticDiff.com
Copy link

semanticdiff-com bot commented Sep 9, 2024 •
edited
Loading

Review changes with SemanticDiff.

Analyzed 1 of 26 files.

File Information
Filename Status
❔ zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h Unsupported file format
❔ zzz_generated/app-common/app-common/zap-generated/cluster-enums.h Unsupported file format
❔ src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h Unsupported file format
✔️ src/controller/python/chip/clusters/Objects.py Analyzed
❔ src/controller/data_model/controller-clusters.matter Unsupported file format
❔ src/app/zap-templates/zcl/data-model/chip/device-energy-management-mode-cluster.xml Unsupported file format
❔ src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml Unsupported file format
❔ src/app/zap-templates/zcl/data-model/chip/energy-evse-mode-cluster.xml Unsupported file format
❔ src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml Unsupported file format
❔ src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml Unsupported file format
❔ src/app/zap-templates/zcl/data-model/chip/mode-base-cluster.xml Unsupported file format
❔ src/app/zap-templates/zcl/data-model/chip/operational-state-cluster.xml Unsupported file format
❔ src/app/zap-templates/zcl/data-model/chip/operational-state-oven-cluster.xml Unsupported file format
❔ src/app/zap-templates/zcl/data-model/chip/operational-state-rvc-cluster.xml Unsupported file format
❔ src/app/zap-templates/zcl/data-model/chip/oven-mode-cluster.xml Unsupported file format
❔ src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml Unsupported file format
❔ src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml Unsupported file format
❔ src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml Unsupported file format
❔ src/app/zap-templates/zcl/data-model/chip/water-heater-mode-cluster.xml Unsupported file format
❔ examples/rvc-app/rvc-common/rvc-app.matter Unsupported file format
❔ examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.matter Unsupported file format
❔ examples/laundry-washer-app/nxp/zap/laundry-washer-app.matter Unsupported file format
❔ examples/energy-management-app/energy-management-common/energy-management-app.matter Unsupported file format
❔ examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter Unsupported file format
❔ examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter Unsupported file format
❔ examples/all-clusters-app/all-clusters-common/all-clusters-app.matter Unsupported file format

@github-actions GitHub Actions
Copy link

github-actions bot commented Sep 9, 2024 •
edited
Loading

PR #35489: Size comparison from 78830a0 to bec5e53

Increases above 0.2%:

platform target config section 78830a0 bec5e53 change % change
linux all-clusters-app debug RAM 510840 514296 3456 0.7
chip-tool debug RAM 558570 562186 3616 0.6
chip-tool-ipv6only arm64 RAM 608672 612312 3640 0.6
fabric-admin debug RAM 557562 561210 3648 0.7
tv-app debug RAM 583512 586968 3456 0.6
tv-casting-app debug RAM 646200 649912 3712 0.6
Full report (77 builds for bl602, bl702, bl702l, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
platform target config section 78830a0 bec5e53 change % change
bl602 lighting-app bl602 FLASH 1276224 1276224 0 0.0
RAM 95800 95800 0 0.0
bl602+mfd FLASH 1290332 1290332 0 0.0
RAM 95944 95944 0 0.0
bl602+rpc FLASH 1315180 1315180 0 0.0
RAM 104224 104224 0 0.0
bl702 lighting-app bl702 FLASH 942516 942516 0 0.0
RAM 15137 15137 0 0.0
bl702+mfd FLASH 944914 944914 0 0.0
RAM 15281 15281 0 0.0
bl702+rpc FLASH 1037836 1037836 0 0.0
RAM 24149 24149 0 0.0
bl706-eth FLASH 645588 645588 0 0.0
RAM 25233 25233 0 0.0
bl706-wifi FLASH 892496 892496 0 0.0
RAM 14453 14453 0 0.0
bl702l lighting-app bl702l FLASH 959176 959176 0 0.0
RAM 16812 16812 0 0.0
bl702l+mfd FLASH 961796 961796 0 0.0
RAM 16956 16956 0 0.0
cyw30739 light CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 675889 675889 0 0.0
RAM 78460 78460 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 695749 695749 0 0.0
RAM 81092 81092 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 695749 695749 0 0.0
RAM 81092 81092 0 0.0
CYW930739M2EVB-02 unknown 2040 2040 0 0.0
FLASH 652685 652685 0 0.0
RAM 73528 73528 0 0.0
light-switch CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 612257 612257 0 0.0
RAM 71436 71436 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 631893 631893 0 0.0
RAM 73988 73988 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 631893 631893 0 0.0
RAM 73988 73988 0 0.0
lock CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 631409 631409 0 0.0
RAM 74476 74476 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 651125 651125 0 0.0
RAM 77028 77028 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 651125 651125 0 0.0
RAM 77028 77028 0 0.0
thermostat CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 606917 606917 0 0.0
RAM 68580 68580 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 626769 626769 0 0.0
RAM 71212 71212 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 626769 626769 0 0.0
RAM 71212 71212 0 0.0
efr32 lighting-app BRD4187C FLASH 931396 931388 -8 -0.0
RAM 135024 135024 0 0.0
lock-app BRD4338a FLASH 739324 739324 0 0.0
RAM 197112 197112 0 0.0
window-app BRD4187C FLASH 1014544 1014536 -8 -0.0
RAM 126964 126964 0 0.0
esp32 all-clusters-app c3devkit DRAM 94136 94136 0 0.0
FLASH 1538430 1538430 0 0.0
IRAM 82538 82538 0 0.0
m5stack DRAM 115072 115072 0 0.0
FLASH 1548862 1548858 -4 -0.0
IRAM 117039 117039 0 0.0
linux air-purifier-app debug unknown 4688 4688 0 0.0
FLASH 2768253 2768253 0 0.0
RAM 128808 128808 0 0.0
all-clusters-app debug unknown 5456 5456 0 0.0
FLASH 6079122 6079186 64 0.0
RAM 510840 514296 3456 0.7
all-clusters-minimal-app debug unknown 5352 5352 0 0.0
FLASH 5403236 5403236 0 0.0
RAM 240648 240648 0 0.0
bridge-app debug unknown 5336 5336 0 0.0
FLASH 4737058 4737058 0 0.0
RAM 217640 217640 0 0.0
chip-tool debug unknown 5888 5888 0 0.0
FLASH 12653798 12664936 11138 0.1
RAM 558570 562186 3616 0.6
chip-tool-ipv6only arm64 unknown 20376 20384 8 0.0
FLASH 11325732 11336964 11232 0.1
RAM 608672 612312 3640 0.6
fabric-admin debug unknown 5720 5720 0 0.0
FLASH 10961327 10971937 10610 0.1
RAM 557562 561210 3648 0.7
fabric-bridge-app debug unknown 4568 4568 0 0.0
FLASH 4559860 4559860 0 0.0
RAM 204288 204288 0 0.0
lighting-app debug+rpc+ui unknown 5984 5984 0 0.0
FLASH 5673185 5673185 0 0.0
RAM 227928 227928 0 0.0
lock-app debug unknown 5272 5272 0 0.0
FLASH 4786614 4786614 0 0.0
RAM 203728 203728 0 0.0
ota-provider-app debug unknown 4648 4648 0 0.0
FLASH 4419788 4419788 0 0.0
RAM 197496 197496 0 0.0
ota-requestor-app debug unknown 4584 4584 0 0.0
FLASH 4558364 4558364 0 0.0
RAM 202032 202032 0 0.0
shell debug unknown 4216 4216 0 0.0
FLASH 3105469 3105469 0 0.0
RAM 159520 159520 0 0.0
thermostat-no-ble arm64 unknown 9320 9320 0 0.0
FLASH 4330692 4330692 0 0.0
RAM 242240 242240 0 0.0
tv-app debug unknown 5552 5552 0 0.0
FLASH 6018869 6018901 32 0.0
RAM 583512 586968 3456 0.6
tv-casting-app debug unknown 5208 5208 0 0.0
FLASH 10859293 10870589 11296 0.1
RAM 646200 649912 3712 0.6
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 914064 914064 0 0.0
RAM 142252 142252 0 0.0
nrf7002dk_nrf5340_cpuapp FLASH 885732 885732 0 0.0
RAM 140391 140391 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 FLASH 845456 845456 0 0.0
RAM 141070 141070 0 0.0
nxp contact k32w0+release FLASH 579500 579500 0 0.0
RAM 70676 70676 0 0.0
k32w1+release FLASH 593328 593328 0 0.0
RAM 62712 62712 0 0.0
light k32w0+release FLASH 615128 615128 0 0.0
RAM 70140 70140 0 0.0
k32w1+release FLASH 676952 676952 0 0.0
RAM 47848 47848 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1645964 1645964 0 0.0
RAM 210944 210944 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1549596 1549596 0 0.0
RAM 207656 207656 0 0.0
light cy8ckit_062s2_43012 FLASH 1465436 1465436 0 0.0
RAM 200656 200656 0 0.0
lock cy8ckit_062s2_43012 FLASH 1462180 1462180 0 0.0
RAM 225000 225000 0 0.0
qpg lighting-app qpg6105+debug FLASH 657804 657804 0 0.0
RAM 105192 105192 0 0.0
lock-app qpg6105+debug FLASH 615960 615960 0 0.0
RAM 99660 99660 0 0.0
stm32 light STM32WB5MM-DK FLASH 479320 479320 0 0.0
RAM 144644 144644 0 0.0
telink air-quality-sensor-app tlsr9528a_retention FLASH 620810 620810 0 0.0
RAM 50940 50940 0 0.0
all-clusters-app tlsr9118bdk40d FLASH 686304 686304 0 0.0
RAM 149584 149584 0 0.0
all-clusters-minimal-app tlsr9528a FLASH 778744 778744 0 0.0
RAM 110744 110744 0 0.0
bridge-app tlsr9258a FLASH 679804 679804 0 0.0
RAM 91596 91596 0 0.0
contact-sensor-app tlsr9528a_retention FLASH 620574 620574 0 0.0
RAM 50892 50892 0 0.0
light-switch-app-ota-shell-factory-data tlsr9528a FLASH 706568 706568 0 0.0
RAM 74232 74232 0 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 622758 622758 0 0.0
RAM 145476 145476 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 808888 808888 0 0.0
RAM 99400 99400 0 0.0
lock-app-dfu tlsr9528a FLASH 654424 654424 0 0.0
RAM 66952 66952 0 0.0
ota-requestor-app tlsr9258a FLASH 695840 695840 0 0.0
RAM 91188 91188 0 0.0
pump-app-usb tlsr9518adk80d FLASH 632112 632112 0 0.0
RAM 55760 55760 0 0.0
pump-controller-app tlsr9518adk80d FLASH 609360 609360 0 0.0
RAM 53004 53004 0 0.0
shell tlsr9518adk80d FLASH 467196 467196 0 0.0
RAM 68668 68668 0 0.0
smoke_co_alarm-app tlsr9528a_retention FLASH 627352 627352 0 0.0
RAM 52612 52612 0 0.0
temperature-measurement-app-mars-ota tlsr9518adk80d FLASH 651496 651496 0 0.0
RAM 56552 56552 0 0.0
thermostat tlsr9518adk80d FLASH 636092 636092 0 0.0
RAM 53408 53408 0 0.0
window-covering tlsr9118bdk40d FLASH 521504 521504 0 0.0
RAM 98452 98452 0 0.0
tizen all-clusters-app arm unknown 4840 4840 0 0.0
FLASH 1722416 1722416 0 0.0
RAM 89548 89548 0 0.0
chip-tool-ubsan arm unknown 10276 10280 4 0.0
FLASH 17501426 17518634 17208 0.1
RAM 7597300 7607272 9972 0.1

@mergify mergify bot merged commit 2d0135d into project-chip:master Sep 10, 2024
68 checks passed
yyzhong-g pushed a commit to yyzhong-g/connectedhomeip that referenced this pull request Dec 12, 2024
@tcarmelveilleux @yyzhong-g
Ensure all derived clusters have the base enum values (project-chip#3…
730a619 
…5489)

- OperationalState and ModeBase cluster enum values did not
  include the base enums values. This causes all sorts of
  pain for anything based on .matter files or code-gened
  enum values.
- This PR fixes the situation in the short term by having the ZAP
  XML include the necessary values

Testing done:

- No changes of values, only added values
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andyg-apple andyg-apple Awaiting requested review from andyg-apple

@anush-apple anush-apple Awaiting requested review from anush-apple

@arkq arkq Awaiting requested review from arkq

@andy31415 andy31415 Awaiting requested review from andy31415

@axelnxp axelnxp Awaiting requested review from axelnxp

@bauerschwan bauerschwan Awaiting requested review from bauerschwan

@bzbarsky-apple bzbarsky-apple Awaiting requested review from bzbarsky-apple

@carol-apple carol-apple Awaiting requested review from carol-apple

@chapongatien chapongatien Awaiting requested review from chapongatien

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@cliffamzn cliffamzn Awaiting requested review from cliffamzn

@Damian-Nordic Damian-Nordic Awaiting requested review from Damian-Nordic

@dhrishi dhrishi Awaiting requested review from dhrishi

@doru91 doru91 Awaiting requested review from doru91

@fessehaeve fessehaeve Awaiting requested review from fessehaeve

@harimau-qirex harimau-qirex Awaiting requested review from harimau-qirex

@harsha-rajendran harsha-rajendran Awaiting requested review from harsha-rajendran

@hawk248 hawk248 Awaiting requested review from hawk248

@hicklin hicklin Awaiting requested review from hicklin

@jepenven-silabs jepenven-silabs Awaiting requested review from jepenven-silabs

@jmartinez-silabs jmartinez-silabs Awaiting requested review from jmartinez-silabs

@jmeg-sfy jmeg-sfy Awaiting requested review from jmeg-sfy

@joonhaengHeo joonhaengHeo Awaiting requested review from joonhaengHeo

@jtung-apple jtung-apple Awaiting requested review from jtung-apple

@kiel-apple kiel-apple Awaiting requested review from kiel-apple

@kkasperczyk-no kkasperczyk-no Awaiting requested review from kkasperczyk-no

@kpschoedel kpschoedel Awaiting requested review from kpschoedel

@ksperling-apple ksperling-apple Awaiting requested review from ksperling-apple

@lazarkov lazarkov Awaiting requested review from lazarkov

@lpbeliveau-silabs lpbeliveau-silabs Awaiting requested review from lpbeliveau-silabs

@LuDuda LuDuda Awaiting requested review from LuDuda

@mhazley mhazley Awaiting requested review from mhazley

@mkardous-silabs mkardous-silabs Awaiting requested review from mkardous-silabs

@mspang mspang Awaiting requested review from mspang

@nivi-apple nivi-apple Awaiting requested review from nivi-apple

@p0fi p0fi Awaiting requested review from p0fi

@pidarped pidarped Awaiting requested review from pidarped

@plauric plauric Awaiting requested review from plauric

@rcasallas-silabs rcasallas-silabs Awaiting requested review from rcasallas-silabs

@ReneJosefsen ReneJosefsen Awaiting requested review from ReneJosefsen

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@sharadb-amazon sharadb-amazon Awaiting requested review from sharadb-amazon

@tecimovic tecimovic Awaiting requested review from tecimovic

@tehampson tehampson Awaiting requested review from tehampson

@tima-q tima-q Awaiting requested review from tima-q

@tobiasgraf tobiasgraf Awaiting requested review from tobiasgraf

@turon turon Awaiting requested review from turon

@vivien-apple vivien-apple Awaiting requested review from vivien-apple

@wiba-nordic wiba-nordic Awaiting requested review from wiba-nordic

@younghak-hwang younghak-hwang Awaiting requested review from younghak-hwang

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

@yunhanw-google yunhanw-google Awaiting requested review from yunhanw-google

@woody-apple woody-apple Awaiting requested review from woody-apple

Assignees
No one assigned
Labels
app controller darwin examples review - approved
Projects
[Platform] Darwin
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tcarmelveilleux @andy31415 @woody-apple