Fix nasa#288, Remove unused command codes

skliper · Jul 27, 2022 · 59e0359 · 59e0359
1 parent 2ab2341
commit 59e0359
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 17 deletions.
diff --git a/fsw/src/cf_cmd.c b/fsw/src/cf_cmd.c
@@ -1272,10 +1272,10 @@ void CF_ProcessGroundCommand(CFE_SB_Buffer_t *msg)
         CF_CmdDisableDequeue, /* CF_DISABLE_DEQUEUE_CC */
         CF_CmdEnablePolldir,  /* CF_ENABLE_DIR_POLLING_CC */
         CF_CmdDisablePolldir, /* CF_DISABLE_DIR_POLLING_CC */
-        NULL,                 /* CF_DELETE_QUEUE_NODE_CC */
-        CF_CmdPurgeQueue,     /* CF_PURGE_QUEUE_CC */
-        CF_CmdEnableEngine,   /* CF_ENABLE_ENGINE_CC */
-        CF_CmdDisableEngine,  /* CF_DISABLE_ENGINE_CC */
+        NULL,
+        CF_CmdPurgeQueue,    /* CF_PURGE_QUEUE_CC */
+        CF_CmdEnableEngine,  /* CF_ENABLE_ENGINE_CC */
+        CF_CmdDisableEngine, /* CF_DISABLE_ENGINE_CC */
     };
 
     static const uint16 expected_lengths[CF_NUM_COMMANDS] = {
@@ -1293,16 +1293,16 @@ void CF_ProcessGroundCommand(CFE_SB_Buffer_t *msg)
         sizeof(CF_GetParamCmd_t),    /* CF_GET_MIB_PARAM_CC */
         0,
         0,
-        sizeof(CF_NoArgsCmd_t),     /* CF_SendRet_CFG_PARAMS_CC */
+        0,
         sizeof(CF_WriteQueueCmd_t), /* CF_WRITE_QUEUE_CC */
         sizeof(CF_UnionArgsCmd_t),  /* CF_ENABLE_DEQUEUE_CC */
         sizeof(CF_UnionArgsCmd_t),  /* CF_DISABLE_DEQUEUE_CC */
         sizeof(CF_UnionArgsCmd_t),  /* CF_ENABLE_DIR_POLLING_CC */
         sizeof(CF_UnionArgsCmd_t),  /* CF_DISABLE_DIR_POLLING_CC */
-        0,                          /* CF_DELETE_QUEUE_NODE_CC */
-        sizeof(CF_UnionArgsCmd_t),  /* CF_PURGE_QUEUE_CC */
-        sizeof(CF_NoArgsCmd_t),     /* CF_ENABLE_ENGINE_CC */
-        sizeof(CF_NoArgsCmd_t),     /* CF_DISABLE_ENGINE_CC */
+        0,
+        sizeof(CF_UnionArgsCmd_t), /* CF_PURGE_QUEUE_CC */
+        sizeof(CF_NoArgsCmd_t),    /* CF_ENABLE_ENGINE_CC */
+        sizeof(CF_NoArgsCmd_t),    /* CF_DISABLE_ENGINE_CC */
     };
 
     CFE_MSG_FcnCode_t cmd = 0;

diff --git a/fsw/src/cf_msg.h b/fsw/src/cf_msg.h
@@ -129,11 +129,6 @@ typedef struct CF_HkPacket
 
 /**
  * \defgroup cfscfcmdcodes CFS CFDP Command Codes
- *
- * NOTE: these are what was in the original app (may have slightly different names)
- * Not sure that we need to implement all these for cf 3.0
- *
- * ANOTHER NOTE: not all of these are used, but they are here legacy from the old app
  * \{
  */
 typedef enum
@@ -716,9 +711,6 @@ typedef enum
      */
     CF_DISABLE_DIR_POLLING_CC = 19,
 
-    /** \brief Unused */
-    CF_DELETE_QUEUE_NODE_CC = 20,
-
     /**
      * \brief Purge queue
      *