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

[ICD] Set MaximumCheckInBackOff to external and fix define guards for… #36231

Merged
merged 1 commit into from
Oct 24, 2024
Merged

[ICD] Set MaximumCheckInBackOff to external and fix define guards for… #36231

merged 1 commit into from
Oct 24, 2024

Conversation

mkardous-silabs
Copy link
Contributor

Description

PR addresses two issues in the ICD server code :

  • MaximumCheckInBackOff attribute should have been set to external in the zcl json files. This was not done when the attributes were initially added to the xml.
  • In the ICDManager, a define guard was set to idef when the define was always set to 0 or 1. Updated the guard to correctly check the define value

Only the first comment as functionnal changes. The second is just the generation.
Cherrypick of #36223

CI and generation to validate the changes

@mkardous-silabs
[ICD] Set MaximumCheckInBackOff to external and fix define guards for…
a32aa84 
… unit test members (project-chip#36223)

* Fix ICD manager and attributes

* Generated files

* zap regen
@semanticdiff-com SemanticDiff.com
Copy link

semanticdiff-com bot commented Oct 24, 2024 •
edited
Loading

Review changes with SemanticDiff.

Analyzed 2 of 6 files.

Overall, the semantic diff is 67% smaller than the GitHub diff.

Filename Status
❔ zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp Unsupported file format
❔ zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h Unsupported file format
✔️ src/app/zap-templates/zcl/zcl-with-test-extensions.json 66.67% smaller
✔️ src/app/zap-templates/zcl/zcl.json 66.67% smaller
❔ src/app/icd/server/ICDManager.cpp Unsupported file format
❔ src/app/icd/server/ICDManager.h Unsupported file format

@github-actions github-actions bot added app icd Intermittently Connected Devices labels Oct 24, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Oct 24, 2024 •
edited
Loading

PR #36231: Size comparison from 09b7d4b to a32aa84

Full report (88 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
platform target config section 09b7d4b a32aa84 change % change
bl602 lighting-app bl602 FLASH 1280574 1280574 0 0.0
RAM 96000 96000 0 0.0
bl602+mfd FLASH 1308622 1308622 0 0.0
RAM 95656 95656 0 0.0
bl602+rpc FLASH 1335242 1335242 0 0.0
RAM 103976 103976 0 0.0
bl702 lighting-app bl702 FLASH 944974 944974 0 0.0
RAM 15105 15105 0 0.0
bl702+mfd FLASH 957428 957428 0 0.0
RAM 14769 14769 0 0.0
bl702+rpc FLASH 1051132 1051132 0 0.0
RAM 23661 23661 0 0.0
bl706-eth FLASH 658106 658106 0 0.0
RAM 24745 24745 0 0.0
bl706-wifi FLASH 824902 824902 0 0.0
RAM 13965 13965 0 0.0
bl702l lighting-app bl702l FLASH 961910 961910 0 0.0
RAM 16804 16804 0 0.0
bl702l+mfd FLASH 974672 974672 0 0.0
RAM 16468 16468 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 FLASH 829316 829316 0 0.0
RAM 123452 123452 0 0.0
lock-ftd LP_EM_CC1354P10_6 FLASH 814648 814648 0 0.0
RAM 125332 125332 0 0.0
pump-app LP_EM_CC1354P10_6 FLASH 761196 761196 0 0.0
RAM 113824 113824 0 0.0
pump-controller-app LP_EM_CC1354P10_6 FLASH 745432 745432 0 0.0
RAM 114016 114016 0 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL FLASH 616922 616922 0 0.0
RAM 205908 205908 0 0.0
lock CC3235SF_LAUNCHXL FLASH 657010 657010 0 0.0
RAM 206060 206060 0 0.0
cyw30739 light CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 678277 678277 0 0.0
RAM 78668 78668 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 698129 698129 0 0.0
RAM 81300 81300 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 698129 698129 0 0.0
RAM 81300 81300 0 0.0
CYW930739M2EVB-02 unknown 2040 2040 0 0.0
FLASH 655065 655065 0 0.0
RAM 73736 73736 0 0.0
light-switch CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 614621 614621 0 0.0
RAM 71628 71628 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 634249 634249 0 0.0
RAM 74180 74180 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 634249 634249 0 0.0
RAM 74180 74180 0 0.0
lock CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 633933 633933 0 0.0
RAM 74676 74676 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 653649 653649 0 0.0
RAM 77228 77228 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 653649 653649 0 0.0
RAM 77228 77228 0 0.0
thermostat CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 609237 609229 -8 -0.0
RAM 68764 68764 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 629097 629089 -8 -0.0
RAM 71396 71396 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 629097 629089 -8 -0.0
RAM 71396 71396 0 0.0
efr32 lighting-app BRD4187C FLASH 934068 934060 -8 -0.0
RAM 136244 136244 0 0.0
lock-app BRD2605a FLASH 741240 741216 -24 -0.0
RAM 232120 232120 0 0.0
BRD4338a FLASH 741688 741664 -24 -0.0
RAM 232004 232004 0 0.0
window-app BRD4187C FLASH 1017504 1017496 -8 -0.0
RAM 128176 128176 0 0.0
esp32 all-clusters-app c3devkit DRAM 94240 94240 0 0.0
FLASH 1538428 1538428 0 0.0
IRAM 82538 82538 0 0.0
m5stack DRAM 115192 115192 0 0.0
FLASH 1548854 1548858 4 0.0
IRAM 117039 117039 0 0.0
linux air-purifier-app debug unknown 4688 4688 0 0.0
FLASH 2778809 2778809 0 0.0
RAM 129488 129488 0 0.0
all-clusters-app debug unknown 5528 5528 0 0.0
FLASH 6082754 6082754 0 0.0
RAM 510528 510528 0 0.0
all-clusters-minimal-app debug unknown 5424 5424 0 0.0
FLASH 5416038 5416038 0 0.0
RAM 241200 241200 0 0.0
bridge-app debug unknown 5408 5408 0 0.0
FLASH 4749458 4749458 0 0.0
RAM 218384 218384 0 0.0
chip-tool debug unknown 5960 5960 0 0.0
FLASH 12654276 12654276 0 0.0
RAM 560626 560626 0 0.0
chip-tool-ipv6only arm64 unknown 20672 20672 0 0.0
FLASH 11292624 11292624 0 0.0
RAM 610944 610944 0 0.0
fabric-admin debug unknown 5792 5792 0 0.0
FLASH 11006929 11006929 0 0.0
RAM 560058 560058 0 0.0
fabric-bridge-app debug unknown 4632 4632 0 0.0
FLASH 4572424 4572424 0 0.0
RAM 205048 205048 0 0.0
lighting-app debug+rpc+ui unknown 6056 6056 0 0.0
FLASH 5689265 5689265 0 0.0
RAM 228456 228456 0 0.0
lock-app debug unknown 5344 5344 0 0.0
FLASH 4799054 4799054 0 0.0
RAM 204472 204472 0 0.0
ota-provider-app debug unknown 4720 4720 0 0.0
FLASH 4428442 4428442 0 0.0
RAM 198192 198192 0 0.0
ota-requestor-app debug unknown 4656 4656 0 0.0
FLASH 4567258 4567258 0 0.0
RAM 202760 202760 0 0.0
shell debug unknown 4216 4216 0 0.0
FLASH 3108845 3108845 0 0.0
RAM 159280 159280 0 0.0
thermostat-no-ble arm64 unknown 9448 9448 0 0.0
FLASH 4317136 4317136 0 0.0
RAM 242888 242888 0 0.0
tv-app debug unknown 5624 5624 0 0.0
FLASH 6026885 6026885 0 0.0
RAM 584064 584064 0 0.0
tv-casting-app debug unknown 5208 5208 0 0.0
FLASH 10848349 10848349 0 0.0
RAM 648912 648912 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 914212 914212 0 0.0
RAM 142359 142359 0 0.0
nrf7002dk_nrf5340_cpuapp FLASH 885000 885000 0 0.0
RAM 140498 140498 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 FLASH 847628 847628 0 0.0
RAM 141253 141253 0 0.0
nxp contact k32w0+release FLASH 581976 581976 0 0.0
RAM 70944 70944 0 0.0
k32w1+release FLASH 596672 596672 0 0.0
RAM 63168 63168 0 0.0
mcxw71+release FLASH 596432 596432 0 0.0
RAM 63168 63168 0 0.0
light k32w0+release FLASH 618564 618564 0 0.0
RAM 70416 70416 0 0.0
k32w1+release FLASH 682664 682664 0 0.0
RAM 48808 48808 0 0.0
mcxw71+release FLASH 682664 682664 0 0.0
RAM 48808 48808 0 0.0
lock k32w1+release FLASH 705032 705024 -8 -0.0
RAM 67308 67308 0 0.0
mcxw71+release FLASH 705040 705032 -8 -0.0
RAM 67308 67308 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1646092 1646092 0 0.0
RAM 211400 211400 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1552148 1552148 0 0.0
RAM 208200 208200 0 0.0
light cy8ckit_062s2_43012 FLASH 1467620 1467620 0 0.0
RAM 201200 201200 0 0.0
lock cy8ckit_062s2_43012 FLASH 1464692 1464692 0 0.0
RAM 225560 225560 0 0.0
qpg lighting-app qpg6105+debug FLASH 660312 660312 0 0.0
RAM 105396 105396 0 0.0
lock-app qpg6105+debug FLASH 618324 618324 0 0.0
RAM 99864 99864 0 0.0
stm32 light STM32WB5MM-DK FLASH 481608 481608 0 0.0
RAM 144844 144844 0 0.0
telink air-quality-sensor-app tlsr9528a_retention FLASH 620712 620708 -4 -0.0
RAM 50648 50648 0 0.0
all-clusters-app tlsr9118bdk40d FLASH 687912 687912 0 0.0
RAM 148488 148488 0 0.0
all-clusters-minimal-app tlsr9528a FLASH 780904 780904 0 0.0
RAM 110440 110440 0 0.0
bridge-app tlsr9258a FLASH 680814 680814 0 0.0
RAM 91304 91304 0 0.0
contact-sensor-app tlsr9528a_retention FLASH 620476 620472 -4 -0.0
RAM 50600 50600 0 0.0
light-switch-app-ota-shell-factory-data tlsr9528a FLASH 708416 708412 -4 -0.0
RAM 73940 73940 0 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 625418 625418 0 0.0
RAM 144468 144468 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 811178 811178 0 0.0
RAM 99100 99100 0 0.0
lock-app-dfu tlsr9528a FLASH 656382 656378 -4 -0.0
RAM 66660 66660 0 0.0
ota-requestor-app tlsr9258a FLASH 696790 696790 0 0.0
RAM 90896 90896 0 0.0
pump-app-usb tlsr9518adk80d FLASH 634108 634104 -4 -0.0
RAM 55476 55476 0 0.0
pump-controller-app tlsr9518adk80d FLASH 611298 611294 -4 -0.0
RAM 52720 52720 0 0.0
shell tlsr9518adk80d FLASH 467862 467862 0 0.0
RAM 68168 68168 0 0.0
smoke_co_alarm-app tlsr9528a_retention FLASH 627626 627632 6 0.0
RAM 52320 52312 -8 -0.0
temperature-measurement-app-mars-ota tlsr9518adk80d FLASH 653434 653430 -4 -0.0
RAM 56268 56268 0 0.0
thermostat tlsr9518adk80d FLASH 638030 638026 -4 -0.0
RAM 53112 53112 0 0.0
window-covering tlsr9118bdk40d FLASH 524172 524172 0 0.0
RAM 97444 97444 0 0.0
tizen all-clusters-app arm unknown 4904 4904 0 0.0
FLASH 1725768 1725768 0 0.0
RAM 89076 89076 0 0.0
chip-tool-ubsan arm unknown 10424 10424 0 0.0
FLASH 17523714 17523714 0 0.0
RAM 7627764 7627764 0 0.0

@andy31415 andy31415 merged commit fd2d000 into project-chip:v1.4-branch Oct 24, 2024
68 of 69 checks passed
@mkardous-silabs mkardous-silabs deleted the cherry-pick/icd_fix branch October 24, 2024 18:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yunhanw-google yunhanw-google yunhanw-google approved these changes

@andy31415 andy31415 andy31415 approved these changes

Assignees
No one assigned
Labels
app icd Intermittently Connected Devices
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mkardous-silabs @andy31415 @yunhanw-google