From e70d884b462776ea565534bd6bd73780301a106a Mon Sep 17 00:00:00 2001
From: Avi <thnkslprpt@gmail.com>
Date: Fri, 21 Oct 2022 17:05:30 +1000
Subject: [PATCH] Fix #60, Apply consistent Event ID names to common events in
 SC

---
 fsw/inc/sc_events.h | 8 ++++----
 fsw/src/sc_app.c    | 4 ++--
 fsw/src/sc_utils.h  | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fsw/inc/sc_events.h b/fsw/inc/sc_events.h
index 3d8832c..b11197e 100644
--- a/fsw/inc/sc_events.h
+++ b/fsw/inc/sc_events.h
@@ -50,7 +50,7 @@
  *  This event message is issued when a command is received, but it is not of the expected
  *  length
  */
-#define SC_LEN_ERR_EID 2
+#define SC_CMD_LEN_ERR_EID 2
 
 /**
  * \brief SC Create Pipe Failed Event ID
@@ -61,7 +61,7 @@
  *  This event message is issued when #CFE_SB_CreatePipe returns an
  *  error
  */
-#define SC_INIT_SB_CREATE_ERR_EID 3
+#define SC_CR_PIPE_ERR_EID 3
 
 /**
  * \brief SC Housekeeping Request Subscribe Failed Event ID
@@ -508,7 +508,7 @@
  *  \par Cause:
  *  This event message is issued when the #SC_RESET_COUNTERS_CC command was received
  */
-#define SC_RESET_DEB_EID 51
+#define SC_RESET_INF_EID 51
 
 /**
  * \brief SC No-op Command Event ID
@@ -585,7 +585,7 @@
  *  This event message is issued when an invalid command code was received in
  *  the command pipe
  */
-#define SC_INVLD_CMD_ERR_EID 64
+#define SC_CC_ERR_EID 64
 
 /**
  * \brief SC RTS Info Table Get Address Failed Event ID
diff --git a/fsw/src/sc_app.c b/fsw/src/sc_app.c
index 972b39a..821de60 100644
--- a/fsw/src/sc_app.c
+++ b/fsw/src/sc_app.c
@@ -186,8 +186,8 @@ CFE_Status_t SC_AppInit(void)
     Result = CFE_SB_CreatePipe(&SC_OperData.CmdPipe, SC_PIPE_DEPTH, SC_CMD_PIPE_NAME);
     if (Result != CFE_SUCCESS)
     {
-        CFE_EVS_SendEvent(SC_INIT_SB_CREATE_ERR_EID, CFE_EVS_EventType_ERROR,
-                          "Software Bus Create Pipe returned: 0x%08X", (unsigned int)Result);
+        CFE_EVS_SendEvent(SC_CR_PIPE_ERR_EID, CFE_EVS_EventType_ERROR, "Software Bus Create Pipe returned: 0x%08X",
+                          (unsigned int)Result);
         return (Result);
     }
 
diff --git a/fsw/src/sc_utils.h b/fsw/src/sc_utils.h
index ddf05a2..128c3cb 100644
--- a/fsw/src/sc_utils.h
+++ b/fsw/src/sc_utils.h
@@ -105,7 +105,7 @@ bool SC_CompareAbsTime(SC_AbsTimeTag_t AbsTime1, SC_AbsTimeTag_t AbsTime2);
  *  \retval 0 When current ATS index is 1
  *  \retval 1 When current ATS index is 0
  *
- *  \sa #SC_LEN_ERR_EID
+ *  \sa #SC_CMD_LEN_ERR_EID
  */
 uint16 SC_ToggleAtsIndex(void);