Add checks for stepSize and bump Color control cluster revision in its xml

Author: jmartinez-silabs

src/app/clusters/color-control-server/color-control-server.cpp

@@ -1361,7 +1361,8 @@ bool ColorControlServer::moveHueCommand(app::CommandHandler * commandObj, const
 
     VerifyOrExit(colorHueTransitionState != nullptr, status = Status::UnsupportedEndpoint);
 
-    // check moveMode before any operation is done on the transition states
+    // check moveMode and rate before any operation is done on the transition states
+    // rate value is ignored if the MoveMode is stop
     if (moveMode == HueMoveMode::kUnknownEnumValue || (rate == 0 && moveMode != HueMoveMode::kStop))
     {
         commandObj->AddStatus(commandPath, Status::InvalidCommand);
@@ -1643,8 +1644,8 @@ bool ColorControlServer::stepHueCommand(app::CommandHandler * commandObj, const
     ColorHueTransitionState * colorHueTransitionState = getColorHueTransitionState(endpoint);
     VerifyOrExit(colorHueTransitionState != nullptr, status = Status::UnsupportedEndpoint);
 
-    // Confirm validity of the step mode received
-    if (stepMode == HueStepMode::kUnknownEnumValue)
+    // Confirm validity of the step mode and step size received
+    if (stepMode == HueStepMode::kUnknownEnumValue || stepSize == 0)
     {
         commandObj->AddStatus(commandPath, Status::InvalidCommand);
         return true;
@@ -1730,7 +1731,8 @@ bool ColorControlServer::moveSaturationCommand(app::CommandHandler * commandObj,
     Color16uTransitionState * colorSaturationTransitionState = getSaturationTransitionState(endpoint);
     VerifyOrExit(colorSaturationTransitionState != nullptr, status = Status::UnsupportedEndpoint);
 
-    // check moveMode before any operation is done on the transition states
+    // check moveMode and rate before any operation is done on the transition states
+    // rate value is ignored if the MoveMode is stop
     if (moveMode == SaturationMoveMode::kUnknownEnumValue || (rate == 0 && moveMode != SaturationMoveMode::kStop))
     {
         commandObj->AddStatus(commandPath, Status::InvalidCommand);
@@ -1841,8 +1843,8 @@ bool ColorControlServer::stepSaturationCommand(app::CommandHandler * commandObj,
     Color16uTransitionState * colorSaturationTransitionState = getSaturationTransitionState(endpoint);
     VerifyOrExit(colorSaturationTransitionState != nullptr, status = Status::UnsupportedEndpoint);
 
-    // Confirm validity of the step mode received
-    if (stepMode == SaturationStepMode::kUnknownEnumValue)
+    // Confirm validity of the step mode and step size received
+    if (stepMode == SaturationStepMode::kUnknownEnumValue || stepSize == 0)
     {
         commandObj->AddStatus(commandPath, Status::InvalidCommand);
         return true;
@@ -2237,6 +2239,12 @@ bool ColorControlServer::moveColorCommand(app::CommandHandler * commandObj, cons
     VerifyOrExit(colorXTransitionState != nullptr, status = Status::UnsupportedEndpoint);
     VerifyOrExit(colorYTransitionState != nullptr, status = Status::UnsupportedEndpoint);
 
+    if (rateX == 0 && rateY == 0)
+    {
+        commandObj->AddStatus(commandPath, Status::InvalidCommand);
+        return true;
+    }
+
     if (!shouldExecuteIfOff(endpoint, optionsMask, optionsOverride))
     {
         commandObj->AddStatus(commandPath, Status::Success);
@@ -2249,12 +2257,6 @@ bool ColorControlServer::moveColorCommand(app::CommandHandler * commandObj, cons
     // New command.  Need to stop any active transitions.
     stopAllColorTransitions(endpoint);
 
-    if (rateX == 0 && rateY == 0)
-    {
-        commandObj->AddStatus(commandPath, Status::InvalidCommand);
-        return true;
-    }
-
     // Handle color mode transition, if necessary.
     handleModeSwitch(endpoint, ColorControl::EnhancedColorMode::kCurrentXAndCurrentY);
 
@@ -2338,6 +2340,12 @@ bool ColorControlServer::stepColorCommand(app::CommandHandler * commandObj, cons
     VerifyOrExit(colorXTransitionState != nullptr, status = Status::UnsupportedEndpoint);
     VerifyOrExit(colorYTransitionState != nullptr, status = Status::UnsupportedEndpoint);
 
+    if (stepX == 0 && stepY == 0)
+    {
+        commandObj->AddStatus(commandPath, Status::InvalidCommand);
+        return true;
+    }
+
     if (!shouldExecuteIfOff(endpoint, optionsMask, optionsOverride))
     {
         commandObj->AddStatus(commandPath, Status::Success);
@@ -2667,7 +2675,8 @@ bool ColorControlServer::moveColorTempCommand(app::CommandHandler * commandObj,
     Color16uTransitionState * colorTempTransitionState = getTempTransitionState(endpoint);
     VerifyOrExit(colorTempTransitionState != nullptr, status = Status::UnsupportedEndpoint);
 
-    // check moveMode before any operation is done on the transition states
+    // check moveMode and rate before any operation is done on the transition states
+    // rate value is ignored if the MoveMode is stop
     if (moveMode == HueMoveMode::kUnknownEnumValue || (rate == 0 && moveMode != HueMoveMode::kStop))
     {
         commandObj->AddStatus(commandPath, Status::InvalidCommand);
@@ -2784,8 +2793,8 @@ bool ColorControlServer::stepColorTempCommand(app::CommandHandler * commandObj,
     Color16uTransitionState * colorTempTransitionState = getTempTransitionState(endpoint);
     VerifyOrExit(colorTempTransitionState != nullptr, status = Status::UnsupportedEndpoint);
 
-    // Confirm validity of the step mode received
-    if (stepMode == HueStepMode::kUnknownEnumValue)
+    // Confirm validity of the step mode and step size received
+    if (stepMode == HueStepMode::kUnknownEnumValue || stepSize == 0)
     {
         commandObj->AddStatus(commandPath, Status::InvalidCommand);
         return true;

src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml

@@ -98,7 +98,7 @@ limitations under the License.
     <client tick="false" init="false">true</client>
     <server tick="false" init="false">true</server>
 
-    <globalAttribute side="either" code="0xFFFD" value="6"/>
+    <globalAttribute side="either" code="0xFFFD" value="7"/>
 
     <features>
       <feature bit="0" code="HS" name="Hue And Saturation" summary="Supports color specification via hue/saturation.">