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.

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

Address comments from reviews #34884

Merged
merged 77 commits into from
Aug 9, 2024

Conversation

hicklin
Copy link
Contributor

@hicklin hicklin commented Aug 8, 2024

This PR is onto of #34814. Use this link to see a comparison between these two branches.

Fixes #34862.

This PR fixes some issues in the service area server impl that where raised in reviews and on slack. here is a summary

  • Some delegate methods are expected to modify a MutableCharSpan where not using a reference in the function signature.
  • There was a missing final response in the Instance's HandleSkipCurrentAreaCmd method.
  • Simplifies the syntax in IsValidSupportedArea and handled the missed case of the mapID being null when the SupportedMaps is not empty.

hicklin and others added 30 commits July 31, 2024 17:04
Copy link

github-actions bot commented Aug 9, 2024

PR #34884: Size comparison from 304df86 to b0940e8

Full report (84 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
platform target config section 304df86 b0940e8 change % change
bl602 lighting-app bl602 FLASH 1277892 1277892 0 0.0
RAM 95928 95928 0 0.0
bl602+mfd FLASH 1291746 1291746 0 0.0
RAM 96072 96072 0 0.0
bl602+rpc FLASH 1316856 1316856 0 0.0
RAM 104352 104352 0 0.0
bl702 lighting-app bl702 FLASH 943834 943834 0 0.0
RAM 15209 15209 0 0.0
bl702+mfd FLASH 946234 946234 0 0.0
RAM 15353 15353 0 0.0
bl702+rpc FLASH 1038890 1038890 0 0.0
RAM 24221 24221 0 0.0
bl706-eth FLASH 646552 646552 0 0.0
RAM 25305 25305 0 0.0
bl706-wifi FLASH 894128 894128 0 0.0
RAM 14525 14525 0 0.0
bl702l lighting-app bl702l FLASH 960238 960238 0 0.0
RAM 16868 16868 0 0.0
bl702l+mfd FLASH 962860 962860 0 0.0
RAM 17012 17012 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 FLASH 802972 802972 0 0.0
RAM 117628 117628 0 0.0
lock-ftd LP_EM_CC1354P10_6 FLASH 818800 818800 0 0.0
RAM 125220 125220 0 0.0
lock-mtd LP_EM_CC1354P10_6 FLASH 811156 811156 0 0.0
RAM 119500 119500 0 0.0
pump-app LP_EM_CC1354P10_6 FLASH 763328 763328 0 0.0
RAM 113648 113648 0 0.0
pump-controller-app LP_EM_CC1354P10_6 FLASH 747812 747812 0 0.0
RAM 113840 113840 0 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL FLASH 612850 612850 0 0.0
RAM 205404 205404 0 0.0
lock CC3235SF_LAUNCHXL FLASH 654802 654802 0 0.0
RAM 205620 205620 0 0.0
cyw30739 light CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 672097 672097 0 0.0
RAM 78348 78348 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 691949 691949 0 0.0
RAM 80980 80980 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 691949 691949 0 0.0
RAM 80980 80980 0 0.0
CYW930739M2EVB-02 unknown 2040 2040 0 0.0
FLASH 648893 648893 0 0.0
RAM 73416 73416 0 0.0
light-switch CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 610537 610537 0 0.0
RAM 71340 71340 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 630173 630173 0 0.0
RAM 73892 73892 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 630173 630173 0 0.0
RAM 73892 73892 0 0.0
lock CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 628009 628009 0 0.0
RAM 74356 74356 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 647725 647725 0 0.0
RAM 76908 76908 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 647725 647725 0 0.0
RAM 76908 76908 0 0.0
thermostat CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 601533 601533 0 0.0
RAM 68388 68388 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 621393 621393 0 0.0
RAM 71020 71020 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 621393 621393 0 0.0
RAM 71020 71020 0 0.0
efr32 lighting-app BRD4187C FLASH 930024 930016 -8 -0.0
RAM 135144 135144 0 0.0
lock-app BRD4338a FLASH 737148 737140 -8 -0.0
RAM 208440 208440 0 0.0
window-app BRD4187C FLASH 1015508 1015508 0 0.0
RAM 127084 127084 0 0.0
esp32 all-clusters-app c3devkit DRAM 94176 94176 0 0.0
FLASH 1533320 1533320 0 0.0
IRAM 82538 82538 0 0.0
m5stack DRAM 115104 115104 0 0.0
FLASH 1543086 1543086 0 0.0
IRAM 117039 117039 0 0.0
linux air-purifier-app debug unknown 4624 4624 0 0.0
FLASH 2753903 2753903 0 0.0
RAM 128408 128408 0 0.0
all-clusters-app debug unknown 5408 5408 0 0.0
FLASH 6035864 6035864 0 0.0
RAM 509704 509704 0 0.0
all-clusters-minimal-app debug unknown 5304 5304 0 0.0
FLASH 5375044 5375044 0 0.0
RAM 240072 240072 0 0.0
bridge-app debug unknown 5288 5288 0 0.0
FLASH 4727732 4727732 0 0.0
RAM 216952 216952 0 0.0
chip-tool debug unknown 5832 5832 0 0.0
FLASH 12487274 12487274 0 0.0
RAM 557202 557202 0 0.0
chip-tool-ipv6only arm64 unknown 20312 20312 0 0.0
FLASH 11162972 11162972 0 0.0
RAM 607272 607272 0 0.0
fabric-admin debug unknown 5672 5672 0 0.0
FLASH 11477597 11477597 0 0.0
RAM 554706 554706 0 0.0
fabric-bridge-app debug unknown 4520 4520 0 0.0
FLASH 4531412 4531412 0 0.0
RAM 203288 203288 0 0.0
lighting-app debug+rpc+ui unknown 5936 5936 0 0.0
FLASH 5662289 5662289 0 0.0
RAM 228008 228008 0 0.0
lock-app debug unknown 5224 5224 0 0.0
FLASH 4782512 4782512 0 0.0
RAM 203736 203736 0 0.0
ota-provider-app debug unknown 4600 4600 0 0.0
FLASH 4422520 4422520 0 0.0
RAM 197720 197720 0 0.0
ota-requestor-app debug unknown 4536 4536 0 0.0
FLASH 4561138 4561138 0 0.0
RAM 202256 202256 0 0.0
shell debug unknown 4176 4176 0 0.0
FLASH 3075485 3075485 0 0.0
RAM 159200 159200 0 0.0
thermostat-no-ble arm64 unknown 9352 9352 0 0.0
FLASH 4362932 4362932 0 0.0
RAM 242416 242416 0 0.0
tv-app debug unknown 5496 5496 0 0.0
FLASH 6005765 6005765 0 0.0
RAM 582968 582968 0 0.0
tv-casting-app debug unknown 5168 5168 0 0.0
FLASH 10691229 10691229 0 0.0
RAM 644280 644280 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 908832 908832 0 0.0
RAM 142255 142255 0 0.0
nrf7002dk_nrf5340_cpuapp FLASH 880780 880780 0 0.0
RAM 140394 140394 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 FLASH 840668 840668 0 0.0
RAM 141074 141074 0 0.0
nxp contact k32w0+release FLASH 577196 577196 0 0.0
RAM 70468 70468 0 0.0
k32w1+release FLASH 592496 592496 0 0.0
RAM 74456 74456 0 0.0
light k32w0+release FLASH 612640 612640 0 0.0
RAM 69940 69940 0 0.0
k32w1+release FLASH 677472 677472 0 0.0
RAM 83232 83232 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1637924 1637924 0 0.0
RAM 210928 210928 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1543620 1543620 0 0.0
RAM 207672 207672 0 0.0
light cy8ckit_062s2_43012 FLASH 1463540 1463540 0 0.0
RAM 200776 200776 0 0.0
lock cy8ckit_062s2_43012 FLASH 1462188 1462188 0 0.0
RAM 225112 225112 0 0.0
qpg lighting-app qpg6105+debug FLASH 655716 655716 0 0.0
RAM 105152 105152 0 0.0
lock-app qpg6105+debug FLASH 613072 613072 0 0.0
RAM 99636 99636 0 0.0
stm32 light STM32WB5MM-DK FLASH 478120 478120 0 0.0
RAM 144764 144764 0 0.0
telink air-quality-sensor-app tlsr9528a_retention FLASH 619928 619928 0 0.0
RAM 50940 50940 0 0.0
all-clusters-app tlsr9118bdk40d FLASH 680448 680448 0 0.0
RAM 149592 149592 0 0.0
all-clusters-minimal-app tlsr9528a FLASH 773708 773708 0 0.0
RAM 110752 110752 0 0.0
bridge-app tlsr9258a FLASH 678616 678616 0 0.0
RAM 91636 91636 0 0.0
contact-sensor-app tlsr9528a_retention FLASH 621524 621524 0 0.0
RAM 50980 50980 0 0.0
light-switch-app-ota-shell-factory-data tlsr9528a FLASH 707406 707406 0 0.0
RAM 74320 74320 0 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 620450 620450 0 0.0
RAM 145580 145580 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 806536 806536 0 0.0
RAM 99504 99504 0 0.0
lock-app-dfu tlsr9528a FLASH 654396 654396 0 0.0
RAM 67016 67016 0 0.0
ota-requestor-app tlsr9258a FLASH 696632 696632 0 0.0
RAM 91320 91320 0 0.0
pump-app-usb tlsr9518adk80d FLASH 630912 630912 0 0.0
RAM 55760 55760 0 0.0
pump-controller-app tlsr9518adk80d FLASH 608422 608422 0 0.0
RAM 53004 53004 0 0.0
shell tlsr9518adk80d FLASH 466810 466810 0 0.0
RAM 68660 68660 0 0.0
smoke_co_alarm-app tlsr9528a_retention FLASH 628296 628296 0 0.0
RAM 52700 52700 0 0.0
temperature-measurement-app-mars-ota tlsr9518adk80d FLASH 652292 652292 0 0.0
RAM 56640 56640 0 0.0
thermostat tlsr9518adk80d FLASH 633476 633476 0 0.0
RAM 53400 53400 0 0.0
window-covering tlsr9118bdk40d FLASH 522456 522456 0 0.0
RAM 98540 98540 0 0.0
tizen all-clusters-app arm unknown 4796 4796 0 0.0
FLASH 1696484 1696484 0 0.0
RAM 89292 89292 0 0.0
chip-tool-ubsan arm unknown 10236 10236 0 0.0
FLASH 17304222 17304222 0 0.0
RAM 7559352 7559352 0 0.0

@mergify mergify bot merged commit a190f44 into project-chip:master Aug 9, 2024
68 checks passed
austina-csa pushed a commit to austina-csa/connectedhomeip that referenced this pull request Aug 12, 2024
* Updated the golabl data type's XMLs, removing the cluster entries.

* Zap generated after XML update.

* Fixed namespaces used of global structs.

* Restyled by clang-format

* Renamed LocationInfoStruct to AreaInfoStruct.

* Zap generated after XML update.

* Renamed LocationStruct to AreaStruct and its LocationID and LocationDesc fields.

* Zap generated after XML update.

* Updated SDK and example code to match the new naming.

* Updated the ProgressStruct's LocationID name to AreaID.

* Zap generated after XML update.

* Updated the SDK code following name changes.

* Updated the SelectLocationsStatus and SkipLocationStatus enum names and some of their enums.

* Zap generated after XML update.

* Updated the SelectLocationsStatus and SkipCurrentLocationStatus names and their enum names.

* Updated the names of the SupportedLocations, SelectedLocations and CurrentLocation attributes.

* Zap generated after XML update.

* Updated the changed names in the SDK.

* Updated the service area command names in XML.

* Zap generated after XML update.

* Updated the service area command names in the SDK.

* Updated the rvc-example zap file.

* Refactored LocationStructureWrapper to AreaStructureWrapper.

* Restyled by clang-format

* Regenerated zap files due to changes upsteram.

* Removed unused generated file.

* Updated the Service Area XML marking previously nullabel attributes as not-nullable.

* Zap generated after XML update.

* Updated the attribute encoding and some server logic following the romoval of the nullable quality for some attributes.

* Explicitly set the Service Area version.

* Zap generated after XML update.

* Updated the service area features in the XML to match the current spec.

* Zap generated after XML update.

* Updated the SupportedArea validation logic as if the MAPS feature is not supported, the Delegate may choose not to implement map related methods.

* Change the type of the MapID to uint32 to match the spec.

* Added the SkippedArea arg to the SkipArea command.

* Zap generated after XML update.

* Updated the Service Area server code to handle the new SkippedArea command arg.

* Updated the service area XML to match the current spec. This includes the addition of the LandmarkInfoStruct and updates of AreaInfoStruct, SelectAreasStatus.

* Zap generated after XML update.

* Updated SDK server code and rvc-example after changes to the XML.

* Restyled by whitespace

* added vector include.

* spacing changes form zap regen.

* Fixed minor mistake during merge.

* Restyled by clang-format

* Applied suggestions from review.

* Restyled by whitespace

* Updated the LondmarkInfoSturct PositionTag type.

* Zap generated after XML update.

* Fixed SDK following update to the position type.

* Restyled by clang-format

* Updated the AeraStructWrapper to not contain methods with a large number of params. Updated some relate Instance and Delegate methods.

* Restyled by whitespace

* Restyled by clang-format

* Missed a submudule update.

* Made the setters reture a ref to the sturct to allow chaining.

* simplified the = oporator and add the == operator.

* Restyled by clang-format

* minor change to get restyler going.

* Restyled by clang-format

* Fixed status text referance issue.

* Fixed issue casued by a change in the way that registrations are made.

* Fixed styling and minor bug in IsValidSupportedArea.

---------

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

minor style comments
4 participants