Remove EMBER_ZCL_STATUS_INVALID_FIELD

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

Hide file tree

Showing 8 changed files with 135 additions and 136 deletions.
diff --git a/examples/tv-app/linux/include/level-control/LevelControl.cpp b/examples/tv-app/linux/include/level-control/LevelControl.cpp
@@ -89,7 +89,7 @@ static void stepHandler(CommandId commandId, uint8_t stepMode, uint8_t stepSize,
         }
         break;
     default:
-        status = EMBER_ZCL_STATUS_INVALID_FIELD;
+        status = EMBER_ZCL_STATUS_INVALID_COMMAND;
         goto send_default_response;
     }
 

diff --git a/src/app/clusters/color-control-server/color-control-server.cpp b/src/app/clusters/color-control-server/color-control-server.cpp
@@ -2207,7 +2207,7 @@ bool ColorControlServer::moveColorTempCommand(const app::ConcreteCommandPath & c
 
     if (rate == 0)
     {
-        emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_INVALID_FIELD);
+        emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_INVALID_COMMAND);
         return true;
     }
 

diff --git a/src/app/clusters/level-control/level-control.cpp b/src/app/clusters/level-control/level-control.cpp
@@ -830,7 +830,7 @@ static void moveHandler(EndpointId endpoint, CommandId commandId, uint8_t moveMo
         difference         = static_cast<uint8_t>(currentLevel.Value() - state->minLevel);
         break;
     default:
-        status = EMBER_ZCL_STATUS_INVALID_FIELD;
+        status = EMBER_ZCL_STATUS_INVALID_COMMAND;
         goto send_default_response;
     }
 
@@ -972,7 +972,7 @@ static void stepHandler(EndpointId endpoint, CommandId commandId, uint8_t stepMo
         }
         break;
     default:
-        status = EMBER_ZCL_STATUS_INVALID_FIELD;
+        status = EMBER_ZCL_STATUS_INVALID_COMMAND;
         goto send_default_response;
     }
 

