Skip to content

Commit

Permalink
Fix nasa#126, Update 'successful' command event types to INFO
Browse files Browse the repository at this point in the history
  • Loading branch information
@thnkslprpt
thnkslprpt committed May 29, 2024
1 parent 0bdc746 commit 710e901
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 76 deletions.
22 changes: 11 additions & 11 deletions config/default_hs_fcncodes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
* Successful execution of this command may be verified with
* the following telemetry:
* - #HS_HkTlm_Payload_t.CmdCount will be cleared
* - The #HS_RESET_DBG_EID debug event message will be
* - The #HS_RESET_INF_EID informational event message will be
* generated when the command is executed
*
* \par Error Conditions
Expand Down Expand Up @@ -114,7 +114,7 @@
* the following telemetry:
* - #HS_HkTlm_Payload_t.CmdCount will increment
* - #HS_HkTlm_Payload_t.CurrentAppMonState will be set to Enabled
* - The #HS_ENABLE_APPMON_DBG_EID informational event message will be
* - The #HS_ENABLE_APPMON_INF_EID informational event message will be
* generated when the command is executed
*
* \par Error Conditions
Expand Down Expand Up @@ -146,7 +146,7 @@
* the following telemetry:
* - #HS_HkTlm_Payload_t.CmdCount will increment
* - #HS_HkTlm_Payload_t.CurrentAppMonState will be set to Disabled
* - The #HS_DISABLE_APPMON_DBG_EID informational event message will be
* - The #HS_DISABLE_APPMON_INF_EID informational event message will be
* generated when the command is executed
*
* \par Error Conditions
Expand Down Expand Up @@ -178,7 +178,7 @@
* the following telemetry:
* - #HS_HkTlm_Payload_t.CmdCount will increment
* - #HS_HkTlm_Payload_t.CurrentEventMonState will be set to Enabled
* - The #HS_ENABLE_EVENTMON_DBG_EID informational event message will be
* - The #HS_ENABLE_EVENTMON_INF_EID informational event message will be
* generated when the command is executed
*
* \par Error Conditions
Expand Down Expand Up @@ -210,7 +210,7 @@
* the following telemetry:
* - #HS_HkTlm_Payload_t.CmdCount will increment
* - #HS_HkTlm_Payload_t.CurrentEventMonState will be set to Disabled
* - The #HS_DISABLE_EVENTMON_DBG_EID informational event message will be
* - The #HS_DISABLE_EVENTMON_INF_EID informational event message will be
* generated when the command is executed
*
* \par Error Conditions
Expand Down Expand Up @@ -242,7 +242,7 @@
* the following telemetry:
* - #HS_HkTlm_Payload_t.CmdCount will increment
* - #HS_HkTlm_Payload_t.CurrentAlivenessState will be set to Enabled
* - The #HS_ENABLE_ALIVENESS_DBG_EID informational event message will be
* - The #HS_ENABLE_ALIVENESS_INF_EID informational event message will be
* generated when the command is executed
*
* \par Error Conditions
Expand Down Expand Up @@ -274,7 +274,7 @@
* the following telemetry:
* - #HS_HkTlm_Payload_t.CmdCount will increment
* - #HS_HkTlm_Payload_t.CurrentAlivenessState will be set to Disabled
* - The #HS_DISABLE_ALIVENESS_DBG_EID informational event message will be
* - The #HS_DISABLE_ALIVENESS_INF_EID informational event message will be
* generated when the command is executed
*
* \par Error Conditions
Expand Down Expand Up @@ -306,7 +306,7 @@
* the following telemetry:
* - #HS_HkTlm_Payload_t.CmdCount will increment
* - #HS_HkTlm_Payload_t.ResetsPerformed will be set to 0
* - The #HS_RESET_RESETS_DBG_EID informational event message will be
* - The #HS_RESET_RESETS_INF_EID informational event message will be
* generated when the command is executed
*
* \par Error Conditions
Expand Down Expand Up @@ -338,7 +338,7 @@
* the following telemetry:
* - #HS_HkTlm_Payload_t.CmdCount will increment
* - #HS_HkTlm_Payload_t.MaxResets will be set to the provided value
* - The #HS_SET_MAX_RESETS_DBG_EID informational event message will be
* - The #HS_SET_MAX_RESETS_INF_EID informational event message will be
* generated when the command is executed
*
* \par Error Conditions
Expand Down Expand Up @@ -370,7 +370,7 @@
* the following telemetry:
* - #HS_HkTlm_Payload_t.CmdCount will increment
* - #HS_HkTlm_Payload_t.CurrentCPUHogState will be set to Enabled
* - The #HS_ENABLE_CPUHOG_DBG_EID informational event message will be
* - The #HS_ENABLE_CPUHOG_INF_EID informational event message will be
* generated when the command is executed
*
* \par Error Conditions
Expand Down Expand Up @@ -402,7 +402,7 @@
* the following telemetry:
* - #HS_HkTlm_Payload_t.CmdCount will increment
* - #HS_HkTlm_Payload_t.CurrentCPUHogState will be set to Disabled
* - The #HS_DISABLE_CPUHOG_DBG_EID informational event message will be
* - The #HS_DISABLE_CPUHOG_INF_EID informational event message will be
* generated when the command is executed
*
* \par Error Conditions
Expand Down
44 changes: 22 additions & 22 deletions fsw/inc/hs_eventids.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,110 +313,110 @@
/**
* \brief HS Reset Counters Command Event ID
*
* \par Type: DEBUG
* \par Type: INFORMATIONAL
*
* \par Cause:
*
* This event message is issued when a reset counters command has
* been received.
*/
#define HS_RESET_DBG_EID 24
#define HS_RESET_INF_EID 24

