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

XML changes for OccupancySensing rev 5 #34163

Merged
merged 6 commits into from
Jul 2, 2024
Merged

XML changes for OccupancySensing rev 5 #34163

merged 6 commits into from
Jul 2, 2024

Conversation

tcarmelveilleux
Copy link
Contributor

  • Matter 1.4 has OccupancySensing Rev 5 cluster
  • There were new features and attributes added
  • This PR updates the ZAP XML to account for the changes

No functional changes. ZAP/codegen-only.

@tcarmelveilleux tcarmelveilleux added Spec XML align SDK XML does not match the spec (including naming, etc) occupancy labels Jul 2, 2024
@tcarmelveilleux tcarmelveilleux added this to the 1.4 Test Complete milestone Jul 2, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Jul 2, 2024 •
edited
Loading

PR #34163: Size comparison from ca57b59 to 815847f

Full report (85 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, mbed, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
platform target config section ca57b59 815847f change % change
bl602 lighting-app bl602 FLASH 1271088 1271088 0 0.0
RAM 95328 95328 0 0.0
bl602+mfd FLASH 1285602 1285602 0 0.0
RAM 95472 95472 0 0.0
bl602+rpc FLASH 1310304 1310304 0 0.0
RAM 103752 103752 0 0.0
bl702 lighting-app bl702 FLASH 1092238 1092238 0 0.0
RAM 15161 15161 0 0.0
bl702+mfd FLASH 1102932 1102932 0 0.0
RAM 15313 15313 0 0.0
bl702+rpc FLASH 1182048 1182048 0 0.0
RAM 24181 24181 0 0.0
bl706-eth FLASH 875328 875328 0 0.0
RAM 27272 27272 0 0.0
bl706-wifi FLASH 1127724 1127724 0 0.0
RAM 14605 14605 0 0.0
bl702l lighting-app bl702l FLASH 1079124 1079124 0 0.0
RAM 21732 21732 0 0.0
bl702l+mfd FLASH 1090386 1090386 0 0.0
RAM 21892 21892 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 FLASH 797344 797344 0 0.0
RAM 106636 106636 0 0.0
lock-ftd LP_EM_CC1354P10_6 FLASH 816260 816260 0 0.0
RAM 116948 116948 0 0.0
lock-mtd LP_EM_CC1354P10_6 FLASH 807712 807712 0 0.0
RAM 111236 111236 0 0.0
pump-app LP_EM_CC1354P10_6 FLASH 760552 760552 0 0.0
RAM 105328 105328 0 0.0
pump-controller-app LP_EM_CC1354P10_6 FLASH 746272 746272 0 0.0
RAM 105576 105576 0 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL FLASH 606186 606186 0 0.0
RAM 204508 204508 0 0.0
lock CC3235SF_LAUNCHXL FLASH 651214 651214 0 0.0
RAM 204780 204780 0 0.0
cyw30739 light CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 666345 666345 0 0.0
RAM 75100 75100 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 686197 686197 0 0.0
RAM 77732 77732 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 686197 686197 0 0.0
RAM 77732 77732 0 0.0
CYW930739M2EVB-02 unknown 2040 2040 0 0.0
FLASH 643133 643133 0 0.0
RAM 70168 70168 0 0.0
light-switch CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 608873 608873 0 0.0
RAM 70804 70804 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 628517 628517 0 0.0
RAM 73356 73356 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 628517 628517 0 0.0
RAM 73356 73356 0 0.0
lock CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 624401 624401 0 0.0
RAM 73820 73820 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 644117 644117 0 0.0
RAM 76372 76372 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 644117 644117 0 0.0
RAM 76372 76372 0 0.0
thermostat CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 592973 592973 0 0.0
RAM 67788 67788 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 612825 612825 0 0.0
RAM 70420 70420 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 612825 612825 0 0.0
RAM 70420 70420 0 0.0
efr32 lighting-app BRD4187C FLASH 923444 923436 -8 -0.0
RAM 134996 134996 0 0.0
lock-app BRD4338a FLASH 740132 740132 0 0.0
RAM 203996 203996 0 0.0
window-app BRD4187C FLASH 1012376 1012368 -8 -0.0
RAM 129632 129632 0 0.0
esp32 all-clusters-app c3devkit DRAM 88396 88396 0 0.0
FLASH 1467894 1467894 0 0.0
IRAM 75570 75570 0 0.0
m5stack DRAM 114868 114868 0 0.0
FLASH 1536763 1536747 -16 -0.0
IRAM 125403 125403 0 0.0
linux air-purifier-app debug unknown 4592 4592 0 0.0
FLASH 2530112 2530112 0 0.0
RAM 125112 125112 0 0.0
all-clusters-app debug unknown 5368 5368 0 0.0
FLASH 5582158 5582254 96 0.0
RAM 487512 487960 448 0.1
all-clusters-minimal-app debug unknown 5288 5288 0 0.0
FLASH 5052328 5052328 0 0.0
RAM 232936 232936 0 0.0
bridge-app debug unknown 5256 5256 0 0.0
FLASH 4478328 4478328 0 0.0
RAM 212832 212832 0 0.0
chip-tool debug unknown 5728 5728 0 0.0
FLASH 11693799 11709575 15776 0.1
RAM 542146 543010 864 0.2
chip-tool-ipv6only arm64 unknown 19992 20016 24 0.1
FLASH 10811980 10827020 15040 0.1
RAM 591072 591960 888 0.2
fabric-admin debug unknown 5592 5592 0 0.0
FLASH 10674727 10688471 13744 0.1
RAM 536210 537074 864 0.2
fabric-bridge-app debug unknown 5264 5264 0 0.0
FLASH 4348856 4348856 0 0.0
RAM 204960 204960 0 0.0
lighting-app debug+rpc+ui unknown 5936 5936 0 0.0
FLASH 5373570 5373570 0 0.0
RAM 221640 221640 0 0.0
lock-app debug unknown 5192 5192 0 0.0
FLASH 4541896 4541896 0 0.0
RAM 200248 200248 0 0.0
ota-provider-app debug unknown 4576 4576 0 0.0
FLASH 4197768 4197768 0 0.0
RAM 194544 194544 0 0.0
ota-requestor-app debug unknown 4512 4512 0 0.0
FLASH 4323128 4323128 0 0.0
RAM 199168 199168 0 0.0
shell debug unknown 4112 4112 0 0.0
FLASH 2795373 2795373 0 0.0
RAM 150480 150480 0 0.0
thermostat-no-ble arm64 unknown 9184 9184 0 0.0
FLASH 4168236 4168236 0 0.0
RAM 235864 235864 0 0.0
tv-app debug unknown 5472 5472 0 0.0
FLASH 5605592 5605592 0 0.0
RAM 341800 341800 0 0.0
tv-casting-app debug unknown 5096 5096 0 0.0
FLASH 9862958 9878958 16000 0.2
RAM 400024 400552 528 0.1
mbed lock-app-release cy8cproto_062_4343w FLASH 1502428 1502428 0 0.0
RAM 226656 226656 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 881340 881340 0 0.0
RAM 139693 139693 0 0.0
nrf7002dk_nrf5340_cpuapp FLASH 951852 951852 0 0.0
RAM 138121 138121 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 FLASH 826848 826848 0 0.0
RAM 138591 138591 0 0.0
nxp contact k32w0+release FLASH 575996 575996 0 0.0
RAM 70024 70024 0 0.0
k32w1+release FLASH 591232 591232 0 0.0
RAM 74056 74056 0 0.0
light k32w0+release FLASH 610120 610120 0 0.0
RAM 69500 69500 0 0.0
k32w1+release FLASH 674824 674824 0 0.0
RAM 82816 82816 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1613772 1613772 0 0.0
RAM 207148 207148 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1534540 1534540 0 0.0
RAM 204052 204052 0 0.0
light cy8ckit_062s2_43012 FLASH 1461404 1461404 0 0.0
RAM 197332 197332 0 0.0
lock cy8ckit_062s2_43012 FLASH 1463268 1463268 0 0.0
RAM 224396 224396 0 0.0
qpg lighting-app qpg6105+debug FLASH 651156 651156 0 0.0
RAM 104564 104564 0 0.0
lock-app qpg6105+debug FLASH 611280 611280 0 0.0
RAM 99240 99240 0 0.0
stm32 light STM32WB5MM-DK FLASH 472544 472544 0 0.0
RAM 141652 141652 0 0.0
telink air-quality-sensor-app tlsr9528a_retention FLASH 632646 632646 0 0.0
RAM 50528 50528 0 0.0
all-clusters-app tlsr9118bdk40d FLASH 657320 657320 0 0.0
RAM 145872 145872 0 0.0
all-clusters-minimal-app tlsr9528a FLASH 777624 777624 0 0.0
RAM 110684 110684 0 0.0
bridge-app tlsr9258a FLASH 675642 675642 0 0.0
RAM 95304 95304 0 0.0
contact-sensor-app tlsr9528a_retention FLASH 634230 634230 0 0.0
RAM 50572 50572 0 0.0
light-switch-app-ota-shell-factory-data tlsr9528a FLASH 720030 720030 0 0.0
RAM 77148 77148 0 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 612458 612458 0 0.0
RAM 142104 142104 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 800244 800244 0 0.0
RAM 100508 100508 0 0.0
lock-app-dfu tlsr9528a FLASH 665804 665804 0 0.0
RAM 69860 69860 0 0.0
ota-requestor-app tlsr9258a FLASH 694972 694972 0 0.0
RAM 95028 95028 0 0.0
pump-app tlsr9518adk80d FLASH 616504 616504 0 0.0
RAM 56952 56952 0 0.0
pump-controller-app tlsr9518adk80d FLASH 606888 606888 0 0.0
RAM 56752 56752 0 0.0
shell tlsr9518adk80d FLASH 466214 466214 0 0.0
RAM 72484 72484 0 0.0
smoke_co_alarm-app tlsr9528a_retention FLASH 640844 640844 0 0.0
RAM 52200 52200 0 0.0
temperature-measurement-app-mars-ota tlsr9518adk80d FLASH 650714 650714 0 0.0
RAM 60388 60388 0 0.0
thermostat tlsr9518adk80d FLASH 625778 625778 0 0.0
RAM 57084 57084 0 0.0
window-covering tlsr9118bdk40d FLASH 519004 519004 0 0.0
RAM 97800 97800 0 0.0
tizen all-clusters-app arm unknown 1584 1584 0 0.0
FLASH 1633856 1633856 0 0.0
RAM 46012 46012 0 0.0
chip-tool-ubsan arm unknown 2384 2384 0 0.0
FLASH 16120290 16149514 29224 0.2
RAM 7084980 7095116 10136 0.1

@mergify mergify bot merged commit fba5793 into project-chip:master Jul 2, 2024
71 checks passed
@OliverFan1
Copy link
Contributor

OliverFan1 commented Jul 4, 2024 •
edited
Loading

Hi @tcarmelveilleux ,
From your PR, I find the cluster revision of occupancy sensing cluster in all-clusters-app.matter and in controller-clusters.matter is still 4, not being changed to 5.
May I ask why? Thanks!

@bzbarsky-apple
Copy link
Contributor

@OliverFan1 The cluster revision is stored in .zap files and does not necessarily match the XML.

That said, we have a script to update it in all the .zap files: scripts/tools/zap/update_cluster_revisions.py

austina-csa pushed a commit to austina-csa/connectedhomeip that referenced this pull request Jul 10, 2024
@tcarmelveilleux @restyled-commits @austina-csa
XML changes for OccupancySensing rev 5 (project-chip#34163)
147984d 
* Updated occupancy sensing cluster XML to Rev 5 (Matter 1.4)

* Regen ZAP

* Fix codegen

* Add missing Kotlin generated files

* Restyled by whitespace

* Restyled by prettier-json

---------

Co-authored-by: Restyled.io <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jmartinez-silabs jmartinez-silabs jmartinez-silabs approved these changes

@andy31415 andy31415 andy31415 approved these changes

@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

@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

@cecille cecille Awaiting requested review from cecille

@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

@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

@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

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

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

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

Assignees
No one assigned
Labels
app controller darwin examples occupancy review - approved Spec XML align SDK XML does not match the spec (including naming, etc)
Projects
[Device Type] Ambient Sensing
Status: Done
[Feature] Lighting & Occupancy
Status: Done
[Feature] Occupancy Sensing updates for Ambient Sensing
Status: No status
[Platform] Darwin
Status: Done
Milestone
1.4 Test Complete
Development

Successfully merging this pull request may close these issues.
6 participants
@tcarmelveilleux @OliverFan1 @bzbarsky-apple @andy31415 @jmartinez-silabs @restyled-commits