Skip to content

Commit 4820e16

Browse files
thnkslprptthnkslprpt
committed
Fix nasa#2175, Apply consistent naming to common Event IDs
1 parent 8ea2307 commit 4820e16

31 files changed

+154
-156
lines changed

‎docs/src/cfe_es.dox

+1-1
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@
728728
message length embedded within the header (from `CFE_MSG_GetSize()`) matches the expected
729729
length of that message, based on the size of the C structure defining that command.
730730
If there is any discrepancy between the expected and actual message size, ES will generate
731-
the #CFE_ES_LEN_ERR_EID event, increment the command error counter (\ES_CMDEC), and the
731+
the #CFE_ES_CMD_LEN_ERR_EID event, increment the command error counter (\ES_CMDEC), and the
732732
command will _not_ be accepted for processing.
733733

734734
The following is a list of commands that are processed by the cFE Executive Services Task.

‎docs/src/cfe_evs.dox

+1-1
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@
492492
** message length embedded within the header (from `CFE_MSG_GetSize()`) matches the expected
493493
** length of that message, based on the size of the C structure defining that command.
494494
** If there is any discrepancy between the expected and actual message size, EVS will generate
495-
** the #CFE_EVS_LEN_ERR_EID event, increment the command error counter (\EVS_CMDEC), and the
495+
** the #CFE_EVS_CMD_LEN_ERR_EID event, increment the command error counter (\EVS_CMDEC), and the
496496
** command will _not_ be accepted for processing.
497497
**
498498
** The following is a list of commands that are processed by the cFE Event Services Task.

‎docs/src/cfe_sb.dox

+1-1
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@
530530
** message length embedded within the header (from `CFE_MSG_GetSize()`) matches the expected
531531
** length of that message, based on the size of the C structure defining that command.
532532
** If there is any discrepancy between the expected and actual message size, SB will generate
533-
** the #CFE_SB_LEN_ERR_EID event, increment the command error counter (\SB_CMDEC), and the
533+
** the #CFE_SB_CMD_LEN_ERR_EID event, increment the command error counter (\SB_CMDEC), and the
534534
** command will _not_ be accepted for processing.
535535
**
536536
** The following is a list of commands that are processed by the cFE Software Bus Task.

‎docs/src/cfe_tbl.dox

+1-1
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@
377377
** message length embedded within the header (from `CFE_MSG_GetSize()`) matches the expected
378378
** length of that message, based on the size of the C structure defining that command.
379379
** If there is any discrepancy between the expected and actual message size, TBL will generate
380-
** the #CFE_TBL_LEN_ERR_EID event, increment the command error counter (\TBL_CMDEC), and the
380+
** the #CFE_TBL_CMD_LEN_ERR_EID event, increment the command error counter (\TBL_CMDEC), and the
381381
** command will _not_ be accepted for processing.
382382
**
383383
** The following is a list of commands that are processed by the cFE Table Services Task.

‎docs/src/cfe_time.dox

+1-1
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@
706706
** message length embedded within the header (from `CFE_MSG_GetSize()`) matches the expected
707707
** length of that message, based on the size of the C structure defining that command.
708708
** If there is any discrepancy between the expected and actual message size, TIME will generate
709-
** the #CFE_TIME_LEN_ERR_EID event, increment the command error counter (\TIME_CMDEC), and the
709+
** the #CFE_TIME_CMD_LEN_ERR_EID event, increment the command error counter (\TIME_CMDEC), and the
710710
** command will _not_ be accepted for processing.
711711
**
712712
** The following is a list of commands that are processed by the cFE Time Services Task.

‎modules/es/eds/cfe_es.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,7 @@
822822

823823
Evidence of failure may be found in the following telemetry:
824824
- \b \c \ES_CMDEC - command error counter will increment
825-
- the #CFE_ES_LEN_ERR_EID error event message will be generated
825+
- the #CFE_ES_CMD_LEN_ERR_EID error event message will be generated
826826

827827
\par Criticality
828828
None
@@ -863,7 +863,7 @@
863863

