From 1750368a32d25f9431b5865e0b1bf1f5d2904ebb Mon Sep 17 00:00:00 2001 From: Lazar Kovacic Date: Tue, 19 Jul 2022 17:41:49 +0200 Subject: [PATCH] Update tv.zap & matter-devices.xml to align them with spec (#20918) * Update tv.zap & xml to align per spec * update per issue * Remove binding cluster from endpoint 3 --- examples/tv-app/tv-common/tv-app.matter | 106 +- examples/tv-app/tv-common/tv-app.zap | 1250 +++++++++-------- .../zcl/data-model/chip/matter-devices.xml | 48 +- .../tv-app/zap-generated/endpoint_config.h | 247 ++-- .../tv-app/zap-generated/gen_config.h | 14 +- 5 files changed, 872 insertions(+), 793 deletions(-) diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index ca7f8880c790c9..414058c5e9e277 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1562,6 +1562,9 @@ server cluster Channel = 1284 { readonly attribute ChannelInfo channelList[] = 0; readonly attribute nullable LineupInfo lineup = 1; readonly attribute nullable ChannelInfo currentChannel = 2; + readonly attribute command_id generatedCommandList[] = 65528; + readonly attribute command_id acceptedCommandList[] = 65529; + readonly attribute attrib_id attributeList[] = 65531; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1602,6 +1605,9 @@ server cluster TargetNavigator = 1285 { readonly attribute TargetInfo targetList[] = 0; readonly attribute int8u currentTarget = 1; + readonly attribute command_id generatedCommandList[] = 65528; + readonly attribute command_id acceptedCommandList[] = 65529; + readonly attribute attrib_id attributeList[] = 65531; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1839,6 +1845,9 @@ server cluster KeypadInput = 1289 { kNumberKeys = 0x4; } + readonly attribute command_id generatedCommandList[] = 65528; + readonly attribute command_id acceptedCommandList[] = 65529; + readonly attribute attrib_id attributeList[] = 65531; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1846,6 +1855,10 @@ server cluster KeypadInput = 1289 { CecKeyCode keyCode = 0; } + response struct SendKeyResponse = 1 { + KeypadInputStatusEnum status = 0; + } + command SendKey(SendKeyRequest): SendKeyResponse = 0; } @@ -2013,6 +2026,9 @@ server cluster ApplicationLauncher = 1292 { readonly attribute INT16U catalogList[] = 0; attribute nullable ApplicationEP currentApp = 1; + readonly attribute command_id generatedCommandList[] = 65528; + readonly attribute command_id acceptedCommandList[] = 65529; + readonly attribute attrib_id attributeList[] = 65531; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -2060,6 +2076,9 @@ server cluster ApplicationBasic = 1293 { readonly attribute ApplicationStatusEnum status = 5; readonly attribute char_string<32> applicationVersion = 6; readonly attribute vendor_id allowedVendorList[] = 7; + readonly attribute command_id generatedCommandList[] = 65528; + readonly attribute command_id acceptedCommandList[] = 65529; + readonly attribute attrib_id attributeList[] = 65531; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; } @@ -2513,6 +2532,23 @@ endpoint 3 { callback attribute clusterRevision default = 1; } + server cluster Channel { + callback attribute generatedCommandList; + callback attribute acceptedCommandList; + callback attribute attributeList; + ram attribute featureMap; + ram attribute clusterRevision default = 1; + } + + server cluster TargetNavigator { + callback attribute targetList; + callback attribute generatedCommandList; + callback attribute acceptedCommandList; + callback attribute attributeList; + ram attribute featureMap; + ram attribute clusterRevision default = 1; + } + server cluster MediaPlayback { ram attribute currentState; ram attribute startTime default = 0xFF; @@ -2525,46 +2561,25 @@ endpoint 3 { ram attribute clusterRevision default = 1; } - server cluster ContentLauncher { - callback attribute acceptHeader; - ram attribute supportedStreamingProtocols; - ram attribute featureMap default = 0x0003; - ram attribute clusterRevision default = 1; - } - - server cluster ApplicationBasic { - ram attribute vendorName; - ram attribute vendorID; - ram attribute applicationName; - ram attribute productID; - callback attribute application; - ram attribute status; - ram attribute applicationVersion; - callback attribute allowedVendorList; - ram attribute featureMap; - ram attribute clusterRevision default = 1; - } - - server cluster AccountLogin { + server cluster KeypadInput { + callback attribute generatedCommandList; + callback attribute acceptedCommandList; + callback attribute attributeList; ram attribute featureMap; ram attribute clusterRevision default = 1; } -} -endpoint 4 { - device type contentapplication = 36; - - server cluster Descriptor { - callback attribute deviceList; - callback attribute serverList; - callback attribute clientList; - callback attribute partsList; - ram attribute featureMap; - callback attribute clusterRevision default = 1; - } server cluster ContentLauncher { callback attribute acceptHeader; ram attribute supportedStreamingProtocols; + ram attribute featureMap default = 0x0003; + ram attribute clusterRevision default = 1; + } + + server cluster ApplicationLauncher { + callback attribute generatedCommandList; + callback attribute acceptedCommandList; + callback attribute attributeList; ram attribute featureMap; ram attribute clusterRevision default = 1; } @@ -2578,31 +2593,14 @@ endpoint 4 { ram attribute status; ram attribute applicationVersion; callback attribute allowedVendorList; + callback attribute generatedCommandList; + callback attribute acceptedCommandList; + callback attribute attributeList; ram attribute featureMap; ram attribute clusterRevision default = 1; } -} -endpoint 5 { - device type contentapplication = 36; - server cluster Descriptor { - callback attribute deviceList; - callback attribute serverList; - callback attribute clientList; - callback attribute partsList; - ram attribute featureMap; - callback attribute clusterRevision default = 1; - } - - server cluster ApplicationBasic { - ram attribute vendorName; - ram attribute vendorID; - ram attribute applicationName; - ram attribute productID; - callback attribute application; - ram attribute status; - ram attribute applicationVersion; - callback attribute allowedVendorList; + server cluster AccountLogin { ram attribute featureMap; ram attribute clusterRevision default = 1; } diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index 7203b5542d51fb..de91964662631c 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -7359,7 +7359,7 @@ }, { "name": "MA-videoplayer", - "deviceTypeName": "MA-videoplayer", + "deviceTypeName": "MA-casting-videoplayer", "deviceTypeCode": 35, "deviceTypeProfileId": 259, "clusters": [ @@ -10479,7 +10479,7 @@ }, { "name": "MA-contentapplication", - "deviceTypeName": "MA-contentapplication", + "deviceTypeName": "MA-contentapp", "deviceTypeCode": 36, "deviceTypeProfileId": 259, "clusters": [ @@ -10618,103 +10618,30 @@ ] }, { - "name": "Media Playback", - "code": 1286, + "name": "Binding", + "code": 30, "mfgCode": null, - "define": "MEDIA_PLAYBACK_CLUSTER", + "define": "BINDING_CLUSTER", "side": "client", "enabled": 0, - "commands": [ - { - "name": "Play", - "code": 0, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "Pause", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "StopPlayback", - "code": 2, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "StartOver", - "code": 3, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "Previous", - "code": 4, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "Next", - "code": 5, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "Rewind", - "code": 6, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "FastForward", - "code": 7, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, - { - "name": "SkipForward", - "code": 8, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, + "commands": [], + "attributes": [ { - "name": "SkipBackward", - "code": 9, + "name": "FeatureMap", + "code": 65532, "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 + "side": "client", + "type": "bitmap32", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 }, - { - "name": "Seek", - "code": 11, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ], - "attributes": [ { "name": "ClusterRevision", "code": 65533, @@ -10727,140 +10654,35 @@ "bounded": 0, "defaultValue": "1", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 } ] }, { - "name": "Media Playback", - "code": 1286, + "name": "Binding", + "code": 30, "mfgCode": null, - "define": "MEDIA_PLAYBACK_CLUSTER", + "define": "BINDING_CLUSTER", "side": "server", - "enabled": 1, - "commands": [ - { - "name": "PlaybackResponse", - "code": 10, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - } - ], + "enabled": 0, + "commands": [], "attributes": [ { - "name": "CurrentState", + "name": "Binding", "code": 0, "mfgCode": null, "side": "server", - "type": "PlaybackStateEnum", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "StartTime", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "epoch_us", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0xFF", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "Duration", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "int64u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "SampledPosition", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "PlaybackPosition", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": null, - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "PlaybackSpeed", - "code": 4, - "mfgCode": null, - "side": "server", - "type": "single", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "SeekRangeEnd", - "code": 5, - "mfgCode": null, - "side": "server", - "type": "int64u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "SeekRangeStart", - "code": 6, - "mfgCode": null, - "side": "server", - "type": "int64u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { @@ -10869,7 +10691,7 @@ "mfgCode": null, "side": "server", "type": "array", - "included": 0, + "included": 1, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -10885,7 +10707,7 @@ "mfgCode": null, "side": "server", "type": "array", - "included": 0, + "included": 1, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -10901,7 +10723,7 @@ "mfgCode": null, "side": "server", "type": "array", - "included": 0, + "included": 1, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -10921,7 +10743,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0003", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -10939,31 +10761,39 @@ "bounded": 0, "defaultValue": "1", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 } ] }, { - "name": "Content Launcher", - "code": 1290, + "name": "Channel", + "code": 1284, "mfgCode": null, - "define": "CONTENT_LAUNCH_CLUSTER", + "define": "CHANNEL_CLUSTER", "side": "client", "enabled": 0, "commands": [ { - "name": "LaunchContent", + "name": "ChangeChannel", "code": 0, "mfgCode": null, "source": "client", "incoming": 1, + "outgoing": 0 + }, + { + "name": "ChangeChannelByNumber", + "code": 2, + "mfgCode": null, + "source": "client", + "incoming": 1, "outgoing": 1 }, { - "name": "LaunchURL", - "code": 1, + "name": "SkipChannel", + "code": 3, "mfgCode": null, "source": "client", "incoming": 1, @@ -10971,6 +10801,22 @@ } ], "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "type": "bitmap32", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -10983,23 +10829,23 @@ "bounded": 0, "defaultValue": "1", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 } ] }, { - "name": "Content Launcher", - "code": 1290, + "name": "Channel", + "code": 1284, "mfgCode": null, - "define": "CONTENT_LAUNCH_CLUSTER", + "define": "CHANNEL_CLUSTER", "side": "server", "enabled": 1, "commands": [ { - "name": "LaunchResponse", - "code": 2, + "name": "ChangeChannelResponse", + "code": 1, "mfgCode": null, "source": "server", "incoming": 0, @@ -11008,35 +10854,51 @@ ], "attributes": [ { - "name": "AcceptHeader", + "name": "ChannelList", "code": 0, "mfgCode": null, "side": "server", "type": "array", - "included": 1, + "included": 0, "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "SupportedStreamingProtocols", + "name": "Lineup", "code": 1, "mfgCode": null, "side": "server", - "type": "bitmap32", - "included": 1, + "type": "LineupInfo", + "included": 0, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0x0", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "CurrentChannel", + "code": 2, + "mfgCode": null, + "side": "server", + "type": "ChannelInfo", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { @@ -11045,7 +10907,7 @@ "mfgCode": null, "side": "server", "type": "array", - "included": 0, + "included": 1, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -11061,7 +10923,7 @@ "mfgCode": null, "side": "server", "type": "array", - "included": 0, + "included": 1, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -11077,7 +10939,7 @@ "mfgCode": null, "side": "server", "type": "array", - "included": 0, + "included": 1, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -11097,7 +10959,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x0003", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -11115,118 +10977,88 @@ "bounded": 0, "defaultValue": "1", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 } ] }, { - "name": "Application Basic", - "code": 1293, + "name": "Target Navigator", + "code": 1285, "mfgCode": null, - "define": "APPLICATION_BASIC_CLUSTER", + "define": "TARGET_NAVIGATOR_CLUSTER", "side": "client", "enabled": 0, - "commands": [], - "attributes": [ + "commands": [ { - "name": "ClusterRevision", - "code": 65533, + "name": "NavigateTarget", + "code": 0, "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 + "source": "client", + "incoming": 1, + "outgoing": 1 } - ] - }, - { - "name": "Application Basic", - "code": 1293, - "mfgCode": null, - "define": "APPLICATION_BASIC_CLUSTER", - "side": "server", - "enabled": 1, - "commands": [], + ], "attributes": [ { - "name": "VendorName", - "code": 0, + "name": "FeatureMap", + "code": 65532, "mfgCode": null, - "side": "server", - "type": "char_string", + "side": "client", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "VendorID", - "code": 1, + "name": "ClusterRevision", + "code": 65533, "mfgCode": null, - "side": "server", + "side": "client", "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "ApplicationName", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", + "defaultValue": "1", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 - }, + } + ] + }, + { + "name": "Target Navigator", + "code": 1285, + "mfgCode": null, + "define": "TARGET_NAVIGATOR_CLUSTER", + "side": "server", + "enabled": 1, + "commands": [ { - "name": "ProductID", - "code": 3, + "name": "NavigateTargetResponse", + "code": 1, "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x00", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, + "source": "server", + "incoming": 1, + "outgoing": 1 + } + ], + "attributes": [ { - "name": "Application", - "code": 4, + "name": "TargetList", + "code": 0, "mfgCode": null, "side": "server", - "type": "ApplicationBasicApplication", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -11238,40 +11070,40 @@ "reportableChange": 0 }, { - "name": "Status", - "code": 5, + "name": "CurrentTarget", + "code": 1, "mfgCode": null, "side": "server", - "type": "ApplicationStatusEnum", - "included": 1, + "type": "int8u", + "included": 0, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ApplicationVersion", - "code": 6, + "name": "GeneratedCommandList", + "code": 65528, "mfgCode": null, "side": "server", - "type": "char_string", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "AllowedVendorList", - "code": 7, + "name": "AcceptedCommandList", + "code": 65529, "mfgCode": null, "side": "server", "type": "array", @@ -11291,7 +11123,7 @@ "mfgCode": null, "side": "server", "type": "array", - "included": 0, + "included": 1, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -11329,22 +11161,22 @@ "bounded": 0, "defaultValue": "1", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 } ] }, { - "name": "Account Login", - "code": 1294, + "name": "Media Playback", + "code": 1286, "mfgCode": null, - "define": "ACCOUNT_LOGIN_CLUSTER", + "define": "MEDIA_PLAYBACK_CLUSTER", "side": "client", "enabled": 0, "commands": [ { - "name": "GetSetupPIN", + "name": "Play", "code": 0, "mfgCode": null, "source": "client", @@ -11352,19 +11184,83 @@ "outgoing": 1 }, { - "name": "Login", + "name": "Pause", + "code": 1, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "StopPlayback", "code": 2, "mfgCode": null, "source": "client", "incoming": 1, - "outgoing": 0 + "outgoing": 1 }, { - "name": "Logout", + "name": "StartOver", "code": 3, "mfgCode": null, "source": "client", "incoming": 1, + "outgoing": 1 + }, + { + "name": "Previous", + "code": 4, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "Next", + "code": 5, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "Rewind", + "code": 6, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "FastForward", + "code": 7, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "SkipForward", + "code": 8, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "SkipBackward", + "code": 9, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "Seek", + "code": 11, + "mfgCode": null, + "source": "client", + "incoming": 1, "outgoing": 0 } ], @@ -11388,16 +11284,16 @@ ] }, { - "name": "Account Login", - "code": 1294, + "name": "Media Playback", + "code": 1286, "mfgCode": null, - "define": "ACCOUNT_LOGIN_CLUSTER", + "define": "MEDIA_PLAYBACK_CLUSTER", "side": "server", "enabled": 1, "commands": [ { - "name": "GetSetupPINResponse", - "code": 1, + "name": "PlaybackResponse", + "code": 10, "mfgCode": null, "source": "server", "incoming": 0, @@ -11406,122 +11302,124 @@ ], "attributes": [ { - "name": "AttributeList", - "code": 65531, + "name": "CurrentState", + "code": 0, "mfgCode": null, "side": "server", - "type": "array", - "included": 0, - "storageOption": "External", + "type": "PlaybackStateEnum", + "included": 1, + "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0x00", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "FeatureMap", - "code": 65532, + "name": "StartTime", + "code": 1, "mfgCode": null, "side": "server", - "type": "bitmap32", + "type": "epoch_us", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "0xFF", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "ClusterRevision", - "code": 65533, + "name": "Duration", + "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "int64u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "", "reportable": 1, "minInterval": 0, "maxInterval": 65344, "reportableChange": 0 - } - ] - } - ] - }, - { - "name": "MA-contentapplication", - "deviceTypeName": "MA-contentapplication", - "deviceTypeCode": 36, - "deviceTypeProfileId": 259, - "clusters": [ - { - "name": "Descriptor", - "code": 29, - "mfgCode": null, - "define": "DESCRIPTOR_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [], - "attributes": [ + }, { - "name": "ClusterRevision", - "code": 65533, + "name": "SampledPosition", + "code": 3, "mfgCode": null, - "side": "client", - "type": "int16u", + "side": "server", + "type": "PlaybackPosition", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": null, + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + }, + { + "name": "PlaybackSpeed", + "code": 4, + "mfgCode": null, + "side": "server", + "type": "single", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 - } - ] - }, - { - "name": "Descriptor", - "code": 29, - "mfgCode": null, - "define": "DESCRIPTOR_CLUSTER", - "side": "server", - "enabled": 1, - "commands": [], - "attributes": [ + }, { - "name": "device list", - "code": 0, + "name": "SeekRangeEnd", + "code": 5, "mfgCode": null, "side": "server", - "type": "array", + "type": "int64u", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "server list", - "code": 1, + "name": "SeekRangeStart", + "code": 6, "mfgCode": null, "side": "server", - "type": "array", + "type": "int64u", "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + }, + { + "name": "GeneratedCommandList", + "code": 65528, + "mfgCode": null, + "side": "server", + "type": "array", + "included": 0, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -11531,13 +11429,13 @@ "maxInterval": 65534, "reportableChange": 0 }, - { - "name": "client list", - "code": 2, + { + "name": "AcceptedCommandList", + "code": 65529, "mfgCode": null, "side": "server", "type": "array", - "included": 1, + "included": 0, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -11548,12 +11446,12 @@ "reportableChange": 0 }, { - "name": "parts list", - "code": 3, + "name": "AttributeList", + "code": 65531, "mfgCode": null, "side": "server", "type": "array", - "included": 1, + "included": 0, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -11573,7 +11471,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "0x0003", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -11586,43 +11484,51 @@ "side": "server", "type": "int16u", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "1", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 } ] }, { - "name": "Content Launcher", - "code": 1290, + "name": "Keypad Input", + "code": 1289, "mfgCode": null, - "define": "CONTENT_LAUNCH_CLUSTER", + "define": "KEYPAD_INPUT_CLUSTER", "side": "client", "enabled": 0, "commands": [ { - "name": "LaunchContent", + "name": "SendKey", "code": 0, "mfgCode": null, "source": "client", "incoming": 1, "outgoing": 1 - }, - { - "name": "LaunchURL", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 } ], "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "type": "bitmap32", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -11635,33 +11541,33 @@ "bounded": 0, "defaultValue": "1", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 } ] }, { - "name": "Content Launcher", - "code": 1290, + "name": "Keypad Input", + "code": 1289, "mfgCode": null, - "define": "CONTENT_LAUNCH_CLUSTER", + "define": "KEYPAD_INPUT_CLUSTER", "side": "server", "enabled": 1, "commands": [ { - "name": "LaunchResponse", - "code": 2, + "name": "SendKeyResponse", + "code": 1, "mfgCode": null, "source": "server", - "incoming": 0, + "incoming": 1, "outgoing": 1 } ], "attributes": [ { - "name": "AcceptHeader", - "code": 0, + "name": "GeneratedCommandList", + "code": 65528, "mfgCode": null, "side": "server", "type": "array", @@ -11671,24 +11577,24 @@ "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "SupportedStreamingProtocols", - "code": 1, + "name": "AcceptedCommandList", + "code": 65529, "mfgCode": null, "side": "server", - "type": "bitmap32", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { @@ -11697,7 +11603,7 @@ "mfgCode": null, "side": "server", "type": "array", - "included": 0, + "included": 1, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -11735,20 +11641,37 @@ "bounded": 0, "defaultValue": "1", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 } ] }, { - "name": "Application Basic", - "code": 1293, + "name": "Content Launcher", + "code": 1290, "mfgCode": null, - "define": "APPLICATION_BASIC_CLUSTER", + "define": "CONTENT_LAUNCH_CLUSTER", "side": "client", "enabled": 0, - "commands": [], + "commands": [ + { + "name": "LaunchContent", + "code": 0, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "LaunchURL", + "code": 1, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + } + ], "attributes": [ { "name": "ClusterRevision", @@ -11769,22 +11692,31 @@ ] }, { - "name": "Application Basic", - "code": 1293, + "name": "Content Launcher", + "code": 1290, "mfgCode": null, - "define": "APPLICATION_BASIC_CLUSTER", + "define": "CONTENT_LAUNCH_CLUSTER", "side": "server", "enabled": 1, - "commands": [], + "commands": [ + { + "name": "LaunchResponse", + "code": 2, + "mfgCode": null, + "source": "server", + "incoming": 0, + "outgoing": 1 + } + ], "attributes": [ { - "name": "VendorName", + "name": "AcceptHeader", "code": 0, "mfgCode": null, "side": "server", - "type": "char_string", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -11794,11 +11726,11 @@ "reportableChange": 0 }, { - "name": "VendorID", + "name": "SupportedStreamingProtocols", "code": 1, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -11810,44 +11742,44 @@ "reportableChange": 0 }, { - "name": "ApplicationName", - "code": 2, + "name": "GeneratedCommandList", + "code": 65528, "mfgCode": null, "side": "server", - "type": "char_string", - "included": 1, - "storageOption": "RAM", + "type": "array", + "included": 0, + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ProductID", - "code": 3, + "name": "AcceptedCommandList", + "code": 65529, "mfgCode": null, "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", + "type": "array", + "included": 0, + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "Application", - "code": 4, + "name": "AttributeList", + "code": 65531, "mfgCode": null, "side": "server", - "type": "ApplicationBasicApplication", - "included": 1, + "type": "array", + "included": 0, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -11858,74 +11790,78 @@ "reportableChange": 0 }, { - "name": "Status", - "code": 5, + "name": "FeatureMap", + "code": 65532, "mfgCode": null, "side": "server", - "type": "ApplicationStatusEnum", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0x0003", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ApplicationVersion", - "code": 6, + "name": "ClusterRevision", + "code": 65533, "mfgCode": null, "side": "server", - "type": "char_string", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "1", "reportable": 1, "minInterval": 0, "maxInterval": 65344, "reportableChange": 0 - }, + } + ] + }, + { + "name": "Application Launcher", + "code": 1292, + "mfgCode": null, + "define": "APPLICATION_LAUNCHER_CLUSTER", + "side": "client", + "enabled": 0, + "commands": [ { - "name": "AllowedVendorList", - "code": 7, + "name": "LaunchApp", + "code": 0, "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 + "source": "client", + "incoming": 1, + "outgoing": 1 }, { - "name": "AttributeList", - "code": 65531, + "name": "StopApp", + "code": 1, "mfgCode": null, - "side": "server", - "type": "array", - "included": 0, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 + "source": "client", + "incoming": 1, + "outgoing": 1 }, + { + "name": "HideApp", + "code": 2, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + } + ], + "attributes": [ { "name": "FeatureMap", "code": 65532, "mfgCode": null, - "side": "server", + "side": "client", "type": "bitmap32", "included": 1, "storageOption": "RAM", @@ -11937,41 +11873,6 @@ "maxInterval": 65534, "reportableChange": 0 }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - } - ] - }, - { - "name": "MA-contentapplication", - "deviceTypeName": "MA-contentapplication", - "deviceTypeCode": 36, - "deviceTypeProfileId": 259, - "clusters": [ - { - "name": "Descriptor", - "code": 29, - "mfgCode": null, - "define": "DESCRIPTOR_CLUSTER", - "side": "client", - "enabled": 0, - "commands": [], - "attributes": [ { "name": "ClusterRevision", "code": 65533, @@ -11991,21 +11892,30 @@ ] }, { - "name": "Descriptor", - "code": 29, + "name": "Application Launcher", + "code": 1292, "mfgCode": null, - "define": "DESCRIPTOR_CLUSTER", + "define": "APPLICATION_LAUNCHER_CLUSTER", "side": "server", "enabled": 1, - "commands": [], + "commands": [ + { + "name": "LauncherResponse", + "code": 3, + "mfgCode": null, + "source": "server", + "incoming": 1, + "outgoing": 1 + } + ], "attributes": [ { - "name": "device list", + "name": "CatalogList", "code": 0, "mfgCode": null, "side": "server", "type": "array", - "included": 1, + "included": 0, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -12016,10 +11926,26 @@ "reportableChange": 0 }, { - "name": "server list", + "name": "CurrentApp", "code": 1, "mfgCode": null, "side": "server", + "type": "ApplicationEP", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "GeneratedCommandList", + "code": 65528, + "mfgCode": null, + "side": "server", "type": "array", "included": 1, "storageOption": "External", @@ -12032,8 +11958,8 @@ "reportableChange": 0 }, { - "name": "client list", - "code": 2, + "name": "AcceptedCommandList", + "code": 65529, "mfgCode": null, "side": "server", "type": "array", @@ -12048,8 +11974,8 @@ "reportableChange": 0 }, { - "name": "parts list", - "code": 3, + "name": "AttributeList", + "code": 65531, "mfgCode": null, "side": "server", "type": "array", @@ -12086,7 +12012,7 @@ "side": "server", "type": "int16u", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "1", @@ -12191,7 +12117,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0x00", "reportable": 1, "minInterval": 0, "maxInterval": 65344, @@ -12207,7 +12133,7 @@ "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x00", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -12261,6 +12187,158 @@ "maxInterval": 65534, "reportableChange": 0 }, + { + "name": "GeneratedCommandList", + "code": 65528, + "mfgCode": null, + "side": "server", + "type": "array", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "AcceptedCommandList", + "code": 65529, + "mfgCode": null, + "side": "server", + "type": "array", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "AttributeList", + "code": 65531, + "mfgCode": null, + "side": "server", + "type": "array", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "type": "bitmap32", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ClusterRevision", + "code": 65533, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "1", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + } + ] + }, + { + "name": "Account Login", + "code": 1294, + "mfgCode": null, + "define": "ACCOUNT_LOGIN_CLUSTER", + "side": "client", + "enabled": 0, + "commands": [ + { + "name": "GetSetupPIN", + "code": 0, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 1 + }, + { + "name": "Login", + "code": 2, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 + }, + { + "name": "Logout", + "code": 3, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 + } + ], + "attributes": [ + { + "name": "ClusterRevision", + "code": 65533, + "mfgCode": null, + "side": "client", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "1", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + } + ] + }, + { + "name": "Account Login", + "code": 1294, + "mfgCode": null, + "define": "ACCOUNT_LOGIN_CLUSTER", + "side": "server", + "enabled": 1, + "commands": [ + { + "name": "GetSetupPINResponse", + "code": 1, + "mfgCode": null, + "source": "server", + "incoming": 0, + "outgoing": 1 + } + ], + "attributes": [ { "name": "AttributeList", "code": 65531, @@ -12350,24 +12428,6 @@ "networkId": 0, "endpointVersion": 1, "deviceIdentifier": 36 - }, - { - "endpointTypeName": "MA-contentapplication", - "endpointTypeIndex": 4, - "profileId": 259, - "endpointId": 4, - "networkId": 0, - "endpointVersion": 1, - "deviceIdentifier": 36 - }, - { - "endpointTypeName": "MA-contentapplication", - "endpointTypeIndex": 5, - "profileId": 259, - "endpointId": 5, - "networkId": 0, - "endpointVersion": 1, - "deviceIdentifier": 36 } ], "log": [] 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 402bd1f634d6a6..36ffc95d2f7deb 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 @@ -1954,9 +1954,9 @@ limitations under the License. - MA-videoplayer + MA-casting-videoplayer CHIP - Matter Video Player + Matter Casting Video Player 0x0103 0x0023 @@ -1990,6 +1990,44 @@ limitations under the License. + + + MA-basic-videoplayer + CHIP + Matter Basic Video Player + 0x0103 + 0x0028 + + + IDENTIFY_TIME + IDENTIFY_TYPE + Identify + IdentifyQuery + TriggerEffect + + + DEVICE_TYPE_LIST + SERVER_LIST + CLIENT_LIST + PARTS_LIST + + + BINDING + + + + + + + + + + + + + + + MA-speaker CHIP @@ -2018,9 +2056,9 @@ limitations under the License. - MA-contentapplication + MA-contentapp CHIP - Matter Content Application + Matter Content App 0x0103 0x0024 @@ -2047,7 +2085,7 @@ limitations under the License. - + diff --git a/zzz_generated/tv-app/zap-generated/endpoint_config.h b/zzz_generated/tv-app/zap-generated/endpoint_config.h index 7137dac09e8e24..4c2e573255fe61 100644 --- a/zzz_generated/tv-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-app/zap-generated/endpoint_config.h @@ -146,7 +146,7 @@ #define ZAP_ATTRIBUTE_MASK(mask) ATTRIBUTE_MASK_##mask // This is an array of EmberAfAttributeMetadata structures. -#define GENERATED_ATTRIBUTE_COUNT 351 +#define GENERATED_ATTRIBUTE_COUNT 324 #define GENERATED_ATTRIBUTES \ { \ \ @@ -627,6 +627,15 @@ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \ \ + /* Endpoint: 3, Cluster: Channel (server) */ \ + { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ + { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ + \ + /* Endpoint: 3, Cluster: Target Navigator (server) */ \ + { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* TargetList */ \ + { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ + { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ + \ /* Endpoint: 3, Cluster: Media Playback (server) */ \ { 0x00000000, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* CurrentState */ \ { 0x00000001, ZAP_TYPE(EPOCH_US), 8, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_LONG_DEFAULTS_INDEX(46) }, /* StartTime */ \ @@ -639,6 +648,10 @@ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0x0003) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ + /* Endpoint: 3, Cluster: Keypad Input (server) */ \ + { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ + { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ + \ /* Endpoint: 3, Cluster: Content Launcher (server) */ \ { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* AcceptHeader */ \ { 0x00000001, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), \ @@ -646,6 +659,10 @@ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0x0003) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ + /* Endpoint: 3, Cluster: Application Launcher (server) */ \ + { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ + { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ + \ /* Endpoint: 3, Cluster: Application Basic (server) */ \ { 0x00000000, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* VendorName */ \ { 0x00000001, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* VendorID */ \ @@ -661,53 +678,6 @@ /* Endpoint: 3, Cluster: Account Login (server) */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ - \ - /* Endpoint: 4, Cluster: Descriptor (server) */ \ - { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* device list */ \ - { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* server list */ \ - { 0x00000002, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* client list */ \ - { 0x00000003, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* parts list */ \ - { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ - { 0x0000FFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \ - \ - /* Endpoint: 4, Cluster: Content Launcher (server) */ \ - { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* AcceptHeader */ \ - { 0x00000001, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(WRITABLE), \ - ZAP_EMPTY_DEFAULT() }, /* SupportedStreamingProtocols */ \ - { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ - { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ - \ - /* Endpoint: 4, Cluster: Application Basic (server) */ \ - { 0x00000000, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* VendorName */ \ - { 0x00000001, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* VendorID */ \ - { 0x00000002, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* ApplicationName */ \ - { 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* ProductID */ \ - { 0x00000004, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* Application */ \ - { 0x00000005, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Status */ \ - { 0x00000006, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* ApplicationVersion */ \ - { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* AllowedVendorList */ \ - { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ - { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ - \ - /* Endpoint: 5, Cluster: Descriptor (server) */ \ - { 0x00000000, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* device list */ \ - { 0x00000001, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* server list */ \ - { 0x00000002, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* client list */ \ - { 0x00000003, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* parts list */ \ - { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ - { 0x0000FFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \ - \ - /* Endpoint: 5, Cluster: Application Basic (server) */ \ - { 0x00000000, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* VendorName */ \ - { 0x00000001, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* VendorID */ \ - { 0x00000002, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* ApplicationName */ \ - { 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* ProductID */ \ - { 0x00000004, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* Application */ \ - { 0x00000005, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Status */ \ - { 0x00000006, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* ApplicationVersion */ \ - { 0x00000007, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* AllowedVendorList */ \ - { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ - { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ } // This is an array of EmberAfCluster structures. @@ -917,8 +887,24 @@ 0x00000006 /* StepWithOnOff */, \ 0x00000007 /* StopWithOnOff */, \ chip::kInvalidCommandId /* end of list */, \ - /* Endpoint: 3, Cluster: Media Playback (server) */\ + /* Endpoint: 3, Cluster: Channel (server) */\ /* AcceptedCommandList (index=126) */ \ + 0x00000000 /* ChangeChannel */, \ + 0x00000002 /* ChangeChannelByNumber */, \ + 0x00000003 /* SkipChannel */, \ + chip::kInvalidCommandId /* end of list */, \ + /* GeneratedCommandList (index=130)*/ \ + 0x00000001 /* ChangeChannelResponse */, \ + chip::kInvalidCommandId /* end of list */, \ + /* Endpoint: 3, Cluster: Target Navigator (server) */\ + /* AcceptedCommandList (index=132) */ \ + 0x00000000 /* NavigateTarget */, \ + chip::kInvalidCommandId /* end of list */, \ + /* GeneratedCommandList (index=134)*/ \ + 0x00000001 /* NavigateTargetResponse */, \ + chip::kInvalidCommandId /* end of list */, \ + /* Endpoint: 3, Cluster: Media Playback (server) */\ + /* AcceptedCommandList (index=136) */ \ 0x00000000 /* Play */, \ 0x00000001 /* Pause */, \ 0x00000002 /* StopPlayback */, \ @@ -931,40 +917,48 @@ 0x00000009 /* SkipBackward */, \ 0x0000000B /* Seek */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=138)*/ \ + /* GeneratedCommandList (index=148)*/ \ 0x0000000A /* PlaybackResponse */, \ chip::kInvalidCommandId /* end of list */, \ + /* Endpoint: 3, Cluster: Keypad Input (server) */\ + /* AcceptedCommandList (index=150) */ \ + 0x00000000 /* SendKey */, \ + chip::kInvalidCommandId /* end of list */, \ + /* GeneratedCommandList (index=152)*/ \ + 0x00000001 /* SendKeyResponse */, \ + chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 3, Cluster: Content Launcher (server) */\ - /* AcceptedCommandList (index=140) */ \ + /* AcceptedCommandList (index=154) */ \ 0x00000000 /* LaunchContent */, \ 0x00000001 /* LaunchURL */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=143)*/ \ + /* GeneratedCommandList (index=157)*/ \ 0x00000002 /* LaunchResponse */, \ chip::kInvalidCommandId /* end of list */, \ + /* Endpoint: 3, Cluster: Application Launcher (server) */\ + /* AcceptedCommandList (index=159) */ \ + 0x00000000 /* LaunchApp */, \ + 0x00000001 /* StopApp */, \ + 0x00000002 /* HideApp */, \ + chip::kInvalidCommandId /* end of list */, \ + /* GeneratedCommandList (index=163)*/ \ + 0x00000003 /* LauncherResponse */, \ + chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 3, Cluster: Account Login (server) */\ - /* AcceptedCommandList (index=145) */ \ + /* AcceptedCommandList (index=165) */ \ 0x00000000 /* GetSetupPIN */, \ 0x00000002 /* Login */, \ 0x00000003 /* Logout */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=149)*/ \ + /* GeneratedCommandList (index=169)*/ \ 0x00000001 /* GetSetupPINResponse */, \ chip::kInvalidCommandId /* end of list */, \ - /* Endpoint: 4, Cluster: Content Launcher (server) */\ - /* AcceptedCommandList (index=151) */ \ - 0x00000000 /* LaunchContent */, \ - 0x00000001 /* LaunchURL */, \ - chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=154)*/ \ - 0x00000002 /* LaunchResponse */, \ - chip::kInvalidCommandId /* end of list */, \ } // clang-format on #define ZAP_CLUSTER_MASK(mask) CLUSTER_MASK_##mask -#define GENERATED_CLUSTER_COUNT 51 +#define GENERATED_CLUSTER_COUNT 50 // clang-format off #define GENERATED_CLUSTERS { \ @@ -1431,103 +1425,92 @@ .generatedCommandList = nullptr ,\ },\ { \ - /* Endpoint: 3, Cluster: Media Playback (server) */ \ - .clusterId = 0x00000506, \ + /* Endpoint: 3, Cluster: Channel (server) */ \ + .clusterId = 0x00000504, \ .attributes = ZAP_ATTRIBUTE_INDEX(290), \ - .attributeCount = 9, \ - .clusterSize = 43, \ + .attributeCount = 2, \ + .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 126 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 138 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 130 ) ,\ },\ { \ - /* Endpoint: 3, Cluster: Content Launcher (server) */ \ - .clusterId = 0x0000050A, \ - .attributes = ZAP_ATTRIBUTE_INDEX(299), \ - .attributeCount = 4, \ - .clusterSize = 10, \ + /* Endpoint: 3, Cluster: Target Navigator (server) */ \ + .clusterId = 0x00000505, \ + .attributes = ZAP_ATTRIBUTE_INDEX(292), \ + .attributeCount = 3, \ + .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 140 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 143 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 132 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 134 ) ,\ },\ { \ - /* Endpoint: 3, Cluster: Application Basic (server) */ \ - .clusterId = 0x0000050D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(303), \ - .attributeCount = 10, \ - .clusterSize = 110, \ + /* Endpoint: 3, Cluster: Media Playback (server) */ \ + .clusterId = 0x00000506, \ + .attributes = ZAP_ATTRIBUTE_INDEX(295), \ + .attributeCount = 9, \ + .clusterSize = 43, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 136 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 148 ) ,\ },\ { \ - /* Endpoint: 3, Cluster: Account Login (server) */ \ - .clusterId = 0x0000050E, \ - .attributes = ZAP_ATTRIBUTE_INDEX(313), \ + /* Endpoint: 3, Cluster: Keypad Input (server) */ \ + .clusterId = 0x00000509, \ + .attributes = ZAP_ATTRIBUTE_INDEX(304), \ .attributeCount = 2, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 145 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 149 ) ,\ - },\ - { \ - /* Endpoint: 4, Cluster: Descriptor (server) */ \ - .clusterId = 0x0000001D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(315), \ - .attributeCount = 6, \ - .clusterSize = 4, \ - .mask = ZAP_CLUSTER_MASK(SERVER), \ - .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 150 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 152 ) ,\ },\ { \ - /* Endpoint: 4, Cluster: Content Launcher (server) */ \ + /* Endpoint: 3, Cluster: Content Launcher (server) */ \ .clusterId = 0x0000050A, \ - .attributes = ZAP_ATTRIBUTE_INDEX(321), \ + .attributes = ZAP_ATTRIBUTE_INDEX(306), \ .attributeCount = 4, \ .clusterSize = 10, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 151 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 154 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 154 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 157 ) ,\ },\ { \ - /* Endpoint: 4, Cluster: Application Basic (server) */ \ - .clusterId = 0x0000050D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(325), \ - .attributeCount = 10, \ - .clusterSize = 110, \ + /* Endpoint: 3, Cluster: Application Launcher (server) */ \ + .clusterId = 0x0000050C, \ + .attributes = ZAP_ATTRIBUTE_INDEX(310), \ + .attributeCount = 2, \ + .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 159 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 163 ) ,\ },\ { \ - /* Endpoint: 5, Cluster: Descriptor (server) */ \ - .clusterId = 0x0000001D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(335), \ - .attributeCount = 6, \ - .clusterSize = 4, \ + /* Endpoint: 3, Cluster: Application Basic (server) */ \ + .clusterId = 0x0000050D, \ + .attributes = ZAP_ATTRIBUTE_INDEX(312), \ + .attributeCount = 10, \ + .clusterSize = 110, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ .acceptedCommandList = nullptr ,\ .generatedCommandList = nullptr ,\ },\ { \ - /* Endpoint: 5, Cluster: Application Basic (server) */ \ - .clusterId = 0x0000050D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(341), \ - .attributeCount = 10, \ - .clusterSize = 110, \ + /* Endpoint: 3, Cluster: Account Login (server) */ \ + .clusterId = 0x0000050E, \ + .attributes = ZAP_ATTRIBUTE_INDEX(322), \ + .attributeCount = 2, \ + .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = nullptr ,\ - .generatedCommandList = nullptr ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 165 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 169 ) ,\ },\ } @@ -1535,13 +1518,13 @@ #define ZAP_CLUSTER_INDEX(index) (&generatedClusters[index]) -#define ZAP_FIXED_ENDPOINT_DATA_VERSION_COUNT 47 +#define ZAP_FIXED_ENDPOINT_DATA_VERSION_COUNT 46 // This is an array of EmberAfEndpointType structures. #define GENERATED_ENDPOINT_TYPES \ { \ { ZAP_CLUSTER_INDEX(0), 26, 260 }, { ZAP_CLUSTER_INDEX(26), 12, 148 }, { ZAP_CLUSTER_INDEX(38), 3, 38 }, \ - { ZAP_CLUSTER_INDEX(41), 5, 173 }, { ZAP_CLUSTER_INDEX(46), 3, 124 }, { ZAP_CLUSTER_INDEX(49), 2, 114 }, \ + { ZAP_CLUSTER_INDEX(41), 9, 197 }, \ } // Largest attribute size is needed for various buffers @@ -1553,50 +1536,50 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, #define ATTRIBUTE_SINGLETONS_SIZE (37) // Total size of attribute storage -#define ATTRIBUTE_MAX_SIZE (857) +#define ATTRIBUTE_MAX_SIZE (643) // Number of fixed endpoints -#define FIXED_ENDPOINT_COUNT (6) +#define FIXED_ENDPOINT_COUNT (4) // Array of endpoints that are supported, the data inside // the array is the endpoint number. #define FIXED_ENDPOINT_ARRAY \ { \ - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005 \ + 0x0000, 0x0001, 0x0002, 0x0003 \ } // Array of profile ids #define FIXED_PROFILE_IDS \ { \ - 0x0103, 0x0103, 0x0103, 0x0103, 0x0103, 0x0103 \ + 0x0103, 0x0103, 0x0103, 0x0103 \ } // Array of device types #define FIXED_DEVICE_TYPES \ { \ - { 0x0016, 1 }, { 0x0023, 1 }, { 0x0022, 1 }, { 0x0024, 1 }, { 0x0024, 1 }, { 0x0024, 1 } \ + { 0x0016, 1 }, { 0x0023, 1 }, { 0x0022, 1 }, { 0x0024, 1 } \ } // Array of device type offsets #define FIXED_DEVICE_TYPE_OFFSETS \ { \ - 0, 1, 2, 3, 4, 5 \ + 0, 1, 2, 3 \ } // Array of device type lengths #define FIXED_DEVICE_TYPE_LENGTHS \ { \ - 1, 1, 1, 1, 1, 1 \ + 1, 1, 1, 1 \ } // Array of endpoint types supported on each endpoint #define FIXED_ENDPOINT_TYPES \ { \ - 0, 1, 2, 3, 4, 5 \ + 0, 1, 2, 3 \ } // Array of networks supported on each endpoint #define FIXED_NETWORKS \ { \ - 0, 0, 0, 0, 0, 0 \ + 0, 0, 0, 0 \ } diff --git a/zzz_generated/tv-app/zap-generated/gen_config.h b/zzz_generated/tv-app/zap-generated/gen_config.h index 6e62d2728760d0..af106c59ddae0e 100644 --- a/zzz_generated/tv-app/zap-generated/gen_config.h +++ b/zzz_generated/tv-app/zap-generated/gen_config.h @@ -31,7 +31,7 @@ /**** Cluster endpoint counts ****/ #define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (2) #define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (6) +#define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (4) #define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -58,16 +58,16 @@ #define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_WAKE_ON_LAN_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT (2) +#define EMBER_AF_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT (2) #define EMBER_AF_MEDIA_PLAYBACK_CLUSTER_SERVER_ENDPOINT_COUNT (2) #define EMBER_AF_MEDIA_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOW_POWER_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT (3) +#define EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (2) +#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT (2) #define EMBER_AF_AUDIO_OUTPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_APPLICATION_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (3) +#define EMBER_AF_APPLICATION_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT (2) +#define EMBER_AF_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_ACCOUNT_LOGIN_CLUSTER_SERVER_ENDPOINT_COUNT (1) /**** Cluster Plugins ****/