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

pressurement cluster again #7996

Merged
merged 15 commits into from
Jul 9, 2021
Merged

pressurement cluster again #7996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a6150aa
pressurement cluster again
janusheide Jun 29, 2021
dbcd97a
moved xml file to proper folder
janusheide Jul 1, 2021
b5c00a9
Merge branch 'master' of github.com:project-chip/connectedhomeip into…
janusheide Jul 1, 2021
9579b1b
adding dropped ranges (again)
janusheide Jul 1, 2021
08d785b
added default values
janusheide Jul 1, 2021
6ab7170
scaled tolerance unsigned
janusheide Jul 1, 2021
afd25e3
removed ranges not in spec
janusheide Jul 1, 2021
456b70d
Merge branch 'project-chip:master' into pressure-measurement-cluster-2
janusheide Jul 2, 2021
53a9cd6
Merge branch 'project-chip:master' into pressure-measurement-cluster-2
janusheide Jul 5, 2021
a9c222e
Merge branch 'project-chip:master' into pressure-measurement-cluster-2
janusheide Jul 6, 2021
ae983ad
trying to remove this, to see if we can pass the ci
janusheide Jul 6, 2021
31facfb
Merge branch 'pressure-measurement-cluster-2' of github.com:grundfos/…
janusheide Jul 6, 2021
5e66161
fix xml errors
janusheide Jul 7, 2021
ebc16b9
Update src/app/zap-templates/zcl/data-model/silabs/ha.xml
janusheide Jul 7, 2021
6723654
Merge branch 'project-chip:master' into pressure-measurement-cluster-2
janusheide Jul 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version="1.0"?>
<!--
Copyright (c) 2021 Project CHIP Authors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<configurator>
<domain name="CHIP"/>
<cluster>
<name>Pressure Measurement</name>
<domain>Measurement &amp; Sensing</domain>
<description>Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements.</description>
<code>0x0403</code>
<define>PRESSURE_MEASUREMENT_CLUSTER</define>
<client tick="false" init="false">true</client>
<server tick="false" tickFrequency="half" init="false">true</server>
<globalAttribute side="either" code="0xFFFD" value="2"/>
<attribute side="server" code="0x0000" define="PRESSURE_MEASURED_VALUE" type="INT16S" writable="false" reportable="true" default="0x0000" optional="false">measured value</attribute>
<attribute side="server" code="0x0001" define="PRESSURE_MIN_MEASURED_VALUE" type="INT16S" writable="false" optional="false">min measured value</attribute>
<attribute side="server" code="0x0002" define="PRESSURE_MAX_MEASURED_VALUE" type="INT16S" writable="false" optional="false">max measured value</attribute>
<attribute side="server" code="0x0003" define="PRESSURE_TOLERANCE" type="INT16U" min="0x0000" max="0x0800" writable="false" reportable="true" optional="true" default="0">tolerance</attribute>
<attribute side="server" code="0x0010" define="PRESSURE_SCALED_VALUE" type="INT16S" writable="false" reportable="true" optional="true" default="0">scaled value</attribute>
<attribute side="server" code="0x0011" define="PRESSURE_MIN_SCALED_VALUE" type="INT16S" writable="false" optional="true" default="0">min scaled value</attribute>
<attribute side="server" code="0x0012" define="PRESSURE_MAX_SCALED_VALUE" type="INT16S" writable="false" optional="true" default="0">max scaled value</attribute>
<attribute side="server" code="0x0013" define="PRESSURE_SCALED_TOLERANCE" type="INT16U" min="0x0000" max="0x0800" writable="false" reportable="true" optional="true" default="0">scaled tolerance</attribute>
<attribute side="server" code="0x0014" define="PRESSURE_SCALE" type="INT8S" writable="false" optional="true" default="0">scale</attribute>
</cluster>

</configurator>
23 changes: 0 additions & 23 deletions src/app/zap-templates/zcl/data-model/silabs/ha.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,29 +451,6 @@ limitations under the License.
<!-- LIGHT_SENSOR_TYPE -->
<attribute side="server" code="0x0010" define="ILLUMINANCE_TARGET_LEVEL" type="INT16U" min="0x0000" max="0xFFFE" writable="true" optional="false">illuminance level target</attribute>
</cluster>
<cluster>
<name>Pressure Measurement</name>
<domain>Measurement &amp; Sensing</domain>
<description>Attributes and commands for configuring the measurement of pressure, and reporting pressure measurements.</description>
<code>0x0403</code>
<define>PRESSURE_MEASUREMENT_CLUSTER</define>
<client tick="false" init="false">true</client>
<server tick="false" tickFrequency="half" init="false">true</server>
<globalAttribute side="either" code="0xFFFD" value="2"/>
<attribute side="server" code="0x0000" define="PRESSURE_MEASURED_VALUE" type="INT16S" writable="false" reportable="true" default="0x0000" optional="false">measured value</attribute>
<!-- MEASURED_VALUE -->
<attribute side="server" code="0x0001" define="PRESSURE_MIN_MEASURED_VALUE" type="INT16S" min="0x8001" max="0x7FFE" writable="false" optional="false">min measured value</attribute>
<!-- MIN_MEASURED_VALUE -->
<attribute side="server" code="0x0002" define="PRESSURE_MAX_MEASURED_VALUE" type="INT16S" min="0x8002" max="0x7FFF" writable="false" optional="false">max measured value</attribute>
<!-- MAX_MEASURED_VALUE -->
<attribute side="server" code="0x0003" define="PRESSURE_TOLERANCE" type="INT16U" min="0x0000" max="0x0800" writable="false" reportable="true" optional="true">tolerance</attribute>
<!-- TOLERANCE -->
<attribute side="server" code="0x0010" define="PRESSURE_SCALED_VALUE" type="INT16S" writable="false" reportable="true" default="0x0000" optional="true">scaled value</attribute>
<attribute side="server" code="0x0011" define="PRESSURE_MIN_SCALED_VALUE" type="INT16S" min="0x8001" max="0x7FFE" writable="false" optional="true">min scaled value</attribute>
<attribute side="server" code="0x0012" define="PRESSURE_MAX_SCALED_VALUE" type="INT16S" min="0x8002" max="0x7FFF" writable="false" optional="true">max scaled value</attribute>
<attribute side="server" code="0x0013" define="PRESSURE_SCALED_TOLERANCE" type="INT16S" min="0x0000" max="0x0800" writable="false" reportable="true" optional="true">scaled tolerance</attribute>
<attribute side="server" code="0x0014" define="PRESSURE_SCALE" type="INT8S" min="0x81" max="0x7F" writable="false" optional="true">scale</attribute>
</cluster>
<cluster>
<name>Occupancy Sensing</name>
<domain>Measurement &amp; Sensing</domain>
Expand Down
1 change: 1 addition & 0 deletions src/app/zap-templates/zcl/zcl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"media-input-cluster.xml",
"media-playback-cluster.xml",
"operational-credentials-cluster.xml",
"pressure-measurement-cluster.xml",
"pump-configuration-and-control-cluster.xml",
"pump-controller-device.xml",
"pump-device.xml",
Expand Down