Skip to content

Commit 102e709

Browse files
authored
Contact sensor app compliance (project-chip#38190)
* Update versions * Updating devices * Added Ota Requestor * Adding matter file
1 parent c7d1a48 commit 102e709

File tree

2 files changed

+85
-241
lines changed

2 files changed

+85
-241
lines changed

examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter

Lines changed: 12 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -326,83 +326,6 @@ cluster Identify = 3 {
326326
command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
327327
}
328328

329-
/** Attributes and commands for group configuration and manipulation. */
330-
cluster Groups = 4 {
331-
revision 4;
332-
333-
bitmap Feature : bitmap32 {
334-
kGroupNames = 0x1;
335-
}
336-
337-
bitmap NameSupportBitmap : bitmap8 {
338-
kGroupNames = 0x80;
339-
}
340-
341-
readonly attribute NameSupportBitmap nameSupport = 0;
342-
readonly attribute command_id generatedCommandList[] = 65528;
343-
readonly attribute command_id acceptedCommandList[] = 65529;
344-
readonly attribute event_id eventList[] = 65530;
345-
readonly attribute attrib_id attributeList[] = 65531;
346-
readonly attribute bitmap32 featureMap = 65532;
347-
readonly attribute int16u clusterRevision = 65533;
348-
349-
request struct AddGroupRequest {
350-
group_id groupID = 0;
351-
char_string<16> groupName = 1;
352-
}
353-
354-
response struct AddGroupResponse = 0 {
355-
enum8 status = 0;
356-
group_id groupID = 1;
357-
}
358-
359-
request struct ViewGroupRequest {
360-
group_id groupID = 0;
361-
}
362-
363-
response struct ViewGroupResponse = 1 {
364-
enum8 status = 0;
365-
group_id groupID = 1;
366-
char_string<16> groupName = 2;
367-
}
368-
369-
request struct GetGroupMembershipRequest {
370-
group_id groupList[] = 0;
371-
}
372-
373-
response struct GetGroupMembershipResponse = 2 {
374-
nullable int8u capacity = 0;
375-
group_id groupList[] = 1;
376-
}
377-
378-
request struct RemoveGroupRequest {
379-
group_id groupID = 0;
380-
}
381-
382-
response struct RemoveGroupResponse = 3 {
383-
enum8 status = 0;
384-
group_id groupID = 1;
385-
}
386-
387-
request struct AddGroupIfIdentifyingRequest {
388-
group_id groupID = 0;
389-
char_string<16> groupName = 1;
390-
}
391-
392-
/** Command description for AddGroup */
393-
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
394-
/** Command description for ViewGroup */
395-
fabric command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
396-
/** Command description for GetGroupMembership */
397-
fabric command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
398-
/** Command description for RemoveGroup */
399-
fabric command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
400-
/** Command description for RemoveAllGroups */
401-
fabric command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
402-
/** Command description for AddGroupIfIdentifying */
403-
fabric command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
404-
}
405-
406329
/** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
407330
cluster Descriptor = 29 {
408331
revision 2;
@@ -1918,32 +1841,19 @@ cluster BooleanState = 69 {
19181841
}
19191842

19201843
endpoint 0 {
1921-
device type ma_rootdevice = 22, version 2;
1844+
device type ma_rootdevice = 22, version 3;
1845+
device type ma_otarequestor = 18, version 1;
19221846

19231847
binding cluster OtaSoftwareUpdateProvider;
19241848

1925-
server cluster Groups {
1926-
ram attribute nameSupport;
1927-
ram attribute featureMap default = 0;
1928-
ram attribute clusterRevision default = 4;
1929-
1930-
handle command AddGroup;
1931-
handle command AddGroupResponse;
1932-
handle command ViewGroup;
1933-
handle command ViewGroupResponse;
1934-
handle command GetGroupMembership;
1935-
handle command GetGroupMembershipResponse;
1936-
handle command RemoveGroup;
1937-
handle command RemoveGroupResponse;
1938-
handle command RemoveAllGroups;
1939-
handle command AddGroupIfIdentifying;
1940-
}
1941-
19421849
server cluster Descriptor {
19431850
callback attribute deviceTypeList;
19441851
callback attribute serverList;
19451852
callback attribute clientList;
19461853
callback attribute partsList;
1854+
callback attribute generatedCommandList;
1855+
callback attribute acceptedCommandList;
1856+
callback attribute attributeList;
19471857
callback attribute featureMap;
19481858
callback attribute clusterRevision;
19491859
}
@@ -1952,10 +1862,11 @@ endpoint 0 {
19521862
emits event AccessControlEntryChanged;
19531863
emits event AccessControlExtensionChanged;
19541864
callback attribute acl;
1955-
callback attribute extension;
19561865
callback attribute subjectsPerAccessControlEntry;
19571866
callback attribute targetsPerAccessControlEntry;
19581867
callback attribute accessControlEntriesPerFabric;
1868+
callback attribute generatedCommandList;
1869+
callback attribute acceptedCommandList;
19591870
callback attribute attributeList;
19601871
ram attribute featureMap default = 0;
19611872
callback attribute clusterRevision;
@@ -1987,7 +1898,7 @@ endpoint 0 {
19871898
callback attribute specificationVersion;
19881899
callback attribute maxPathsPerInvoke;
19891900
ram attribute featureMap default = 0;
1990-
ram attribute clusterRevision default = 3;
1901+
ram attribute clusterRevision default = 4;
19911902
}
19921903

19931904
server cluster OtaSoftwareUpdateRequestor {
@@ -2011,7 +1922,7 @@ endpoint 0 {
20111922
callback attribute locationCapability;
20121923
callback attribute supportsConcurrentConnection;
20131924
ram attribute featureMap default = 0;
2014-
ram attribute clusterRevision default = 1;
1925+
ram attribute clusterRevision default = 2;
20151926

20161927
handle command ArmFailSafe;
20171928
handle command ArmFailSafeResponse;
@@ -2146,7 +2057,7 @@ endpoint 0 {
21462057
callback attribute operationalDatasetComponents;
21472058
callback attribute activeNetworkFaultsList;
21482059
ram attribute featureMap default = 0x000F;
2149-
ram attribute clusterRevision default = 2;
2060+
ram attribute clusterRevision default = 3;
21502061

21512062
handle command ResetCounts;
21522063
}
@@ -2255,7 +2166,7 @@ endpoint 0 {
22552166
}
22562167
}
22572168
endpoint 1 {
2258-
device type ma_contactsensor = 21, version 1;
2169+
device type ma_contactsensor = 21, version 2;
22592170

22602171

22612172
server cluster Identify {
@@ -2265,7 +2176,7 @@ endpoint 1 {
22652176
callback attribute acceptedCommandList;
22662177
callback attribute attributeList;
22672178
ram attribute featureMap default = 0;
2268-
ram attribute clusterRevision default = 4;
2179+
ram attribute clusterRevision default = 5;
22692180

22702181
handle command Identify;
22712182
handle command TriggerEffect;

0 commit comments

Comments
 (0)