Skip to content

Commit

Permalink
Fix nasa#133, Apply consistent Event ID names to common events
Browse files Browse the repository at this point in the history
  • Loading branch information
thnkslprpt committed Mar 12, 2023
1 parent 7ca124c commit 77f7d11
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions fsw/src/to_lab_app.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ int32 TO_LAB_init(void)
CFE_SB_Subscribe(CFE_SB_ValueToMsgId(TO_LAB_SEND_HK_MID), TO_LAB_Global.Cmd_pipe);
}
else
CFE_EVS_SendEvent(TO_LAB_CRCMDPIPE_ERR_EID, CFE_EVS_EventType_ERROR, "L%d TO Can't create cmd pipe status %i",
CFE_EVS_SendEvent(TO_LAB_CR_PIPE_ERR_EID, CFE_EVS_EventType_ERROR, "L%d TO Can't create cmd pipe status %i",
__LINE__, (int)status);

/* Create TO TLM pipe */
Expand Down Expand Up @@ -285,7 +285,7 @@ void TO_LAB_process_commands(void)
break;

default:
CFE_EVS_SendEvent(TO_LAB_MSGID_ERR_EID, CFE_EVS_EventType_ERROR,
CFE_EVS_SendEvent(TO_LAB_MID_ERR_EID, CFE_EVS_EventType_ERROR,
"L%d TO: Invalid Msg ID Rcvd 0x%x", __LINE__,
(unsigned int)CFE_SB_MsgIdToValue(MsgId));
break;
Expand Down
4 changes: 2 additions & 2 deletions fsw/src/to_lab_events.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
#define TO_LAB_EVM_RESERVED 0

#define TO_LAB_INIT_INF_EID 1
#define TO_LAB_CRCMDPIPE_ERR_EID 2
#define TO_LAB_CR_PIPE_ERR_EID 2
#define TO_LAB_TLMOUTENA_INF_EID 3
#define TO_LAB_SUBSCRIBE_ERR_EID 4
#define TO_LAB_TLMPIPE_ERR_EID 5
#define TO_LAB_TLMOUTSOCKET_ERR_EID 6
#define TO_LAB_TLMOUTSTOP_ERR_EID 7
#define TO_LAB_MSGID_ERR_EID 8
#define TO_LAB_MID_ERR_EID 8
#define TO_LAB_FNCODE_ERR_EID 9
#define TO_LAB_ADDPKT_ERR_EID 10
#define TO_LAB_REMOVEPKT_ERR_EID 11
Expand Down

0 comments on commit 77f7d11

Please sign in to comment.