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 a8842201042d33..4282eb691780b5 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
@@ -7064,7 +7064,7 @@ endpoint 1 {
ram attribute windSetting default = 0x00;
ram attribute airflowDirection default = 0;
ram attribute featureMap default = 0x3F;
- ram attribute clusterRevision default = 2;
+ ram attribute clusterRevision default = 4;
}
server cluster ThermostatUserInterfaceConfiguration {
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 cdf5a70eb812e8..a020f5c9b9788d 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,6 +16,12 @@
}
],
"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",
@@ -23,20 +29,14 @@
"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": [
{
- "id": 1,
+ "id": 4,
"name": "MA-rootdevice",
"deviceTypeRef": {
- "id": 3,
+ "id": 56,
"code": 17,
"profileId": 259,
"label": "MA-powersource",
@@ -44,14 +44,14 @@
},
"deviceTypes": [
{
- "id": 3,
+ "id": 56,
"code": 17,
"profileId": 259,
"label": "MA-powersource",
"name": "MA-powersource"
},
{
- "id": 2,
+ "id": 55,
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
@@ -59,8 +59,8 @@
}
],
"deviceTypeRefs": [
- 3,
- 2
+ 56,
+ 55
],
"deviceVersions": [
1,
@@ -10512,10 +10512,10 @@
]
},
{
- "id": 2,
+ "id": 7,
"name": "MA-onofflight",
"deviceTypeRef": {
- "id": 8,
+ "id": 61,
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
@@ -10523,14 +10523,14 @@
},
"deviceTypes": [
{
- "id": 8,
+ "id": 61,
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
"name": "MA-onofflight"
},
{
- "id": 3,
+ "id": 56,
"code": 17,
"profileId": 259,
"label": "MA-powersource",
@@ -10538,8 +10538,8 @@
}
],
"deviceTypeRefs": [
- 8,
- 3
+ 61,
+ 56
],
"deviceVersions": [
1,
@@ -16867,7 +16867,7 @@
"side": "server",
"type": "AirQualityEnum",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
@@ -21528,7 +21528,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
- "defaultValue": "2",
+ "defaultValue": "4",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
@@ -30613,10 +30613,10 @@
]
},
{
- "id": 3,
+ "id": 5,
"name": "MA-onofflight",
"deviceTypeRef": {
- "id": 8,
+ "id": 61,
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
@@ -30624,14 +30624,14 @@
},
"deviceTypes": [
{
- "id": 8,
+ "id": 61,
"code": 256,
"profileId": 259,
"label": "MA-onofflight",
"name": "MA-onofflight"
},
{
- "id": 3,
+ "id": 56,
"code": 17,
"profileId": 259,
"label": "MA-powersource",
@@ -30639,8 +30639,8 @@
}
],
"deviceTypeRefs": [
- 8,
- 3
+ 61,
+ 56
],
"deviceVersions": [
1,
@@ -34897,10 +34897,10 @@
]
},
{
- "id": 4,
+ "id": 6,
"name": "Anonymous Endpoint Type",
"deviceTypeRef": {
- "id": 53,
+ "id": 106,
"code": 61442,
"profileId": 259,
"label": "MA-secondary-network-commissioning",
@@ -34908,7 +34908,7 @@
},
"deviceTypes": [
{
- "id": 53,
+ "id": 106,
"code": 61442,
"profileId": 259,
"label": "MA-secondary-network-commissioning",
@@ -34916,7 +34916,7 @@
}
],
"deviceTypeRefs": [
- 53
+ 106
],
"deviceVersions": [
1
diff --git a/src/app/tests/suites/certification/Test_TC_FAN_1_1.yaml b/src/app/tests/suites/certification/Test_TC_FAN_1_1.yaml
index 6b278a1a7ea1c2..bb66fadd34a687 100644
--- a/src/app/tests/suites/certification/Test_TC_FAN_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_FAN_1_1.yaml
@@ -31,24 +31,13 @@ tests:
- name: "nodeId"
value: nodeId
- #Issue : https://github.com/project-chip/connectedhomeip/issues/27320
- label: "Step 2a: Read the global attribute: ClusterRevision"
- verification: |
- ./chip-tool fancontrol read cluster-revision 1 1
-
- On TH(chip-tool), Verify the ClusterRevision attribute value as 3:
-
- [1685097285.665923][29977:29979] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0202 Attribute 0x0000_FFFD DataVersion: 2714837972
- [1685097285.666069][29977:29979] CHIP:TOO: ClusterRevision: 2
- cluster: "LogCommands"
- command: "UserPrompt"
- PICS: PICS_USER_PROMPT
- arguments:
- values:
- - name: "message"
- value: "Please enter 'y' for success"
- - name: "expectedValue"
- value: "y"
+ command: "readAttribute"
+ attribute: "ClusterRevision"
+ response:
+ value: 4
+ constraints:
+ type: int16u
- label: "Step 2b: Read the global attribute: FeatureMap"
command: "readAttribute"
diff --git a/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml
index 1b7552f451c66a..e78de6367b8c7f 100644
--- a/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml
@@ -83,6 +83,8 @@ limitations under the License.
true
true
+
+
FanMode
FanModeSequence
PercentSetting
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 c1db86cc0585e0..140f8444f563dd 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -51217,10 +51217,6 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
break;
case 1:
ChipLogProgress(chipTool, " ***** Test Step 1 : Step 2a: Read the global attribute: ClusterRevision\n");
- if (ShouldSkip("PICS_USER_PROMPT")) {
- NextTest();
- return;
- }
err = TestStep2aReadTheGlobalAttributeClusterRevision_1();
break;
case 2:
@@ -51498,11 +51494,25 @@ class Test_TC_FAN_1_1 : public TestCommandBridge {
CHIP_ERROR TestStep2aReadTheGlobalAttributeClusterRevision_1()
{
- chip::app::Clusters::LogCommands::Commands::UserPrompt::Type value;
- value.message = chip::Span("Please enter 'y' for successgarbage: not in length on purpose", 28);
- value.expectedValue.Emplace();
- value.expectedValue.Value() = chip::Span("ygarbage: not in length on purpose", 1);
- return UserPrompt("alpha", value);
+ MTRBaseDevice * device = GetDevice("alpha");
+ __auto_type * cluster = [[MTRBaseClusterFanControl alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue];
+ VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+ [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+ NSLog(@"Step 2a: Read the global attribute: ClusterRevision Error: %@", err);
+
+ VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+ {
+ id actualValue = value;
+ VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 4U));
+ }
+
+ VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u"));
+ NextTest();
+ }];
+
+ return CHIP_NO_ERROR;
}
CHIP_ERROR TestStep2bReadTheGlobalAttributeFeatureMap_2()