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

[cluster] Move ColorControl cluster to a dedicated file #24727

Merged
merged 1 commit into from
Jan 30, 2023
+494 −440
Merged

[cluster] Move ColorControl cluster to a dedicated file #24727

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 @@ -125,6 +125,7 @@ jobs:
src/app/zap-templates/zcl/data-model/chip/chip-types.xml \
src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/clusters-extensions.xml \
src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml \
Expand Down Expand Up @@ -182,7 +183,6 @@ jobs:
src/app/zap-templates/zcl/data-model/silabs/lo-devices.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 \
"
- name: Build Apps
timeout-minutes: 60
Expand Down
1 change: 1 addition & 0 deletions scripts/rules.matterlint
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ load "../src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/chip-ota.xml";
load "../src/app/zap-templates/zcl/data-model/chip/chip-types.xml";
load "../src/app/zap-templates/zcl/data-model/chip/clusters-extensions.xml";
load "../src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.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 @@ -15,6 +15,7 @@
<xi:include href="chip/chip-types.xml" />
<xi:include href="chip/client-monitoring-cluster.xml" />
<xi:include href="chip/clusters-extensions.xml" />
<xi:include href="chip/color-control-cluster.xml" />
<xi:include href="chip/content-launch-cluster.xml" />
<xi:include href="chip/descriptor-cluster.xml" />
<xi:include href="chip/diagnostic-logs-cluster.xml" />
Expand Down Expand Up @@ -72,5 +73,4 @@
<xi:include href="silabs/lo-devices.xml" />
<xi:include href="silabs/types-silabs.xml" />
<xi:include href="silabs/zll-devices.xml" />
<xi:include href="silabs/zll.xml" />
</all>
459 changes: 459 additions & 0 deletions src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 28 additions & 0 deletions src/app/zap-templates/zcl/data-model/draft/types/color-control.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0"?>
<!--
Copyright (c) 2023 Project CHIP Authors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<configurator>
<enum name="ColorControlOptions" type="BITMAP8">
<item name="ExecuteIfOff" value="0x1"/>
</enum>

<enum name="EnhancedColorMode" type="ENUM8">
<item name="CurrentHueAndCurrentSaturation" value="0x00"/>
<item name="CurrentXAndCurrentY" value="0x01"/>
<item name="ColorTemperature" value="0x02"/>
<item name="EnhancedCurrentHueAndCurrentSaturation" value="0x03"/>
</enum>
</configurator>
253 changes: 0 additions & 253 deletions src/app/zap-templates/zcl/data-model/silabs/ha.xml
View file
Open in desktop

Large diffs are not rendered by default.

38 changes: 0 additions & 38 deletions src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,44 +159,6 @@ limitations under the License.
<item name="levelFourLockout" value="0x4"/>
<item name="levelfiveLockout" value="0x5"/>
</enum>
<enum name="HueDirection" type="ENUM8">
<cluster code="0x0300"/>
<item name="ShortestDistance" value="0x0"/>
<item name="LongestDistance" value="0x1"/>
<item name="Up" value="0x2"/>
<item name="Down" value="0x3"/>
</enum>
<enum name="HueMoveMode" type="ENUM8">
<cluster code="0x0300"/>
<item name="Stop" value="0x0"/>
<item name="Up" value="0x1"/>
<item name="Down" value="0x3"/>
</enum>
<enum name="HueStepMode" type="ENUM8">
<cluster code="0x0300"/>
<item name="Up" value="0x1"/>
<item name="Down" value="0x3"/>
</enum>
<enum name="SaturationMoveMode" type="ENUM8">
<cluster code="0x0300"/>
<item name="Stop" value="0x0"/>
<item name="Up" value="0x1"/>
<item name="Down" value="0x3"/>
</enum>
<enum name="SaturationStepMode" type="ENUM8">
<cluster code="0x0300"/>
<item name="Up" value="0x1"/>
<item name="Down" value="0x3"/>
</enum>
<enum name="ColorMode" type="ENUM8">
<cluster code="0x0300"/>
<item name="CurrentHueAndCurrentSaturation" value="0x00"/>
<item name="CurrentXAndCurrentY" value="0x01"/>
<item name="ColorTemperature" value="0x02"/>
</enum>
<enum name="ColorControlOptions" type="BITMAP8">
<item name="ExecuteIfOff" value="0x1"/>
</enum>
<enum name="LevelStatus" type="ENUM8">
<item name="OnTarget" value="0x0"/>
<item name="BelowTarget" value="0x1"/>
Expand Down
145 changes: 0 additions & 145 deletions src/app/zap-templates/zcl/data-model/silabs/zll.xml
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion 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 @@ -30,6 +30,7 @@
"channel-cluster.xml",
"client-monitoring-cluster.xml",
"clusters-extensions.xml",
"color-control-cluster.xml",
"content-launch-cluster.xml",
"descriptor-cluster.xml",
"diagnostic-logs-cluster.xml",
Expand Down Expand Up @@ -86,7 +87,7 @@
"ha.xml",
"lo-devices.xml",
"zll-devices.xml",
"zll.xml"
"types/color-control.xml"
],
"manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml",
"options": {
Expand Down
3 changes: 2 additions & 1 deletion src/app/zap-templates/zcl/zcl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"channel-cluster.xml",
"client-monitoring-cluster.xml",
"clusters-extensions.xml",
"color-control-cluster.xml",
"content-launch-cluster.xml",
"descriptor-cluster.xml",
"diagnostic-logs-cluster.xml",
Expand Down Expand Up @@ -84,7 +85,7 @@
"ha.xml",
"lo-devices.xml",
"zll-devices.xml",
"zll.xml"
"types/color-control.xml"
],
"manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml",
"options": {
Expand Down