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

Align Scenes with device_library #20031

Merged
merged 1 commit into from
Jun 28, 2022
Merged

Align Scenes with device_library #20031

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
26 changes: 13 additions & 13 deletions src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ limitations under the License.
<requireCommand>RemoveAllGroups</requireCommand>
<requireCommand>AddGroupIfIdentifying</requireCommand>
</include>
<include cluster="Scenes" client="true" server="true" clientLocked="true" serverLocked="true">
<include cluster="Scenes" client="false" server="true" clientLocked="false" serverLocked="true">
<requireAttribute>SCENE_COUNT</requireAttribute>
<requireAttribute>CURRENT_SCENE</requireAttribute>
<requireAttribute>CURRENT_GROUP</requireAttribute>
Expand Down Expand Up @@ -342,7 +342,7 @@ limitations under the License.
<requireCommand>RemoveAllGroups</requireCommand>
<requireCommand>AddGroupIfIdentifying</requireCommand>
</include>
<include cluster="Scenes" client="true" server="true" clientLocked="true" serverLocked="true">
<include cluster="Scenes" client="false" server="true" clientLocked="true" serverLocked="true">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this one clientLocked="true" while On/Off light was clientLocked="false"?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the semantics of clientLocked? If it is true, the GUI user cannot change whether the client's default?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a question for @tecimovic ...

<requireAttribute>SCENE_COUNT</requireAttribute>
<requireAttribute>CURRENT_SCENE</requireAttribute>
<requireAttribute>CURRENT_GROUP</requireAttribute>
Expand Down Expand Up @@ -428,7 +428,7 @@ limitations under the License.
<requireCommand>RemoveAllGroups</requireCommand>
<requireCommand>AddGroupIfIdentifying</requireCommand>
</include>
<include cluster="Scenes" client="true" server="true" clientLocked="true" serverLocked="true">
<include cluster="Scenes" client="false" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>SCENE_COUNT</requireAttribute>
<requireAttribute>CURRENT_SCENE</requireAttribute>
<requireAttribute>CURRENT_GROUP</requireAttribute>
Expand Down Expand Up @@ -563,7 +563,7 @@ limitations under the License.
<requireCommand>RemoveAllGroups</requireCommand>
<requireCommand>AddGroupIfIdentifying</requireCommand>
</include>
<include cluster="Scenes" client="true" server="true" clientLocked="true" serverLocked="true">
<include cluster="Scenes" client="false" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>SCENE_COUNT</requireAttribute>
<requireAttribute>CURRENT_SCENE</requireAttribute>
<requireAttribute>CURRENT_GROUP</requireAttribute>
Expand Down Expand Up @@ -708,7 +708,7 @@ limitations under the License.
<requireCommand>RemoveAllGroups</requireCommand>
<requireCommand>AddGroupIfIdentifying</requireCommand>
</include>
<include cluster="Scenes" client="true" server="true" clientLocked="true" serverLocked="true">
<include cluster="Scenes" client="false" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>SCENE_COUNT</requireAttribute>
<requireAttribute>CURRENT_SCENE</requireAttribute>
<requireAttribute>CURRENT_GROUP</requireAttribute>
Expand Down Expand Up @@ -793,7 +793,7 @@ limitations under the License.
<requireCommand>RemoveAllGroups</requireCommand>
<requireCommand>AddGroupIfIdentifying</requireCommand>
</include>
<include cluster="Scenes" client="true" server="true" clientLocked="true" serverLocked="true">
<include cluster="Scenes" client="false" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>SCENE_COUNT</requireAttribute>
<requireAttribute>CURRENT_SCENE</requireAttribute>
<requireAttribute>CURRENT_GROUP</requireAttribute>
Expand Down Expand Up @@ -878,7 +878,7 @@ limitations under the License.
<requireCommand>RemoveAllGroups</requireCommand>
<requireCommand>AddGroupIfIdentifying</requireCommand>
</include>
<include cluster="Scenes" client="true" server="true" clientLocked="true" serverLocked="true">
<include cluster="Scenes" client="false" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>SCENE_COUNT</requireAttribute>
<requireAttribute>CURRENT_SCENE</requireAttribute>
<requireAttribute>CURRENT_GROUP</requireAttribute>
Expand Down Expand Up @@ -1577,7 +1577,7 @@ limitations under the License.
<requireCommand>RemoveAllGroups</requireCommand>
<requireCommand>AddGroupIfIdentifying</requireCommand>
</include>
<include cluster="Scenes" client="true" server="true" clientLocked="true" serverLocked="true">
<include cluster="Scenes" client="true" server="false" clientLocked="true" serverLocked="true">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is this coming from? I see nothing in the Matter device library with an M client Scenes cluster. This applies to a bunch of other cases in this PR too.

