Skip to content

Commit

Permalink
Bringing tv-casting-app cluster definitions up to spec (#19656)
Browse files Browse the repository at this point in the history 
* Bringing tv-casting-app cluster definitions up to spec

* Removing Test cluster
  • Loading branch information
@sharadb-amazon
sharadb-amazon authored Jun 16, 2022
1 parent 0a90632 commit 26d6c54
Show file tree
Hide file tree
Showing 8 changed files with 1,548 additions and 2,837 deletions.
156 changes: 40 additions & 116 deletions examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,8 @@ server cluster EthernetNetworkDiagnostics = 55 {
readonly attribute int64u timeSinceReset = 8;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

command ResetCounts(): DefaultSuccess = 0;
}

server cluster FixedLabel = 64 {
Expand Down Expand Up @@ -716,10 +718,44 @@ server cluster GroupKeyManagement = 63 {
fabric_idx fabricIndex = 254;
}

struct GroupKeySetStruct {
int16u groupKeySetID = 0;
GroupKeySecurityPolicy groupKeySecurityPolicy = 1;
nullable octet_string<16> epochKey0 = 2;
nullable epoch_us epochStartTime0 = 3;
nullable octet_string<16> epochKey1 = 4;
nullable epoch_us epochStartTime1 = 5;
nullable octet_string<16> epochKey2 = 6;
nullable epoch_us epochStartTime2 = 7;
}

attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
readonly attribute GroupInfoMapStruct groupTable[] = 1;
readonly attribute int16u maxGroupsPerFabric = 2;
readonly attribute int16u maxGroupKeysPerFabric = 3;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

request struct KeySetWriteRequest {
GroupKeySetStruct groupKeySet = 0;
}

request struct KeySetReadRequest {
INT16U groupKeySetID = 0;
}

request struct KeySetRemoveRequest {
INT16U groupKeySetID = 0;
}

request struct KeySetReadAllIndicesRequest {
INT16U groupKeySetIDs[] = 0;
}

command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
}

server cluster Groups = 4 {
Expand Down Expand Up @@ -802,6 +838,7 @@ server cluster Identify = 3 {
}

attribute int16u identifyTime = 0;
readonly attribute enum8 identifyType = 1;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down Expand Up @@ -1787,97 +1824,6 @@ client cluster TargetNavigator = 1285 {
command NavigateTarget(NavigateTargetRequest): NavigateTargetResponse = 0;
}

server cluster TestCluster = 4294048773 {
enum SimpleEnum : ENUM8 {
kUnspecified = 0;
kValueA = 1;
kValueB = 2;
kValueC = 3;
}

bitmap Bitmap16MaskMap : BITMAP16 {
kMaskVal1 = 0x1;
kMaskVal2 = 0x2;
kMaskVal3 = 0x4;
kMaskVal4 = 0x4000;
}

bitmap Bitmap32MaskMap : BITMAP32 {
kMaskVal1 = 0x1;
kMaskVal2 = 0x2;
kMaskVal3 = 0x4;
kMaskVal4 = 0x40000000;
}

bitmap Bitmap64MaskMap : BITMAP64 {
kMaskVal1 = 0x1;
kMaskVal2 = 0x2;
kMaskVal3 = 0x4;
kMaskVal4 = 0x4000000000000000;
}

bitmap Bitmap8MaskMap : BITMAP8 {
kMaskVal1 = 0x1;
kMaskVal2 = 0x2;
kMaskVal3 = 0x4;
kMaskVal4 = 0x40;
}

bitmap SimpleBitmap : BITMAP8 {
kValueA = 0x1;
kValueB = 0x2;
kValueC = 0x4;
}

struct TestListStructOctet {
int64u member1 = 0;
octet_string<32> member2 = 1;
}

info event TestEvent = 1 {
INT8U arg1 = 1;
SimpleEnum arg2 = 2;
BOOLEAN arg3 = 3;
SimpleStruct arg4 = 4;
SimpleStruct arg5[] = 5;
SimpleEnum arg6[] = 6;
}

info event TestFabricScopedEvent = 2 {
fabric_idx arg1 = 254;
}

attribute boolean boolean = 0;
attribute Bitmap8MaskMap bitmap8 = 1;
attribute Bitmap16MaskMap bitmap16 = 2;
attribute Bitmap32MaskMap bitmap32 = 3;
attribute Bitmap64MaskMap bitmap64 = 4;
attribute int8u int8u = 5;
attribute int16u int16u = 6;
attribute int32u int32u = 8;
attribute int64u int64u = 12;
attribute int8s int8s = 13;
attribute int16s int16s = 14;
attribute int32s int32s = 16;
attribute int64s int64s = 20;
attribute enum8 enum8 = 21;
attribute enum16 enum16 = 22;
attribute octet_string<10> octetString = 25;
attribute INT8U listInt8u[] = 26;
attribute OCTET_STRING listOctetString[] = 27;
attribute TestListStructOctet listStructOctetString[] = 28;
attribute long_octet_string<1000> longOctetString = 29;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

response struct TestSpecificResponse = 0 {
INT8U returnValue = 0;
}

command Test(): DefaultSuccess = 0;
command TestNotHandled(): DefaultSuccess = 1;
}

server cluster ThreadNetworkDiagnostics = 53 {
enum NetworkFault : ENUM8 {
kUnspecified = 0;
Expand Down Expand Up @@ -2399,6 +2345,8 @@ endpoint 0 {
server cluster GroupKeyManagement {
callback attribute groupKeyMap;
callback attribute groupTable;
callback attribute maxGroupsPerFabric;
callback attribute maxGroupKeysPerFabric;
ram attribute featureMap;
ram attribute clusterRevision default = 1;
}
Expand Down Expand Up @@ -2433,6 +2381,7 @@ endpoint 1 {

server cluster Identify {
ram attribute identifyTime;
ram attribute identifyType;
ram attribute featureMap;
ram attribute clusterRevision default = 4;
}
Expand Down Expand Up @@ -2532,31 +2481,6 @@ endpoint 1 {
ram attribute featureMap;
ram attribute clusterRevision default = 1;
}

server cluster TestCluster {
ram attribute boolean;
ram attribute bitmap8;
ram attribute bitmap16;
ram attribute bitmap32;
ram attribute bitmap64;
ram attribute int8u;
ram attribute int16u;
ram attribute int32u;
ram attribute int64u;
ram attribute int8s;
ram attribute int16s;
ram attribute int32s;
ram attribute int64s;
ram attribute enum8;
ram attribute enum16;
ram attribute octetString;
callback attribute listInt8u;
callback attribute listOctetString;
callback attribute listStructOctetString;
ram attribute longOctetString;
ram attribute featureMap;
ram attribute clusterRevision default = 1;
}
}
endpoint 2 {
device type occupancysensor = 263;
Expand Down
Loading

0 comments on commit 26d6c54

Please sign in to comment.