Replaced the previous solution that fixed the issue in the generated python files canused by the lack of bitmasks by adding a NoFeatures=0 mask.

hicklin · hicklin · commit 9175e7573742 · 2024-01-26T14:51:21.000Z
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
@@ -2929,6 +2929,7 @@ cluster RvcRunMode = 84 {
   }
 
   bitmap Feature : bitmap32 {
+    kNoFeatures = 0x0;
   }
 
   struct ModeTagStruct {
@@ -2980,6 +2981,7 @@ cluster RvcCleanMode = 85 {
   }
 
   bitmap Feature : bitmap32 {
+    kNoFeatures = 0x0;
   }
 
   struct ModeTagStruct {
diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
@@ -1020,6 +1020,7 @@ cluster RvcRunMode = 84 {
   }
 
   bitmap Feature : bitmap32 {
+    kNoFeatures = 0x0;
   }
 
   struct ModeTagStruct {
@@ -1071,6 +1072,7 @@ cluster RvcCleanMode = 85 {
   }
 
   bitmap Feature : bitmap32 {
+    kNoFeatures = 0x0;
   }
 
   struct ModeTagStruct {
diff --git a/examples/rvc-app/rvc-common/rvc-app.matter b/examples/rvc-app/rvc-common/rvc-app.matter
@@ -943,6 +943,7 @@ cluster RvcRunMode = 84 {
   }
 
   bitmap Feature : bitmap32 {
+    kNoFeatures = 0x0;
   }
 
   struct ModeTagStruct {
@@ -994,6 +995,7 @@ cluster RvcCleanMode = 85 {
   }
 
   bitmap Feature : bitmap32 {
+    kNoFeatures = 0x0;
   }
 
   struct ModeTagStruct {
diff --git a/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml
@@ -63,6 +63,7 @@ limitations under the License.
 
   <bitmap name="Feature" type="bitmap32">
     <cluster code="0x0055"/>
+    <field name="NoFeatures" mask="0x0"/>
     <!-- Feature OnOff with code 0x01 is deprecated -->
   </bitmap>
 
diff --git a/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml
@@ -70,6 +70,7 @@ limitations under the License.
 
   <bitmap name="Feature" type="bitmap32">
     <cluster code="0x0054"/>
+    <field name="NoFeatures" mask="0x0"/>
     <!-- Feature OnOff with code 0x01 is deprecated -->
   </bitmap>
 
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -3117,6 +3117,7 @@ cluster RvcRunMode = 84 {
   }
 
   bitmap Feature : bitmap32 {
+    kNoFeatures = 0x0;
   }
 
   struct ModeTagStruct {
@@ -3168,6 +3169,7 @@ cluster RvcCleanMode = 85 {
   }
 
   bitmap Feature : bitmap32 {
+    kNoFeatures = 0x0;
   }
 
   struct ModeTagStruct {
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
diff --git a/src/controller/python/templates/python-cluster-Objects-py.zapt b/src/controller/python/templates/python-cluster-Objects-py.zapt
@@ -78,8 +78,6 @@ class {{asUpperCamelCase name}}(Cluster):
         class {{asType label}}(IntFlag):
 {{#zcl_bitmap_items}}
             k{{asUpperCamelCase label}} = {{asHex mask}}
-{{else}}
-            kInternalDoNotUseNone = 0
 {{/zcl_bitmap_items}}
 
 {{/zcl_bitmaps}}
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h

Original file line number	Diff line number	Diff line change
`@@ -2929,6 +2929,7 @@ cluster RvcRunMode = 84 {`
`2929`	`2929`	`}`
`2930`	`2930`
`2931`	`2931`	`bitmap Feature : bitmap32 {`
	`2932`	`+ kNoFeatures = 0x0;`
`2932`	`2933`	`}`
`2933`	`2934`
`2934`	`2935`	`struct ModeTagStruct {`
`@@ -2980,6 +2981,7 @@ cluster RvcCleanMode = 85 {`
`2980`	`2981`	`}`
`2981`	`2982`
`2982`	`2983`	`bitmap Feature : bitmap32 {`
	`2984`	`+ kNoFeatures = 0x0;`
`2983`	`2985`	`}`
`2984`	`2986`
`2985`	`2987`	`struct ModeTagStruct {`
Original file line number	Diff line number	Diff line change
`@@ -1020,6 +1020,7 @@ cluster RvcRunMode = 84 {`
`1020`	`1020`	`}`
`1021`	`1021`
`1022`	`1022`	`bitmap Feature : bitmap32 {`
	`1023`	`+ kNoFeatures = 0x0;`
`1023`	`1024`	`}`
`1024`	`1025`
`1025`	`1026`	`struct ModeTagStruct {`
`@@ -1071,6 +1072,7 @@ cluster RvcCleanMode = 85 {`
`1071`	`1072`	`}`
`1072`	`1073`
`1073`	`1074`	`bitmap Feature : bitmap32 {`
	`1075`	`+ kNoFeatures = 0x0;`
`1074`	`1076`	`}`
`1075`	`1077`
`1076`	`1078`	`struct ModeTagStruct {`
Original file line number	Diff line number	Diff line change
`@@ -943,6 +943,7 @@ cluster RvcRunMode = 84 {`
`943`	`943`	`}`
`944`	`944`
`945`	`945`	`bitmap Feature : bitmap32 {`
	`946`	`+ kNoFeatures = 0x0;`
`946`	`947`	`}`
`947`	`948`
`948`	`949`	`struct ModeTagStruct {`
`@@ -994,6 +995,7 @@ cluster RvcCleanMode = 85 {`
`994`	`995`	`}`
`995`	`996`
`996`	`997`	`bitmap Feature : bitmap32 {`
	`998`	`+ kNoFeatures = 0x0;`
`997`	`999`	`}`
`998`	`1000`
`999`	`1001`	`struct ModeTagStruct {`
Original file line number	Diff line number	Diff line change
`@@ -3117,6 +3117,7 @@ cluster RvcRunMode = 84 {`
`3117`	`3117`	`}`
`3118`	`3118`
`3119`	`3119`	`bitmap Feature : bitmap32 {`
	`3120`	`+ kNoFeatures = 0x0;`
`3120`	`3121`	`}`
`3121`	`3122`
`3122`	`3123`	`struct ModeTagStruct {`
`@@ -3168,6 +3169,7 @@ cluster RvcCleanMode = 85 {`
`3168`	`3169`	`}`
`3169`	`3170`
`3170`	`3171`	`bitmap Feature : bitmap32 {`
	`3172`	`+ kNoFeatures = 0x0;`
`3171`	`3173`	`}`
`3172`	`3174`
`3173`	`3175`	`struct ModeTagStruct {`