<requireAttribute>SCENE_COUNT</requireAttribute>
<requireAttribute>CURRENT_SCENE</requireAttribute>
<requireAttribute>CURRENT_GROUP</requireAttribute>
Expand Down Expand Up @@ -1625,7 +1625,7 @@ limitations under the License.
<include cluster="Binding" client="true" server="false" clientLocked="false" serverLocked="true">
<requireAttribute>BINDING</requireAttribute>
</include>
<include cluster="Scenes" client="true" server="true" clientLocked="true" serverLocked="true">
<include cluster="Scenes" client="false" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>SCENE_COUNT</requireAttribute>
<requireAttribute>CURRENT_SCENE</requireAttribute>
<requireAttribute>CURRENT_GROUP</requireAttribute>
Expand Down Expand Up @@ -1689,7 +1689,7 @@ limitations under the License.
<include cluster="Binding" client="true" server="false" clientLocked="false" serverLocked="true">
<requireAttribute>BINDING</requireAttribute>
</include>
<include cluster="Scenes" client="true" server="true" clientLocked="true" serverLocked="true">
<include cluster="Scenes" client="true" server="false" clientLocked="true" serverLocked="true">
<requireAttribute>SCENE_COUNT</requireAttribute>
<requireAttribute>CURRENT_SCENE</requireAttribute>
<requireAttribute>CURRENT_GROUP</requireAttribute>
Expand Down Expand Up @@ -1749,7 +1749,7 @@ limitations under the License.
<include cluster="Binding" client="true" server="false" clientLocked="false" serverLocked="true">
<requireAttribute>BINDING</requireAttribute>
</include>
<include cluster="Scenes" client="true" server="true" clientLocked="true" serverLocked="true">
<include cluster="Scenes" client="false" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>SCENE_COUNT</requireAttribute>
<requireAttribute>CURRENT_SCENE</requireAttribute>
<requireAttribute>CURRENT_GROUP</requireAttribute>
Expand Down Expand Up @@ -1808,7 +1808,7 @@ limitations under the License.
<include cluster="Binding" client="true" server="false" clientLocked="false" serverLocked="true">
<requireAttribute>BINDING</requireAttribute>
</include>
<include cluster="Scenes" client="true" server="true" clientLocked="true" serverLocked="true">
<include cluster="Scenes" client="true" server="false" clientLocked="true" serverLocked="true">
<requireAttribute>SCENE_COUNT</requireAttribute>
<requireAttribute>CURRENT_SCENE</requireAttribute>
<requireAttribute>CURRENT_GROUP</requireAttribute>
Expand Down Expand Up @@ -1910,7 +1910,7 @@ limitations under the License.
<include cluster="Binding" client="true" server="false" clientLocked="false" serverLocked="true">
<requireAttribute>BINDING</requireAttribute>
</include>
<include cluster="Scenes" client="true" server="true" clientLocked="true" serverLocked="true">
<include cluster="Scenes" client="false" server="true" clientLocked="true" serverLocked="true">
<requireAttribute>SCENE_COUNT</requireAttribute>
<requireAttribute>CURRENT_SCENE</requireAttribute>
<requireAttribute>CURRENT_GROUP</requireAttribute>
Expand Down