Merge pull request #335 from thnkslprpt/fix-262-update-event-id-name

dzbaker · web-flow · commit f65d6792bad9 · 2024-02-22T14:27:16.000-05:00
Fix #262, Update inaccurate event ID name
diff --git a/fsw/inc/cf_events.h b/fsw/inc/cf_events.h
@@ -132,7 +132,7 @@
  *
  *  Invalid message ID received on the software bus pipe
  */
-#define CF_EID_ERR_INVALID_MID (28)
+#define CF_MID_ERR_EID (28)
 
 /**
  * \brief CF SB Receive Buffer Failed Event ID
diff --git a/fsw/src/cf_cfdp_types.h b/fsw/src/cf_cfdp_types.h
@@ -163,7 +163,6 @@ typedef enum
 
     /* keep last */
     CF_TxnStatus_MAX = 22
-
 } CF_TxnStatus_t;
 
 /**
diff --git a/fsw/src/cf_dispatch.c b/fsw/src/cf_dispatch.c
@@ -151,7 +151,7 @@ void CF_AppPipe(const CFE_SB_Buffer_t *msg)
 
         default:
             ++CF_AppData.hk.Payload.counters.err;
-            CFE_EVS_SendEvent(CF_EID_ERR_INVALID_MID, CFE_EVS_EventType_ERROR, "CF: invalid command packet id=0x%lx",
+            CFE_EVS_SendEvent(CF_MID_ERR_EID, CFE_EVS_EventType_ERROR, "CF: invalid command packet id=0x%lx",
                               (unsigned long)CFE_SB_MsgIdToValue(msg_id));
             break;
     }
diff --git a/unit-test/cf_dispatch_tests.c b/unit-test/cf_dispatch_tests.c
@@ -262,7 +262,7 @@ void Test_CF_AppPipe_UnrecognizedCommandEnterDefaultPath(void)
     /* Assert */
     UtAssert_UINT32_EQ(CF_AppData.hk.Payload.counters.err, 1);
     UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1);
-    UT_CF_AssertEventID(CF_EID_ERR_INVALID_MID);
+    UT_CF_AssertEventID(CF_MID_ERR_EID);
 }
 
 void add_CF_ProcessGroundCommand_tests(void)

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@`
`132`	`132`	`*`
`133`	`133`	`* Invalid message ID received on the software bus pipe`
`134`	`134`	`*/`
`135`		`-#define CF_EID_ERR_INVALID_MID (28)`
	`135`	`+#define CF_MID_ERR_EID (28)`
`136`	`136`
`137`	`137`	`/**`
`138`	`138`	`* \brief CF SB Receive Buffer Failed Event ID`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ void CF_AppPipe(const CFE_SB_Buffer_t *msg)`
`151`	`151`
`152`	`152`	`default:`
`153`	`153`	`++CF_AppData.hk.Payload.counters.err;`
`154`		`- CFE_EVS_SendEvent(CF_EID_ERR_INVALID_MID, CFE_EVS_EventType_ERROR, "CF: invalid command packet id=0x%lx",`
	`154`	`+ CFE_EVS_SendEvent(CF_MID_ERR_EID, CFE_EVS_EventType_ERROR, "CF: invalid command packet id=0x%lx",`
`155`	`155`	`(unsigned long)CFE_SB_MsgIdToValue(msg_id));`
`156`	`156`	`break;`
`157`	`157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ void Test_CF_AppPipe_UnrecognizedCommandEnterDefaultPath(void)`
`262`	`262`	`/* Assert */`
`263`	`263`	`UtAssert_UINT32_EQ(CF_AppData.hk.Payload.counters.err, 1);`
`264`	`264`	`UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1);`
`265`		`- UT_CF_AssertEventID(CF_EID_ERR_INVALID_MID);`
	`265`	`+ UT_CF_AssertEventID(CF_MID_ERR_EID);`
`266`	`266`	`}`
`267`	`267`
`268`	`268`	`void add_CF_ProcessGroundCommand_tests(void)`