From e385365f277236830a74149044954c17b6545f3b Mon Sep 17 00:00:00 2001 From: Avi Date: Fri, 21 Oct 2022 20:28:47 +1000 Subject: [PATCH] Fix #133, Apply consistent Event ID names to common events --- fsw/src/to_lab_app.c | 32 +++++++++++++++++--------------- fsw/src/to_lab_events.h | 4 ++-- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/fsw/src/to_lab_app.c b/fsw/src/to_lab_app.c index 1aed08c..72b0912 100644 --- a/fsw/src/to_lab_app.c +++ b/fsw/src/to_lab_app.c @@ -157,8 +157,8 @@ int32 TO_LAB_init(void) if (status != CFE_SUCCESS) { - CFE_EVS_SendEvent(TO_LAB_TBL_ERR_EID, CFE_EVS_EventType_ERROR, "L%d TO Can't register table status %i", __LINE__, - (int)status); + CFE_EVS_SendEvent(TO_LAB_TBL_ERR_EID, CFE_EVS_EventType_ERROR, "L%d TO Can't register table status %i", + __LINE__, (int)status); return status; } @@ -175,8 +175,8 @@ int32 TO_LAB_init(void) if (status != CFE_SUCCESS && status != CFE_TBL_INFO_UPDATED) { - CFE_EVS_SendEvent(TO_LAB_TBL_ERR_EID, CFE_EVS_EventType_ERROR, "L%d TO Can't get table addr status %i", __LINE__, - (int)status); + CFE_EVS_SendEvent(TO_LAB_TBL_ERR_EID, CFE_EVS_EventType_ERROR, "L%d TO Can't get table addr status %i", + __LINE__, (int)status); return status; } @@ -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 */ @@ -224,8 +224,8 @@ int32 TO_LAB_init(void) */ OS_TaskInstallDeleteHandler(&TO_LAB_delete_callback); - CFE_EVS_SendEvent(TO_LAB_INIT_INF_EID, CFE_EVS_EventType_INFORMATION, "TO Lab Initialized.%s, Awaiting enable command.", - TO_LAB_VERSION_STRING); + CFE_EVS_SendEvent(TO_LAB_INIT_INF_EID, CFE_EVS_EventType_INFORMATION, + "TO Lab Initialized.%s, Awaiting enable command.", TO_LAB_VERSION_STRING); return CFE_SUCCESS; } @@ -285,8 +285,9 @@ void TO_LAB_process_commands(void) break; default: - CFE_EVS_SendEvent(TO_LAB_MSGID_ERR_EID, CFE_EVS_EventType_ERROR, "L%d TO: Invalid Msg ID Rcvd 0x%x", - __LINE__, (unsigned int)CFE_SB_MsgIdToValue(MsgId)); + 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; } break; @@ -445,8 +446,8 @@ void TO_LAB_openTLM(void) status = OS_SocketOpen(&TO_LAB_Global.TLMsockid, OS_SocketDomain_INET, OS_SocketType_DATAGRAM); if (status != OS_SUCCESS) { - CFE_EVS_SendEvent(TO_LAB_TLMOUTSOCKET_ERR_EID, CFE_EVS_EventType_ERROR, "L%d, TO TLM socket error: %d", __LINE__, - (int)status); + CFE_EVS_SendEvent(TO_LAB_TLMOUTSOCKET_ERR_EID, CFE_EVS_EventType_ERROR, "L%d, TO TLM socket error: %d", + __LINE__, (int)status); } /*---------------- Add static arp entries ----------------*/ @@ -465,11 +466,12 @@ int32 TO_LAB_AddPacket(const TO_LAB_AddPacketCmd_t *data) status = CFE_SB_SubscribeEx(pCmd->Stream, TO_LAB_Global.Tlm_pipe, pCmd->Flags, pCmd->BufLimit); if (status != CFE_SUCCESS) - CFE_EVS_SendEvent(TO_LAB_ADDPKT_ERR_EID, CFE_EVS_EventType_ERROR, "L%d TO Can't subscribe 0x%x status %i", __LINE__, - (unsigned int)CFE_SB_MsgIdToValue(pCmd->Stream), (int)status); + CFE_EVS_SendEvent(TO_LAB_ADDPKT_ERR_EID, CFE_EVS_EventType_ERROR, "L%d TO Can't subscribe 0x%x status %i", + __LINE__, (unsigned int)CFE_SB_MsgIdToValue(pCmd->Stream), (int)status); else - CFE_EVS_SendEvent(TO_LAB_ADDPKT_INF_EID, CFE_EVS_EventType_INFORMATION, "L%d TO AddPkt 0x%x, QoS %d.%d, limit %d", - __LINE__, (unsigned int)CFE_SB_MsgIdToValue(pCmd->Stream), pCmd->Flags.Priority, + CFE_EVS_SendEvent(TO_LAB_ADDPKT_INF_EID, CFE_EVS_EventType_INFORMATION, + "L%d TO AddPkt 0x%x, QoS %d.%d, limit %d", __LINE__, + (unsigned int)CFE_SB_MsgIdToValue(pCmd->Stream), pCmd->Flags.Priority, pCmd->Flags.Reliability, pCmd->BufLimit); ++TO_LAB_Global.HkTlm.Payload.CommandCounter; diff --git a/fsw/src/to_lab_events.h b/fsw/src/to_lab_events.h index 44369fa..8c2dfa8 100644 --- a/fsw/src/to_lab_events.h +++ b/fsw/src/to_lab_events.h @@ -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