Skip to content

Commit 7fa387a

Browse files
drempelgdrempelg
committed
Marked some of the optional fields as actually optional.
There may be more changes as the last bit of the spec PR gets finalized.
1 parent 5c031b1 commit 7fa387a

File tree

38 files changed

+553
-330
lines changed

38 files changed

+553
-330
lines changed

‎examples/air-purifier-app/air-purifier-common/air-purifier-app.matter

+7-7
Original file line numberDiff line numberDiff line change
@@ -1766,7 +1766,7 @@ cluster Thermostat = 513 {
17661766
}
17671767

17681768
info event SystemModeChange = 0 {
1769-
SystemModeEnum previousSystemMode = 0;
1769+
optional SystemModeEnum previousSystemMode = 0;
17701770
SystemModeEnum currentSystemMode = 1;
17711771
}
17721772

@@ -1775,34 +1775,34 @@ cluster Thermostat = 513 {
17751775
}
17761776

17771777
info event OccupancyChange = 2 {
1778-
OccupancyBitmap previousOccupancy = 0;
1778+
optional OccupancyBitmap previousOccupancy = 0;
17791779
OccupancyBitmap currentOccupancy = 1;
17801780
}
17811781

17821782
info event SetpointChange = 3 {
17831783
SystemModeEnum systemMode = 0;
17841784
OccupancyBitmap occupancy = 1;
1785-
temperature previousSetpoint = 2;
1785+
optional temperature previousSetpoint = 2;
17861786
temperature currentSetpoint = 3;
17871787
}
17881788

17891789
info event RunningStateChange = 4 {
1790-
RelayStateBitmap previousRunningState = 0;
1790+
optional RelayStateBitmap previousRunningState = 0;
17911791
RelayStateBitmap currentRunningState = 1;
17921792
}
17931793

17941794
info event RunningModeChange = 5 {
1795-
ThermostatRunningModeEnum previousRunningMode = 0;
1795+
optional ThermostatRunningModeEnum previousRunningMode = 0;
17961796
ThermostatRunningModeEnum currentRunningMode = 1;
17971797
}
17981798

17991799
info event ActiveScheduleChange = 6 {
1800-
octet_string previousScheduleHandle = 0;
1800+
optional octet_string previousScheduleHandle = 0;
18011801
octet_string currentScheduleHandle = 1;
18021802
}
18031803

18041804
info event ActivePresetChange = 7 {
1805-
octet_string previousPresetHandle = 0;
1805+
optional octet_string previousPresetHandle = 0;
18061806
octet_string currentPresetHandle = 1;
18071807
}
18081808

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+7-7
Original file line numberDiff line numberDiff line change
@@ -5629,7 +5629,7 @@ cluster Thermostat = 513 {
56295629
}
56305630

56315631
info event SystemModeChange = 0 {
5632-
SystemModeEnum previousSystemMode = 0;
5632+
optional SystemModeEnum previousSystemMode = 0;
56335633
SystemModeEnum currentSystemMode = 1;
56345634
}
56355635

@@ -5638,34 +5638,34 @@ cluster Thermostat = 513 {
56385638
}
56395639

56405640
info event OccupancyChange = 2 {
5641-
OccupancyBitmap previousOccupancy = 0;
5641+
optional OccupancyBitmap previousOccupancy = 0;
56425642
OccupancyBitmap currentOccupancy = 1;
56435643
}
56445644

56455645
info event SetpointChange = 3 {
56465646
SystemModeEnum systemMode = 0;
56475647
OccupancyBitmap occupancy = 1;
5648-
temperature previousSetpoint = 2;
5648+
optional temperature previousSetpoint = 2;
56495649
temperature currentSetpoint = 3;
56505650
}
56515651

56525652
info event RunningStateChange = 4 {
5653-
RelayStateBitmap previousRunningState = 0;
5653+
optional RelayStateBitmap previousRunningState = 0;
56545654
RelayStateBitmap currentRunningState = 1;
56555655
}
56565656

56575657
info event RunningModeChange = 5 {
5658-
ThermostatRunningModeEnum previousRunningMode = 0;
5658+
optional ThermostatRunningModeEnum previousRunningMode = 0;
56595659
ThermostatRunningModeEnum currentRunningMode = 1;
56605660
}
56615661

56625662
info event ActiveScheduleChange = 6 {
5663-
octet_string previousScheduleHandle = 0;
5663+
optional octet_string previousScheduleHandle = 0;
56645664
octet_string currentScheduleHandle = 1;
56655665
}
56665666

