From dc7473b52c8b18efdb2e207f5fb07eece49bc390 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Wed, 21 Jun 2023 14:52:54 -0400 Subject: [PATCH] Update concentration measurement cluster revisions to 3. Fixes https://github.com/project-chip/connectedhomeip/issues/27364 --- .../all-clusters-app.matter | 20 +++--- .../all-clusters-common/all-clusters-app.zap | 32 ++++----- .../concentration-measurement-cluster.xml | 70 +++++++++++++++++++ 3 files changed, 96 insertions(+), 26 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index 9d332ab0d7509b..1501b06a842527 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -6637,7 +6637,7 @@ endpoint 1 { callback attribute eventList; callback attribute attributeList; ram attribute featureMap default = 63; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 3; } server cluster CarbonDioxideConcentrationMeasurement { @@ -6657,7 +6657,7 @@ endpoint 1 { callback attribute eventList; callback attribute attributeList; ram attribute featureMap default = 63; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 3; } server cluster NitrogenDioxideConcentrationMeasurement { @@ -6677,7 +6677,7 @@ endpoint 1 { callback attribute eventList; callback attribute attributeList; ram attribute featureMap default = 63; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 3; } server cluster OzoneConcentrationMeasurement { @@ -6697,7 +6697,7 @@ endpoint 1 { callback attribute eventList; callback attribute attributeList; ram attribute featureMap default = 63; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 3; } server cluster Pm25ConcentrationMeasurement { @@ -6717,7 +6717,7 @@ endpoint 1 { callback attribute eventList; callback attribute attributeList; ram attribute featureMap default = 63; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 3; } server cluster FormaldehydeConcentrationMeasurement { @@ -6737,7 +6737,7 @@ endpoint 1 { callback attribute eventList; callback attribute attributeList; ram attribute featureMap default = 63; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 3; } server cluster Pm1ConcentrationMeasurement { @@ -6757,7 +6757,7 @@ endpoint 1 { callback attribute eventList; callback attribute attributeList; ram attribute featureMap default = 63; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 3; } server cluster Pm10ConcentrationMeasurement { @@ -6777,7 +6777,7 @@ endpoint 1 { callback attribute eventList; callback attribute attributeList; ram attribute featureMap default = 63; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 3; } server cluster TotalVolatileOrganicCompoundsConcentrationMeasurement { @@ -6797,7 +6797,7 @@ endpoint 1 { callback attribute eventList; callback attribute attributeList; ram attribute featureMap default = 63; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 3; } server cluster RadonConcentrationMeasurement { @@ -6817,7 +6817,7 @@ endpoint 1 { callback attribute eventList; callback attribute attributeList; ram attribute featureMap default = 63; - ram attribute clusterRevision default = 1; + ram attribute clusterRevision default = 3; } server cluster WakeOnLan { 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 7136a62988b61c..d2e55f8f6dd442 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 @@ -16,12 +16,6 @@ } ], "package": [ - { - "pathRelativity": "relativeToZap", - "path": "../../../src/app/zap-templates/app-templates.json", - "type": "gen-templates-json", - "version": "chip-v1" - }, { "pathRelativity": "relativeToZap", "path": "../../../src/app/zap-templates/zcl/zcl-with-test-extensions.json", @@ -29,6 +23,12 @@ "category": "matter", "version": 1, "description": "Matter SDK ZCL data with some extensions" + }, + { + "pathRelativity": "relativeToZap", + "path": "../../../src/app/zap-templates/app-templates.json", + "type": "gen-templates-json", + "version": "chip-v1" } ], "endpointTypes": [ @@ -21417,7 +21417,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "3", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -21741,7 +21741,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "3", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -22389,7 +22389,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "3", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -22713,7 +22713,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "3", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -23037,7 +23037,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "3", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -23361,7 +23361,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "3", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -23685,7 +23685,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "3", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -24009,7 +24009,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "3", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -24333,7 +24333,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "3", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -24657,7 +24657,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "3", "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml index 8b11a638f75dc6..8b494f02ef7bb4 100644 --- a/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml @@ -27,6 +27,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -74,6 +76,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -97,6 +101,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -120,6 +126,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -143,6 +151,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -166,6 +176,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -189,6 +201,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -212,6 +226,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -235,6 +251,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -258,6 +276,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -281,6 +301,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -304,6 +326,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -327,6 +351,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -350,6 +376,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -373,6 +401,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -396,6 +426,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -419,6 +451,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -442,6 +476,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -465,6 +501,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -488,6 +526,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -511,6 +551,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -534,6 +576,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -557,6 +601,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -580,6 +626,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -603,6 +651,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -626,6 +676,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -649,6 +701,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -672,6 +726,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -695,6 +751,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -718,6 +776,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -741,6 +801,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -764,6 +826,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -787,6 +851,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -810,6 +876,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue @@ -833,6 +901,8 @@ limitations under the License. true true + + MeasuredValue MinMeasuredValue MaxMeasuredValue