Skip to content

Commit

Permalink
Fix nasa#1712, Make successful command events INFO type
Browse files Browse the repository at this point in the history
  • Loading branch information
thnkslprpt committed Jul 10, 2024
1 parent 00fe82a commit 5595876
Show file tree
Hide file tree
Showing 31 changed files with 374 additions and 371 deletions.
22 changes: 11 additions & 11 deletions modules/es/config/default_cfe_es_fcncodes.h
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@
** the following telemetry:
** - \b \c \ES_CMDPC - command execution counter will
** increment
** - The #CFE_ES_ONE_APP_EID debug event message will be
** - The #CFE_ES_ONE_APP_INF_EID informational event message will be
** generated.
** - Receipt of the #CFE_ES_OneAppTlm_t telemetry packet
**
Expand Down Expand Up @@ -401,7 +401,7 @@
** the following telemetry:
** - \b \c \ES_CMDPC - command execution counter will
** increment
** - The #CFE_ES_ALL_APPS_EID debug event message will be
** - The #CFE_ES_ALL_APPS_INF_EID informational event message will be
** generated.
** - The file specified in the command (or the default specified
** by the #CFE_PLATFORM_ES_DEFAULT_APP_LOG_FILE configuration parameter) will be
Expand Down Expand Up @@ -478,7 +478,7 @@
** the following telemetry:
** - \b \c \ES_CMDPC - command execution counter will
** increment
** - The #CFE_ES_SYSLOG2_EID debug event message will be
** - The #CFE_ES_SYSLOG2_INF_EID informational event message will be
** generated.
** - The file specified in the command (or the default specified
** by the #CFE_PLATFORM_ES_DEFAULT_SYSLOG_FILE configuration parameter) will be
Expand Down Expand Up @@ -555,7 +555,7 @@
** the following telemetry:
** - \b \c \ES_CMDPC - command execution counter will
** increment
** - The #CFE_ES_ERLOG2_EID debug event message will be
** - The #CFE_ES_ERLOG2_INF_EID informational event message will be
** generated.
** - The file specified in the command (or the default specified
** by the #CFE_PLATFORM_ES_DEFAULT_ER_LOG_FILE configuration parameter) will be
Expand Down Expand Up @@ -606,7 +606,7 @@
** - \b \c \ES_PERFDATASTART - Data Start Index will go to zero
** - \b \c \ES_PERFDATAEND - Data End Index will go to zero
** - \b \c \ES_PERFDATACNT - Performance Data Counter will go to zero
** - The #CFE_ES_PERF_STARTCMD_EID debug event message will be
** - The #CFE_ES_PERF_STARTCMD_INF_EID informational event message will be
** generated.
**
** \par Error Conditions
Expand Down Expand Up @@ -694,7 +694,7 @@
** increment
** - \b \c \ES_PERFFLTRMASK - the current performance filter mask
** value(s) should reflect the commanded value
** - The #CFE_ES_PERF_FILTMSKCMD_EID debug event message will be
** - The #CFE_ES_PERF_FILTMSKCMD_INF_EID informational event message will be
** generated.
**
** \par Error Conditions
Expand Down Expand Up @@ -731,7 +731,7 @@
** increment
** - \b \c \ES_PERFTRIGMASK - the current performance trigger mask
** value(s) should reflect the commanded value
** - The #CFE_ES_PERF_TRIGMSKCMD_EID debug event message will be
** - The #CFE_ES_PERF_TRIGMSKCMD_INF_EID informational event message will be
** generated.
**
** \par Error Conditions
Expand Down Expand Up @@ -770,7 +770,7 @@
** increment
** - \b \c \ES_SYSLOGMODE - Current System Log Mode should reflect
** the commanded value
** - The #CFE_ES_SYSLOGMODE_EID debug event message will be
** - The #CFE_ES_SYSLOGMODE_INF_EID informational event message will be
** generated.
**
** \par Error Conditions
Expand Down Expand Up @@ -924,7 +924,7 @@
** the following telemetry:
** - \b \c \ES_CMDPC - command execution counter will
** increment
** - The #CFE_ES_TLM_POOL_STATS_INFO_EID debug event message will be
** - The #CFE_ES_TLM_POOL_STATS_INF_EID informational event message will be
** generated.
** - The \link #CFE_ES_MemStatsTlm_t Memory Pool Statistics Telemetry Packet \endlink
** is produced
Expand Down Expand Up @@ -963,7 +963,7 @@
** the following telemetry:
** - \b \c \ES_CMDPC - command execution counter will
** increment
** - The #CFE_ES_CDS_REG_DUMP_INF_EID debug event message will be
** - The #CFE_ES_CDS_REG_DUMP_INF_EID informational event message will be
** generated.
** - The file specified in the command (or the default specified
** by the #CFE_PLATFORM_ES_DEFAULT_CDS_REG_DUMP_FILE configuration parameter) will be
Expand Down Expand Up @@ -1005,7 +1005,7 @@
** the following telemetry:
** - \b \c \ES_CMDPC - command execution counter will
** increment
** - The #CFE_ES_TASKINFO_EID debug event message will be
** - The #CFE_ES_TASKINFO_INF_EID informational event message will be
** generated.
** - The file specified in the command (or the default specified
** by the #CFE_PLATFORM_ES_DEFAULT_TASK_LOG_FILE configuration parameter) will be
Expand Down
22 changes: 11 additions & 11 deletions modules/es/eds/cfe_es.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1181,7 +1181,7 @@
the following telemetry:
- \b \c \ES_CMDPC - command execution counter will
increment
- The #CFE_ES_ONE_APP_EID debug event message will be
- The #CFE_ES_ONE_APP_INF_EID informational event message will be
generated. NOTE: This event message only identifies that the
act of stopping the application has begun, not that it has completed.
- Receipt of the #CFE_ES_APP_TLM_t telemetry packet
Expand Down Expand Up @@ -1229,7 +1229,7 @@
the following telemetry:
- \b \c \ES_CMDPC - command execution counter will
increment
- The #CFE_ES_ALL_APPS_EID debug event message will be
- The #CFE_ES_ALL_APPS_INF_EID informational event message will be
generated.
- The file specified in the command (or the default specified
by the #CFE_ES_DEFAULT_APP_LOG_FILE configuration parameter) will be
Expand Down Expand Up @@ -1328,7 +1328,7 @@
the following telemetry:
- \b \c \ES_CMDPC - command execution counter will
increment
- The #CFE_ES_SYSLOG2_EID debug event message will be
- The #CFE_ES_SYSLOG2_INF_EID informational event message will be
generated.
- The file specified in the command (or the default specified
by the #CFE_ES_DEFAULT_SYSLOG_FILE configuration parameter) will be
Expand Down Expand Up @@ -1427,7 +1427,7 @@
the following telemetry:
- \b \c \ES_CMDPC - command execution counter will
increment
- The #CFE_ES_ERLOG2_EID debug event message will be
- The #CFE_ES_ERLOG2_INF_EID informational event message will be
generated.
- The file specified in the command (or the default specified
by the #CFE_ES_DEFAULT_ER_LOG_FILE configuration parameter) will be
Expand Down Expand Up @@ -1488,7 +1488,7 @@
- \b \c \ES_PERFDATASTART - Data Start Index will go to zero
- \b \c \ES_PERFDATAEND - Data End Index will go to zero
- \b \c \ES_PERFDATACNT - Performance Data Counter will go to zero
- The #CFE_ES_PERF_STARTCMD_EID debug event message will be
- The #CFE_ES_PERF_STARTCMD_INF_EID informational event message will be
generated.

\par Error Conditions
Expand Down Expand Up @@ -1592,7 +1592,7 @@
increment
- \B \C \ES_PERFFLTRMASK - the current performance filter mask
value(s) should reflect the commanded value
- The #CFE_ES_PERF_FILTMSKCMD_EID debug event message will be
- The #CFE_ES_PERF_FILTMSKCMD_INF_EID informational event message will be
generated.

\par Error Conditions
Expand Down Expand Up @@ -1640,7 +1640,7 @@
increment
- \b \c \ES_PERFTRIGMASK - the current performance trigger mask
value(s) should reflect the commanded value
- The #CFE_ES_PERF_TRIGMSKCMD_EID debug event message will be
- The #CFE_ES_PERF_TRIGMSKCMD_INF_EID informational event message will be
generated.

\par Error Conditions
Expand Down Expand Up @@ -1691,7 +1691,7 @@
increment
- \b \c \ES_SYSLOGMODE - Current System Log Mode should reflect
the commanded value
- The #CFE_ES_SYSLOGMODE_EID debug event message will be
- The #CFE_ES_SYSLOGMODE_INF_EID informational event message will be
generated.

\par Error Conditions
Expand Down Expand Up @@ -1894,7 +1894,7 @@
the following telemetry:
- \b \c \ES_CMDPC - command execution counter will
increment
- The #CFE_ES_TLM_POOL_STATS_INFO_EID debug event message will be
- The #CFE_ES_TLM_POOL_STATS_INF_EID informational event message will be
generated.
- The \link #CFE_ES_MEMSTATS_TLM_t Memory Pool Statistics Telemetry Packet \endlink
is produced
Expand Down Expand Up @@ -1945,7 +1945,7 @@
the following telemetry:
- \b \c \ES_CMDPC - command execution counter will
increment
- The #CFE_ES_CDS_REG_DUMP_INF_EID debug event message will be
- The #CFE_ES_CDS_REG_DUMP_INF_EID informational event message will be
generated.
- The file specified in the command (or the default specified
by the #CFE_ES_DEFAULT_CDS_REG_DUMP_FILE configuration parameter) will be
Expand Down Expand Up @@ -1997,7 +1997,7 @@
the following telemetry:
- \b \c \ES_CMDPC - command execution counter will
increment
- The #CFE_ES_TASKINFO_EID debug event message will be
- The #CFE_ES_TASKINFO_INF_EID informational event message will be
generated.
- The file specified in the command (or the default specified
by the #CFE_ES_DEFAULT_TASK_LOG_FILE configuration parameter) will be
Expand Down
42 changes: 21 additions & 21 deletions modules/es/fsw/inc/cfe_es_eventids.h
Original file line number Diff line number Diff line change
Expand Up @@ -186,24 +186,24 @@
/**
* \brief ES Query One Application Command Success Event ID
*
* \par Type: DEBUG
* \par Type: INFORMATION
*
* \par Cause:
*
* \link #CFE_ES_QUERY_ONE_CC ES Query One Application Command \endlink success.
*/
#define CFE_ES_ONE_APP_EID 15
#define CFE_ES_ONE_APP_INF_EID 15

/**
* \brief ES Query All Applications Command Success Event ID
*
* \par Type: DEBUG
* \par Type: INFORMATION
*
* \par Cause:
*
* \link #CFE_ES_QUERY_ALL_CC ES Query All Applications Command \endlink success.
*/
#define CFE_ES_ALL_APPS_EID 16
#define CFE_ES_ALL_APPS_INF_EID 16

/**
* \brief ES Clear System Log Command Success Event ID
Expand All @@ -219,13 +219,13 @@
/**
* \brief ES Write System Log Command Success Event ID
*
* \par Type: DEBUG
* \par Type: INFORMATION
*
* \par Cause:
*
* \link #CFE_ES_CLEAR_SYS_LOG_CC ES Write System Log Command \endlink success.
*/
#define CFE_ES_SYSLOG2_EID 18
#define CFE_ES_SYSLOG2_INF_EID 18

/**
* \brief ES Clear Exception Reset Log Command Success Event ID
Expand All @@ -241,13 +241,13 @@
/**
* \brief ES Write Exception Reset Log Complete Event ID
*
* \par Type: DEBUG
* \par Type: INFORMATION
*
* \par Cause:
*
* Request to write the Exception Reset log successfully completed.
*/
#define CFE_ES_ERLOG2_EID 20
#define CFE_ES_ERLOG2_INF_EID 20

/**
* \brief ES Invalid Message ID Received Event ID
Expand Down Expand Up @@ -628,13 +628,13 @@
/**
* \brief ES Start Performance Analyzer Data Collection Command Success Event ID
*
* \par Type: DEBUG
* \par Type: INFORMATION
*
* \par Cause:
*
* \link #CFE_ES_START_PERF_DATA_CC ES Start Performance Analyzer Data Collection Command \endlink success.
*/
#define CFE_ES_PERF_STARTCMD_EID 57
#define CFE_ES_PERF_STARTCMD_INF_EID 57

/**
* \brief ES Start Performance Analyzer Data Collection Command Idle Check Failed Event ID
Expand Down Expand Up @@ -688,13 +688,13 @@
/**
* \brief ES Set Performance Analyzer Filter Mask Command Success Event ID
*
* \par Type: DEBUG
* \par Type: INFORMATION
*
* \par Cause:
*
* \link #CFE_ES_SET_PERF_FILTER_MASK_CC ES Set Performance Analyzer Filter Mask Command \endlink success.
*/
#define CFE_ES_PERF_FILTMSKCMD_EID 63
#define CFE_ES_PERF_FILTMSKCMD_INF_EID 63

/**
* \brief ES Set Performance Analyzer Filter Mask Command Invalid Index Event ID
Expand All @@ -711,13 +711,13 @@
/**
* \brief ES Set Performance Analyzer Trigger Mask Command Success Event ID
*
* \par Type: DEBUG
* \par Type: INFORMATION
*
* \par Cause:
*
* \link #CFE_ES_SET_PERF_TRIGGER_MASK_CC ES Set Performance Analyzer Trigger Mask Command \endlink success.
*/
#define CFE_ES_PERF_TRIGMSKCMD_EID 65
#define CFE_ES_PERF_TRIGMSKCMD_INF_EID 65

/**
* \brief ES Set Performance Analyzer Trigger Mask Command Invalid Mask Event ID
Expand Down Expand Up @@ -768,13 +768,13 @@
/**
* \brief ES Set System Log Overwrite Mode Command Success Event ID
*
* \par Type: DEBUG
* \par Type: INFORMATION
*
* \par Cause:
*
* \link #CFE_ES_OVER_WRITE_SYS_LOG_CC ES Set System Log Overwrite Mode Command \endlink success.
*/
#define CFE_ES_SYSLOGMODE_EID 70
#define CFE_ES_SYSLOGMODE_INF_EID 70

/**
* \brief ES Set System Log Overwrite Mode Command Failed Event ID
Expand Down Expand Up @@ -885,13 +885,13 @@
/**
* \brief ES Telemeter Memory Statistics Command Success Event ID
*
* \par Type: DEBUG
* \par Type: INFORMATION
*
* \par Cause:
*
* \link #CFE_ES_SEND_MEM_POOL_STATS_CC ES Telemeter Memory Statistics Command \endlink success.
*/
#define CFE_ES_TLM_POOL_STATS_INFO_EID 81
#define CFE_ES_TLM_POOL_STATS_INF_EID 81

/**
* \brief ES Telemeter Memory Statistics Command Invalid Handle Event ID
Expand All @@ -908,7 +908,7 @@
/**
* \brief ES Write Critical Data Store Registry Command Success Event ID
*
* \par Type: DEBUG
* \par Type: INFORMATION
*
* \par Cause:
*
Expand Down Expand Up @@ -955,13 +955,13 @@
/**
* \brief ES Write All Task Data Command Success Event ID
*
* \par Type: DEBUG
* \par Type: INFORMATION
*
* \par Cause:
*
* \link #CFE_ES_QUERY_ALL_TASKS_CC ES Write All Task Data Command \endlink success.
*/
#define CFE_ES_TASKINFO_EID 87
#define CFE_ES_TASKINFO_INF_EID 87

/**
* \brief ES Write All Task Data Command Filename Parse or File Create Failed Event ID
Expand Down
2 changes: 1 addition & 1 deletion modules/es/fsw/src/cfe_es_erlog.c
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ void CFE_ES_BackgroundERLogFileEventHandler(void *Meta, CFE_FS_FileWriteEvent_t
switch (Event)
{
case CFE_FS_FileWriteEvent_COMPLETE:
CFE_EVS_SendEvent(CFE_ES_ERLOG2_EID, CFE_EVS_EventType_DEBUG, "%s written:Size=%lu",
CFE_EVS_SendEvent(CFE_ES_ERLOG2_INF_EID, CFE_EVS_EventType_INFORMATION, "%s written:Size=%lu",
BgFilePtr->FileWrite.FileName, (unsigned long)Position);
break;

Expand Down
6 changes: 3 additions & 3 deletions modules/es/fsw/src/cfe_es_perf.c
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ int32 CFE_ES_StartPerfDataCmd(const CFE_ES_StartPerfDataCmd_t *data)
Perf->MetaData.State = CFE_ES_PERF_WAITING_FOR_TRIGGER; /* this must be done last */
OS_MutSemGive(CFE_ES_Global.PerfDataMutex);

CFE_EVS_SendEvent(CFE_ES_PERF_STARTCMD_EID, CFE_EVS_EventType_DEBUG,
CFE_EVS_SendEvent(CFE_ES_PERF_STARTCMD_INF_EID, CFE_EVS_EventType_INFORMATION,
"Start collecting performance data cmd received, trigger mode = %d",
(int)CmdPtr->TriggerMode);
}
Expand Down Expand Up @@ -499,7 +499,7 @@ int32 CFE_ES_SetPerfFilterMaskCmd(const CFE_ES_SetPerfFilterMaskCmd_t *data)
{
Perf->MetaData.FilterMask[cmd->FilterMaskNum] = cmd->FilterMask;

CFE_EVS_SendEvent(CFE_ES_PERF_FILTMSKCMD_EID, CFE_EVS_EventType_DEBUG,
CFE_EVS_SendEvent(CFE_ES_PERF_FILTMSKCMD_INF_EID, CFE_EVS_EventType_INFORMATION,
"Set Performance Filter Mask Cmd rcvd, num %u, val 0x%08X", (unsigned int)cmd->FilterMaskNum,
(unsigned int)cmd->FilterMask);

Expand Down Expand Up @@ -537,7 +537,7 @@ int32 CFE_ES_SetPerfTriggerMaskCmd(const CFE_ES_SetPerfTriggerMaskCmd_t *data)
{
Perf->MetaData.TriggerMask[cmd->TriggerMaskNum] = cmd->TriggerMask;

CFE_EVS_SendEvent(CFE_ES_PERF_TRIGMSKCMD_EID, CFE_EVS_EventType_DEBUG,
CFE_EVS_SendEvent(CFE_ES_PERF_TRIGMSKCMD_INF_EID, CFE_EVS_EventType_INFORMATION,
"Set Performance Trigger Mask Cmd rcvd,num %u, val 0x%08X", (unsigned int)cmd->TriggerMaskNum,
(unsigned int)cmd->TriggerMask);

Expand Down
Loading

0 comments on commit 5595876

Please sign in to comment.