From 710e901953bb4288848b7f9e3b895a06b74f1849 Mon Sep 17 00:00:00 2001 From: Avi Weiss Date: Wed, 29 May 2024 21:18:53 +0200 Subject: [PATCH] Fix #126, Update 'successful' command event types to INFO --- config/default_hs_fcncodes.h | 22 +++++++-------- fsw/inc/hs_eventids.h | 44 +++++++++++++++--------------- fsw/src/hs_cmds.c | 22 +++++++-------- fsw/src/hs_verify.h | 12 ++++----- unit-test/hs_cmds_tests.c | 52 ++++++++++++++++++------------------ 5 files changed, 76 insertions(+), 76 deletions(-) diff --git a/config/default_hs_fcncodes.h b/config/default_hs_fcncodes.h index 1d211bd..f28aeee 100644 --- a/config/default_hs_fcncodes.h +++ b/config/default_hs_fcncodes.h @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/fsw/inc/hs_eventids.h b/fsw/inc/hs_eventids.h index 0f124da..f7c136f 100644 --- a/fsw/inc/hs_eventids.h +++ b/fsw/inc/hs_eventids.h @@ -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 @@ -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 diff --git a/fsw/src/hs_cmds.c b/fsw/src/hs_cmds.c index ceee741..b545bd6 100644 --- a/fsw/src/hs_cmds.c +++ b/fsw/src/hs_cmds.c @@ -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; } @@ -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; } @@ -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; } @@ -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 { @@ -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 { @@ -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; } @@ -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; } @@ -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; } @@ -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; } @@ -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; @@ -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; diff --git a/fsw/src/hs_verify.h b/fsw/src/hs_verify.h index 13e6cb2..9b90586 100644 --- a/fsw/src/hs_verify.h +++ b/fsw/src/hs_verify.h @@ -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. */ @@ -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. */ @@ -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. */ diff --git a/unit-test/hs_cmds_tests.c b/unit-test/hs_cmds_tests.c index a6f5720..e799b21 100644 --- a/unit-test/hs_cmds_tests.c +++ b/unit-test/hs_cmds_tests.c @@ -1034,8 +1034,8 @@ void HS_ResetCmd_Test(void) /* Verify results */ UtAssert_True(HS_AppData.CmdCount == 0, "HS_AppData.CmdCount == 0"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_RESET_DBG_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_RESET_INF_EID); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); strCmpResult = strncmp(ExpectedEventString[0], context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); @@ -1093,8 +1093,8 @@ void HS_EnableAppMonCmd_Test(void) UtAssert_True(HS_AppData.CurrentAppMonState == HS_STATE_ENABLED, "HS_AppData.CurrentAppMonState == HS_STATE_ENABLED"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_ENABLE_APPMON_DBG_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_ENABLE_APPMON_INF_EID); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); strCmpResult = strncmp(ExpectedEventString[0], context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); @@ -1131,8 +1131,8 @@ void HS_DisableAppMonCmd_Test(void) UtAssert_True(HS_AppData.CurrentAppMonState == HS_STATE_DISABLED, "HS_AppData.CurrentAppMonState == HS_STATE_DISABLED"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_DISABLE_APPMON_DBG_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_DISABLE_APPMON_INF_EID); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); strCmpResult = strncmp(ExpectedEventString[0], context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); @@ -1171,8 +1171,8 @@ void HS_EnableEventMonCmd_Test_Disabled(void) UtAssert_True(HS_AppData.CurrentEventMonState == HS_STATE_ENABLED, "HS_AppData.CurrentEventMonState == HS_STATE_ENABLED"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_ENABLE_EVENTMON_DBG_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_ENABLE_EVENTMON_INF_EID); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); strCmpResult = strncmp(ExpectedEventString[0], context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); @@ -1211,8 +1211,8 @@ void HS_EnableEventMonCmd_Test_AlreadyEnabled(void) UtAssert_True(HS_AppData.CurrentEventMonState == HS_STATE_ENABLED, "HS_AppData.CurrentEventMonState == HS_STATE_ENABLED"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_ENABLE_EVENTMON_DBG_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_ENABLE_EVENTMON_INF_EID); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); strCmpResult = strncmp(ExpectedEventString[0], context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); @@ -1337,8 +1337,8 @@ void HS_DisableEventMonCmd_Test_Enabled(void) UtAssert_True(HS_AppData.CurrentEventMonState == HS_STATE_DISABLED, "HS_AppData.CurrentEventMonState == HS_STATE_DISABLED"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_DISABLE_EVENTMON_DBG_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_DISABLE_EVENTMON_INF_EID); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); strCmpResult = strncmp(ExpectedEventString[0], context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); @@ -1377,8 +1377,8 @@ void HS_DisableEventMonCmd_Test_AlreadyDisabled(void) UtAssert_True(HS_AppData.CurrentEventMonState == HS_STATE_DISABLED, "HS_AppData.CurrentEventMonState == HS_STATE_DISABLED"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_DISABLE_EVENTMON_DBG_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_DISABLE_EVENTMON_INF_EID); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); strCmpResult = strncmp(ExpectedEventString[0], context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); @@ -1503,8 +1503,8 @@ void HS_EnableAlivenessCmd_Test(void) UtAssert_True(HS_AppData.CurrentAlivenessState == HS_STATE_ENABLED, "HS_AppData.CurrentAlivenessState == HS_STATE_ENABLED"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_ENABLE_ALIVENESS_DBG_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_ENABLE_ALIVENESS_INF_EID); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); strCmpResult = strncmp(ExpectedEventString[0], context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); @@ -1543,8 +1543,8 @@ void HS_DisableAlivenessCmd_Test(void) UtAssert_True(HS_AppData.CurrentAlivenessState == HS_STATE_DISABLED, "HS_AppData.CurrentAlivenessState == HS_STATE_DISABLED"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_DISABLE_ALIVENESS_DBG_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_DISABLE_ALIVENESS_INF_EID); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); strCmpResult = strncmp(ExpectedEventString[0], context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); @@ -1583,8 +1583,8 @@ void HS_EnableCpuHogCmd_Test(void) UtAssert_True(HS_AppData.CurrentCPUHogState == HS_STATE_ENABLED, "HS_AppData.CurrentCPUHogState == HS_STATE_ENABLED"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_ENABLE_CPUHOG_DBG_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_ENABLE_CPUHOG_INF_EID); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); strCmpResult = strncmp(ExpectedEventString[0], context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); @@ -1623,8 +1623,8 @@ void HS_DisableCpuHogCmd_Test(void) UtAssert_True(HS_AppData.CurrentCPUHogState == HS_STATE_DISABLED, "HS_AppData.CurrentCPUHogState == HS_STATE_DISABLED"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_DISABLE_CPUHOG_DBG_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_DISABLE_CPUHOG_INF_EID); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); strCmpResult = strncmp(ExpectedEventString[0], context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); @@ -1659,8 +1659,8 @@ void HS_ResetResetsPerformedCmd_Test(void) /* Verify results */ UtAssert_True(HS_AppData.CmdCount == 1, "HS_AppData.CmdCount == 1"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_RESET_RESETS_DBG_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_RESET_RESETS_INF_EID); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); strCmpResult = strncmp(ExpectedEventString[0], context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); @@ -1702,8 +1702,8 @@ void HS_SetMaxResetsCmd_Test(void) /* Verify results */ UtAssert_True(HS_AppData.CmdCount == 1, "HS_AppData.CmdCount == 1"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_SET_MAX_RESETS_DBG_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_SET_MAX_RESETS_INF_EID); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); strCmpResult = strncmp(ExpectedEventString[0], context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH);