Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Take into account manufacturerCode when generating .matter files #28805

Merged
merged 2 commits into from
Aug 23, 2023
Merged

Take into account manufacturerCode when generating .matter files #28805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb1ff25
Use asMEI for matter file codegen
andreilitvin Aug 22, 2023
d33e6b5
Ensure backwards compatible format for MEI
andreilitvin Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/app/zap-templates/partials/idl/attribute_definition.zapt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,10 @@
{{~/if~}}
{{~/if~}}
{{/unless}} {{asLowerCamelCase name~}}
{{~#if isArray~}} [] {{~/if}} = {{code~}}
{{~#if isArray~}} [] {{~/if}} = {{!}}
{{~#if manufacturerCode}}
{{~asMEI manufacturerCode code~}}
{{else}}
{{~code~}}
{{/if~}}
;
14 changes: 12 additions & 2 deletions src/app/zap-templates/partials/idl/cluster_definition.zapt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
/** {{description}} */
{{#if generateClientCluster}}client {{else}}server {{/if~}}
cluster {{asUpperCamelCase name}} = {{code}} {
cluster {{asUpperCamelCase name}} = {{!}}
{{~#if manufacturerCode}}
{{~asMEI manufacturerCode code~}}
{{else}}
{{~code~}}
{{/if}} {
{{#zcl_enums}}
enum {{asUpperCamelCase name preserveAcronyms=true}} : ENUM{{multiply size 8}} {
{{#zcl_enum_items}}
Expand Down Expand Up @@ -29,7 +34,12 @@ cluster {{asUpperCamelCase name}} = {{code}} {
{{operation}}: {{role}}
{{~#last}}) {{/last~}}
{{~/chip_access_elements~}}
{{asUpperCamelCase name preserveAcronyms=true}} = {{code}} {
{{asUpperCamelCase name preserveAcronyms=true}} = {{!}}
{{~#if manufacturerCode}}
{{~asMEI manufacturerCode code~}}
{{else}}
{{~code~}}
{{/if}} {
{{#zcl_event_fields}}
{{>idl_structure_member label=name}}

Expand Down
9 changes: 7 additions & 2 deletions src/app/zap-templates/partials/idl/command_response_struct.zapt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
{{#zcl_command_arguments}}
{{#first}}
{{~new_line 1~}}{{~indent 1~}}response struct {{asUpperCamelCase parent.commandName}} = {{parent.code}} {
{{/first}}
{{~new_line 1~}}{{~indent 1~}}response struct {{asUpperCamelCase parent.commandName}} = {{!}}
{{~#if parent.manufacturerCode}}
{{~asMEI parent.manufacturerCode parent.code~}}
{{else}}
{{~parent.code~}}
{{/if}} {
{{/first}}
{{~indent 2~}}{{> idl_structure_member}}
{{#last}}

Expand Down
Loading