56675667
info event ActivePresetChange = 7 {
5668-
octet_string previousPresetHandle = 0;
5668+
optional octet_string previousPresetHandle = 0;
56695669
octet_string currentPresetHandle = 1;
56705670
}
56715671

‎examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter

+7-7
Original file line numberDiff line numberDiff line change
@@ -4041,7 +4041,7 @@ cluster Thermostat = 513 {
40414041
}
40424042

40434043
info event SystemModeChange = 0 {
4044-
SystemModeEnum previousSystemMode = 0;
4044+
optional SystemModeEnum previousSystemMode = 0;
40454045
SystemModeEnum currentSystemMode = 1;
40464046
}
40474047

@@ -4050,34 +4050,34 @@ cluster Thermostat = 513 {
40504050
}
40514051

40524052
info event OccupancyChange = 2 {
4053-
OccupancyBitmap previousOccupancy = 0;
4053+
optional OccupancyBitmap previousOccupancy = 0;
40544054
OccupancyBitmap currentOccupancy = 1;
40554055
}
40564056

40574057
info event SetpointChange = 3 {
40584058
SystemModeEnum systemMode = 0;
40594059
OccupancyBitmap occupancy = 1;
4060-
temperature previousSetpoint = 2;
4060+
optional temperature previousSetpoint = 2;
40614061
temperature currentSetpoint = 3;
40624062
}
40634063

40644064
info event RunningStateChange = 4 {
4065-
RelayStateBitmap previousRunningState = 0;
4065+
optional RelayStateBitmap previousRunningState = 0;
40664066
RelayStateBitmap currentRunningState = 1;
40674067
}
40684068

40694069
info event RunningModeChange = 5 {
4070-
ThermostatRunningModeEnum previousRunningMode = 0;
4070+
optional ThermostatRunningModeEnum previousRunningMode = 0;
40714071
ThermostatRunningModeEnum currentRunningMode = 1;
40724072
}
40734073

40744074
info event ActiveScheduleChange = 6 {
4075-
octet_string previousScheduleHandle = 0;
4075+
optional octet_string previousScheduleHandle = 0;
40764076
octet_string currentScheduleHandle = 1;
40774077
}
40784078

40794079
info event ActivePresetChange = 7 {
4080-
octet_string previousPresetHandle = 0;
4080+
optional octet_string previousPresetHandle = 0;
40814081
octet_string currentPresetHandle = 1;
40824082
}
40834083

‎examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter

+7-7
Original file line numberDiff line numberDiff line change
@@ -1689,7 +1689,7 @@ cluster Thermostat = 513 {
16891689
}
16901690

16911691
info event SystemModeChange = 0 {
1692-
SystemModeEnum previousSystemMode = 0;
1692+
optional SystemModeEnum previousSystemMode = 0;
16931693
SystemModeEnum currentSystemMode = 1;
16941694
}
16951695

@@ -1698,34 +1698,34 @@ cluster Thermostat = 513 {
16981698
}
16991699

17001700
info event OccupancyChange = 2 {
1701-
OccupancyBitmap previousOccupancy = 0;
1701+
optional OccupancyBitmap previousOccupancy = 0;
17021702
OccupancyBitmap currentOccupancy = 1;
17031703
}
17041704

17051705
info event SetpointChange = 3 {
17061706
SystemModeEnum systemMode = 0;
17071707
OccupancyBitmap occupancy = 1;
1708-
temperature previousSetpoint = 2;
1708+
optional temperature previousSetpoint = 2;
17091709
temperature currentSetpoint = 3;
17101710
}
17111711

17121712
info event RunningStateChange = 4 {
1713-
RelayStateBitmap previousRunningState = 0;
1713+
optional RelayStateBitmap previousRunningState = 0;
17141714
RelayStateBitmap currentRunningState = 1;
17151715
}
17161716

17171717
info event RunningModeChange = 5 {
1718-
ThermostatRunningModeEnum previousRunningMode = 0;
1718+
optional ThermostatRunningModeEnum previousRunningMode = 0;
17191719
ThermostatRunningModeEnum currentRunningMode = 1;
17201720
}
17211721

17221722
info event ActiveScheduleChange = 6 {
1723-
octet_string previousScheduleHandle = 0;
1723+
optional octet_string previousScheduleHandle = 0;
17241724
octet_string currentScheduleHandle = 1;
17251725
}
17261726

