Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit bf9f16e

Browse files
committedJun 27, 2024··
Remove queued presets from Thermostats
1 parent d71a363 commit bf9f16e

File tree

278 files changed

+12979
-13363
lines changed

Some content is hidden

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

278 files changed

+12979
-13363
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;

0 commit comments

Comments
 (0)