/**
* \brief HS Enable Application Monitoring Command Event ID
*
* \par Type: DEBUG
* \par Type: INFORMATIONAL
*
* \par Cause:
*
* This event message is issued when an enable application monitoring
* command has been received.
*/
#define HS_ENABLE_APPMON_DBG_EID 25
#define HS_ENABLE_APPMON_INF_EID 25

/**
* \brief HS Disable Application Monitoring Command Event ID
*
* \par Type: DEBUG
* \par Type: INFORMATIONAL
*
* \par Cause:
*
* This event message is issued when a disable application monitoring
* command has been received.
*/
#define HS_DISABLE_APPMON_DBG_EID 26
#define HS_DISABLE_APPMON_INF_EID 26

/**
* \brief HS Enable Event Monitoring Command Event ID
*
* \par Type: DEBUG
* \par Type: INFORMATIONAL
*
* \par Cause:
*
* This event message is issued when an enable event monitoring
* command has been received.
*/
#define HS_ENABLE_EVENTMON_DBG_EID 27
#define HS_ENABLE_EVENTMON_INF_EID 27

/**
* \brief HS Disable Event Monitoring Command Event ID
*
* \par Type: DEBUG
* \par Type: INFORMATIONAL
*
* \par Cause:
*
* This event message is issued when a disable event monitoring
* command has been received.
*/
#define HS_DISABLE_EVENTMON_DBG_EID 28
#define HS_DISABLE_EVENTMON_INF_EID 28

/**
* \brief HS Enable Aliveness Indicator Command Event ID
*
* \par Type: DEBUG
* \par Type: INFORMATIONAL
*
* \par Cause:
*
* This event message is issued when an enable aliveness indicator
* command has been received.
*/
#define HS_ENABLE_ALIVENESS_DBG_EID 29
#define HS_ENABLE_ALIVENESS_INF_EID 29

/**
* \brief HS Disable Aliveness Indicator Command Event ID
*
* \par Type: DEBUG
* \par Type: INFORMATIONAL
*
* \par Cause:
*
* This event message is issued when a disable aliveness indicator
* command has been received.
*/
#define HS_DISABLE_ALIVENESS_DBG_EID 30
#define HS_DISABLE_ALIVENESS_INF_EID 30

/**
* \brief HS Reset Process Reset Counter Command Event ID
*
* \par Type: DEBUG
* \par Type: INFORMATIONAL
*
* \par Cause:
*
* This event message is issued when a reset processor resets count
* command has been received.
*/
#define HS_RESET_RESETS_DBG_EID 31
#define HS_RESET_RESETS_INF_EID 31

/**
* \brief HS Set Max Resets Command Event ID
*
* \par Type: DEBUG
* \par Type: INFORMATIONAL
*
* \par Cause:
*
* This event message is issued when a set max processor resets
* command has been received.
*/
#define HS_SET_MAX_RESETS_DBG_EID 32
#define HS_SET_MAX_RESETS_INF_EID 32

/**
* \brief HS AppMon Table Get Address Failed Event ID
Expand Down Expand Up @@ -777,26 +777,26 @@
/**
* \brief HS CPU Hogging Detection Enabled Event ID
*
* \par Type: DEBUG
* \par Type: INFORMATIONAL
*
* \par Cause:
*
* This event message is issued when an enable cpu hogging indicator
* command has been received.
*/
#define HS_ENABLE_CPUHOG_DBG_EID 64
#define HS_ENABLE_CPUHOG_INF_EID 64

/**
* \brief HS CPU Hogging Detection Disabled Event ID
*
* \par Type: DEBUG
* \par Type: INFORMATIONAL
*
* \par Cause:
*
* This event message is issued when a disable cpu hogging indicator
* command has been received.
*/
#define HS_DISABLE_CPUHOG_DBG_EID 65
#define HS_DISABLE_CPUHOG_INF_EID 65

