Skip to content

Commit 0bfb2a2

Browse files
drempelgdrempelg
committed
Changes coming from the revised spec
1 parent c801fd0 commit 0bfb2a2

File tree

26 files changed

+89
-145
lines changed

26 files changed

+89
-145
lines changed

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -4748,7 +4748,7 @@ cluster PumpConfigurationAndControl = 512 {
47484748

47494749
/** An interface for configuring and controlling the functionality of a thermostat. */
47504750
cluster Thermostat = 513 {
4751-
revision 6;
4751+
revision 7;
47524752

47534753
enum ACCapacityFormatEnum : enum8 {
47544754
kBTUh = 0;
@@ -4866,8 +4866,7 @@ cluster Thermostat = 513 {
48664866
kLocalTemperatureNotExposed = 0x40;
48674867
kMatterScheduleConfiguration = 0x80;
48684868
kPresets = 0x100;
4869-
kSetpoints = 0x200;
4870-
kQueuedPresetsSupported = 0x400;
4869+
kQueuedPresetsSupported = 0x200;
48714870
}
48724871

48734872
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -4947,7 +4946,7 @@ cluster Thermostat = 513 {
49474946
optional char_string<64> name = 2;
49484947
optional octet_string<16> presetHandle = 3;
49494948
ScheduleTransitionStruct transitions[] = 4;
4950-
optional nullable boolean builtIn = 5;
4949+
nullable boolean builtIn = 5;
49514950
}
49524951

49534952
struct PresetStruct {

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -3475,7 +3475,7 @@ cluster PumpConfigurationAndControl = 512 {
34753475

34763476
/** An interface for configuring and controlling the functionality of a thermostat. */
34773477
cluster Thermostat = 513 {
3478-
revision 6;
3478+
revision 7;
34793479

34803480
enum ACCapacityFormatEnum : enum8 {
34813481
kBTUh = 0;
@@ -3593,8 +3593,7 @@ cluster Thermostat = 513 {
35933593
kLocalTemperatureNotExposed = 0x40;
35943594
kMatterScheduleConfiguration = 0x80;
35953595
kPresets = 0x100;
3596-
kSetpoints = 0x200;
3597-
kQueuedPresetsSupported = 0x400;
3596+
kQueuedPresetsSupported = 0x200;
35983597
}
35993598

36003599
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -3674,7 +3673,7 @@ cluster Thermostat = 513 {
36743673
optional char_string<64> name = 2;
36753674
optional octet_string<16> presetHandle = 3;
36763675
ScheduleTransitionStruct transitions[] = 4;
3677-
optional nullable boolean builtIn = 5;
3676+
nullable boolean builtIn = 5;
36783677
}
36793678

36803679
struct PresetStruct {

‎examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter

+3-4
Original file line numberDiff line numberDiff line change
@@ -1132,7 +1132,7 @@ cluster ActivatedCarbonFilterMonitoring = 114 {
11321132

11331133
/** An interface for configuring and controlling the functionality of a thermostat. */
11341134
cluster Thermostat = 513 {
1135-
revision 6;
1135+
revision 7;
11361136

11371137
enum ACCapacityFormatEnum : enum8 {
11381138
kBTUh = 0;
@@ -1250,8 +1250,7 @@ cluster Thermostat = 513 {
12501250
kLocalTemperatureNotExposed = 0x40;
12511251
kMatterScheduleConfiguration = 0x80;
12521252
kPresets = 0x100;
1253-
kSetpoints = 0x200;
1254-
kQueuedPresetsSupported = 0x400;
1253+
kQueuedPresetsSupported = 0x200;
12551254
}
12561255

12571256
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -1331,7 +1330,7 @@ cluster Thermostat = 513 {
13311330
optional char_string<64> name = 2;
13321331
optional octet_string<16> presetHandle = 3;
13331332
ScheduleTransitionStruct transitions[] = 4;
1334-
optional nullable boolean builtIn = 5;
1333+
nullable boolean builtIn = 5;
13351334
}
13361335

13371336
struct PresetStruct {

‎examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter

+3-4
Original file line numberDiff line numberDiff line change
@@ -1489,7 +1489,7 @@ cluster FixedLabel = 64 {
14891489

14901490
/** An interface for configuring and controlling the functionality of a thermostat. */
14911491
cluster Thermostat = 513 {
1492-
revision 6;
1492+
revision 7;
14931493

14941494
enum ACCapacityFormatEnum : enum8 {
14951495
kBTUh = 0;
@@ -1607,8 +1607,7 @@ cluster Thermostat = 513 {
16071607
kLocalTemperatureNotExposed = 0x40;
16081608
kMatterScheduleConfiguration = 0x80;
16091609
kPresets = 0x100;
1610-
kSetpoints = 0x200;
1611-
kQueuedPresetsSupported = 0x400;
1610+
kQueuedPresetsSupported = 0x200;
16121611
}
16131612

16141613
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -1688,7 +1687,7 @@ cluster Thermostat = 513 {
16881687
optional char_string<64> name = 2;
16891688
optional octet_string<16> presetHandle = 3;
16901689
ScheduleTransitionStruct transitions[] = 4;
1691-
optional nullable boolean builtIn = 5;
1690+
nullable boolean builtIn = 5;
16921691
}
16931692

16941693
struct PresetStruct {

‎examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter

+3-4
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,7 @@ cluster GroupKeyManagement = 63 {
10721072

10731073
/** An interface for configuring and controlling the functionality of a thermostat. */
10741074
cluster Thermostat = 513 {
1075-
revision 6;
1075+
revision 7;
10761076

10771077
enum ACCapacityFormatEnum : enum8 {
10781078
kBTUh = 0;
@@ -1190,8 +1190,7 @@ cluster Thermostat = 513 {
11901190
kLocalTemperatureNotExposed = 0x40;
11911191
kMatterScheduleConfiguration = 0x80;
11921192
kPresets = 0x100;
1193-
kSetpoints = 0x200;
1194-
kQueuedPresetsSupported = 0x400;
1193+
kQueuedPresetsSupported = 0x200;
11951194
}
11961195

11971196
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -1271,7 +1270,7 @@ cluster Thermostat = 513 {
12711270
optional char_string<64> name = 2;
12721271
optional octet_string<16> presetHandle = 3;
12731272
ScheduleTransitionStruct transitions[] = 4;
1274-
optional nullable boolean builtIn = 5;
1273+
nullable boolean builtIn = 5;
12751274
}
12761275

12771276
struct PresetStruct {

‎examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter

+3-4
Original file line numberDiff line numberDiff line change
@@ -1292,7 +1292,7 @@ cluster FixedLabel = 64 {
12921292

12931293
/** An interface for configuring and controlling the functionality of a thermostat. */
12941294
cluster Thermostat = 513 {
1295-
revision 6;
1295+
revision 7;
12961296

12971297
enum ACCapacityFormatEnum : enum8 {
12981298
kBTUh = 0;
@@ -1410,8 +1410,7 @@ cluster Thermostat = 513 {
14101410
kLocalTemperatureNotExposed = 0x40;
14111411
kMatterScheduleConfiguration = 0x80;
14121412
kPresets = 0x100;
1413-
kSetpoints = 0x200;
1414-
kQueuedPresetsSupported = 0x400;
1413+
kQueuedPresetsSupported = 0x200;
14151414
}
14161415

14171416
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -1491,7 +1490,7 @@ cluster Thermostat = 513 {
14911490
optional char_string<64> name = 2;
14921491
optional octet_string<16> presetHandle = 3;
14931492
ScheduleTransitionStruct transitions[] = 4;
1494-
optional nullable boolean builtIn = 5;
1493+
nullable boolean builtIn = 5;
14951494
}
14961495

14971496
struct PresetStruct {

‎examples/placeholder/linux/apps/app1/config.matter

+6-8
Original file line numberDiff line numberDiff line change
@@ -4720,7 +4720,7 @@ cluster PumpConfigurationAndControl = 512 {
47204720

47214721
/** An interface for configuring and controlling the functionality of a thermostat. */
47224722
cluster Thermostat = 513 {
4723-
revision 6;
4723+
revision 7;
47244724

47254725
enum ACCapacityFormatEnum : enum8 {
47264726
kBTUh = 0;
@@ -4838,8 +4838,7 @@ cluster Thermostat = 513 {
48384838
kLocalTemperatureNotExposed = 0x40;
48394839
kMatterScheduleConfiguration = 0x80;
48404840
kPresets = 0x100;
4841-
kSetpoints = 0x200;
4842-
kQueuedPresetsSupported = 0x400;
4841+
kQueuedPresetsSupported = 0x200;
48434842
}
48444843

48454844
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -4919,7 +4918,7 @@ cluster Thermostat = 513 {
49194918
optional char_string<64> name = 2;
49204919
optional octet_string<16> presetHandle = 3;
49214920
ScheduleTransitionStruct transitions[] = 4;
4922-
optional nullable boolean builtIn = 5;
4921+
nullable boolean builtIn = 5;
49234922
}
49244923

49254924
struct PresetStruct {
@@ -5091,7 +5090,7 @@ cluster Thermostat = 513 {
50915090

50925091
/** An interface for configuring and controlling the functionality of a thermostat. */
50935092
cluster Thermostat = 513 {
5094-
revision 6;
5093+
revision 7;
50955094

50965095
enum ACCapacityFormatEnum : enum8 {
50975096
kBTUh = 0;
@@ -5209,8 +5208,7 @@ cluster Thermostat = 513 {
52095208
kLocalTemperatureNotExposed = 0x40;
52105209
kMatterScheduleConfiguration = 0x80;
52115210
kPresets = 0x100;
5212-
kSetpoints = 0x200;
5213-
kQueuedPresetsSupported = 0x400;
5211+
kQueuedPresetsSupported = 0x200;
52145212
}
52155213

52165214
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -5290,7 +5288,7 @@ cluster Thermostat = 513 {
52905288
optional char_string<64> name = 2;
52915289
optional octet_string<16> presetHandle = 3;
52925290
ScheduleTransitionStruct transitions[] = 4;
5293-
optional nullable boolean builtIn = 5;
5291+
nullable boolean builtIn = 5;
52945292
}
52955293

52965294
struct PresetStruct {

‎examples/placeholder/linux/apps/app2/config.matter

+6-8
Original file line numberDiff line numberDiff line change
@@ -4677,7 +4677,7 @@ cluster PumpConfigurationAndControl = 512 {
46774677

46784678
/** An interface for configuring and controlling the functionality of a thermostat. */
46794679
cluster Thermostat = 513 {
4680-
revision 6;
4680+
revision 7;
46814681

46824682
enum ACCapacityFormatEnum : enum8 {
46834683
kBTUh = 0;
@@ -4795,8 +4795,7 @@ cluster Thermostat = 513 {
47954795
kLocalTemperatureNotExposed = 0x40;
47964796
kMatterScheduleConfiguration = 0x80;
47974797
kPresets = 0x100;
4798-
kSetpoints = 0x200;
4799-
kQueuedPresetsSupported = 0x400;
4798+
kQueuedPresetsSupported = 0x200;
48004799
}
48014800

48024801
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -4876,7 +4875,7 @@ cluster Thermostat = 513 {
48764875
optional char_string<64> name = 2;
48774876
optional octet_string<16> presetHandle = 3;
48784877
ScheduleTransitionStruct transitions[] = 4;
4879-
optional nullable boolean builtIn = 5;
4878+
nullable boolean builtIn = 5;
48804879
}
48814880

48824881
struct PresetStruct {
@@ -5048,7 +5047,7 @@ cluster Thermostat = 513 {
50485047

50495048
/** An interface for configuring and controlling the functionality of a thermostat. */
50505049
cluster Thermostat = 513 {
5051-
revision 6;
5050+
revision 7;
50525051

50535052
enum ACCapacityFormatEnum : enum8 {
50545053
kBTUh = 0;
@@ -5166,8 +5165,7 @@ cluster Thermostat = 513 {
51665165
kLocalTemperatureNotExposed = 0x40;
51675166
kMatterScheduleConfiguration = 0x80;
51685167
kPresets = 0x100;
5169-
kSetpoints = 0x200;
5170-
kQueuedPresetsSupported = 0x400;
5168+
kQueuedPresetsSupported = 0x200;
51715169
}
51725170

51735171
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -5247,7 +5245,7 @@ cluster Thermostat = 513 {
52475245
optional char_string<64> name = 2;
52485246
optional octet_string<16> presetHandle = 3;
52495247
ScheduleTransitionStruct transitions[] = 4;
5250-
optional nullable boolean builtIn = 5;
5248+
nullable boolean builtIn = 5;
52515249
}
52525250

52535251
struct PresetStruct {

‎examples/thermostat/nxp/zap/thermostat_matter_thread.matter

+3-4
Original file line numberDiff line numberDiff line change
@@ -1876,7 +1876,7 @@ provisional cluster ScenesManagement = 98 {
18761876

18771877
/** An interface for configuring and controlling the functionality of a thermostat. */
18781878
cluster Thermostat = 513 {
1879-
revision 6;
1879+
revision 7;
18801880

18811881
enum ACCapacityFormatEnum : enum8 {
18821882
kBTUh = 0;
@@ -1994,8 +1994,7 @@ cluster Thermostat = 513 {
19941994
kLocalTemperatureNotExposed = 0x40;
19951995
kMatterScheduleConfiguration = 0x80;
19961996
kPresets = 0x100;
1997-
kSetpoints = 0x200;
1998-
kQueuedPresetsSupported = 0x400;
1997+
kQueuedPresetsSupported = 0x200;
19991998
}
20001999

20012000
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -2075,7 +2074,7 @@ cluster Thermostat = 513 {
20752074
optional char_string<64> name = 2;
20762075
optional octet_string<16> presetHandle = 3;
20772076
ScheduleTransitionStruct transitions[] = 4;
2078-
optional nullable boolean builtIn = 5;
2077+
nullable boolean builtIn = 5;
20792078
}
20802079

20812080
struct PresetStruct {

‎examples/thermostat/nxp/zap/thermostat_matter_wifi.matter

+3-4
Original file line numberDiff line numberDiff line change
@@ -1787,7 +1787,7 @@ provisional cluster ScenesManagement = 98 {
17871787

17881788
/** An interface for configuring and controlling the functionality of a thermostat. */
17891789
cluster Thermostat = 513 {
1790-
revision 6;
1790+
revision 7;
17911791

17921792
enum ACCapacityFormatEnum : enum8 {
17931793
kBTUh = 0;
@@ -1905,8 +1905,7 @@ cluster Thermostat = 513 {
19051905
kLocalTemperatureNotExposed = 0x40;
19061906
kMatterScheduleConfiguration = 0x80;
19071907
kPresets = 0x100;
1908-
kSetpoints = 0x200;
1909-
kQueuedPresetsSupported = 0x400;
1908+
kQueuedPresetsSupported = 0x200;
19101909
}
19111910

19121911
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -1986,7 +1985,7 @@ cluster Thermostat = 513 {
19861985
optional char_string<64> name = 2;
19871986
optional octet_string<16> presetHandle = 3;
19881987
ScheduleTransitionStruct transitions[] = 4;
1989-
optional nullable boolean builtIn = 5;
1988+
nullable boolean builtIn = 5;
19901989
}
19911990

19921991
struct PresetStruct {

‎examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter

+3-4
Original file line numberDiff line numberDiff line change
@@ -1491,7 +1491,7 @@ cluster UserLabel = 65 {
14911491

14921492
/** An interface for configuring and controlling the functionality of a thermostat. */
14931493
cluster Thermostat = 513 {
1494-
revision 6;
1494+
revision 7;
14951495

14961496
enum ACCapacityFormatEnum : enum8 {
14971497
kBTUh = 0;
@@ -1609,8 +1609,7 @@ cluster Thermostat = 513 {
16091609
kLocalTemperatureNotExposed = 0x40;
16101610
kMatterScheduleConfiguration = 0x80;
16111611
kPresets = 0x100;
1612-
kSetpoints = 0x200;
1613-
kQueuedPresetsSupported = 0x400;
1612+
kQueuedPresetsSupported = 0x200;
16141613
}
16151614

16161615
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -1690,7 +1689,7 @@ cluster Thermostat = 513 {
16901689
optional char_string<64> name = 2;
16911690
optional octet_string<16> presetHandle = 3;
16921691
ScheduleTransitionStruct transitions[] = 4;
1693-
optional nullable boolean builtIn = 5;
1692+
nullable boolean builtIn = 5;
16941693
}
16951694

16961695
struct PresetStruct {

‎examples/thermostat/thermostat-common/thermostat.matter

+3-4
Original file line numberDiff line numberDiff line change
@@ -1671,7 +1671,7 @@ cluster UserLabel = 65 {
16711671

16721672
/** An interface for configuring and controlling the functionality of a thermostat. */
16731673
cluster Thermostat = 513 {
1674-
revision 6;
1674+
revision 7;
16751675

16761676
enum ACCapacityFormatEnum : enum8 {
16771677
kBTUh = 0;
@@ -1789,8 +1789,7 @@ cluster Thermostat = 513 {
17891789
kLocalTemperatureNotExposed = 0x40;
17901790
kMatterScheduleConfiguration = 0x80;
17911791
kPresets = 0x100;
1792-
kSetpoints = 0x200;
1793-
kQueuedPresetsSupported = 0x400;
1792+
kQueuedPresetsSupported = 0x200;
17941793
}
17951794

17961795
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -1870,7 +1869,7 @@ cluster Thermostat = 513 {
18701869
optional char_string<64> name = 2;
18711870
optional octet_string<16> presetHandle = 3;
18721871
ScheduleTransitionStruct transitions[] = 4;
1873-
optional nullable boolean builtIn = 5;
1872+
nullable boolean builtIn = 5;
18741873
}
18751874

18761875
struct PresetStruct {

0 commit comments

Comments
 (0)