Skip to content

Commit 0afec00

Browse files
cdjacksoncdjackson
authored
Add PM2.5, CO, CO2 and Formaldehyde measurement clusters (#1432)
* Add PM2.5, CO and CO2 measurement clusters Signed-off-by: Chris Jackson <[email protected]> * Add Formaldehyde measurement Signed-off-by: Chris Jackson <[email protected]> --------- Signed-off-by: Chris Jackson <[email protected]>
1 parent 60e8255 commit 0afec00

File tree

10 files changed

+1691
-1
lines changed

10 files changed

+1691
-1
lines changed

‎com.zsmartsystems.zigbee.autocode/src/main/java/com/zsmartsystems/zigbee/autocode/ZigBeeCodeGenerator.java

+6
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,12 @@ public static void main(final String[] args) {
8888
zclParser.addFile("src/main/resources/0407_LeafWetness.xml");
8989
zclParser.addFile("src/main/resources/0408_SoilMoisture.xml");
9090

91+
zclParser.addFile("src/main/resources/040C_CarbonMonoxide.xml");
92+
zclParser.addFile("src/main/resources/040D_CarbonDioxide.xml");
93+
94+
zclParser.addFile("src/main/resources/042A_PM25Measurement.xml");
95+
zclParser.addFile("src/main/resources/042B_FormaldehydeMeasurement.xml");
96+
9197
zclParser.addFile("src/main/resources/0500_IasZone.xml");
9298
zclParser.addFile("src/main/resources/0501_IasAce.xml");
9399
zclParser.addFile("src/main/resources/0502_IasWd.xml");

‎com.zsmartsystems.zigbee.autocode/src/main/resources/040C_CarbonMonoxide.xml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:noNamespaceSchemaLocation="zigbee-description.xsd" code="0x040C">
3+
<name>Carbon Monoxide Measurement</name>
4+
<description>The cluster provides an interface for measurement of Carbon Monoxide</description>
5+
<attribute code="0x0000" type="FLOAT_32_BIT" side="server" optional="false" writable="false"
6+
reportable="true" default="0x0000">
7+
<name>Measured Value</name>
8+
<description>MeasuredValue represents the concentration as a fraction of 1 (one).</description>
9+
<description>A value of NaN indicates that the concentration measurement is unknown or outside the valid range.</description>
10+
<description>MinMeasuredValue and MaxMeasuredValue define the valid range for MeasuredValue.</description>
11+
<description>MeasuredValue is updated continuously as new measurements are made.</description>
12+
</attribute>
13+
<attribute code="0x0001" type="FLOAT_32_BIT" side="server" optional="false" writable="false"
14+
reportable="false" minimum="0x8001" maximum="0x7FFE">
15+
<name>Min Measured Value</name>
16+
<description>The MinMeasuredValue attribute indicates the minimum value of MeasuredValue that can be measured. A value of NaN means this attribute is not defined.</description>
17+
</attribute>
18+
<attribute code="0x0002" type="FLOAT_32_BIT" side="server" optional="false" writable="false"
19+
reportable="true" minimum="0x8002" maximum="0x7FFF">
20+
<name>Max Measured Value</name>
21+
<description>The MaxMeasuredValue attribute indicates the maximum value of MeasuredValue that can be measured. A value of NaN means this attribute is not defined.</description>
22+
<description>MaxMeasuredValue shall be greater than MinMeasuredValue.</description>
23+
<description>MinMeasuredValue and MaxMeasuredValue define the range of the sensor.</description>
24+
</attribute>
25+
<attribute code="0x0003" type="FLOAT_32_BIT" side="server" optional="true" writable="false"
26+
reportable="false" minimum="0x0000" maximum="0x0800">
27+
<name>Tolerance</name>
28+
<description>The Tolerance attribute indicates the magnitude of the possible error that is associated with MeasuredValue . The true value is located in the range (MeasuredValue &#8211; Tolerance) to (MeasuredValue + Tolerance).</description>
29+
</attribute>
30+
</cluster>

‎com.zsmartsystems.zigbee.autocode/src/main/resources/040D_CarbonDioxide.xml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:noNamespaceSchemaLocation="zigbee-description.xsd" code="0x040D">
3+
<name>Carbon Dioxide Measurement</name>
4+
<description>The cluster provides an interface for measurement of Carbon Dioxide</description>
5+
<attribute code="0x0000" type="FLOAT_32_BIT" side="server" optional="false" writable="false"
6+
reportable="true" default="0x0000">
7+
<name>Measured Value</name>
8+
<description>MeasuredValue represents the concentration as a fraction of 1 (one).</description>
9+
<description>A value of NaN indicates that the concentration measurement is unknown or outside the valid range.</description>
10+
<description>MinMeasuredValue and MaxMeasuredValue define the valid range for MeasuredValue.</description>
11+
<description>MeasuredValue is updated continuously as new measurements are made.</description>
12+
</attribute>
13+
<attribute code="0x0001" type="FLOAT_32_BIT" side="server" optional="false" writable="false"
14+
reportable="false" minimum="0x8001" maximum="0x7FFE">
15+
<name>Min Measured Value</name>
16+
<description>The MinMeasuredValue attribute indicates the minimum value of MeasuredValue that can be measured. A value of NaN means this attribute is not defined.</description>
17+
</attribute>
18+
<attribute code="0x0002" type="FLOAT_32_BIT" side="server" optional="false" writable="false"
19+
reportable="true" minimum="0x8002" maximum="0x7FFF">
20+
<name>Max Measured Value</name>
21+
<description>The MaxMeasuredValue attribute indicates the maximum value of MeasuredValue that can be measured. A value of NaN means this attribute is not defined.</description>
22+
<description>MaxMeasuredValue shall be greater than MinMeasuredValue.</description>
23+
<description>MinMeasuredValue and MaxMeasuredValue define the range of the sensor.</description>
24+
</attribute>
25+
<attribute code="0x0003" type="FLOAT_32_BIT" side="server" optional="true" writable="false"
26+
reportable="false" minimum="0x0000" maximum="0x0800">
27+
<name>Tolerance</name>
28+
<description>The Tolerance attribute indicates the magnitude of the possible error that is associated with MeasuredValue . The true value is located in the range (MeasuredValue &#8211; Tolerance) to (MeasuredValue + Tolerance).</description>
29+
</attribute>
30+
</cluster>

‎com.zsmartsystems.zigbee.autocode/src/main/resources/042A_PM25Measurement.xml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:noNamespaceSchemaLocation="zigbee-description.xsd" code="0x042A">
3+
<name>PM2.5 Measurement</name>
4+
<description>The cluster provides an interface for measurement of Particulate Matter 2.5 microns or less</description>
5+
<attribute code="0x0000" type="FLOAT_32_BIT" side="server" optional="false" writable="false"
6+
reportable="true" default="0x0000">
7+
<name>Measured Value</name>
8+
<description>MeasuredValue represents the concentration as a fraction of 1 (one).</description>
9+
<description>A value of NaN indicates that the concentration measurement is unknown or outside the valid range.</description>
10+
<description>MinMeasuredValue and MaxMeasuredValue define the valid range for MeasuredValue.</description>
11+
<description>MeasuredValue is updated continuously as new measurements are made.</description>
12+
</attribute>
13+
<attribute code="0x0001" type="FLOAT_32_BIT" side="server" optional="false" writable="false"
14+
reportable="false" minimum="0x8001" maximum="0x7FFE">
15+
<name>Min Measured Value</name>
16+
<description>The MinMeasuredValue attribute indicates the minimum value of MeasuredValue that can be measured. A value of NaN means this attribute is not defined.</description>
17+
</attribute>
18+
<attribute code="0x0002" type="FLOAT_32_BIT" side="server" optional="false" writable="false"
19+
reportable="true" minimum="0x8002" maximum="0x7FFF">
20+
<name>Max Measured Value</name>
21+
<description>The MaxMeasuredValue attribute indicates the maximum value of MeasuredValue that can be measured. A value of NaN means this attribute is not defined.</description>
22+
<description>MaxMeasuredValue shall be greater than MinMeasuredValue.</description>
23+
<description>MinMeasuredValue and MaxMeasuredValue define the range of the sensor.</description>
24+
</attribute>
25+
<attribute code="0x0003" type="FLOAT_32_BIT" side="server" optional="true" writable="false"
26+
reportable="false" minimum="0x0000" maximum="0x0800">
27+
<name>Tolerance</name>
28+
<description>The Tolerance attribute indicates the magnitude of the possible error that is associated with MeasuredValue . The true value is located in the range (MeasuredValue &#8211; Tolerance) to (MeasuredValue + Tolerance).</description>
29+
</attribute>
30+
</cluster>

‎com.zsmartsystems.zigbee.autocode/src/main/resources/042B_FormaldehydeMeasurement.xml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:noNamespaceSchemaLocation="zigbee-description.xsd" code="0x042B">
3+
<name>Formaldehyde Measurement</name>
4+
<description>The cluster provides an interface for measurement of Formaldehyde</description>
5+
<attribute code="0x0000" type="FLOAT_32_BIT" side="server" optional="false" writable="false"
6+
reportable="true" default="0x0000">
7+
<name>Measured Value</name>
8+
<description>MeasuredValue represents the concentration as a fraction of 1 (one).</description>
9+
<description>A value of NaN indicates that the concentration measurement is unknown or outside the valid range.</description>
10+
<description>MinMeasuredValue and MaxMeasuredValue define the valid range for MeasuredValue.</description>
11+
<description>MeasuredValue is updated continuously as new measurements are made.</description>
12+
</attribute>
13+
<attribute code="0x0001" type="FLOAT_32_BIT" side="server" optional="false" writable="false"
14+
reportable="false" minimum="0x8001" maximum="0x7FFE">
15+
<name>Min Measured Value</name>
16+
<description>The MinMeasuredValue attribute indicates the minimum value of MeasuredValue that can be measured. A value of NaN means this attribute is not defined.</description>
17+
</attribute>
18+
<attribute code="0x0002" type="FLOAT_32_BIT" side="server" optional="false" writable="false"
19+
reportable="true" minimum="0x8002" maximum="0x7FFF">
20+
<name>Max Measured Value</name>
21+
<description>The MaxMeasuredValue attribute indicates the maximum value of MeasuredValue that can be measured. A value of NaN means this attribute is not defined.</description>
22+
<description>MaxMeasuredValue shall be greater than MinMeasuredValue.</description>
23+
<description>MinMeasuredValue and MaxMeasuredValue define the range of the sensor.</description>
24+
</attribute>
25+
<attribute code="0x0003" type="FLOAT_32_BIT" side="server" optional="true" writable="false"
26+
reportable="false" minimum="0x0000" maximum="0x0800">
27+
<name>Tolerance</name>
28+
<description>The Tolerance attribute indicates the magnitude of the possible error that is associated with MeasuredValue . The true value is located in the range (MeasuredValue &#8211; Tolerance) to (MeasuredValue + Tolerance).</description>
29+
</attribute>
30+
</cluster>

0 commit comments

Comments
 (0)