From 2318850b8f8de0dd0fbb3f48195084b03b03fecc Mon Sep 17 00:00:00 2001
From: Junior Martinez <67972863+jmartinez-silabs@users.noreply.github.com>
Date: Thu, 31 Aug 2023 09:26:10 -0400
Subject: [PATCH] Fix requirements in the matter-device.xml for Ligthing device
types (#28971)
---
.../zcl/data-model/chip/matter-devices.xml | 128 +++---------------
1 file changed, 19 insertions(+), 109 deletions(-)
diff --git a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
index f72c3298856906..6b398976a387d3 100644
--- a/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
@@ -195,7 +195,6 @@ limitations under the License.
IDENTIFY_TIME
IDENTIFY_TYPE
Identify
- IdentifyQuery
TriggerEffect
@@ -218,10 +217,6 @@ limitations under the License.
AddGroupIfIdentifying
- SCENE_COUNT
- CURRENT_SCENE
- CURRENT_GROUP
- SCENE_VALID
SCENE_NAME_SUPPORT
AddScene
AddSceneResponse
@@ -236,6 +231,8 @@ limitations under the License.
RecallScene
GetSceneMembership
GetSceneMembershipResponse
+ CopyScene
+ CopySceneResponse
ON_OFF
@@ -254,6 +251,8 @@ limitations under the License.
CURRENT_LEVEL
OPTIONS
LEVEL_CONTROL_REMAINING_TIME
+ MINIMUM_LEVEL
+ ON_LEVEL
START_UP_CURRENT_LEVEL
MoveToLevel
Move
@@ -281,7 +280,6 @@ limitations under the License.
IDENTIFY_TIME
IDENTIFY_TYPE
Identify
- IdentifyQuery
TriggerEffect
@@ -307,10 +305,6 @@ limitations under the License.
AddGroupIfIdentifying
- SCENE_COUNT
- CURRENT_SCENE
- CURRENT_GROUP
- SCENE_VALID
SCENE_NAME_SUPPORT
AddScene
AddSceneResponse
@@ -325,6 +319,8 @@ limitations under the License.
RecallScene
GetSceneMembership
GetSceneMembershipResponse
+ CopyScene
+ CopySceneResponse
ON_OFF
@@ -343,6 +339,8 @@ limitations under the License.
CURRENT_LEVEL
OPTIONS
LEVEL_CONTROL_REMAINING_TIME
+ MINIMUM_LEVEL
+ ON_LEVEL
START_UP_CURRENT_LEVEL
MoveToLevel
Move
@@ -370,7 +368,6 @@ limitations under the License.
IDENTIFY_TIME
IDENTIFY_TYPE
Identify
- IdentifyQuery
TriggerEffect
@@ -393,10 +390,6 @@ limitations under the License.
AddGroupIfIdentifying
- SCENE_COUNT
- CURRENT_SCENE
- CURRENT_GROUP
- SCENE_VALID
SCENE_NAME_SUPPORT
AddScene
AddSceneResponse
@@ -411,6 +404,8 @@ limitations under the License.
RecallScene
GetSceneMembership
GetSceneMembershipResponse
+ CopyScene
+ CopySceneResponse
ON_OFF
@@ -429,6 +424,8 @@ limitations under the License.
CURRENT_LEVEL
OPTIONS
LEVEL_CONTROL_REMAINING_TIME
+ MINIMUM_LEVEL
+ ON_LEVEL
START_UP_CURRENT_LEVEL
MoveToLevel
Move
@@ -444,47 +441,14 @@ limitations under the License.
COLOR_CONTROL_COLOR_TEMPERATURE
COLOR_CONTROL_COLOR_MODE
COLOR_CONTROL_OPTIONS
+ COLOR_CONTROL_ENHANCED_COLOR_MODE
COLOR_CONTROL_NUMBER_OF_PRIMARIES
- COLOR_CONTROL_PRIMARY_1_X
- COLOR_CONTROL_PRIMARY_1_Y
- COLOR_CONTROL_PRIMARY_1_INTENSITY
- COLOR_CONTROL_PRIMARY_2_X
- COLOR_CONTROL_PRIMARY_2_Y
- COLOR_CONTROL_PRIMARY_2_INTENSITY
- COLOR_CONTROL_PRIMARY_3_X
- COLOR_CONTROL_PRIMARY_3_Y
- COLOR_CONTROL_PRIMARY_3_INTENSITY
- COLOR_CONTROL_PRIMARY_4_X
- COLOR_CONTROL_PRIMARY_4_Y
- COLOR_CONTROL_PRIMARY_4_INTENSITY
- COLOR_CONTROL_PRIMARY_5_X
- COLOR_CONTROL_PRIMARY_5_Y
- COLOR_CONTROL_PRIMARY_5_INTENSITY
- COLOR_CONTROL_PRIMARY_6_X
- COLOR_CONTROL_PRIMARY_6_Y
- COLOR_CONTROL_PRIMARY_6_INTENSITY
- COLOR_CONTROL_ENHANCED_CURRENT_HUE
COLOR_CONTROL_COLOR_CAPABILITIES
COLOR_CONTROL_COLOR_TEMP_PHYSICAL_MIN
COLOR_CONTROL_COLOR_TEMP_PHYSICAL_MAX
COLOR_CONTROL_TEMPERATURE_LEVEL_MIN_MIREDS
START_UP_COLOR_TEMPERATURE_MIREDS
- MoveToHue
- MoveHue
- StepHue
- MoveToSaturation
- MoveSaturation
- StepSaturation
- MoveToHueAndSaturation
- MoveToColor
- MoveColor
- StepColor
MoveToColorTemperature
- EnhancedMoveToHue
- EnhancedMoveHue
- EnhancedStepHue
- EnhancedMoveToHueAndSaturation
- ColorLoopSet
StopMoveStep
MoveColorTemperature
StepColorTemperature
@@ -505,7 +469,6 @@ limitations under the License.
IDENTIFY_TIME
IDENTIFY_TYPE
Identify
- IdentifyQuery
TriggerEffect
@@ -528,10 +491,6 @@ limitations under the License.
AddGroupIfIdentifying
- SCENE_COUNT
- CURRENT_SCENE
- CURRENT_GROUP
- SCENE_VALID
SCENE_NAME_SUPPORT
AddScene
AddSceneResponse
@@ -564,6 +523,8 @@ limitations under the License.
CURRENT_LEVEL
OPTIONS
LEVEL_CONTROL_REMAINING_TIME
+ MINIMUM_LEVEL
+ ON_LEVEL
START_UP_CURRENT_LEVEL
MoveToLevel
Move
@@ -575,8 +536,6 @@ limitations under the License.
StopWithOnOff
- COLOR_CONTROL_CURRENT_HUE
- COLOR_CONTROL_CURRENT_SATURATION
COLOR_CONTROL_REMAINING_TIME
COLOR_CONTROL_CURRENT_X
COLOR_CONTROL_CURRENT_Y
@@ -584,52 +543,16 @@ limitations under the License.
COLOR_CONTROL_COLOR_MODE
COLOR_CONTROL_OPTIONS
COLOR_CONTROL_NUMBER_OF_PRIMARIES
- COLOR_CONTROL_PRIMARY_1_X
- COLOR_CONTROL_PRIMARY_1_Y
- COLOR_CONTROL_PRIMARY_1_INTENSITY
- COLOR_CONTROL_PRIMARY_2_X
- COLOR_CONTROL_PRIMARY_2_Y
- COLOR_CONTROL_PRIMARY_2_INTENSITY
- COLOR_CONTROL_PRIMARY_3_X
- COLOR_CONTROL_PRIMARY_3_Y
- COLOR_CONTROL_PRIMARY_3_INTENSITY
- COLOR_CONTROL_PRIMARY_4_X
- COLOR_CONTROL_PRIMARY_4_Y
- COLOR_CONTROL_PRIMARY_4_INTENSITY
- COLOR_CONTROL_PRIMARY_5_X
- COLOR_CONTROL_PRIMARY_5_Y
- COLOR_CONTROL_PRIMARY_5_INTENSITY
- COLOR_CONTROL_PRIMARY_6_X
- COLOR_CONTROL_PRIMARY_6_Y
- COLOR_CONTROL_PRIMARY_6_INTENSITY
- COLOR_CONTROL_ENHANCED_CURRENT_HUE
COLOR_CONTROL_ENHANCED_COLOR_MODE
- COLOR_CONTROL_COLOR_LOOP_ACTIVE
- COLOR_CONTROL_COLOR_LOOP_DIRECTION
- COLOR_CONTROL_COLOR_LOOP_TIME
- COLOR_CONTROL_COLOR_LOOP_START_ENHANCED_HUE
- COLOR_CONTROL_COLOR_LOOP_STORED_ENHANCED_HUE
COLOR_CONTROL_COLOR_CAPABILITIES
COLOR_CONTROL_COLOR_TEMP_PHYSICAL_MIN
COLOR_CONTROL_COLOR_TEMP_PHYSICAL_MAX
COLOR_CONTROL_TEMPERATURE_LEVEL_MIN_MIREDS
START_UP_COLOR_TEMPERATURE_MIREDS
- MoveToHue
- MoveHue
- StepHue
- MoveToSaturation
- MoveSaturation
- StepSaturation
- MoveToHueAndSaturation
MoveToColor
MoveColor
StepColor
MoveToColorTemperature
- EnhancedMoveToHue
- EnhancedMoveHue
- EnhancedStepHue
- EnhancedMoveToHueAndSaturation
- ColorLoopSet
StopMoveStep
MoveColorTemperature
StepColorTemperature
@@ -649,7 +572,6 @@ limitations under the License.
IDENTIFY_TIME
IDENTIFY_TYPE
Identify
- IdentifyQuery
TriggerEffect
@@ -672,10 +594,6 @@ limitations under the License.
AddGroupIfIdentifying
- SCENE_COUNT
- CURRENT_SCENE
- CURRENT_GROUP
- SCENE_VALID
SCENE_NAME_SUPPORT
AddScene
AddSceneResponse
@@ -708,6 +626,8 @@ limitations under the License.
CURRENT_LEVEL
OPTIONS
LEVEL_CONTROL_REMAINING_TIME
+ MINIMUM_LEVEL
+ ON_LEVEL
START_UP_CURRENT_LEVEL
MoveToLevel
Move
@@ -733,7 +653,6 @@ limitations under the License.
IDENTIFY_TIME
IDENTIFY_TYPE
Identify
- IdentifyQuery
TriggerEffect
@@ -756,10 +675,6 @@ limitations under the License.
AddGroupIfIdentifying
- SCENE_COUNT
- CURRENT_SCENE
- CURRENT_GROUP
- SCENE_VALID
SCENE_NAME_SUPPORT
AddScene
AddSceneResponse
@@ -792,6 +707,8 @@ limitations under the License.
CURRENT_LEVEL
OPTIONS
LEVEL_CONTROL_REMAINING_TIME
+ MINIMUM_LEVEL
+ ON_LEVEL
START_UP_CURRENT_LEVEL
MoveToLevel
Move
@@ -897,7 +814,6 @@ limitations under the License.
IDENTIFY_TIME
IDENTIFY_TYPE
Identify
- IdentifyQuery
TriggerEffect
@@ -959,7 +875,6 @@ limitations under the License.
IDENTIFY_TIME
IDENTIFY_TYPE
Identify
- IdentifyQuery
TriggerEffect
@@ -1022,7 +937,6 @@ limitations under the License.
IDENTIFY_TIME
IDENTIFY_TYPE
Identify
- IdentifyQuery
TriggerEffect
@@ -1048,10 +962,6 @@ limitations under the License.
AddGroupIfIdentifying
- SCENE_COUNT
- CURRENT_SCENE
- CURRENT_GROUP
- SCENE_VALID
SCENE_NAME_SUPPORT
AddScene
AddSceneResponse