Fix constraint error check for the STEP feature of Temperature Contro…

…l cluster. (#29409)
project-chip · Dec 4, 2023 · 1257352 · 1257352
1 parent 23f041e
commit 1257352
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/app/clusters/temperature-control-server/temperature-control-server.cpp b/src/app/clusters/temperature-control-server/temperature-control-server.cpp
@@ -145,6 +145,11 @@ bool emberAfTemperatureControlClusterSetTemperatureCallback(app::CommandHandler
  goto exit;
  }
 
+ if (targetTemperature.Value() < minTemperature || targetTemperature.Value() > maxTemperature)
+ {
+ status = Status::ConstraintError;
+ goto exit;
+ }
  if (TemperatureControlHasFeature(endpoint, TemperatureControl::Feature::kTemperatureStep))
  {
  int16_t step = 0;
@@ -161,14 +166,6 @@ bool emberAfTemperatureControlClusterSetTemperatureCallback(app::CommandHandler
  goto exit;
  }
  }
- else
- {
- if (targetTemperature.Value() < minTemperature || targetTemperature.Value() > maxTemperature)
- {
- status = Status::ConstraintError;
- goto exit;
- }
- }
  emberAfStatus = TemperatureSetpoint::Set(endpoint, targetTemperature.Value());
  if (emberAfStatus != EMBER_ZCL_STATUS_SUCCESS)
  {