Align Replaceable Monitoring clusters on the "Feature" name. (#26613)

We generally want to move all feature maps to this.
project-chip · Aug 10, 2023 · 6b95644 · 6b95644
1 parent 45a3dc6
commit 6b95644
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 85 deletions.
diff --git a/src/app/zap-templates/zcl/data-model/chip/replacable-monitoring-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/replacable-monitoring-cluster.xml
@@ -269,7 +269,7 @@ limitations under the License.
   </cluster>
 
   <!-- Feature Map -->
-  <bitmap name="Features" type="BITMAP32">
+  <bitmap name="Feature" type="BITMAP32">
     <cluster code="0x0071" />
     <cluster code="0x0072" />
     <cluster code="0x0073" />

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -2627,7 +2627,7 @@ client cluster HepaFilterMonitoring = 113 {
     kDown = 1;
   }
 
-  bitmap Features : BITMAP32 {
+  bitmap Feature : BITMAP32 {
     kCondition = 0x1;
     kWarning = 0x2;
   }
@@ -2660,7 +2660,7 @@ client cluster ActivatedCarbonFilterMonitoring = 114 {
     kDown = 1;
   }
 
-  bitmap Features : BITMAP32 {
+  bitmap Feature : BITMAP32 {
     kCondition = 0x1;
     kWarning = 0x2;
   }
@@ -2693,7 +2693,7 @@ client cluster CeramicFilterMonitoring = 115 {
     kDown = 1;
   }
 
-  bitmap Features : BITMAP32 {
+  bitmap Feature : BITMAP32 {
     kCondition = 0x1;
     kWarning = 0x2;
   }
@@ -2726,7 +2726,7 @@ client cluster ElectrostaticFilterMonitoring = 116 {
     kDown = 1;
   }
 
-  bitmap Features : BITMAP32 {
+  bitmap Feature : BITMAP32 {
     kCondition = 0x1;
     kWarning = 0x2;
   }
@@ -2759,7 +2759,7 @@ client cluster UvFilterMonitoring = 117 {
     kDown = 1;
   }
 
-  bitmap Features : BITMAP32 {
+  bitmap Feature : BITMAP32 {
     kCondition = 0x1;
     kWarning = 0x2;
   }
@@ -2792,7 +2792,7 @@ client cluster IonizingFilterMonitoring = 118 {
     kDown = 1;
   }
 
-  bitmap Features : BITMAP32 {
+  bitmap Feature : BITMAP32 {
     kCondition = 0x1;
     kWarning = 0x2;
   }
@@ -2825,7 +2825,7 @@ client cluster ZeoliteFilterMonitoring = 119 {
     kDown = 1;
   }
 
-  bitmap Features : BITMAP32 {
+  bitmap Feature : BITMAP32 {
     kCondition = 0x1;
     kWarning = 0x2;
   }
@@ -2858,7 +2858,7 @@ client cluster OzoneFilterMonitoring = 120 {
     kDown = 1;
   }
 
-  bitmap Features : BITMAP32 {
+  bitmap Feature : BITMAP32 {
     kCondition = 0x1;
     kWarning = 0x2;
   }
@@ -2891,7 +2891,7 @@ client cluster WaterTankMonitoring = 121 {
     kDown = 1;
   }
 
-  bitmap Features : BITMAP32 {
+  bitmap Feature : BITMAP32 {
     kCondition = 0x1;
     kWarning = 0x2;
   }
@@ -2924,7 +2924,7 @@ client cluster FuelTankMonitoring = 122 {
     kDown = 1;
   }
 
-  bitmap Features : BITMAP32 {
+  bitmap Feature : BITMAP32 {
     kCondition = 0x1;
     kWarning = 0x2;
   }
@@ -2957,7 +2957,7 @@ client cluster InkCartridgeMonitoring = 123 {
     kDown = 1;
   }
 
-  bitmap Features : BITMAP32 {
+  bitmap Feature : BITMAP32 {
     kCondition = 0x1;
     kWarning = 0x2;
   }
@@ -2990,7 +2990,7 @@ client cluster TonerCartridgeMonitoring = 124 {
     kDown = 1;
   }
 
-  bitmap Features : BITMAP32 {
+  bitmap Feature : BITMAP32 {
     kCondition = 0x1;
     kWarning = 0x2;
   }

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/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h