Align naming in Thermostat cluster XML with the spec. (#24622)

* Align naming in Thermostat cluster XML with the spec. * Regenerate generated code.
project-chip · Jan 30, 2024 · 1139011 · 1139011
1 parent fa90ef9
commit 1139011
Show file tree

Hide file tree

Showing 19 changed files with 261 additions and 185 deletions.
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
@@ -2665,9 +2665,9 @@ server cluster PumpConfigurationAndControl = 512 {
 
 server cluster Thermostat = 513 {
  enum SetpointAdjustMode : ENUM8 {
- kHeatSetpoint = 0;
- kCoolSetpoint = 1;
- kHeatAndCoolSetpoints = 2;
+ kHeat = 0;
+ kCool = 1;
+ kBoth = 2;
  }
 
  enum ThermostatControlSequence : ENUM8 {
@@ -2690,9 +2690,11 @@ server cluster Thermostat = 513 {
  kAuto = 1;
  kCool = 3;
  kHeat = 4;
- kEmergencyHeating = 5;
+ kEmergencyHeat = 5;
  kPrecooling = 6;
  kFanOnly = 7;
+ kDry = 8;
+ kSleep = 9;
  }
 
  bitmap DayOfWeek : BITMAP8 {
@@ -2703,21 +2705,21 @@ server cluster Thermostat = 513 {
  kThursday = 0x10;
  kFriday = 0x20;
  kSaturday = 0x40;
- kAwayOrVacation = 0x80;
+ kAway = 0x80;
  }
 
  bitmap ModeForSequence : BITMAP8 {
- kHeatSetpointFieldPresent = 0x1;
- kCoolSetpointFieldPresent = 0x2;
+ kHeatSetpointPresent = 0x1;
+ kCoolSetpointPresent = 0x2;
  }
 
  bitmap ThermostatFeature : BITMAP32 {
  kHeating = 0x1;
  kCooling = 0x2;
  kOccupancy = 0x4;
- kSchedule = 0x8;
+ kScheduleConfiguration = 0x8;
  kSetback = 0x10;
- kAutomode = 0x20;
+ kAutoMode = 0x20;
  }
 
  struct ThermostatScheduleTransition {

diff --git a/examples/all-clusters-app/ameba/main/include/ThermostatCommands.h b/examples/all-clusters-app/ameba/main/include/ThermostatCommands.h
@@ -154,7 +154,7 @@ void ProcessThermostatUnicastBindingCommand(BindingCommandData * data, const Emb
  switch (data->commandId)
  {
  case Clusters::Thermostat::Commands::SetpointRaiseLower::Id:
- setpointRaiseLowerCommand.mode = static_cast<EmberAfSetpointAdjustMode>(data->args[0]);
+ setpointRaiseLowerCommand.mode = static_cast<Clusters::Thermostat::SetpointAdjustMode>(data->args[0]);
  setpointRaiseLowerCommand.amount = static_cast<int8_t>(data->args[1]);
  Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote,
  setpointRaiseLowerCommand, onSuccess, onFailure);
@@ -171,7 +171,7 @@ void ProcessThermostatGroupBindingCommand(BindingCommandData * data, const Ember
  switch (data->commandId)
  {
  case Clusters::Thermostat::Commands::SetpointRaiseLower::Id:
- setpointRaiseLowerCommand.mode = static_cast<EmberAfSetpointAdjustMode>(data->args[0]);
+ setpointRaiseLowerCommand.mode = static_cast<Clusters::Thermostat::SetpointAdjustMode>(data->args[0]);
  setpointRaiseLowerCommand.amount = static_cast<int8_t>(data->args[1]);
  Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, setpointRaiseLowerCommand);
  break;

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
@@ -2262,9 +2262,9 @@ server cluster PumpConfigurationAndControl = 512 {
 
 server cluster Thermostat = 513 {
  enum SetpointAdjustMode : ENUM8 {
- kHeatSetpoint = 0;
- kCoolSetpoint = 1;
- kHeatAndCoolSetpoints = 2;
+ kHeat = 0;
+ kCool = 1;
+ kBoth = 2;
  }
 
  enum ThermostatControlSequence : ENUM8 {
@@ -2287,9 +2287,11 @@ server cluster Thermostat = 513 {
  kAuto = 1;
  kCool = 3;
  kHeat = 4;
- kEmergencyHeating = 5;
+ kEmergencyHeat = 5;
  kPrecooling = 6;
  kFanOnly = 7;
+ kDry = 8;
+ kSleep = 9;
  }
 
  bitmap DayOfWeek : BITMAP8 {
@@ -2300,21 +2302,21 @@ server cluster Thermostat = 513 {
  kThursday = 0x10;
  kFriday = 0x20;
  kSaturday = 0x40;
- kAwayOrVacation = 0x80;
+ kAway = 0x80;
  }
 
  bitmap ModeForSequence : BITMAP8 {
- kHeatSetpointFieldPresent = 0x1;
- kCoolSetpointFieldPresent = 0x2;
+ kHeatSetpointPresent = 0x1;
+ kCoolSetpointPresent = 0x2;
  }
 
  bitmap ThermostatFeature : BITMAP32 {
  kHeating = 0x1;
  kCooling = 0x2;
  kOccupancy = 0x4;
- kSchedule = 0x8;
+ kScheduleConfiguration = 0x8;
  kSetback = 0x10;
- kAutomode = 0x20;
+ kAutoMode = 0x20;
  }
 
  struct ThermostatScheduleTransition {

diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
@@ -1171,9 +1171,9 @@ server cluster FixedLabel = 64 {
 
 client cluster Thermostat = 513 {
  enum SetpointAdjustMode : ENUM8 {
- kHeatSetpoint = 0;
- kCoolSetpoint = 1;
- kHeatAndCoolSetpoints = 2;
+ kHeat = 0;
+ kCool = 1;
+ kBoth = 2;
  }
 
  enum ThermostatControlSequence : ENUM8 {
@@ -1196,9 +1196,11 @@ client cluster Thermostat = 513 {
  kAuto = 1;
  kCool = 3;
  kHeat = 4;
- kEmergencyHeating = 5;
+ kEmergencyHeat = 5;
  kPrecooling = 6;
  kFanOnly = 7;
+ kDry = 8;
+ kSleep = 9;
  }
 
  bitmap DayOfWeek : BITMAP8 {
@@ -1209,21 +1211,21 @@ client cluster Thermostat = 513 {
  kThursday = 0x10;
  kFriday = 0x20;
  kSaturday = 0x40;
- kAwayOrVacation = 0x80;
+ kAway = 0x80;
  }
 
  bitmap ModeForSequence : BITMAP8 {
- kHeatSetpointFieldPresent = 0x1;
- kCoolSetpointFieldPresent = 0x2;
+ kHeatSetpointPresent = 0x1;
+ kCoolSetpointPresent = 0x2;
  }
 
  bitmap ThermostatFeature : BITMAP32 {
  kHeating = 0x1;
  kCooling = 0x2;
  kOccupancy = 0x4;
- kSchedule = 0x8;
+ kScheduleConfiguration = 0x8;
  kSetback = 0x10;
- kAutomode = 0x20;
+ kAutoMode = 0x20;
  }
 
  readonly attribute nullable int16s localTemperature = 0;

diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
@@ -1029,9 +1029,9 @@ server cluster FixedLabel = 64 {
 
 server cluster Thermostat = 513 {
  enum SetpointAdjustMode : ENUM8 {
- kHeatSetpoint = 0;
- kCoolSetpoint = 1;
- kHeatAndCoolSetpoints = 2;
+ kHeat = 0;
+ kCool = 1;
+ kBoth = 2;
  }
 
  enum ThermostatControlSequence : ENUM8 {
@@ -1054,9 +1054,11 @@ server cluster Thermostat = 513 {
  kAuto = 1;
  kCool = 3;
  kHeat = 4;
- kEmergencyHeating = 5;
+ kEmergencyHeat = 5;
  kPrecooling = 6;
  kFanOnly = 7;
+ kDry = 8;
+ kSleep = 9;
  }
 
  bitmap DayOfWeek : BITMAP8 {
@@ -1067,21 +1069,21 @@ server cluster Thermostat = 513 {
  kThursday = 0x10;
  kFriday = 0x20;
  kSaturday = 0x40;
- kAwayOrVacation = 0x80;
+ kAway = 0x80;
  }
 
  bitmap ModeForSequence : BITMAP8 {
- kHeatSetpointFieldPresent = 0x1;
- kCoolSetpointFieldPresent = 0x2;
+ kHeatSetpointPresent = 0x1;
+ kCoolSetpointPresent = 0x2;
  }
 
  bitmap ThermostatFeature : BITMAP32 {
  kHeating = 0x1;
  kCooling = 0x2;
  kOccupancy = 0x4;
- kSchedule = 0x8;
+ kScheduleConfiguration = 0x8;
  kSetback = 0x10;
- kAutomode = 0x20;
+ kAutoMode = 0x20;
  }
 
  readonly attribute nullable int16s localTemperature = 0;

diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
@@ -1862,9 +1862,9 @@ server cluster PumpConfigurationAndControl = 512 {
 
 server cluster Thermostat = 513 {
  enum SetpointAdjustMode : ENUM8 {
- kHeatSetpoint = 0;
- kCoolSetpoint = 1;
- kHeatAndCoolSetpoints = 2;
+ kHeat = 0;
+ kCool = 1;
+ kBoth = 2;
  }
 
  enum ThermostatControlSequence : ENUM8 {
@@ -1887,9 +1887,11 @@ server cluster Thermostat = 513 {
  kAuto = 1;
  kCool = 3;
  kHeat = 4;
- kEmergencyHeating = 5;
+ kEmergencyHeat = 5;
  kPrecooling = 6;
  kFanOnly = 7;
+ kDry = 8;
+ kSleep = 9;
  }
 
  bitmap DayOfWeek : BITMAP8 {
@@ -1900,21 +1902,21 @@ server cluster Thermostat = 513 {
  kThursday = 0x10;
  kFriday = 0x20;
  kSaturday = 0x40;
- kAwayOrVacation = 0x80;
+ kAway = 0x80;
  }
 
  bitmap ModeForSequence : BITMAP8 {
- kHeatSetpointFieldPresent = 0x1;
- kCoolSetpointFieldPresent = 0x2;
+ kHeatSetpointPresent = 0x1;
+ kCoolSetpointPresent = 0x2;
  }
 
  bitmap ThermostatFeature : BITMAP32 {
  kHeating = 0x1;
  kCooling = 0x2;
  kOccupancy = 0x4;
- kSchedule = 0x8;
+ kScheduleConfiguration = 0x8;
  kSetback = 0x10;
- kAutomode = 0x20;
+ kAutoMode = 0x20;
  }
 
  struct ThermostatScheduleTransition {

diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
@@ -1839,9 +1839,9 @@ server cluster PumpConfigurationAndControl = 512 {
 
 server cluster Thermostat = 513 {
  enum SetpointAdjustMode : ENUM8 {
- kHeatSetpoint = 0;
- kCoolSetpoint = 1;
- kHeatAndCoolSetpoints = 2;
+ kHeat = 0;
+ kCool = 1;
+ kBoth = 2;
  }
 
  enum ThermostatControlSequence : ENUM8 {
@@ -1864,9 +1864,11 @@ server cluster Thermostat = 513 {
  kAuto = 1;
  kCool = 3;
  kHeat = 4;
- kEmergencyHeating = 5;
+ kEmergencyHeat = 5;
  kPrecooling = 6;
  kFanOnly = 7;
+ kDry = 8;
+ kSleep = 9;
  }
 
  bitmap DayOfWeek : BITMAP8 {
@@ -1877,21 +1879,21 @@ server cluster Thermostat = 513 {
  kThursday = 0x10;
  kFriday = 0x20;
  kSaturday = 0x40;
- kAwayOrVacation = 0x80;
+ kAway = 0x80;
  }
 
  bitmap ModeForSequence : BITMAP8 {
- kHeatSetpointFieldPresent = 0x1;
- kCoolSetpointFieldPresent = 0x2;
+ kHeatSetpointPresent = 0x1;
+ kCoolSetpointPresent = 0x2;
  }
 
  bitmap ThermostatFeature : BITMAP32 {
  kHeating = 0x1;
  kCooling = 0x2;
  kOccupancy = 0x4;
- kSchedule = 0x8;
+ kScheduleConfiguration = 0x8;
  kSetback = 0x10;
- kAutomode = 0x20;
+ kAutoMode = 0x20;
  }
 
  struct ThermostatScheduleTransition {

diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter
@@ -1394,9 +1394,9 @@ server cluster UserLabel = 65 {
 
 server cluster Thermostat = 513 {
  enum SetpointAdjustMode : ENUM8 {
- kHeatSetpoint = 0;
- kCoolSetpoint = 1;
- kHeatAndCoolSetpoints = 2;
+ kHeat = 0;
+ kCool = 1;
+ kBoth = 2;
  }
 
  enum ThermostatControlSequence : ENUM8 {
@@ -1419,9 +1419,11 @@ server cluster Thermostat = 513 {
  kAuto = 1;
  kCool = 3;
  kHeat = 4;
- kEmergencyHeating = 5;
+ kEmergencyHeat = 5;
  kPrecooling = 6;
  kFanOnly = 7;
+ kDry = 8;
+ kSleep = 9;
  }
 
  bitmap DayOfWeek : BITMAP8 {
@@ -1432,21 +1434,21 @@ server cluster Thermostat = 513 {
  kThursday = 0x10;
  kFriday = 0x20;
  kSaturday = 0x40;
- kAwayOrVacation = 0x80;
+ kAway = 0x80;
  }
 
  bitmap ModeForSequence : BITMAP8 {
- kHeatSetpointFieldPresent = 0x1;
- kCoolSetpointFieldPresent = 0x2;
+ kHeatSetpointPresent = 0x1;
+ kCoolSetpointPresent = 0x2;
  }
 
  bitmap ThermostatFeature : BITMAP32 {
  kHeating = 0x1;
  kCooling = 0x2;
  kOccupancy = 0x4;
- kSchedule = 0x8;
+ kScheduleConfiguration = 0x8;
  kSetback = 0x10;
- kAutomode = 0x20;
+ kAutoMode = 0x20;
  }
 
  struct ThermostatScheduleTransition {