From 4b1bc906a9348eb48d77434617bfdeb461dea353 Mon Sep 17 00:00:00 2001 From: Janus Date: Wed, 27 Oct 2021 02:02:13 +0200 Subject: [PATCH] Flow measurement cluster: camelcase attributes (#10966) * camelcase attributes * updated flw tests * added zap generated files --- .../suites/certification/Test_TC_FLW_2_1.yaml | 18 +++++++++--------- .../suites/certification/Test_TC_FLW_2_2.yaml | 4 ++-- .../chip/flow-measurement-cluster.xml | 8 ++++---- .../zap-generated/endpoint_config.h | 6 +++--- .../pump-app/zap-generated/endpoint_config.h | 6 +++--- .../thermostat/zap-generated/endpoint_config.h | 6 +++--- .../zap-generated/endpoint_config.h | 6 +++--- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/app/tests/suites/certification/Test_TC_FLW_2_1.yaml b/src/app/tests/suites/certification/Test_TC_FLW_2_1.yaml index 27dbbc51db65ce..89fe838951588c 100644 --- a/src/app/tests/suites/certification/Test_TC_FLW_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_FLW_2_1.yaml @@ -21,21 +21,21 @@ config: tests: - label: "read the mandatory attribute: MeasuredValue" command: "readAttribute" - attribute: "measured value" + attribute: "MeasuredValue" response: constraints: type: uint16 - label: "read the mandatory attribute: MinMeasuredValue" command: "readAttribute" - attribute: "min measured value" + attribute: "MinMeasuredValue" response: constraints: type: uint16 - label: "read the mandatory attribute: MaxMeasuredValue" command: "readAttribute" - attribute: "max measured value" + attribute: "MaxMeasuredValue" response: constraints: type: uint16 @@ -43,7 +43,7 @@ tests: - label: "write the default value to optional attribute: MeasuredValue" disabled: true command: "writeAttribute" - attribute: "measured value" + attribute: "MeasuredValue" arguments: value: 0 response: @@ -51,7 +51,7 @@ tests: - label: "write the default value to optional attribute: MinMeasuredValue" command: "writeAttribute" - attribute: "min measured value" + attribute: "MinMeasuredValue" arguments: value: 0 response: @@ -59,7 +59,7 @@ tests: - label: "write the default value to optional attribute: MaxMeasuredValue" command: "writeAttribute" - attribute: "max measured value" + attribute: "MaxMeasuredValue" arguments: value: 0 response: @@ -67,21 +67,21 @@ tests: - label: "read the mandatory attribute: MeasuredValue" command: "readAttribute" - attribute: "measured value" + attribute: "MeasuredValue" response: constraints: type: uint16 - label: "read the mandatory attribute: MinMeasuredValue" command: "readAttribute" - attribute: "min measured value" + attribute: "MinMeasuredValue" response: constraints: type: uint16 - label: "read the mandatory attribute: MaxMeasuredValue" command: "readAttribute" - attribute: "max measured value" + attribute: "MaxMeasuredValue" response: constraints: type: uint16 diff --git a/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml b/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml index 35f5413cfad104..2eac222866cb64 100644 --- a/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml @@ -21,7 +21,7 @@ config: tests: - label: "read the mandatory attribute: MeasuredValue" command: "readAttribute" - attribute: "measured value" + attribute: "MeasuredValue" response: constraints: type: uint16 @@ -31,7 +31,7 @@ tests: - label: "read the mandatory attribute: MeasuredValue" command: "readAttribute" - attribute: "measured value" + attribute: "MeasuredValue" response: constraints: type: uint16 diff --git a/src/app/zap-templates/zcl/data-model/chip/flow-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/flow-measurement-cluster.xml index 0844e9cd5998f6..38e072dc953d95 100644 --- a/src/app/zap-templates/zcl/data-model/chip/flow-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/flow-measurement-cluster.xml @@ -24,10 +24,10 @@ limitations under the License. FLOW_MEASUREMENT_CLUSTER true true - measured value - min measured value - max measured value - tolerance + MeasuredValue + MinMeasuredValue + MaxMeasuredValue + Tolerance 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 7c6f85d4b79d3d..ece5bddb54c2ac 100644 --- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h @@ -2437,9 +2437,9 @@ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Flow Measurement (server) */ \ - { 0x0000, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* measured value */ \ - { 0x0001, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* min measured value */ \ - { 0x0002, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* max measured value */ \ + { 0x0000, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* MeasuredValue */ \ + { 0x0001, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* MinMeasuredValue */ \ + { 0x0002, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* MaxMeasuredValue */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Relative Humidity Measurement (server) */ \ diff --git a/zzz_generated/pump-app/zap-generated/endpoint_config.h b/zzz_generated/pump-app/zap-generated/endpoint_config.h index b468217c0be69c..51bb2fcf708570 100644 --- a/zzz_generated/pump-app/zap-generated/endpoint_config.h +++ b/zzz_generated/pump-app/zap-generated/endpoint_config.h @@ -1020,9 +1020,9 @@ { 0xFFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(CLIENT), ZAP_SIMPLE_DEFAULT(2) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Flow Measurement (server) */ \ - { 0x0000, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* measured value */ \ - { 0x0001, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* min measured value */ \ - { 0x0002, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* max measured value */ \ + { 0x0000, ZAP_TYPE(INT16S), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* MeasuredValue */ \ + { 0x0001, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* MinMeasuredValue */ \ + { 0x0002, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* MaxMeasuredValue */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* ClusterRevision */ \ } diff --git a/zzz_generated/thermostat/zap-generated/endpoint_config.h b/zzz_generated/thermostat/zap-generated/endpoint_config.h index 529680ea8b2d3b..c57b2a94cb63f3 100644 --- a/zzz_generated/thermostat/zap-generated/endpoint_config.h +++ b/zzz_generated/thermostat/zap-generated/endpoint_config.h @@ -2079,9 +2079,9 @@ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Flow Measurement (server) */ \ - { 0x0000, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* measured value */ \ - { 0x0001, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* min measured value */ \ - { 0x0002, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* max measured value */ \ + { 0x0000, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* MeasuredValue */ \ + { 0x0001, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* MinMeasuredValue */ \ + { 0x0002, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* MaxMeasuredValue */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Relative Humidity Measurement (server) */ \ diff --git a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h index 5ea1c9426fdb33..13466b394cb108 100644 --- a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h @@ -2021,9 +2021,9 @@ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Flow Measurement (server) */ \ - { 0x0000, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* measured value */ \ - { 0x0001, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* min measured value */ \ - { 0x0002, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* max measured value */ \ + { 0x0000, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* MeasuredValue */ \ + { 0x0001, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* MinMeasuredValue */ \ + { 0x0002, ZAP_TYPE(INT16S), 2, 0, ZAP_EMPTY_DEFAULT() }, /* MaxMeasuredValue */ \ { 0xFFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Relative Humidity Measurement (server) */ \