864864
Evidence of failure may be found in the following telemetry:
865865
- \b \c \ES_CMDEC - command error counter will increment
866-
- the #CFE_ES_LEN_ERR_EID error event message will be generated
866+
- the #CFE_ES_CMD_LEN_ERR_EID error event message will be generated
867867

868868
\par Criticality
869869

‎modules/es/fsw/inc/cfe_es_events.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@
269269
*
270270
* Invalid command code for message ID #CFE_ES_CMD_MID received on the ES message pipe.
271271
*/
272-
#define CFE_ES_CC1_ERR_EID 22
272+
#define CFE_ES_CC_ERR_EID 22
273273

274274
/**
275275
* \brief ES Invalid Command Length Event ID
@@ -280,7 +280,7 @@
280280
*
281281
* Invalid length for the command code in message ID #CFE_ES_CMD_MID received on the ES message pipe.
282282
*/
283-
#define CFE_ES_LEN_ERR_EID 23
283+
#define CFE_ES_CMD_LEN_ERR_EID 23
284284

285285
/**
286286
* \brief ES Restart Command Invalid Restart Type Event ID

‎modules/es/fsw/inc/cfe_es_msg.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
**
7474
** Evidence of failure may be found in the following telemetry:
7575
** - \b \c \ES_CMDEC - command error counter will increment
76-
** - the #CFE_ES_LEN_ERR_EID error event message will be generated
76+
** - the #CFE_ES_CMD_LEN_ERR_EID error event message will be generated
7777
**
7878
** \par Criticality
7979
** None

‎modules/es/fsw/src/cfe_es_dispatch.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ bool CFE_ES_VerifyCmdLength(const CFE_MSG_Message_t *MsgPtr, size_t ExpectedLeng
5858
CFE_MSG_GetMsgId(MsgPtr, &MsgId);
5959
CFE_MSG_GetFcnCode(MsgPtr, &FcnCode);
6060

61-
CFE_EVS_SendEvent(CFE_ES_LEN_ERR_EID, CFE_EVS_EventType_ERROR,
61+
CFE_EVS_SendEvent(CFE_ES_CMD_LEN_ERR_EID, CFE_EVS_EventType_ERROR,
6262
"Invalid msg length: ID = 0x%X, CC = %u, Len = %u, Expected = %u",
6363
(unsigned int)CFE_SB_MsgIdToValue(MsgId), (unsigned int)FcnCode, (unsigned int)ActualLength,
6464
(unsigned int)ExpectedLength);
@@ -267,7 +267,7 @@ void CFE_ES_TaskPipe(const CFE_SB_Buffer_t *SBBufPtr)
267267
break;
268268

269269
default:
270-
CFE_EVS_SendEvent(CFE_ES_CC1_ERR_EID, CFE_EVS_EventType_ERROR,
270+
CFE_EVS_SendEvent(CFE_ES_CC_ERR_EID, CFE_EVS_EventType_ERROR,
271271
"Invalid ground command code: ID = 0x%X, CC = %d",
272272
(unsigned int)CFE_SB_MsgIdToValue(MessageID), (int)CommandCode);
273273
CFE_ES_Global.TaskData.CommandErrorCounter++;

‎modules/es/ut-coverage/es_UT.c

+21-21
Original file line numberDiff line numberDiff line change
@@ -3217,7 +3217,7 @@ void TestTask(void)
32173217
*/
32183218
ES_ResetUnitTest();
32193219
UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, 0, UT_TPID_CFE_ES_CMD_CLEAR_ER_LOG_CC);
3220-
CFE_UtAssert_EVENTSENT(CFE_ES_LEN_ERR_EID);
3220+
CFE_UtAssert_EVENTSENT(CFE_ES_CMD_LEN_ERR_EID);
32213221

