Skip to content

Commit 1148076

Browse files
bzbarsky-applepull[bot]
authored andcommitted
Generate cluster objects for all clusters. (#10156)
We're only generating them for the ones enabled in controller-clusters.zap.
1 parent d4ecb9a commit 1148076

File tree

4 files changed

+2255
-1097
lines changed

4 files changed

+2255
-1097
lines changed

src/app/zap-templates/templates/app/cluster-objects-src.zapt

+3-5
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
namespace chip {
88
namespace app {
99
namespace clusters {
10-
{{#all_user_clusters}}
11-
{{#if (user_cluster_has_enabled_command name side)}}
12-
namespace {{asCamelCased name false}} {
10+
{{#zcl_clusters}}
11+
namespace {{asUpperCamelCase name}} {
1312
{{#zcl_structs}}
1413
namespace {{asType label}} {
1514
CHIP_ERROR Type::Encode(TLV::TLVWriter &writer, uint64_t tag) const{
@@ -91,8 +90,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader &reader) {
9190
{{/zcl_structs}}
9291
}
9392

94-
{{/if}}
95-
{{/all_user_clusters}}
93+
{{/zcl_clusters}}
9694

9795
} // namespace clusters
9896
} // namespace app

src/app/zap-templates/templates/app/cluster-objects.zapt

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ namespace chip {
1212
namespace app {
1313
namespace clusters {
1414

15-
{{#all_user_clusters}}
16-
namespace {{asCamelCased name false}} {
15+
{{#zcl_clusters}}
16+
namespace {{asUpperCamelCase name}} {
1717
{{#zcl_enums}}
1818
// Enum for {{label}}
1919
enum class {{asType label}} : {{asUnderlyingZclType type}} {
@@ -60,11 +60,11 @@ namespace {{name}} {
6060
};
6161
{{/if}}
6262

63-
}// namespace for {{name}}
63+
} // namespace {{name}}
6464
{{/zcl_structs}}
6565

66-
}// namespace for {{name}}
67-
{{/all_user_clusters}}
66+
} // namespace {{asUpperCamelCase name}}
67+
{{/zcl_clusters}}
6868

6969
} // namespace clusters
7070
} // namespace app

0 commit comments

Comments
 (0)