From d04d6e9146339f9179d4d3aec72742fbf7d47f2a Mon Sep 17 00:00:00 2001 From: Avi Date: Tue, 18 Oct 2022 17:55:56 +1000 Subject: [PATCH] Fix #262, Update inaccurate event ID name --- fsw/inc/cf_events.h | 2 +- fsw/src/cf_app.c | 4 ++-- fsw/src/cf_cfdp_types.h | 1 - unit-test/cf_app_tests.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/fsw/inc/cf_events.h b/fsw/inc/cf_events.h index 9910ef0a..2666c174 100644 --- 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_INIT_CMD_LENGTH (28) +#define CF_MID_ERR_EID (28) /** * \brief CF SB Receive Buffer Failed Event ID diff --git a/fsw/src/cf_app.c b/fsw/src/cf_app.c index 919d8597..5ecc7354 100644 --- a/fsw/src/cf_app.c +++ b/fsw/src/cf_app.c @@ -302,8 +302,8 @@ void CF_ProcessMsg(CFE_SB_Buffer_t *msg) default: ++CF_AppData.hk.counters.err; - CFE_EVS_SendEvent(CF_EID_ERR_INIT_CMD_LENGTH, CFE_EVS_EventType_ERROR, - "CF: invalid command packet id=0x%lx", (unsigned long)CFE_SB_MsgIdToValue(msg_id)); + 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/fsw/src/cf_cfdp_types.h b/fsw/src/cf_cfdp_types.h index a4d9c85a..5b658422 100644 --- a/fsw/src/cf_cfdp_types.h +++ b/fsw/src/cf_cfdp_types.h @@ -162,7 +162,6 @@ typedef enum /* keep last */ CF_TxnStatus_MAX = 22 - } CF_TxnStatus_t; /** diff --git a/unit-test/cf_app_tests.c b/unit-test/cf_app_tests.c index fd435549..e61fec02 100644 --- a/unit-test/cf_app_tests.c +++ b/unit-test/cf_app_tests.c @@ -577,7 +577,7 @@ void Test_CF_ProcessMsg_UnrecognizedCommandEnterDefaultPath(void) /* Assert */ UtAssert_UINT32_EQ(CF_AppData.hk.counters.err, 1); UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); - UT_CF_AssertEventID(CF_EID_ERR_INIT_CMD_LENGTH); + UT_CF_AssertEventID(CF_MID_ERR_EID); } /*******************************************************************************