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

Extract OnOff cluster definition from general.xml and zll.xml #8330

Merged

Conversation

vivien-apple
Copy link
Contributor

Problem

The OnOff cluster definition from Silabs is defined in 2 separated files, and the attributes names formatting is a bit different from the spec at: https://github.com/CHIP-Specifications/connectedhomeip-spec/blob/master/src/app_clusters/OnOff.adoc

Change overview

  • Remove the definitions from Silabs/general.xml and Silabs/zll.xml and move it to Chip/onoff-cluster.xml
  • Update the attributes names to match the formatting from the spec
  • Update the cluster revision from 2 to 3
  • Update some test cases with the proper name and the proper cluster revision
  • Update gen/ folders

For reviewers, the last commit is autogenerated code from the changes in the previous commits.

Testing

I have runned ./scripts/tests/suites.sh locally with the changes from this patch. In fact this PR is a step to add an other set of test that uses the ZLL code from https://github.com/project-chip/connectedhomeip/tree/master/src/app/clusters/zll-on-off-server that I still need to port to cpp.

@bzbarsky-apple
Copy link
Contributor

@vivien-apple The darwin test failure looks real?

@vivien-apple vivien-apple force-pushed the ZAP_UpdateOnOffClusterDefinition branch from 9873a57 to 6b109e7 Compare July 14, 2021 14:00
@vivien-apple
Copy link
Contributor Author

@vivien-apple The darwin test failure looks real?

Correct. There was a missing macro at https://github.com/project-chip/connectedhomeip/blob/master/src/darwin/Framework/CHIP/templates/partials/test_cluster.zapt#L12

I have added it and in the same time I replaced asCamelCased usage by asLowerCamelCase/asUpperCamelCase everywhere for the darwin specific templates.

@andy31415 andy31415 merged commit 8ceb910 into project-chip:master Jul 14, 2021
nikita-s-wrk pushed a commit to nikita-s-wrk/connectedhomeip that referenced this pull request Sep 23, 2021
…t-chip#8330)

* Extract OnOff cluster definition from general.xml and zll.xml to have it into its own file and reformat it to make it easier to read when comparing to the spec

* Update some attributes name into the tests file to match the name update in onoff.xml

* Update zap files to takes into account the names changes, as well as the Cluster Revision change

* Use as[Upper/Lower]CamelCase instead of asCamelCased for src/darwin/Framework/CHIP/templates

* Update gen/ folders
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.

5 participants