Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #133, Apply consistent Event ID names to common events #134

Merged
merged 1 commit into from
Nov 14, 2023
Merged

Fix #133, Apply consistent Event ID names to common events #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions fsw/src/to_lab_app.c
View file
Open in desktop
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
View file
Open in desktop
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