diff --git a/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter b/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter
index 7dd6e1762ce1c7..4e9d31f7df3b8e 100644
--- a/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter
+++ b/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter
@@ -1344,7 +1344,6 @@ cluster Thermostat = 513 {
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
- kQueuedPresetsSupported = 0x400;
}
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -1442,11 +1441,6 @@ cluster Thermostat = 513 {
PresetTypeFeaturesBitmap presetTypeFeatures = 2;
}
- struct QueuedPresetStruct {
- nullable octet_string<16> presetHandle = 0;
- nullable epoch_s transitionTimestamp = 1;
- }
-
struct ScheduleTypeStruct {
SystemModeEnum systemMode = 0;
int8u numberOfSchedules = 1;
@@ -1521,7 +1515,6 @@ cluster Thermostat = 513 {
readonly attribute optional boolean presetsSchedulesEditable = 82;
readonly attribute optional TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 83;
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 84;
- readonly attribute optional nullable QueuedPresetStruct queuedPreset = 85;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
@@ -1559,7 +1552,6 @@ cluster Thermostat = 513 {
request struct SetActivePresetRequestRequest {
octet_string<16> presetHandle = 0;
- optional int16u delayMinutes = 1;
}
request struct StartPresetsSchedulesEditRequestRequest {
@@ -1588,8 +1580,6 @@ cluster Thermostat = 513 {
command access(invoke: manage) CancelPresetsSchedulesEditRequest(): DefaultSuccess = 8;
/** This command is used to notify the server that all edits are done and should be committed. */
command access(invoke: manage) CommitPresetsSchedulesRequest(): DefaultSuccess = 9;
- /** This command is sent to cancel a queued preset. */
- command access(invoke: manage) CancelSetActivePresetRequest(): DefaultSuccess = 10;
/** This command sets the set point hold policy. */
command SetTemperatureSetpointHoldPolicy(SetTemperatureSetpointHoldPolicyRequest): DefaultSuccess = 11;
}
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
index 8c87eb8a6a6c20..b8855227a52db1 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -5073,7 +5073,6 @@ cluster Thermostat = 513 {
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
- kQueuedPresetsSupported = 0x400;
}
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -5171,11 +5170,6 @@ cluster Thermostat = 513 {
PresetTypeFeaturesBitmap presetTypeFeatures = 2;
}
- struct QueuedPresetStruct {
- nullable octet_string<16> presetHandle = 0;
- nullable epoch_s transitionTimestamp = 1;
- }
-
struct ScheduleTypeStruct {
SystemModeEnum systemMode = 0;
int8u numberOfSchedules = 1;
@@ -5250,7 +5244,6 @@ cluster Thermostat = 513 {
readonly attribute optional boolean presetsSchedulesEditable = 82;
readonly attribute optional TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 83;
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 84;
- readonly attribute optional nullable QueuedPresetStruct queuedPreset = 85;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
@@ -5288,7 +5281,6 @@ cluster Thermostat = 513 {
request struct SetActivePresetRequestRequest {
octet_string<16> presetHandle = 0;
- optional int16u delayMinutes = 1;
}
request struct StartPresetsSchedulesEditRequestRequest {
@@ -5317,8 +5309,6 @@ cluster Thermostat = 513 {
command access(invoke: manage) CancelPresetsSchedulesEditRequest(): DefaultSuccess = 8;
/** This command is used to notify the server that all edits are done and should be committed. */
command access(invoke: manage) CommitPresetsSchedulesRequest(): DefaultSuccess = 9;
- /** This command is sent to cancel a queued preset. */
- command access(invoke: manage) CancelSetActivePresetRequest(): DefaultSuccess = 10;
/** This command sets the set point hold policy. */
command SetTemperatureSetpointHoldPolicy(SetTemperatureSetpointHoldPolicyRequest): DefaultSuccess = 11;
}
@@ -8610,7 +8600,6 @@ endpoint 1 {
ram attribute presetsSchedulesEditable;
ram attribute temperatureSetpointHoldPolicy default = 0;
ram attribute setpointHoldExpiryTimestamp;
- callback attribute queuedPreset;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
index 57ea60bfd6caf6..80fd60040a9142 100644
--- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -3618,7 +3618,6 @@ cluster Thermostat = 513 {
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
- kQueuedPresetsSupported = 0x400;
}
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -3716,11 +3715,6 @@ cluster Thermostat = 513 {
PresetTypeFeaturesBitmap presetTypeFeatures = 2;
}
- struct QueuedPresetStruct {
- nullable octet_string<16> presetHandle = 0;
- nullable epoch_s transitionTimestamp = 1;
- }
-
struct ScheduleTypeStruct {
SystemModeEnum systemMode = 0;
int8u numberOfSchedules = 1;
@@ -3795,7 +3789,6 @@ cluster Thermostat = 513 {
readonly attribute optional boolean presetsSchedulesEditable = 82;
readonly attribute optional TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 83;
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 84;
- readonly attribute optional nullable QueuedPresetStruct queuedPreset = 85;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
@@ -3833,7 +3826,6 @@ cluster Thermostat = 513 {
request struct SetActivePresetRequestRequest {
octet_string<16> presetHandle = 0;
- optional int16u delayMinutes = 1;
}
request struct StartPresetsSchedulesEditRequestRequest {
@@ -3862,8 +3854,6 @@ cluster Thermostat = 513 {
command access(invoke: manage) CancelPresetsSchedulesEditRequest(): DefaultSuccess = 8;
/** This command is used to notify the server that all edits are done and should be committed. */
command access(invoke: manage) CommitPresetsSchedulesRequest(): DefaultSuccess = 9;
- /** This command is sent to cancel a queued preset. */
- command access(invoke: manage) CancelSetActivePresetRequest(): DefaultSuccess = 10;
/** This command sets the set point hold policy. */
command SetTemperatureSetpointHoldPolicy(SetTemperatureSetpointHoldPolicyRequest): DefaultSuccess = 11;
}
diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
index d85bd9fa866873..d56dff0afcf204 100644
--- a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
+++ b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
@@ -1267,7 +1267,6 @@ cluster Thermostat = 513 {
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
- kQueuedPresetsSupported = 0x400;
}
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -1365,11 +1364,6 @@ cluster Thermostat = 513 {
PresetTypeFeaturesBitmap presetTypeFeatures = 2;
}
- struct QueuedPresetStruct {
- nullable octet_string<16> presetHandle = 0;
- nullable epoch_s transitionTimestamp = 1;
- }
-
struct ScheduleTypeStruct {
SystemModeEnum systemMode = 0;
int8u numberOfSchedules = 1;
@@ -1444,7 +1438,6 @@ cluster Thermostat = 513 {
readonly attribute optional boolean presetsSchedulesEditable = 82;
readonly attribute optional TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 83;
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 84;
- readonly attribute optional nullable QueuedPresetStruct queuedPreset = 85;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
@@ -1482,7 +1475,6 @@ cluster Thermostat = 513 {
request struct SetActivePresetRequestRequest {
octet_string<16> presetHandle = 0;
- optional int16u delayMinutes = 1;
}
request struct StartPresetsSchedulesEditRequestRequest {
@@ -1511,8 +1503,6 @@ cluster Thermostat = 513 {
command access(invoke: manage) CancelPresetsSchedulesEditRequest(): DefaultSuccess = 8;
/** This command is used to notify the server that all edits are done and should be committed. */
command access(invoke: manage) CommitPresetsSchedulesRequest(): DefaultSuccess = 9;
- /** This command is sent to cancel a queued preset. */
- command access(invoke: manage) CancelSetActivePresetRequest(): DefaultSuccess = 10;
/** This command sets the set point hold policy. */
command SetTemperatureSetpointHoldPolicy(SetTemperatureSetpointHoldPolicyRequest): DefaultSuccess = 11;
}
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
index badf76462c9d24..45bdce794448c0 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
@@ -1624,7 +1624,6 @@ cluster Thermostat = 513 {
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
- kQueuedPresetsSupported = 0x400;
}
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -1722,11 +1721,6 @@ cluster Thermostat = 513 {
PresetTypeFeaturesBitmap presetTypeFeatures = 2;
}
- struct QueuedPresetStruct {
- nullable octet_string<16> presetHandle = 0;
- nullable epoch_s transitionTimestamp = 1;
- }
-
struct ScheduleTypeStruct {
SystemModeEnum systemMode = 0;
int8u numberOfSchedules = 1;
@@ -1801,7 +1795,6 @@ cluster Thermostat = 513 {
readonly attribute optional boolean presetsSchedulesEditable = 82;
readonly attribute optional TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 83;
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 84;
- readonly attribute optional nullable QueuedPresetStruct queuedPreset = 85;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
@@ -1839,7 +1832,6 @@ cluster Thermostat = 513 {
request struct SetActivePresetRequestRequest {
octet_string<16> presetHandle = 0;
- optional int16u delayMinutes = 1;
}
request struct StartPresetsSchedulesEditRequestRequest {
@@ -1868,8 +1860,6 @@ cluster Thermostat = 513 {
command access(invoke: manage) CancelPresetsSchedulesEditRequest(): DefaultSuccess = 8;
/** This command is used to notify the server that all edits are done and should be committed. */
command access(invoke: manage) CommitPresetsSchedulesRequest(): DefaultSuccess = 9;
- /** This command is sent to cancel a queued preset. */
- command access(invoke: manage) CancelSetActivePresetRequest(): DefaultSuccess = 10;
/** This command sets the set point hold policy. */
command SetTemperatureSetpointHoldPolicy(SetTemperatureSetpointHoldPolicyRequest): DefaultSuccess = 11;
}
diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
index 3d730b7474395e..81770335f21b94 100644
--- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
+++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
@@ -1207,7 +1207,6 @@ cluster Thermostat = 513 {
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
- kQueuedPresetsSupported = 0x400;
}
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -1305,11 +1304,6 @@ cluster Thermostat = 513 {
PresetTypeFeaturesBitmap presetTypeFeatures = 2;
}
- struct QueuedPresetStruct {
- nullable octet_string<16> presetHandle = 0;
- nullable epoch_s transitionTimestamp = 1;
- }
-
struct ScheduleTypeStruct {
SystemModeEnum systemMode = 0;
int8u numberOfSchedules = 1;
@@ -1384,7 +1378,6 @@ cluster Thermostat = 513 {
readonly attribute optional boolean presetsSchedulesEditable = 82;
readonly attribute optional TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 83;
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 84;
- readonly attribute optional nullable QueuedPresetStruct queuedPreset = 85;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
@@ -1422,7 +1415,6 @@ cluster Thermostat = 513 {
request struct SetActivePresetRequestRequest {
octet_string<16> presetHandle = 0;
- optional int16u delayMinutes = 1;
}
request struct StartPresetsSchedulesEditRequestRequest {
@@ -1451,8 +1443,6 @@ cluster Thermostat = 513 {
command access(invoke: manage) CancelPresetsSchedulesEditRequest(): DefaultSuccess = 8;
/** This command is used to notify the server that all edits are done and should be committed. */
command access(invoke: manage) CommitPresetsSchedulesRequest(): DefaultSuccess = 9;
- /** This command is sent to cancel a queued preset. */
- command access(invoke: manage) CancelSetActivePresetRequest(): DefaultSuccess = 10;
/** This command sets the set point hold policy. */
command SetTemperatureSetpointHoldPolicy(SetTemperatureSetpointHoldPolicyRequest): DefaultSuccess = 11;
}
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
index 2ee66aec3362e1..6ae0a08d75721a 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
@@ -1427,7 +1427,6 @@ cluster Thermostat = 513 {
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
- kQueuedPresetsSupported = 0x400;
}
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -1525,11 +1524,6 @@ cluster Thermostat = 513 {
PresetTypeFeaturesBitmap presetTypeFeatures = 2;
}
- struct QueuedPresetStruct {
- nullable octet_string<16> presetHandle = 0;
- nullable epoch_s transitionTimestamp = 1;
- }
-
struct ScheduleTypeStruct {
SystemModeEnum systemMode = 0;
int8u numberOfSchedules = 1;
@@ -1604,7 +1598,6 @@ cluster Thermostat = 513 {
readonly attribute optional boolean presetsSchedulesEditable = 82;
readonly attribute optional TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 83;
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 84;
- readonly attribute optional nullable QueuedPresetStruct queuedPreset = 85;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
@@ -1642,7 +1635,6 @@ cluster Thermostat = 513 {
request struct SetActivePresetRequestRequest {
octet_string<16> presetHandle = 0;
- optional int16u delayMinutes = 1;
}
request struct StartPresetsSchedulesEditRequestRequest {
@@ -1671,8 +1663,6 @@ cluster Thermostat = 513 {
command access(invoke: manage) CancelPresetsSchedulesEditRequest(): DefaultSuccess = 8;
/** This command is used to notify the server that all edits are done and should be committed. */
command access(invoke: manage) CommitPresetsSchedulesRequest(): DefaultSuccess = 9;
- /** This command is sent to cancel a queued preset. */
- command access(invoke: manage) CancelSetActivePresetRequest(): DefaultSuccess = 10;
/** This command sets the set point hold policy. */
command SetTemperatureSetpointHoldPolicy(SetTemperatureSetpointHoldPolicyRequest): DefaultSuccess = 11;
}
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index d23b640787d0cf..2f250369cd3c05 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -4864,7 +4864,6 @@ cluster Thermostat = 513 {
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
- kQueuedPresetsSupported = 0x400;
}
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -4962,11 +4961,6 @@ cluster Thermostat = 513 {
PresetTypeFeaturesBitmap presetTypeFeatures = 2;
}
- struct QueuedPresetStruct {
- nullable octet_string<16> presetHandle = 0;
- nullable epoch_s transitionTimestamp = 1;
- }
-
struct ScheduleTypeStruct {
SystemModeEnum systemMode = 0;
int8u numberOfSchedules = 1;
@@ -5041,7 +5035,6 @@ cluster Thermostat = 513 {
readonly attribute optional boolean presetsSchedulesEditable = 82;
readonly attribute optional TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 83;
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 84;
- readonly attribute optional nullable QueuedPresetStruct queuedPreset = 85;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
@@ -5079,7 +5072,6 @@ cluster Thermostat = 513 {
request struct SetActivePresetRequestRequest {
octet_string<16> presetHandle = 0;
- optional int16u delayMinutes = 1;
}
request struct StartPresetsSchedulesEditRequestRequest {
@@ -5108,8 +5100,6 @@ cluster Thermostat = 513 {
command access(invoke: manage) CancelPresetsSchedulesEditRequest(): DefaultSuccess = 8;
/** This command is used to notify the server that all edits are done and should be committed. */
command access(invoke: manage) CommitPresetsSchedulesRequest(): DefaultSuccess = 9;
- /** This command is sent to cancel a queued preset. */
- command access(invoke: manage) CancelSetActivePresetRequest(): DefaultSuccess = 10;
/** This command sets the set point hold policy. */
command SetTemperatureSetpointHoldPolicy(SetTemperatureSetpointHoldPolicyRequest): DefaultSuccess = 11;
}
@@ -5235,7 +5225,6 @@ cluster Thermostat = 513 {
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
- kQueuedPresetsSupported = 0x400;
}
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -5333,11 +5322,6 @@ cluster Thermostat = 513 {
PresetTypeFeaturesBitmap presetTypeFeatures = 2;
}
- struct QueuedPresetStruct {
- nullable octet_string<16> presetHandle = 0;
- nullable epoch_s transitionTimestamp = 1;
- }
-
struct ScheduleTypeStruct {
SystemModeEnum systemMode = 0;
int8u numberOfSchedules = 1;
@@ -5412,7 +5396,6 @@ cluster Thermostat = 513 {
readonly attribute optional boolean presetsSchedulesEditable = 82;
readonly attribute optional TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 83;
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 84;
- readonly attribute optional nullable QueuedPresetStruct queuedPreset = 85;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
@@ -5450,7 +5433,6 @@ cluster Thermostat = 513 {
request struct SetActivePresetRequestRequest {
octet_string<16> presetHandle = 0;
- optional int16u delayMinutes = 1;
}
request struct StartPresetsSchedulesEditRequestRequest {
@@ -5479,8 +5461,6 @@ cluster Thermostat = 513 {
command access(invoke: manage) CancelPresetsSchedulesEditRequest(): DefaultSuccess = 8;
/** This command is used to notify the server that all edits are done and should be committed. */
command access(invoke: manage) CommitPresetsSchedulesRequest(): DefaultSuccess = 9;
- /** This command is sent to cancel a queued preset. */
- command access(invoke: manage) CancelSetActivePresetRequest(): DefaultSuccess = 10;
/** This command sets the set point hold policy. */
command SetTemperatureSetpointHoldPolicy(SetTemperatureSetpointHoldPolicyRequest): DefaultSuccess = 11;
}
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index 85950bac76279e..a68dc9ce2b63f2 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -4821,7 +4821,6 @@ cluster Thermostat = 513 {
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
- kQueuedPresetsSupported = 0x400;
}
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -4919,11 +4918,6 @@ cluster Thermostat = 513 {
PresetTypeFeaturesBitmap presetTypeFeatures = 2;
}
- struct QueuedPresetStruct {
- nullable octet_string<16> presetHandle = 0;
- nullable epoch_s transitionTimestamp = 1;
- }
-
struct ScheduleTypeStruct {
SystemModeEnum systemMode = 0;
int8u numberOfSchedules = 1;
@@ -4998,7 +4992,6 @@ cluster Thermostat = 513 {
readonly attribute optional boolean presetsSchedulesEditable = 82;
readonly attribute optional TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 83;
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 84;
- readonly attribute optional nullable QueuedPresetStruct queuedPreset = 85;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
@@ -5036,7 +5029,6 @@ cluster Thermostat = 513 {
request struct SetActivePresetRequestRequest {
octet_string<16> presetHandle = 0;
- optional int16u delayMinutes = 1;
}
request struct StartPresetsSchedulesEditRequestRequest {
@@ -5065,8 +5057,6 @@ cluster Thermostat = 513 {
command access(invoke: manage) CancelPresetsSchedulesEditRequest(): DefaultSuccess = 8;
/** This command is used to notify the server that all edits are done and should be committed. */
command access(invoke: manage) CommitPresetsSchedulesRequest(): DefaultSuccess = 9;
- /** This command is sent to cancel a queued preset. */
- command access(invoke: manage) CancelSetActivePresetRequest(): DefaultSuccess = 10;
/** This command sets the set point hold policy. */
command SetTemperatureSetpointHoldPolicy(SetTemperatureSetpointHoldPolicyRequest): DefaultSuccess = 11;
}
@@ -5192,7 +5182,6 @@ cluster Thermostat = 513 {
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
- kQueuedPresetsSupported = 0x400;
}
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -5290,11 +5279,6 @@ cluster Thermostat = 513 {
PresetTypeFeaturesBitmap presetTypeFeatures = 2;
}
- struct QueuedPresetStruct {
- nullable octet_string<16> presetHandle = 0;
- nullable epoch_s transitionTimestamp = 1;
- }
-
struct ScheduleTypeStruct {
SystemModeEnum systemMode = 0;
int8u numberOfSchedules = 1;
@@ -5369,7 +5353,6 @@ cluster Thermostat = 513 {
readonly attribute optional boolean presetsSchedulesEditable = 82;
readonly attribute optional TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 83;
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 84;
- readonly attribute optional nullable QueuedPresetStruct queuedPreset = 85;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
@@ -5407,7 +5390,6 @@ cluster Thermostat = 513 {
request struct SetActivePresetRequestRequest {
octet_string<16> presetHandle = 0;
- optional int16u delayMinutes = 1;
}
request struct StartPresetsSchedulesEditRequestRequest {
@@ -5436,8 +5418,6 @@ cluster Thermostat = 513 {
command access(invoke: manage) CancelPresetsSchedulesEditRequest(): DefaultSuccess = 8;
/** This command is used to notify the server that all edits are done and should be committed. */
command access(invoke: manage) CommitPresetsSchedulesRequest(): DefaultSuccess = 9;
- /** This command is sent to cancel a queued preset. */
- command access(invoke: manage) CancelSetActivePresetRequest(): DefaultSuccess = 10;
/** This command sets the set point hold policy. */
command SetTemperatureSetpointHoldPolicy(SetTemperatureSetpointHoldPolicyRequest): DefaultSuccess = 11;
}
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter
index 55439d700c7c06..43cae6aee44148 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter
+++ b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter
@@ -2018,7 +2018,6 @@ cluster Thermostat = 513 {
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
- kQueuedPresetsSupported = 0x400;
}
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -2116,11 +2115,6 @@ cluster Thermostat = 513 {
PresetTypeFeaturesBitmap presetTypeFeatures = 2;
}
- struct QueuedPresetStruct {
- nullable octet_string<16> presetHandle = 0;
- nullable epoch_s transitionTimestamp = 1;
- }
-
struct ScheduleTypeStruct {
SystemModeEnum systemMode = 0;
int8u numberOfSchedules = 1;
@@ -2195,7 +2189,6 @@ cluster Thermostat = 513 {
readonly attribute optional boolean presetsSchedulesEditable = 82;
readonly attribute optional TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 83;
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 84;
- readonly attribute optional nullable QueuedPresetStruct queuedPreset = 85;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
@@ -2233,7 +2226,6 @@ cluster Thermostat = 513 {
request struct SetActivePresetRequestRequest {
octet_string<16> presetHandle = 0;
- optional int16u delayMinutes = 1;
}
request struct StartPresetsSchedulesEditRequestRequest {
@@ -2262,8 +2254,6 @@ cluster Thermostat = 513 {
command access(invoke: manage) CancelPresetsSchedulesEditRequest(): DefaultSuccess = 8;
/** This command is used to notify the server that all edits are done and should be committed. */
command access(invoke: manage) CommitPresetsSchedulesRequest(): DefaultSuccess = 9;
- /** This command is sent to cancel a queued preset. */
- command access(invoke: manage) CancelSetActivePresetRequest(): DefaultSuccess = 10;
/** This command sets the set point hold policy. */
command SetTemperatureSetpointHoldPolicy(SetTemperatureSetpointHoldPolicyRequest): DefaultSuccess = 11;
}
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter
index e6aa1f27611e44..356347c1e7bf02 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter
+++ b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter
@@ -1929,7 +1929,6 @@ cluster Thermostat = 513 {
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
- kQueuedPresetsSupported = 0x400;
}
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -2027,11 +2026,6 @@ cluster Thermostat = 513 {
PresetTypeFeaturesBitmap presetTypeFeatures = 2;
}
- struct QueuedPresetStruct {
- nullable octet_string<16> presetHandle = 0;
- nullable epoch_s transitionTimestamp = 1;
- }
-
struct ScheduleTypeStruct {
SystemModeEnum systemMode = 0;
int8u numberOfSchedules = 1;
@@ -2106,7 +2100,6 @@ cluster Thermostat = 513 {
readonly attribute optional boolean presetsSchedulesEditable = 82;
readonly attribute optional TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 83;
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 84;
- readonly attribute optional nullable QueuedPresetStruct queuedPreset = 85;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
@@ -2144,7 +2137,6 @@ cluster Thermostat = 513 {
request struct SetActivePresetRequestRequest {
octet_string<16> presetHandle = 0;
- optional int16u delayMinutes = 1;
}
request struct StartPresetsSchedulesEditRequestRequest {
@@ -2173,8 +2165,6 @@ cluster Thermostat = 513 {
command access(invoke: manage) CancelPresetsSchedulesEditRequest(): DefaultSuccess = 8;
/** This command is used to notify the server that all edits are done and should be committed. */
command access(invoke: manage) CommitPresetsSchedulesRequest(): DefaultSuccess = 9;
- /** This command is sent to cancel a queued preset. */
- command access(invoke: manage) CancelSetActivePresetRequest(): DefaultSuccess = 10;
/** This command sets the set point hold policy. */
command SetTemperatureSetpointHoldPolicy(SetTemperatureSetpointHoldPolicyRequest): DefaultSuccess = 11;
}
diff --git a/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter b/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter
index 775b1d38bbb160..7d90277b06091e 100644
--- a/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter
+++ b/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter
@@ -1626,7 +1626,6 @@ cluster Thermostat = 513 {
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
- kQueuedPresetsSupported = 0x400;
}
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -1724,11 +1723,6 @@ cluster Thermostat = 513 {
PresetTypeFeaturesBitmap presetTypeFeatures = 2;
}
- struct QueuedPresetStruct {
- nullable octet_string<16> presetHandle = 0;
- nullable epoch_s transitionTimestamp = 1;
- }
-
struct ScheduleTypeStruct {
SystemModeEnum systemMode = 0;
int8u numberOfSchedules = 1;
@@ -1803,7 +1797,6 @@ cluster Thermostat = 513 {
readonly attribute optional boolean presetsSchedulesEditable = 82;
readonly attribute optional TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 83;
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 84;
- readonly attribute optional nullable QueuedPresetStruct queuedPreset = 85;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
@@ -1841,7 +1834,6 @@ cluster Thermostat = 513 {
request struct SetActivePresetRequestRequest {
octet_string<16> presetHandle = 0;
- optional int16u delayMinutes = 1;
}
request struct StartPresetsSchedulesEditRequestRequest {
@@ -1870,8 +1862,6 @@ cluster Thermostat = 513 {
command access(invoke: manage) CancelPresetsSchedulesEditRequest(): DefaultSuccess = 8;
/** This command is used to notify the server that all edits are done and should be committed. */
command access(invoke: manage) CommitPresetsSchedulesRequest(): DefaultSuccess = 9;
- /** This command is sent to cancel a queued preset. */
- command access(invoke: manage) CancelSetActivePresetRequest(): DefaultSuccess = 10;
/** This command sets the set point hold policy. */
command SetTemperatureSetpointHoldPolicy(SetTemperatureSetpointHoldPolicyRequest): DefaultSuccess = 11;
}
diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter
index 3268c9aa5263cb..3246155268aca9 100644
--- a/examples/thermostat/thermostat-common/thermostat.matter
+++ b/examples/thermostat/thermostat-common/thermostat.matter
@@ -1806,7 +1806,6 @@ cluster Thermostat = 513 {
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
- kQueuedPresetsSupported = 0x400;
}
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -1904,11 +1903,6 @@ cluster Thermostat = 513 {
PresetTypeFeaturesBitmap presetTypeFeatures = 2;
}
- struct QueuedPresetStruct {
- nullable octet_string<16> presetHandle = 0;
- nullable epoch_s transitionTimestamp = 1;
- }
-
struct ScheduleTypeStruct {
SystemModeEnum systemMode = 0;
int8u numberOfSchedules = 1;
@@ -1983,7 +1977,6 @@ cluster Thermostat = 513 {
readonly attribute optional boolean presetsSchedulesEditable = 82;
readonly attribute optional TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 83;
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 84;
- readonly attribute optional nullable QueuedPresetStruct queuedPreset = 85;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
@@ -2021,7 +2014,6 @@ cluster Thermostat = 513 {
request struct SetActivePresetRequestRequest {
octet_string<16> presetHandle = 0;
- optional int16u delayMinutes = 1;
}
request struct StartPresetsSchedulesEditRequestRequest {
@@ -2050,8 +2042,6 @@ cluster Thermostat = 513 {
command access(invoke: manage) CancelPresetsSchedulesEditRequest(): DefaultSuccess = 8;
/** This command is used to notify the server that all edits are done and should be committed. */
command access(invoke: manage) CommitPresetsSchedulesRequest(): DefaultSuccess = 9;
- /** This command is sent to cancel a queued preset. */
- command access(invoke: manage) CancelSetActivePresetRequest(): DefaultSuccess = 10;
/** This command sets the set point hold policy. */
command SetTemperatureSetpointHoldPolicy(SetTemperatureSetpointHoldPolicyRequest): DefaultSuccess = 11;
}
diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h
index 36156ad1e2a503..f2c082b1d0d4a1 100644
--- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h
+++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h
@@ -355,7 +355,7 @@
}
// This is an array of EmberAfAttributeMetadata structures.
-#define GENERATED_ATTRIBUTE_COUNT 1057
+#define GENERATED_ATTRIBUTE_COUNT 1056
#define GENERATED_ATTRIBUTES \
{ \
\
@@ -1402,11 +1402,9 @@
{ ZAP_EMPTY_DEFAULT(), 0x00000052, 1, ZAP_TYPE(BOOLEAN), 0 }, /* PresetsSchedulesEditable */ \
{ ZAP_SIMPLE_DEFAULT(0), 0x00000053, 1, ZAP_TYPE(BITMAP8), 0 }, /* TemperatureSetpointHoldPolicy */ \
{ ZAP_EMPTY_DEFAULT(), 0x00000054, 4, ZAP_TYPE(EPOCH_S), \
- ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SetpointHoldExpiryTimestamp */ \
- { ZAP_EMPTY_DEFAULT(), 0x00000055, 0, ZAP_TYPE(STRUCT), \
- ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* QueuedPreset */ \
- { ZAP_SIMPLE_DEFAULT(0x0023), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
- { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
+ ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SetpointHoldExpiryTimestamp */ \
+ { ZAP_SIMPLE_DEFAULT(0x0023), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \
+ { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \
\
/* Endpoint: 1, Cluster: Fan Control (server) */ \
{ ZAP_MIN_MAX_DEFAULTS_INDEX(22), 0x00000000, 1, ZAP_TYPE(ENUM8), \
@@ -3751,7 +3749,7 @@
/* Endpoint: 1, Cluster: Thermostat (server) */ \
.clusterId = 0x00000201, \
.attributes = ZAP_ATTRIBUTE_INDEX(616), \
- .attributeCount = 29, \
+ .attributeCount = 28, \
.clusterSize = 74, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
.functions = chipFuncArrayThermostatServer, \
@@ -3763,7 +3761,7 @@
{ \
/* Endpoint: 1, Cluster: Fan Control (server) */ \
.clusterId = 0x00000202, \
- .attributes = ZAP_ATTRIBUTE_INDEX(645), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(644), \
.attributeCount = 14, \
.clusterSize = 18, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
@@ -3776,7 +3774,7 @@
{ \
/* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */ \
.clusterId = 0x00000204, \
- .attributes = ZAP_ATTRIBUTE_INDEX(659), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(658), \
.attributeCount = 5, \
.clusterSize = 9, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \
@@ -3789,7 +3787,7 @@
{ \
/* Endpoint: 1, Cluster: Color Control (server) */ \
.clusterId = 0x00000300, \
- .attributes = ZAP_ATTRIBUTE_INDEX(664), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(663), \
.attributeCount = 54, \
.clusterSize = 345, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \
@@ -3802,7 +3800,7 @@
{ \
/* Endpoint: 1, Cluster: Ballast Configuration (server) */ \
.clusterId = 0x00000301, \
- .attributes = ZAP_ATTRIBUTE_INDEX(718), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(717), \
.attributeCount = 16, \
.clusterSize = 58, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3815,7 +3813,7 @@
{ \
/* Endpoint: 1, Cluster: Illuminance Measurement (server) */ \
.clusterId = 0x00000400, \
- .attributes = ZAP_ATTRIBUTE_INDEX(734), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(733), \
.attributeCount = 7, \
.clusterSize = 15, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3828,7 +3826,7 @@
{ \
/* Endpoint: 1, Cluster: Temperature Measurement (server) */ \
.clusterId = 0x00000402, \
- .attributes = ZAP_ATTRIBUTE_INDEX(741), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(740), \
.attributeCount = 6, \
.clusterSize = 14, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3841,7 +3839,7 @@
{ \
/* Endpoint: 1, Cluster: Pressure Measurement (server) */ \
.clusterId = 0x00000403, \
- .attributes = ZAP_ATTRIBUTE_INDEX(747), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(746), \
.attributeCount = 5, \
.clusterSize = 12, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3854,7 +3852,7 @@
{ \
/* Endpoint: 1, Cluster: Flow Measurement (server) */ \
.clusterId = 0x00000404, \
- .attributes = ZAP_ATTRIBUTE_INDEX(752), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(751), \
.attributeCount = 6, \
.clusterSize = 14, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3867,7 +3865,7 @@
{ \
/* Endpoint: 1, Cluster: Relative Humidity Measurement (server) */ \
.clusterId = 0x00000405, \
- .attributes = ZAP_ATTRIBUTE_INDEX(758), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(757), \
.attributeCount = 6, \
.clusterSize = 14, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3880,7 +3878,7 @@
{ \
/* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \
.clusterId = 0x00000406, \
- .attributes = ZAP_ATTRIBUTE_INDEX(764), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(763), \
.attributeCount = 5, \
.clusterSize = 9, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
@@ -3893,7 +3891,7 @@
{ \
/* Endpoint: 1, Cluster: Carbon Monoxide Concentration Measurement (server) */ \
.clusterId = 0x0000040C, \
- .attributes = ZAP_ATTRIBUTE_INDEX(769), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(768), \
.attributeCount = 13, \
.clusterSize = 2, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3906,7 +3904,7 @@
{ \
/* Endpoint: 1, Cluster: Carbon Dioxide Concentration Measurement (server) */ \
.clusterId = 0x0000040D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(782), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(781), \
.attributeCount = 13, \
.clusterSize = 2, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3919,7 +3917,7 @@
{ \
/* Endpoint: 1, Cluster: Nitrogen Dioxide Concentration Measurement (server) */ \
.clusterId = 0x00000413, \
- .attributes = ZAP_ATTRIBUTE_INDEX(795), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(794), \
.attributeCount = 13, \
.clusterSize = 2, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3932,7 +3930,7 @@
{ \
/* Endpoint: 1, Cluster: Ozone Concentration Measurement (server) */ \
.clusterId = 0x00000415, \
- .attributes = ZAP_ATTRIBUTE_INDEX(808), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(807), \
.attributeCount = 13, \
.clusterSize = 2, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3945,7 +3943,7 @@
{ \
/* Endpoint: 1, Cluster: PM2.5 Concentration Measurement (server) */ \
.clusterId = 0x0000042A, \
- .attributes = ZAP_ATTRIBUTE_INDEX(821), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(820), \
.attributeCount = 13, \
.clusterSize = 2, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3958,7 +3956,7 @@
{ \
/* Endpoint: 1, Cluster: Formaldehyde Concentration Measurement (server) */ \
.clusterId = 0x0000042B, \
- .attributes = ZAP_ATTRIBUTE_INDEX(834), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(833), \
.attributeCount = 13, \
.clusterSize = 2, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3971,7 +3969,7 @@
{ \
/* Endpoint: 1, Cluster: PM1 Concentration Measurement (server) */ \
.clusterId = 0x0000042C, \
- .attributes = ZAP_ATTRIBUTE_INDEX(847), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(846), \
.attributeCount = 13, \
.clusterSize = 2, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3984,7 +3982,7 @@
{ \
/* Endpoint: 1, Cluster: PM10 Concentration Measurement (server) */ \
.clusterId = 0x0000042D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(860), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(859), \
.attributeCount = 13, \
.clusterSize = 2, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -3997,7 +3995,7 @@
{ \
/* Endpoint: 1, Cluster: Total Volatile Organic Compounds Concentration Measurement (server) */ \
.clusterId = 0x0000042E, \
- .attributes = ZAP_ATTRIBUTE_INDEX(873), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(872), \
.attributeCount = 13, \
.clusterSize = 2, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4010,7 +4008,7 @@
{ \
/* Endpoint: 1, Cluster: Radon Concentration Measurement (server) */ \
.clusterId = 0x0000042F, \
- .attributes = ZAP_ATTRIBUTE_INDEX(886), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(885), \
.attributeCount = 13, \
.clusterSize = 2, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4023,7 +4021,7 @@
{ \
/* Endpoint: 1, Cluster: Wake on LAN (server) */ \
.clusterId = 0x00000503, \
- .attributes = ZAP_ATTRIBUTE_INDEX(899), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(898), \
.attributeCount = 3, \
.clusterSize = 19, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4036,7 +4034,7 @@
{ \
/* Endpoint: 1, Cluster: Low Power (server) */ \
.clusterId = 0x00000508, \
- .attributes = ZAP_ATTRIBUTE_INDEX(902), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(901), \
.attributeCount = 2, \
.clusterSize = 6, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4049,7 +4047,7 @@
{ \
/* Endpoint: 1, Cluster: Electrical Measurement (server) */ \
.clusterId = 0x00000B04, \
- .attributes = ZAP_ATTRIBUTE_INDEX(904), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(903), \
.attributeCount = 13, \
.clusterSize = 32, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4062,7 +4060,7 @@
{ \
/* Endpoint: 1, Cluster: Unit Testing (server) */ \
.clusterId = 0xFFF1FC05, \
- .attributes = ZAP_ATTRIBUTE_INDEX(917), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(916), \
.attributeCount = 84, \
.clusterSize = 2290, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4075,7 +4073,7 @@
{ \
/* Endpoint: 2, Cluster: Identify (server) */ \
.clusterId = 0x00000003, \
- .attributes = ZAP_ATTRIBUTE_INDEX(1001), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(1000), \
.attributeCount = 4, \
.clusterSize = 9, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \
@@ -4088,7 +4086,7 @@
{ \
/* Endpoint: 2, Cluster: Groups (server) */ \
.clusterId = 0x00000004, \
- .attributes = ZAP_ATTRIBUTE_INDEX(1005), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(1004), \
.attributeCount = 3, \
.clusterSize = 7, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
@@ -4101,7 +4099,7 @@
{ \
/* Endpoint: 2, Cluster: On/Off (server) */ \
.clusterId = 0x00000006, \
- .attributes = ZAP_ATTRIBUTE_INDEX(1008), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(1007), \
.attributeCount = 7, \
.clusterSize = 13, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \
@@ -4114,7 +4112,7 @@
{ \
/* Endpoint: 2, Cluster: Descriptor (server) */ \
.clusterId = 0x0000001D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(1015), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(1014), \
.attributeCount = 7, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4127,7 +4125,7 @@
{ \
/* Endpoint: 2, Cluster: Power Source (server) */ \
.clusterId = 0x0000002F, \
- .attributes = ZAP_ATTRIBUTE_INDEX(1022), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(1021), \
.attributeCount = 9, \
.clusterSize = 72, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4140,7 +4138,7 @@
{ \
/* Endpoint: 2, Cluster: Scenes Management (server) */ \
.clusterId = 0x00000062, \
- .attributes = ZAP_ATTRIBUTE_INDEX(1031), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(1030), \
.attributeCount = 5, \
.clusterSize = 16, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \
@@ -4153,7 +4151,7 @@
{ \
/* Endpoint: 2, Cluster: Occupancy Sensing (server) */ \
.clusterId = 0x00000406, \
- .attributes = ZAP_ATTRIBUTE_INDEX(1036), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(1035), \
.attributeCount = 5, \
.clusterSize = 9, \
.mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \
@@ -4166,7 +4164,7 @@
{ \
/* Endpoint: 65534, Cluster: Descriptor (server) */ \
.clusterId = 0x0000001D, \
- .attributes = ZAP_ATTRIBUTE_INDEX(1041), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(1040), \
.attributeCount = 6, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
@@ -4179,7 +4177,7 @@
{ \
/* Endpoint: 65534, Cluster: Network Commissioning (server) */ \
.clusterId = 0x00000031, \
- .attributes = ZAP_ATTRIBUTE_INDEX(1047), \
+ .attributes = ZAP_ATTRIBUTE_INDEX(1046), \
.attributeCount = 10, \
.clusterSize = 0, \
.mask = ZAP_CLUSTER_MASK(SERVER), \
diff --git a/src/app/clusters/thermostat-server/thermostat-server.cpp b/src/app/clusters/thermostat-server/thermostat-server.cpp
index 214594667b9eb8..c650a30c871989 100644
--- a/src/app/clusters/thermostat-server/thermostat-server.cpp
+++ b/src/app/clusters/thermostat-server/thermostat-server.cpp
@@ -122,10 +122,6 @@ CHIP_ERROR ThermostatAttrAccess::Read(const ConcreteReadAttributePath & aPath, A
return aEncoder.EncodeList([](const auto & encoder) -> CHIP_ERROR { return CHIP_NO_ERROR; });
}
break;
- case QueuedPreset::Id: {
- DataModel::Nullable<Structs::QueuedPresetStruct::Type> value;
- return aEncoder.Encode(value);
- }
default: // return CHIP_NO_ERROR and just read from the attribute store in default
break;
}
@@ -166,10 +162,6 @@ CHIP_ERROR ThermostatAttrAccess::Write(const ConcreteDataAttributePath & aPath,
return CHIP_ERROR_NOT_IMPLEMENTED;
}
break;
- case QueuedPreset::Id: {
- return CHIP_ERROR_NOT_IMPLEMENTED;
- }
- break;
default: // return CHIP_NO_ERROR and just write to the attribute store in default
break;
}
@@ -532,14 +524,6 @@ bool emberAfThermostatClusterCommitPresetsSchedulesRequestCallback(
return false;
}
-bool emberAfThermostatClusterCancelSetActivePresetRequestCallback(
- chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
- const chip::app::Clusters::Thermostat::Commands::CancelSetActivePresetRequest::DecodableType & commandData)
-{
- // TODO
- return false;
-}
-
bool emberAfThermostatClusterSetTemperatureSetpointHoldPolicyCallback(
chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
const chip::app::Clusters::Thermostat::Commands::SetTemperatureSetpointHoldPolicy::DecodableType & commandData)
diff --git a/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml
index 62e9a6d883516d..91a89497d7c8cc 100644
--- a/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml
@@ -224,11 +224,6 @@ limitations under the License.
<item fieldId="2" name="ScheduleTypeFeatures" type="ScheduleTypeFeaturesBitmap" min="0x0" max="0xF" default="0"/>
</struct>
- <struct name="QueuedPresetStruct" apiMaturity="provisional">
- <cluster code="0x0201"/>
- <item fieldId="0" name="PresetHandle" type="octet_string" length="16" isNullable="true"/>
- <item fieldId="1" name="TransitionTimestamp" type="epoch_s" isNullable="true"/>
- </struct>
<struct name="PresetStruct" apiMaturity="provisional">
<cluster code="0x0201"/>
@@ -323,9 +318,6 @@ limitations under the License.
<feature bit="9" code="S" name="Setpoints" summary="Setpoints">
<optionalConform/>
</feature>
- <feature bit="10" code="QPS" name="QueuedPresetsSupported" summary="QueuedPresetsSupported">
- <optionalConform/>
- </feature>
</features>
<!-- Attributes -->
@@ -469,7 +461,6 @@ limitations under the License.
<attribute code="0x0052" side="server" type="boolean" define="PRESETS_SCHEDULES_EDITABLE" writable="false" optional="true">PresetsSchedulesEditable</attribute>
<attribute code="0x0053" side="server" type="TemperatureSetpointHoldPolicyBitmap" define="TEMPERATURE_SETPOINT_HOLD_POLICY" default="0" writable="false" optional="true" min="0x0" max="0x3">TemperatureSetpointHoldPolicy</attribute>
<attribute code="0x0054" side="server" type="epoch_s" define="SETPOINT_HOLD_EXPIRY_TIMESTAMP" isNullable="true" writable="false" optional="true">SetpointHoldExpiryTimestamp</attribute>
- <attribute code="0x0055" side="server" type="QueuedPresetStruct" define="QUEUED_PRESET" isNullable="true" writable="false" optional="true">QueuedPreset</attribute>
<!-- Client Commands -->
@@ -508,7 +499,6 @@ limitations under the License.
<command source="client" code="0x06" name="SetActivePresetRequest" optional="true">
<description>This command is used to set the active preset.</description>
<arg name="PresetHandle" type="octet_string" length="16"/>
- <arg name="DelayMinutes" type="int16u" optional="true" default="0"/>
</command>
<command source="client" code="0x07" name="StartPresetsSchedulesEditRequest" optional="true">
<description>This command is used to start editing the presets and schedules.</description>
@@ -523,10 +513,6 @@ limitations under the License.
<description>This command is used to notify the server that all edits are done and should be committed.</description>
<access op="invoke" privilege="manage"/>
</command>
- <command source="client" code="0x0A" name="CancelSetActivePresetRequest" optional="true">
- <description>This command is sent to cancel a queued preset.</description>
- <access op="invoke" privilege="manage"/>
- </command>
<command source="client" code="0x0B" name="SetTemperatureSetpointHoldPolicy" optional="true">
<description>This command sets the set point hold policy.</description>
<arg name="TemperatureSetpointHoldPolicy" type="TemperatureSetpointHoldPolicyBitmap" min="0x0" max="0x3"/>
diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
index 1a76205be885f9..513144d3d32ad9 100644
--- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json
+++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -609,7 +609,6 @@
"FeatureMap"
],
"Air Quality": ["AirQuality", "FeatureMap"],
- "Thermostat": ["QueuedPreset"],
"Electrical Energy Measurement": [
"Accuracy",
"CumulativeEnergyImported",
diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
index 5388a12156601a..b497281e585578 100644
--- a/src/app/zap-templates/zcl/zcl.json
+++ b/src/app/zap-templates/zcl/zcl.json
@@ -607,7 +607,6 @@
"FeatureMap"
],
"Air Quality": ["AirQuality", "FeatureMap"],
- "Thermostat": ["QueuedPreset"],
"Electrical Energy Measurement": [
"Accuracy",
"CumulativeEnergyImported",
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index fafbb2d48d9d14..6acf9fd8c4fb2f 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -6656,7 +6656,6 @@ cluster Thermostat = 513 {
kMatterScheduleConfiguration = 0x80;
kPresets = 0x100;
kSetpoints = 0x200;
- kQueuedPresetsSupported = 0x400;
}
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -6754,11 +6753,6 @@ cluster Thermostat = 513 {
PresetTypeFeaturesBitmap presetTypeFeatures = 2;
}
- struct QueuedPresetStruct {
- nullable octet_string<16> presetHandle = 0;
- nullable epoch_s transitionTimestamp = 1;
- }
-
struct ScheduleTypeStruct {
SystemModeEnum systemMode = 0;
int8u numberOfSchedules = 1;
@@ -6833,7 +6827,6 @@ cluster Thermostat = 513 {
readonly attribute optional boolean presetsSchedulesEditable = 82;
readonly attribute optional TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 83;
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 84;
- readonly attribute optional nullable QueuedPresetStruct queuedPreset = 85;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
@@ -6871,7 +6864,6 @@ cluster Thermostat = 513 {
request struct SetActivePresetRequestRequest {
octet_string<16> presetHandle = 0;
- optional int16u delayMinutes = 1;
}
request struct StartPresetsSchedulesEditRequestRequest {
@@ -6900,8 +6892,6 @@ cluster Thermostat = 513 {
command access(invoke: manage) CancelPresetsSchedulesEditRequest(): DefaultSuccess = 8;
/** This command is used to notify the server that all edits are done and should be committed. */
command access(invoke: manage) CommitPresetsSchedulesRequest(): DefaultSuccess = 9;
- /** This command is sent to cancel a queued preset. */
- command access(invoke: manage) CancelSetActivePresetRequest(): DefaultSuccess = 10;
/** This command sets the set point hold policy. */
command SetTemperatureSetpointHoldPolicy(SetTemperatureSetpointHoldPolicyRequest): DefaultSuccess = 11;
}
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java
index 5975e7387a2897..66338f93c0b225 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java
@@ -40211,7 +40211,6 @@ public static class ThermostatCluster extends BaseChipCluster {
private static final long PRESETS_SCHEDULES_EDITABLE_ATTRIBUTE_ID = 82L;
private static final long TEMPERATURE_SETPOINT_HOLD_POLICY_ATTRIBUTE_ID = 83L;
private static final long SETPOINT_HOLD_EXPIRY_TIMESTAMP_ATTRIBUTE_ID = 84L;
- private static final long QUEUED_PRESET_ATTRIBUTE_ID = 85L;
private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L;
private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L;
private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L;
@@ -40376,11 +40375,11 @@ public void onResponse(StructType invokeStructValue) {
}}, commandId, commandArgs, timedInvokeTimeoutMs);
}
- public void setActivePresetRequest(DefaultClusterCallback callback, byte[] presetHandle, Optional<Integer> delayMinutes) {
- setActivePresetRequest(callback, presetHandle, delayMinutes, 0);
+ public void setActivePresetRequest(DefaultClusterCallback callback, byte[] presetHandle) {
+ setActivePresetRequest(callback, presetHandle, 0);
}
- public void setActivePresetRequest(DefaultClusterCallback callback, byte[] presetHandle, Optional<Integer> delayMinutes, int timedInvokeTimeoutMs) {
+ public void setActivePresetRequest(DefaultClusterCallback callback, byte[] presetHandle, int timedInvokeTimeoutMs) {
final long commandId = 6L;
ArrayList<StructElement> elements = new ArrayList<>();
@@ -40388,10 +40387,6 @@ public void setActivePresetRequest(DefaultClusterCallback callback, byte[] prese
BaseTLVType presetHandletlvValue = new ByteArrayType(presetHandle);
elements.add(new StructElement(presetHandleFieldID, presetHandletlvValue));
- final long delayMinutesFieldID = 1L;
- BaseTLVType delayMinutestlvValue = delayMinutes.<BaseTLVType>map((nonOptionaldelayMinutes) -> new UIntType(nonOptionaldelayMinutes)).orElse(new EmptyType());
- elements.add(new StructElement(delayMinutesFieldID, delayMinutestlvValue));
-
StructType commandArgs = new StructType(elements);
invoke(new InvokeCallbackImpl(callback) {
@Override
@@ -40452,22 +40447,6 @@ public void onResponse(StructType invokeStructValue) {
}}, commandId, commandArgs, timedInvokeTimeoutMs);
}
- public void cancelSetActivePresetRequest(DefaultClusterCallback callback) {
- cancelSetActivePresetRequest(callback, 0);
- }
-
- public void cancelSetActivePresetRequest(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
- final long commandId = 10L;
-
- ArrayList<StructElement> elements = new ArrayList<>();
- StructType commandArgs = new StructType(elements);
- invoke(new InvokeCallbackImpl(callback) {
- @Override
- public void onResponse(StructType invokeStructValue) {
- callback.onSuccess();
- }}, commandId, commandArgs, timedInvokeTimeoutMs);
- }
-
public void setTemperatureSetpointHoldPolicy(DefaultClusterCallback callback, Integer temperatureSetpointHoldPolicy) {
setTemperatureSetpointHoldPolicy(callback, temperatureSetpointHoldPolicy, 0);
}
@@ -40568,10 +40547,6 @@ public interface SetpointHoldExpiryTimestampAttributeCallback extends BaseAttrib
void onSuccess(@Nullable Long value);
}
- public interface QueuedPresetAttributeCallback extends BaseAttributeCallback {
- void onSuccess(@Nullable ChipStructs.ThermostatClusterQueuedPresetStruct value);
- }
-
public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
void onSuccess(List<Long> value);
}
@@ -42461,32 +42436,6 @@ public void onSuccess(byte[] tlv) {
}, SETPOINT_HOLD_EXPIRY_TIMESTAMP_ATTRIBUTE_ID, minInterval, maxInterval);
}
- public void readQueuedPresetAttribute(
- QueuedPresetAttributeCallback callback) {
- ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, QUEUED_PRESET_ATTRIBUTE_ID);
-
- readAttribute(new ReportCallbackImpl(callback, path) {
- @Override
- public void onSuccess(byte[] tlv) {
- @Nullable ChipStructs.ThermostatClusterQueuedPresetStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
- callback.onSuccess(value);
- }
- }, QUEUED_PRESET_ATTRIBUTE_ID, true);
- }
-
- public void subscribeQueuedPresetAttribute(
- QueuedPresetAttributeCallback callback, int minInterval, int maxInterval) {
- ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, QUEUED_PRESET_ATTRIBUTE_ID);
-
- subscribeAttribute(new ReportCallbackImpl(callback, path) {
- @Override
- public void onSuccess(byte[] tlv) {
- @Nullable ChipStructs.ThermostatClusterQueuedPresetStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
- callback.onSuccess(value);
- }
- }, QUEUED_PRESET_ATTRIBUTE_ID, minInterval, maxInterval);
- }
-
public void readGeneratedCommandListAttribute(
GeneratedCommandListAttributeCallback callback) {
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java
index 11cba416fb733c..c62c3062fa3bc4 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java
@@ -9777,67 +9777,6 @@ public String toString() {
return output.toString();
}
}
-public static class ThermostatClusterQueuedPresetStruct {
- public @Nullable byte[] presetHandle;
- public @Nullable Long transitionTimestamp;
- private static final long PRESET_HANDLE_ID = 0L;
- private static final long TRANSITION_TIMESTAMP_ID = 1L;
-
- public ThermostatClusterQueuedPresetStruct(
- @Nullable byte[] presetHandle,
- @Nullable Long transitionTimestamp
- ) {
- this.presetHandle = presetHandle;
- this.transitionTimestamp = transitionTimestamp;
- }
-
- public StructType encodeTlv() {
- ArrayList<StructElement> values = new ArrayList<>();
- values.add(new StructElement(PRESET_HANDLE_ID, presetHandle != null ? new ByteArrayType(presetHandle) : new NullType()));
- values.add(new StructElement(TRANSITION_TIMESTAMP_ID, transitionTimestamp != null ? new UIntType(transitionTimestamp) : new NullType()));
-
- return new StructType(values);
- }
-
- public static ThermostatClusterQueuedPresetStruct decodeTlv(BaseTLVType tlvValue) {
- if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
- return null;
- }
- @Nullable byte[] presetHandle = null;
- @Nullable Long transitionTimestamp = null;
- for (StructElement element: ((StructType)tlvValue).value()) {
- if (element.contextTagNum() == PRESET_HANDLE_ID) {
- if (element.value(BaseTLVType.class).type() == TLVType.ByteArray) {
- ByteArrayType castingValue = element.value(ByteArrayType.class);
- presetHandle = castingValue.value(byte[].class);
- }
- } else if (element.contextTagNum() == TRANSITION_TIMESTAMP_ID) {
- if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
- UIntType castingValue = element.value(UIntType.class);
- transitionTimestamp = castingValue.value(Long.class);
- }
- }
- }
- return new ThermostatClusterQueuedPresetStruct(
- presetHandle,
- transitionTimestamp
- );
- }
-
- @Override
- public String toString() {
- StringBuilder output = new StringBuilder();
- output.append("ThermostatClusterQueuedPresetStruct {\n");
- output.append("\tpresetHandle: ");
- output.append(Arrays.toString(presetHandle));
- output.append("\n");
- output.append("\ttransitionTimestamp: ");
- output.append(transitionTimestamp);
- output.append("\n");
- output.append("}\n");
- return output.toString();
- }
-}
public static class ThermostatClusterScheduleTypeStruct {
public Integer systemMode;
public Integer numberOfSchedules;
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
index 38a5c390932d41..6959f3a3d83caa 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
@@ -11894,7 +11894,6 @@ public enum Attribute {
PresetsSchedulesEditable(82L),
TemperatureSetpointHoldPolicy(83L),
SetpointHoldExpiryTimestamp(84L),
- QueuedPreset(85L),
GeneratedCommandList(65528L),
AcceptedCommandList(65529L),
EventList(65530L),
@@ -11950,7 +11949,6 @@ public enum Command {
StartPresetsSchedulesEditRequest(7L),
CancelPresetsSchedulesEditRequest(8L),
CommitPresetsSchedulesRequest(9L),
- CancelSetActivePresetRequest(10L),
SetTemperatureSetpointHoldPolicy(11L),;
private final long id;
Command(long id) {
@@ -12037,7 +12035,7 @@ public static SetActiveScheduleRequestCommandField value(int id) throws NoSuchFi
}
throw new NoSuchFieldError();
}
- }public enum SetActivePresetRequestCommandField {PresetHandle(0),DelayMinutes(1),;
+ }public enum SetActivePresetRequestCommandField {PresetHandle(0),;
private final int id;
SetActivePresetRequestCommandField(int id) {
this.id = id;
diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java
index 1538d4f47415ad..99bae94690439d 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java
@@ -14200,27 +14200,6 @@ public void onError(Exception ex) {
}
}
- public static class DelegatedThermostatClusterQueuedPresetAttributeCallback implements ChipClusters.ThermostatCluster.QueuedPresetAttributeCallback, DelegatedClusterCallback {
- private ClusterCommandCallback callback;
- @Override
- public void setCallbackDelegate(ClusterCommandCallback callback) {
- this.callback = callback;
- }
-
- @Override
- public void onSuccess(@Nullable ChipStructs.ThermostatClusterQueuedPresetStruct value) {
- Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
- CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.ThermostatClusterQueuedPresetStruct");
- responseValues.put(commandResponseInfo, value);
- callback.onSuccess(responseValues);
- }
-
- @Override
- public void onError(Exception ex) {
- callback.onFailure(ex);
- }
- }
-
public static class DelegatedThermostatClusterGeneratedCommandListAttributeCallback implements ChipClusters.ThermostatCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
private ClusterCommandCallback callback;
@Override
@@ -26706,17 +26685,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
CommandParameterInfo thermostatsetActivePresetRequestpresetHandleCommandParameterInfo = new CommandParameterInfo("presetHandle", byte[].class, byte[].class);
thermostatsetActivePresetRequestCommandParams.put("presetHandle",thermostatsetActivePresetRequestpresetHandleCommandParameterInfo);
-
- CommandParameterInfo thermostatsetActivePresetRequestdelayMinutesCommandParameterInfo = new CommandParameterInfo("delayMinutes", Optional.class, Integer.class);
- thermostatsetActivePresetRequestCommandParams.put("delayMinutes",thermostatsetActivePresetRequestdelayMinutesCommandParameterInfo);
InteractionInfo thermostatsetActivePresetRequestInteractionInfo = new InteractionInfo(
(cluster, callback, commandArguments) -> {
((ChipClusters.ThermostatCluster) cluster)
.setActivePresetRequest((DefaultClusterCallback) callback
, (byte[])
commandArguments.get("presetHandle")
- , (Optional<Integer>)
- commandArguments.get("delayMinutes")
);
},
() -> new DelegatedDefaultClusterCallback(),
@@ -26765,18 +26739,6 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
);
thermostatClusterInteractionInfoMap.put("commitPresetsSchedulesRequest", thermostatcommitPresetsSchedulesRequestInteractionInfo);
- Map<String, CommandParameterInfo> thermostatcancelSetActivePresetRequestCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
- InteractionInfo thermostatcancelSetActivePresetRequestInteractionInfo = new InteractionInfo(
- (cluster, callback, commandArguments) -> {
- ((ChipClusters.ThermostatCluster) cluster)
- .cancelSetActivePresetRequest((DefaultClusterCallback) callback
- );
- },
- () -> new DelegatedDefaultClusterCallback(),
- thermostatcancelSetActivePresetRequestCommandParams
- );
- thermostatClusterInteractionInfoMap.put("cancelSetActivePresetRequest", thermostatcancelSetActivePresetRequestInteractionInfo);
-
Map<String, CommandParameterInfo> thermostatsetTemperatureSetpointHoldPolicyCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
CommandParameterInfo thermostatsetTemperatureSetpointHoldPolicytemperatureSetpointHoldPolicyCommandParameterInfo = new CommandParameterInfo("temperatureSetpointHoldPolicy", Integer.class, Integer.class);
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni b/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni
index 5a29a90b27372b..f50c3e2c82b56e 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni
@@ -125,7 +125,6 @@ structs_sources = [
"${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/TargetNavigatorClusterTargetInfoStruct.kt",
"${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ThermostatClusterPresetStruct.kt",
"${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ThermostatClusterPresetTypeStruct.kt",
- "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ThermostatClusterQueuedPresetStruct.kt",
"${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ThermostatClusterScheduleStruct.kt",
"${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ThermostatClusterScheduleTransitionStruct.kt",
"${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ThermostatClusterScheduleTypeStruct.kt",
diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ThermostatClusterQueuedPresetStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ThermostatClusterQueuedPresetStruct.kt
deleted file mode 100644
index fbb176317e9fb4..00000000000000
--- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/ThermostatClusterQueuedPresetStruct.kt
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *
- * Copyright (c) 2023 Project CHIP Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package chip.devicecontroller.cluster.structs
-
-import chip.devicecontroller.cluster.*
-import matter.tlv.ContextSpecificTag
-import matter.tlv.Tag
-import matter.tlv.TlvReader
-import matter.tlv.TlvWriter
-
-class ThermostatClusterQueuedPresetStruct(
- val presetHandle: ByteArray?,
- val transitionTimestamp: ULong?,
-) {
- override fun toString(): String = buildString {
- append("ThermostatClusterQueuedPresetStruct {\n")
- append("\tpresetHandle : $presetHandle\n")
- append("\ttransitionTimestamp : $transitionTimestamp\n")
- append("}\n")
- }
-
- fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
- tlvWriter.apply {
- startStructure(tlvTag)
- if (presetHandle != null) {
- put(ContextSpecificTag(TAG_PRESET_HANDLE), presetHandle)
- } else {
- putNull(ContextSpecificTag(TAG_PRESET_HANDLE))
- }
- if (transitionTimestamp != null) {
- put(ContextSpecificTag(TAG_TRANSITION_TIMESTAMP), transitionTimestamp)
- } else {
- putNull(ContextSpecificTag(TAG_TRANSITION_TIMESTAMP))
- }
- endStructure()
- }
- }
-
- companion object {
- private const val TAG_PRESET_HANDLE = 0
- private const val TAG_TRANSITION_TIMESTAMP = 1
-
- fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ThermostatClusterQueuedPresetStruct {
- tlvReader.enterStructure(tlvTag)
- val presetHandle =
- if (!tlvReader.isNull()) {
- tlvReader.getByteArray(ContextSpecificTag(TAG_PRESET_HANDLE))
- } else {
- tlvReader.getNull(ContextSpecificTag(TAG_PRESET_HANDLE))
- null
- }
- val transitionTimestamp =
- if (!tlvReader.isNull()) {
- tlvReader.getULong(ContextSpecificTag(TAG_TRANSITION_TIMESTAMP))
- } else {
- tlvReader.getNull(ContextSpecificTag(TAG_TRANSITION_TIMESTAMP))
- null
- }
-
- tlvReader.exitContainer()
-
- return ThermostatClusterQueuedPresetStruct(presetHandle, transitionTimestamp)
- }
- }
-}
diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/ThermostatCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ThermostatCluster.kt
index 5d36b70eea4726..ed9077402e96af 100644
--- a/src/controller/java/generated/java/matter/controller/cluster/clusters/ThermostatCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ThermostatCluster.kt
@@ -253,17 +253,6 @@ class ThermostatCluster(private val controller: MatterController, private val en
object SubscriptionEstablished : SetpointHoldExpiryTimestampAttributeSubscriptionState()
}
- class QueuedPresetAttribute(val value: ThermostatClusterQueuedPresetStruct?)
-
- sealed class QueuedPresetAttributeSubscriptionState {
- data class Success(val value: ThermostatClusterQueuedPresetStruct?) :
- QueuedPresetAttributeSubscriptionState()
-
- data class Error(val exception: Exception) : QueuedPresetAttributeSubscriptionState()
-
- object SubscriptionEstablished : QueuedPresetAttributeSubscriptionState()
- }
-
class GeneratedCommandListAttribute(val value: List<UInt>)
sealed class GeneratedCommandListAttributeSubscriptionState {
@@ -511,7 +500,6 @@ class ThermostatCluster(private val controller: MatterController, private val en
suspend fun setActivePresetRequest(
presetHandle: ByteArray,
- delayMinutes: UShort?,
timedInvokeTimeout: Duration? = null,
) {
val commandId: UInt = 6u
@@ -521,9 +509,6 @@ class ThermostatCluster(private val controller: MatterController, private val en
val TAG_PRESET_HANDLE_REQ: Int = 0
tlvWriter.put(ContextSpecificTag(TAG_PRESET_HANDLE_REQ), presetHandle)
-
- val TAG_DELAY_MINUTES_REQ: Int = 1
- delayMinutes?.let { tlvWriter.put(ContextSpecificTag(TAG_DELAY_MINUTES_REQ), delayMinutes) }
tlvWriter.endStructure()
val request: InvokeRequest =
@@ -597,24 +582,6 @@ class ThermostatCluster(private val controller: MatterController, private val en
logger.log(Level.FINE, "Invoke command succeeded: ${response}")
}
- suspend fun cancelSetActivePresetRequest(timedInvokeTimeout: Duration? = null) {
- val commandId: UInt = 10u
-
- val tlvWriter = TlvWriter()
- tlvWriter.startStructure(AnonymousTag)
- tlvWriter.endStructure()
-
- val request: InvokeRequest =
- InvokeRequest(
- CommandPath(endpointId, clusterId = CLUSTER_ID, commandId),
- tlvPayload = tlvWriter.getEncoded(),
- timedRequest = timedInvokeTimeout,
- )
-
- val response: InvokeResponse = controller.invoke(request)
- logger.log(Level.FINE, "Invoke command succeeded: ${response}")
- }
-
suspend fun setTemperatureSetpointHoldPolicy(
temperatureSetpointHoldPolicy: UByte,
timedInvokeTimeout: Duration? = null,
@@ -7790,107 +7757,6 @@ class ThermostatCluster(private val controller: MatterController, private val en
}
}
- suspend fun readQueuedPresetAttribute(): QueuedPresetAttribute {
- val ATTRIBUTE_ID: UInt = 85u
-
- val attributePath =
- AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
- val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
- val response = controller.read(readRequest)
-
- if (response.successes.isEmpty()) {
- logger.log(Level.WARNING, "Read command failed")
- throw IllegalStateException("Read command failed with failures: ${response.failures}")
- }
-
- logger.log(Level.FINE, "Read command succeeded")
-
- val attributeData =
- response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
- it.path.attributeId == ATTRIBUTE_ID
- }
-
- requireNotNull(attributeData) { "Queuedpreset attribute not found in response" }
-
- // Decode the TLV data into the appropriate type
- val tlvReader = TlvReader(attributeData.data)
- val decodedValue: ThermostatClusterQueuedPresetStruct? =
- if (!tlvReader.isNull()) {
- if (tlvReader.isNextTag(AnonymousTag)) {
- ThermostatClusterQueuedPresetStruct.fromTlv(AnonymousTag, tlvReader)
- } else {
- null
- }
- } else {
- tlvReader.getNull(AnonymousTag)
- null
- }
-
- return QueuedPresetAttribute(decodedValue)
- }
-
- suspend fun subscribeQueuedPresetAttribute(
- minInterval: Int,
- maxInterval: Int,
- ): Flow<QueuedPresetAttributeSubscriptionState> {
- val ATTRIBUTE_ID: UInt = 85u
- val attributePaths =
- listOf(
- AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
- )
-
- val subscribeRequest: SubscribeRequest =
- SubscribeRequest(
- eventPaths = emptyList(),
- attributePaths = attributePaths,
- minInterval = Duration.ofSeconds(minInterval.toLong()),
- maxInterval = Duration.ofSeconds(maxInterval.toLong()),
- )
-
- return controller.subscribe(subscribeRequest).transform { subscriptionState ->
- when (subscriptionState) {
- is SubscriptionState.SubscriptionErrorNotification -> {
- emit(
- QueuedPresetAttributeSubscriptionState.Error(
- Exception(
- "Subscription terminated with error code: ${subscriptionState.terminationCause}"
- )
- )
- )
- }
- is SubscriptionState.NodeStateUpdate -> {
- val attributeData =
- subscriptionState.updateState.successes
- .filterIsInstance<ReadData.Attribute>()
- .firstOrNull { it.path.attributeId == ATTRIBUTE_ID }
-
- requireNotNull(attributeData) { "Queuedpreset attribute not found in Node State update" }
-
- // Decode the TLV data into the appropriate type
- val tlvReader = TlvReader(attributeData.data)
- val decodedValue: ThermostatClusterQueuedPresetStruct? =
- if (!tlvReader.isNull()) {
- if (tlvReader.isNextTag(AnonymousTag)) {
- ThermostatClusterQueuedPresetStruct.fromTlv(AnonymousTag, tlvReader)
- } else {
- null
- }
- } else {
- tlvReader.getNull(AnonymousTag)
- null
- }
-
- decodedValue?.let { emit(QueuedPresetAttributeSubscriptionState.Success(it)) }
- }
- SubscriptionState.SubscriptionEstablished -> {
- emit(QueuedPresetAttributeSubscriptionState.SubscriptionEstablished)
- }
- }
- }
- }
-
suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
val ATTRIBUTE_ID: UInt = 65528u
diff --git a/src/controller/java/generated/java/matter/controller/cluster/files.gni b/src/controller/java/generated/java/matter/controller/cluster/files.gni
index ddb25414b6304d..856e286c2a2e7d 100644
--- a/src/controller/java/generated/java/matter/controller/cluster/files.gni
+++ b/src/controller/java/generated/java/matter/controller/cluster/files.gni
@@ -125,7 +125,6 @@ matter_structs_sources = [
"${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/TargetNavigatorClusterTargetInfoStruct.kt",
"${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ThermostatClusterPresetStruct.kt",
"${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ThermostatClusterPresetTypeStruct.kt",
- "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ThermostatClusterQueuedPresetStruct.kt",
"${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ThermostatClusterScheduleStruct.kt",
"${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ThermostatClusterScheduleTransitionStruct.kt",
"${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ThermostatClusterScheduleTypeStruct.kt",
diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/ThermostatClusterQueuedPresetStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ThermostatClusterQueuedPresetStruct.kt
deleted file mode 100644
index 4cb63aed9e7b39..00000000000000
--- a/src/controller/java/generated/java/matter/controller/cluster/structs/ThermostatClusterQueuedPresetStruct.kt
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *
- * Copyright (c) 2023 Project CHIP Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package matter.controller.cluster.structs
-
-import matter.controller.cluster.*
-import matter.tlv.ContextSpecificTag
-import matter.tlv.Tag
-import matter.tlv.TlvReader
-import matter.tlv.TlvWriter
-
-class ThermostatClusterQueuedPresetStruct(
- val presetHandle: ByteArray?,
- val transitionTimestamp: UInt?,
-) {
- override fun toString(): String = buildString {
- append("ThermostatClusterQueuedPresetStruct {\n")
- append("\tpresetHandle : $presetHandle\n")
- append("\ttransitionTimestamp : $transitionTimestamp\n")
- append("}\n")
- }
-
- fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
- tlvWriter.apply {
- startStructure(tlvTag)
- if (presetHandle != null) {
- put(ContextSpecificTag(TAG_PRESET_HANDLE), presetHandle)
- } else {
- putNull(ContextSpecificTag(TAG_PRESET_HANDLE))
- }
- if (transitionTimestamp != null) {
- put(ContextSpecificTag(TAG_TRANSITION_TIMESTAMP), transitionTimestamp)
- } else {
- putNull(ContextSpecificTag(TAG_TRANSITION_TIMESTAMP))
- }
- endStructure()
- }
- }
-
- companion object {
- private const val TAG_PRESET_HANDLE = 0
- private const val TAG_TRANSITION_TIMESTAMP = 1
-
- fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ThermostatClusterQueuedPresetStruct {
- tlvReader.enterStructure(tlvTag)
- val presetHandle =
- if (!tlvReader.isNull()) {
- tlvReader.getByteArray(ContextSpecificTag(TAG_PRESET_HANDLE))
- } else {
- tlvReader.getNull(ContextSpecificTag(TAG_PRESET_HANDLE))
- null
- }
- val transitionTimestamp =
- if (!tlvReader.isNull()) {
- tlvReader.getUInt(ContextSpecificTag(TAG_TRANSITION_TIMESTAMP))
- } else {
- tlvReader.getNull(ContextSpecificTag(TAG_TRANSITION_TIMESTAMP))
- null
- }
-
- tlvReader.exitContainer()
-
- return ThermostatClusterQueuedPresetStruct(presetHandle, transitionTimestamp)
- }
- }
-}
diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
index 3472866475eb9d..183a61a505c875 100644
--- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
+++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
@@ -31064,73 +31064,6 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
}
return value;
}
- case Attributes::QueuedPreset::Id: {
- using TypeInfo = Attributes::QueuedPreset::TypeInfo;
- TypeInfo::DecodableType cppValue;
- *aError = app::DataModel::Decode(aReader, cppValue);
- if (*aError != CHIP_NO_ERROR)
- {
- return nullptr;
- }
- jobject value;
- if (cppValue.IsNull())
- {
- value = nullptr;
- }
- else
- {
- jobject value_presetHandle;
- if (cppValue.Value().presetHandle.IsNull())
- {
- value_presetHandle = nullptr;
- }
- else
- {
- jbyteArray value_presetHandleByteArray =
- env->NewByteArray(static_cast<jsize>(cppValue.Value().presetHandle.Value().size()));
- env->SetByteArrayRegion(value_presetHandleByteArray, 0,
- static_cast<jsize>(cppValue.Value().presetHandle.Value().size()),
- reinterpret_cast<const jbyte *>(cppValue.Value().presetHandle.Value().data()));
- value_presetHandle = value_presetHandleByteArray;
- }
- jobject value_transitionTimestamp;
- if (cppValue.Value().transitionTimestamp.IsNull())
- {
- value_transitionTimestamp = nullptr;
- }
- else
- {
- std::string value_transitionTimestampClassName = "java/lang/Long";
- std::string value_transitionTimestampCtorSignature = "(J)V";
- jlong jnivalue_transitionTimestamp = static_cast<jlong>(cppValue.Value().transitionTimestamp.Value());
- chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(
- value_transitionTimestampClassName.c_str(), value_transitionTimestampCtorSignature.c_str(),
- jnivalue_transitionTimestamp, value_transitionTimestamp);
- }
-
- jclass queuedPresetStructStructClass_1;
- err = chip::JniReferences::GetInstance().GetLocalClassRef(
- env, "chip/devicecontroller/ChipStructs$ThermostatClusterQueuedPresetStruct", queuedPresetStructStructClass_1);
- if (err != CHIP_NO_ERROR)
- {
- ChipLogError(Zcl, "Could not find class ChipStructs$ThermostatClusterQueuedPresetStruct");
- return nullptr;
- }
-
- jmethodID queuedPresetStructStructCtor_1;
- err = chip::JniReferences::GetInstance().FindMethod(env, queuedPresetStructStructClass_1, "<init>",
- "([BLjava/lang/Long;)V", &queuedPresetStructStructCtor_1);
- if (err != CHIP_NO_ERROR || queuedPresetStructStructCtor_1 == nullptr)
- {
- ChipLogError(Zcl, "Could not find ChipStructs$ThermostatClusterQueuedPresetStruct constructor");
- return nullptr;
- }
-
- value = env->NewObject(queuedPresetStructStructClass_1, queuedPresetStructStructCtor_1, value_presetHandle,
- value_transitionTimestamp);
- }
- return value;
- }
case Attributes::GeneratedCommandList::Id: {
using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
TypeInfo::DecodableType cppValue;
diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py
index 7da79a01c52de0..1f3b1305b5f52f 100644
--- a/src/controller/python/chip/clusters/CHIPClusters.py
+++ b/src/controller/python/chip/clusters/CHIPClusters.py
@@ -8819,7 +8819,6 @@ class ChipClusters:
"commandName": "SetActivePresetRequest",
"args": {
"presetHandle": "bytes",
- "delayMinutes": "int",
},
},
0x00000007: {
@@ -8841,12 +8840,6 @@ class ChipClusters:
"args": {
},
},
- 0x0000000A: {
- "commandId": 0x0000000A,
- "commandName": "CancelSetActivePresetRequest",
- "args": {
- },
- },
0x0000000B: {
"commandId": 0x0000000B,
"commandName": "SetTemperatureSetpointHoldPolicy",
@@ -9257,12 +9250,6 @@ class ChipClusters:
"type": "int",
"reportable": True,
},
- 0x00000055: {
- "attributeName": "QueuedPreset",
- "attributeId": 0x00000055,
- "type": "",
- "reportable": True,
- },
0x0000FFF8: {
"attributeName": "GeneratedCommandList",
"attributeId": 0x0000FFF8,
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index efcad230b34d82..bf94c7ea84ea08 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -32047,7 +32047,6 @@ def descriptor(cls) -> ClusterObjectDescriptor:
ClusterObjectFieldDescriptor(Label="presetsSchedulesEditable", Tag=0x00000052, Type=typing.Optional[bool]),
ClusterObjectFieldDescriptor(Label="temperatureSetpointHoldPolicy", Tag=0x00000053, Type=typing.Optional[uint]),
ClusterObjectFieldDescriptor(Label="setpointHoldExpiryTimestamp", Tag=0x00000054, Type=typing.Union[None, Nullable, uint]),
- ClusterObjectFieldDescriptor(Label="queuedPreset", Tag=0x00000055, Type=typing.Union[None, Nullable, Thermostat.Structs.QueuedPresetStruct]),
ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]),
@@ -32118,7 +32117,6 @@ def descriptor(cls) -> ClusterObjectDescriptor:
presetsSchedulesEditable: 'typing.Optional[bool]' = None
temperatureSetpointHoldPolicy: 'typing.Optional[uint]' = None
setpointHoldExpiryTimestamp: 'typing.Union[None, Nullable, uint]' = None
- queuedPreset: 'typing.Union[None, Nullable, Thermostat.Structs.QueuedPresetStruct]' = None
generatedCommandList: 'typing.List[uint]' = None
acceptedCommandList: 'typing.List[uint]' = None
eventList: 'typing.List[uint]' = None
@@ -32296,7 +32294,6 @@ class Feature(IntFlag):
kMatterScheduleConfiguration = 0x80
kPresets = 0x100
kSetpoints = 0x200
- kQueuedPresetsSupported = 0x400
class HVACSystemTypeBitmap(IntFlag):
kCoolingStage = 0x3
@@ -32430,19 +32427,6 @@ def descriptor(cls) -> ClusterObjectDescriptor:
numberOfPresets: 'uint' = 0
presetTypeFeatures: 'uint' = 0
- @dataclass
- class QueuedPresetStruct(ClusterObject):
- @ChipUtility.classproperty
- def descriptor(cls) -> ClusterObjectDescriptor:
- return ClusterObjectDescriptor(
- Fields=[
- ClusterObjectFieldDescriptor(Label="presetHandle", Tag=0, Type=typing.Union[Nullable, bytes]),
- ClusterObjectFieldDescriptor(Label="transitionTimestamp", Tag=1, Type=typing.Union[Nullable, uint]),
- ])
-
- presetHandle: 'typing.Union[Nullable, bytes]' = NullValue
- transitionTimestamp: 'typing.Union[Nullable, uint]' = NullValue
-
@dataclass
class ScheduleTypeStruct(ClusterObject):
@ChipUtility.classproperty
@@ -32595,11 +32579,9 @@ def descriptor(cls) -> ClusterObjectDescriptor:
return ClusterObjectDescriptor(
Fields=[
ClusterObjectFieldDescriptor(Label="presetHandle", Tag=0, Type=bytes),
- ClusterObjectFieldDescriptor(Label="delayMinutes", Tag=1, Type=typing.Optional[uint]),
])
presetHandle: 'bytes' = b""
- delayMinutes: 'typing.Optional[uint]' = None
@dataclass
class StartPresetsSchedulesEditRequest(ClusterCommand):
@@ -32643,19 +32625,6 @@ def descriptor(cls) -> ClusterObjectDescriptor:
Fields=[
])
- @dataclass
- class CancelSetActivePresetRequest(ClusterCommand):
- cluster_id: typing.ClassVar[int] = 0x00000201
- command_id: typing.ClassVar[int] = 0x0000000A
- is_client: typing.ClassVar[bool] = True
- response_type: typing.ClassVar[str] = None
-
- @ChipUtility.classproperty
- def descriptor(cls) -> ClusterObjectDescriptor:
- return ClusterObjectDescriptor(
- Fields=[
- ])
-
@dataclass
class SetTemperatureSetpointHoldPolicy(ClusterCommand):
cluster_id: typing.ClassVar[int] = 0x00000201
@@ -33665,22 +33634,6 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
value: 'typing.Union[None, Nullable, uint]' = None
- @dataclass
- class QueuedPreset(ClusterAttributeDescriptor):
- @ChipUtility.classproperty
- def cluster_id(cls) -> int:
- return 0x00000201
-
- @ChipUtility.classproperty
- def attribute_id(cls) -> int:
- return 0x00000055
-
- @ChipUtility.classproperty
- def attribute_type(cls) -> ClusterObjectFieldDescriptor:
- return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, Thermostat.Structs.QueuedPresetStruct])
-
- value: 'typing.Union[None, Nullable, Thermostat.Structs.QueuedPresetStruct]' = None
-
@dataclass
class GeneratedCommandList(ClusterAttributeDescriptor):
@ChipUtility.classproperty
diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
index 59a09aa0769686..723133cb74d477 100644
--- a/src/darwin/Framework/CHIP/templates/availability.yaml
+++ b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -9583,7 +9583,6 @@
- PresetsSchedulesEditable
- TemperatureSetpointHoldPolicy
- SetpointHoldExpiryTimestamp
- - QueuedPreset
- ActiveScheduleHandle
UnitTesting:
# Ideally none of UnitTesting would be exposed as public API, but
@@ -9601,7 +9600,6 @@
- StartPresetsSchedulesEditRequest
- CancelPresetsSchedulesEditRequest
- CommitPresetsSchedulesRequest
- - CancelSetActivePresetRequest
- SetTemperatureSetpointHoldPolicy
RVCOperationalState:
# Targeting Spring 2024 Matter release
@@ -9623,7 +9621,6 @@
- PresetStruct
- PresetTypeStruct
- ScheduleTypeStruct
- - QueuedPresetStruct
events:
UnitTesting:
# Ideally none of UnitTesting would be exposed as public API, but
@@ -9670,7 +9667,6 @@
Thermostat:
Feature:
# Targeting Spring 2024 Matter release
- - QueuedPresetsSupported
- Setpoints
- Presets
- MatterScheduleConfiguration
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm
index d45f0fbf796324..0d2f7bca464902 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm
@@ -4167,9 +4167,6 @@ static BOOL AttributeIsSpecifiedInThermostatCluster(AttributeId aAttributeId)
case Attributes::SetpointHoldExpiryTimestamp::Id: {
return YES;
}
- case Attributes::QueuedPreset::Id: {
- return YES;
- }
case Attributes::GeneratedCommandList::Id: {
return YES;
}
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
index 3bfe8b1d374fd8..8ce69c91d5ae56 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
@@ -12496,31 +12496,6 @@ static id _Nullable DecodeAttributeValueForThermostatCluster(AttributeId aAttrib
}
return value;
}
- case Attributes::QueuedPreset::Id: {
- using TypeInfo = Attributes::QueuedPreset::TypeInfo;
- TypeInfo::DecodableType cppValue;
- *aError = DataModel::Decode(aReader, cppValue);
- if (*aError != CHIP_NO_ERROR) {
- return nil;
- }
- MTRThermostatClusterQueuedPresetStruct * _Nullable value;
- if (cppValue.IsNull()) {
- value = nil;
- } else {
- value = [MTRThermostatClusterQueuedPresetStruct new];
- if (cppValue.Value().presetHandle.IsNull()) {
- value.presetHandle = nil;
- } else {
- value.presetHandle = AsData(cppValue.Value().presetHandle.Value());
- }
- if (cppValue.Value().transitionTimestamp.IsNull()) {
- value.transitionTimestamp = nil;
- } else {
- value.transitionTimestamp = [NSNumber numberWithUnsignedInt:cppValue.Value().transitionTimestamp.Value()];
- }
- }
- return value;
- }
default: {
break;
}
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
index 92bbd3e7c7db27..c1ad2950a339f2 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
@@ -10012,14 +10012,6 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
- (void)commitPresetsSchedulesRequestWithParams:(MTRThermostatClusterCommitPresetsSchedulesRequestParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
- (void)commitPresetsSchedulesRequestWithCompletion:(MTRStatusCompletion)completion
MTR_PROVISIONALLY_AVAILABLE;
-/**
- * Command CancelSetActivePresetRequest
- *
- * This command is sent to cancel a queued preset.
- */
-- (void)cancelSetActivePresetRequestWithParams:(MTRThermostatClusterCancelSetActivePresetRequestParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)cancelSetActivePresetRequestWithCompletion:(MTRStatusCompletion)completion
- MTR_PROVISIONALLY_AVAILABLE;
/**
* Command SetTemperatureSetpointHoldPolicy
*
@@ -10457,12 +10449,6 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
+ (void)readAttributeSetpointHoldExpiryTimestampWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)readAttributeQueuedPresetWithCompletion:(void (^)(MTRThermostatClusterQueuedPresetStruct * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)subscribeAttributeQueuedPresetWithParams:(MTRSubscribeParams *)params
- subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
- reportHandler:(void (^)(MTRThermostatClusterQueuedPresetStruct * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
-+ (void)readAttributeQueuedPresetWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(MTRThermostatClusterQueuedPresetStruct * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
-
- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params
subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
@@ -19847,7 +19833,6 @@ typedef NS_OPTIONS(uint32_t, MTRThermostatFeature) {
MTRThermostatFeatureMatterScheduleConfiguration MTR_PROVISIONALLY_AVAILABLE = 0x80,
MTRThermostatFeaturePresets MTR_PROVISIONALLY_AVAILABLE = 0x100,
MTRThermostatFeatureSetpoints MTR_PROVISIONALLY_AVAILABLE = 0x200,
- MTRThermostatFeatureQueuedPresetsSupported MTR_PROVISIONALLY_AVAILABLE = 0x400,
} MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
typedef NS_OPTIONS(uint8_t, MTRThermostatHVACSystemTypeBitmap) {
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
index 3dfc68fddf68b1..b4f9ee8e82e653 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
@@ -67948,34 +67948,6 @@ - (void)commitPresetsSchedulesRequestWithParams:(MTRThermostatClusterCommitPrese
queue:self.callbackQueue
completion:responseHandler];
}
-- (void)cancelSetActivePresetRequestWithCompletion:(MTRStatusCompletion)completion
-{
- [self cancelSetActivePresetRequestWithParams:nil completion:completion];
-}
-- (void)cancelSetActivePresetRequestWithParams:(MTRThermostatClusterCancelSetActivePresetRequestParams * _Nullable)params completion:(MTRStatusCompletion)completion
-{
- if (params == nil) {
- params = [[MTRThermostatClusterCancelSetActivePresetRequestParams
- alloc] init];
- }
-
- auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
- completion(error);
- };
-
- auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
-
- using RequestType = Thermostat::Commands::CancelSetActivePresetRequest::Type;
- [self.device _invokeKnownCommandWithEndpointID:self.endpointID
- clusterID:@(RequestType::GetClusterId())
- commandID:@(RequestType::GetCommandId())
- commandPayload:params
- timedInvokeTimeout:timedInvokeTimeoutMs
- serverSideProcessingTimeout:params.serverSideProcessingTimeout
- responseClass:nil
- queue:self.callbackQueue
- completion:responseHandler];
-}
- (void)setTemperatureSetpointHoldPolicyWithParams:(MTRThermostatClusterSetTemperatureSetpointHoldPolicyParams *)params completion:(MTRStatusCompletion)completion
{
if (params == nil) {
@@ -71193,42 +71165,6 @@ + (void)readAttributeSetpointHoldExpiryTimestampWithClusterStateCache:(MTRCluste
completion:completion];
}
-- (void)readAttributeQueuedPresetWithCompletion:(void (^)(MTRThermostatClusterQueuedPresetStruct * _Nullable value, NSError * _Nullable error))completion
-{
- using TypeInfo = Thermostat::Attributes::QueuedPreset::TypeInfo;
- [self.device _readKnownAttributeWithEndpointID:self.endpointID
- clusterID:@(TypeInfo::GetClusterId())
- attributeID:@(TypeInfo::GetAttributeId())
- params:nil
- queue:self.callbackQueue
- completion:completion];
-}
-
-- (void)subscribeAttributeQueuedPresetWithParams:(MTRSubscribeParams * _Nonnull)params
- subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
- reportHandler:(void (^)(MTRThermostatClusterQueuedPresetStruct * _Nullable value, NSError * _Nullable error))reportHandler
-{
- using TypeInfo = Thermostat::Attributes::QueuedPreset::TypeInfo;
- [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID
- clusterID:@(TypeInfo::GetClusterId())
- attributeID:@(TypeInfo::GetAttributeId())
- params:params
- queue:self.callbackQueue
- reportHandler:reportHandler
- subscriptionEstablished:subscriptionEstablished];
-}
-
-+ (void)readAttributeQueuedPresetWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(MTRThermostatClusterQueuedPresetStruct * _Nullable value, NSError * _Nullable error))completion
-{
- using TypeInfo = Thermostat::Attributes::QueuedPreset::TypeInfo;
- [clusterStateCacheContainer
- _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
- clusterID:TypeInfo::GetClusterId()
- attributeID:TypeInfo::GetAttributeId()
- queue:queue
- completion:completion];
-}
-
- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
{
using TypeInfo = Thermostat::Attributes::GeneratedCommandList::TypeInfo;
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
index d5ac60d60c2172..094d58964241fa 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
@@ -3488,7 +3488,6 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) {
MTRAttributeIDTypeClusterThermostatAttributePresetsSchedulesEditableID MTR_PROVISIONALLY_AVAILABLE = 0x00000052,
MTRAttributeIDTypeClusterThermostatAttributeTemperatureSetpointHoldPolicyID MTR_PROVISIONALLY_AVAILABLE = 0x00000053,
MTRAttributeIDTypeClusterThermostatAttributeSetpointHoldExpiryTimestampID MTR_PROVISIONALLY_AVAILABLE = 0x00000054,
- MTRAttributeIDTypeClusterThermostatAttributeQueuedPresetID MTR_PROVISIONALLY_AVAILABLE = 0x00000055,
MTRAttributeIDTypeClusterThermostatAttributeGeneratedCommandListID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID,
MTRAttributeIDTypeClusterThermostatAttributeAcceptedCommandListID MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID,
MTRAttributeIDTypeClusterThermostatAttributeEventListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeEventListID,
@@ -6593,7 +6592,6 @@ typedef NS_ENUM(uint32_t, MTRCommandIDType) {
MTRCommandIDTypeClusterThermostatCommandStartPresetsSchedulesEditRequestID MTR_PROVISIONALLY_AVAILABLE = 0x00000007,
MTRCommandIDTypeClusterThermostatCommandCancelPresetsSchedulesEditRequestID MTR_PROVISIONALLY_AVAILABLE = 0x00000008,
MTRCommandIDTypeClusterThermostatCommandCommitPresetsSchedulesRequestID MTR_PROVISIONALLY_AVAILABLE = 0x00000009,
- MTRCommandIDTypeClusterThermostatCommandCancelSetActivePresetRequestID MTR_PROVISIONALLY_AVAILABLE = 0x0000000A,
MTRCommandIDTypeClusterThermostatCommandSetTemperatureSetpointHoldPolicyID MTR_PROVISIONALLY_AVAILABLE = 0x0000000B,
// Cluster FanControl deprecated command id names
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm
index 2d293f540a717c..91bdbf48d13e74 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm
@@ -5774,10 +5774,6 @@
result = @"SetpointHoldExpiryTimestamp";
break;
- case MTRAttributeIDTypeClusterThermostatAttributeQueuedPresetID:
- result = @"QueuedPreset";
- break;
-
case MTRAttributeIDTypeClusterThermostatAttributeGeneratedCommandListID:
result = @"GeneratedCommandList";
break;
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
index 37b0cf885f8736..7c4d66189c3b4d 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
@@ -4649,9 +4649,6 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
- (void)commitPresetsSchedulesRequestWithParams:(MTRThermostatClusterCommitPresetsSchedulesRequestParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
- (void)commitPresetsSchedulesRequestWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
MTR_PROVISIONALLY_AVAILABLE;
-- (void)cancelSetActivePresetRequestWithParams:(MTRThermostatClusterCancelSetActivePresetRequestParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)cancelSetActivePresetRequestWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
- MTR_PROVISIONALLY_AVAILABLE;
- (void)setTemperatureSetpointHoldPolicyWithParams:(MTRThermostatClusterSetTemperatureSetpointHoldPolicyParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
- (NSDictionary<NSString *, id> * _Nullable)readAttributeLocalTemperatureWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
@@ -4836,8 +4833,6 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
- (NSDictionary<NSString *, id> * _Nullable)readAttributeSetpointHoldExpiryTimestampWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeQueuedPresetWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
-
- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
index 7a05f312120430..b638b2c8f56890 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
@@ -13300,37 +13300,6 @@ - (void)commitPresetsSchedulesRequestWithParams:(MTRThermostatClusterCommitPrese
completion:responseHandler];
}
-- (void)cancelSetActivePresetRequestWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
-{
- [self cancelSetActivePresetRequestWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
-}
-- (void)cancelSetActivePresetRequestWithParams:(MTRThermostatClusterCancelSetActivePresetRequestParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
-{
- if (params == nil) {
- params = [[MTRThermostatClusterCancelSetActivePresetRequestParams
- alloc] init];
- }
-
- auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
- completion(error);
- };
-
- auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
-
- using RequestType = Thermostat::Commands::CancelSetActivePresetRequest::Type;
- [self.device _invokeKnownCommandWithEndpointID:self.endpointID
- clusterID:@(RequestType::GetClusterId())
- commandID:@(RequestType::GetCommandId())
- commandPayload:params
- expectedValues:expectedValues
- expectedValueInterval:expectedValueIntervalMs
- timedInvokeTimeout:timedInvokeTimeoutMs
- serverSideProcessingTimeout:params.serverSideProcessingTimeout
- responseClass:nil
- queue:self.callbackQueue
- completion:responseHandler];
-}
-
- (void)setTemperatureSetpointHoldPolicyWithParams:(MTRThermostatClusterSetTemperatureSetpointHoldPolicyParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
{
if (params == nil) {
@@ -13987,11 +13956,6 @@ - (void)writeAttributeSchedulesWithValue:(NSDictionary<NSString *, id> *)dataVal
return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeThermostatID) attributeID:@(MTRAttributeIDTypeClusterThermostatAttributeSetpointHoldExpiryTimestampID) params:params];
}
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeQueuedPresetWithParams:(MTRReadParams * _Nullable)params
-{
- return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeThermostatID) attributeID:@(MTRAttributeIDTypeClusterThermostatAttributeQueuedPresetID) params:params];
-}
-
- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
{
return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeThermostatID) attributeID:@(MTRAttributeIDTypeClusterThermostatAttributeGeneratedCommandListID) params:params];
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
index 4bdab512cd6d77..5981d8292c039c 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
@@ -7808,8 +7808,6 @@ MTR_PROVISIONALLY_AVAILABLE
@interface MTRThermostatClusterSetActivePresetRequestParams : NSObject <NSCopying>
@property (nonatomic, copy) NSData * _Nonnull presetHandle MTR_PROVISIONALLY_AVAILABLE;
-
-@property (nonatomic, copy) NSNumber * _Nullable delayMinutes MTR_PROVISIONALLY_AVAILABLE;
/**
* Controls whether the command is a timed command (using Timed Invoke).
*
@@ -7922,34 +7920,6 @@ MTR_PROVISIONALLY_AVAILABLE
@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
@end
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRThermostatClusterCancelSetActivePresetRequestParams : NSObject <NSCopying>
-/**
- * Controls whether the command is a timed command (using Timed Invoke).
- *
- * If nil (the default value), a regular invoke is done for commands that do
- * not require a timed invoke and a timed invoke with some default timed request
- * timeout is done for commands that require a timed invoke.
- *
- * If not nil, a timed invoke is done, with the provided value used as the timed
- * request timeout. The value should be chosen small enough to provide the
- * desired security properties but large enough that it will allow a round-trip
- * from the sever to the client (for the status response and actual invoke
- * request) within the timeout window.
- *
- */
-@property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
-
-/**
- * Controls how much time, in seconds, we will allow for the server to process the command.
- *
- * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes.
- *
- * If nil, the framework will try to select an appropriate timeout value itself.
- */
-@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
-@end
-
MTR_PROVISIONALLY_AVAILABLE
@interface MTRThermostatClusterSetTemperatureSetpointHoldPolicyParams : NSObject <NSCopying>
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
index 9f7ffd3a16b328..295f8444db0b63 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
@@ -22279,8 +22279,6 @@ - (instancetype)init
if (self = [super init]) {
_presetHandle = [NSData data];
-
- _delayMinutes = nil;
_timedInvokeTimeoutMs = nil;
_serverSideProcessingTimeout = nil;
}
@@ -22292,7 +22290,6 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
auto other = [[MTRThermostatClusterSetActivePresetRequestParams alloc] init];
other.presetHandle = self.presetHandle;
- other.delayMinutes = self.delayMinutes;
other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
@@ -22301,7 +22298,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
- (NSString *)description
{
- NSString * descriptionString = [NSString stringWithFormat:@"<%@: presetHandle:%@; delayMinutes:%@; >", NSStringFromClass([self class]), [_presetHandle base64EncodedStringWithOptions:0], _delayMinutes];
+ NSString * descriptionString = [NSString stringWithFormat:@"<%@: presetHandle:%@; >", NSStringFromClass([self class]), [_presetHandle base64EncodedStringWithOptions:0]];
return descriptionString;
}
@@ -22316,12 +22313,6 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
{
encodableStruct.presetHandle = AsByteSpan(self.presetHandle);
}
- {
- if (self.delayMinutes != nil) {
- auto & definedValue_0 = encodableStruct.delayMinutes.Emplace();
- definedValue_0 = self.delayMinutes.unsignedShortValue;
- }
- }
auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
if (buffer.IsNull()) {
@@ -22586,79 +22577,6 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
}
@end
-@implementation MTRThermostatClusterCancelSetActivePresetRequestParams
-- (instancetype)init
-{
- if (self = [super init]) {
- _timedInvokeTimeoutMs = nil;
- _serverSideProcessingTimeout = nil;
- }
- return self;
-}
-
-- (id)copyWithZone:(NSZone * _Nullable)zone;
-{
- auto other = [[MTRThermostatClusterCancelSetActivePresetRequestParams alloc] init];
-
- other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
- other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
-
- return other;
-}
-
-- (NSString *)description
-{
- NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
- return descriptionString;
-}
-
-@end
-
-@implementation MTRThermostatClusterCancelSetActivePresetRequestParams (InternalMethods)
-
-- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
-{
- chip::app::Clusters::Thermostat::Commands::CancelSetActivePresetRequest::Type encodableStruct;
- ListFreer listFreer;
-
- auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
- if (buffer.IsNull()) {
- return CHIP_ERROR_NO_MEMORY;
- }
-
- chip::System::PacketBufferTLVWriter writer;
- // Commands never need chained buffers, since they cannot be chunked.
- writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
-
- ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct));
-
- ReturnErrorOnFailure(writer.Finalize(&buffer));
-
- reader.Init(std::move(buffer));
- return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
-}
-
-- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
-{
- chip::System::PacketBufferTLVReader reader;
- CHIP_ERROR err = [self _encodeToTLVReader:reader];
- if (err != CHIP_NO_ERROR) {
- if (error) {
- *error = [MTRError errorForCHIPErrorCode:err];
- }
- return nil;
- }
-
- auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
- if (decodedObj == nil) {
- if (error) {
- *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
- }
- }
- return decodedObj;
-}
-@end
-
@implementation MTRThermostatClusterSetTemperatureSetpointHoldPolicyParams
- (instancetype)init
{
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h
index c229f6cda86db8..d3746f9d936895 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h
@@ -1486,12 +1486,6 @@ NS_ASSUME_NONNULL_BEGIN
@end
-@interface MTRThermostatClusterCancelSetActivePresetRequestParams (InternalMethods)
-
-- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
-
-@end
-
@interface MTRThermostatClusterSetTemperatureSetpointHoldPolicyParams (InternalMethods)
- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error;
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
index 92f82f3496fca9..b804aee8b5ace1 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
@@ -1675,12 +1675,6 @@ MTR_PROVISIONALLY_AVAILABLE
@property (nonatomic, copy) NSNumber * _Nonnull presetTypeFeatures MTR_PROVISIONALLY_AVAILABLE;
@end
-MTR_PROVISIONALLY_AVAILABLE
-@interface MTRThermostatClusterQueuedPresetStruct : NSObject <NSCopying>
-@property (nonatomic, copy) NSData * _Nullable presetHandle MTR_PROVISIONALLY_AVAILABLE;
-@property (nonatomic, copy) NSNumber * _Nullable transitionTimestamp MTR_PROVISIONALLY_AVAILABLE;
-@end
-
MTR_PROVISIONALLY_AVAILABLE
@interface MTRThermostatClusterScheduleTypeStruct : NSObject <NSCopying>
@property (nonatomic, copy) NSNumber * _Nonnull systemMode MTR_PROVISIONALLY_AVAILABLE;
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
index f0869bd61918fb..d3182118beb89c 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
@@ -7073,36 +7073,6 @@ - (NSString *)description
@end
-@implementation MTRThermostatClusterQueuedPresetStruct
-- (instancetype)init
-{
- if (self = [super init]) {
-
- _presetHandle = nil;
-
- _transitionTimestamp = nil;
- }
- return self;
-}
-
-- (id)copyWithZone:(NSZone * _Nullable)zone
-{
- auto other = [[MTRThermostatClusterQueuedPresetStruct alloc] init];
-
- other.presetHandle = self.presetHandle;
- other.transitionTimestamp = self.transitionTimestamp;
-
- return other;
-}
-
-- (NSString *)description
-{
- NSString * descriptionString = [NSString stringWithFormat:@"<%@: presetHandle:%@; transitionTimestamp:%@; >", NSStringFromClass([self class]), [_presetHandle base64EncodedStringWithOptions:0], _transitionTimestamp];
- return descriptionString;
-}
-
-@end
-
@implementation MTRThermostatClusterScheduleTypeStruct
- (instancetype)init
{
diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h
index ab6514fdf02103..80e42e929fe08a 100644
--- a/zzz_generated/app-common/app-common/zap-generated/callback.h
+++ b/zzz_generated/app-common/app-common/zap-generated/callback.h
@@ -6317,12 +6317,6 @@ bool emberAfThermostatClusterCancelPresetsSchedulesEditRequestCallback(
bool emberAfThermostatClusterCommitPresetsSchedulesRequestCallback(
chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
const chip::app::Clusters::Thermostat::Commands::CommitPresetsSchedulesRequest::DecodableType & commandData);
-/**
- * @brief Thermostat Cluster CancelSetActivePresetRequest Command callback (from client)
- */
-bool emberAfThermostatClusterCancelSetActivePresetRequestCallback(
- chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
- const chip::app::Clusters::Thermostat::Commands::CancelSetActivePresetRequest::DecodableType & commandData);
/**
* @brief Thermostat Cluster SetTemperatureSetpointHoldPolicy Command callback (from client)
*/
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
index 50cc1b63f37cc3..62bf3473649525 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
@@ -4053,7 +4053,6 @@ enum class Feature : uint32_t
kMatterScheduleConfiguration = 0x80,
kPresets = 0x100,
kSetpoints = 0x200,
- kQueuedPresetsSupported = 0x400,
};
// Bitmap for HVACSystemTypeBitmap
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
index b21ac03febabb8..8fc3c32562d3d7 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
@@ -20817,47 +20817,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
} // namespace PresetTypeStruct
-namespace QueuedPresetStruct {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
-{
- DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
- encoder.Encode(to_underlying(Fields::kPresetHandle), presetHandle);
- encoder.Encode(to_underlying(Fields::kTransitionTimestamp), transitionTimestamp);
- return encoder.Finalize();
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
- detail::StructDecodeIterator __iterator(reader);
- while (true)
- {
- auto __element = __iterator.Next();
- if (std::holds_alternative<CHIP_ERROR>(__element))
- {
- return std::get<CHIP_ERROR>(__element);
- }
-
- CHIP_ERROR err = CHIP_NO_ERROR;
- const uint8_t __context_tag = std::get<uint8_t>(__element);
-
- if (__context_tag == to_underlying(Fields::kPresetHandle))
- {
- err = DataModel::Decode(reader, presetHandle);
- }
- else if (__context_tag == to_underlying(Fields::kTransitionTimestamp))
- {
- err = DataModel::Decode(reader, transitionTimestamp);
- }
- else
- {
- }
-
- ReturnErrorOnFailure(err);
- }
-}
-
-} // namespace QueuedPresetStruct
-
namespace ScheduleTypeStruct {
CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
{
@@ -21187,7 +21146,6 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
{
DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
encoder.Encode(to_underlying(Fields::kPresetHandle), presetHandle);
- encoder.Encode(to_underlying(Fields::kDelayMinutes), delayMinutes);
return encoder.Finalize();
}
@@ -21209,10 +21167,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
{
err = DataModel::Decode(reader, presetHandle);
}
- else if (__context_tag == to_underlying(Fields::kDelayMinutes))
- {
- err = DataModel::Decode(reader, delayMinutes);
- }
else
{
}
@@ -21295,26 +21249,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
}
}
} // namespace CommitPresetsSchedulesRequest.
-namespace CancelSetActivePresetRequest {
-CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
-{
- DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
- return encoder.Finalize();
-}
-
-CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
-{
- detail::StructDecodeIterator __iterator(reader);
- while (true)
- {
- auto __element = __iterator.Next();
- if (std::holds_alternative<CHIP_ERROR>(__element))
- {
- return std::get<CHIP_ERROR>(__element);
- }
- }
-}
-} // namespace CancelSetActivePresetRequest.
namespace SetTemperatureSetpointHoldPolicy {
CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
{
@@ -21480,8 +21414,6 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
return DataModel::Decode(reader, temperatureSetpointHoldPolicy);
case Attributes::SetpointHoldExpiryTimestamp::TypeInfo::GetAttributeId():
return DataModel::Decode(reader, setpointHoldExpiryTimestamp);
- case Attributes::QueuedPreset::TypeInfo::GetAttributeId():
- return DataModel::Decode(reader, queuedPreset);
case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId():
return DataModel::Decode(reader, generatedCommandList);
case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId():
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
index a4561d80d66c0a..9c335d4ba91dcb 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
@@ -29147,29 +29147,6 @@ struct Type
using DecodableType = Type;
} // namespace PresetTypeStruct
-namespace QueuedPresetStruct {
-enum class Fields : uint8_t
-{
- kPresetHandle = 0,
- kTransitionTimestamp = 1,
-};
-
-struct Type
-{
-public:
- DataModel::Nullable<chip::ByteSpan> presetHandle;
- DataModel::Nullable<uint32_t> transitionTimestamp;
-
- CHIP_ERROR Decode(TLV::TLVReader & reader);
-
- static constexpr bool kIsFabricScoped = false;
-
- CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
-};
-
-using DecodableType = Type;
-
-} // namespace QueuedPresetStruct
namespace ScheduleTypeStruct {
enum class Fields : uint8_t
{
@@ -29275,11 +29252,6 @@ struct Type;
struct DecodableType;
} // namespace CommitPresetsSchedulesRequest
-namespace CancelSetActivePresetRequest {
-struct Type;
-struct DecodableType;
-} // namespace CancelSetActivePresetRequest
-
namespace SetTemperatureSetpointHoldPolicy {
struct Type;
struct DecodableType;
@@ -29504,7 +29476,6 @@ namespace SetActivePresetRequest {
enum class Fields : uint8_t
{
kPresetHandle = 0,
- kDelayMinutes = 1,
};
struct Type
@@ -29515,7 +29486,6 @@ struct Type
static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; }
chip::ByteSpan presetHandle;
- Optional<uint16_t> delayMinutes;
CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
@@ -29531,7 +29501,6 @@ struct DecodableType
static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; }
chip::ByteSpan presetHandle;
- Optional<uint16_t> delayMinutes;
CHIP_ERROR Decode(TLV::TLVReader & reader);
};
}; // namespace SetActivePresetRequest
@@ -29623,34 +29592,6 @@ struct DecodableType
CHIP_ERROR Decode(TLV::TLVReader & reader);
};
}; // namespace CommitPresetsSchedulesRequest
-namespace CancelSetActivePresetRequest {
-enum class Fields : uint8_t
-{
-};
-
-struct Type
-{
-public:
- // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
- static constexpr CommandId GetCommandId() { return Commands::CancelSetActivePresetRequest::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; }
-
- CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
-
- using ResponseType = DataModel::NullObjectType;
-
- static constexpr bool MustUseTimedInvoke() { return false; }
-};
-
-struct DecodableType
-{
-public:
- static constexpr CommandId GetCommandId() { return Commands::CancelSetActivePresetRequest::Id; }
- static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; }
-
- CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace CancelSetActivePresetRequest
namespace SetTemperatureSetpointHoldPolicy {
enum class Fields : uint8_t
{
@@ -30443,20 +30384,6 @@ struct TypeInfo
static constexpr bool MustUseTimedWrite() { return false; }
};
} // namespace SetpointHoldExpiryTimestamp
-namespace QueuedPreset {
-struct TypeInfo
-{
- using Type = chip::app::DataModel::Nullable<chip::app::Clusters::Thermostat::Structs::QueuedPresetStruct::Type>;
- using DecodableType =
- chip::app::DataModel::Nullable<chip::app::Clusters::Thermostat::Structs::QueuedPresetStruct::DecodableType>;
- using DecodableArgType =
- const chip::app::DataModel::Nullable<chip::app::Clusters::Thermostat::Structs::QueuedPresetStruct::DecodableType> &;
-
- static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; }
- static constexpr AttributeId GetAttributeId() { return Attributes::QueuedPreset::Id; }
- static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace QueuedPreset
namespace GeneratedCommandList {
struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
{
@@ -30579,7 +30506,6 @@ struct TypeInfo
Attributes::TemperatureSetpointHoldPolicy::TypeInfo::DecodableType temperatureSetpointHoldPolicy =
static_cast<chip::BitMask<chip::app::Clusters::Thermostat::TemperatureSetpointHoldPolicyBitmap>>(0);
Attributes::SetpointHoldExpiryTimestamp::TypeInfo::DecodableType setpointHoldExpiryTimestamp;
- Attributes::QueuedPreset::TypeInfo::DecodableType queuedPreset;
Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList;
Attributes::EventList::TypeInfo::DecodableType eventList;
diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h
index 193cec36ba2a3e..224f09ff69f44d 100644
--- a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h
+++ b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h
@@ -5194,10 +5194,6 @@ namespace SetpointHoldExpiryTimestamp {
static constexpr AttributeId Id = 0x00000054;
} // namespace SetpointHoldExpiryTimestamp
-namespace QueuedPreset {
-static constexpr AttributeId Id = 0x00000055;
-} // namespace QueuedPreset
-
namespace GeneratedCommandList {
static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id;
} // namespace GeneratedCommandList
diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h
index 382737bcee0c8e..4a8e4a830a44f7 100644
--- a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h
+++ b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h
@@ -1328,10 +1328,6 @@ namespace CommitPresetsSchedulesRequest {
static constexpr CommandId Id = 0x00000009;
} // namespace CommitPresetsSchedulesRequest
-namespace CancelSetActivePresetRequest {
-static constexpr CommandId Id = 0x0000000A;
-} // namespace CancelSetActivePresetRequest
-
namespace SetTemperatureSetpointHoldPolicy {
static constexpr CommandId Id = 0x0000000B;
} // namespace SetTemperatureSetpointHoldPolicy
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
index 7aa2430955f57c..dd2f2c40082af8 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
@@ -9395,7 +9395,6 @@ class ServiceAreaSkipCurrentLocation : public ClusterCommand
| * StartPresetsSchedulesEditRequest | 0x07 |
| * CancelPresetsSchedulesEditRequest | 0x08 |
| * CommitPresetsSchedulesRequest | 0x09 |
-| * CancelSetActivePresetRequest | 0x0A |
| * SetTemperatureSetpointHoldPolicy | 0x0B |
|------------------------------------------------------------------------------|
| Attributes: | |
@@ -9461,7 +9460,6 @@ class ServiceAreaSkipCurrentLocation : public ClusterCommand
| * PresetsSchedulesEditable | 0x0052 |
| * TemperatureSetpointHoldPolicy | 0x0053 |
| * SetpointHoldExpiryTimestamp | 0x0054 |
-| * QueuedPreset | 0x0055 |
| * GeneratedCommandList | 0xFFF8 |
| * AcceptedCommandList | 0xFFF9 |
| * EventList | 0xFFFA |
@@ -9679,7 +9677,6 @@ class ThermostatSetActivePresetRequest : public ClusterCommand
ClusterCommand("set-active-preset-request", credsIssuerConfig)
{
AddArgument("PresetHandle", &mRequest.presetHandle);
- AddArgument("DelayMinutes", 0, UINT16_MAX, &mRequest.delayMinutes);
ClusterCommand::AddArguments();
}
@@ -9820,43 +9817,6 @@ class ThermostatCommitPresetsSchedulesRequest : public ClusterCommand
chip::app::Clusters::Thermostat::Commands::CommitPresetsSchedulesRequest::Type mRequest;
};
-/*
- * Command CancelSetActivePresetRequest
- */
-class ThermostatCancelSetActivePresetRequest : public ClusterCommand
-{
-public:
- ThermostatCancelSetActivePresetRequest(CredentialIssuerCommands * credsIssuerConfig) :
- ClusterCommand("cancel-set-active-preset-request", credsIssuerConfig)
- {
- ClusterCommand::AddArguments();
- }
-
- CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
- {
- constexpr chip::ClusterId clusterId = chip::app::Clusters::Thermostat::Id;
- constexpr chip::CommandId commandId = chip::app::Clusters::Thermostat::Commands::CancelSetActivePresetRequest::Id;
-
- ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId,
- commandId, endpointIds.at(0));
- return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest);
- }
-
- CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override
- {
- constexpr chip::ClusterId clusterId = chip::app::Clusters::Thermostat::Id;
- constexpr chip::CommandId commandId = chip::app::Clusters::Thermostat::Commands::CancelSetActivePresetRequest::Id;
-
- ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId,
- groupId);
-
- return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
- }
-
-private:
- chip::app::Clusters::Thermostat::Commands::CancelSetActivePresetRequest::Type mRequest;
-};
-
/*
* Command SetTemperatureSetpointHoldPolicy
*/
@@ -22969,7 +22929,6 @@ void registerClusterThermostat(Commands & commands, CredentialIssuerCommands * c
make_unique<ThermostatStartPresetsSchedulesEditRequest>(credsIssuerConfig), //
make_unique<ThermostatCancelPresetsSchedulesEditRequest>(credsIssuerConfig), //
make_unique<ThermostatCommitPresetsSchedulesRequest>(credsIssuerConfig), //
- make_unique<ThermostatCancelSetActivePresetRequest>(credsIssuerConfig), //
make_unique<ThermostatSetTemperatureSetpointHoldPolicy>(credsIssuerConfig), //
//
// Attributes
@@ -23056,7 +23015,6 @@ void registerClusterThermostat(Commands & commands, CredentialIssuerCommands * c
credsIssuerConfig), //
make_unique<ReadAttribute>(Id, "setpoint-hold-expiry-timestamp", Attributes::SetpointHoldExpiryTimestamp::Id,
credsIssuerConfig), //
- make_unique<ReadAttribute>(Id, "queued-preset", Attributes::QueuedPreset::Id, credsIssuerConfig), //
make_unique<ReadAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
make_unique<ReadAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), //
make_unique<ReadAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig), //
@@ -23229,9 +23187,6 @@ void registerClusterThermostat(Commands & commands, CredentialIssuerCommands * c
make_unique<WriteAttribute<chip::app::DataModel::Nullable<uint32_t>>>(Id, "setpoint-hold-expiry-timestamp", 0, UINT32_MAX,
Attributes::SetpointHoldExpiryTimestamp::Id,
WriteCommandType::kForceWrite, credsIssuerConfig), //
- make_unique<WriteAttributeAsComplex<
- chip::app::DataModel::Nullable<chip::app::Clusters::Thermostat::Structs::QueuedPresetStruct::Type>>>(
- Id, "queued-preset", Attributes::QueuedPreset::Id, WriteCommandType::kForceWrite, credsIssuerConfig), //
make_unique<WriteAttributeAsComplex<chip::app::DataModel::List<const chip::CommandId>>>(
Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite,
credsIssuerConfig), //
@@ -23331,7 +23286,6 @@ void registerClusterThermostat(Commands & commands, CredentialIssuerCommands * c
credsIssuerConfig), //
make_unique<SubscribeAttribute>(Id, "setpoint-hold-expiry-timestamp", Attributes::SetpointHoldExpiryTimestamp::Id,
credsIssuerConfig), //
- make_unique<SubscribeAttribute>(Id, "queued-preset", Attributes::QueuedPreset::Id, credsIssuerConfig), //
make_unique<SubscribeAttribute>(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), //
make_unique<SubscribeAttribute>(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), //
make_unique<SubscribeAttribute>(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig), //
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
index 624acd23feb594..c6d7864443fafe 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
@@ -4175,38 +4175,6 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::Thermostat::Structs::P
ComplexArgumentParser::Finalize(request.presetTypeFeatures);
}
-CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
- chip::app::Clusters::Thermostat::Structs::QueuedPresetStruct::Type & request,
- Json::Value & value)
-{
- VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
-
- // Copy to track which members we already processed.
- Json::Value valueCopy(value);
-
- ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("QueuedPresetStruct.presetHandle", "presetHandle",
- value.isMember("presetHandle")));
- ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("QueuedPresetStruct.transitionTimestamp", "transitionTimestamp",
- value.isMember("transitionTimestamp")));
-
- char labelWithMember[kMaxLabelLength];
- snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "presetHandle");
- ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.presetHandle, value["presetHandle"]));
- valueCopy.removeMember("presetHandle");
-
- snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "transitionTimestamp");
- ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.transitionTimestamp, value["transitionTimestamp"]));
- valueCopy.removeMember("transitionTimestamp");
-
- return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy);
-}
-
-void ComplexArgumentParser::Finalize(chip::app::Clusters::Thermostat::Structs::QueuedPresetStruct::Type & request)
-{
- ComplexArgumentParser::Finalize(request.presetHandle);
- ComplexArgumentParser::Finalize(request.transitionTimestamp);
-}
-
CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
chip::app::Clusters::Thermostat::Structs::ScheduleTypeStruct::Type & request,
Json::Value & value)
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
index b32e8eedcefb9f..c258467efab2a6 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
@@ -471,11 +471,6 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::Thermostat::Str
static void Finalize(chip::app::Clusters::Thermostat::Structs::PresetTypeStruct::Type & request);
-static CHIP_ERROR Setup(const char * label, chip::app::Clusters::Thermostat::Structs::QueuedPresetStruct::Type & request,
- Json::Value & value);
-
-static void Finalize(chip::app::Clusters::Thermostat::Structs::QueuedPresetStruct::Type & request);
-
static CHIP_ERROR Setup(const char * label, chip::app::Clusters::Thermostat::Structs::ScheduleTypeStruct::Type & request,
Json::Value & value);
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
index 78566172c45403..d062e7aeac77c5 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
@@ -3699,31 +3699,6 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
return CHIP_NO_ERROR;
}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
- const chip::app::Clusters::Thermostat::Structs::QueuedPresetStruct::DecodableType & value)
-{
- DataModelLogger::LogString(label, indent, "{");
- {
- CHIP_ERROR err = LogValue("PresetHandle", indent + 1, value.presetHandle);
- if (err != CHIP_NO_ERROR)
- {
- DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'PresetHandle'");
- return err;
- }
- }
- {
- CHIP_ERROR err = LogValue("TransitionTimestamp", indent + 1, value.transitionTimestamp);
- if (err != CHIP_NO_ERROR)
- {
- DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'TransitionTimestamp'");
- return err;
- }
- }
- DataModelLogger::LogString(indent, "}");
-
- return CHIP_NO_ERROR;
-}
-
CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
const chip::app::Clusters::Thermostat::Structs::ScheduleTypeStruct::DecodableType & value)
{
@@ -14850,11 +14825,6 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
return DataModelLogger::LogValue("SetpointHoldExpiryTimestamp", 1, value);
}
- case Thermostat::Attributes::QueuedPreset::Id: {
- chip::app::DataModel::Nullable<chip::app::Clusters::Thermostat::Structs::QueuedPresetStruct::DecodableType> value;
- ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
- return DataModelLogger::LogValue("QueuedPreset", 1, value);
- }
case Thermostat::Attributes::GeneratedCommandList::Id: {
chip::app::DataModel::DecodableList<chip::CommandId> value;
ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
index 7ee50893968ccd..8a74b57e503b30 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
@@ -294,9 +294,6 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::Thermostat::Structs::PresetTypeStruct::DecodableType & value);
-static CHIP_ERROR LogValue(const char * label, size_t indent,
- const chip::app::Clusters::Thermostat::Structs::QueuedPresetStruct::DecodableType & value);
-
static CHIP_ERROR LogValue(const char * label, size_t indent,
const chip::app::Clusters::Thermostat::Structs::ScheduleTypeStruct::DecodableType & value);
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
index 4c09589a60f4ad..39f9c949872dfe 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
@@ -106823,7 +106823,6 @@ class SubscribeAttributePumpConfigurationAndControlClusterRevision : public Subs
| * StartPresetsSchedulesEditRequest | 0x07 |
| * CancelPresetsSchedulesEditRequest | 0x08 |
| * CommitPresetsSchedulesRequest | 0x09 |
-| * CancelSetActivePresetRequest | 0x0A |
| * SetTemperatureSetpointHoldPolicy | 0x0B |
|------------------------------------------------------------------------------|
| Attributes: | |
@@ -106889,7 +106888,6 @@ class SubscribeAttributePumpConfigurationAndControlClusterRevision : public Subs
| * PresetsSchedulesEditable | 0x0052 |
| * TemperatureSetpointHoldPolicy | 0x0053 |
| * SetpointHoldExpiryTimestamp | 0x0054 |
-| * QueuedPreset | 0x0055 |
| * GeneratedCommandList | 0xFFF8 |
| * AcceptedCommandList | 0xFFF9 |
| * EventList | 0xFFFA |
@@ -107186,9 +107184,6 @@ class ThermostatSetActivePresetRequest : public ClusterCommand {
{
#if MTR_ENABLE_PROVISIONAL
AddArgument("PresetHandle", &mRequest.presetHandle);
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
- AddArgument("DelayMinutes", 0, UINT16_MAX, &mRequest.delayMinutes);
#endif // MTR_ENABLE_PROVISIONAL
ClusterCommand::AddArguments();
}
@@ -107206,13 +107201,6 @@ class ThermostatSetActivePresetRequest : public ClusterCommand {
params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
#if MTR_ENABLE_PROVISIONAL
params.presetHandle = [NSData dataWithBytes:mRequest.presetHandle.data() length:mRequest.presetHandle.size()];
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
- if (mRequest.delayMinutes.HasValue()) {
- params.delayMinutes = [NSNumber numberWithUnsignedShort:mRequest.delayMinutes.Value()];
- } else {
- params.delayMinutes = nil;
- }
#endif // MTR_ENABLE_PROVISIONAL
uint16_t repeatCount = mRepeatCount.ValueOr(1);
uint16_t __block responsesNeeded = repeatCount;
@@ -107382,52 +107370,6 @@ class ThermostatCommitPresetsSchedulesRequest : public ClusterCommand {
private:
};
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-/*
- * Command CancelSetActivePresetRequest
- */
-class ThermostatCancelSetActivePresetRequest : public ClusterCommand {
-public:
- ThermostatCancelSetActivePresetRequest()
- : ClusterCommand("cancel-set-active-preset-request")
- {
- ClusterCommand::AddArguments();
- }
-
- CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
- {
- constexpr chip::ClusterId clusterId = chip::app::Clusters::Thermostat::Id;
- constexpr chip::CommandId commandId = chip::app::Clusters::Thermostat::Commands::CancelSetActivePresetRequest::Id;
-
- ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId);
-
- dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
- __auto_type * params = [[MTRThermostatClusterCancelSetActivePresetRequestParams alloc] init];
- params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
- uint16_t repeatCount = mRepeatCount.ValueOr(1);
- uint16_t __block responsesNeeded = repeatCount;
- while (repeatCount--) {
- [cluster cancelSetActivePresetRequestWithParams:params completion:
- ^(NSError * _Nullable error) {
- responsesNeeded--;
- if (error != nil) {
- mError = error;
- LogNSError("Error", error);
- RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
- }
- if (responsesNeeded == 0) {
- SetCommandExitStatus(mError);
- }
- }];
- }
- return CHIP_NO_ERROR;
- }
-
-private:
-};
-
#endif // MTR_ENABLE_PROVISIONAL
#if MTR_ENABLE_PROVISIONAL
/*
@@ -113911,91 +113853,6 @@ class SubscribeAttributeThermostatSetpointHoldExpiryTimestamp : public Subscribe
}
};
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-
-/*
- * Attribute QueuedPreset
- */
-class ReadThermostatQueuedPreset : public ReadAttribute {
-public:
- ReadThermostatQueuedPreset()
- : ReadAttribute("queued-preset")
- {
- }
-
- ~ReadThermostatQueuedPreset()
- {
- }
-
- CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
- {
- constexpr chip::ClusterId clusterId = chip::app::Clusters::Thermostat::Id;
- constexpr chip::AttributeId attributeId = chip::app::Clusters::Thermostat::Attributes::QueuedPreset::Id;
-
- ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId);
-
- dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
- [cluster readAttributeQueuedPresetWithCompletion:^(MTRThermostatClusterQueuedPresetStruct * _Nullable value, NSError * _Nullable error) {
- NSLog(@"Thermostat.QueuedPreset response %@", [value description]);
- if (error == nil) {
- RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
- } else {
- LogNSError("Thermostat QueuedPreset read Error", error);
- RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
- }
- SetCommandExitStatus(error);
- }];
- return CHIP_NO_ERROR;
- }
-};
-
-class SubscribeAttributeThermostatQueuedPreset : public SubscribeAttribute {
-public:
- SubscribeAttributeThermostatQueuedPreset()
- : SubscribeAttribute("queued-preset")
- {
- }
-
- ~SubscribeAttributeThermostatQueuedPreset()
- {
- }
-
- CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
- {
- constexpr chip::ClusterId clusterId = chip::app::Clusters::Thermostat::Id;
- constexpr chip::CommandId attributeId = chip::app::Clusters::Thermostat::Attributes::QueuedPreset::Id;
-
- ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId);
- dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL);
- __auto_type * cluster = [[MTRBaseClusterThermostat alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
- __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
- if (mKeepSubscriptions.HasValue()) {
- params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
- }
- if (mFabricFiltered.HasValue()) {
- params.filterByFabric = mFabricFiltered.Value();
- }
- if (mAutoResubscribe.HasValue()) {
- params.resubscribeAutomatically = mAutoResubscribe.Value();
- }
- [cluster subscribeAttributeQueuedPresetWithParams:params
- subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
- reportHandler:^(MTRThermostatClusterQueuedPresetStruct * _Nullable value, NSError * _Nullable error) {
- NSLog(@"Thermostat.QueuedPreset response %@", [value description]);
- if (error == nil) {
- RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
- } else {
- RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
- }
- SetCommandExitStatus(error);
- }];
-
- return CHIP_NO_ERROR;
- }
-};
-
#endif // MTR_ENABLE_PROVISIONAL
/*
@@ -194223,9 +194080,6 @@ void registerClusterThermostat(Commands & commands)
#if MTR_ENABLE_PROVISIONAL
make_unique<ThermostatCommitPresetsSchedulesRequest>(), //
#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
- make_unique<ThermostatCancelSetActivePresetRequest>(), //
-#endif // MTR_ENABLE_PROVISIONAL
#if MTR_ENABLE_PROVISIONAL
make_unique<ThermostatSetTemperatureSetpointHoldPolicy>(), //
#endif // MTR_ENABLE_PROVISIONAL
@@ -194410,10 +194264,6 @@ void registerClusterThermostat(Commands & commands)
#if MTR_ENABLE_PROVISIONAL
make_unique<ReadThermostatSetpointHoldExpiryTimestamp>(), //
make_unique<SubscribeAttributeThermostatSetpointHoldExpiryTimestamp>(), //
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
- make_unique<ReadThermostatQueuedPreset>(), //
- make_unique<SubscribeAttributeThermostatQueuedPreset>(), //
#endif // MTR_ENABLE_PROVISIONAL
make_unique<ReadThermostatGeneratedCommandList>(), //
make_unique<SubscribeAttributeThermostatGeneratedCommandList>(), //