17271727
info event ActivePresetChange = 7 {
1728-
octet_string previousPresetHandle = 0;
1728+
optional octet_string previousPresetHandle = 0;
17291729
octet_string currentPresetHandle = 1;
17301730
}
17311731

‎examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter

+7-7
Original file line numberDiff line numberDiff line change
@@ -1985,7 +1985,7 @@ cluster Thermostat = 513 {
19851985
}
19861986

19871987
info event SystemModeChange = 0 {
1988-
SystemModeEnum previousSystemMode = 0;
1988+
optional SystemModeEnum previousSystemMode = 0;
19891989
SystemModeEnum currentSystemMode = 1;
19901990
}
19911991

@@ -1994,34 +1994,34 @@ cluster Thermostat = 513 {
19941994
}
19951995

19961996
info event OccupancyChange = 2 {
1997-
OccupancyBitmap previousOccupancy = 0;
1997+
optional OccupancyBitmap previousOccupancy = 0;
19981998
OccupancyBitmap currentOccupancy = 1;
19991999
}
20002000

20012001
info event SetpointChange = 3 {
20022002
SystemModeEnum systemMode = 0;
20032003
OccupancyBitmap occupancy = 1;
2004-
temperature previousSetpoint = 2;
2004+
optional temperature previousSetpoint = 2;
20052005
temperature currentSetpoint = 3;
20062006
}
20072007

20082008
info event RunningStateChange = 4 {
2009-
RelayStateBitmap previousRunningState = 0;
2009+
optional RelayStateBitmap previousRunningState = 0;
20102010
RelayStateBitmap currentRunningState = 1;
20112011
}
20122012

20132013
info event RunningModeChange = 5 {
2014-
ThermostatRunningModeEnum previousRunningMode = 0;
2014+
optional ThermostatRunningModeEnum previousRunningMode = 0;
20152015
ThermostatRunningModeEnum currentRunningMode = 1;
20162016
}
20172017

20182018
info event ActiveScheduleChange = 6 {
2019-
octet_string previousScheduleHandle = 0;
2019+
optional octet_string previousScheduleHandle = 0;
20202020
octet_string currentScheduleHandle = 1;
20212021
}
20222022

20232023
info event ActivePresetChange = 7 {
2024-
octet_string previousPresetHandle = 0;
2024+
optional octet_string previousPresetHandle = 0;
20252025
octet_string currentPresetHandle = 1;
20262026
}
20272027

‎examples/chef/devices/rootnode_heatpump_87ivjRAECh.matter

+7-7
Original file line numberDiff line numberDiff line change
@@ -2248,7 +2248,7 @@ cluster Thermostat = 513 {
22482248
}
22492249

22502250
info event SystemModeChange = 0 {
2251-
SystemModeEnum previousSystemMode = 0;
2251+
optional SystemModeEnum previousSystemMode = 0;
22522252
SystemModeEnum currentSystemMode = 1;
22532253
}
22542254

@@ -2257,34 +2257,34 @@ cluster Thermostat = 513 {
22572257
}
22582258

22592259
info event OccupancyChange = 2 {
2260-
OccupancyBitmap previousOccupancy = 0;
2260+
optional OccupancyBitmap previousOccupancy = 0;
22612261
OccupancyBitmap currentOccupancy = 1;
22622262
}
22632263

22642264
info event SetpointChange = 3 {
22652265
SystemModeEnum systemMode = 0;
22662266
OccupancyBitmap occupancy = 1;
2267-
temperature previousSetpoint = 2;
2267+
optional temperature previousSetpoint = 2;
22682268
temperature currentSetpoint = 3;
22692269
}
22702270

22712271
info event RunningStateChange = 4 {
2272-
RelayStateBitmap previousRunningState = 0;
2272+
optional RelayStateBitmap previousRunningState = 0;
22732273
RelayStateBitmap currentRunningState = 1;
22742274
}
22752275

22762276
info event RunningModeChange = 5 {
2277-
ThermostatRunningModeEnum previousRunningMode = 0;
2277+
optional ThermostatRunningModeEnum previousRunningMode = 0;
22782278
ThermostatRunningModeEnum currentRunningMode = 1;
22792279
}
22802280

22812281
info event ActiveScheduleChange = 6 {
2282-
octet_string previousScheduleHandle = 0;
2282+
optional octet_string previousScheduleHandle = 0;
22832283
octet_string currentScheduleHandle = 1;
22842284
}
22852285

22862286
info event ActivePresetChange = 7 {
2287-
octet_string previousPresetHandle = 0;
2287+
optional octet_string previousPresetHandle = 0;
22882288
octet_string currentPresetHandle = 1;
22892289
}
22902290

