From a526401ae34cd346e462553a176c15502e791494 Mon Sep 17 00:00:00 2001 From: "Ethan.Z" Date: Sun, 29 Sep 2024 12:03:33 -0400 Subject: [PATCH] update c --- .../zcl/data-model/chip/channel-cluster.xml | 51 +- .../zcl/data-model/chip/chip-ota.xml | 5 + .../data-model/chip/color-control-cluster.xml | 453 ++++++++++- .../chip/commissioner-control-cluster.xml | 4 + .../concentration-measurement-cluster.xml | 750 +++++++++++++++--- .../chip/content-app-observer-cluster.xml | 2 + .../chip/content-control-cluster.xml | 92 ++- .../chip/content-launch-cluster.xml | 44 +- 8 files changed, 1238 insertions(+), 163 deletions(-) diff --git a/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml index 25ec7b7062f97a..2101430e2e3e55 100644 --- a/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml @@ -41,34 +41,64 @@ limitations under the License. - ChannelList - Lineup - CurrentChannel + + ChannelList + + + + + + Lineup + + + + + + CurrentChannel + + Change the channel on the media player to the channel case-insensitive exact matching the value passed as an argument. + + + + + + Change the channel on the media plaeyer to the channel with the given Number in the ChannelList attribute. + This command provides channel up and channel down functionality, but allows channel index jumps of size Count. When the value of the increase or decrease is larger than the number of channels remaining in the given direction, then the behavior SHALL be to return to the beginning (or end) of the channel list and continue. For example, if the current channel is at index 0 and count value of -1 is given, then the current channel should change to the last channel. + Upon receipt, this SHALL display the active status of the input list on screen. + + + + + + This command retrieves the program guide. It accepts several filter parameters to return specific schedule and program information from a content app. The command shall receive in response a ProgramGuideResponse. + + + @@ -80,12 +110,21 @@ limitations under the License. This command is a response to the GetProgramGuide command. + + + Record a specific program or series when it goes live. This functionality enables DVR recording features. + + + + + + @@ -94,6 +133,12 @@ limitations under the License. Cancel recording for a specific program or series. + + + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml b/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml index 04fa27436383b2..5f7b094165cbbd 100644 --- a/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml +++ b/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml @@ -46,6 +46,7 @@ limitations under the License. true Determine availability of a new Software Image + @@ -57,6 +58,7 @@ limitations under the License. Response to QueryImage command + @@ -68,16 +70,19 @@ limitations under the License. Determine next action to take for a downloaded Software Image + Reponse to ApplyUpdateRequest command + Notify OTA Provider that an update was applied + diff --git a/src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml index 3623ce1ccf925c..fda1529d82df98 100644 --- a/src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml @@ -127,141 +127,410 @@ limitations under the License. - CurrentHue + + CurrentHue + + + + - CurrentSaturation + + CurrentSaturation + + + + - RemainingTime + + RemainingTime + + - CurrentX + + CurrentX + + + + - CurrentY + + CurrentY + + + + - DriftCompensation + + DriftCompensation + + - CompensationText + + CompensationText + + - ColorTemperatureMireds + + ColorTemperatureMireds + + + + - ColorMode + + ColorMode + + - Options + + Options + + - NumberOfPrimaries + + NumberOfPrimaries + + - Primary1X + + Primary1X + + + + + + + + + + - Primary1Y + + Primary1Y + + + + + + + + + + - Primary1Intensity + + Primary1Intensity + + + + + + + + + + - Primary2X + + Primary2X + + + + + + + + + + - Primary2Y + + Primary2Y + + + + + + + + + + - Primary2Intensity + + Primary2Intensity + + + + + + + + + + - Primary3X + + Primary3X + + + + + + + + + + - Primary3Y + + Primary3Y + + + + + + + + + + - Primary3Intensity + + Primary3Intensity + + + + + + + + + + - Primary4X + + Primary4X + + + + + + + + + + - Primary4Y + + Primary4Y + + + + + + + + + + - Primary4Intensity + + Primary4Intensity + + + + + + + + + + - Primary5X + + Primary5X + + + + + + + + + + - Primary5Y + + Primary5Y + + + + + + + + + + - Primary5Intensity + + Primary5Intensity + + + + + + + + + + - Primary6X + + Primary6X + + + + + + + + + + - Primary6Y + + Primary6Y + + + + + + + + + + - Primary6Intensity + + Primary6Intensity + + + + + + + + + + WhitePointX + WhitePointY + ColorPointRX + ColorPointRY + ColorPointRIntensity + ColorPointGX + ColorPointGY + ColorPointGIntensity + ColorPointBX + ColorPointBY + ColorPointBIntensity + - CoupleColorTempToLevelMinMireds + + CoupleColorTempToLevelMinMireds + + + + + + + StartUpColorTemperatureMireds + + + + + + Move to specified hue. + + + @@ -273,6 +542,9 @@ limitations under the License. Move hue up or down at specified rate. + + + @@ -283,6 +555,9 @@ limitations under the License. Step hue up or down by specified size at specified rate. + + + @@ -294,6 +569,9 @@ limitations under the License. Move to specified saturation. + + + @@ -304,6 +582,9 @@ limitations under the License. Move saturation up or down at specified rate. + + + @@ -314,6 +595,9 @@ limitations under the License. Step saturation up or down by specified size at specified rate. + + + @@ -325,6 +609,9 @@ limitations under the License. Move to hue and saturation. + + + @@ -336,6 +623,9 @@ limitations under the License. Move to specified color. + + + @@ -347,6 +637,9 @@ limitations under the License. Moves the color. + + + @@ -357,6 +650,9 @@ limitations under the License. Steps the lighting to a specific color. + + + @@ -368,6 +664,9 @@ limitations under the License. Move to a specific color temperature. + + + @@ -376,21 +675,70 @@ limitations under the License. - EnhancedCurrentHue - EnhancedColorMode - ColorLoopActive - ColorLoopDirection - ColorLoopTime - ColorLoopStartEnhancedHue - ColorLoopStoredEnhancedHue - ColorCapabilities - ColorTempPhysicalMinMireds - ColorTempPhysicalMaxMireds + + EnhancedCurrentHue + + + + + + EnhancedColorMode + + + + ColorLoopActive + + + + + + ColorLoopDirection + + + + + + ColorLoopTime + + + + + + ColorLoopStartEnhancedHue + + + + + + ColorLoopStoredEnhancedHue + + + + + + ColorCapabilities + + + + ColorTempPhysicalMinMireds + + + + + + ColorTempPhysicalMaxMireds + + + + Command description for EnhancedMoveToHue + + + @@ -402,6 +750,9 @@ limitations under the License. Command description for EnhancedMoveHue + + + @@ -412,6 +763,9 @@ limitations under the License. Command description for EnhancedStepHue + + + @@ -423,6 +777,9 @@ limitations under the License. Command description for EnhancedMoveToHueAndSaturation + + + @@ -434,6 +791,9 @@ limitations under the License. Command description for ColorLoopSet + + + @@ -447,6 +807,13 @@ limitations under the License. Command description for StopMoveStep + + + + + + + @@ -455,6 +822,9 @@ limitations under the License. Command description for MoveColorTemperature + + + @@ -467,6 +837,9 @@ limitations under the License. Command description for StepColorTemperature + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml index abfd85dde2cd93..990bf386993fea 100644 --- a/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/commissioner-control-cluster.xml @@ -35,10 +35,12 @@ limitations under the License. SupportedDeviceCategories + This command is sent by a client to request approval for a future CommissionNode call. + @@ -48,6 +50,7 @@ limitations under the License. This command is sent by a client to request that the server begins commissioning a previously approved request. + @@ -55,6 +58,7 @@ limitations under the License. When received within the timeout specified by CommissionNode, the client SHALL open a commissioning window on to the node which the client called RequestCommissioningApproval to have commissioned. + diff --git a/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml index 4d03c539103970..f9671b92063ead 100644 --- a/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml @@ -58,17 +58,70 @@ limitations under the License. - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - PeakMeasuredValue - PeakMeasuredValueWindow - AverageMeasuredValue - AverageMeasuredValueWindow - Uncertainty - MeasurementUnit - MeasurementMedium - LevelValue + + MeasuredValue + + + + + + MinMeasuredValue + + + + + + MaxMeasuredValue + + + + + + PeakMeasuredValue + + + + + + PeakMeasuredValueWindow + + + + + + AverageMeasuredValue + + + + + + AverageMeasuredValueWindow + + + + + + Uncertainty + + + + + + MeasurementUnit + + + + + + MeasurementMedium + + + + LevelValue + + + + @@ -113,17 +166,70 @@ limitations under the License. - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - PeakMeasuredValue - PeakMeasuredValueWindow - AverageMeasuredValue - AverageMeasuredValueWindow - Uncertainty - MeasurementUnit - MeasurementMedium - LevelValue + + MeasuredValue + + + + + + MinMeasuredValue + + + + + + MaxMeasuredValue + + + + + + PeakMeasuredValue + + + + + + PeakMeasuredValueWindow + + + + + + AverageMeasuredValue + + + + + + AverageMeasuredValueWindow + + + + + + Uncertainty + + + + + + MeasurementUnit + + + + + + MeasurementMedium + + + + LevelValue + + + + @@ -167,17 +273,70 @@ limitations under the License. - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - PeakMeasuredValue - PeakMeasuredValueWindow - AverageMeasuredValue - AverageMeasuredValueWindow - Uncertainty - MeasurementUnit - MeasurementMedium - LevelValue + + MeasuredValue + + + + + + MinMeasuredValue + + + + + + MaxMeasuredValue + + + + + + PeakMeasuredValue + + + + + + PeakMeasuredValueWindow + + + + + + AverageMeasuredValue + + + + + + AverageMeasuredValueWindow + + + + + + Uncertainty + + + + + + MeasurementUnit + + + + + + MeasurementMedium + + + + LevelValue + + + + @@ -221,17 +380,70 @@ limitations under the License. - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - PeakMeasuredValue - PeakMeasuredValueWindow - AverageMeasuredValue - AverageMeasuredValueWindow - Uncertainty - MeasurementUnit - MeasurementMedium - LevelValue + + MeasuredValue + + + + + + MinMeasuredValue + + + + + + MaxMeasuredValue + + + + + + PeakMeasuredValue + + + + + + PeakMeasuredValueWindow + + + + + + AverageMeasuredValue + + + + + + AverageMeasuredValueWindow + + + + + + Uncertainty + + + + + + MeasurementUnit + + + + + + MeasurementMedium + + + + LevelValue + + + + @@ -275,17 +487,70 @@ limitations under the License. - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - PeakMeasuredValue - PeakMeasuredValueWindow - AverageMeasuredValue - AverageMeasuredValueWindow - Uncertainty - MeasurementUnit - MeasurementMedium - LevelValue + + MeasuredValue + + + + + + MinMeasuredValue + + + + + + MaxMeasuredValue + + + + + + PeakMeasuredValue + + + + + + PeakMeasuredValueWindow + + + + + + AverageMeasuredValue + + + + + + AverageMeasuredValueWindow + + + + + + Uncertainty + + + + + + MeasurementUnit + + + + + + MeasurementMedium + + + + LevelValue + + + + @@ -329,17 +594,70 @@ limitations under the License. - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - PeakMeasuredValue - PeakMeasuredValueWindow - AverageMeasuredValue - AverageMeasuredValueWindow - Uncertainty - MeasurementUnit - MeasurementMedium - LevelValue + + MeasuredValue + + + + + + MinMeasuredValue + + + + + + MaxMeasuredValue + + + + + + PeakMeasuredValue + + + + + + PeakMeasuredValueWindow + + + + + + AverageMeasuredValue + + + + + + AverageMeasuredValueWindow + + + + + + Uncertainty + + + + + + MeasurementUnit + + + + + + MeasurementMedium + + + + LevelValue + + + + @@ -383,17 +701,70 @@ limitations under the License. - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - PeakMeasuredValue - PeakMeasuredValueWindow - AverageMeasuredValue - AverageMeasuredValueWindow - Uncertainty - MeasurementUnit - MeasurementMedium - LevelValue + + MeasuredValue + + + + + + MinMeasuredValue + + + + + + MaxMeasuredValue + + + + + + PeakMeasuredValue + + + + + + PeakMeasuredValueWindow + + + + + + AverageMeasuredValue + + + + + + AverageMeasuredValueWindow + + + + + + Uncertainty + + + + + + MeasurementUnit + + + + + + MeasurementMedium + + + + LevelValue + + + + @@ -437,17 +808,70 @@ limitations under the License. - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - PeakMeasuredValue - PeakMeasuredValueWindow - AverageMeasuredValue - AverageMeasuredValueWindow - Uncertainty - MeasurementUnit - MeasurementMedium - LevelValue + + MeasuredValue + + + + + + MinMeasuredValue + + + + + + MaxMeasuredValue + + + + + + PeakMeasuredValue + + + + + + PeakMeasuredValueWindow + + + + + + AverageMeasuredValue + + + + + + AverageMeasuredValueWindow + + + + + + Uncertainty + + + + + + MeasurementUnit + + + + + + MeasurementMedium + + + + LevelValue + + + + @@ -491,17 +915,70 @@ limitations under the License. - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - PeakMeasuredValue - PeakMeasuredValueWindow - AverageMeasuredValue - AverageMeasuredValueWindow - Uncertainty - MeasurementUnit - MeasurementMedium - LevelValue + + MeasuredValue + + + + + + MinMeasuredValue + + + + + + MaxMeasuredValue + + + + + + PeakMeasuredValue + + + + + + PeakMeasuredValueWindow + + + + + + AverageMeasuredValue + + + + + + AverageMeasuredValueWindow + + + + + + Uncertainty + + + + + + MeasurementUnit + + + + + + MeasurementMedium + + + + LevelValue + + + + @@ -545,17 +1022,70 @@ limitations under the License. - MeasuredValue - MinMeasuredValue - MaxMeasuredValue - PeakMeasuredValue - PeakMeasuredValueWindow - AverageMeasuredValue - AverageMeasuredValueWindow - Uncertainty - MeasurementUnit - MeasurementMedium - LevelValue + + MeasuredValue + + + + + + MinMeasuredValue + + + + + + MaxMeasuredValue + + + + + + PeakMeasuredValue + + + + + + PeakMeasuredValueWindow + + + + + + AverageMeasuredValue + + + + + + AverageMeasuredValueWindow + + + + + + Uncertainty + + + + + + MeasurementUnit + + + + + + MeasurementMedium + + + + LevelValue + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/content-app-observer-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/content-app-observer-cluster.xml index 6e241c7b5c3cd0..aa4666719bf25e 100644 --- a/src/app/zap-templates/zcl/data-model/chip/content-app-observer-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/content-app-observer-cluster.xml @@ -27,12 +27,14 @@ limitations under the License. Upon receipt, the data field MAY be parsed and interpreted. Message encoding is specific to the Content App. A Content App MAY when possible read attributes from the Basic Information Cluster on the Observer and use this to determine the Message encoding. + This command SHALL be generated in response to ContentAppMessage command. + diff --git a/src/app/zap-templates/zcl/data-model/chip/content-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/content-control-cluster.xml index 06468c114c42dc..649171ba5cba8a 100644 --- a/src/app/zap-templates/zcl/data-model/chip/content-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/content-control-cluster.xml @@ -41,66 +41,142 @@ limitations under the License. + + + + + + + + + - Enabled - OnDemandRatings - OnDemandRatingThreshold - ScheduledContentRatings - ScheduledContentRatingThreshold - ScreenDailyTime - RemainingScreenTime - BlockUnrated + + Enabled + + + + OnDemandRatings + + + + + + OnDemandRatingThreshold + + + + + + ScheduledContentRatings + + + + + + ScheduledContentRatingThreshold + + + + + + ScreenDailyTime + + + + + + RemainingScreenTime + + + + + + BlockUnrated + + + + The purpose of this command is to update the PIN used for protecting configuration of the content control settings. Upon success, the old PIN SHALL no longer work. The PIN is used to ensure that only the Node (or User) with the PIN code can make changes to the Content Control settings, for example, turn off Content Controls or modify the ScreenDailyTime. The PIN is composed of a numeric string of up to 6 human readable characters (displayable) . Upon receipt of this command, the media device SHALL check if the OldPIN field of this command is the same as the current PIN. If the PINs are the same, then the PIN code SHALL be set to NewPIN. Otherwise a response with InvalidPINCode error status SHALL be returned. The media device MAY provide a default PIN to the User via an out of band mechanism. For security reasons, it is recommended that a client encourage the user to update the PIN from its default value when performing configuration of the Content Control settings exposed by this cluster. The ResetPIN command can also be used to obtain the default PIN. + + + The purpose of this command is to reset the PIN. If this command is executed successfully, a ResetPINResponse command with a new PIN SHALL be returned. + + + This command SHALL be generated in response to a ResetPIN command. The data for this command SHALL be as follows: + + + The purpose of this command is to turn on the Content Control feature on a media device. On receipt of the Enable command, the media device SHALL set the Enabled attribute to TRUE. + The purpose of this command is to turn off the Content Control feature on a media device. On receipt of the Disable command, the media device SHALL set the Enabled attribute to FALSE. + The purpose of this command is to add the extra screen time for the user. If a client with Operate privilege invokes this command, the media device SHALL check whether the PINCode passed in the command matches the current PINCode value. If these match, then the RemainingScreenTime attribute SHALL be increased by the specified BonusTime value. If the PINs do not match, then a response with InvalidPINCode error status SHALL be returned, and no changes SHALL be made to RemainingScreenTime. If a client with Manage privilege or greater invokes this command, the media device SHALL ignore the PINCode field and directly increase the RemainingScreenTime attribute by the specified BonusTime value. A server that does not support the PM feature SHALL respond with InvalidPINCode to clients that only have Operate privilege unless: It has been provided with the PIN value to expect via an out of band mechanism, and The client has provided a PINCode that matches the expected PIN value. + + + The purpose of this command is to set the ScreenDailyTime attribute. On receipt of the SetScreenDailyTime command, the media device SHALL set the ScreenDailyTime attribute to the ScreenTime value. + + + The purpose of this command is to specify whether programs with no Content rating must be blocked by this media device. On receipt of the BlockUnratedContent command, the media device SHALL set the BlockUnrated attribute to TRUE. + + + The purpose of this command is to specify whether programs with no Content rating must be blocked by this media device. On receipt of the UnblockUnratedContent command, the media device SHALL set the BlockUnrated attribute to FALSE. + + + The purpose of this command is to set the OnDemandRatingThreshold attribute. On receipt of the SetOnDemandRatingThreshold command, the media device SHALL check if the Rating field is one of values present in the OnDemandRatings attribute. If not, then a response with InvalidRating error status SHALL be returned. + + + The purpose of this command is to set ScheduledContentRatingThreshold attribute. On receipt of the SetScheduledContentRatingThreshold command, the media device SHALL check if the Rating field is one of values present in the ScheduledContentRatings attribute. If not, then a response with InvalidRating error status SHALL be returned. + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml index 3c59ae1f9c90ad..14b6c031ade7e5 100644 --- a/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml @@ -26,11 +26,42 @@ limitations under the License. This cluster provides an interface for launching content on a media player device such as a TV or Speaker. - AcceptHeader - SupportedStreamingProtocols + + + + + + + + + + + + + + + + + + + + AcceptHeader + + + + + + SupportedStreamingProtocols + + + + Upon receipt, this SHALL launch the specified content with optional search criteria. + + + @@ -40,6 +71,9 @@ limitations under the License. Upon receipt, this SHALL launch content from the specified URL. + + + @@ -47,6 +81,12 @@ limitations under the License. This command SHALL be generated in response to LaunchContent command. + + + + + +