From 4823e34b666419394ae0082094cd6ad4b8599a78 Mon Sep 17 00:00:00 2001
From: Petru Lauric <81822411+plauric@users.noreply.github.com>
Date: Wed, 25 Oct 2023 13:39:02 -0400
Subject: [PATCH] Mode-derived clusters: rev update (XMLs + TC 1.1) (#29964)
* add changes
* add Commands.h changes generated by regen
* update zap files and fix XML indenting issue
* add matter files
* add missing chef matter file
---
.../all-clusters-common/all-clusters-app.matter | 10 +++++-----
.../all-clusters-common/all-clusters-app.zap | 10 +++++-----
.../rootnode_roboticvacuumcleaner_1807ff0c49.matter | 4 ++--
.../rootnode_roboticvacuumcleaner_1807ff0c49.zap | 7 ++++---
examples/rvc-app/rvc-common/rvc-app.matter | 4 ++--
examples/rvc-app/rvc-common/rvc-app.zap | 7 ++++---
.../tests/suites/certification/Test_TC_DISHM_1_1.yaml | 4 ++--
.../tests/suites/certification/Test_TC_LWM_1_1.yaml | 2 +-
.../suites/certification/Test_TC_RVCCLEANM_1_1.yaml | 2 +-
.../suites/certification/Test_TC_RVCRUNM_1_1.yaml | 2 +-
.../tests/suites/certification/Test_TC_TCCM_1_1.yaml | 2 +-
.../data-model/chip/laundry-washer-mode-cluster.xml | 1 +
...and-temperature-controlled-cabinet-mode-cluster.xml | 1 +
.../zcl/data-model/chip/rvc-clean-mode-cluster.xml | 1 +
.../zcl/data-model/chip/rvc-run-mode-cluster.xml | 1 +
.../zap-generated/test/Commands.h | 8 ++++----
16 files changed, 36 insertions(+), 30 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 9dd83af84912ac..c99cdc61e453e1 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
@@ -5886,7 +5886,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
callback attribute featureMap default = 0;
- ram attribute clusterRevision default = 1;
+ ram attribute clusterRevision default = 2;
handle command ChangeToMode;
handle command ChangeToModeResponse;
@@ -5901,7 +5901,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
callback attribute featureMap default = 0;
- ram attribute clusterRevision default = 1;
+ ram attribute clusterRevision default = 2;
handle command ChangeToMode;
handle command ChangeToModeResponse;
@@ -5928,7 +5928,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
callback attribute featureMap default = 0;
- ram attribute clusterRevision default = 1;
+ ram attribute clusterRevision default = 2;
handle command ChangeToMode;
handle command ChangeToModeResponse;
@@ -5942,7 +5942,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
callback attribute featureMap default = 0;
- ram attribute clusterRevision default = 1;
+ ram attribute clusterRevision default = 2;
handle command ChangeToMode;
handle command ChangeToModeResponse;
@@ -5981,7 +5981,7 @@ endpoint 1 {
callback attribute acceptedCommandList;
callback attribute attributeList;
callback attribute featureMap default = 0;
- ram attribute clusterRevision default = 1;
+ ram attribute clusterRevision default = 2;
handle command ChangeToMode;
handle command ChangeToModeResponse;
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 34ca8f7ab481f2..d5e88382335d63 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
@@ -9018,7 +9018,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -9190,7 +9190,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -9516,7 +9516,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -9672,7 +9672,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -10123,7 +10123,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
index 754ef7632f1a2a..6bcbb7e9a1419b 100644
--- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
+++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
@@ -1286,7 +1286,7 @@ endpoint 1 {
callback attribute eventList;
callback attribute attributeList;
callback attribute featureMap default = 0;
- ram attribute clusterRevision default = 1;
+ ram attribute clusterRevision default = 2;
handle command ChangeToMode;
handle command ChangeToModeResponse;
@@ -1301,7 +1301,7 @@ endpoint 1 {
callback attribute eventList;
callback attribute attributeList;
callback attribute featureMap default = 0;
- ram attribute clusterRevision default = 1;
+ ram attribute clusterRevision default = 2;
handle command ChangeToMode;
handle command ChangeToModeResponse;
diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap
index 6189b501edc472..8b70d3da6ebd45 100644
--- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap
+++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap
@@ -2593,7 +2593,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -2765,7 +2765,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -3035,5 +3035,6 @@
"endpointId": 1,
"networkId": 0
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/examples/rvc-app/rvc-common/rvc-app.matter b/examples/rvc-app/rvc-common/rvc-app.matter
index c5ffc7e7e4ef63..0bb7e9efb14a62 100644
--- a/examples/rvc-app/rvc-common/rvc-app.matter
+++ b/examples/rvc-app/rvc-common/rvc-app.matter
@@ -1192,7 +1192,7 @@ endpoint 1 {
callback attribute eventList;
callback attribute attributeList;
callback attribute featureMap default = 0;
- ram attribute clusterRevision default = 1;
+ ram attribute clusterRevision default = 2;
handle command ChangeToMode;
handle command ChangeToModeResponse;
@@ -1206,7 +1206,7 @@ endpoint 1 {
callback attribute eventList;
callback attribute attributeList;
callback attribute featureMap default = 0;
- ram attribute clusterRevision default = 1;
+ ram attribute clusterRevision default = 2;
handle command ChangeToMode;
handle command ChangeToModeResponse;
diff --git a/examples/rvc-app/rvc-common/rvc-app.zap b/examples/rvc-app/rvc-common/rvc-app.zap
index c3a38c0e3d1708..d6d93ff4a7cc6b 100644
--- a/examples/rvc-app/rvc-common/rvc-app.zap
+++ b/examples/rvc-app/rvc-common/rvc-app.zap
@@ -2373,7 +2373,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -2529,7 +2529,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -2783,5 +2783,6 @@
"endpointId": 1,
"networkId": 0
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/src/app/tests/suites/certification/Test_TC_DISHM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DISHM_1_1.yaml
index cd6c4dbac170a2..c45ce0700c179b 100644
--- a/src/app/tests/suites/certification/Test_TC_DISHM_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DISHM_1_1.yaml
@@ -35,10 +35,10 @@ tests:
verification: |
./chip-tool dishwashermode read cluster-revision 1 1
- Verify the "ClusterRevision" value is of unit16 and reflects the highest revision number 1 on the TH(Chip-tool) and below is the sample log provided for the raspi platform:
+ Verify the "ClusterRevision" value is of unit16 and reflects the highest revision number (2) on the TH(Chip-tool) and below is the sample log provided for the raspi platform:
[1690365584.246794][27436:27438] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0059 Attribute 0x0000_FFFD DataVersion: 1130015440
- [1690365584.246860][27436:27438] CHIP:TOO: ClusterRevision: 1
+ [1690365584.246860][27436:27438] CHIP:TOO: ClusterRevision: 2
disabled: true
- label: "Step 3: TH reads from the DUT the FeatureMap attribute."
diff --git a/src/app/tests/suites/certification/Test_TC_LWM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_LWM_1_1.yaml
index 91ab6841eb12e8..8932fe0e7506ea 100644
--- a/src/app/tests/suites/certification/Test_TC_LWM_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_LWM_1_1.yaml
@@ -35,7 +35,7 @@ tests:
command: "readAttribute"
attribute: "ClusterRevision"
response:
- value: 1
+ value: 2
constraints:
type: int16u
diff --git a/src/app/tests/suites/certification/Test_TC_RVCCLEANM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_RVCCLEANM_1_1.yaml
index a80ea7c76f93f9..2415830c81adc0 100644
--- a/src/app/tests/suites/certification/Test_TC_RVCCLEANM_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_RVCCLEANM_1_1.yaml
@@ -35,7 +35,7 @@ tests:
command: "readAttribute"
attribute: "ClusterRevision"
response:
- value: 1
+ value: 2
constraints:
type: int16u
diff --git a/src/app/tests/suites/certification/Test_TC_RVCRUNM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_RVCRUNM_1_1.yaml
index 8dd2428b9dd203..ad7ff4866e2c32 100644
--- a/src/app/tests/suites/certification/Test_TC_RVCRUNM_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_RVCRUNM_1_1.yaml
@@ -35,7 +35,7 @@ tests:
command: "readAttribute"
attribute: "ClusterRevision"
response:
- value: 1
+ value: 2
constraints:
type: int16u
diff --git a/src/app/tests/suites/certification/Test_TC_TCCM_1_1.yaml b/src/app/tests/suites/certification/Test_TC_TCCM_1_1.yaml
index e0f6df2d917fb4..a9e64fb9ae44e7 100644
--- a/src/app/tests/suites/certification/Test_TC_TCCM_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_TCCM_1_1.yaml
@@ -35,7 +35,7 @@ tests:
command: "readAttribute"
attribute: "ClusterRevision"
response:
- value: 1
+ value: 2
constraints:
type: int16u
diff --git a/src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml
index 0747c2f55c9c8d..f9181a6edd5ca4 100644
--- a/src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml
@@ -33,6 +33,7 @@ limitations under the License.
true
true
Attributes and commands for selecting a mode from a list of supported options.
+
SupportedModes
CurrentMode
diff --git a/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml
index 7b60cff33629a1..bbd0e229338883 100644
--- a/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml
@@ -31,6 +31,7 @@ limitations under the License.
true
true
Attributes and commands for selecting a mode from a list of supported options.
+
SupportedModes
CurrentMode
diff --git a/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml
index 32ebf79c7e0d31..44a2669c8d018e 100644
--- a/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml
@@ -37,6 +37,7 @@ limitations under the License.
true
true
Attributes and commands for selecting a mode from a list of supported options.
+
SupportedModes
CurrentMode
diff --git a/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml
index c177155c2f9ec3..2175e26ed9f257 100644
--- a/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml
@@ -43,6 +43,7 @@ limitations under the License.
true
true
Attributes and commands for selecting a mode from a list of supported options.
+
SupportedModes
CurrentMode
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
index 19518f0203335d..3d3737a78c4347 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -63366,7 +63366,7 @@ class Test_TC_LWM_1_1 : public TestCommandBridge {
{
id actualValue = value;
- VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U));
+ VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 2U));
}
VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u"));
@@ -88978,7 +88978,7 @@ class Test_TC_RVCCLEANM_1_1 : public TestCommandBridge {
{
id actualValue = value;
- VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U));
+ VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 2U));
}
VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u"));
@@ -89414,7 +89414,7 @@ class Test_TC_RVCRUNM_1_1 : public TestCommandBridge {
{
id actualValue = value;
- VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U));
+ VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 2U));
}
VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u"));
@@ -92087,7 +92087,7 @@ class Test_TC_TCCM_1_1 : public TestCommandBridge {
{
id actualValue = value;
- VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U));
+ VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 2U));
}
VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u"));