Skip to content

Commit b96dd26

Browse files
luis4a0gmarcosb
authored andcommitted
Fix conformance errors on water leak detector app (project-chip#37656)
* Fix conformance errors. * Remove "Groups" cluster (0x04). * Update generated .matter file.
1 parent 5b2bece commit b96dd26

File tree

2 files changed

+16
-514
lines changed

2 files changed

+16
-514
lines changed

examples/water-leak-detector-app/water-leak-detector-common/water-leak-detector-app.matter

+7-117
Original file line numberDiff line numberDiff line change
@@ -291,83 +291,6 @@ cluster Identify = 3 {
291291
command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64;
292292
}
293293

294-
/** Attributes and commands for group configuration and manipulation. */
295-
cluster Groups = 4 {
296-
revision 4;
297-
298-
bitmap Feature : bitmap32 {
299-
kGroupNames = 0x1;
300-
}
301-
302-
bitmap NameSupportBitmap : bitmap8 {
303-
kGroupNames = 0x80;
304-
}
305-
306-
readonly attribute NameSupportBitmap nameSupport = 0;
307-
readonly attribute command_id generatedCommandList[] = 65528;
308-
readonly attribute command_id acceptedCommandList[] = 65529;
309-
readonly attribute event_id eventList[] = 65530;
310-
readonly attribute attrib_id attributeList[] = 65531;
311-
readonly attribute bitmap32 featureMap = 65532;
312-
readonly attribute int16u clusterRevision = 65533;
313-
314-
request struct AddGroupRequest {
315-
group_id groupID = 0;
316-
char_string<16> groupName = 1;
317-
}
318-
319-
response struct AddGroupResponse = 0 {
320-
enum8 status = 0;
321-
group_id groupID = 1;
322-
}
323-
324-
request struct ViewGroupRequest {
325-
group_id groupID = 0;
326-
}
327-
328-
response struct ViewGroupResponse = 1 {
329-
enum8 status = 0;
330-
group_id groupID = 1;
331-
char_string<16> groupName = 2;
332-
}
333-
334-
request struct GetGroupMembershipRequest {
335-
group_id groupList[] = 0;
336-
}
337-
338-
response struct GetGroupMembershipResponse = 2 {
339-
nullable int8u capacity = 0;
340-
group_id groupList[] = 1;
341-
}
342-
343-
request struct RemoveGroupRequest {
344-
group_id groupID = 0;
345-
}
346-
347-
response struct RemoveGroupResponse = 3 {
348-
enum8 status = 0;
349-
group_id groupID = 1;
350-
}
351-
352-
request struct AddGroupIfIdentifyingRequest {
353-
group_id groupID = 0;
354-
char_string<16> groupName = 1;
355-
}
356-
357-
/** Command description for AddGroup */
358-
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
359-
/** Command description for ViewGroup */
360-
fabric command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
361-
/** Command description for GetGroupMembership */
362-
fabric command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
363-
/** Command description for RemoveGroup */
364-
fabric command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
365-
/** Command description for RemoveAllGroups */
366-
fabric command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
367-
/** Command description for AddGroupIfIdentifying */
368-
fabric command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
369-
}
370-
371294
/** The Descriptor Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for describing a node, its endpoints and clusters. */
372295
cluster Descriptor = 29 {
373296
revision 2;
@@ -1702,7 +1625,7 @@ cluster BooleanStateConfiguration = 128 {
17021625
}
17031626

17041627
endpoint 0 {
1705-
device type ma_rootdevice = 22, version 1;
1628+
device type ma_rootdevice = 22, version 3;
17061629

17071630

17081631
server cluster Descriptor {
@@ -1718,7 +1641,6 @@ endpoint 0 {
17181641
emits event AccessControlEntryChanged;
17191642
emits event AccessControlExtensionChanged;
17201643
callback attribute acl;
1721-
callback attribute extension;
17221644
callback attribute subjectsPerAccessControlEntry;
17231645
callback attribute targetsPerAccessControlEntry;
17241646
callback attribute accessControlEntriesPerFabric;
@@ -1753,7 +1675,7 @@ endpoint 0 {
17531675
callback attribute specificationVersion;
17541676
callback attribute maxPathsPerInvoke;
17551677
ram attribute featureMap default = 0;
1756-
ram attribute clusterRevision default = 2;
1678+
ram attribute clusterRevision default = 4;
17571679
}
17581680

17591681
server cluster LocalizationConfiguration {
@@ -1773,7 +1695,7 @@ endpoint 0 {
17731695
callback attribute locationCapability;
17741696
callback attribute supportsConcurrentConnection;
17751697
ram attribute featureMap default = 0;
1776-
ram attribute clusterRevision default = 0x0001;
1698+
ram attribute clusterRevision default = 0x0002;
17771699

17781700
handle command ArmFailSafe;
17791701
handle command ArmFailSafeResponse;
@@ -1786,8 +1708,6 @@ endpoint 0 {
17861708
server cluster NetworkCommissioning {
17871709
ram attribute maxNetworks;
17881710
callback attribute networks;
1789-
ram attribute scanMaxTimeSeconds;
1790-
ram attribute connectMaxTimeSeconds;
17911711
ram attribute interfaceEnabled;
17921712
ram attribute lastNetworkingStatus;
17931713
ram attribute lastNetworkID;
@@ -1841,7 +1761,6 @@ endpoint 0 {
18411761
ram attribute clusterRevision default = 0x0001;
18421762

18431763
handle command OpenCommissioningWindow;
1844-
handle command OpenBasicCommissioningWindow;
18451764
handle command RevokeCommissioning;
18461765
}
18471766

@@ -1897,32 +1816,12 @@ endpoint 1 {
18971816
callback attribute acceptedCommandList;
18981817
callback attribute attributeList;
18991818
ram attribute featureMap default = 0;
1900-
ram attribute clusterRevision default = 2;
1819+
ram attribute clusterRevision default = 5;
19011820

19021821
handle command Identify;
19031822
handle command TriggerEffect;
19041823
}
19051824

1906-
server cluster Groups {
1907-
ram attribute nameSupport;
1908-
callback attribute generatedCommandList;
1909-
callback attribute acceptedCommandList;
1910-
callback attribute attributeList;
1911-
ram attribute featureMap default = 0;
1912-
ram attribute clusterRevision default = 3;
1913-
1914-
handle command AddGroup;
1915-
handle command AddGroupResponse;
1916-
handle command ViewGroup;
1917-
handle command ViewGroupResponse;
1918-
handle command GetGroupMembership;
1919-
handle command GetGroupMembershipResponse;
1920-
handle command RemoveGroup;
1921-
handle command RemoveGroupResponse;
1922-
handle command RemoveAllGroups;
1923-
handle command AddGroupIfIdentifying;
1924-
}
1925-
19261825
server cluster Descriptor {
19271826
callback attribute deviceTypeList;
19281827
callback attribute serverList;
@@ -1939,22 +1838,13 @@ endpoint 1 {
19391838
ram attribute status default = 1;
19401839
ram attribute order default = 1;
19411840
ram attribute description default = "Primary Battery";
1942-
ram attribute batVoltage default = 4100;
1943-
ram attribute batPercentRemaining default = 95;
1944-
ram attribute batTimeRemaining default = 518400;
1945-
ram attribute batChargeLevel default = 0;
1946-
ram attribute batReplacementNeeded default = 0;
1947-
ram attribute batReplaceability default = 1;
1948-
ram attribute batPresent default = 1;
1949-
ram attribute batCapacity default = 350;
1950-
ram attribute batChargeState default = 4;
1951-
ram attribute batFunctionalWhileCharging default = 1;
1841+
ram attribute wiredCurrentType default = 1;
19521842
callback attribute endpointList;
19531843
callback attribute generatedCommandList;
19541844
callback attribute acceptedCommandList;
19551845
callback attribute attributeList;
1956-
ram attribute featureMap default = 0;
1957-
ram attribute clusterRevision default = 1;
1846+
ram attribute featureMap default = 1;
1847+
ram attribute clusterRevision default = 3;
19581848
}
19591849

19601850
server cluster BooleanState {

0 commit comments

Comments
 (0)