Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Silabs] Remove ICDM cluster from lighting app #28522

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1914,53 +1914,6 @@ server cluster UserLabel = 65 {
readonly attribute int16u clusterRevision = 65533;
}

/** Allows servers to ensure that listed clients are notified when a server is available for communication. */
server cluster IcdManagement = 70 {
bitmap Feature : BITMAP32 {
kCheckInProtocolSupport = 0x1;
}

fabric_scoped struct MonitoringRegistrationStruct {
fabric_sensitive node_id checkInNodeID = 1;
fabric_sensitive int64u monitoredSubject = 2;
fabric_sensitive octet_string<16> key = 3;
fabric_idx fabricIndex = 254;
}

readonly attribute int32u idleModeInterval = 0;
readonly attribute int32u activeModeInterval = 1;
readonly attribute int16u activeModeThreshold = 2;
readonly attribute access(read: administer) MonitoringRegistrationStruct registeredClients[] = 3;
readonly attribute access(read: administer) int32u ICDCounter = 4;
readonly attribute int16u clientsSupportedPerFabric = 5;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

request struct RegisterClientRequest {
node_id checkInNodeID = 0;
INT64U monitoredSubject = 1;
OCTET_STRING<16> key = 2;
optional OCTET_STRING<16> verificationKey = 3;
}

request struct UnregisterClientRequest {
node_id checkInNodeID = 0;
optional OCTET_STRING<16> verificationKey = 1;
}

response struct RegisterClientResponse = 1 {
INT32U ICDCounter = 0;
}

fabric command access(invoke: manage) RegisterClient(RegisterClientRequest): RegisterClientResponse = 0;
fabric command access(invoke: manage) UnregisterClient(UnregisterClientRequest): DefaultSuccess = 2;
command access(invoke: manage) StayActiveRequest(): DefaultSuccess = 3;
}

/** Attributes and commands for controlling the color properties of a color-capable light. */
server cluster ColorControl = 768 {
enum ColorLoopAction : ENUM8 {
Expand Down Expand Up @@ -2463,20 +2416,6 @@ endpoint 0 {
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
}

server cluster IcdManagement {
callback attribute idleModeInterval default = 500;
callback attribute activeModeInterval default = 300;
callback attribute activeModeThreshold default = 300;
callback attribute registeredClients;
callback attribute ICDCounter;
callback attribute clientsSupportedPerFabric default = 1;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 1;
ram attribute clusterRevision default = 1;
}
}
endpoint 1 {
device type dimmablelight = 257, version 1;
Expand Down
62 changes: 55 additions & 7 deletions examples/lighting-app/silabs/data_model/lighting-thread-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,33 @@
],
"endpointTypes": [
{
"id": 1,
"name": "MA-rootdevice",
"deviceTypeRef": {
"id": 2,
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
"name": "MA-rootdevice"
},
"deviceTypes": [
{
"id": 2,
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
"name": "MA-rootdevice"
}
],
"deviceTypeRefs": [
2
],
"deviceVersions": [
1
],
"deviceIdentifiers": [
22
],
"deviceTypeName": "MA-rootdevice",
"deviceTypeCode": 22,
"deviceTypeProfileId": 259,
Expand Down Expand Up @@ -5555,7 +5581,7 @@
"mfgCode": null,
"define": "ICD_MANAGEMENT_CLUSTER",
"side": "server",
"enabled": 1,
"enabled": 0,
"commands": [
{
"name": "RegisterClientResponse",
Expand Down Expand Up @@ -5764,7 +5790,33 @@
]
},
{
"id": 2,
"name": "MA-dimmablelight",
"deviceTypeRef": {
"id": 9,
"code": 257,
"profileId": 259,
"label": "MA-dimmablelight",
"name": "MA-dimmablelight"
},
"deviceTypes": [
{
"id": 9,
"code": 257,
"profileId": 259,
"label": "MA-dimmablelight",
"name": "MA-dimmablelight"
}
],
"deviceTypeRefs": [
9
],
"deviceVersions": [
1
],
"deviceIdentifiers": [
257
],
"deviceTypeName": "MA-dimmablelight",
"deviceTypeCode": 257,
"deviceTypeProfileId": 259,
Expand Down Expand Up @@ -9103,18 +9155,14 @@
"endpointTypeIndex": 0,
"profileId": 259,
"endpointId": 0,
"networkId": 0,
"endpointVersion": 1,
"deviceIdentifier": 22
"networkId": 0
},
{
"endpointTypeName": "MA-dimmablelight",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
"networkId": 0,
"endpointVersion": 1,
"deviceIdentifier": 257
"networkId": 0
}
],
"log": []
Expand Down
Loading