Skip to content

Commit

Permalink
Fix #45, Apply consistent Event ID names to common events in LC
Browse files Browse the repository at this point in the history
  • Loading branch information
thnkslprpt committed Apr 1, 2023
1 parent 2f177ae commit 1c38e4f
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions fsw/inc/lc_events.h
Original file line number Diff line number Diff line change
Expand Up @@ -394,14 +394,14 @@
/**
* \brief LC Reset Counters Command Event ID
*
* \par Type: DEBUG
* \par Type: INFORMATION
*
* \par Cause:
*
* This event message is issued when a reset counters command has
* been received.
*/
#define LC_RESET_DBG_EID 27
#define LC_RESET_INF_EID 27

/**
* \brief LC Set Limit Checker State Command Event ID
Expand Down Expand Up @@ -596,7 +596,7 @@
* This event message is issued when a ground command message is received
* with a message length that doesn't match the expected value.
*/
#define LC_LEN_ERR_EID 43
#define LC_CMD_LEN_ERR_EID 43

/**
* \brief LC Watchpoint Message Unsubscribe Failed Event ID
Expand Down
16 changes: 8 additions & 8 deletions fsw/inc/lc_msgdefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
*
* \par Evidence of failure may be found in the following telemetry:
* - #LC_HkPacket_t.CmdErrCount will increment
* - Error specific event message #LC_LEN_ERR_EID
* - Error specific event message #LC_CMD_LEN_ERR_EID
*
* \par Criticality
* None
Expand All @@ -165,7 +165,7 @@
* Successful execution of this command may be verified with
* the following telemetry:
* - #LC_HkPacket_t.CmdCount will be cleared
* - The #LC_RESET_DBG_EID debug event message will be
* - The #LC_RESET_INF_EID informational event message will be
* generated when the command is executed
*
* \par Error Conditions
Expand All @@ -174,7 +174,7 @@
*
* \par Evidence of failure may be found in the following telemetry:
* - #LC_HkPacket_t.CmdErrCount will increment
* - Error specific event message #LC_LEN_ERR_EID
* - Error specific event message #LC_CMD_LEN_ERR_EID
*
* \par Criticality
* None
Expand Down Expand Up @@ -207,7 +207,7 @@
*
* \par Evidence of failure may be found in the following telemetry:
* - #LC_HkPacket_t.CmdErrCount will increment
* - Error specific event message #LC_LEN_ERR_EID
* - Error specific event message #LC_CMD_LEN_ERR_EID
* - Error specific event message #LC_LCSTATE_ERR_EID
*
* \par Criticality
Expand Down Expand Up @@ -243,7 +243,7 @@
*
* \par Evidence of failure may be found in the following telemetry:
* - #LC_HkPacket_t.CmdErrCount will increment
* - Error specific event message #LC_LEN_ERR_EID
* - Error specific event message #LC_CMD_LEN_ERR_EID
* - Error specific event message #LC_APSTATE_NEW_ERR_EID
* - Error specific event message #LC_APSTATE_APNUM_ERR_EID
* - Error specific event message #LC_APSTATE_CURR_ERR_EID
Expand Down Expand Up @@ -279,7 +279,7 @@
*
* \par Evidence of failure may be found in the following telemetry:
* - #LC_HkPacket_t.CmdErrCount will increment
* - Error specific event message #LC_LEN_ERR_EID
* - Error specific event message #LC_CMD_LEN_ERR_EID
* - Error specific event message #LC_APOFF_APNUM_ERR_EID
* - Error specific event message #LC_APOFF_CURR_ERR_EID
*
Expand Down Expand Up @@ -313,7 +313,7 @@
*
* \par Evidence of failure may be found in the following telemetry:
* - #LC_HkPacket_t.CmdErrCount will increment
* - Error specific event message #LC_LEN_ERR_EID
* - Error specific event message #LC_CMD_LEN_ERR_EID
* - Error specific event message #LC_APSTATS_APNUM_ERR_EID
*
* \par Criticality
Expand Down Expand Up @@ -347,7 +347,7 @@
*
* \par Evidence of failure may be found in the following telemetry:
* - #LC_HkPacket_t.CmdErrCount will increment
* - Error specific event message #LC_LEN_ERR_EID
* - Error specific event message #LC_CMD_LEN_ERR_EID
* - Error specific event message #LC_WPSTATS_WPNUM_ERR_EID
*
* \par Criticality
Expand Down
2 changes: 1 addition & 1 deletion fsw/src/lc_cmds.c
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ void LC_ResetCmd(const CFE_SB_Buffer_t *BufPtr)
{
LC_ResetCounters();

CFE_EVS_SendEvent(LC_RESET_DBG_EID, CFE_EVS_EventType_DEBUG, "Reset counters command");
CFE_EVS_SendEvent(LC_RESET_INF_EID, CFE_EVS_EventType_DEBUG, "Reset counters command");
}

return;
Expand Down
2 changes: 1 addition & 1 deletion fsw/src/lc_utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ bool LC_VerifyMsgLength(const CFE_MSG_Message_t *MsgPtr, size_t ExpectedLength)
/*
** All other cases, increment error counter
*/
CFE_EVS_SendEvent(LC_LEN_ERR_EID, CFE_EVS_EventType_ERROR,
CFE_EVS_SendEvent(LC_CMD_LEN_ERR_EID, CFE_EVS_EventType_ERROR,
"Invalid msg length: ID = 0x%08lX, CC = %d, Len = %d, Expected = %d",
(unsigned long)CFE_SB_MsgIdToValue(MessageID), CommandCode, (int)ActualLength,
(int)ExpectedLength);
Expand Down
2 changes: 1 addition & 1 deletion fsw/src/lc_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
* \retval true Length verification passed
* \retval false Length verification failed
*
* \sa #LC_LEN_ERR_EID
* \sa #LC_CMD_LEN_ERR_EID
*/
bool LC_VerifyMsgLength(const CFE_MSG_Message_t *MsgPtr, size_t ExpectedLength);

Expand Down
2 changes: 1 addition & 1 deletion unit-test/lc_cmds_tests.c
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ void LC_AppPipe_Test_Reset(void)
* has been reached */
call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent));
UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1);
UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, LC_RESET_DBG_EID);
UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, LC_RESET_INF_EID);
UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG);

strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH);
Expand Down
2 changes: 1 addition & 1 deletion unit-test/lc_utils_tests.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ void LC_VerifyMsgLength_Test_GenericLengthError(void)

call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent));
UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1);
UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, LC_LEN_ERR_EID);
UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, LC_CMD_LEN_ERR_EID);
UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR);

strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH);
Expand Down

0 comments on commit 1c38e4f

Please sign in to comment.