Generate cluster objects for all clusters. (#10156)

We're only generating them for the ones enabled in controller-clusters.zap.
project-chip · Nov 9, 2021 · cb4ff7c · cb4ff7c
1 parent 501a524
commit cb4ff7c
Show file tree

Hide file tree

Showing 4 changed files with 2,255 additions and 1,097 deletions.
diff --git a/src/app/zap-templates/templates/app/cluster-objects-src.zapt b/src/app/zap-templates/templates/app/cluster-objects-src.zapt
@@ -7,9 +7,8 @@
 namespace chip {
 namespace app {
 namespace clusters {
-{{#all_user_clusters}}
-{{#if (user_cluster_has_enabled_command name side)}}
-namespace {{asCamelCased name false}} {
+{{#zcl_clusters}}
+namespace {{asUpperCamelCase name}} {
 {{#zcl_structs}}
 namespace {{asType label}} {
 CHIP_ERROR Type::Encode(TLV::TLVWriter &writer, uint64_t tag) const{
@@ -91,8 +90,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader &reader) {
 {{/zcl_structs}}
 }
 
-{{/if}}
-{{/all_user_clusters}}
+{{/zcl_clusters}}
 
 } // namespace clusters
 } // namespace app

diff --git a/src/app/zap-templates/templates/app/cluster-objects.zapt b/src/app/zap-templates/templates/app/cluster-objects.zapt
@@ -12,8 +12,8 @@ namespace chip {
 namespace app {
 namespace clusters {
 
-{{#all_user_clusters}}
-namespace {{asCamelCased name false}} {
+{{#zcl_clusters}}
+namespace {{asUpperCamelCase name}} {
 {{#zcl_enums}}
 // Enum for {{label}}
 enum class {{asType label}} : {{asUnderlyingZclType type}} {
@@ -60,11 +60,11 @@ namespace {{name}} {
     };
     {{/if}}
 
-}// namespace for {{name}}
+} // namespace {{name}}
 {{/zcl_structs}}
 
-}// namespace for {{name}}
-{{/all_user_clusters}}
+} // namespace {{asUpperCamelCase name}}
+{{/zcl_clusters}}
 
 } // namespace clusters
 } // namespace app