fix bug : fail test in TC-SM-1.1 and TC-DT-1.1

project-chip · Aug 15, 2023 · 7faf168 · 7faf168
1 parent af74ecf
commit 7faf168
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 11 deletions.
diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter
@@ -1158,7 +1158,7 @@ endpoint 0 {
     callback attribute vendorID;
     callback attribute productName;
     callback attribute productID;
-    callback attribute nodeLabel;
+    persist  attribute nodeLabel;
     callback attribute location default = "XX";
     callback attribute hardwareVersion default = 0;
     callback attribute hardwareVersionString;

diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap b/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap
@@ -33,7 +33,33 @@
   ],
   "endpointTypes": [
     {
+      "id": 13,
       "name": "MA-rootdevice",
+      "deviceTypeRef": {
+        "id": 2,
+        "code": 22,
+        "profileId": 259,
+        "label": "MA-rootdevice",
+        "name": "MA-rootdevice"
+      },
+      "deviceTypes": [
+        {
+          "id": 2,
+          "code": 22,
+          "profileId": 259,
+          "label": "MA-rootdevice",
+          "name": "MA-rootdevice"
+        }
+      ],
+      "deviceTypeRefs": [
+        2
+      ],
+      "deviceVersions": [
+        1
+      ],
+      "deviceIdentifiers": [
+        22
+      ],
       "deviceTypeName": "MA-rootdevice",
       "deviceTypeCode": 22,
       "deviceTypeProfileId": 259,
@@ -1389,7 +1415,7 @@
               "side": "server",
               "type": "char_string",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "NVM",
               "singleton": 1,
               "bounded": 0,
               "defaultValue": "",
@@ -6226,7 +6252,33 @@
       ]
     },
     {
-      "name": "MA-dimmablelight",
+      "id": 14,
+      "name": "MA-dishwasher",
+      "deviceTypeRef": {
+        "id": 47,
+        "code": 117,
+        "profileId": 259,
+        "label": "MA-dishwasher",
+        "name": "MA-dishwasher"
+      },
+      "deviceTypes": [
+        {
+          "id": 47,
+          "code": 117,
+          "profileId": 259,
+          "label": "MA-dishwasher",
+          "name": "MA-dishwasher"
+        }
+      ],
+      "deviceTypeRefs": [
+        47
+      ],
+      "deviceVersions": [
+        1
+      ],
+      "deviceIdentifiers": [
+        117
+      ],
       "deviceTypeName": "MA-dishwasher",
       "deviceTypeCode": 117,
       "deviceTypeProfileId": 259,
@@ -10782,19 +10834,15 @@
       "endpointTypeIndex": 0,
       "profileId": 259,
       "endpointId": 0,
-      "networkId": 0,
-      "endpointVersion": 1,
-      "deviceIdentifier": 22
+      "networkId": 0
     },
     {
-      "endpointTypeName": "MA-dimmablelight",
+      "endpointTypeName": "MA-dishwasher",
       "endpointTypeIndex": 1,
       "profileId": 259,
       "endpointId": 1,
-      "networkId": 0,
-      "endpointVersion": 1,
-      "deviceIdentifier": 117
+      "networkId": 0
     }
   ],
   "log": []
-}
+}