Skip to content

Commit 343e70f

Browse files
hastyhasty
committed
Regenerated source files for thermostat
1 parent aae9787 commit 343e70f

File tree

63 files changed

+2050
-3232
lines changed

Some content is hidden

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

63 files changed

+2050
-3232
lines changed

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

+47-42
Original file line numberDiff line numberDiff line change
@@ -1225,7 +1225,7 @@ cluster ActivatedCarbonFilterMonitoring = 114 {
12251225

12261226
/** An interface for configuring and controlling the functionality of a thermostat. */
12271227
cluster Thermostat = 513 {
1228-
revision 6;
1228+
revision 7;
12291229

12301230
enum ACCapacityFormatEnum : enum8 {
12311231
kBTUh = 0;
@@ -1261,6 +1261,12 @@ cluster Thermostat = 513 {
12611261
kHeatPumpInverter = 4;
12621262
}
12631263

1264+
enum AtomicRequestTypeEnum : enum8 {
1265+
kBeginWrite = 0;
1266+
kCommitWrite = 1;
1267+
kRollbackWrite = 2;
1268+
}
1269+
12641270
enum ControlSequenceOfOperationEnum : enum8 {
12651271
kCoolingOnly = 0;
12661272
kCoolingWithReheat = 1;
@@ -1271,13 +1277,13 @@ cluster Thermostat = 513 {
12711277
}
12721278

12731279
enum PresetScenarioEnum : enum8 {
1274-
kUnspecified = 0;
12751280
kOccupied = 1;
12761281
kUnoccupied = 2;
12771282
kSleep = 3;
12781283
kWake = 4;
12791284
kVacation = 5;
1280-
kUserDefined = 6;
1285+
kGoingToSleep = 6;
1286+
kUserDefined = 254;
12811287
}
12821288

12831289
enum SetpointChangeSourceEnum : enum8 {
@@ -1343,7 +1349,6 @@ cluster Thermostat = 513 {
13431349
kLocalTemperatureNotExposed = 0x40;
13441350
kMatterScheduleConfiguration = 0x80;
13451351
kPresets = 0x100;
1346-
kSetpoints = 0x200;
13471352
}
13481353

13491354
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -1353,6 +1358,10 @@ cluster Thermostat = 513 {
13531358
kHeatingUsesFuel = 0x20;
13541359
}
13551360

1361+
bitmap OccupancyBitmap : bitmap8 {
1362+
kOccupied = 0x1;
1363+
}
1364+
13561365
bitmap PresetTypeFeaturesBitmap : bitmap16 {
13571366
kAutomatic = 0x1;
13581367
kSupportsNames = 0x2;
@@ -1403,11 +1412,6 @@ cluster Thermostat = 513 {
14031412
kSupportsOff = 0x8;
14041413
}
14051414

1406-
bitmap TemperatureSetpointHoldPolicyBitmap : bitmap8 {
1407-
kHoldDurationElapsed = 0x1;
1408-
kHoldDurationElapsedOrPresetChanged = 0x2;
1409-
}
1410-
14111415
struct ScheduleTransitionStruct {
14121416
ScheduleDayOfWeekBitmap dayOfWeek = 0;
14131417
int16u transitionTime = 1;
@@ -1423,7 +1427,12 @@ cluster Thermostat = 513 {
14231427
optional char_string<64> name = 2;
14241428
optional octet_string<16> presetHandle = 3;
14251429
ScheduleTransitionStruct transitions[] = 4;
1426-
optional nullable boolean builtIn = 5;
1430+
nullable boolean builtIn = 5;
1431+
}
1432+
1433+
struct AtomicAttributeStatusStruct {
1434+
optional attrib_id attributeID = 0;
1435+
optional status statusCode = 1;
14271436
}
14281437

14291438
struct PresetStruct {
@@ -1455,23 +1464,23 @@ cluster Thermostat = 513 {
14551464

14561465
readonly attribute nullable temperature localTemperature = 0;
14571466
readonly attribute optional nullable temperature outdoorTemperature = 1;
1458-
readonly attribute optional bitmap8 occupancy = 2;
1467+
readonly attribute optional OccupancyBitmap occupancy = 2;
14591468
readonly attribute optional temperature absMinHeatSetpointLimit = 3;
14601469
readonly attribute optional temperature absMaxHeatSetpointLimit = 4;
14611470
readonly attribute optional temperature absMinCoolSetpointLimit = 5;
14621471
readonly attribute optional temperature absMaxCoolSetpointLimit = 6;
14631472
readonly attribute optional int8u PICoolingDemand = 7;
14641473
readonly attribute optional int8u PIHeatingDemand = 8;
1465-
attribute access(write: manage) optional bitmap8 HVACSystemTypeConfiguration = 9;
1474+
attribute access(write: manage) optional HVACSystemTypeBitmap HVACSystemTypeConfiguration = 9;
14661475
attribute access(write: manage) optional int8s localTemperatureCalibration = 16;
1467-
attribute optional int16s occupiedCoolingSetpoint = 17;
1468-
attribute optional int16s occupiedHeatingSetpoint = 18;
1469-
attribute optional int16s unoccupiedCoolingSetpoint = 19;
1470-
attribute optional int16s unoccupiedHeatingSetpoint = 20;
1471-
attribute access(write: manage) optional int16s minHeatSetpointLimit = 21;
1472-
attribute access(write: manage) optional int16s maxHeatSetpointLimit = 22;
1473-
attribute access(write: manage) optional int16s minCoolSetpointLimit = 23;
1474-
attribute access(write: manage) optional int16s maxCoolSetpointLimit = 24;
1476+
attribute optional temperature occupiedCoolingSetpoint = 17;
1477+
attribute optional temperature occupiedHeatingSetpoint = 18;
1478+
attribute optional temperature unoccupiedCoolingSetpoint = 19;
1479+
attribute optional temperature unoccupiedHeatingSetpoint = 20;
1480+
attribute access(write: manage) optional temperature minHeatSetpointLimit = 21;
1481+
attribute access(write: manage) optional temperature maxHeatSetpointLimit = 22;
1482+
attribute access(write: manage) optional temperature minCoolSetpointLimit = 23;
1483+
attribute access(write: manage) optional temperature maxCoolSetpointLimit = 24;
14751484
attribute access(write: manage) optional int8s minSetpointDeadBand = 25;
14761485
attribute access(write: manage) optional RemoteSensingBitmap remoteSensing = 26;
14771486
attribute access(write: manage) ControlSequenceOfOperationEnum controlSequenceOfOperation = 27;
@@ -1501,7 +1510,7 @@ cluster Thermostat = 513 {
15011510
attribute access(write: manage) optional ACErrorCodeBitmap ACErrorCode = 68;
15021511
attribute access(write: manage) optional ACLouverPositionEnum ACLouverPosition = 69;
15031512
readonly attribute optional nullable temperature ACCoilTemperature = 70;
1504-
attribute access(write: manage) optional ACCapacityFormatEnum ACCapacityformat = 71;
1513+
attribute access(write: manage) optional ACCapacityFormatEnum ACCapacityFormat = 71;
15051514
readonly attribute optional PresetTypeStruct presetTypes[] = 72;
15061515
readonly attribute optional ScheduleTypeStruct scheduleTypes[] = 73;
15071516
readonly attribute optional int8u numberOfPresets = 74;
@@ -1512,9 +1521,7 @@ cluster Thermostat = 513 {
15121521
readonly attribute optional nullable octet_string<16> activeScheduleHandle = 79;
15131522
attribute access(write: manage) optional PresetStruct presets[] = 80;
15141523
attribute access(write: manage) optional ScheduleStruct schedules[] = 81;
1515-
readonly attribute optional boolean presetsSchedulesEditable = 82;
1516-
readonly attribute optional TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 83;
1517-
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 84;
1524+
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 82;
15181525
readonly attribute command_id generatedCommandList[] = 65528;
15191526
readonly attribute command_id acceptedCommandList[] = 65529;
15201527
readonly attribute event_id eventList[] = 65530;
@@ -1554,34 +1561,32 @@ cluster Thermostat = 513 {
15541561
octet_string<16> presetHandle = 0;
15551562
}
15561563

1557-
request struct StartPresetsSchedulesEditRequestRequest {
1558-
int16u timeoutSeconds = 0;
1564+
response struct AtomicResponse = 253 {
1565+
status statusCode = 0;
1566+
AtomicAttributeStatusStruct attributeStatus[] = 1;
1567+
optional int16u timeout = 2;
15591568
}
15601569

1561-
request struct SetTemperatureSetpointHoldPolicyRequest {
1562-
TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 0;
1570+
request struct AtomicRequestRequest {
1571+
AtomicRequestTypeEnum requestType = 0;
1572+
attrib_id attributeRequests[] = 1;
1573+
optional int16u timeout = 2;
15631574
}
15641575

1565-
/** Command description for SetpointRaiseLower */
1576+
/** Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them. */
15661577
command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0;
1567-
/** Command description for SetWeeklySchedule */
1578+
/** Upon receipt, the weekly schedule for updating setpoints SHALL be stored in the */
15681579
command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1;
1569-
/** Command description for GetWeeklySchedule */
1580+
/** Upon receipt, the unit SHOULD send in return the Get */
15701581
command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2;
1571-
/** This command is used to clear the weekly schedule. The ClearWeeklySchedule command has no payload. */
1582+
/** This command is used to clear the weekly schedule. */
15721583
command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3;
1573-
/** This command is used to set the active schedule. */
1584+
/** Upon receipt, if the */
15741585
command SetActiveScheduleRequest(SetActiveScheduleRequestRequest): DefaultSuccess = 5;
1575-
/** This command is used to set the active preset. */
1586+
/** ID */
15761587
command SetActivePresetRequest(SetActivePresetRequestRequest): DefaultSuccess = 6;
1577-
/** This command is used to start editing the presets and schedules. */
1578-
command access(invoke: manage) StartPresetsSchedulesEditRequest(StartPresetsSchedulesEditRequestRequest): DefaultSuccess = 7;
1579-
/** This command is used to cancel editing presets and schedules. */
1580-
command access(invoke: manage) CancelPresetsSchedulesEditRequest(): DefaultSuccess = 8;
1581-
/** This command is used to notify the server that all edits are done and should be committed. */
1582-
command access(invoke: manage) CommitPresetsSchedulesRequest(): DefaultSuccess = 9;
1583-
/** This command sets the set point hold policy. */
1584-
command SetTemperatureSetpointHoldPolicy(SetTemperatureSetpointHoldPolicyRequest): DefaultSuccess = 11;
1588+
/** Begins, Commits or Cancels an atomic write */
1589+
command access(invoke: manage) AtomicRequest(AtomicRequestRequest): AtomicResponse = 254;
15851590
}
15861591

15871592
/** An interface for controlling a fan in a heating/cooling system. */

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

+49-44
Original file line numberDiff line numberDiff line change
@@ -4954,7 +4954,7 @@ cluster PumpConfigurationAndControl = 512 {
49544954

49554955
/** An interface for configuring and controlling the functionality of a thermostat. */
49564956
cluster Thermostat = 513 {
4957-
revision 6;
4957+
revision 7;
49584958

49594959
enum ACCapacityFormatEnum : enum8 {
49604960
kBTUh = 0;
@@ -4990,6 +4990,12 @@ cluster Thermostat = 513 {
49904990
kHeatPumpInverter = 4;
49914991
}
49924992

4993+
enum AtomicRequestTypeEnum : enum8 {
4994+
kBeginWrite = 0;
4995+
kCommitWrite = 1;
4996+
kRollbackWrite = 2;
4997+
}
4998+
49934999
enum ControlSequenceOfOperationEnum : enum8 {
49945000
kCoolingOnly = 0;
49955001
kCoolingWithReheat = 1;
@@ -5000,13 +5006,13 @@ cluster Thermostat = 513 {
50005006
}
50015007

50025008
enum PresetScenarioEnum : enum8 {
5003-
kUnspecified = 0;
50045009
kOccupied = 1;
50055010
kUnoccupied = 2;
50065011
kSleep = 3;
50075012
kWake = 4;
50085013
kVacation = 5;
5009-
kUserDefined = 6;
5014+
kGoingToSleep = 6;
5015+
kUserDefined = 254;
50105016
}
50115017

50125018
enum SetpointChangeSourceEnum : enum8 {
@@ -5072,7 +5078,6 @@ cluster Thermostat = 513 {
50725078
kLocalTemperatureNotExposed = 0x40;
50735079
kMatterScheduleConfiguration = 0x80;
50745080
kPresets = 0x100;
5075-
kSetpoints = 0x200;
50765081
}
50775082

50785083
bitmap HVACSystemTypeBitmap : bitmap8 {
@@ -5082,6 +5087,10 @@ cluster Thermostat = 513 {
50825087
kHeatingUsesFuel = 0x20;
50835088
}
50845089

5090+
bitmap OccupancyBitmap : bitmap8 {
5091+
kOccupied = 0x1;
5092+
}
5093+
50855094
bitmap PresetTypeFeaturesBitmap : bitmap16 {
50865095
kAutomatic = 0x1;
50875096
kSupportsNames = 0x2;
@@ -5132,11 +5141,6 @@ cluster Thermostat = 513 {
51325141
kSupportsOff = 0x8;
51335142
}
51345143

5135-
bitmap TemperatureSetpointHoldPolicyBitmap : bitmap8 {
5136-
kHoldDurationElapsed = 0x1;
5137-
kHoldDurationElapsedOrPresetChanged = 0x2;
5138-
}
5139-
51405144
struct ScheduleTransitionStruct {
51415145
ScheduleDayOfWeekBitmap dayOfWeek = 0;
51425146
int16u transitionTime = 1;
@@ -5152,7 +5156,12 @@ cluster Thermostat = 513 {
51525156
optional char_string<64> name = 2;
51535157
optional octet_string<16> presetHandle = 3;
51545158
ScheduleTransitionStruct transitions[] = 4;
5155-
optional nullable boolean builtIn = 5;
5159+
nullable boolean builtIn = 5;
5160+
}
5161+
5162+
struct AtomicAttributeStatusStruct {
5163+
optional attrib_id attributeID = 0;
5164+
optional status statusCode = 1;
51565165
}
51575166

51585167
struct PresetStruct {
@@ -5184,23 +5193,23 @@ cluster Thermostat = 513 {
51845193

51855194
readonly attribute nullable temperature localTemperature = 0;
51865195
readonly attribute optional nullable temperature outdoorTemperature = 1;
5187-
readonly attribute optional bitmap8 occupancy = 2;
5196+
readonly attribute optional OccupancyBitmap occupancy = 2;
51885197
readonly attribute optional temperature absMinHeatSetpointLimit = 3;
51895198
readonly attribute optional temperature absMaxHeatSetpointLimit = 4;
51905199
readonly attribute optional temperature absMinCoolSetpointLimit = 5;
51915200
readonly attribute optional temperature absMaxCoolSetpointLimit = 6;
51925201
readonly attribute optional int8u PICoolingDemand = 7;
51935202
readonly attribute optional int8u PIHeatingDemand = 8;
5194-
attribute access(write: manage) optional bitmap8 HVACSystemTypeConfiguration = 9;
5203+
attribute access(write: manage) optional HVACSystemTypeBitmap HVACSystemTypeConfiguration = 9;
51955204
attribute access(write: manage) optional int8s localTemperatureCalibration = 16;
5196-
attribute optional int16s occupiedCoolingSetpoint = 17;
5197-
attribute optional int16s occupiedHeatingSetpoint = 18;
5198-
attribute optional int16s unoccupiedCoolingSetpoint = 19;
5199-
attribute optional int16s unoccupiedHeatingSetpoint = 20;
5200-
attribute access(write: manage) optional int16s minHeatSetpointLimit = 21;
5201-
attribute access(write: manage) optional int16s maxHeatSetpointLimit = 22;
5202-
attribute access(write: manage) optional int16s minCoolSetpointLimit = 23;
5203-
attribute access(write: manage) optional int16s maxCoolSetpointLimit = 24;
5205+
attribute optional temperature occupiedCoolingSetpoint = 17;
5206+
attribute optional temperature occupiedHeatingSetpoint = 18;
5207+
attribute optional temperature unoccupiedCoolingSetpoint = 19;
5208+
attribute optional temperature unoccupiedHeatingSetpoint = 20;
5209+
attribute access(write: manage) optional temperature minHeatSetpointLimit = 21;
5210+
attribute access(write: manage) optional temperature maxHeatSetpointLimit = 22;
5211+
attribute access(write: manage) optional temperature minCoolSetpointLimit = 23;
5212+
attribute access(write: manage) optional temperature maxCoolSetpointLimit = 24;
52045213
attribute access(write: manage) optional int8s minSetpointDeadBand = 25;
52055214
attribute access(write: manage) optional RemoteSensingBitmap remoteSensing = 26;
52065215
attribute access(write: manage) ControlSequenceOfOperationEnum controlSequenceOfOperation = 27;
@@ -5230,7 +5239,7 @@ cluster Thermostat = 513 {
52305239
attribute access(write: manage) optional ACErrorCodeBitmap ACErrorCode = 68;
52315240
attribute access(write: manage) optional ACLouverPositionEnum ACLouverPosition = 69;
52325241
readonly attribute optional nullable temperature ACCoilTemperature = 70;
5233-
attribute access(write: manage) optional ACCapacityFormatEnum ACCapacityformat = 71;
5242+
attribute access(write: manage) optional ACCapacityFormatEnum ACCapacityFormat = 71;
52345243
readonly attribute optional PresetTypeStruct presetTypes[] = 72;
52355244
readonly attribute optional ScheduleTypeStruct scheduleTypes[] = 73;
52365245
readonly attribute optional int8u numberOfPresets = 74;
@@ -5241,9 +5250,7 @@ cluster Thermostat = 513 {
52415250
readonly attribute optional nullable octet_string<16> activeScheduleHandle = 79;
52425251
attribute access(write: manage) optional PresetStruct presets[] = 80;
52435252
attribute access(write: manage) optional ScheduleStruct schedules[] = 81;
5244-
readonly attribute optional boolean presetsSchedulesEditable = 82;
5245-
readonly attribute optional TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 83;
5246-
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 84;
5253+
readonly attribute optional nullable epoch_s setpointHoldExpiryTimestamp = 82;
52475254
readonly attribute command_id generatedCommandList[] = 65528;
52485255
readonly attribute command_id acceptedCommandList[] = 65529;
52495256
readonly attribute event_id eventList[] = 65530;
@@ -5283,34 +5290,32 @@ cluster Thermostat = 513 {
52835290
octet_string<16> presetHandle = 0;
52845291
}
52855292

5286-
request struct StartPresetsSchedulesEditRequestRequest {
5287-
int16u timeoutSeconds = 0;
5293+
response struct AtomicResponse = 253 {
5294+
status statusCode = 0;
5295+
AtomicAttributeStatusStruct attributeStatus[] = 1;
5296+
optional int16u timeout = 2;
52885297
}
52895298

5290-
request struct SetTemperatureSetpointHoldPolicyRequest {
5291-
TemperatureSetpointHoldPolicyBitmap temperatureSetpointHoldPolicy = 0;
5299+
request struct AtomicRequestRequest {
5300+
AtomicRequestTypeEnum requestType = 0;
5301+
attrib_id attributeRequests[] = 1;
5302+
optional int16u timeout = 2;
52925303
}
52935304

5294-
/** Command description for SetpointRaiseLower */
5305+
/** Upon receipt, the attributes for the indicated setpoint(s) SHALL have the amount specified in the Amount field added to them. */
52955306
command SetpointRaiseLower(SetpointRaiseLowerRequest): DefaultSuccess = 0;
5296-
/** Command description for SetWeeklySchedule */
5307+
/** Upon receipt, the weekly schedule for updating setpoints SHALL be stored in the */
52975308
command access(invoke: manage) SetWeeklySchedule(SetWeeklyScheduleRequest): DefaultSuccess = 1;
5298-
/** Command description for GetWeeklySchedule */
5309+
/** Upon receipt, the unit SHOULD send in return the Get */
52995310
command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2;
5300-
/** This command is used to clear the weekly schedule. The ClearWeeklySchedule command has no payload. */
5311+
/** This command is used to clear the weekly schedule. */
53015312
command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3;
5302-
/** This command is used to set the active schedule. */
5313+
/** Upon receipt, if the */
53035314
command SetActiveScheduleRequest(SetActiveScheduleRequestRequest): DefaultSuccess = 5;
5304-
/** This command is used to set the active preset. */
5315+
/** ID */
53055316
command SetActivePresetRequest(SetActivePresetRequestRequest): DefaultSuccess = 6;
5306-
/** This command is used to start editing the presets and schedules. */
5307-
command access(invoke: manage) StartPresetsSchedulesEditRequest(StartPresetsSchedulesEditRequestRequest): DefaultSuccess = 7;
5308-
/** This command is used to cancel editing presets and schedules. */
5309-
command access(invoke: manage) CancelPresetsSchedulesEditRequest(): DefaultSuccess = 8;
5310-
/** This command is used to notify the server that all edits are done and should be committed. */
5311-
command access(invoke: manage) CommitPresetsSchedulesRequest(): DefaultSuccess = 9;
5312-
/** This command sets the set point hold policy. */
5313-
command SetTemperatureSetpointHoldPolicy(SetTemperatureSetpointHoldPolicyRequest): DefaultSuccess = 11;
5317+
/** Begins, Commits or Cancels an atomic write */
5318+
command access(invoke: manage) AtomicRequest(AtomicRequestRequest): AtomicResponse = 254;
53145319
}
53155320

53165321
/** An interface for controlling a fan in a heating/cooling system. */
@@ -8597,8 +8602,6 @@ endpoint 1 {
85978602
ram attribute activeScheduleHandle;
85988603
callback attribute presets;
85998604
callback attribute schedules;
8600-
ram attribute presetsSchedulesEditable;
8601-
ram attribute temperatureSetpointHoldPolicy default = 0;
86028605
ram attribute setpointHoldExpiryTimestamp;
86038606
callback attribute generatedCommandList;
86048607
callback attribute acceptedCommandList;
@@ -8608,6 +8611,8 @@ endpoint 1 {
86088611
ram attribute clusterRevision default = 6;
86098612

86108613
handle command SetpointRaiseLower;
8614+
handle command AtomicResponse;
8615+
handle command AtomicRequest;
86118616
}
86128617

86138618
server cluster FanControl {

0 commit comments

Comments
 (0)