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

pressurement cluster again #7996

Merged

Conversation

janusheide
Copy link
Contributor

Problem

What is being fixed? Examples:

  • Pressure measurement cluster is not moved from existing implementation

Change overview

  • Pressure measurement cluster moved into seperate xml

Testing

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

superseeds #7228

@janusheide
Copy link
Contributor Author

@bzbarsky-apple here is the second attempt, lets see if we can get it merged before the repo runs away again ;)

@woody-apple woody-apple requested a review from a user June 29, 2021 20:29
@bzbarsky-apple
Copy link
Contributor

@janusheide This PR removes the pressure management cluster from various apps (e.g. all-clusters-app). Is that intended?

@@ -0,0 +1,38 @@
<?xml version="1.0"?>
Copy link
Contributor

Choose a reason for hiding this comment

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

This should presumably live in some directory where ZAP will find it, which will fix the "this is removing this cluster from everything" problem. Something like src/app/zap-templates/zcl/data-model/chip perhaps?

@bzbarsky-apple
Copy link
Contributor

@janusheide I tried to fix this up, but I don't have write permissions to git@github.com:Grundfos/connectedhomeip.git

The fixup goes like this:

  1. git rebase -i to drop the two "add generated stuff" commits.
  2. In the "moved xml file to proper folder" commit, drop all changes except the actual renaming of the .xml file.

With that, you are done. You can run regeneration if you want, but there should be no changed to generated files (and ther are not for me), because the XML is just moving around with no other changes.

@janusheide janusheide force-pushed the pressure-measurement-cluster-2 branch from de2b9cb to dbcd97a Compare July 1, 2021 06:26
@janusheide
Copy link
Contributor Author

I opted to go back to the first commit, which did not contain any auto generated stuff, fix that and force push to the branch, simpler and requires no merging work.

@jmartinez-silabs
Copy link
Member

ZAP ci error seems real. The zap configuration file for all-cluster-app (and any that had the pressurment cluster enabled) need to be update also

@janusheide
Copy link
Contributor Author

I am unable to fix this as the zap tool got broken here after a recent update...

@janusheide
Copy link
Contributor Author

@jmartinez-silabs too me the zap ci error looks like an error caused by the zap tool, do you have an idea of what needs to be done to fix this?

@jmartinez-silabs
Copy link
Member

@janusheide The ZAP error shows that it fails to do the generatoion of files for all-clusters-app base on this .zap configuration.
examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
It probably also fails for you localy when you run any generation script. Does any example/controller work?
scripts/tools/zap_regen_all.py

From what I see from the diff files you moved some definitions from one xml file to another. the Pressure Measurement was in another domain and i don't see any change to the configuration files (.zap) Seems like the .zap file is still configured to enable the clusters Pressure Measurement in the Measurement & Sensing domain that doesn't exist anymore.

Verify tha the zap files are correctly configured based on your changes
run ./scripts/tools/zap/configure.sh and open the examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

@andy31415
Copy link
Contributor

/rebase

@bzbarsky-apple
Copy link
Contributor

@bzbarsky-apple bzbarsky-apple merged commit 810727b into project-chip:master Jul 9, 2021
@bzbarsky-apple
Copy link
Contributor

@janusheide Was the change of ScaledTolerance from int16s to int16u purposeful?

bzbarsky-apple added a commit to bzbarsky-apple/connectedhomeip that referenced this pull request Jul 10, 2021
@janusheide
Copy link
Contributor Author

@bzbarsky-apple according to the spec https://github.com/CHIP-Specifications/connectedhomeip-spec/blob/master/src/app_clusters/PressureMeasurement.adoc scaled tolerance should be unsigned.

It was unsigned in the zcl raw imported version spec.
https://github.com/CHIP-Specifications/connectedhomeip-spec/commit/5c8e240d94823460e2fbb417ee1811c5597f97cc#diff-1e1868167ee2036591c2cdd83f795b6890f2627f56bbd44169dcd47372d10d79

So it looks like the spec and impl diverted before and now they are the same. To me it makes sense that it is alway positive, but from the definition of the scaled tolerance it looks like a tolerance of +42 and -42 would give the same range, but in different orders.

@bzbarsky-apple
Copy link
Contributor

@janusheide OK, great. I just wanted to make sure that was a purposeful change, since the PR description just talked about moving to a separate XML; not saying we shouldn't have made it in general.

nikita-s-wrk pushed a commit to nikita-s-wrk/connectedhomeip that referenced this pull request Sep 23, 2021
* pressurement cluster again

* moved xml file to proper folder

* adding dropped ranges (again)

* added default values

* scaled tolerance unsigned

* removed ranges not in spec

* trying to remove this, to see if we can pass the ci

* fix xml errors

* Update src/app/zap-templates/zcl/data-model/silabs/ha.xml
nikita-s-wrk pushed a commit to nikita-s-wrk/connectedhomeip that referenced this pull request Sep 23, 2021
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.

6 participants