Skip to content

Commit

Permalink
Update tv.zap & matter-devices.xml to align them with spec (#20918)
Browse files Browse the repository at this point in the history 
* Update tv.zap & xml to align per spec

* update per issue

* Remove binding cluster from endpoint 3
  • Loading branch information
@lazarkov @pull
lazarkov authored and pull[bot] committed Sep 28, 2023
1 parent 538ddba commit 1750368
Show file tree
Hide file tree
Showing 5 changed files with 872 additions and 793 deletions.
106 changes: 52 additions & 54 deletions examples/tv-app/tv-common/tv-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -1839,13 +1845,20 @@ 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;

request struct SendKeyRequest {
CecKeyCode keyCode = 0;
}

response struct SendKeyResponse = 1 {
KeypadInputStatusEnum status = 0;
}

command SendKey(SendKeyRequest): SendKeyResponse = 0;
}

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand Down
Loading

0 comments on commit 1750368

Please sign in to comment.