Fix window covering XML and regen .zap files. (#11055)

We had some changes to .xml files to rename things that were not reflected into .zap files. Running ./scripts/tools/zap_convert_all.py fixes that, but fails before this PR because ZAP support for <tag> is broken and #9246 introduced use of <tag> in window-covering.xml. So the changes: 1) Comment out the <tag> bits in src/app/zap-templates/zcl/data-model/chip/window-covering.xml. 2) Run ./scripts/tools/zap_convert_all.py to fix up the attribute names in the .zap files.
project-chip · Oct 27, 2021 · 9a618bb · 9a618bb
1 parent 73bd219
commit 9a618bb
Show file tree

Hide file tree

Showing 17 changed files with 167 additions and 180 deletions.
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
@@ -18990,6 +18990,5 @@
       "endpointVersion": null,
       "deviceIdentifier": null
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap
@@ -4018,6 +4018,5 @@
       "endpointVersion": null,
       "deviceIdentifier": null
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap
@@ -6211,6 +6211,5 @@
       "endpointVersion": 1,
       "deviceIdentifier": 259
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap
@@ -5022,6 +5022,5 @@
       "endpointVersion": 0,
       "deviceIdentifier": null
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap
@@ -1,5 +1,5 @@
 {
-  "featureLevel": 54,
+  "featureLevel": 63,
   "creator": "zap",
   "keyValuePairs": [
     {
@@ -3410,7 +3410,7 @@
           "commands": [],
           "attributes": [
             {
-              "name": "measured value",
+              "name": "MeasuredValue",
               "code": 0,
               "mfgCode": null,
               "side": "server",
@@ -3425,7 +3425,7 @@
               "reportableChange": 0
             },
             {
-              "name": "min measured value",
+              "name": "MinMeasuredValue",
               "code": 1,
               "mfgCode": null,
               "side": "server",
@@ -3440,7 +3440,7 @@
               "reportableChange": 0
             },
             {
-              "name": "max measured value",
+              "name": "MaxMeasuredValue",
               "code": 2,
               "mfgCode": null,
               "side": "server",
@@ -3638,4 +3638,4 @@
       "deviceIdentifier": null
     }
   ]
-}
+}
diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
@@ -1,5 +1,5 @@
 {
-  "featureLevel": 62,
+  "featureLevel": 63,
   "creator": "zap",
   "keyValuePairs": [
     {
@@ -3434,7 +3434,7 @@
           "commands": [],
           "attributes": [
             {
-              "name": "measured value",
+              "name": "MeasuredValue",
               "code": 0,
               "mfgCode": null,
               "side": "server",
@@ -3449,7 +3449,7 @@
               "reportableChange": 0
             },
             {
-              "name": "min measured value",
+              "name": "MinMeasuredValue",
               "code": 1,
               "mfgCode": null,
               "side": "server",
@@ -3464,7 +3464,7 @@
               "reportableChange": 0
             },
             {
-              "name": "max measured value",
+              "name": "MaxMeasuredValue",
               "code": 2,
               "mfgCode": null,
               "side": "server",
@@ -3661,6 +3661,5 @@
       "endpointVersion": 1,
       "deviceIdentifier": 0
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap
@@ -32,7 +32,7 @@
   "endpointTypes": [
     {
       "name": "Anonymous Endpoint Type",
-      "deviceTypeName": "Root Node Device Type",
+      "deviceTypeName": "Base Application Example",
       "deviceTypeCode": 65280,
       "deviceTypeProfileId": 259,
       "clusters": [
@@ -1907,6 +1907,5 @@
       "endpointVersion": 1,
       "deviceIdentifier": 258
     }
-  ],
-  "log": []
-}
+  ]
+}
diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap
@@ -32,7 +32,7 @@
   "endpointTypes": [
     {
       "name": "Anonymous Endpoint Type",
-      "deviceTypeName": "Root Node Device Type",
+      "deviceTypeName": "Base Application Example",
       "deviceTypeCode": 65280,
       "deviceTypeProfileId": 259,
       "clusters": [
@@ -1710,6 +1710,5 @@
       "endpointVersion": 1,
       "deviceIdentifier": 257
     }
-  ],
-  "log": []
-}
+  ]
+}