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 785e3aaef11fe8..c16a21606f8cbc 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 @@ -11038,6 +11038,30 @@ "source": "client", "incoming": 1, "outgoing": 1 + }, + { + "name": "EnhancedAddScene", + "code": 64, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 + }, + { + "name": "EnhancedViewScene", + "code": 65, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 + }, + { + "name": "CopyScene", + "code": 66, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 } ], "attributes": [ @@ -11130,6 +11154,30 @@ "source": "server", "incoming": 1, "outgoing": 1 + }, + { + "name": "EnhancedAddSceneResponse", + "code": 64, + "mfgCode": null, + "source": "server", + "incoming": 0, + "outgoing": 1 + }, + { + "name": "EnhancedViewSceneResponse", + "code": 65, + "mfgCode": null, + "source": "server", + "incoming": 0, + "outgoing": 1 + }, + { + "name": "CopySceneResponse", + "code": 66, + "mfgCode": null, + "source": "server", + "incoming": 0, + "outgoing": 1 } ], "attributes": [ @@ -11207,7 +11255,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0x80", "reportable": 1, "minInterval": 0, "maxInterval": 65344, @@ -11239,7 +11287,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "16", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -11255,7 +11303,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "8", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -11335,7 +11383,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -31132,6 +31180,30 @@ "source": "client", "incoming": 1, "outgoing": 1 + }, + { + "name": "EnhancedAddScene", + "code": 64, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 + }, + { + "name": "EnhancedViewScene", + "code": 65, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 + }, + { + "name": "CopyScene", + "code": 66, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 } ], "attributes": [ @@ -31224,6 +31296,30 @@ "source": "server", "incoming": 1, "outgoing": 1 + }, + { + "name": "EnhancedAddSceneResponse", + "code": 64, + "mfgCode": null, + "source": "server", + "incoming": 0, + "outgoing": 1 + }, + { + "name": "EnhancedViewSceneResponse", + "code": 65, + "mfgCode": null, + "source": "server", + "incoming": 0, + "outgoing": 1 + }, + { + "name": "CopySceneResponse", + "code": 66, + "mfgCode": null, + "source": "server", + "incoming": 0, + "outgoing": 1 } ], "attributes": [ @@ -31301,7 +31397,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0x80", "reportable": 1, "minInterval": 0, "maxInterval": 65344, @@ -31333,7 +31429,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "16", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -31349,7 +31445,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "8", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -31429,7 +31525,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -35392,5 +35488,6 @@ "endpointId": 65534, "networkId": 0 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/src/app/tests/suites/certification/Test_TC_S_1_1.yaml b/src/app/tests/suites/certification/Test_TC_S_1_1.yaml index 93be11fdee2487..b48b1a4e30c079 100644 --- a/src/app/tests/suites/certification/Test_TC_S_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_S_1_1.yaml @@ -151,7 +151,7 @@ tests: response: constraints: type: list - contains: [0, 1, 2, 3, 4, 5, 6, 40, 41, 42] + contains: [0, 1, 2, 3, 4, 5, 6, 64, 65, 66] - label: "Step 6b: Read AcceptedCommandList (global attribute 65529)" PICS: (!S.S.C40.Rsp) @@ -169,7 +169,7 @@ tests: response: constraints: type: list - contains: [0, 1, 2, 3, 4, 5, 6, 40, 41, 42] + contains: [0, 1, 2, 3, 4, 5, 6, 64, 65, 66] - label: "Step 6d: Read AcceptedCommandList (global attribute 65529)" PICS: (!S.C.C40.Tx) @@ -186,7 +186,7 @@ tests: response: constraints: type: list - contains: [0, 1, 2, 3, 4, 5, 6] + contains: [0, 1, 2, 3, 4, 6] - label: "Step 7b: Read optional command(EnhancedAddSceneResponse) in @@ -197,7 +197,7 @@ tests: response: constraints: type: list - contains: [40] + contains: [64] - label: "Step 7c: Read optional command(EnhancedViewSceneResponse) in @@ -208,7 +208,7 @@ tests: response: constraints: type: list - contains: [41] + contains: [65] - label: "Step 7d: Read optional command(CopySceneResponse) in @@ -219,4 +219,4 @@ tests: response: constraints: type: list - contains: [42] + contains: [66] diff --git a/src/app/tests/suites/certification/Test_TC_S_2_1.yaml b/src/app/tests/suites/certification/Test_TC_S_2_1.yaml index 039309538b5097..ed909e8b9a255f 100644 --- a/src/app/tests/suites/certification/Test_TC_S_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_S_2_1.yaml @@ -56,7 +56,7 @@ tests: attribute: "CurrentGroup" response: constraints: - type: groupid + type: int16u - label: "Step 5: TH reads from the DUT the (0x0003) SceneValid attribute" PICS: S.S.A0003 @@ -64,7 +64,7 @@ tests: attribute: "SceneValid" response: constraints: - type: int8u + type: boolean - label: "Step 6: TH reads from the DUT the (0x0004) NameSupport attribute" PICS: S.S.A0003 && S.S.F00 @@ -99,8 +99,10 @@ tests: command: "readAttribute" attribute: "SceneTableSize" response: + value: 0x10 constraints: - type: uint16 + type: int16u + - label: "Step 9: TH reads from the DUT the (0x0007) RemainingCapacity @@ -109,5 +111,7 @@ tests: command: "readAttribute" attribute: "RemainingCapacity" response: + value: 0x08 constraints: type: int8u + diff --git a/src/app/tests/suites/certification/Test_TC_S_2_2.yaml b/src/app/tests/suites/certification/Test_TC_S_2_2.yaml index a33f9d9752b168..1e00c9c760545c 100644 --- a/src/app/tests/suites/certification/Test_TC_S_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_S_2_2.yaml @@ -237,6 +237,8 @@ tests: value: 0x0001 - name: "SceneID" value: 0x01 + response: + error: '' - label: "Step 3c: TH reads the SceneCount attribute from DUT." PICS: S.S.A0000 && S.S.A0001 && S.S.A0002 && S.S.A0003 && !S.S.F03 @@ -264,7 +266,7 @@ tests: response: value: 0x0001 constraints: - type: groupid + type: int16u - label: "Step 3f: TH reads the SceneValid attribute from DUT." PICS: S.S.A0000 && S.S.A0001 && S.S.A0002 && S.S.A0003 && !S.S.F03 @@ -273,7 +275,7 @@ tests: response: value: true constraints: - type: int8u + type: boolean - label: "Step 3g: TH reads attribute SceneTableSize from DUT." PICS: S.S.F03 && S.S.F02 @@ -431,10 +433,6 @@ tests: AttributeID: 0x0000, AttributeValue: 0x64, }, - { - AttributeID: 0x0001, - AttributeValue: 0x00, - }, ], }, ] @@ -548,10 +546,6 @@ tests: AttributeID: 0x0000, AttributeValue: 0x64, }, - { - AttributeID: 0x0001, - AttributeValue: 0x00, - }, ], }, ] diff --git a/src/app/tests/suites/certification/Test_TC_S_2_3.yaml b/src/app/tests/suites/certification/Test_TC_S_2_3.yaml index cc019818fcc4a1..edb94238ed8b02 100644 --- a/src/app/tests/suites/certification/Test_TC_S_2_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_S_2_3.yaml @@ -24,7 +24,7 @@ config: endpoint: 1 G1: type: int16u - defaultValue: 0x0001 + defaultValue: 0x0101 GroupKeyManagement.Endpoint: 0 tests: @@ -87,7 +87,7 @@ tests: - name: "GroupID" value: G1 - name: "GroupName" - value: "Group1" + value: "Group #1" response: values: - name: "Status" @@ -125,7 +125,7 @@ tests: - name: "Status" value: 0x00 - name: "Capacity" - value: (maxScenes/2) + value: maxScenes / 2 - name: "GroupID" value: G1 - name: "SceneList" @@ -164,10 +164,6 @@ tests: AttributeID: 0x0000, AttributeValue: 0x64, }, - { - AttributeID: 0x0001, - AttributeValue: 0x00, - }, ], }, ] @@ -184,7 +180,7 @@ tests: "Step 2b: TH sends a AddScene command to DUT with the GroupID field set to G1, the SceneID field set to 0x01, the TransitionTime field set to 0x0001 (1s) and a set of extension fields appropriate to AC1." - PICS: S.S.C40.Rsp && PICS_SDK_CI_ONLY + PICS: (!S.S.C40.Rsp) && PICS_SDK_CI_ONLY command: "AddScene" arguments: values: @@ -212,10 +208,6 @@ tests: AttributeID: 0x0000, AttributeValue: 0x64, }, - { - AttributeID: 0x0001, - AttributeValue: 0x00, - }, ], }, ] @@ -274,7 +266,7 @@ tests: [1670970505.890328][5742:5744] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0005 Command 0x0000_0040 [1670970505.890458][5742:5744] CHIP:TOO: EnhancedAddSceneResponse: { [1670970505.890551][5742:5744] CHIP:TOO: status: 0 - [1670970505.890608][5742:5744] CHIP:TOO: groupId: 1 + [1670970505.890608][5742:5744] CHIP:TOO: groupId: 101 [1670970505.890717][5742:5744] CHIP:TOO: sceneId: 1 [1670970505.890774][5742:5744] CHIP:TOO: } cluster: "LogCommands" @@ -336,7 +328,7 @@ tests: [1670970505.890328][5742:5744] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0005 Command 0x0000_0000 [1670970505.890458][5742:5744] CHIP:TOO: AddSceneResponse: { [1670970505.890551][5742:5744] CHIP:TOO: status: 0 - [1670970505.890608][5742:5744] CHIP:TOO: groupId: 1 + [1670970505.890608][5742:5744] CHIP:TOO: groupId: 101 [1670970505.890717][5742:5744] CHIP:TOO: sceneId: 1 [1670970505.890774][5742:5744] CHIP:TOO: } cluster: "LogCommands" @@ -389,10 +381,6 @@ tests: AttributeID: 0x0000, AttributeValue: 0x64, }, - { - AttributeID: 0x0001, - AttributeValue: 0x00, - }, ], }, ] @@ -400,7 +388,7 @@ tests: - label: "Step 3b: TH sends a ViewScene command to DUT with the GroupID field set to G1 and the SceneID field set to 0x01." - PICS: S.S.C41.Rsp && PICS_SDK_CI_ONLY + PICS: (!S.S.C41.Rsp) && PICS_SDK_CI_ONLY command: "ViewScene" arguments: values: @@ -434,10 +422,6 @@ tests: AttributeID: 0x0000, AttributeValue: 0x64, }, - { - AttributeID: 0x0001, - AttributeValue: 0x00, - }, ], }, ] @@ -513,7 +497,7 @@ tests: - name: "Status" value: 0x00 - name: "Capacity" - value: (maxScenes/2) - 1 + value: ( maxScenes / 2 ) - 1 - name: "GroupID" value: G1 - name: "SceneList" @@ -558,7 +542,7 @@ tests: field set to G1 and the scene ID field set to 0x01." PICS: S.S.C05.Rsp command: "RecallScene" - groupId: 0x0001 + groupId: 0x101 arguments: values: - name: "GroupID" @@ -577,7 +561,7 @@ tests: - label: "TH confirm the DUT reached AC1 (on level control cluster) after 1s" - PICS: S.S.C40.Rsp + PICS: PICS_SDK_CI_ONLY && S.S.C05.Rsp cluster: "Level Control" command: "readAttribute" attribute: "CurrentLevel" @@ -639,7 +623,7 @@ tests: - name: "Status" value: 0x00 - name: "Capacity" - value: (maxScenes/2) - 2 + value: ( maxScenes / 2 ) - 2 - name: "GroupID" value: G1 - name: "SceneList" diff --git a/src/app/tests/suites/certification/Test_TC_S_2_4.yaml b/src/app/tests/suites/certification/Test_TC_S_2_4.yaml index 2cf0d603da4ba1..54b445505f8ccd 100644 --- a/src/app/tests/suites/certification/Test_TC_S_2_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_S_2_4.yaml @@ -24,6 +24,9 @@ config: endpoint: 1 GroupKeyManagement.Endpoint: 0 + G1: + type: int16u + defaultValue: 0x0001 Groups.Endpoint: 1 tests: @@ -64,7 +67,7 @@ tests: command: "writeAttribute" attribute: "GroupKeyMap" arguments: - value: [{ FabricIndex: 1, GroupId: 0x0001, GroupKeySetID: 0x01a1 }] + value: [{ FabricIndex: 1, GroupId: G1, GroupKeySetID: 0x01a1 }] - label: "Step 0c: TH sends a RemoveAllGroups command to DUT." PICS: G.S.C04.Rsp @@ -81,7 +84,7 @@ tests: arguments: values: - name: "GroupID" - value: 0x0001 + value: G1 - name: "GroupName" value: "Group1" response: @@ -89,7 +92,7 @@ tests: - name: "Status" value: 0 - name: "GroupID" - value: 0x0001 + value: G1 - label: "Step 2b: TH sends a RemoveAllScenes command to DUT with the GroupID @@ -99,13 +102,13 @@ tests: arguments: values: - name: "GroupID" - value: 0x0001 + value: G1 response: values: - name: "Status" value: 0 - name: "GroupID" - value: 0x0001 + value: G1 - label: "Step 3: TH sends a AddScene command to DUT with the GroupID field set @@ -116,7 +119,7 @@ tests: arguments: values: - name: "GroupID" - value: 0x0001 + value: G1 - name: "SceneID" value: 0x0001 - name: "TransitionTime" @@ -131,7 +134,7 @@ tests: - name: "Status" value: 0x00 - name: "GroupID" - value: 0x0001 + value: G1 - name: "SceneID" value: 0x01 @@ -185,7 +188,7 @@ tests: - name: "Status" value: 0x00 - name: "GroupID" - value: 0x0001 + value: G1 - name: "SceneID" value: 0x01 @@ -250,7 +253,7 @@ tests: arguments: values: - name: "GroupID" - value: 0x0001 + value: G1 - name: "SceneID" value: 0x01 @@ -260,7 +263,7 @@ tests: arguments: values: - name: "ms" - value: 20000 + value: 20500 - label: "TH confirm the DUT reached AC1 (on level control cluster) after 20s" @@ -327,7 +330,7 @@ tests: arguments: values: - name: "GroupID" - value: 0x0001 + value: G1 - name: "SceneID" value: 0x01 - name: "TransitionTime" @@ -339,7 +342,7 @@ tests: arguments: values: - name: "ms" - value: 5000 + value: 5500 - label: "TH confirm the DUT reached AC2 (on level control cluster) after 5s" @@ -406,13 +409,11 @@ tests: arguments: values: - name: "GroupID" - value: 0x0001 + value: G1 - name: "SceneID" value: 0x01 - name: "TransitionTime" value: null - response: - error: SUCCESS - label: "Step 8: TH removes the Group key set that was added by sending a diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values index d709e8f55d907b..d72cd90092160a 100644 --- a/src/app/tests/suites/certification/ci-pics-values +++ b/src/app/tests/suites/certification/ci-pics-values @@ -598,7 +598,7 @@ G.S.C00.Rsp=1 G.S.C01.Rsp=1 G.S.C02.Rsp=1 G.S.C03.Rsp=1 -G.S.C04.Rsp=0 +G.S.C04.Rsp=1 G.S.C05.Rsp=0 G.S.C00.Tx=1 G.S.C01.Tx=1 @@ -656,29 +656,28 @@ I.C.AO-READ=0 I.C.AO-WRITE=0 # Scenes Cluster -S.S=0 -S.S.A0000=0 -S.S.A0001=0 -S.S.A0002=0 -S.S.A0003=0 -S.S.A0004=0 -S.S.A0005=0 -S.S.A0006=0 +S.S=1 +S.S.A0000=1 +S.S.A0001=1 +S.S.A0002=1 +S.S.A0003=1 +S.S.A0004=1 +S.S.A0005=1 +S.S.A0006=1 S.S.A0007=0 -S.S.C00.Rsp=0 -S.S.C01.Rsp=0 -S.S.C02.Rsp=0 -S.S.C03.Rsp=0 -S.S.C04.Rsp=0 -S.S.C05.Rsp=0 -S.S.C06.Rsp=0 -S.S.C40.Rsp=0 -S.S.C41.Rsp=0 -S.S.C42.Rsp=0 -S.S.C05.Rsp=0 +S.S.C00.Rsp=1 +S.S.C01.Rsp=1 +S.S.C02.Rsp=1 +S.S.C03.Rsp=1 +S.S.C04.Rsp=1 +S.S.C05.Rsp=1 +S.S.C06.Rsp=1 +S.S.C40.Rsp=1 +S.S.C41.Rsp=1 +S.S.C42.Rsp=1 S.S.AM=0 S.S.AO=0 -S.S.F00=0 +S.S.F00=1 S.S.F01=0 S.S.F02=0 S.S.F03=0