Remove EMBER_ZCL_STATUS_INVALID_VALUE

project-chip · Dec 7, 2022 · 2ceb2cc · 2ceb2cc
1 parent 39a7700
commit 2ceb2cc
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 13 deletions.
diff --git a/src/app/clusters/barrier-control-server/barrier-control-server.cpp b/src/app/clusters/barrier-control-server/barrier-control-server.cpp
@@ -286,7 +286,7 @@ bool emberAfBarrierControlClusterBarrierControlGoToPercentCallback(
                  percentOpen != EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_CLOSED &&
                  percentOpen != EMBER_ZCL_BARRIER_CONTROL_BARRIER_POSITION_OPEN))
     {
-        status = EMBER_ZCL_STATUS_INVALID_VALUE;
+        status = EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     else
     {

diff --git a/src/app/clusters/groups-server/groups-server.cpp b/src/app/clusters/groups-server/groups-server.cpp
@@ -160,7 +160,7 @@ bool emberAfGroupsClusterViewGroupCallback(app::CommandHandler * commandObj, con
     CHIP_ERROR err       = CHIP_NO_ERROR;
     EmberAfStatus status = EMBER_ZCL_STATUS_NOT_FOUND;
 
-    VerifyOrExit(IsFabricGroupId(groupId), status = EMBER_ZCL_STATUS_INVALID_VALUE);
+    VerifyOrExit(IsFabricGroupId(groupId), status = EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
     VerifyOrExit(nullptr != provider, status = EMBER_ZCL_STATUS_FAILURE);
     VerifyOrExit(provider->HasEndpoint(fabricIndex, groupId, commandPath.mEndpointId), status = EMBER_ZCL_STATUS_NOT_FOUND);
 

diff --git a/src/app/clusters/ias-zone-server/ias-zone-server.cpp b/src/app/clusters/ias-zone-server/ias-zone-server.cpp
@@ -273,7 +273,7 @@ EmberAfStatus emberAfPluginIasZoneClusterSetEnrollmentMethod(EndpointId endpoint
     else if (!isValidEnrollmentMode(method))
     {
         emberAfIasZoneClusterPrintln("Invalid IAS Zone Server Enrollment Mode: %d", method);
-        status = EMBER_ZCL_STATUS_INVALID_VALUE;
+        status = EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
     else
     {

diff --git a/src/app/clusters/window-covering-server/window-covering-server.cpp b/src/app/clusters/window-covering-server/window-covering-server.cpp
@@ -841,7 +841,7 @@ bool emberAfWindowCoveringClusterGoToLiftPercentageCallback(app::CommandHandler
         }
         else
         {
-            emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_INVALID_VALUE);
+            emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
         }
     }
     else
@@ -933,7 +933,7 @@ bool emberAfWindowCoveringClusterGoToTiltPercentageCallback(app::CommandHandler
         }
         else
         {
-            emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_INVALID_VALUE);
+            emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
         }
     }
     else

diff --git a/src/app/tests/suites/TestCluster.yaml b/src/app/tests/suites/TestCluster.yaml
@@ -2965,7 +2965,7 @@ tests:
           "Send a command that takes an optional parameter but do not set it."
       command: "TestSimpleOptionalArgumentRequest"
       response:
-          error: INVALID_VALUE
+          error: CONSTRAINT_ERROR
 
     - label:
           "Send a command that takes an optional parameter but do not set it."

diff --git a/src/app/util/af-enums.h b/src/app/util/af-enums.h
@@ -37,7 +37,6 @@ enum EmberAfStatus : uint8_t
     EMBER_ZCL_STATUS_INVALID_COMMAND          = 0x85,
     EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE    = 0x86,
     EMBER_ZCL_STATUS_CONSTRAINT_ERROR         = 0x87,
-    EMBER_ZCL_STATUS_INVALID_VALUE            = 0x87, // Deprecated; same as CONSTRAINT_ERROR
     EMBER_ZCL_STATUS_UNSUPPORTED_WRITE        = 0x88,
     EMBER_ZCL_STATUS_READ_ONLY                = 0x88, // Deprecated; same as UNSUPPORTED_WRITE
     EMBER_ZCL_STATUS_RESOURCE_EXHAUSTED       = 0x89,

diff --git a/src/app/util/attribute-table.cpp b/src/app/util/attribute-table.cpp
@@ -217,7 +217,7 @@ static bool IsNullValue(const uint8_t * data, uint16_t dataLen, bool isAttribute
 // - EMBER_ZCL_STATUS_INVALID_DATA_TYPE: if the data type passed in doesnt match the type
 //           stored in the attribute table
 // - EMBER_ZCL_STATUS_READ_ONLY: if the attribute isnt writable
-// - EMBER_ZCL_STATUS_INVALID_VALUE: if the value is set out of the allowable range for
+// - EMBER_ZCL_STATUS_CONSTRAINT_ERROR: if the value is set out of the allowable range for
 //           the attribute
 // - EMBER_ZCL_STATUS_SUCCESS: if the attribute was found and successfully written
 //
@@ -272,7 +272,7 @@ EmberAfStatus emAfWriteAttribute(EndpointId endpoint, ClusterId cluster, Attribu
     }
 
     // if the value the attribute is being set to is out of range
-    // return EMBER_ZCL_STATUS_INVALID_VALUE
+    // return EMBER_ZCL_STATUS_CONSTRAINT_ERROR
     if ((metadata->mask & ATTRIBUTE_MASK_MIN_MAX) != 0U)
     {
         EmberAfDefaultAttributeValue minv = metadata->defaultValue.ptrToMinMaxValue->minValue;
@@ -309,7 +309,7 @@ EmberAfStatus emAfWriteAttribute(EndpointId endpoint, ClusterId cluster, Attribu
             // null value is always in-range for a nullable attribute.
             (!metadata->IsNullable() || !IsNullValue(data, dataLen, isAttributeSigned)))
         {
-            return EMBER_ZCL_STATUS_INVALID_VALUE;
+            return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
         }
     }
 

diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             else
             {
-                emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_INVALID_VALUE);
+                emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
             }
         }
         else
@@ Expand Down Expand Up @@
             }
             else
             {
-                emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_INVALID_VALUE);
+                emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_CONSTRAINT_ERROR);
             }
         }
         else
@@ Expand Down @@