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

Rename silabs/types.xml to silabs/types-silabs.xml to prevent it to b… #24710

Merged
merged 1 commit into from
Jan 28, 2023
Merged

Rename silabs/types.xml to silabs/types-silabs.xml to prevent it to b… #24710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ jobs:
src/app/zap-templates/zcl/data-model/silabs/ha-devices.xml \
src/app/zap-templates/zcl/data-model/silabs/ha.xml \
src/app/zap-templates/zcl/data-model/silabs/lo-devices.xml \
src/app/zap-templates/zcl/data-model/silabs/types.xml \
src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml \
src/app/zap-templates/zcl/data-model/silabs/zll-devices.xml \
src/app/zap-templates/zcl/data-model/silabs/zll.xml \
"
Expand Down
2 changes: 1 addition & 1 deletion src/app/zap-templates/zcl/data-model/all.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<xi:include href="silabs/ha-devices.xml" />
<xi:include href="silabs/ha.xml" />
<xi:include href="silabs/lo-devices.xml" />
<xi:include href="silabs/types.xml" />
<xi:include href="silabs/types-silabs.xml" />
<xi:include href="silabs/zll-devices.xml" />
<xi:include href="silabs/zll.xml" />
</all>
0 ...templates/zcl/data-model/silabs/types.xml → ...es/zcl/data-model/silabs/types-silabs.xml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/app/zap-templates/zcl/zcl-with-test-extensions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
"_comment": "Ensure access-control-definitions.xml is first in xmlFile array",
"xmlFile": [
"access-control-definitions.xml",
"chip-types.xml",
"types-silabs.xml",
"access-control-cluster.xml",
"account-login-cluster.xml",
"administrator-commissioning-cluster.xml",
Expand All @@ -23,7 +25,6 @@
"actions-cluster.xml",
"bridged-device-basic-information.xml",
"chip-ota.xml",
"chip-types.xml",
"channel-cluster.xml",
"client-monitoring-cluster.xml",
"clusters-extensions.xml",
Expand Down Expand Up @@ -80,7 +81,6 @@
"ha-devices.xml",
"ha.xml",
"lo-devices.xml",
"types.xml",
"zll-devices.xml",
"zll.xml"
],
Expand Down
4 changes: 2 additions & 2 deletions src/app/zap-templates/zcl/zcl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
"_comment": "Ensure access-control-definitions.xml is first in xmlFile array",
"xmlFile": [
"access-control-definitions.xml",
"chip-types.xml",
"types-silabs.xml",
"access-control-cluster.xml",
"account-login-cluster.xml",
"administrator-commissioning-cluster.xml",
Expand All @@ -18,7 +20,6 @@
"actions-cluster.xml",
"bridged-device-basic-information.xml",
"chip-ota.xml",
"chip-types.xml",
"channel-cluster.xml",
"client-monitoring-cluster.xml",
"clusters-extensions.xml",
Expand Down Expand Up @@ -74,7 +75,6 @@
"ha-devices.xml",
"ha.xml",
"lo-devices.xml",
"types.xml",
"zll-devices.xml",
"zll.xml"
],
Expand Down
2 changes: 1 addition & 1 deletion src/darwin/Framework/CHIP/templates/availability.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6001,7 +6001,7 @@
- DlOperationSource
- DlUserStatus
- DlUserType
# The enums after this come from the silabs types.xml, not the
# The enums after this come from the silabs types-silabs.xml, not the
# door lock cluster XML
#
# DoorLockUserStatus is not marked deprecated here because the
Expand Down