/**
* \brief HS Event Monitor Enable Subscribe To Long Events Failed Event ID
Expand Down
22 changes: 11 additions & 11 deletions fsw/src/hs_cmds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ CFE_Status_t HS_ResetCmd(const HS_ResetCmd_t *BufPtr)
{
HS_ResetCounters();

CFE_EVS_SendEvent(HS_RESET_DBG_EID, CFE_EVS_EventType_DEBUG, "Reset counters command");
CFE_EVS_SendEvent(HS_RESET_INF_EID, CFE_EVS_EventType_INFORMATION, "Reset counters command");
return CFE_SUCCESS;
}

Expand All @@ -239,7 +239,7 @@ CFE_Status_t HS_EnableAppMonCmd(const HS_EnableAppMonCmd_t *BufPtr)
HS_AppData.CmdCount++;
HS_AppMonStatusRefresh();
HS_AppData.CurrentAppMonState = HS_STATE_ENABLED;
CFE_EVS_SendEvent(HS_ENABLE_APPMON_DBG_EID, CFE_EVS_EventType_DEBUG, "Application Monitoring Enabled");
CFE_EVS_SendEvent(HS_ENABLE_APPMON_INF_EID, CFE_EVS_EventType_INFORMATION, "Application Monitoring Enabled");
return CFE_SUCCESS;
}

Expand All @@ -252,7 +252,7 @@ CFE_Status_t HS_DisableAppMonCmd(const HS_DisableAppMonCmd_t *BufPtr)
{
HS_AppData.CmdCount++;
HS_AppData.CurrentAppMonState = HS_STATE_DISABLED;
CFE_EVS_SendEvent(HS_DISABLE_APPMON_DBG_EID, CFE_EVS_EventType_DEBUG, "Application Monitoring Disabled");
CFE_EVS_SendEvent(HS_DISABLE_APPMON_INF_EID, CFE_EVS_EventType_INFORMATION, "Application Monitoring Disabled");
return CFE_SUCCESS;
}

Expand Down Expand Up @@ -296,7 +296,7 @@ CFE_Status_t HS_EnableEventMonCmd(const HS_EnableEventMonCmd_t *BufPtr)
{
HS_AppData.CmdCount++;
HS_AppData.CurrentEventMonState = HS_STATE_ENABLED;
CFE_EVS_SendEvent(HS_ENABLE_EVENTMON_DBG_EID, CFE_EVS_EventType_DEBUG, "Event Monitoring Enabled");
CFE_EVS_SendEvent(HS_ENABLE_EVENTMON_INF_EID, CFE_EVS_EventType_INFORMATION, "Event Monitoring Enabled");
}
else
{
Expand Down Expand Up @@ -345,7 +345,7 @@ CFE_Status_t HS_DisableEventMonCmd(const HS_DisableEventMonCmd_t *BufPtr)
{
HS_AppData.CmdCount++;
HS_AppData.CurrentEventMonState = HS_STATE_DISABLED;
CFE_EVS_SendEvent(HS_DISABLE_EVENTMON_DBG_EID, CFE_EVS_EventType_DEBUG, "Event Monitoring Disabled");
CFE_EVS_SendEvent(HS_DISABLE_EVENTMON_INF_EID, CFE_EVS_EventType_INFORMATION, "Event Monitoring Disabled");
}
else
{
Expand All @@ -364,7 +364,7 @@ CFE_Status_t HS_EnableAlivenessCmd(const HS_EnableAlivenessCmd_t *BufPtr)
{
HS_AppData.CmdCount++;
HS_AppData.CurrentAlivenessState = HS_STATE_ENABLED;
CFE_EVS_SendEvent(HS_ENABLE_ALIVENESS_DBG_EID, CFE_EVS_EventType_DEBUG, "Aliveness Indicator Enabled");
CFE_EVS_SendEvent(HS_ENABLE_ALIVENESS_INF_EID, CFE_EVS_EventType_INFORMATION, "Aliveness Indicator Enabled");

return CFE_SUCCESS;
}
Expand All @@ -378,7 +378,7 @@ CFE_Status_t HS_DisableAlivenessCmd(const HS_DisableAlivenessCmd_t *BufPtr)
{
HS_AppData.CmdCount++;
HS_AppData.CurrentAlivenessState = HS_STATE_DISABLED;
CFE_EVS_SendEvent(HS_DISABLE_ALIVENESS_DBG_EID, CFE_EVS_EventType_DEBUG, "Aliveness Indicator Disabled");
CFE_EVS_SendEvent(HS_DISABLE_ALIVENESS_INF_EID, CFE_EVS_EventType_INFORMATION, "Aliveness Indicator Disabled");

return CFE_SUCCESS;
}
Expand All @@ -392,7 +392,7 @@ CFE_Status_t HS_EnableCpuHogCmd(const HS_EnableCpuHogCmd_t *BufPtr)
{
HS_AppData.CmdCount++;
HS_AppData.CurrentCPUHogState = HS_STATE_ENABLED;
CFE_EVS_SendEvent(HS_ENABLE_CPUHOG_DBG_EID, CFE_EVS_EventType_DEBUG, "CPU Hogging Indicator Enabled");
CFE_EVS_SendEvent(HS_ENABLE_CPUHOG_INF_EID, CFE_EVS_EventType_INFORMATION, "CPU Hogging Indicator Enabled");

return CFE_SUCCESS;
}
Expand All @@ -406,7 +406,7 @@ CFE_Status_t HS_DisableCpuHogCmd(const HS_DisableCpuHogCmd_t *BufPtr)
{
HS_AppData.CmdCount++;
HS_AppData.CurrentCPUHogState = HS_STATE_DISABLED;
CFE_EVS_SendEvent(HS_DISABLE_CPUHOG_DBG_EID, CFE_EVS_EventType_DEBUG, "CPU Hogging Indicator Disabled");
CFE_EVS_SendEvent(HS_DISABLE_CPUHOG_INF_EID, CFE_EVS_EventType_INFORMATION, "CPU Hogging Indicator Disabled");

return CFE_SUCCESS;
}
Expand All @@ -420,7 +420,7 @@ CFE_Status_t HS_ResetResetsPerformedCmd(const HS_ResetResetsPerformedCmd_t *BufP
{
HS_AppData.CmdCount++;
HS_SetCDSData(0, HS_AppData.CDSData.MaxResets);
CFE_EVS_SendEvent(HS_RESET_RESETS_DBG_EID, CFE_EVS_EventType_DEBUG,
CFE_EVS_SendEvent(HS_RESET_RESETS_INF_EID, CFE_EVS_EventType_INFORMATION,
"Processor Resets Performed by HS Counter has been Reset");

return CFE_SUCCESS;
Expand All @@ -440,7 +440,7 @@ CFE_Status_t HS_SetMaxResetsCmd(const HS_SetMaxResetsCmd_t *BufPtr)

HS_SetCDSData(HS_AppData.CDSData.ResetsPerformed, CmdPtr->MaxResets);

CFE_EVS_SendEvent(HS_SET_MAX_RESETS_DBG_EID, CFE_EVS_EventType_DEBUG,
CFE_EVS_SendEvent(HS_SET_MAX_RESETS_INF_EID, CFE_EVS_EventType_INFORMATION,
"Max Resets Performable by HS has been set to %d", HS_AppData.CDSData.MaxResets);

return CFE_SUCCESS;
Expand Down
12 changes: 6 additions & 6 deletions fsw/src/hs_verify.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,10 @@

/*
* JPH 2015-06-29 - Removed check of:
* HS_CMD_PIPE_DEPTH > CFE_SB_MAX_PIPE_DEPTH
* HS_CMD_PIPE_DEPTH > OS_QUEUE_MAX_DEPTH
*
* This is not a valid check anymore, as the HS app does not have knowledge
* of CFE_SB_MAX_PIPE_DEPTH. But if the configuration violates this rule it will
* of OS_QUEUE_MAX_DEPTH. But if the configuration violates this rule it will
* show up as an obvious run-time error so the compile-time check is redundant.
*/