32223222
/* Test resetting and setting the max for the processor reset count */
32233223
ES_ResetUnitTest();
@@ -3332,22 +3332,22 @@ void TestTask(void)
33323332
/* Test the command pipe message process with an invalid command */
33333333
ES_ResetUnitTest();
33343334
UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.NoopCmd), UT_TPID_CFE_ES_CMD_INVALID_CC);
3335-
CFE_UtAssert_EVENTSENT(CFE_ES_CC1_ERR_EID);
3335+
CFE_UtAssert_EVENTSENT(CFE_ES_CC_ERR_EID);
33363336

33373337
/* Test sending a no-op command with an invalid command length */
33383338
ES_ResetUnitTest();
33393339
UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, 0, UT_TPID_CFE_ES_CMD_NOOP_CC);
3340-
CFE_UtAssert_EVENTSENT(CFE_ES_LEN_ERR_EID);
3340+
CFE_UtAssert_EVENTSENT(CFE_ES_CMD_LEN_ERR_EID);
33413341

33423342
/* Test sending a reset counters command with an invalid command length */
33433343
ES_ResetUnitTest();
33443344
UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, 0, UT_TPID_CFE_ES_CMD_RESET_COUNTERS_CC);
3345-
CFE_UtAssert_EVENTSENT(CFE_ES_LEN_ERR_EID);
3345+
CFE_UtAssert_EVENTSENT(CFE_ES_CMD_LEN_ERR_EID);
33463346

33473347
/* Test sending a cFE restart command with an invalid command length */
33483348
ES_ResetUnitTest();
33493349
UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, 0, UT_TPID_CFE_ES_CMD_RESTART_CC);
3350-
CFE_UtAssert_EVENTSENT(CFE_ES_LEN_ERR_EID);
3350+
CFE_UtAssert_EVENTSENT(CFE_ES_CMD_LEN_ERR_EID);
33513351

33523352
/* Test cFE restart with a power on reset */
33533353
ES_ResetUnitTest();
@@ -3361,7 +3361,7 @@ void TestTask(void)
33613361
*/
33623362
ES_ResetUnitTest();
33633363
UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, 0, UT_TPID_CFE_ES_CMD_START_APP_CC);
3364-
CFE_UtAssert_EVENTSENT(CFE_ES_LEN_ERR_EID);
3364+
CFE_UtAssert_EVENTSENT(CFE_ES_CMD_LEN_ERR_EID);
33653365

33663366
/* Test start application command with a processor restart on application
33673367
* exception
@@ -3386,63 +3386,63 @@ void TestTask(void)
33863386
*/
33873387
ES_ResetUnitTest();
33883388
UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, 0, UT_TPID_CFE_ES_CMD_STOP_APP_CC);
3389-
CFE_UtAssert_EVENTSENT(CFE_ES_LEN_ERR_EID);
3389+
CFE_UtAssert_EVENTSENT(CFE_ES_CMD_LEN_ERR_EID);
33903390

33913391
/* Test sending a restart application command with an invalid command
33923392
* length
33933393
*/
33943394
ES_ResetUnitTest();
33953395
UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, 0, UT_TPID_CFE_ES_CMD_RESTART_APP_CC);
3396-
CFE_UtAssert_EVENTSENT(CFE_ES_LEN_ERR_EID);
3396+
CFE_UtAssert_EVENTSENT(CFE_ES_CMD_LEN_ERR_EID);
33973397

33983398
/* Test sending a reload application command with an invalid command
33993399
* length
34003400
*/
34013401
ES_ResetUnitTest();
34023402
UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, 0, UT_TPID_CFE_ES_CMD_RELOAD_APP_CC);
3403-
CFE_UtAssert_EVENTSENT(CFE_ES_LEN_ERR_EID);
3403+
CFE_UtAssert_EVENTSENT(CFE_ES_CMD_LEN_ERR_EID);
34043404

34053405
/* Test sending a write request for a single application with an
34063406
* invalid command length
34073407
*/
34083408
ES_ResetUnitTest();
34093409
UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, 0, UT_TPID_CFE_ES_CMD_QUERY_ONE_CC);
3410-
CFE_UtAssert_EVENTSENT(CFE_ES_LEN_ERR_EID);
3410+
CFE_UtAssert_EVENTSENT(CFE_ES_CMD_LEN_ERR_EID);
34113411