diff --git a/src/app/clusters/scenes/scenes.cpp b/src/app/clusters/scenes/scenes.cpp
@@ -234,7 +234,7 @@ bool emberAfScenesClusterRemoveSceneCallback(app::CommandHandler * commandObj, c
 
     if (!isEndpointInGroup(fabricIndex, emberAfCurrentEndpoint(), groupId))
     {
-        status = EMBER_ZCL_STATUS_INVALID_FIELD;
+        status = EMBER_ZCL_STATUS_INVALID_COMMAND;
     }
     else
     {
@@ -284,7 +284,7 @@ bool emberAfScenesClusterRemoveAllScenesCallback(app::CommandHandler * commandOb
     auto fabricIndex = commandObj->GetAccessingFabricIndex();
     auto & groupId   = commandData.groupId;
 
-    EmberAfStatus status = EMBER_ZCL_STATUS_INVALID_FIELD;
+    EmberAfStatus status = EMBER_ZCL_STATUS_INVALID_COMMAND;
     CHIP_ERROR err       = CHIP_NO_ERROR;
 
     emberAfScenesClusterPrintln("RX: RemoveAllScenes 0x%2x", groupId);
@@ -417,7 +417,7 @@ bool emberAfScenesClusterGetSceneMembershipCallback(app::CommandHandler * comman
 
     if (!isEndpointInGroup(fabricIndex, emberAfCurrentEndpoint(), groupId))
     {
-        status = EMBER_ZCL_STATUS_INVALID_FIELD;
+        status = EMBER_ZCL_STATUS_INVALID_COMMAND;
     }
 
     if (status == EMBER_ZCL_STATUS_SUCCESS)
@@ -471,7 +471,7 @@ EmberAfStatus emberAfScenesClusterStoreCurrentSceneCallback(chip::FabricIndex fa
 
     if (!isEndpointInGroup(fabricIndex, endpoint, groupId))
     {
-        return EMBER_ZCL_STATUS_INVALID_FIELD;
+        return EMBER_ZCL_STATUS_INVALID_COMMAND;
     }
 
     for (i = 0; i < MATTER_SCENES_TABLE_SIZE; i++)
@@ -589,7 +589,7 @@ EmberAfStatus emberAfScenesClusterRecallSavedSceneCallback(chip::FabricIndex fab
 {
     if (!isEndpointInGroup(fabricIndex, endpoint, groupId))
     {
-        return EMBER_ZCL_STATUS_INVALID_FIELD;
+        return EMBER_ZCL_STATUS_INVALID_COMMAND;
     }
 
     uint8_t i;
@@ -737,7 +737,7 @@ bool emberAfPluginScenesServerParseAddScene(
     // Add Scene commands can only reference groups to which we belong.
     if (!isEndpointInGroup(fabricIndex, endpoint, groupId))
     {
-        status = EMBER_ZCL_STATUS_INVALID_FIELD;
+        status = EMBER_ZCL_STATUS_INVALID_COMMAND;
         goto kickout;
     }
 
@@ -1070,7 +1070,7 @@ bool emberAfPluginScenesServerParseViewScene(app::CommandHandler * commandObj, c
     // View Scene commands can only reference groups which we belong to.
     if (!isEndpointInGroup(fabricIndex, endpoint, groupId))
     {
-        status = EMBER_ZCL_STATUS_INVALID_FIELD;
+        status = EMBER_ZCL_STATUS_INVALID_COMMAND;
     }
     else
     {

diff --git a/src/app/tests/suites/DL_Schedules.yaml b/src/app/tests/suites/DL_Schedules.yaml
@@ -108,7 +108,7 @@ tests:
               - name: "endMinute"
                 value: 00
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Create Week Day schedule with out-of-bounds index"
       command: "SetWeekDaySchedule"
@@ -129,7 +129,7 @@ tests:
               - name: "endMinute"
                 value: 00
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Create Week Day schedule with 0 user index"
       command: "SetWeekDaySchedule"
@@ -150,7 +150,7 @@ tests:
               - name: "endMinute"
                 value: 00
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Create Week Day schedule with out-of-bounds user index"
       command: "SetWeekDaySchedule"
@@ -171,7 +171,7 @@ tests:
               - name: "endMinute"
                 value: 00
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Create Week Day schedule for non-existing user"
       command: "SetWeekDaySchedule"
@@ -213,7 +213,7 @@ tests:
               - name: "endMinute"
                 value: 00
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Create Week Day schedule for Sunday and Monday"
       command: "SetWeekDaySchedule"
@@ -234,7 +234,7 @@ tests:
               - name: "endMinute"
                 value: 00
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Create Week Day schedule for Sunday Wednesday and Saturday"
       command: "SetWeekDaySchedule"
@@ -255,7 +255,7 @@ tests:
               - name: "endMinute"
                 value: 00
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Create Week Day schedule with invalid start hour"
       command: "SetWeekDaySchedule"
@@ -276,7 +276,7 @@ tests:
               - name: "endMinute"
                 value: 00
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Create Week Day schedule with invalid start minute"
       command: "SetWeekDaySchedule"
@@ -297,7 +297,7 @@ tests:
               - name: "endMinute"
                 value: 00
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Create Week Day schedule with invalid end hour"
       command: "SetWeekDaySchedule"
@@ -318,7 +318,7 @@ tests:
               - name: "endMinute"
                 value: 00
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Create Week Day schedule with invalid end minute"
       command: "SetWeekDaySchedule"
@@ -339,7 +339,7 @@ tests:
               - name: "endMinute"
                 value: 60
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Create Week Day schedule with start hour later that end hour"
       command: "SetWeekDaySchedule"
@@ -360,7 +360,7 @@ tests:
               - name: "endMinute"
                 value: 00
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label:
           "Create Week Day schedule with start minute later that end minute when
@@ -383,7 +383,7 @@ tests:
               - name: "endMinute"
                 value: 49
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Make sure that previous operations did not create a schedule"
       command: "GetWeekDaySchedule"
@@ -506,7 +506,7 @@ tests:
               - name: "localEndTime"
                 value: 12345689
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Create Year Day schedule with out-of-bounds index"
       command: "SetYearDaySchedule"
@@ -521,7 +521,7 @@ tests:
               - name: "localEndTime"
                 value: 12345689
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Create Year Day schedule with 0 user index"
       command: "SetYearDaySchedule"
@@ -536,7 +536,7 @@ tests:
               - name: "localEndTime"
                 value: 12345689
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Create Year Day schedule with out-of-bounds user index"
       command: "SetYearDaySchedule"
@@ -551,7 +551,7 @@ tests:
               - name: "localEndTime"
                 value: 12345689
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Create Year Day schedule for non-existing user"
       command: "SetYearDaySchedule"
@@ -704,7 +704,7 @@ tests:
               - name: "operatingMode"
                 value: 0
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Create Holiday schedule with out-of-bounds index"
       command: "SetHolidaySchedule"
@@ -719,7 +719,7 @@ tests:
               - name: "operatingMode"
                 value: 0
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Create Holiday schedule with start hour later that end hour"
       command: "SetHolidaySchedule"
@@ -734,7 +734,7 @@ tests:
               - name: "operatingMode"
                 value: 0
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Create Holiday schedule with invalid operating mode"
       command: "SetHolidaySchedule"
@@ -749,7 +749,7 @@ tests:
               - name: "operatingMode"
                 value: 5
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Make sure that previous operations did not create a schedule"
       command: "GetHolidaySchedule"
@@ -918,7 +918,7 @@ tests:
               - name: "userIndex"
                 value: 1
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Clear Week Day schedule with out-of-bounds index"
       command: "ClearWeekDaySchedule"
@@ -929,7 +929,7 @@ tests:
               - name: "userIndex"
                 value: 1
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Clear Week Day schedule with 0 user index"
       command: "ClearWeekDaySchedule"
@@ -940,7 +940,7 @@ tests:
               - name: "userIndex"
                 value: 0
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Clear Week Day schedule with out-of-bounds user index"
       command: "ClearWeekDaySchedule"
@@ -951,7 +951,7 @@ tests:
               - name: "userIndex"
                 value: NumberOfTotalUsersSupported + 1
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Clear Week Day schedule with non-existing user"
       command: "ClearWeekDaySchedule"
@@ -1043,7 +1043,7 @@ tests:
               - name: "userIndex"
                 value: 1
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Clear Year Day schedule with out-of-bounds index"
       command: "ClearYearDaySchedule"
@@ -1054,7 +1054,7 @@ tests:
               - name: "userIndex"
                 value: 1
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Clear Year Day schedule with 0 user index"
       command: "ClearYearDaySchedule"
@@ -1065,7 +1065,7 @@ tests:
               - name: "userIndex"
                 value: 0
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Clear Year Day schedule with out-of-bounds user index"
       command: "ClearYearDaySchedule"
@@ -1076,7 +1076,7 @@ tests:
               - name: "userIndex"
                 value: NumberOfTotalUsersSupported + 1
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Clear Year Day schedule with non-existing user"
       command: "ClearYearDaySchedule"
@@ -1164,7 +1164,7 @@ tests:
               - name: "holidayIndex"
                 value: 0
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Clear Holiday schedule with out-of-bounds index"
       command: "ClearHolidaySchedule"
@@ -1173,7 +1173,7 @@ tests:
               - name: "holidayIndex"
                 value: NumberOfYearDaySchedulesSupportedPerUser + 1
       response:
-          error: INVALID_FIELD
+          error: INVALID_COMMAND
 
     - label: "Make sure that week day schedule was not deleted"
       command: "GetWeekDaySchedule"

diff --git a/src/app/util/af-enums.h b/src/app/util/af-enums.h
@@ -35,7 +35,6 @@ enum EmberAfStatus : uint8_t
     EMBER_ZCL_STATUS_DEPRECATED83             = 0x83,
     EMBER_ZCL_STATUS_DEPRECATED84             = 0x84,
     EMBER_ZCL_STATUS_INVALID_COMMAND          = 0x85,
-    EMBER_ZCL_STATUS_INVALID_FIELD            = 0x85, // Deprecated; same as INVALID_COMMAND
     EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE    = 0x86,
     EMBER_ZCL_STATUS_CONSTRAINT_ERROR         = 0x87,
     EMBER_ZCL_STATUS_INVALID_VALUE            = 0x87, // Deprecated; same as CONSTRAINT_ERROR