‎examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter

+7-7
Original file line numberDiff line numberDiff line change
@@ -1629,7 +1629,7 @@ cluster Thermostat = 513 {
16291629
}
16301630

16311631
info event SystemModeChange = 0 {
1632-
SystemModeEnum previousSystemMode = 0;
1632+
optional SystemModeEnum previousSystemMode = 0;
16331633
SystemModeEnum currentSystemMode = 1;
16341634
}
16351635

@@ -1638,34 +1638,34 @@ cluster Thermostat = 513 {
16381638
}
16391639

16401640
info event OccupancyChange = 2 {
1641-
OccupancyBitmap previousOccupancy = 0;
1641+
optional OccupancyBitmap previousOccupancy = 0;
16421642
OccupancyBitmap currentOccupancy = 1;
16431643
}
16441644

16451645
info event SetpointChange = 3 {
16461646
SystemModeEnum systemMode = 0;
16471647
OccupancyBitmap occupancy = 1;
1648-
temperature previousSetpoint = 2;
1648+
optional temperature previousSetpoint = 2;
16491649
temperature currentSetpoint = 3;
16501650
}
16511651

16521652
info event RunningStateChange = 4 {
1653-
RelayStateBitmap previousRunningState = 0;
1653+
optional RelayStateBitmap previousRunningState = 0;
16541654
RelayStateBitmap currentRunningState = 1;
16551655
}
16561656

16571657
info event RunningModeChange = 5 {
1658-
ThermostatRunningModeEnum previousRunningMode = 0;
1658+
optional ThermostatRunningModeEnum previousRunningMode = 0;
16591659
ThermostatRunningModeEnum currentRunningMode = 1;
16601660
}
16611661

16621662
info event ActiveScheduleChange = 6 {
1663-
octet_string previousScheduleHandle = 0;
1663+
optional octet_string previousScheduleHandle = 0;
16641664
octet_string currentScheduleHandle = 1;
16651665
}
16661666

16671667
info event ActivePresetChange = 7 {
1668-
octet_string previousPresetHandle = 0;
1668+
optional octet_string previousPresetHandle = 0;
16691669
octet_string currentPresetHandle = 1;
16701670
}
16711671

‎examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter

+7-7
Original file line numberDiff line numberDiff line change
@@ -1849,7 +1849,7 @@ cluster Thermostat = 513 {
18491849
}
18501850

18511851
info event SystemModeChange = 0 {
1852-
SystemModeEnum previousSystemMode = 0;
1852+
optional SystemModeEnum previousSystemMode = 0;
18531853
SystemModeEnum currentSystemMode = 1;
18541854
}
18551855

@@ -1858,34 +1858,34 @@ cluster Thermostat = 513 {
18581858
}
18591859

18601860
info event OccupancyChange = 2 {
1861-
OccupancyBitmap previousOccupancy = 0;
1861+
optional OccupancyBitmap previousOccupancy = 0;
18621862
OccupancyBitmap currentOccupancy = 1;
18631863
}
18641864

18651865
info event SetpointChange = 3 {
18661866
SystemModeEnum systemMode = 0;
18671867
OccupancyBitmap occupancy = 1;
1868-
temperature previousSetpoint = 2;
1868+
optional temperature previousSetpoint = 2;
18691869
temperature currentSetpoint = 3;
18701870
}
18711871

18721872
info event RunningStateChange = 4 {
1873-
RelayStateBitmap previousRunningState = 0;
1873+
optional RelayStateBitmap previousRunningState = 0;
18741874
RelayStateBitmap currentRunningState = 1;
18751875
}
18761876

18771877
info event RunningModeChange = 5 {
1878-
ThermostatRunningModeEnum previousRunningMode = 0;
1878+
optional ThermostatRunningModeEnum previousRunningMode = 0;
18791879
ThermostatRunningModeEnum currentRunningMode = 1;
18801880
}
18811881

18821882
info event ActiveScheduleChange = 6 {
1883-
octet_string previousScheduleHandle = 0;
1883+
optional octet_string previousScheduleHandle = 0;
18841884
octet_string currentScheduleHandle = 1;
18851885
}
18861886

18871887
info event ActivePresetChange = 7 {
1888-
octet_string previousPresetHandle = 0;
1888+
optional octet_string previousPresetHandle = 0;
18891889
octet_string currentPresetHandle = 1;
18901890
}
18911891

0 commit comments

Comments
 (0)