34123412
/* Test sending a write request for all applications with an
34133413
* invalid command length
34143414
*/
34153415
ES_ResetUnitTest();
34163416
UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, 0, UT_TPID_CFE_ES_CMD_QUERY_ALL_CC);
3417-
CFE_UtAssert_EVENTSENT(CFE_ES_LEN_ERR_EID);
3417+
CFE_UtAssert_EVENTSENT(CFE_ES_CMD_LEN_ERR_EID);
34183418

34193419
/* Test sending a write request for all tasks with an
34203420
* invalid command length
34213421
*/
34223422
ES_ResetUnitTest();
34233423
UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, 0, UT_TPID_CFE_ES_CMD_QUERY_ALL_TASKS_CC);
3424-
CFE_UtAssert_EVENTSENT(CFE_ES_LEN_ERR_EID);
3424+
CFE_UtAssert_EVENTSENT(CFE_ES_CMD_LEN_ERR_EID);
34253425

34263426
/* Test sending a request to clear the system log with an
34273427
* invalid command length
34283428
*/
34293429
ES_ResetUnitTest();
34303430
UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, 0, UT_TPID_CFE_ES_CMD_CLEAR_SYSLOG_CC);
3431-
CFE_UtAssert_EVENTSENT(CFE_ES_LEN_ERR_EID);
3431+
CFE_UtAssert_EVENTSENT(CFE_ES_CMD_LEN_ERR_EID);
34323432

34333433
/* Test sending a request to overwrite the system log with an
34343434
* invalid command length
34353435
*/
34363436
ES_ResetUnitTest();
34373437
UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, 0, UT_TPID_CFE_ES_CMD_OVER_WRITE_SYSLOG_CC);
3438-
CFE_UtAssert_EVENTSENT(CFE_ES_LEN_ERR_EID);
3438+
CFE_UtAssert_EVENTSENT(CFE_ES_CMD_LEN_ERR_EID);
34393439

34403440
/* Test sending a request to write the system log with an
34413441
* invalid command length
34423442
*/
34433443
ES_ResetUnitTest();
34443444
UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, 0, UT_TPID_CFE_ES_CMD_WRITE_SYSLOG_CC);
3445-
CFE_UtAssert_EVENTSENT(CFE_ES_LEN_ERR_EID);
3445+
CFE_UtAssert_EVENTSENT(CFE_ES_CMD_LEN_ERR_EID);
34463446

34473447
/* Test successful overwriting of the system log using overwrite mode */
34483448
ES_ResetUnitTest();
@@ -3457,35 +3457,35 @@ void TestTask(void)
34573457
*/
34583458
ES_ResetUnitTest();
34593459
UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, 0, UT_TPID_CFE_ES_CMD_WRITE_ER_LOG_CC);
3460-
CFE_UtAssert_EVENTSENT(CFE_ES_LEN_ERR_EID);
3460+
CFE_UtAssert_EVENTSENT(CFE_ES_CMD_LEN_ERR_EID);
34613461

34623462
/* Test sending a request to reset the processor reset count with an
34633463
* invalid command length
34643464
*/
34653465
ES_ResetUnitTest();
34663466
UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, 0, UT_TPID_CFE_ES_CMD_RESET_PR_COUNT_CC);
3467-
CFE_UtAssert_EVENTSENT(CFE_ES_LEN_ERR_EID);
3467+
CFE_UtAssert_EVENTSENT(CFE_ES_CMD_LEN_ERR_EID);
34683468

34693469
/* Test sending a request to set the maximum processor reset count with
34703470
* an invalid command length
34713471
*/
34723472
ES_ResetUnitTest();
34733473
UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, 0, UT_TPID_CFE_ES_CMD_SET_MAX_PR_COUNT_CC);
3474-
CFE_UtAssert_EVENTSENT(CFE_ES_LEN_ERR_EID);
3474+
CFE_UtAssert_EVENTSENT(CFE_ES_CMD_LEN_ERR_EID);
34753475

