[cluster] Move ColorControl cluster to a dedicated file

.github/workflows/tests.yaml

@@ -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 \
@@ -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

scripts/rules.matterlint

@@ -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";

src/app/zap-templates/zcl/data-model/all.xml

@@ -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" />
@@ -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>

src/app/zap-templates/zcl/data-model/draft/types/color-control.xml

@@ -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>

src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml

@@ -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"/>

src/app/zap-templates/zcl/zcl-with-test-extensions.json

@@ -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",
@@ -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": {

src/app/zap-templates/zcl/zcl.json

@@ -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",
@@ -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": {