Align naming in Relative Humidity Measurement cluster XML with the spec. (#24391)
* Align naming in Relative Humidity Measurement cluster XML with the spec.
* Auto-update ZAP files.
* Regenerate generated code.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
index c3b7e95..fc99463 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -7857,7 +7857,7 @@
"enabled": 1,
"attributes": [
{
- "name": "measured value",
+ "name": "MeasuredValue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -7873,7 +7873,7 @@
"reportableChange": 0
},
{
- "name": "min measured value",
+ "name": "MinMeasuredValue",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -7889,7 +7889,7 @@
"reportableChange": 0
},
{
- "name": "max measured value",
+ "name": "MaxMeasuredValue",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -7905,7 +7905,7 @@
"reportableChange": 0
},
{
- "name": "tolerance",
+ "name": "Tolerance",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -17299,7 +17299,7 @@
"enabled": 1,
"attributes": [
{
- "name": "measured value",
+ "name": "MeasuredValue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -17315,7 +17315,7 @@
"reportableChange": 0
},
{
- "name": "min measured value",
+ "name": "MinMeasuredValue",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -17331,7 +17331,7 @@
"reportableChange": 0
},
{
- "name": "max measured value",
+ "name": "MaxMeasuredValue",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -17347,7 +17347,7 @@
"reportableChange": 0
},
{
- "name": "tolerance",
+ "name": "Tolerance",
"code": 3,
"mfgCode": null,
"side": "server",
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
index 0c48849..cb7ec75 100644
--- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
@@ -7857,7 +7857,7 @@
"enabled": 1,
"attributes": [
{
- "name": "measured value",
+ "name": "MeasuredValue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -7873,7 +7873,7 @@
"reportableChange": 0
},
{
- "name": "min measured value",
+ "name": "MinMeasuredValue",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -7889,7 +7889,7 @@
"reportableChange": 0
},
{
- "name": "max measured value",
+ "name": "MaxMeasuredValue",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -7905,7 +7905,7 @@
"reportableChange": 0
},
{
- "name": "tolerance",
+ "name": "Tolerance",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -16791,7 +16791,7 @@
"enabled": 1,
"attributes": [
{
- "name": "measured value",
+ "name": "MeasuredValue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -16807,7 +16807,7 @@
"reportableChange": 0
},
{
- "name": "min measured value",
+ "name": "MinMeasuredValue",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -16823,7 +16823,7 @@
"reportableChange": 0
},
{
- "name": "max measured value",
+ "name": "MaxMeasuredValue",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -16839,7 +16839,7 @@
"reportableChange": 0
},
{
- "name": "tolerance",
+ "name": "Tolerance",
"code": 3,
"mfgCode": null,
"side": "server",
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
index 4ce5bd3..b0ea252 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
@@ -6001,7 +6001,7 @@
"enabled": 1,
"attributes": [
{
- "name": "measured value",
+ "name": "MeasuredValue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -6017,7 +6017,7 @@
"reportableChange": 0
},
{
- "name": "min measured value",
+ "name": "MinMeasuredValue",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -6033,7 +6033,7 @@
"reportableChange": 0
},
{
- "name": "max measured value",
+ "name": "MaxMeasuredValue",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -6049,7 +6049,7 @@
"reportableChange": 0
},
{
- "name": "tolerance",
+ "name": "Tolerance",
"code": 3,
"mfgCode": null,
"side": "server",
diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap
index 8419a5e..4963be2 100644
--- a/examples/placeholder/linux/apps/app1/config.zap
+++ b/examples/placeholder/linux/apps/app1/config.zap
@@ -5955,7 +5955,7 @@
"enabled": 1,
"attributes": [
{
- "name": "measured value",
+ "name": "MeasuredValue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -5971,7 +5971,7 @@
"reportableChange": 0
},
{
- "name": "min measured value",
+ "name": "MinMeasuredValue",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -5987,7 +5987,7 @@
"reportableChange": 0
},
{
- "name": "max measured value",
+ "name": "MaxMeasuredValue",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -6003,7 +6003,7 @@
"reportableChange": 0
},
{
- "name": "tolerance",
+ "name": "Tolerance",
"code": 3,
"mfgCode": null,
"side": "server",
diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap
index 2d8e773..d83644d 100644
--- a/examples/placeholder/linux/apps/app2/config.zap
+++ b/examples/placeholder/linux/apps/app2/config.zap
@@ -6239,7 +6239,7 @@
"enabled": 1,
"attributes": [
{
- "name": "measured value",
+ "name": "MeasuredValue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -6255,7 +6255,7 @@
"reportableChange": 0
},
{
- "name": "min measured value",
+ "name": "MinMeasuredValue",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -6271,7 +6271,7 @@
"reportableChange": 0
},
{
- "name": "max measured value",
+ "name": "MaxMeasuredValue",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -6287,7 +6287,7 @@
"reportableChange": 0
},
{
- "name": "tolerance",
+ "name": "Tolerance",
"code": 3,
"mfgCode": null,
"side": "server",
diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap
index f661b38..0011f82 100644
--- a/examples/thermostat/thermostat-common/thermostat.zap
+++ b/examples/thermostat/thermostat-common/thermostat.zap
@@ -7013,7 +7013,7 @@
"enabled": 0,
"attributes": [
{
- "name": "measured value",
+ "name": "MeasuredValue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -7029,7 +7029,7 @@
"reportableChange": 0
},
{
- "name": "min measured value",
+ "name": "MinMeasuredValue",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -7045,7 +7045,7 @@
"reportableChange": 0
},
{
- "name": "max measured value",
+ "name": "MaxMeasuredValue",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -7061,7 +7061,7 @@
"reportableChange": 0
},
{
- "name": "tolerance",
+ "name": "Tolerance",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -13031,7 +13031,7 @@
"enabled": 0,
"attributes": [
{
- "name": "measured value",
+ "name": "MeasuredValue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -13047,7 +13047,7 @@
"reportableChange": 0
},
{
- "name": "min measured value",
+ "name": "MinMeasuredValue",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -13063,7 +13063,7 @@
"reportableChange": 0
},
{
- "name": "max measured value",
+ "name": "MaxMeasuredValue",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -13079,7 +13079,7 @@
"reportableChange": 0
},
{
- "name": "tolerance",
+ "name": "Tolerance",
"code": 3,
"mfgCode": null,
"side": "server",
diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap
index 6f7e437..96d083b 100644
--- a/examples/tv-app/tv-common/tv-app.zap
+++ b/examples/tv-app/tv-common/tv-app.zap
@@ -6823,7 +6823,7 @@
"enabled": 1,
"attributes": [
{
- "name": "measured value",
+ "name": "MeasuredValue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -6839,7 +6839,7 @@
"reportableChange": 0
},
{
- "name": "min measured value",
+ "name": "MinMeasuredValue",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -6855,7 +6855,7 @@
"reportableChange": 0
},
{
- "name": "max measured value",
+ "name": "MaxMeasuredValue",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -6871,7 +6871,7 @@
"reportableChange": 0
},
{
- "name": "tolerance",
+ "name": "Tolerance",
"code": 3,
"mfgCode": null,
"side": "server",
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
index 8746944..3d713a3 100644
--- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
+++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
@@ -6675,7 +6675,7 @@
"enabled": 0,
"attributes": [
{
- "name": "measured value",
+ "name": "MeasuredValue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -6691,7 +6691,7 @@
"reportableChange": 0
},
{
- "name": "min measured value",
+ "name": "MinMeasuredValue",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -6707,7 +6707,7 @@
"reportableChange": 0
},
{
- "name": "max measured value",
+ "name": "MaxMeasuredValue",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -6723,7 +6723,7 @@
"reportableChange": 0
},
{
- "name": "tolerance",
+ "name": "Tolerance",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -12147,7 +12147,7 @@
"enabled": 0,
"attributes": [
{
- "name": "measured value",
+ "name": "MeasuredValue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -12163,7 +12163,7 @@
"reportableChange": 0
},
{
- "name": "min measured value",
+ "name": "MinMeasuredValue",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -12179,7 +12179,7 @@
"reportableChange": 0
},
{
- "name": "max measured value",
+ "name": "MaxMeasuredValue",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -12195,7 +12195,7 @@
"reportableChange": 0
},
{
- "name": "tolerance",
+ "name": "Tolerance",
"code": 3,
"mfgCode": null,
"side": "server",
diff --git a/src/app/tests/suites/certification/Test_TC_RH_2_1.yaml b/src/app/tests/suites/certification/Test_TC_RH_2_1.yaml
index 1edde0f..44504a5 100644
--- a/src/app/tests/suites/certification/Test_TC_RH_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_RH_2_1.yaml
@@ -34,7 +34,7 @@
- label: "TH reads the MinMeasuredValue attribute from the DUT"
PICS: RH.S.A0001
command: "readAttribute"
- attribute: "min measured value"
+ attribute: "MinMeasuredValue"
response:
constraints:
type: int16u
@@ -44,7 +44,7 @@
- label: "TH reads the MaxMeasuredValue attribute from the DUT"
PICS: RH.S.A0002
command: "readAttribute"
- attribute: "max measured value"
+ attribute: "MaxMeasuredValue"
response:
constraints:
type: int16u
@@ -54,7 +54,7 @@
- label: "TH reads the MeasuredValue attribute from the DUT"
PICS: RH.S.A0000
command: "readAttribute"
- attribute: "measured value"
+ attribute: "MeasuredValue"
response:
constraints:
type: int16u
@@ -64,7 +64,7 @@
- label: "TH reads the Tolerance attribute from the DUT"
PICS: RH.S.A0003
command: "readAttribute"
- attribute: "tolerance"
+ attribute: "Tolerance"
response:
constraints:
type: int16u
diff --git a/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml b/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml
index 7160009..cffae32 100644
--- a/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml
@@ -34,7 +34,7 @@
- label: "Reads constraints of attribute: MinMeasuredValue"
PICS: RH.S.A0001
command: "readAttribute"
- attribute: "min measured value"
+ attribute: "MinMeasuredValue"
response:
constraints:
type: int16u
@@ -44,7 +44,7 @@
- label: "Reads constraints of attribute: MaxMeasuredValue"
PICS: RH.S.A0002
command: "readAttribute"
- attribute: "max measured value"
+ attribute: "MaxMeasuredValue"
response:
constraints:
type: int16u
@@ -53,7 +53,7 @@
- label: "Reads MeasuredValue attribute from DUT"
command: "readAttribute"
- attribute: "measured value"
+ attribute: "MeasuredValue"
PICS: RH.S.A0000
response:
saveAs: ValueBeforeChange
@@ -75,7 +75,7 @@
- label: "Read the mandatory attribute: MeasuredValue"
command: "readAttribute"
- attribute: "measured value"
+ attribute: "MeasuredValue"
PICS: RH.S.A0000 && RH.M.ManuallyControlled
response:
constraints:
diff --git a/src/app/tests/suites/certification/Test_TC_RH_3_1_Simulated.yaml b/src/app/tests/suites/certification/Test_TC_RH_3_1_Simulated.yaml
index 2ed1b31..35d6b87 100644
--- a/src/app/tests/suites/certification/Test_TC_RH_3_1_Simulated.yaml
+++ b/src/app/tests/suites/certification/Test_TC_RH_3_1_Simulated.yaml
@@ -26,16 +26,16 @@
- label: "Read attribute MeasuredValue"
wait: "readAttribute"
- attribute: "measured value"
+ attribute: "MeasuredValue"
- label: "Read attribute MinMeasuredValue"
wait: "readAttribute"
- attribute: "min measured value"
+ attribute: "MinMeasuredValue"
- label: "Read attribute MaxMeasuredValue"
wait: "readAttribute"
- attribute: "max measured value"
+ attribute: "MaxMeasuredValue"
- label: "Read attribute Tolerance"
wait: "readAttribute"
- attribute: "tolerance"
+ attribute: "Tolerance"
diff --git a/src/app/zap-templates/zcl/data-model/chip/relative-humidity-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/relative-humidity-measurement-cluster.xml
index 536e270..6e45cae 100644
--- a/src/app/zap-templates/zcl/data-model/chip/relative-humidity-measurement-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/relative-humidity-measurement-cluster.xml
@@ -25,9 +25,9 @@
<client tick="false" init="false">true</client>
<server tick="false" tickFrequency="half" init="false">true</server>
<globalAttribute side="either" code="0xFFFD" value="3"/>
- <attribute side="server" code="0x0000" define="RELATIVE_HUMIDITY_MEASURED_VALUE" type="INT16U" writable="false" reportable="true" optional="false" isNullable="true">measured value</attribute>
- <attribute side="server" code="0x0001" define="RELATIVE_HUMIDITY_MIN_MEASURED_VALUE" type="INT16U" min="0x0000" max="0x270F" writable="false" optional="false" isNullable="true">min measured value</attribute>
- <attribute side="server" code="0x0002" define="RELATIVE_HUMIDITY_MAX_MEASURED_VALUE" type="INT16U" min="0x0001" max="0x2710" writable="false" optional="false" isNullable="true">max measured value</attribute>
- <attribute side="server" code="0x0003" define="RELATIVE_HUMIDITY_TOLERANCE" type="INT16U" min="0x0000" max="0x0800" writable="false" reportable="true" optional="true">tolerance</attribute>
+ <attribute side="server" code="0x0000" define="RELATIVE_HUMIDITY_MEASURED_VALUE" type="INT16U" writable="false" reportable="true" optional="false" isNullable="true">MeasuredValue</attribute>
+ <attribute side="server" code="0x0001" define="RELATIVE_HUMIDITY_MIN_MEASURED_VALUE" type="INT16U" min="0x0000" max="0x270F" writable="false" optional="false" isNullable="true">MinMeasuredValue</attribute>
+ <attribute side="server" code="0x0002" define="RELATIVE_HUMIDITY_MAX_MEASURED_VALUE" type="INT16U" min="0x0001" max="0x2710" writable="false" optional="false" isNullable="true">MaxMeasuredValue</attribute>
+ <attribute side="server" code="0x0003" define="RELATIVE_HUMIDITY_TOLERANCE" type="INT16U" min="0x0000" max="0x0800" writable="false" reportable="true" optional="true">Tolerance</attribute>
</cluster>
</configurator>
diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
index db4536f..f9deb79 100644
--- a/src/controller/data_model/controller-clusters.zap
+++ b/src/controller/data_model/controller-clusters.zap
@@ -14647,7 +14647,7 @@
"enabled": 0,
"attributes": [
{
- "name": "measured value",
+ "name": "MeasuredValue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -14663,7 +14663,7 @@
"reportableChange": 0
},
{
- "name": "min measured value",
+ "name": "MinMeasuredValue",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -14679,7 +14679,7 @@
"reportableChange": 0
},
{
- "name": "max measured value",
+ "name": "MaxMeasuredValue",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -14695,7 +14695,7 @@
"reportableChange": 0
},
{
- "name": "tolerance",
+ "name": "Tolerance",
"code": 3,
"mfgCode": null,
"side": "server",
diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
index 14e9b02..2e13bb7 100644
--- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
@@ -751,12 +751,11 @@
{ ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \
- { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* measured value */ \
- { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* min measured value */ \
- { ZAP_SIMPLE_DEFAULT(0x2710), 0x00000002, 2, ZAP_TYPE(INT16U), \
- ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* max measured value */ \
- { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
- { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
+ { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */ \
+ { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */ \
+ { ZAP_SIMPLE_DEFAULT(0x2710), 0x00000002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */ \
+ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
+ { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Client Monitoring (server) */ \
{ ZAP_SIMPLE_DEFAULT(0x12C), 0x00000000, 4, ZAP_TYPE(INT32U), 0 }, /* IdleModeInterval */ \
@@ -1191,13 +1190,12 @@
{ ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
\
/* Endpoint: 1, Cluster: Relative Humidity Measurement (server) */ \
- { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* measured value */ \
- { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* min measured value */ \
- { ZAP_SIMPLE_DEFAULT(0x2710), 0x00000002, 2, ZAP_TYPE(INT16U), \
- ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* max measured value */ \
- { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), 0 }, /* tolerance */ \
- { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
- { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
+ { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */ \
+ { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */ \
+ { ZAP_SIMPLE_DEFAULT(0x2710), 0x00000002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */ \
+ { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), 0 }, /* Tolerance */ \
+ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
+ { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
\
/* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \
{ ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy */ \
diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h
index 994d8d9..0043f5f 100644
--- a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h
@@ -554,12 +554,11 @@
{ ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \
- { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* measured value */ \
- { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* min measured value */ \
- { ZAP_SIMPLE_DEFAULT(0x2710), 0x00000002, 2, ZAP_TYPE(INT16U), \
- ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* max measured value */ \
- { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
- { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
+ { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */ \
+ { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */ \
+ { ZAP_SIMPLE_DEFAULT(0x2710), 0x00000002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */ \
+ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
+ { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
\
/* Endpoint: 1, Cluster: Identify (server) */ \
{ ZAP_SIMPLE_DEFAULT(0x0000), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* IdentifyTime */ \
@@ -754,12 +753,11 @@
{ ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
\
/* Endpoint: 1, Cluster: Relative Humidity Measurement (server) */ \
- { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* measured value */ \
- { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* min measured value */ \
- { ZAP_SIMPLE_DEFAULT(0x2710), 0x00000002, 2, ZAP_TYPE(INT16U), \
- ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* max measured value */ \
- { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
- { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
+ { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */ \
+ { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */ \
+ { ZAP_SIMPLE_DEFAULT(0x2710), 0x00000002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */ \
+ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
+ { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
\
/* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \
{ ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* occupancy */ \
diff --git a/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/endpoint_config.h
index ad2b4b6..58f6888 100644
--- a/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/endpoint_config.h
+++ b/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/endpoint_config.h
@@ -281,13 +281,12 @@
{ ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
\
/* Endpoint: 1, Cluster: Relative Humidity Measurement (server) */ \
- { ZAP_SIMPLE_DEFAULT(0x11d0), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* measured value */ \
- { ZAP_SIMPLE_DEFAULT(0x1), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* min measured value */ \
- { ZAP_SIMPLE_DEFAULT(0x2710), 0x00000002, 2, ZAP_TYPE(INT16U), \
- ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* max measured value */ \
- { ZAP_SIMPLE_DEFAULT(8), 0x00000003, 2, ZAP_TYPE(INT16U), 0 }, /* tolerance */ \
- { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
- { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
+ { ZAP_SIMPLE_DEFAULT(0x11d0), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */ \
+ { ZAP_SIMPLE_DEFAULT(0x1), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */ \
+ { ZAP_SIMPLE_DEFAULT(0x2710), 0x00000002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */ \
+ { ZAP_SIMPLE_DEFAULT(8), 0x00000003, 2, ZAP_TYPE(INT16U), 0 }, /* Tolerance */ \
+ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
+ { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
}
// This is an array of EmberAfCluster structures.
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
index b8d98ea..db386d4 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
@@ -8354,22 +8354,22 @@
case RelativeHumidityMeasurement::Attributes::MeasuredValue::Id: {
chip::app::DataModel::Nullable<uint16_t> value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
- return DataModelLogger::LogValue("measured value", 1, value);
+ return DataModelLogger::LogValue("MeasuredValue", 1, value);
}
case RelativeHumidityMeasurement::Attributes::MinMeasuredValue::Id: {
chip::app::DataModel::Nullable<uint16_t> value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
- return DataModelLogger::LogValue("min measured value", 1, value);
+ return DataModelLogger::LogValue("MinMeasuredValue", 1, value);
}
case RelativeHumidityMeasurement::Attributes::MaxMeasuredValue::Id: {
chip::app::DataModel::Nullable<uint16_t> value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
- return DataModelLogger::LogValue("max measured value", 1, value);
+ return DataModelLogger::LogValue("MaxMeasuredValue", 1, value);
}
case RelativeHumidityMeasurement::Attributes::Tolerance::Id: {
uint16_t value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
- return DataModelLogger::LogValue("tolerance", 1, value);
+ return DataModelLogger::LogValue("Tolerance", 1, value);
}
case RelativeHumidityMeasurement::Attributes::GeneratedCommandList::Id: {
chip::app::DataModel::DecodableList<chip::CommandId> value;
diff --git a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h
index 733387d..575c585 100644
--- a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h
+++ b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h
@@ -521,13 +521,12 @@
{ ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \
- { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* measured value */ \
- { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* min measured value */ \
- { ZAP_SIMPLE_DEFAULT(0x2710), 0x00000002, 2, ZAP_TYPE(INT16U), \
- ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* max measured value */ \
- { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), 0 }, /* tolerance */ \
- { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
- { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
+ { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */ \
+ { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */ \
+ { ZAP_SIMPLE_DEFAULT(0x2710), 0x00000002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */ \
+ { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), 0 }, /* Tolerance */ \
+ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
+ { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Target Navigator (server) */ \
{ ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TargetList */ \
diff --git a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h
index e9e3561..da8ed95 100644
--- a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h
+++ b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h
@@ -539,13 +539,12 @@
{ ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \
- { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* measured value */ \
- { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* min measured value */ \
- { ZAP_SIMPLE_DEFAULT(0x2710), 0x00000002, 2, ZAP_TYPE(INT16U), \
- ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* max measured value */ \
- { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), 0 }, /* tolerance */ \
- { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
- { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
+ { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */ \
+ { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */ \
+ { ZAP_SIMPLE_DEFAULT(0x2710), 0x00000002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */ \
+ { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), 0 }, /* Tolerance */ \
+ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
+ { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Target Navigator (server) */ \
{ ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TargetList */ \
diff --git a/zzz_generated/tv-app/zap-generated/endpoint_config.h b/zzz_generated/tv-app/zap-generated/endpoint_config.h
index e1dc818..e71f34a 100644
--- a/zzz_generated/tv-app/zap-generated/endpoint_config.h
+++ b/zzz_generated/tv-app/zap-generated/endpoint_config.h
@@ -500,9 +500,9 @@
{ ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
\
/* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */ \
- { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* measured value */ \
- { ZAP_EMPTY_DEFAULT(), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* min measured value */ \
- { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* max measured value */ \
+ { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */ \
+ { ZAP_EMPTY_DEFAULT(), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */ \
+ { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */ \
{ ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
{ ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
\
