Window Covering: Add FeatureMap (#9246)

* WC: Add FeatureMap inside xml + zap * WC: Update all autogenerated files by ZAP + SDK * WC: Activate Test for global attribute FeatureMap reading value * WC: Add missing test dependancies * WC: Add absolute positioning into FeatureMap * Fix: Conflict on Cluster gen * WC: Regenerate/Rebase * WC: Regen / Rebase * WC: Regen rebase * Restyled by autopep8 * Restyled by autopep8 Co-authored-by: Justin Wood <[email protected]> Co-authored-by: Restyled.io <[email protected]>
project-chip · Oct 27, 2021 · 1114959 · 1114959
1 parent 1d10ef8
commit 1114959
Show file tree

Hide file tree

Showing 24 changed files with 535 additions and 278 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
@@ -10408,6 +10408,21 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 0,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
             {
               "name": "ClusterRevision",
               "code": 65533,

diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap
@@ -5693,6 +5693,21 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0001",
+              "reportable": 0,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
             {
               "name": "ClusterRevision",
               "code": 65533,
@@ -6909,6 +6924,21 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0001",
+              "reportable": 0,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
             {
               "name": "ClusterRevision",
               "code": 65533,

diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_1_1.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_1_1.yaml
@@ -41,8 +41,7 @@ tests:
       response:
           value: 5
 
-    - label: "read the optional global attribute: FeatureMap"
-      disabled: 1
+    - label: "read the global attribute: FeatureMap"
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
@@ -53,12 +52,11 @@ tests:
       command: "writeAttribute"
       attribute: "FeatureMap"
       arguments:
-          value: 0
+          value: 5
       response:
           error: 1
 
-    - label: "reads back optional global attribute: FeatureMap"
-      disabled: true
+    - label: "reads back global attribute: FeatureMap"
       command: "readAttribute"
       attribute: "FeatureMap"
       response:

diff --git a/src/app/zap-templates/zcl/data-model/chip/window-covering.xml b/src/app/zap-templates/zcl/data-model/chip/window-covering.xml
@@ -21,7 +21,16 @@ limitations under the License.
     <define>WINDOW_COVERING_CLUSTER</define>
     <client tick="false" init="false">true</client>
     <server tick="false" init="false">true</server>
-    <!-- TODO: Add feature map once it is supported -->
+    <tag name="LF" description="Lift Control"/>
+    <tag name="TL" description="Tilt Control"/>
+    <tag name="PA" description="Position Aware"/>
+    <tag name="ABS" description="Absolute Positioning"/>
+    <globalAttribute side="server" code="0xFFFC" value="0x0001">
+      <featureBit tag="LF" bit="0">true</featureBit>
+      <featureBit tag="TL" bit="1">false</featureBit>
+      <featureBit tag="PA" bit="2">false</featureBit>
+      <featureBit tag="ABS" bit="3">false</featureBit>
+    </globalAttribute>
     <globalAttribute side="either" code="0xFFFD" value="5"/>
     <!-- Window Covering Information Attribute Set -->
     <attribute side="server" writable="false" code="0x0000" define="WC_TYPE"                                      type="ENUM8"    min="0x00"   max="0x09"   default="0x00"   optional="false">Type</attribute>
@@ -86,7 +95,6 @@ limitations under the License.
 
   <!-- Window Covering Descriptive Enum Set -->
   <enum name="WcType" type="ENUM8">
-    <cluster code="0x0102"/>
     <item value="00" name="Rollershade"/>
     <item value="01" name="Rollershade2Motor"/>
     <item value="02" name="RollershadeExterior"/>
@@ -101,7 +109,6 @@ limitations under the License.
   </enum>
 
   <enum name="WcEndProductType" type="ENUM8">
-    <cluster code="0x0102"/>
     <item value="00" name="RollerShade"/>  
     <item value="01" name="RomanShade"/>
     <item value="02" name="BalloonShade"/>
@@ -171,4 +178,4 @@ limitations under the License.
     <field mask="0x0400" name="ManualOperation"/>
     <field mask="0x0800" name="Protection"/>
   </bitmap>
-</configurator>
+</configurator>
diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
@@ -6523,6 +6523,21 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0x0001",
+              "reportable": 0,
+              "minInterval": 0,
+              "maxInterval": 65344,
+              "reportableChange": 0
+            },
             {
               "name": "ClusterRevision",
               "code": 65533,

diff --git a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
diff --git a/src/controller/python/chip/clusters/CHIPClusters.cpp b/src/controller/python/chip/clusters/CHIPClusters.cpp
diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm