Skip to content

Commit 55358ea

Browse files
committed
Fix cluster revisions for zap
1 parent d15e626 commit 55358ea

File tree

2 files changed

+1595
-1635
lines changed

2 files changed

+1595
-1635
lines changed

examples/google-multi-device/device-common/google-multi-device.matter

+87-6
Original file line numberDiff line numberDiff line change
@@ -1616,7 +1616,7 @@ endpoint 0 {
16161616
callback attribute specificationVersion;
16171617
callback attribute maxPathsPerInvoke;
16181618
ram attribute featureMap default = 0;
1619-
ram attribute clusterRevision default = 3;
1619+
ram attribute clusterRevision default = 4;
16201620
}
16211621

16221622
server cluster GeneralCommissioning {
@@ -1626,7 +1626,7 @@ endpoint 0 {
16261626
callback attribute locationCapability;
16271627
callback attribute supportsConcurrentConnection;
16281628
ram attribute featureMap default = 0;
1629-
ram attribute clusterRevision default = 1;
1629+
ram attribute clusterRevision default = 2;
16301630

16311631
handle command ArmFailSafe;
16321632
handle command ArmFailSafeResponse;
@@ -1652,7 +1652,6 @@ endpoint 0 {
16521652

16531653
handle command ScanNetworks;
16541654
handle command ScanNetworksResponse;
1655-
handle command AddOrUpdateWiFiNetwork;
16561655
handle command AddOrUpdateThreadNetwork;
16571656
handle command RemoveNetwork;
16581657
handle command NetworkConfigResponse;
@@ -1710,7 +1709,6 @@ endpoint 0 {
17101709
ram attribute clusterRevision default = 1;
17111710

17121711
handle command OpenCommissioningWindow;
1713-
handle command OpenBasicCommissioningWindow;
17141712
handle command RevokeCommissioning;
17151713
}
17161714

@@ -1768,14 +1766,33 @@ endpoint 1 {
17681766
}
17691767
}
17701768
endpoint 2 {
1769+
device type ma_bridgeddevice = 19, version 1;
17711770
device type ma_genericswitch = 15, version 3;
17721771

17731772

1773+
server cluster Identify {
1774+
ram attribute identifyTime default = 0x0;
1775+
ram attribute identifyType default = 0x00;
1776+
callback attribute generatedCommandList;
1777+
callback attribute acceptedCommandList;
1778+
callback attribute eventList;
1779+
callback attribute attributeList;
1780+
ram attribute featureMap default = 0;
1781+
ram attribute clusterRevision default = 5;
1782+
1783+
handle command Identify;
1784+
handle command TriggerEffect;
1785+
}
1786+
17741787
server cluster Descriptor {
17751788
callback attribute deviceTypeList;
17761789
callback attribute serverList;
17771790
callback attribute clientList;
17781791
callback attribute partsList;
1792+
callback attribute generatedCommandList;
1793+
callback attribute acceptedCommandList;
1794+
callback attribute eventList;
1795+
callback attribute attributeList;
17791796
callback attribute featureMap;
17801797
callback attribute clusterRevision;
17811798
}
@@ -1798,19 +1815,42 @@ endpoint 2 {
17981815
ram attribute numberOfPositions default = 2;
17991816
ram attribute currentPosition default = 0;
18001817
ram attribute multiPressMax default = 5;
1818+
callback attribute generatedCommandList;
1819+
callback attribute acceptedCommandList;
1820+
callback attribute eventList;
1821+
callback attribute attributeList;
18011822
ram attribute featureMap default = 58;
18021823
ram attribute clusterRevision default = 2;
18031824
}
18041825
}
18051826
endpoint 3 {
1827+
device type ma_bridgeddevice = 19, version 1;
18061828
device type ma_genericswitch = 15, version 3;
18071829

18081830

1831+
server cluster Identify {
1832+
ram attribute identifyTime default = 0x0;
1833+
ram attribute identifyType default = 0x00;
1834+
callback attribute generatedCommandList;
1835+
callback attribute acceptedCommandList;
1836+
callback attribute eventList;
1837+
callback attribute attributeList;
1838+
ram attribute featureMap default = 0;
1839+
ram attribute clusterRevision default = 5;
1840+
1841+
handle command Identify;
1842+
handle command TriggerEffect;
1843+
}
1844+
18091845
server cluster Descriptor {
18101846
callback attribute deviceTypeList;
18111847
callback attribute serverList;
18121848
callback attribute clientList;
18131849
callback attribute partsList;
1850+
callback attribute generatedCommandList;
1851+
callback attribute acceptedCommandList;
1852+
callback attribute eventList;
1853+
callback attribute attributeList;
18141854
callback attribute featureMap;
18151855
callback attribute clusterRevision;
18161856
}
@@ -1833,19 +1873,42 @@ endpoint 3 {
18331873
ram attribute numberOfPositions default = 2;
18341874
ram attribute currentPosition default = 0;
18351875
ram attribute multiPressMax default = 5;
1876+
callback attribute generatedCommandList;
1877+
callback attribute acceptedCommandList;
1878+
callback attribute eventList;
1879+
callback attribute attributeList;
18361880
ram attribute featureMap default = 30;
18371881
ram attribute clusterRevision default = 2;
18381882
}
18391883
}
18401884
endpoint 4 {
1885+
device type ma_bridgeddevice = 19, version 1;
18411886
device type ma_genericswitch = 15, version 3;
18421887

18431888

1889+
server cluster Identify {
1890+
ram attribute identifyTime default = 0x0;
1891+
ram attribute identifyType default = 0x00;
1892+
callback attribute generatedCommandList;
1893+
callback attribute acceptedCommandList;
1894+
callback attribute eventList;
1895+
callback attribute attributeList;
1896+
ram attribute featureMap default = 0;
1897+
ram attribute clusterRevision default = 5;
1898+
1899+
handle command Identify;
1900+
handle command TriggerEffect;
1901+
}
1902+
18441903
server cluster Descriptor {
18451904
callback attribute deviceTypeList;
18461905
callback attribute serverList;
18471906
callback attribute clientList;
18481907
callback attribute partsList;
1908+
callback attribute generatedCommandList;
1909+
callback attribute acceptedCommandList;
1910+
callback attribute eventList;
1911+
callback attribute attributeList;
18491912
callback attribute featureMap;
18501913
callback attribute clusterRevision;
18511914
}
@@ -1867,11 +1930,16 @@ endpoint 4 {
18671930
emits event SwitchLatched;
18681931
ram attribute numberOfPositions default = 3;
18691932
ram attribute currentPosition default = 0;
1933+
callback attribute generatedCommandList;
1934+
callback attribute acceptedCommandList;
1935+
callback attribute eventList;
1936+
callback attribute attributeList;
18701937
ram attribute featureMap default = 1;
18711938
ram attribute clusterRevision default = 2;
18721939
}
18731940
}
18741941
endpoint 5 {
1942+
device type ma_bridgeddevice = 19, version 1;
18751943
device type ma_occupancysensor = 263, version 4;
18761944

18771945

@@ -1880,18 +1948,24 @@ endpoint 5 {
18801948
ram attribute identifyType default = 0x0;
18811949
callback attribute generatedCommandList;
18821950
callback attribute acceptedCommandList;
1951+
callback attribute eventList;
18831952
callback attribute attributeList;
18841953
ram attribute featureMap default = 0;
1885-
ram attribute clusterRevision default = 2;
1954+
ram attribute clusterRevision default = 5;
18861955

18871956
handle command Identify;
1957+
handle command TriggerEffect;
18881958
}
18891959

18901960
server cluster Descriptor {
18911961
callback attribute deviceTypeList;
18921962
callback attribute serverList;
18931963
callback attribute clientList;
18941964
callback attribute partsList;
1965+
callback attribute generatedCommandList;
1966+
callback attribute acceptedCommandList;
1967+
callback attribute eventList;
1968+
callback attribute attributeList;
18951969
callback attribute featureMap;
18961970
callback attribute clusterRevision;
18971971
}
@@ -1918,12 +1992,14 @@ endpoint 5 {
19181992
callback attribute PIROccupiedToUnoccupiedDelay;
19191993
callback attribute generatedCommandList;
19201994
callback attribute acceptedCommandList;
1995+
callback attribute eventList;
19211996
callback attribute attributeList;
19221997
callback attribute featureMap;
19231998
callback attribute clusterRevision;
19241999
}
19252000
}
19262001
endpoint 6 {
2002+
device type ma_bridgeddevice = 19, version 1;
19272003
device type ma_dishwasher = 117, version 1;
19282004

19292005

@@ -1934,7 +2010,7 @@ endpoint 6 {
19342010
callback attribute acceptedCommandList;
19352011
callback attribute attributeList;
19362012
ram attribute featureMap default = 0;
1937-
ram attribute clusterRevision default = 2;
2013+
ram attribute clusterRevision default = 5;
19382014

19392015
handle command Identify;
19402016
}
@@ -1944,6 +2020,10 @@ endpoint 6 {
19442020
callback attribute serverList;
19452021
callback attribute clientList;
19462022
callback attribute partsList;
2023+
callback attribute generatedCommandList;
2024+
callback attribute acceptedCommandList;
2025+
callback attribute eventList;
2026+
callback attribute attributeList;
19472027
callback attribute featureMap;
19482028
callback attribute clusterRevision;
19492029
}
@@ -1972,6 +2052,7 @@ endpoint 6 {
19722052
callback attribute operationalError;
19732053
callback attribute generatedCommandList;
19742054
callback attribute acceptedCommandList;
2055+
callback attribute eventList;
19752056
callback attribute attributeList;
19762057
ram attribute featureMap default = 0;
19772058
ram attribute clusterRevision default = 3;

0 commit comments

Comments
 (0)