Skip to content

Commit

Permalink
Update smokeco zap
Browse files Browse the repository at this point in the history
  • Loading branch information
@hare-siterwell
hare-siterwell committed Aug 11, 2023
1 parent 56f22d8 commit 75da993
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 164 deletions.
163 changes: 12 additions & 151 deletions examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,125 +148,6 @@ server cluster Groups = 4 {
fabric command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
}

/** Attributes and commands for scene configuration and manipulation. */
server cluster Scenes = 5 {
bitmap Feature : BITMAP32 {
kSceneNames = 0x1;
}

bitmap ScenesCopyMode : BITMAP8 {
kCopyAllScenes = 0x1;
}

struct AttributeValuePair {
attrib_id attributeID = 0;
int32u attributeValue = 1;
}

struct ExtensionFieldSet {
cluster_id clusterID = 0;
AttributeValuePair attributeValueList[] = 1;
}

readonly attribute int8u sceneCount = 0;
readonly attribute int8u currentScene = 1;
readonly attribute group_id currentGroup = 2;
readonly attribute boolean sceneValid = 3;
readonly attribute bitmap8 nameSupport = 4;
readonly attribute int16u sceneTableSize = 6;
readonly attribute int8u remainingCapacity = 7;
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 AddSceneRequest {
group_id groupID = 0;
INT8U sceneID = 1;
INT16U transitionTime = 2;
CHAR_STRING sceneName = 3;
ExtensionFieldSet extensionFieldSets[] = 4;
}

request struct ViewSceneRequest {
group_id groupID = 0;
INT8U sceneID = 1;
}

request struct RemoveSceneRequest {
group_id groupID = 0;
INT8U sceneID = 1;
}

request struct RemoveAllScenesRequest {
group_id groupID = 0;
}

request struct StoreSceneRequest {
group_id groupID = 0;
INT8U sceneID = 1;
}

request struct RecallSceneRequest {
group_id groupID = 0;
INT8U sceneID = 1;
optional nullable INT16U transitionTime = 2;
}

request struct GetSceneMembershipRequest {
group_id groupID = 0;
}

response struct AddSceneResponse = 0 {
status status = 0;
group_id groupID = 1;
INT8U sceneID = 2;
}

response struct ViewSceneResponse = 1 {
status status = 0;
group_id groupID = 1;
INT8U sceneID = 2;
optional INT16U transitionTime = 3;
optional CHAR_STRING sceneName = 4;
optional ExtensionFieldSet extensionFieldSets[] = 5;
}

response struct RemoveSceneResponse = 2 {
status status = 0;
group_id groupID = 1;
INT8U sceneID = 2;
}

response struct RemoveAllScenesResponse = 3 {
status status = 0;
group_id groupID = 1;
}

response struct StoreSceneResponse = 4 {
status status = 0;
group_id groupID = 1;
INT8U sceneID = 2;
}

response struct GetSceneMembershipResponse = 6 {
status status = 0;
nullable INT8U capacity = 1;
group_id groupID = 2;
optional INT8U sceneList[] = 3;
}

fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
fabric command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
fabric command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
fabric command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
fabric command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
fabric command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
}

/** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
server cluster Descriptor = 29 {
struct DeviceTypeStruct {
Expand Down Expand Up @@ -675,6 +556,9 @@ server cluster PowerSource = 47 {
readonly attribute PowerSourceStatusEnum status = 0;
readonly attribute int8u order = 1;
readonly attribute char_string<60> description = 2;
readonly attribute BatChargeLevelEnum batChargeLevel = 14;
readonly attribute boolean batReplacementNeeded = 15;
readonly attribute BatReplaceabilityEnum batReplaceability = 16;
readonly attribute endpoint_no endpointList[] = 31;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down Expand Up @@ -1515,43 +1399,20 @@ endpoint 1 {
ram attribute clusterRevision default = 3;
}

server cluster Scenes {
callback attribute sceneCount default = 0x00;
ram attribute currentScene default = 0x00;
ram attribute currentGroup default = 0x0000;
ram attribute sceneValid default = 0x00;
ram attribute nameSupport default = 0x00;
ram attribute sceneTableSize;
callback attribute remainingCapacity;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 5;
}

server cluster Descriptor {
callback attribute deviceTypeList default = 0;
callback attribute serverList default = 0;
callback attribute clientList default = 0;
callback attribute partsList default = 0;
callback attribute generatedCommandList default = 0;
callback attribute acceptedCommandList default = 0;
callback attribute attributeList default = 0;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
}

server cluster PowerSource {
ram attribute status;
ram attribute order;
ram attribute description;
emits event BatFaultChange;
ram attribute status default = 0;
ram attribute order default = 2;
ram attribute description default = "B2";
ram attribute batChargeLevel default = 0;
ram attribute batReplacementNeeded;
ram attribute batReplaceability;
callback attribute endpointList;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;
ram attribute featureMap default = 2;
ram attribute clusterRevision default = 2;
}

server cluster SmokeCoAlarm {
Expand Down
35 changes: 22 additions & 13 deletions examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
],
"endpointTypes": [
{
"id": 47,
"id": 77,
"name": "MA-rootdevice",
"deviceTypeRef": {
"id": 2,
Expand Down Expand Up @@ -5420,7 +5420,7 @@
]
},
{
"id": 48,
"id": 78,
"name": "Anonymous Endpoint Type",
"deviceTypeRef": {
"id": 44,
Expand Down Expand Up @@ -6003,7 +6003,7 @@
"mfgCode": null,
"define": "SCENES_CLUSTER",
"side": "server",
"enabled": 1,
"enabled": 0,
"commands": [
{
"name": "AddSceneResponse",
Expand Down Expand Up @@ -7021,7 +7021,7 @@
"mfgCode": null,
"define": "DESCRIPTOR_CLUSTER",
"side": "server",
"enabled": 1,
"enabled": 0,
"attributes": [
{
"name": "DeviceTypeList",
Expand Down Expand Up @@ -7409,7 +7409,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": "0",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand All @@ -7425,7 +7425,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand All @@ -7441,7 +7441,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": "B2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand Down Expand Up @@ -7629,11 +7629,11 @@
"mfgCode": null,
"side": "server",
"type": "BatChargeLevelEnum",
"included": 0,
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"defaultValue": "0",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand All @@ -7645,7 +7645,7 @@
"mfgCode": null,
"side": "server",
"type": "boolean",
"included": 0,
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
Expand All @@ -7661,7 +7661,7 @@
"mfgCode": null,
"side": "server",
"type": "BatReplaceabilityEnum",
"included": 0,
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
Expand Down Expand Up @@ -7985,7 +7985,7 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
Expand All @@ -8001,12 +8001,21 @@
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"defaultValue": "2",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
}
],
"events": [
{
"name": "BatFaultChange",
"code": 1,
"mfgCode": null,
"side": "server",
"included": 1
}
]
},
{
Expand Down

0 comments on commit 75da993

Please sign in to comment.