34763476
/* Test sending a request to delete the CDS with an invalid command
34773477
* length
34783478
*/
34793479
ES_ResetUnitTest();
34803480
UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, 0, UT_TPID_CFE_ES_CMD_DELETE_CDS_CC);
3481-
CFE_UtAssert_EVENTSENT(CFE_ES_LEN_ERR_EID);
3481+
CFE_UtAssert_EVENTSENT(CFE_ES_CMD_LEN_ERR_EID);
34823482

34833483
/* Test sending a telemetry pool statistics retrieval command with an
34843484
* invalid command length
34853485
*/
34863486
ES_ResetUnitTest();
34873487
UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, 0, UT_TPID_CFE_ES_CMD_SEND_MEM_POOL_STATS_CC);
3488-
CFE_UtAssert_EVENTSENT(CFE_ES_LEN_ERR_EID);
3488+
CFE_UtAssert_EVENTSENT(CFE_ES_CMD_LEN_ERR_EID);
34893489

34903490
/* Test successful dump of CDS to file using a specified dump file name */
34913491
ES_ResetUnitTest();
@@ -3502,7 +3502,7 @@ void TestTask(void)
35023502
/* Dump CDS command with invalid length */
35033503
ES_ResetUnitTest();
35043504
UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, 0, UT_TPID_CFE_ES_CMD_DUMP_CDS_REGISTRY_CC);
3505-
CFE_UtAssert_EVENTSENT(CFE_ES_LEN_ERR_EID);
3505+
CFE_UtAssert_EVENTSENT(CFE_ES_CMD_LEN_ERR_EID);
35063506

35073507
/* Test error when sending Build Info event */
35083508
ES_ResetUnitTest();

‎modules/evs/eds/cfe_evs.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@
344344
\par Command Verification
345345
Successful execution of this command may be verified with the following telemetry:
346346
- \b \c \EVS_CMDPC - command execution counter will increment
347-
- The #CFE_EVS_NOOP_EID informational event message will be generated
347+
- The #CFE_EVS_NOOP_INF_EID informational event message will be generated
348348

349349
\par Error Conditions
350350
There are no error conditions for this command. If the Event
@@ -379,7 +379,7 @@
379379
the following telemetry:
380380
- \b \c \EVS_CMDPC - command execution counter will
381381
increment
382-
- The #CFE_EVS_RSTCNT_EID debug event message will be
382+
- The #CFE_EVS_RESET_INF_EID debug event message will be
383383
generated
384384

385385
\par Error Conditions

‎modules/evs/fsw/inc/cfe_evs_events.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
*
4040
* \link #CFE_EVS_NOOP_CC EVS NO-OP command \endlink success.
4141
*/
42-
#define CFE_EVS_NOOP_EID 0
42+
#define CFE_EVS_NOOP_INF_EID 0
4343

4444
/**
4545
* \brief EVS Initialization Event ID
@@ -50,7 +50,7 @@
5050
*
5151
* Event Services Task initialization complete.
5252
*/
53-
#define CFE_EVS_STARTUP_EID 1
53+
#define CFE_EVS_INIT_INF_EID 1
5454

5555
/**
5656
* \brief EVS Write Event Log Command File Write Entry Failed Event ID
@@ -85,7 +85,7 @@
8585
*
8686
* Invalid message ID received on the EVS message pipe.
8787
*/
88-
#define CFE_EVS_ERR_MSGID_EID 5
88+
#define CFE_EVS_MID_ERR_EID 5
8989

9090
/**
9191
* \brief EVS Command Event Not Registered For Filtering Event ID
@@ -188,7 +188,7 @@
188188
*
189189
* Invalid command code for message ID #CFE_EVS_CMD_MID received on the EVS message pipe.
190190
*/
191-
#define CFE_EVS_ERR_CC_EID 15
191+
#define CFE_EVS_CC_ERR_EID 15
192192

