From 05f1c92a6d3ee5f0b7a4827589af66f03557c68e Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 10 Mar 2023 12:39:01 -0500 Subject: [PATCH] Fix various mis-alignments wrt spec in cluster XML. 1) Remove default that is not listed in spec table in Boolean State. * Fixes https://github.com/project-chip/connectedhomeip/issues/25605 2) Remove length constraint on list in Fixed Label and User Label. * Fixes https://github.com/project-chip/connectedhomeip/issues/25610 3) Remove length constraint on list in Network Commissioning. * Partially addresses https://github.com/project-chip/connectedhomeip/issues/25612 4) Remove incorrect max values in Occupancy Sensing. * Fixes https://github.com/project-chip/connectedhomeip/issues/25614 5) Add min/max for SupportedFabrics in Operational Credentials * Fixes https://github.com/project-chip/connectedhomeip/issues/25616 6) Remove defaults and "reportable" annotations that are not in the spec table in Pressure Measurement * Fixes https://github.com/project-chip/connectedhomeip/issues/25617 7) Fix max value of Tolerance attribute in Temperature Measurement * Fixes https://github.com/project-chip/connectedhomeip/issues/25618 8) Remove stray "reportable" on Tolerance in Relative Humidity Measurement * Fixes https://github.com/project-chip/connectedhomeip/issues/25620 --- examples/placeholder/linux/apps/app2/config.matter | 4 ++-- .../zcl/data-model/chip/boolean-state-cluster.xml | 2 +- .../zcl/data-model/chip/fixed-label-cluster.xml | 2 +- .../chip/network-commissioning-cluster.xml | 2 +- .../data-model/chip/occupancy-sensing-cluster.xml | 12 ++++++------ .../chip/operational-credentials-cluster.xml | 2 +- .../data-model/chip/pressure-measurement-cluster.xml | 6 +++--- .../chip/relative-humidity-measurement-cluster.xml | 2 +- .../chip/temperature-measurement-cluster.xml | 2 +- .../zcl/data-model/chip/user-label-cluster.xml | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 6f6e953460ce36..cd0fea3a9d5671 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -261,7 +261,7 @@ client cluster OnOff = 6 { kLighting = 0x1; } - readonly attribute boolean onOff = 0; + readonly nosubscribe attribute boolean onOff = 0; readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; @@ -322,7 +322,7 @@ server cluster OnOff = 6 { kLighting = 0x1; } - readonly attribute boolean onOff = 0; + readonly nosubscribe attribute boolean onOff = 0; readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; diff --git a/src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml index a38e8896406a08..0dee692affacee 100644 --- a/src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml @@ -26,7 +26,7 @@ limitations under the License. true true - StateValue + StateValue This event SHALL be generated when the StateValue attribute changes. diff --git a/src/app/zap-templates/zcl/data-model/chip/fixed-label-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/fixed-label-cluster.xml index 69f1bc975c6228..4c5e82c8646b73 100644 --- a/src/app/zap-templates/zcl/data-model/chip/fixed-label-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/fixed-label-cluster.xml @@ -31,6 +31,6 @@ limitations under the License. FIXED_LABEL_CLUSTER The Fixed Label Cluster provides a feature for the device to tag an endpoint with zero or more read only labels. - LabelList + LabelList diff --git a/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml index 57d469de794daa..299a9b3f57960c 100644 --- a/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml @@ -87,7 +87,7 @@ limitations under the License. MaxNetworks - + Networks diff --git a/src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml index 5b914836672f69..ec019f988023ca 100644 --- a/src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml @@ -53,13 +53,13 @@ limitations under the License. OccupancySensorType OccupancySensorTypeBitmap - + PIROccupiedToUnoccupiedDelay - + PIRUnoccupiedToOccupiedDelay @@ -71,13 +71,13 @@ limitations under the License. - + UltrasonicOccupiedToUnoccupiedDelay - + UltrasonicUnoccupiedToOccupiedDelay @@ -89,13 +89,13 @@ limitations under the License. - + PhysicalContactOccupiedToUnoccupiedDelay - + PhysicalContactUnoccupiedToOccupiedDelay diff --git a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml index f410d30b9796f5..30ef7856af36ac 100644 --- a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml @@ -64,7 +64,7 @@ limitations under the License. Fabrics - SupportedFabrics + SupportedFabrics CommissionedFabrics TrustedRootCertificates CurrentFabricIndex diff --git a/src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml index 1a519353270924..ddace88b155a92 100644 --- a/src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/pressure-measurement-cluster.xml @@ -25,11 +25,11 @@ limitations under the License. true true - MeasuredValue + MeasuredValue MinMeasuredValue MaxMeasuredValue - Tolerance - ScaledValue + Tolerance + ScaledValue MinScaledValue MaxScaledValue ScaledTolerance 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 6e45cae570fd36..41f070b27b7ef2 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 @@ -28,6 +28,6 @@ limitations under the License. MeasuredValue MinMeasuredValue MaxMeasuredValue - Tolerance + Tolerance diff --git a/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml index 454583d1d825d0..2e0211c8a30704 100644 --- a/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml @@ -27,6 +27,6 @@ limitations under the License. MeasuredValue MinMeasuredValue MaxMeasuredValue - Tolerance + Tolerance diff --git a/src/app/zap-templates/zcl/data-model/chip/user-label-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/user-label-cluster.xml index 57d27088855fd9..651b32a058b9d7 100644 --- a/src/app/zap-templates/zcl/data-model/chip/user-label-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/user-label-cluster.xml @@ -23,7 +23,7 @@ limitations under the License. 0x0041 USER_LABEL_CLUSTER The User Label Cluster provides a feature to tag an endpoint with zero or more labels. - + LabelList