Skip to content

Commit

Permalink
Bunch of changes related to review
Browse files Browse the repository at this point in the history
  • Loading branch information
@drempelg
drempelg committed Dec 2, 2023
1 parent fce08ea commit b4ba301
Show file tree
Hide file tree
Showing 54 changed files with 971 additions and 1,517 deletions.
36 changes: 10 additions & 26 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4055,17 +4055,11 @@ cluster Thermostat = 513 {
kFanFail = 0x10;
}

bitmap AlarmCodeBitmap : bitmap8 {
kInitialization = 0x1;
kHardware = 0x2;
kSelfCalibration = 0x4;
}

bitmap Feature : bitmap32 {
kHeating = 0x1;
kCooling = 0x2;
kOccupancy = 0x4;
kZigbeeScheduleConfiguration = 0x8;
kScheduleConfiguration = 0x8;
kSetback = 0x10;
kAutoMode = 0x20;
kLocalTemperatureNotExposed = 0x40;
Expand Down Expand Up @@ -4118,8 +4112,8 @@ cluster Thermostat = 513 {

struct WeeklyScheduleTransitionStruct {
int16u transitionTime = 0;
temperature heatSetpoint = 1;
temperature coolSetpoint = 2;
nullable temperature heatSetpoint = 1;
nullable temperature coolSetpoint = 2;
}

readonly attribute nullable temperature localTemperature = 0;
Expand All @@ -4131,11 +4125,12 @@ cluster Thermostat = 513 {
readonly attribute optional temperature absMaxCoolSetpointLimit = 6;
readonly attribute optional int8u PICoolingDemand = 7;
readonly attribute optional int8u PIHeatingDemand = 8;
attribute access(write: manage) optional bitmap8 HVACSystemTypeConfiguration = 9;
attribute access(write: manage) optional int8s localTemperatureCalibration = 16;
attribute optional temperature occupiedCoolingSetpoint = 17;
attribute optional temperature occupiedHeatingSetpoint = 18;
attribute optional temperature unoccupiedCoolingSetpoint = 19;
attribute optional temperature unoccupiedHeatingSetpoint = 20;
attribute optional int16s occupiedCoolingSetpoint = 17;
attribute optional int16s occupiedHeatingSetpoint = 18;
attribute optional int16s unoccupiedCoolingSetpoint = 19;
attribute optional int16s unoccupiedHeatingSetpoint = 20;
attribute access(write: manage) optional temperature minHeatSetpointLimit = 21;
attribute access(write: manage) optional temperature maxHeatSetpointLimit = 22;
attribute access(write: manage) optional temperature minCoolSetpointLimit = 23;
Expand Down Expand Up @@ -4184,27 +4179,18 @@ cluster Thermostat = 513 {

response struct GetWeeklyScheduleResponse = 0 {
int8u numberOfTransitionsForSequence = 0;
ScheduleDayOfWeekBitmap dayOfWeekforSequence = 1;
ScheduleDayOfWeekBitmap dayOfWeekForSequence = 1;
ScheduleModeBitmap modeForSequence = 2;
WeeklyScheduleTransitionStruct transitions[] = 3;
}

request struct SetWeeklyScheduleRequest {
int8u numberOfTransitionsForSequence = 0;
ScheduleDayOfWeekBitmap dayOfWeekforSequence = 1;
ScheduleDayOfWeekBitmap dayOfWeekForSequence = 1;
ScheduleModeBitmap modeForSequence = 2;
WeeklyScheduleTransitionStruct transitions[] = 3;
}

response struct GetRelayStatusLogResponse = 1 {
int16u timeOfDay = 0;
RelayStateBitmap relayStatus = 1;
nullable temperature localTemperature = 2;
nullable int8u humidityInPercentage = 3;
temperature setPoint = 4;
int16u unreadEntries = 5;
}

request struct GetWeeklyScheduleRequest {
ScheduleDayOfWeekBitmap daysToReturn = 0;
ScheduleModeBitmap modeToReturn = 1;
Expand All @@ -4218,8 +4204,6 @@ cluster Thermostat = 513 {
command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2;
/** The Clear Weekly Schedule command is used to clear the weekly schedule. */
command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3;
/** This command is used to query the thermostat internal relay status log. This command has no payload. */
command GetRelayStatusLog(): GetRelayStatusLogResponse = 4;
}

/** An interface for controlling a fan in a heating/cooling system. */
Expand Down
36 changes: 10 additions & 26 deletions examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3586,17 +3586,11 @@ cluster Thermostat = 513 {
kFanFail = 0x10;
}

bitmap AlarmCodeBitmap : bitmap8 {
kInitialization = 0x1;
kHardware = 0x2;
kSelfCalibration = 0x4;
}

bitmap Feature : bitmap32 {
kHeating = 0x1;
kCooling = 0x2;
kOccupancy = 0x4;
kZigbeeScheduleConfiguration = 0x8;
kScheduleConfiguration = 0x8;
kSetback = 0x10;
kAutoMode = 0x20;
kLocalTemperatureNotExposed = 0x40;
Expand Down Expand Up @@ -3649,8 +3643,8 @@ cluster Thermostat = 513 {

struct WeeklyScheduleTransitionStruct {
int16u transitionTime = 0;
temperature heatSetpoint = 1;
temperature coolSetpoint = 2;
nullable temperature heatSetpoint = 1;
nullable temperature coolSetpoint = 2;
}

readonly attribute nullable temperature localTemperature = 0;
Expand All @@ -3662,11 +3656,12 @@ cluster Thermostat = 513 {
readonly attribute optional temperature absMaxCoolSetpointLimit = 6;
readonly attribute optional int8u PICoolingDemand = 7;
readonly attribute optional int8u PIHeatingDemand = 8;
attribute access(write: manage) optional bitmap8 HVACSystemTypeConfiguration = 9;
attribute access(write: manage) optional int8s localTemperatureCalibration = 16;
attribute optional temperature occupiedCoolingSetpoint = 17;
attribute optional temperature occupiedHeatingSetpoint = 18;
attribute optional temperature unoccupiedCoolingSetpoint = 19;
attribute optional temperature unoccupiedHeatingSetpoint = 20;
attribute optional int16s occupiedCoolingSetpoint = 17;
attribute optional int16s occupiedHeatingSetpoint = 18;
attribute optional int16s unoccupiedCoolingSetpoint = 19;
attribute optional int16s unoccupiedHeatingSetpoint = 20;
attribute access(write: manage) optional temperature minHeatSetpointLimit = 21;
attribute access(write: manage) optional temperature maxHeatSetpointLimit = 22;
attribute access(write: manage) optional temperature minCoolSetpointLimit = 23;
Expand Down Expand Up @@ -3715,27 +3710,18 @@ cluster Thermostat = 513 {

response struct GetWeeklyScheduleResponse = 0 {
int8u numberOfTransitionsForSequence = 0;
ScheduleDayOfWeekBitmap dayOfWeekforSequence = 1;
ScheduleDayOfWeekBitmap dayOfWeekForSequence = 1;
ScheduleModeBitmap modeForSequence = 2;
WeeklyScheduleTransitionStruct transitions[] = 3;
}

request struct SetWeeklyScheduleRequest {
int8u numberOfTransitionsForSequence = 0;
ScheduleDayOfWeekBitmap dayOfWeekforSequence = 1;
ScheduleDayOfWeekBitmap dayOfWeekForSequence = 1;
ScheduleModeBitmap modeForSequence = 2;
WeeklyScheduleTransitionStruct transitions[] = 3;
}

response struct GetRelayStatusLogResponse = 1 {
int16u timeOfDay = 0;
RelayStateBitmap relayStatus = 1;
nullable temperature localTemperature = 2;
nullable int8u humidityInPercentage = 3;
temperature setPoint = 4;
int16u unreadEntries = 5;
}

request struct GetWeeklyScheduleRequest {
ScheduleDayOfWeekBitmap daysToReturn = 0;
ScheduleModeBitmap modeToReturn = 1;
Expand All @@ -3749,8 +3735,6 @@ cluster Thermostat = 513 {
command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2;
/** The Clear Weekly Schedule command is used to clear the weekly schedule. */
command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3;
/** This command is used to query the thermostat internal relay status log. This command has no payload. */
command GetRelayStatusLog(): GetRelayStatusLogResponse = 4;
}

/** An interface for controlling a fan in a heating/cooling system. */
Expand Down
36 changes: 10 additions & 26 deletions ...irpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1230,17 +1230,11 @@ cluster Thermostat = 513 {
kFanFail = 0x10;
}

bitmap AlarmCodeBitmap : bitmap8 {
kInitialization = 0x1;
kHardware = 0x2;
kSelfCalibration = 0x4;
}

bitmap Feature : bitmap32 {
kHeating = 0x1;
kCooling = 0x2;
kOccupancy = 0x4;
kZigbeeScheduleConfiguration = 0x8;
kScheduleConfiguration = 0x8;
kSetback = 0x10;
kAutoMode = 0x20;
kLocalTemperatureNotExposed = 0x40;
Expand Down Expand Up @@ -1293,8 +1287,8 @@ cluster Thermostat = 513 {

struct WeeklyScheduleTransitionStruct {
int16u transitionTime = 0;
temperature heatSetpoint = 1;
temperature coolSetpoint = 2;
nullable temperature heatSetpoint = 1;
nullable temperature coolSetpoint = 2;
}

readonly attribute nullable temperature localTemperature = 0;
Expand All @@ -1306,11 +1300,12 @@ cluster Thermostat = 513 {
readonly attribute optional temperature absMaxCoolSetpointLimit = 6;
readonly attribute optional int8u PICoolingDemand = 7;
readonly attribute optional int8u PIHeatingDemand = 8;
attribute access(write: manage) optional bitmap8 HVACSystemTypeConfiguration = 9;
attribute access(write: manage) optional int8s localTemperatureCalibration = 16;
attribute optional temperature occupiedCoolingSetpoint = 17;
attribute optional temperature occupiedHeatingSetpoint = 18;
attribute optional temperature unoccupiedCoolingSetpoint = 19;
attribute optional temperature unoccupiedHeatingSetpoint = 20;
attribute optional int16s occupiedCoolingSetpoint = 17;
attribute optional int16s occupiedHeatingSetpoint = 18;
attribute optional int16s unoccupiedCoolingSetpoint = 19;
attribute optional int16s unoccupiedHeatingSetpoint = 20;
attribute access(write: manage) optional temperature minHeatSetpointLimit = 21;
attribute access(write: manage) optional temperature maxHeatSetpointLimit = 22;
attribute access(write: manage) optional temperature minCoolSetpointLimit = 23;
Expand Down Expand Up @@ -1359,27 +1354,18 @@ cluster Thermostat = 513 {

response struct GetWeeklyScheduleResponse = 0 {
int8u numberOfTransitionsForSequence = 0;
ScheduleDayOfWeekBitmap dayOfWeekforSequence = 1;
ScheduleDayOfWeekBitmap dayOfWeekForSequence = 1;
ScheduleModeBitmap modeForSequence = 2;
WeeklyScheduleTransitionStruct transitions[] = 3;
}

request struct SetWeeklyScheduleRequest {
int8u numberOfTransitionsForSequence = 0;
ScheduleDayOfWeekBitmap dayOfWeekforSequence = 1;
ScheduleDayOfWeekBitmap dayOfWeekForSequence = 1;
ScheduleModeBitmap modeForSequence = 2;
WeeklyScheduleTransitionStruct transitions[] = 3;
}

response struct GetRelayStatusLogResponse = 1 {
int16u timeOfDay = 0;
RelayStateBitmap relayStatus = 1;
nullable temperature localTemperature = 2;
nullable int8u humidityInPercentage = 3;
temperature setPoint = 4;
int16u unreadEntries = 5;
}

request struct GetWeeklyScheduleRequest {
ScheduleDayOfWeekBitmap daysToReturn = 0;
ScheduleModeBitmap modeToReturn = 1;
Expand All @@ -1393,8 +1379,6 @@ cluster Thermostat = 513 {
command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2;
/** The Clear Weekly Schedule command is used to clear the weekly schedule. */
command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3;
/** This command is used to query the thermostat internal relay status log. This command has no payload. */
command GetRelayStatusLog(): GetRelayStatusLogResponse = 4;
}

/** An interface for controlling a fan in a heating/cooling system. */
Expand Down
36 changes: 10 additions & 26 deletions examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1585,17 +1585,11 @@ cluster Thermostat = 513 {
kFanFail = 0x10;
}

bitmap AlarmCodeBitmap : bitmap8 {
kInitialization = 0x1;
kHardware = 0x2;
kSelfCalibration = 0x4;
}

bitmap Feature : bitmap32 {
kHeating = 0x1;
kCooling = 0x2;
kOccupancy = 0x4;
kZigbeeScheduleConfiguration = 0x8;
kScheduleConfiguration = 0x8;
kSetback = 0x10;
kAutoMode = 0x20;
kLocalTemperatureNotExposed = 0x40;
Expand Down Expand Up @@ -1648,8 +1642,8 @@ cluster Thermostat = 513 {

struct WeeklyScheduleTransitionStruct {
int16u transitionTime = 0;
temperature heatSetpoint = 1;
temperature coolSetpoint = 2;
nullable temperature heatSetpoint = 1;
nullable temperature coolSetpoint = 2;
}

readonly attribute nullable temperature localTemperature = 0;
Expand All @@ -1661,11 +1655,12 @@ cluster Thermostat = 513 {
readonly attribute optional temperature absMaxCoolSetpointLimit = 6;
readonly attribute optional int8u PICoolingDemand = 7;
readonly attribute optional int8u PIHeatingDemand = 8;
attribute access(write: manage) optional bitmap8 HVACSystemTypeConfiguration = 9;
attribute access(write: manage) optional int8s localTemperatureCalibration = 16;
attribute optional temperature occupiedCoolingSetpoint = 17;
attribute optional temperature occupiedHeatingSetpoint = 18;
attribute optional temperature unoccupiedCoolingSetpoint = 19;
attribute optional temperature unoccupiedHeatingSetpoint = 20;
attribute optional int16s occupiedCoolingSetpoint = 17;
attribute optional int16s occupiedHeatingSetpoint = 18;
attribute optional int16s unoccupiedCoolingSetpoint = 19;
attribute optional int16s unoccupiedHeatingSetpoint = 20;
attribute access(write: manage) optional temperature minHeatSetpointLimit = 21;
attribute access(write: manage) optional temperature maxHeatSetpointLimit = 22;
attribute access(write: manage) optional temperature minCoolSetpointLimit = 23;
Expand Down Expand Up @@ -1714,27 +1709,18 @@ cluster Thermostat = 513 {

response struct GetWeeklyScheduleResponse = 0 {
int8u numberOfTransitionsForSequence = 0;
ScheduleDayOfWeekBitmap dayOfWeekforSequence = 1;
ScheduleDayOfWeekBitmap dayOfWeekForSequence = 1;
ScheduleModeBitmap modeForSequence = 2;
WeeklyScheduleTransitionStruct transitions[] = 3;
}

request struct SetWeeklyScheduleRequest {
int8u numberOfTransitionsForSequence = 0;
ScheduleDayOfWeekBitmap dayOfWeekforSequence = 1;
ScheduleDayOfWeekBitmap dayOfWeekForSequence = 1;
ScheduleModeBitmap modeForSequence = 2;
WeeklyScheduleTransitionStruct transitions[] = 3;
}

response struct GetRelayStatusLogResponse = 1 {
int16u timeOfDay = 0;
RelayStateBitmap relayStatus = 1;
nullable temperature localTemperature = 2;
nullable int8u humidityInPercentage = 3;
temperature setPoint = 4;
int16u unreadEntries = 5;
}

request struct GetWeeklyScheduleRequest {
ScheduleDayOfWeekBitmap daysToReturn = 0;
ScheduleModeBitmap modeToReturn = 1;
Expand All @@ -1748,8 +1734,6 @@ cluster Thermostat = 513 {
command GetWeeklySchedule(GetWeeklyScheduleRequest): GetWeeklyScheduleResponse = 2;
/** The Clear Weekly Schedule command is used to clear the weekly schedule. */
command access(invoke: manage) ClearWeeklySchedule(): DefaultSuccess = 3;
/** This command is used to query the thermostat internal relay status log. This command has no payload. */
command GetRelayStatusLog(): GetRelayStatusLogResponse = 4;
}

/** An interface for controlling a fan in a heating/cooling system. */
Expand Down
Loading

0 comments on commit b4ba301

Please sign in to comment.