Expand All @@ -145,10 +145,10 @@

/*
* JPH 2015-06-29 - Removed check of:
* HS_EVENT_PIPE_DEPTH > CFE_SB_MAX_PIPE_DEPTH
* HS_EVENT_PIPE_DEPTH > OS_QUEUE_MAX_DEPTH
*
* This is not a valid check anymore, as the HS app does not have knowledge
* of CFE_SB_MAX_PIPE_DEPTH. But if the configuration violates this rule it will
* of OS_QUEUE_MAX_DEPTH. But if the configuration violates this rule it will
* show up as an obvious run-time error so the compile-time check is redundant.
*/

Expand All @@ -158,10 +158,10 @@

/*
* JPH 2015-06-29 - Removed check of:
* HS_WAKEUP_PIPE_DEPTH > CFE_SB_MAX_PIPE_DEPTH
* HS_WAKEUP_PIPE_DEPTH > OS_QUEUE_MAX_DEPTH
*
* This is not a valid check anymore, as the HS app does not have knowledge
* of CFE_SB_MAX_PIPE_DEPTH. But if the configuration violates this rule it will
* of OS_QUEUE_MAX_DEPTH. But if the configuration violates this rule it will
* show up as an obvious run-time error so the compile-time check is redundant.
*/

Expand Down
Loading

0 comments on commit 710e901

Please sign in to comment.