193193
/**
194194
* \brief EVS Reset Counters Command Success Event ID
@@ -199,7 +199,7 @@
199199
*
200200
* \link #CFE_EVS_RESET_COUNTERS_CC EVS Reset Counters Command \endlink success.
201201
*/
202-
#define CFE_EVS_RSTCNT_EID 16
202+
#define CFE_EVS_RESET_INF_EID 16
203203

204204
/**
205205
* \brief EVS Set Filter Command Success Event ID
@@ -465,7 +465,7 @@
465465
*
466466
* Invalid length for the command code in message ID #CFE_EVS_CMD_MID received on the EVS message pipe.
467467
*/
468-
#define CFE_EVS_LEN_ERR_EID 43
468+
#define CFE_EVS_CMD_LEN_ERR_EID 43
469469

470470
/**
471471
* \brief EVS Events Squelched Error Event ID

‎modules/evs/fsw/inc/cfe_evs_msg.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
** following telemetry:
6161
** - \b \c \EVS_CMDPC - command execution counter will
6262
** increment
63-
** - The #CFE_EVS_NOOP_EID informational event message will
63+
** - The #CFE_EVS_NOOP_INF_EID informational event message will
6464
** be generated
6565
**
6666
** \par Error Conditions
@@ -96,7 +96,7 @@
9696
** will be reset to 0
9797
** - \b \c \EVS_CMDEC - command error counter
9898
** will be reset to 0
99-
** - The #CFE_EVS_RSTCNT_EID debug event message will be
99+
** - The #CFE_EVS_RESET_INF_EID debug event message will be
100100
** generated
101101
**
102102
** \par Error Conditions

‎modules/evs/fsw/src/cfe_evs_dispatch.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void CFE_EVS_ProcessCommandPacket(const CFE_SB_Buffer_t *SBBufPtr)
6161
default:
6262
/* Unknown command -- should never occur */
6363
CFE_EVS_Global.EVS_TlmPkt.Payload.CommandErrorCounter++;
64-
EVS_SendEvent(CFE_EVS_ERR_MSGID_EID, CFE_EVS_EventType_ERROR, "Invalid command packet, Message ID = 0x%08X",
64+
EVS_SendEvent(CFE_EVS_MID_ERR_EID, CFE_EVS_EventType_ERROR, "Invalid command packet, Message ID = 0x%08X",
6565
(unsigned int)CFE_SB_MsgIdToValue(MessageID));
6666
break;
6767
}
@@ -257,7 +257,7 @@ void CFE_EVS_ProcessGroundCommand(const CFE_SB_Buffer_t *SBBufPtr, CFE_SB_MsgId_
257257
/* default is a bad command code as it was not found above */
258258
default:
259259

260-
EVS_SendEvent(CFE_EVS_ERR_CC_EID, CFE_EVS_EventType_ERROR, "Invalid command code -- ID = 0x%08x, CC = %u",
260+
EVS_SendEvent(CFE_EVS_CC_ERR_EID, CFE_EVS_EventType_ERROR, "Invalid command code -- ID = 0x%08x, CC = %u",
261261
(unsigned int)CFE_SB_MsgIdToValue(MsgId), (unsigned int)FcnCode);
262262
Status = CFE_STATUS_BAD_COMMAND_CODE;
263263

@@ -299,7 +299,7 @@ bool CFE_EVS_VerifyCmdLength(const CFE_MSG_Message_t *MsgPtr, size_t ExpectedLen
299299
CFE_MSG_GetMsgId(MsgPtr, &MsgId);
300300
CFE_MSG_GetFcnCode(MsgPtr, &FcnCode);
301301

302-
EVS_SendEvent(CFE_EVS_LEN_ERR_EID, CFE_EVS_EventType_ERROR,
302+
EVS_SendEvent(CFE_EVS_CMD_LEN_ERR_EID, CFE_EVS_EventType_ERROR,
303303
"Invalid msg length: ID = 0x%X, CC = %u, Len = %u, Expected = %u",
304304
(unsigned int)CFE_SB_MsgIdToValue(MsgId), (unsigned int)FcnCode, (unsigned int)ActualLength,
305305
(unsigned int)ExpectedLength);

0 commit comments

Comments
 (0)