Skip to content

Commit 504eec0

Browse files
nivi-applenivi-apple
committed
Remove queued presets from Thermostats
1 parent dd0c49b commit 504eec0

File tree

277 files changed

+5701
-7631
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

277 files changed

+5701
-7631
lines changed

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

-10
Original file line numberDiff line numberDiff line change
@@ -1344,7 +1344,6 @@ cluster Thermostat = 513 {
13441344
kMatterScheduleConfiguration = 0x80;
13451345
kPresets = 0x100;
13461346
kSetpoints = 0x200;
1347-
kQueuedPresetsSupported = 0x400;
13481347
}
13491348

13501349
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -1442,11 +1441,6 @@ cluster Thermostat = 513 {
14421441
PresetTypeFeaturesBitmap presetTypeFeatures = 2;
14431442
}
14441443

1445-
struct QueuedPresetStruct {
1446-
nullable octet_string<16> presetHandle = 0;
1447-
nullable epoch_s transitionTimestamp = 1;
1448-
}
1449-
14501444
struct ScheduleTypeStruct {
14511445
SystemModeEnum systemMode = 0;
14521446
int8u numberOfSchedules = 1;
@@ -1521,7 +1515,6 @@ cluster Thermostat = 513 {
15211515
readonly attribute optional boolean presetsSchedulesEditable = 82;
15221516
readonly attribute optional TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 83;
15231517
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 84;
1524-
readonly attribute optional nullable QueuedPresetStruct queuedPreset = 85;
15251518
readonly attribute command_id generatedCommandList[] = 65528;
15261519
readonly attribute command_id acceptedCommandList[] = 65529;
15271520
readonly attribute event_id eventList[] = 65530;
@@ -1559,7 +1552,6 @@ cluster Thermostat = 513 {
15591552

15601553
request struct SetActivePresetRequestRequest {
15611554
octet_string<16> presetHandle = 0;
1562-
optional int16u delayMinutes = 1;
15631555
}
15641556

15651557
request struct StartPresetsSchedulesEditRequestRequest {
@@ -1588,8 +1580,6 @@ cluster Thermostat = 513 {
15881580
command access(invoke: manage) CancelPresetsSchedulesEditRequest(): DefaultSuccess = 8;
15891581
/** This command is used to notify the server that all edits are done and should be committed. */
15901582
command access(invoke: manage) CommitPresetsSchedulesRequest(): DefaultSuccess = 9;
1591-
/** This command is sent to cancel a queued preset. */
1592-
command access(invoke: manage) CancelSetActivePresetRequest(): DefaultSuccess = 10;
15931583
/** This command sets the set point hold policy. */
15941584
command SetTemperatureSetpointHoldPolicy(SetTemperatureSetpointHoldPolicyRequest): DefaultSuccess = 11;
15951585
}

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

-11
Original file line numberDiff line numberDiff line change
@@ -5063,7 +5063,6 @@ cluster Thermostat = 513 {
50635063
kMatterScheduleConfiguration = 0x80;
50645064
kPresets = 0x100;
50655065
kSetpoints = 0x200;
5066-
kQueuedPresetsSupported = 0x400;
50675066
}
50685067

50695068
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -5161,11 +5160,6 @@ cluster Thermostat = 513 {
51615160
PresetTypeFeaturesBitmap presetTypeFeatures = 2;
51625161
}
51635162

5164-
struct QueuedPresetStruct {
5165-
nullable octet_string<16> presetHandle = 0;
5166-
nullable epoch_s transitionTimestamp = 1;
5167-
}
5168-
51695163
struct ScheduleTypeStruct {
51705164
SystemModeEnum systemMode = 0;
51715165
int8u numberOfSchedules = 1;
@@ -5240,7 +5234,6 @@ cluster Thermostat = 513 {
52405234
readonly attribute optional boolean presetsSchedulesEditable = 82;
52415235
readonly attribute optional TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 83;
52425236
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 84;
5243-
readonly attribute optional nullable QueuedPresetStruct queuedPreset = 85;
52445237
readonly attribute command_id generatedCommandList[] = 65528;
52455238
readonly attribute command_id acceptedCommandList[] = 65529;
52465239
readonly attribute event_id eventList[] = 65530;
@@ -5278,7 +5271,6 @@ cluster Thermostat = 513 {
52785271

52795272
request struct SetActivePresetRequestRequest {
52805273
octet_string<16> presetHandle = 0;
5281-
optional int16u delayMinutes = 1;
52825274
}
52835275

52845276
request struct StartPresetsSchedulesEditRequestRequest {
@@ -5307,8 +5299,6 @@ cluster Thermostat = 513 {
53075299
command access(invoke: manage) CancelPresetsSchedulesEditRequest(): DefaultSuccess = 8;
53085300
/** This command is used to notify the server that all edits are done and should be committed. */
53095301
command access(invoke: manage) CommitPresetsSchedulesRequest(): DefaultSuccess = 9;
5310-
/** This command is sent to cancel a queued preset. */
5311-
command access(invoke: manage) CancelSetActivePresetRequest(): DefaultSuccess = 10;
53125302
/** This command sets the set point hold policy. */
53135303
command SetTemperatureSetpointHoldPolicy(SetTemperatureSetpointHoldPolicyRequest): DefaultSuccess = 11;
53145304
}
@@ -8565,7 +8555,6 @@ endpoint 1 {
85658555
ram attribute presetsSchedulesEditable;
85668556
ram attribute temperatureSetpointHoldPolicy default = 0;
85678557
ram attribute setpointHoldExpiryTimestamp;
8568-
callback attribute queuedPreset;
85698558
callback attribute generatedCommandList;
85708559
callback attribute acceptedCommandList;
85718560
callback attribute eventList;

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

-10
Original file line numberDiff line numberDiff line change
@@ -3611,7 +3611,6 @@ cluster Thermostat = 513 {
36113611
kMatterScheduleConfiguration = 0x80;
36123612
kPresets = 0x100;
36133613
kSetpoints = 0x200;
3614-
kQueuedPresetsSupported = 0x400;
36153614
}
36163615

36173616
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -3709,11 +3708,6 @@ cluster Thermostat = 513 {
37093708
PresetTypeFeaturesBitmap presetTypeFeatures = 2;
37103709
}
37113710

3712-
struct QueuedPresetStruct {
3713-
nullable octet_string<16> presetHandle = 0;
3714-
nullable epoch_s transitionTimestamp = 1;
3715-
}
3716-
37173711
struct ScheduleTypeStruct {
37183712
SystemModeEnum systemMode = 0;
37193713
int8u numberOfSchedules = 1;
@@ -3788,7 +3782,6 @@ cluster Thermostat = 513 {
37883782
readonly attribute optional boolean presetsSchedulesEditable = 82;
37893783
readonly attribute optional TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 83;
37903784
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 84;
3791-
readonly attribute optional nullable QueuedPresetStruct queuedPreset = 85;
37923785
readonly attribute command_id generatedCommandList[] = 65528;
37933786
readonly attribute command_id acceptedCommandList[] = 65529;
37943787
readonly attribute event_id eventList[] = 65530;
@@ -3826,7 +3819,6 @@ cluster Thermostat = 513 {
38263819

38273820
request struct SetActivePresetRequestRequest {
38283821
octet_string<16> presetHandle = 0;
3829-
optional int16u delayMinutes = 1;
38303822
}
38313823

38323824
request struct StartPresetsSchedulesEditRequestRequest {
@@ -3855,8 +3847,6 @@ cluster Thermostat = 513 {
38553847
command access(invoke: manage) CancelPresetsSchedulesEditRequest(): DefaultSuccess = 8;
38563848
/** This command is used to notify the server that all edits are done and should be committed. */
38573849
command access(invoke: manage) CommitPresetsSchedulesRequest(): DefaultSuccess = 9;
3858-
/** This command is sent to cancel a queued preset. */
3859-
command access(invoke: manage) CancelSetActivePresetRequest(): DefaultSuccess = 10;
38603850
/** This command sets the set point hold policy. */
38613851
command SetTemperatureSetpointHoldPolicy(SetTemperatureSetpointHoldPolicyRequest): DefaultSuccess = 11;
38623852
}

‎examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter

-10
Original file line numberDiff line numberDiff line change
@@ -1267,7 +1267,6 @@ cluster Thermostat = 513 {
12671267
kMatterScheduleConfiguration = 0x80;
12681268
kPresets = 0x100;
12691269
kSetpoints = 0x200;
1270-
kQueuedPresetsSupported = 0x400;
12711270
}
12721271

12731272
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -1365,11 +1364,6 @@ cluster Thermostat = 513 {
13651364
PresetTypeFeaturesBitmap presetTypeFeatures = 2;
13661365
}
13671366

1368-
struct QueuedPresetStruct {
1369-
nullable octet_string<16> presetHandle = 0;
1370-
nullable epoch_s transitionTimestamp = 1;
1371-
}
1372-
13731367
struct ScheduleTypeStruct {
13741368
SystemModeEnum systemMode = 0;
13751369
int8u numberOfSchedules = 1;
@@ -1444,7 +1438,6 @@ cluster Thermostat = 513 {
14441438
readonly attribute optional boolean presetsSchedulesEditable = 82;
14451439
readonly attribute optional TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 83;
14461440
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 84;
1447-
readonly attribute optional nullable QueuedPresetStruct queuedPreset = 85;
14481441
readonly attribute command_id generatedCommandList[] = 65528;
14491442
readonly attribute command_id acceptedCommandList[] = 65529;
14501443
readonly attribute event_id eventList[] = 65530;
@@ -1482,7 +1475,6 @@ cluster Thermostat = 513 {
14821475

14831476
request struct SetActivePresetRequestRequest {
14841477
octet_string<16> presetHandle = 0;
1485-
optional int16u delayMinutes = 1;
14861478
}
14871479

14881480
request struct StartPresetsSchedulesEditRequestRequest {
@@ -1511,8 +1503,6 @@ cluster Thermostat = 513 {
15111503
command access(invoke: manage) CancelPresetsSchedulesEditRequest(): DefaultSuccess = 8;
15121504
/** This command is used to notify the server that all edits are done and should be committed. */
15131505
command access(invoke: manage) CommitPresetsSchedulesRequest(): DefaultSuccess = 9;
1514-
/** This command is sent to cancel a queued preset. */
1515-
command access(invoke: manage) CancelSetActivePresetRequest(): DefaultSuccess = 10;
15161506
/** This command sets the set point hold policy. */
15171507
command SetTemperatureSetpointHoldPolicy(SetTemperatureSetpointHoldPolicyRequest): DefaultSuccess = 11;
15181508
}

‎examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter

-10
Original file line numberDiff line numberDiff line change
@@ -1624,7 +1624,6 @@ cluster Thermostat = 513 {
16241624
kMatterScheduleConfiguration = 0x80;
16251625
kPresets = 0x100;
16261626
kSetpoints = 0x200;
1627-
kQueuedPresetsSupported = 0x400;
16281627
}
16291628

16301629
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -1722,11 +1721,6 @@ cluster Thermostat = 513 {
17221721
PresetTypeFeaturesBitmap presetTypeFeatures = 2;
17231722
}
17241723

1725-
struct QueuedPresetStruct {
1726-
nullable octet_string<16> presetHandle = 0;
1727-
nullable epoch_s transitionTimestamp = 1;
1728-
}
1729-
17301724
struct ScheduleTypeStruct {
17311725
SystemModeEnum systemMode = 0;
17321726
int8u numberOfSchedules = 1;
@@ -1801,7 +1795,6 @@ cluster Thermostat = 513 {
18011795
readonly attribute optional boolean presetsSchedulesEditable = 82;
18021796
readonly attribute optional TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 83;
18031797
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 84;
1804-
readonly attribute optional nullable QueuedPresetStruct queuedPreset = 85;
18051798
readonly attribute command_id generatedCommandList[] = 65528;
18061799
readonly attribute command_id acceptedCommandList[] = 65529;
18071800
readonly attribute event_id eventList[] = 65530;
@@ -1839,7 +1832,6 @@ cluster Thermostat = 513 {
18391832

18401833
request struct SetActivePresetRequestRequest {
18411834
octet_string<16> presetHandle = 0;
1842-
optional int16u delayMinutes = 1;
18431835
}
18441836

18451837
request struct StartPresetsSchedulesEditRequestRequest {
@@ -1868,8 +1860,6 @@ cluster Thermostat = 513 {
18681860
command access(invoke: manage) CancelPresetsSchedulesEditRequest(): DefaultSuccess = 8;
18691861
/** This command is used to notify the server that all edits are done and should be committed. */
18701862
command access(invoke: manage) CommitPresetsSchedulesRequest(): DefaultSuccess = 9;
1871-
/** This command is sent to cancel a queued preset. */
1872-
command access(invoke: manage) CancelSetActivePresetRequest(): DefaultSuccess = 10;
18731863
/** This command sets the set point hold policy. */
18741864
command SetTemperatureSetpointHoldPolicy(SetTemperatureSetpointHoldPolicyRequest): DefaultSuccess = 11;
18751865
}

‎examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter

-10
Original file line numberDiff line numberDiff line change
@@ -1207,7 +1207,6 @@ cluster Thermostat = 513 {
12071207
kMatterScheduleConfiguration = 0x80;
12081208
kPresets = 0x100;
12091209
kSetpoints = 0x200;
1210-
kQueuedPresetsSupported = 0x400;
12111210
}
12121211

12131212
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -1305,11 +1304,6 @@ cluster Thermostat = 513 {
13051304
PresetTypeFeaturesBitmap presetTypeFeatures = 2;
13061305
}
13071306

1308-
struct QueuedPresetStruct {
1309-
nullable octet_string<16> presetHandle = 0;
1310-
nullable epoch_s transitionTimestamp = 1;
1311-
}
1312-
13131307
struct ScheduleTypeStruct {
13141308
SystemModeEnum systemMode = 0;
13151309
int8u numberOfSchedules = 1;
@@ -1384,7 +1378,6 @@ cluster Thermostat = 513 {
13841378
readonly attribute optional boolean presetsSchedulesEditable = 82;
13851379
readonly attribute optional TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 83;
13861380
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 84;
1387-
readonly attribute optional nullable QueuedPresetStruct queuedPreset = 85;
13881381
readonly attribute command_id generatedCommandList[] = 65528;
13891382
readonly attribute command_id acceptedCommandList[] = 65529;
13901383
readonly attribute event_id eventList[] = 65530;
@@ -1422,7 +1415,6 @@ cluster Thermostat = 513 {
14221415

14231416
request struct SetActivePresetRequestRequest {
14241417
octet_string<16> presetHandle = 0;
1425-
optional int16u delayMinutes = 1;
14261418
}
14271419

14281420
request struct StartPresetsSchedulesEditRequestRequest {
@@ -1451,8 +1443,6 @@ cluster Thermostat = 513 {
14511443
command access(invoke: manage) CancelPresetsSchedulesEditRequest(): DefaultSuccess = 8;
14521444
/** This command is used to notify the server that all edits are done and should be committed. */
14531445
command access(invoke: manage) CommitPresetsSchedulesRequest(): DefaultSuccess = 9;
1454-
/** This command is sent to cancel a queued preset. */
1455-
command access(invoke: manage) CancelSetActivePresetRequest(): DefaultSuccess = 10;
14561446
/** This command sets the set point hold policy. */
14571447
command SetTemperatureSetpointHoldPolicy(SetTemperatureSetpointHoldPolicyRequest): DefaultSuccess = 11;
14581448
}

‎examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter

-10
Original file line numberDiff line numberDiff line change
@@ -1427,7 +1427,6 @@ cluster Thermostat = 513 {
14271427
kMatterScheduleConfiguration = 0x80;
14281428
kPresets = 0x100;
14291429
kSetpoints = 0x200;
1430-
kQueuedPresetsSupported = 0x400;
14311430
}
14321431

14331432
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -1525,11 +1524,6 @@ cluster Thermostat = 513 {
15251524
PresetTypeFeaturesBitmap presetTypeFeatures = 2;
15261525
}
15271526

1528-
struct QueuedPresetStruct {
1529-
nullable octet_string<16> presetHandle = 0;
1530-
nullable epoch_s transitionTimestamp = 1;
1531-
}
1532-
15331527
struct ScheduleTypeStruct {
15341528
SystemModeEnum systemMode = 0;
15351529
int8u numberOfSchedules = 1;
@@ -1604,7 +1598,6 @@ cluster Thermostat = 513 {
16041598
readonly attribute optional boolean presetsSchedulesEditable = 82;
16051599
readonly attribute optional TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 83;
16061600
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 84;
1607-
readonly attribute optional nullable QueuedPresetStruct queuedPreset = 85;
16081601
readonly attribute command_id generatedCommandList[] = 65528;
16091602
readonly attribute command_id acceptedCommandList[] = 65529;
16101603
readonly attribute event_id eventList[] = 65530;
@@ -1642,7 +1635,6 @@ cluster Thermostat = 513 {
16421635

16431636
request struct SetActivePresetRequestRequest {
16441637
octet_string<16> presetHandle = 0;
1645-
optional int16u delayMinutes = 1;
16461638
}
16471639

16481640
request struct StartPresetsSchedulesEditRequestRequest {
@@ -1671,8 +1663,6 @@ cluster Thermostat = 513 {
16711663
command access(invoke: manage) CancelPresetsSchedulesEditRequest(): DefaultSuccess = 8;
16721664
/** This command is used to notify the server that all edits are done and should be committed. */
16731665
command access(invoke: manage) CommitPresetsSchedulesRequest(): DefaultSuccess = 9;
1674-
/** This command is sent to cancel a queued preset. */
1675-
command access(invoke: manage) CancelSetActivePresetRequest(): DefaultSuccess = 10;
16761666
/** This command sets the set point hold policy. */
16771667
command SetTemperatureSetpointHoldPolicy(SetTemperatureSetpointHoldPolicyRequest): DefaultSuccess = 11;
16781668
}

0 commit comments

Comments
 (0)