[config-data] Add a new DefineBitmaps category to config-data.yaml to…

… filter which bitmaps are allowed to generates #define (project-chip#25150)
lecndav · Mar 22, 2023 · 55ff558 · 55ff558
1 parent e1480a9
commit 55ff558
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 524 deletions.
diff --git a/src/app/common/templates/config-data.yaml b/src/app/common/templates/config-data.yaml
@@ -30,6 +30,15 @@ WeakEnums:
     - StepMode
     - TemperatureDisplayMode
 
+DefineBitmaps:
+    # Allow-list of bitmaps that we generates as #define as well as enum classes.
+    # The goal is to drive this down to 0.
+    - BarrierControlCapabilities
+    - BarrierControlSafetyStatus
+    - ColorLoopUpdateFlags
+    - LevelControlFeature
+    - PowerSourceFeature
+
 # We need a more configurable way of deciding which clusters have which init functions....
 # See https://github.com/project-chip/connectedhomeip/issues/4369
 ClustersWithInitFunctions:

diff --git a/src/app/zap-templates/templates/app/enums.zapt b/src/app/zap-templates/templates/app/enums.zapt
@@ -8,8 +8,6 @@
 // ZCL enums
 
 {{#zcl_enums}}
-{{#unless (isStrEqual label "Status")}}
-{{#unless (isStrEqual label "ReportingDirection")}}
 {{#if (isInConfigList label "WeakEnums")}}
 
 // Enum for {{label}}
@@ -19,13 +17,13 @@ enum EmberAf{{asType label}} : {{asUnderlyingZclType name}} {
 {{/zcl_enum_items}}
 };
 {{/if}}
-{{/unless}}
-{{/unless}}
 {{/zcl_enums}}
 
 {{#zcl_bitmaps}}
+{{#if (isInConfigList label "DefineBitmaps")}}
 {{#zcl_bitmap_items}}
 #define EMBER_AF_{{asDelimitedMacro parent.label}}_{{asDelimitedMacro label}} ({{mask}})
 #define EMBER_AF_{{asDelimitedMacro parent.label}}_{{asDelimitedMacro label}}_OFFSET ({{asOffset mask}})
 {{/zcl_bitmap_items}}
+{{/if}}
 {{/zcl_bitmaps}}