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

Add Label to FabricDescriptorStruct and hook up logic with UpdateFabr… #7361

Merged
merged 2 commits into from
Jun 3, 2021

Conversation

shana-apple
Copy link
Contributor

This was reverted yesterday due to CI failing. CI is being fixed by #7360
Once that is merged, we can then integrate this back in.

  • Adds Label to FabricDescriptor struct + regens files
    Adds fabric label to AdminPairingInfo with persistence support
    Hooks up UpdateFabricLabel to SetFabricLabel and writes the fabric label into the attribute list upon changes.

How was this tested? (at least one bullet point required)

  • Added UI in chiptool ios to test this and tested that the label can be modifiled, nulled out and persists after m5stack reboots
  • regen files

  • Restyled by whitespace

  • Restyled by clang-format

  • switching to -std=gnu++14

  • Restyled by clang-format

  • switch from 14 to 17

Co-authored-by: Restyled.io commits@restyled.io

Problem

What is being fixed? Examples:

Change overview

What's in this PR

Testing

How was this tested? (at least one bullet point required)

  • If unit tests were added, how do they cover this issue?
  • If unit tests existed, how were they fixed/modified to prevent this in future?
  • If new unit tests are not added, why not?
  • If integration tests were added, how do they verify this change?
  • If new integration tests are not added, why not?
  • If manually tested, what platforms controller and device platforms were manually tested, and how?
  • If no testing is required, why not?

…icLabel (project-chip#6670)

* Adds Label to FabricDescriptor struct + regens files
Adds fabric label to AdminPairingInfo with persistence support
Hooks up UpdateFabricLabel to SetFabricLabel and writes the fabric label into the attribute list upon changes.

How was this tested? (at least one bullet point required)
- Added UI in chiptool ios to test this and tested that the label can be modifiled, nulled out and persists after m5stack reboots

* regen files

* Restyled by whitespace

* Restyled by clang-format

* switching to -std=gnu++14

* Restyled by clang-format

* switch from 14 to 17

Co-authored-by: Restyled.io <commits@restyled.io>
@todo
Copy link

todo bot commented Jun 3, 2021

Add Label once CHAR_STRING or OCTET_STRING works

<item name="Label" type="OCTET_STRING" length="32"/>// TODO: Add Label once CHAR_STRING or OCTET_STRING works
</struct>
<struct name="TestListStructOctet">
<item name="fabricIndex" type="INT64U"/>


This comment was generated by todo based on a TODO comment in dbdc8bf in #7361. cc @shana-apple.

VerifyOrExit(err == CHIP_NO_ERROR, status = EMBER_ZCL_STATUS_FAILURE);

exit:
writeAdminsIntoFabricsListAttribute();
emberAfSendImmediateDefaultResponse(status);
Copy link
Contributor

Choose a reason for hiding this comment

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

Isn't this supposed to send back an OpCertResponse?

Copy link
Contributor

Choose a reason for hiding this comment

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

It is, but that's not implemented yet, afaict.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Boris is correct, I am working on getting this up to spec.

@github-actions
Copy link

github-actions bot commented Jun 3, 2021

Size increase report for "nrfconnect-example-build" from 575f99d

File Section File VM
chip-lock.elf bss 0 512
chip-lock.elf text 316 316
chip-lock.elf device_handles 4 4
chip-shell.elf text 100 100
chip-shell.elf device_handles -4 -4
Full report output
BLOAT REPORT

Files found only in the build output:
    report.csv

Comparing ./master_artifact/chip-lock.elf and ./pull_artifact/chip-lock.elf:

sections,vmsize,filesize
.debug_info,0,2893763
.debug_str,0,85506
.debug_abbrev,0,20180
.debug_line,0,19589
.debug_loc,0,614
bss,512,0
text,316,316
.symtab,0,64
.strtab,0,60
.debug_frame,0,36
.debug_aranges,0,8
device_handles,4,4

Comparing ./master_artifact/chip-shell.elf and ./pull_artifact/chip-shell.elf:

sections,vmsize,filesize
.debug_info,0,389615
.debug_str,0,91954
.debug_line,0,3525
.debug_abbrev,0,3508
.debug_loc,0,234
text,100,100
.debug_frame,0,36
.debug_aranges,0,8
device_handles,-4,-4


@github-actions
Copy link

github-actions bot commented Jun 3, 2021

Size increase report for "esp32-example-build" from 575f99d

File Section File VM
chip-all-clusters-app.elf .dram0.bss 0 512
chip-all-clusters-app.elf .flash.text 304 304
Full report output
BLOAT REPORT

Files found only in the build output:
    report.csv

Comparing ./master_artifact/chip-pigweed-app.elf and ./pull_artifact/chip-pigweed-app.elf:

sections,vmsize,filesize

Comparing ./master_artifact/chip-all-clusters-app.elf and ./pull_artifact/chip-all-clusters-app.elf:

sections,vmsize,filesize
.debug_info,0,9101
.debug_line,0,1050
.debug_loc,0,824
.dram0.bss,512,0
.flash.text,304,304
.debug_str,0,302
.debug_ranges,0,136
.strtab,0,60
.debug_frame,0,24
.debug_abbrev,0,19
.symtab,0,16
.debug_aranges,0,8


@github-actions
Copy link

github-actions bot commented Jun 3, 2021

Size increase report for "gn_qpg6100-example-build" from 575f99d

File Section File VM
chip-qpg6100-lighting-example.out .text 336 336
chip-qpg6100-lighting-example.out .bss 0 128
chip-qpg6100-lighting-example.out .heap 0 -128
Full report output
BLOAT REPORT

Files found only in the build output:
    report.csv

Comparing ./master_artifact/chip-qpg6100-lighting-example.out and ./pull_artifact/chip-qpg6100-lighting-example.out:

sections,vmsize,filesize
.debug_info,0,7288
.debug_abbrev,0,898
.debug_loc,0,769
.debug_line,0,526
.text,336,336
.debug_str,0,307
.bss,128,0
.symtab,0,64
.strtab,0,60
.debug_frame,0,52
.debug_ranges,0,32
.debug_aranges,0,8
.heap,-128,0
[Unmapped],0,-336

Comparing ./master_artifact/chip-qpg6100-lighting-example.out.map and ./pull_artifact/chip-qpg6100-lighting-example.out.map:

BLOAT EXECUTION FAILED WITH CODE 1:
bloaty: unknown file type for file './pull_artifact/chip-qpg6100-lighting-example.out.map'


@woody-apple woody-apple merged commit 6cf9934 into project-chip:master Jun 3, 2021
nikita-s-wrk pushed a commit to nikita-s-wrk/connectedhomeip that referenced this pull request Sep 23, 2021
project-chip#7361)

* Add Label to FabricDescriptorStruct and hook up logic with UpdateFabricLabel (project-chip#6670)

* Adds Label to FabricDescriptor struct + regens files
Adds fabric label to AdminPairingInfo with persistence support
Hooks up UpdateFabricLabel to SetFabricLabel and writes the fabric label into the attribute list upon changes.

How was this tested? (at least one bullet point required)
- Added UI in chiptool ios to test this and tested that the label can be modifiled, nulled out and persists after m5stack reboots

* regen files

* Restyled by whitespace

* Restyled by clang-format

* switching to -std=gnu++14

* Restyled by clang-format

* switch from 14 to 17

Co-authored-by: Restyled.io <commits@restyled.io>

* Update bridge generated code

Co-authored-by: Restyled.io <commits@restyled.io>
Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
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.

8 participants