diff --git a/fsw/inc/sc_msg.h b/fsw/inc/sc_msg.h index 5527f39..1b3d5e4 100644 --- a/fsw/inc/sc_msg.h +++ b/fsw/inc/sc_msg.h @@ -52,12 +52,10 @@ */ /** - * \brief Housekeeping Packet Structure + * \brief Housekeeping Packet Payload Structure */ typedef struct { - CFE_MSG_TelemetryHeader_t TlmHeader; - uint8 AtsNumber; /**< \brief Current ATS number: 1 = ATS A, 2 = ATS B */ uint8 AtpState; /**< \brief Current ATP state: 2 = IDLE, 5 = EXECUTING */ uint8 ContinueAtsOnFailureFlag; /**< \brief Continue ATS execution on failure flag */ @@ -102,6 +100,15 @@ typedef struct the LSB (bit zero) of uint16 array index zero represents RTS number 1, and bit one of uint16 array index zero represents RTS number 2, etc. If an RTS is ENABLED, then the corresponding bit is zero. If an RTS is DISABLED, then the corresponding bit is one. */ +} SC_HkTlm_Payload_t; + +/** + * \brief Housekeeping Packet Structure + */ +typedef struct +{ + CFE_MSG_TelemetryHeader_t TlmHeader; + SC_HkTlm_Payload_t Payload; } SC_HkTlm_t; /**\}*/ @@ -111,6 +118,61 @@ typedef struct * \{ */ +/** + * \brief ATS Id Command Payload + */ +typedef struct +{ + uint16 AtsId; /**< \brief The ID of the ATS to start, 1 = ATS_A, 2 = ATS_B */ + uint16 Padding; /**< \brief Structure padding */ +} SC_StartAtsCmd_Payload_t; + +/** + * \brief RTS Id Command Payload + */ +typedef struct +{ + uint16 RtsId; /**< \brief The ID of the RTS to start, 1 through #SC_NUMBER_OF_RTS */ + uint16 Padding; /**< \brief Structure padding */ +} SC_RtsCmd_Payload_t; + +/** + * \brief Jump running ATS to a new time Command Payload + */ +typedef struct +{ + uint32 NewTime; /**< \brief the time to 'jump' to */ +} SC_JumpAtsCmd_Payload_t; + +/** + * \brief Continue ATS on failure command Payload + */ +typedef struct +{ + uint16 ContinueState; /**< \brief true or false, to continue ATS after a failure */ + uint16 Padding; /**< \brief Structure Padding */ +} SC_SetContinueAtsOnFailureCmd_Payload_t; + +/** + * \brief Append to ATS Command Payload + */ +typedef struct +{ + uint16 AtsId; /**< \brief The ID of the ATS to append to, 1 = ATS_A, 2 = ATS_B */ + uint16 Padding; /**< \brief Structure Padding */ +} SC_AppendAtsCmd_Payload_t; + +#if (SC_ENABLE_GROUP_COMMANDS == true) +/** + * \brief RTS Group Command Payload + */ +typedef struct +{ + uint16 FirstRtsId; /**< \brief ID of the first RTS to act on, 1 through #SC_NUMBER_OF_RTS */ + uint16 LastRtsId; /**< \brief ID of the last RTS to act on, 1 through #SC_NUMBER_OF_RTS */ +} SC_RtsGrpCmd_Payload_t; +#endif + /** * \brief No Arguments Command * @@ -129,10 +191,8 @@ typedef struct */ typedef struct { - CFE_MSG_CommandHeader_t CmdHeader; /**< \brief Command Header */ - - uint16 AtsId; /**< \brief The ID of the ATS to start, 1 = ATS_A, 2 = ATS_B */ - uint16 Padding; /**< \brief Structure padding */ + CFE_MSG_CommandHeader_t CmdHeader; /**< \brief Command Header */ + SC_StartAtsCmd_Payload_t Payload; } SC_StartAtsCmd_t; /** @@ -143,9 +203,7 @@ typedef struct typedef struct { CFE_MSG_CommandHeader_t CmdHeader; /**< \brief Command Header */ - - uint16 RtsId; /**< \brief The ID of the RTS to start, 1 through #SC_NUMBER_OF_RTS */ - uint16 Padding; /**< \brief Structure padding */ + SC_RtsCmd_Payload_t Payload; } SC_RtsCmd_t; /** @@ -156,8 +214,7 @@ typedef struct typedef struct { CFE_MSG_CommandHeader_t CmdHeader; /**< \brief Command Header */ - - uint32 NewTime; /**< \brief the time to 'jump' to */ + SC_JumpAtsCmd_Payload_t Payload; } SC_JumpAtsCmd_t; /** @@ -167,10 +224,8 @@ typedef struct */ typedef struct { - CFE_MSG_CommandHeader_t CmdHeader; /**< \brief Command Header */ - - uint16 ContinueState; /**< \brief true or false, to continue ATS after a failure */ - uint16 Padding; /**< \brief Structure Padding */ + CFE_MSG_CommandHeader_t CmdHeader; /**< \brief Command Header */ + SC_SetContinueAtsOnFailureCmd_Payload_t Payload; } SC_SetContinueAtsOnFailureCmd_t; /** @@ -180,10 +235,8 @@ typedef struct */ typedef struct { - CFE_MSG_CommandHeader_t CmdHeader; /**< \brief Command Header */ - - uint16 AtsId; /**< \brief The ID of the ATS to append to, 1 = ATS_A, 2 = ATS_B */ - uint16 Padding; /**< \brief Structure Padding */ + CFE_MSG_CommandHeader_t CmdHeader; /**< \brief Command Header */ + SC_AppendAtsCmd_Payload_t Payload; } SC_AppendAtsCmd_t; #if (SC_ENABLE_GROUP_COMMANDS == true) @@ -195,9 +248,7 @@ typedef struct typedef struct { CFE_MSG_CommandHeader_t CmdHeader; /**< \brief Command Header */ - - uint16 FirstRtsId; /**< \brief ID of the first RTS to act on, 1 through #SC_NUMBER_OF_RTS */ - uint16 LastRtsId; /**< \brief ID of the last RTS to act on, 1 through #SC_NUMBER_OF_RTS */ + SC_RtsGrpCmd_Payload_t Payload; } SC_RtsGrpCmd_t; #endif diff --git a/fsw/inc/sc_msgdefs.h b/fsw/inc/sc_msgdefs.h index cba603a..afd8a2c 100644 --- a/fsw/inc/sc_msgdefs.h +++ b/fsw/inc/sc_msgdefs.h @@ -106,7 +106,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #SC_HkTlm_t.CmdCtr will increment + * - #SC_HkTlm_Payload_t.CmdCtr will increment * - The #SC_NOOP_INF_EID informational event message will be * generated when the command is received * @@ -115,7 +115,7 @@ * - Command packet length not as expected * * \par Evidence of failure may be found in the following telemetry: - * - #SC_HkTlm_t.CmdErrCtr will increment + * - #SC_HkTlm_Payload_t.CmdErrCtr will increment * - Error specific event message #SC_LEN_ERR_EID * * \par Criticality @@ -137,7 +137,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #SC_HkTlm_t.CmdCtr will be cleared + * - #SC_HkTlm_Payload_t.CmdCtr will be cleared * - The #SC_STARTATS_CMD_INF_EID informational event message will be * generated when the command is received * @@ -146,7 +146,7 @@ * - Command packet length not as expected * * \par Evidence of failure may be found in the following telemetry: - * - #SC_HkTlm_t.CmdErrCtr will increment + * - #SC_HkTlm_Payload_t.CmdErrCtr will increment * - Error specific event message #SC_LEN_ERR_EID * * \par Criticality @@ -168,7 +168,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #SC_HkTlm_t.CmdCtr will increment + * - #SC_HkTlm_Payload_t.CmdCtr will increment * * \par Error Conditions * This command may fail for the following reason(s): @@ -179,7 +179,7 @@ * - All command were skipped * * \par Evidence of failure may be found in the following telemetry: - * - #SC_HkTlm_t.CmdErrCtr will increment + * - #SC_HkTlm_Payload_t.CmdErrCtr will increment * - Error specific event message * * \par Criticality @@ -200,7 +200,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #SC_HkTlm_t.CmdCtr will increment + * - #SC_HkTlm_Payload_t.CmdCtr will increment * - the #SC_STOPATS_CMD_INF_EID event message will be generated * ** @@ -209,7 +209,7 @@ * - Command packet length not as expected * * \par Evidence of failure may be found in the following telemetry: - * - #SC_HkTlm_t.CmdErrCtr will increment + * - #SC_HkTlm_Payload_t.CmdErrCtr will increment * * \par Criticality * None @@ -230,7 +230,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #SC_HkTlm_t.CmdCtr will increment + * - #SC_HkTlm_Payload_t.CmdCtr will increment * - The #SC_STARTRTS_CMD_DBG_EID will be sent * * \par Error Conditions @@ -243,8 +243,8 @@ * - Invalid RTS ID * * \par Evidence of failure may be found in the following telemetry: - * - #SC_HkTlm_t.CmdErrCtr will increment - * - #SC_HkTlm_t.RtsActiveErrCtr will increment + * - #SC_HkTlm_Payload_t.CmdErrCtr will increment + * - #SC_HkTlm_Payload_t.RtsActiveErrCtr will increment * - Error specific event message * * \par Criticality @@ -266,7 +266,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #SC_HkTlm_t.CmdCtr will increment + * - #SC_HkTlm_Payload_t.CmdCtr will increment * - The #SC_STOPRTS_CMD_INF_EID will be sent * * \par Error Conditions @@ -275,7 +275,7 @@ * - RTS ID is invalid * * \par Evidence of failure may be found in the following telemetry: - * - #SC_HkTlm_t.CmdErrCtr will increment + * - #SC_HkTlm_Payload_t.CmdErrCtr will increment * - Error specific event message * * \par Criticality @@ -297,7 +297,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #SC_HkTlm_t.CmdCtr will increment + * - #SC_HkTlm_Payload_t.CmdCtr will increment * - The #SC_DISABLE_RTS_DEB_EID will be sent * * \par Error Conditions @@ -306,7 +306,7 @@ * - RTS ID is invalid * * \par Evidence of failure may be found in the following telemetry: - * - #SC_HkTlm_t.CmdErrCtr will increment + * - #SC_HkTlm_Payload_t.CmdErrCtr will increment * - Error specific event message * * \par Criticality @@ -328,7 +328,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #SC_HkTlm_t.CmdCtr will increment + * - #SC_HkTlm_Payload_t.CmdCtr will increment * - The #SC_ENABLE_RTS_DEB_EID will be sent * * \par Error Conditions @@ -337,7 +337,7 @@ * - RTS ID is invalid * * \par Evidence of failure may be found in the following telemetry: - * - #SC_HkTlm_t.CmdErrCtr will increment + * - #SC_HkTlm_Payload_t.CmdErrCtr will increment * - Error specific event message * * \par Criticality @@ -359,7 +359,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #SC_HkTlm_t.CmdCtr will increment + * - #SC_HkTlm_Payload_t.CmdCtr will increment * - The #SC_SWITCH_ATS_CMD_INF_EID will be sent * * \par Error Conditions @@ -369,7 +369,7 @@ * - There is no currently running ATS to switch from * * \par Evidence of failure may be found in the following telemetry: - * - #SC_HkTlm_t.CmdErrCtr will increment + * - #SC_HkTlm_Payload_t.CmdErrCtr will increment * - Error specific event message * * \par Criticality @@ -389,7 +389,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #SC_HkTlm_t.CmdCtr will increment + * - #SC_HkTlm_Payload_t.CmdCtr will increment * - The #SC_JUMP_ATS_INF_EID will be sent * * \par Error Conditions @@ -399,7 +399,7 @@ * - No ATS is active * * \par Evidence of failure may be found in the following telemetry: - * - #SC_HkTlm_t.CmdErrCtr will increment + * - #SC_HkTlm_Payload_t.CmdErrCtr will increment * - Error specific event message * * \par Criticality @@ -421,7 +421,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #SC_HkTlm_t.CmdCtr will increment + * - #SC_HkTlm_Payload_t.CmdCtr will increment * - The #SC_CONT_CMD_DEB_EID will be sent * * \par Error Conditions @@ -430,7 +430,7 @@ * - Invalid State specified * * \par Evidence of failure may be found in the following telemetry: - * - #SC_HkTlm_t.CmdErrCtr will increment + * - #SC_HkTlm_Payload_t.CmdErrCtr will increment * - Error specific event message * * \par Criticality @@ -450,7 +450,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #SC_HkTlm_t.CmdCtr will increment + * - #SC_HkTlm_Payload_t.CmdCtr will increment * * \par Error Conditions * This command may fail for the following reason(s): @@ -460,7 +460,7 @@ * - Append table contents too large to fit in ATS free space * * \par Evidence of failure may be found in the following telemetry: - * - #SC_HkTlm_t.CmdErrCtr will increment + * - #SC_HkTlm_Payload_t.CmdErrCtr will increment * - Error specific event message * * \par Criticality @@ -522,7 +522,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #SC_HkTlm_t.CmdCtr will increment + * - #SC_HkTlm_Payload_t.CmdCtr will increment * - #SC_STARTRTSGRP_CMD_INF_EID event will indicate the number of RTS * in the group that were actually STARTED by the command. * @@ -536,7 +536,7 @@ * whether any RTS in the group is actually STARTED by the command. * * \par Evidence of failure may be found in the following telemetry: - * - #SC_HkTlm_t.CmdErrCtr will increment + * - #SC_HkTlm_Payload_t.CmdErrCtr will increment * - The #SC_LEN_ERR_EID event will indicate invalid command packet length. * - The #SC_STARTRTSGRP_CMD_ERR_EID event will indicate invalid group definition. * @@ -562,7 +562,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #SC_HkTlm_t.CmdCtr will increment + * - #SC_HkTlm_Payload_t.CmdCtr will increment * - The #SC_STOPRTSGRP_CMD_INF_EID event will indicate the number of RTS * in the group that were actually STOPPED by the command * @@ -576,7 +576,7 @@ * whether any RTS in the group is actually STOPPED by the command. * * \par Evidence of failure may be found in the following telemetry: - * - #SC_HkTlm_t.CmdErrCtr will increment + * - #SC_HkTlm_Payload_t.CmdErrCtr will increment * - The #SC_LEN_ERR_EID event will indicate invalid command packet length. * - The #SC_STOPRTSGRP_CMD_ERR_EID event will indicate invalid group definition. * @@ -600,7 +600,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #SC_HkTlm_t.CmdCtr will increment + * - #SC_HkTlm_Payload_t.CmdCtr will increment * - The #SC_DISRTSGRP_CMD_INF_EID event will indicate the number of RTS * in the group that were changed from ENABLED to DISABLED by the command * @@ -614,7 +614,7 @@ * whether the group contained an RTS that was not already DISABLED. * * \par Evidence of failure may be found in the following telemetry: - * - #SC_HkTlm_t.CmdErrCtr will increment + * - #SC_HkTlm_Payload_t.CmdErrCtr will increment * - The #SC_LEN_ERR_EID event will indicate invalid command packet length. * - The #SC_DISRTSGRP_CMD_ERR_EID event will indicate invalid group definition. * @@ -638,7 +638,7 @@ * \par Command Verification * Successful execution of this command may be verified with * the following telemetry: - * - #SC_HkTlm_t.CmdCtr will increment + * - #SC_HkTlm_Payload_t.CmdCtr will increment * - The #SC_ENARTSGRP_CMD_INF_EID event will indicate success and display the * number of RTS that were changed from DISABLED to ENABLED by the command. * @@ -652,7 +652,7 @@ * whether the group contained an RTS that was not already ENABLED. * * \par Evidence of failure may be found in the following telemetry: - * - #SC_HkTlm_t.CmdErrCtr will increment + * - #SC_HkTlm_Payload_t.CmdErrCtr will increment * - The #SC_LEN_ERR_EID event will indicate invalid command packet length. * - The #SC_ENARTSGRP_CMD_ERR_EID event will indicate invalid group definition. * diff --git a/fsw/src/sc_app.c b/fsw/src/sc_app.c index 68cf884..2bdd900 100644 --- a/fsw/src/sc_app.c +++ b/fsw/src/sc_app.c @@ -148,7 +148,7 @@ CFE_Status_t SC_AppInit(void) SC_OperData.NumCmdsSec = 0; /* Continue ATS execution if ATS command checksum fails */ - SC_OperData.HkPacket.ContinueAtsOnFailureFlag = SC_CONT_ON_FAILURE_START; + SC_OperData.HkPacket.Payload.ContinueAtsOnFailureFlag = SC_CONT_ON_FAILURE_START; /* Make sure nothing is running */ SC_AppData.NextProcNumber = SC_NONE; diff --git a/fsw/src/sc_atsrq.c b/fsw/src/sc_atsrq.c index f5cb0de..b6f39be 100644 --- a/fsw/src/sc_atsrq.c +++ b/fsw/src/sc_atsrq.c @@ -54,7 +54,7 @@ void SC_StartAtsCmd(const CFE_SB_Buffer_t *BufPtr) if (SC_VerifyCmdLength(&BufPtr->Msg, sizeof(SC_StartAtsCmd_t))) { - AtsId = ((SC_StartAtsCmd_t *)BufPtr)->AtsId; + AtsId = ((SC_StartAtsCmd_t *)BufPtr)->Payload.AtsId; /* validate ATS ID */ if ((AtsId > 0) && (AtsId <= SC_NUMBER_OF_ATS)) @@ -75,7 +75,7 @@ void SC_StartAtsCmd(const CFE_SB_Buffer_t *BufPtr) SC_OperData.AtsCtrlBlckAddr->AtpState = SC_EXECUTING; /* increment the command request counter */ - SC_OperData.HkPacket.CmdCtr++; + SC_OperData.HkPacket.Payload.CmdCtr++; CFE_EVS_SendEvent(SC_STARTATS_CMD_INF_EID, CFE_EVS_EventType_INFORMATION, "ATS %c Execution Started", (AtsIndex ? 'B' : 'A')); @@ -85,7 +85,7 @@ void SC_StartAtsCmd(const CFE_SB_Buffer_t *BufPtr) /* event message was sent from SC_BeginAts */ /* increment the command request error counter */ /* SC_OperData.AtsCtrlBlckAddr->AtpState is updated in SC_KillAts */ - SC_OperData.HkPacket.CmdErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; } /* end if */ } @@ -96,7 +96,7 @@ void SC_StartAtsCmd(const CFE_SB_Buffer_t *BufPtr) "Start ATS Rejected: ATS %c Not Loaded", (AtsIndex ? 'B' : 'A')); /* increment the command request error counter */ - SC_OperData.HkPacket.CmdErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; } /* end if */ } @@ -106,7 +106,7 @@ void SC_StartAtsCmd(const CFE_SB_Buffer_t *BufPtr) CFE_EVS_SendEvent(SC_STARTATS_CMD_NOT_IDLE_ERR_EID, CFE_EVS_EventType_ERROR, "Start ATS Rejected: ATP is not Idle"); /* increment the command request error counter */ - SC_OperData.HkPacket.CmdErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; } /* end if */ } @@ -117,7 +117,7 @@ void SC_StartAtsCmd(const CFE_SB_Buffer_t *BufPtr) "Start ATS %d Rejected: Invalid ATS ID", AtsId); /* increment the command request error counter */ - SC_OperData.HkPacket.CmdErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; } /* end if */ } @@ -168,7 +168,7 @@ void SC_StopAtsCmd(const CFE_SB_Buffer_t *BufPtr) /* clear the global switch pend flag */ SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag = false; - SC_OperData.HkPacket.CmdCtr++; + SC_OperData.HkPacket.Payload.CmdCtr++; } } @@ -316,7 +316,7 @@ void SC_GroundSwitchCmd(const CFE_SB_Buffer_t *BufPtr) SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag = true; /* update the command counter */ - SC_OperData.HkPacket.CmdCtr++; + SC_OperData.HkPacket.Payload.CmdCtr++; CFE_EVS_SendEvent(SC_SWITCH_ATS_CMD_INF_EID, CFE_EVS_EventType_INFORMATION, "Switch ATS is Pending"); } @@ -327,7 +327,7 @@ void SC_GroundSwitchCmd(const CFE_SB_Buffer_t *BufPtr) "Switch ATS Failure: Destination ATS Not Loaded"); /* update command error counter */ - SC_OperData.HkPacket.CmdErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag = false; @@ -340,7 +340,7 @@ void SC_GroundSwitchCmd(const CFE_SB_Buffer_t *BufPtr) "Switch ATS Rejected: ATP is idle"); /* update the command error counter */ - SC_OperData.HkPacket.CmdErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag = false; @@ -454,7 +454,7 @@ bool SC_InlineSwitch(void) /* ** Update the command counter and return code */ - SC_OperData.HkPacket.CmdCtr++; + SC_OperData.HkPacket.Payload.CmdCtr++; ReturnCode = true; } else @@ -463,7 +463,7 @@ bool SC_InlineSwitch(void) /* ** update the command error counter */ - SC_OperData.HkPacket.CmdErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; ReturnCode = false; } /* end if */ @@ -475,7 +475,7 @@ bool SC_InlineSwitch(void) /* ** update the ATS error counter */ - SC_OperData.HkPacket.CmdErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; ReturnCode = false; } /* end if */ @@ -508,7 +508,7 @@ void SC_JumpAtsCmd(const CFE_SB_Buffer_t *BufPtr) { if (SC_OperData.AtsCtrlBlckAddr->AtpState == SC_EXECUTING) { - JumpTime = ((SC_JumpAtsCmd_t *)BufPtr)->NewTime; + JumpTime = ((SC_JumpAtsCmd_t *)BufPtr)->Payload.NewTime; AtsIndex = SC_ATS_NUM_TO_INDEX(SC_OperData.AtsCtrlBlckAddr->AtsNumber); /* @@ -566,7 +566,7 @@ void SC_JumpAtsCmd(const CFE_SB_Buffer_t *BufPtr) CFE_EVS_SendEvent(SC_JUMPATS_CMD_STOPPED_ERR_EID, CFE_EVS_EventType_ERROR, "Jump Cmd: All ATS commands were skipped, ATS stopped"); - SC_OperData.HkPacket.CmdErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; /* stop the ats */ SC_KillAts(); @@ -585,7 +585,7 @@ void SC_JumpAtsCmd(const CFE_SB_Buffer_t *BufPtr) */ SC_AppData.NextCmdTime[SC_ATP] = ListCmdTime; - SC_OperData.HkPacket.CmdCtr++; + SC_OperData.HkPacket.Payload.CmdCtr++; /* print out the date in a readable format */ NewTime.Seconds = ListCmdTime; @@ -609,7 +609,7 @@ void SC_JumpAtsCmd(const CFE_SB_Buffer_t *BufPtr) CFE_EVS_SendEvent(SC_JUMPATS_CMD_NOT_ACT_ERR_EID, CFE_EVS_EventType_ERROR, "ATS Jump Failed: No active ATS"); - SC_OperData.HkPacket.CmdErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; } /* end if */ } @@ -626,20 +626,20 @@ void SC_ContinueAtsOnFailureCmd(const CFE_SB_Buffer_t *BufPtr) if (SC_VerifyCmdLength(&BufPtr->Msg, sizeof(SC_SetContinueAtsOnFailureCmd_t))) { - State = ((SC_SetContinueAtsOnFailureCmd_t *)BufPtr)->ContinueState; + State = ((SC_SetContinueAtsOnFailureCmd_t *)BufPtr)->Payload.ContinueState; if (State != SC_CONTINUE_TRUE && State != SC_CONTINUE_FALSE) { - SC_OperData.HkPacket.CmdErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; CFE_EVS_SendEvent(SC_CONT_CMD_ERR_EID, CFE_EVS_EventType_ERROR, "Continue ATS On Failure command failed, invalid state: %d", State); } else { - SC_OperData.HkPacket.ContinueAtsOnFailureFlag = State; + SC_OperData.HkPacket.Payload.ContinueAtsOnFailureFlag = State; - SC_OperData.HkPacket.CmdCtr++; + SC_OperData.HkPacket.Payload.CmdCtr++; CFE_EVS_SendEvent(SC_CONT_CMD_DEB_EID, CFE_EVS_EventType_DEBUG, "Continue-ATS-On-Failure command, State: %d", State); @@ -659,32 +659,32 @@ void SC_AppendAtsCmd(const CFE_SB_Buffer_t *BufPtr) if (SC_VerifyCmdLength(&BufPtr->Msg, sizeof(SC_AppendAtsCmd_t))) { - if ((AppendCmd->AtsId == 0) || (AppendCmd->AtsId > SC_NUMBER_OF_ATS)) + if ((AppendCmd->Payload.AtsId == 0) || (AppendCmd->Payload.AtsId > SC_NUMBER_OF_ATS)) { /* invalid target ATS selection */ - SC_OperData.HkPacket.CmdErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; CFE_EVS_SendEvent(SC_APPEND_CMD_ARG_ERR_EID, CFE_EVS_EventType_ERROR, - "Append ATS error: invalid ATS ID = %d", AppendCmd->AtsId); + "Append ATS error: invalid ATS ID = %d", AppendCmd->Payload.AtsId); return; } /* create base zero array index from base one ID value */ - AtsIndex = SC_ATS_ID_TO_INDEX(AppendCmd->AtsId); + AtsIndex = SC_ATS_ID_TO_INDEX(AppendCmd->Payload.AtsId); if (SC_OperData.AtsInfoTblAddr[AtsIndex].NumberOfCommands == 0) { /* target ATS table is empty */ - SC_OperData.HkPacket.CmdErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; CFE_EVS_SendEvent(SC_APPEND_CMD_TGT_ERR_EID, CFE_EVS_EventType_ERROR, "Append ATS %c error: ATS table is empty", 'A' + AtsIndex); } - else if (SC_OperData.HkPacket.AppendEntryCount == 0) + else if (SC_OperData.HkPacket.Payload.AppendEntryCount == 0) { /* append table is empty */ - SC_OperData.HkPacket.CmdErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; CFE_EVS_SendEvent(SC_APPEND_CMD_SRC_ERR_EID, CFE_EVS_EventType_ERROR, "Append ATS %c error: Append table is empty", 'A' + AtsIndex); @@ -692,7 +692,7 @@ void SC_AppendAtsCmd(const CFE_SB_Buffer_t *BufPtr) else if ((SC_OperData.AtsInfoTblAddr[AtsIndex].AtsSize + SC_AppData.AppendWordCount) > SC_ATS_BUFF_SIZE32) { /* not enough room in ATS buffer for Append table data */ - SC_OperData.HkPacket.CmdErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; CFE_EVS_SendEvent(SC_APPEND_CMD_FIT_ERR_EID, CFE_EVS_EventType_ERROR, "Append ATS %c error: ATS size = %d, Append size = %d, ATS buffer = %d", 'A' + AtsIndex, @@ -702,17 +702,17 @@ void SC_AppendAtsCmd(const CFE_SB_Buffer_t *BufPtr) else { /* store ATS selection from most recent ATS Append command */ - SC_OperData.HkPacket.AppendCmdArg = AppendCmd->AtsId; + SC_OperData.HkPacket.Payload.AppendCmdArg = AppendCmd->Payload.AtsId; /* copy append data and re-calc timing data */ SC_ProcessAppend(AtsIndex); /* increment command success counter */ - SC_OperData.HkPacket.CmdCtr++; + SC_OperData.HkPacket.Payload.CmdCtr++; CFE_EVS_SendEvent(SC_APPEND_CMD_INF_EID, CFE_EVS_EventType_INFORMATION, "Append ATS %c command: %d ATS entries appended", 'A' + AtsIndex, - SC_OperData.HkPacket.AppendEntryCount); + SC_OperData.HkPacket.Payload.AppendEntryCount); } } } diff --git a/fsw/src/sc_cmds.c b/fsw/src/sc_cmds.c index 3b2f86d..5c4b97b 100644 --- a/fsw/src/sc_cmds.c +++ b/fsw/src/sc_cmds.c @@ -137,15 +137,15 @@ void SC_ProcessAtpCmd(void) ** this command */ SC_OperData.AtsCmdStatusTblAddr[AtsIndex][CmdIndex] = SC_EXECUTED; - SC_OperData.HkPacket.AtsCmdCtr++; + SC_OperData.HkPacket.Payload.AtsCmdCtr++; } else { /* the switch failed for some reason */ SC_OperData.AtsCmdStatusTblAddr[AtsIndex][CmdIndex] = SC_FAILED_DISTRIB; - SC_OperData.HkPacket.AtsCmdErrCtr++; - SC_OperData.HkPacket.LastAtsErrSeq = SC_OperData.AtsCtrlBlckAddr->AtsNumber; - SC_OperData.HkPacket.LastAtsErrCmd = SC_OperData.AtsCtrlBlckAddr->CmdNumber; + SC_OperData.HkPacket.Payload.AtsCmdErrCtr++; + SC_OperData.HkPacket.Payload.LastAtsErrSeq = SC_OperData.AtsCtrlBlckAddr->AtsNumber; + SC_OperData.HkPacket.Payload.LastAtsErrCmd = SC_OperData.AtsCtrlBlckAddr->CmdNumber; } /* end if */ } @@ -157,14 +157,14 @@ void SC_ProcessAtpCmd(void) { /* The command sent OK */ SC_OperData.AtsCmdStatusTblAddr[AtsIndex][CmdIndex] = SC_EXECUTED; - SC_OperData.HkPacket.AtsCmdCtr++; + SC_OperData.HkPacket.Payload.AtsCmdCtr++; } else { /* the command had Software Bus problems */ SC_OperData.AtsCmdStatusTblAddr[AtsIndex][CmdIndex] = SC_FAILED_DISTRIB; - SC_OperData.HkPacket.AtsCmdErrCtr++; - SC_OperData.HkPacket.LastAtsErrSeq = SC_OperData.AtsCtrlBlckAddr->AtsNumber; - SC_OperData.HkPacket.LastAtsErrCmd = SC_OperData.AtsCtrlBlckAddr->CmdNumber; + SC_OperData.HkPacket.Payload.AtsCmdErrCtr++; + SC_OperData.HkPacket.Payload.LastAtsErrSeq = SC_OperData.AtsCtrlBlckAddr->AtsNumber; + SC_OperData.HkPacket.Payload.LastAtsErrCmd = SC_OperData.AtsCtrlBlckAddr->CmdNumber; CFE_EVS_SendEvent(SC_ATS_DIST_ERR_EID, CFE_EVS_EventType_ERROR, "ATS Command Distribution Failed, Cmd Number: %d, SB returned: 0x%08X", @@ -185,18 +185,18 @@ void SC_ProcessAtpCmd(void) /* ** Increment the ATS error counter */ - SC_OperData.HkPacket.AtsCmdErrCtr++; + SC_OperData.HkPacket.Payload.AtsCmdErrCtr++; /* ** Update the last ATS error information structure */ - SC_OperData.HkPacket.LastAtsErrSeq = SC_OperData.AtsCtrlBlckAddr->AtsNumber; - SC_OperData.HkPacket.LastAtsErrCmd = SC_OperData.AtsCtrlBlckAddr->CmdNumber; + SC_OperData.HkPacket.Payload.LastAtsErrSeq = SC_OperData.AtsCtrlBlckAddr->AtsNumber; + SC_OperData.HkPacket.Payload.LastAtsErrCmd = SC_OperData.AtsCtrlBlckAddr->CmdNumber; /* update the command status index table */ SC_OperData.AtsCmdStatusTblAddr[AtsIndex][CmdIndex] = SC_FAILED_CHECKSUM; - if (SC_OperData.HkPacket.ContinueAtsOnFailureFlag == false) + if (SC_OperData.HkPacket.Payload.ContinueAtsOnFailureFlag == false) { /* Mark this ATS for abortion */ AbortATS = true; @@ -215,13 +215,13 @@ void SC_ProcessAtpCmd(void) /* ** Increment the ATS error counter */ - SC_OperData.HkPacket.AtsCmdErrCtr++; + SC_OperData.HkPacket.Payload.AtsCmdErrCtr++; /* ** Update the last ATS error information structure */ - SC_OperData.HkPacket.LastAtsErrSeq = SC_OperData.AtsCtrlBlckAddr->AtsNumber; - SC_OperData.HkPacket.LastAtsErrCmd = SC_OperData.AtsCtrlBlckAddr->CmdNumber; + SC_OperData.HkPacket.Payload.LastAtsErrSeq = SC_OperData.AtsCtrlBlckAddr->AtsNumber; + SC_OperData.HkPacket.Payload.LastAtsErrCmd = SC_OperData.AtsCtrlBlckAddr->CmdNumber; /* update the command status index table */ SC_OperData.AtsCmdStatusTblAddr[AtsIndex][CmdIndex] = SC_SKIPPED; @@ -241,13 +241,13 @@ void SC_ProcessAtpCmd(void) /* ** Increment the ATS error counter */ - SC_OperData.HkPacket.AtsCmdErrCtr++; + SC_OperData.HkPacket.Payload.AtsCmdErrCtr++; /* ** Update the last ATS error information structure */ - SC_OperData.HkPacket.LastAtsErrSeq = SC_OperData.AtsCtrlBlckAddr->AtsNumber; - SC_OperData.HkPacket.LastAtsErrCmd = SC_OperData.AtsCtrlBlckAddr->CmdNumber; + SC_OperData.HkPacket.Payload.LastAtsErrSeq = SC_OperData.AtsCtrlBlckAddr->AtsNumber; + SC_OperData.HkPacket.Payload.LastAtsErrCmd = SC_OperData.AtsCtrlBlckAddr->CmdNumber; /* Do Not Mark this ATS for abortion. The command could be marked as EXECUTED if we alerady jumped back in time */ @@ -341,7 +341,7 @@ void SC_ProcessRtpCommand(void) if (Result == CFE_SUCCESS) { /* the command was sent OK */ - SC_OperData.HkPacket.RtsCmdCtr++; + SC_OperData.HkPacket.Payload.RtsCmdCtr++; SC_OperData.RtsInfoTblAddr[RtsIndex].CmdCtr++; /* @@ -359,10 +359,10 @@ void SC_ProcessRtpCommand(void) "RTS %03d Command Distribution Failed: RTS Stopped. SB returned 0x%08X", (int)SC_OperData.RtsCtrlBlckAddr->RtsNumber, (unsigned int)Result); - SC_OperData.HkPacket.RtsCmdErrCtr++; + SC_OperData.HkPacket.Payload.RtsCmdErrCtr++; SC_OperData.RtsInfoTblAddr[RtsIndex].CmdErrCtr++; - SC_OperData.HkPacket.LastRtsErrSeq = SC_OperData.RtsCtrlBlckAddr->RtsNumber; - SC_OperData.HkPacket.LastRtsErrCmd = CmdOffset; + SC_OperData.HkPacket.Payload.LastRtsErrSeq = SC_OperData.RtsCtrlBlckAddr->RtsNumber; + SC_OperData.HkPacket.Payload.LastRtsErrCmd = CmdOffset; /* ** Stop the RTS from executing @@ -383,10 +383,10 @@ void SC_ProcessRtpCommand(void) /* ** Update the RTS command error counter and last RTS error info */ - SC_OperData.HkPacket.RtsCmdErrCtr++; + SC_OperData.HkPacket.Payload.RtsCmdErrCtr++; SC_OperData.RtsInfoTblAddr[RtsIndex].CmdErrCtr++; - SC_OperData.HkPacket.LastRtsErrSeq = SC_OperData.RtsCtrlBlckAddr->RtsNumber; - SC_OperData.HkPacket.LastRtsErrCmd = CmdOffset; + SC_OperData.HkPacket.Payload.LastRtsErrSeq = SC_OperData.RtsCtrlBlckAddr->RtsNumber; + SC_OperData.HkPacket.Payload.LastRtsErrCmd = CmdOffset; /* ** Stop the RTS from executing @@ -408,10 +408,10 @@ void SC_SendHkPacket(void) /* ** fill in the free bytes in each ATS */ - SC_OperData.HkPacket.AtpFreeBytes[SC_ATS_NUM_TO_INDEX(SC_ATSA)] = + SC_OperData.HkPacket.Payload.AtpFreeBytes[SC_ATS_NUM_TO_INDEX(SC_ATSA)] = (SC_ATS_BUFF_SIZE32 * SC_BYTES_IN_WORD) - (SC_OperData.AtsInfoTblAddr[SC_ATS_NUM_TO_INDEX(SC_ATSA)].AtsSize * SC_BYTES_IN_WORD); - SC_OperData.HkPacket.AtpFreeBytes[SC_ATS_NUM_TO_INDEX(SC_ATSB)] = + SC_OperData.HkPacket.Payload.AtpFreeBytes[SC_ATS_NUM_TO_INDEX(SC_ATSB)] = (SC_ATS_BUFF_SIZE32 * SC_BYTES_IN_WORD) - (SC_OperData.AtsInfoTblAddr[SC_ATS_NUM_TO_INDEX(SC_ATSB)].AtsSize * SC_BYTES_IN_WORD); @@ -421,21 +421,21 @@ void SC_SendHkPacket(void) ** */ - SC_OperData.HkPacket.AtsNumber = SC_OperData.AtsCtrlBlckAddr->AtsNumber; + SC_OperData.HkPacket.Payload.AtsNumber = SC_OperData.AtsCtrlBlckAddr->AtsNumber; - SC_OperData.HkPacket.AtpState = SC_OperData.AtsCtrlBlckAddr->AtpState; - SC_OperData.HkPacket.AtpCmdNumber = SC_OperData.AtsCtrlBlckAddr->CmdNumber; - SC_OperData.HkPacket.SwitchPendFlag = SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag; + SC_OperData.HkPacket.Payload.AtpState = SC_OperData.AtsCtrlBlckAddr->AtpState; + SC_OperData.HkPacket.Payload.AtpCmdNumber = SC_OperData.AtsCtrlBlckAddr->CmdNumber; + SC_OperData.HkPacket.Payload.SwitchPendFlag = SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag; - SC_OperData.HkPacket.NextAtsTime = SC_AppData.NextCmdTime[SC_ATP]; + SC_OperData.HkPacket.Payload.NextAtsTime = SC_AppData.NextCmdTime[SC_ATP]; /* ** Fill out the RTP control block information */ - SC_OperData.HkPacket.NumRtsActive = SC_OperData.RtsCtrlBlckAddr->NumRtsActive; - SC_OperData.HkPacket.RtsNumber = SC_OperData.RtsCtrlBlckAddr->RtsNumber; - SC_OperData.HkPacket.NextRtsTime = SC_AppData.NextCmdTime[SC_RTP]; + SC_OperData.HkPacket.Payload.NumRtsActive = SC_OperData.RtsCtrlBlckAddr->NumRtsActive; + SC_OperData.HkPacket.Payload.RtsNumber = SC_OperData.RtsCtrlBlckAddr->RtsNumber; + SC_OperData.HkPacket.Payload.NextRtsTime = SC_AppData.NextCmdTime[SC_RTP]; /* ** Fill out the RTS status bit mask @@ -443,8 +443,8 @@ void SC_SendHkPacket(void) */ for (i = 0; i < (SC_NUMBER_OF_RTS + (SC_NUMBER_OF_RTS_IN_UINT16 - 1)) / SC_NUMBER_OF_RTS_IN_UINT16; i++) { - SC_OperData.HkPacket.RtsExecutingStatus[i] = 0; - SC_OperData.HkPacket.RtsDisabledStatus[i] = 0; + SC_OperData.HkPacket.Payload.RtsExecutingStatus[i] = 0; + SC_OperData.HkPacket.Payload.RtsDisabledStatus[i] = 0; } /* end for */ @@ -452,12 +452,12 @@ void SC_SendHkPacket(void) { if (SC_OperData.RtsInfoTblAddr[i].DisabledFlag == true) { - SC_OperData.HkPacket.RtsDisabledStatus[i / SC_NUMBER_OF_RTS_IN_UINT16] |= + SC_OperData.HkPacket.Payload.RtsDisabledStatus[i / SC_NUMBER_OF_RTS_IN_UINT16] |= (1 << (i % SC_NUMBER_OF_RTS_IN_UINT16)); } if (SC_OperData.RtsInfoTblAddr[i].RtsStatus == SC_EXECUTING) { - SC_OperData.HkPacket.RtsExecutingStatus[i / SC_NUMBER_OF_RTS_IN_UINT16] |= + SC_OperData.HkPacket.Payload.RtsExecutingStatus[i / SC_NUMBER_OF_RTS_IN_UINT16] |= (1 << (i % SC_NUMBER_OF_RTS_IN_UINT16)); } } /* end for */ @@ -479,14 +479,14 @@ void SC_ResetCountersCmd(const CFE_SB_Buffer_t *BufPtr) { CFE_EVS_SendEvent(SC_RESET_DEB_EID, CFE_EVS_EventType_DEBUG, "Reset counters command"); - SC_OperData.HkPacket.CmdCtr = 0; - SC_OperData.HkPacket.CmdErrCtr = 0; - SC_OperData.HkPacket.AtsCmdCtr = 0; - SC_OperData.HkPacket.AtsCmdErrCtr = 0; - SC_OperData.HkPacket.RtsCmdCtr = 0; - SC_OperData.HkPacket.RtsCmdErrCtr = 0; - SC_OperData.HkPacket.RtsActiveCtr = 0; - SC_OperData.HkPacket.RtsActiveErrCtr = 0; + SC_OperData.HkPacket.Payload.CmdCtr = 0; + SC_OperData.HkPacket.Payload.CmdErrCtr = 0; + SC_OperData.HkPacket.Payload.AtsCmdCtr = 0; + SC_OperData.HkPacket.Payload.AtsCmdErrCtr = 0; + SC_OperData.HkPacket.Payload.RtsCmdCtr = 0; + SC_OperData.HkPacket.Payload.RtsCmdErrCtr = 0; + SC_OperData.HkPacket.Payload.RtsActiveCtr = 0; + SC_OperData.HkPacket.Payload.RtsActiveErrCtr = 0; } } @@ -499,7 +499,7 @@ void SC_NoOpCmd(const CFE_SB_Buffer_t *BufPtr) { if (SC_VerifyCmdLength(&BufPtr->Msg, sizeof(SC_NoArgsCmd_t))) { - SC_OperData.HkPacket.CmdCtr++; + SC_OperData.HkPacket.Payload.CmdCtr++; CFE_EVS_SendEvent(SC_NOOP_INF_EID, CFE_EVS_EventType_INFORMATION, "No-op command. Version %d.%d.%d.%d", SC_MAJOR_VERSION, SC_MINOR_VERSION, SC_REVISION, SC_MISSION_REV); } @@ -607,7 +607,7 @@ void SC_ProcessRequest(const CFE_SB_Buffer_t *BufPtr) CFE_EVS_SendEvent(SC_MID_ERR_EID, CFE_EVS_EventType_ERROR, "Invalid command pipe message ID: 0x%08lX", (unsigned long)CFE_SB_MsgIdToValue(MessageID)); - SC_OperData.HkPacket.CmdErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; break; } /* end switch */ } @@ -702,7 +702,7 @@ void SC_ProcessCommand(const CFE_SB_Buffer_t *BufPtr) CFE_EVS_SendEvent(SC_INVLD_CMD_ERR_EID, CFE_EVS_EventType_ERROR, "Invalid Command Code: MID = 0x%08lX CC = %d", (unsigned long)CFE_SB_MsgIdToValue(MessageID), CommandCode); - SC_OperData.HkPacket.CmdErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; break; } /* end switch */ } diff --git a/fsw/src/sc_loads.c b/fsw/src/sc_loads.c index f17baa0..173ead5 100644 --- a/fsw/src/sc_loads.c +++ b/fsw/src/sc_loads.c @@ -580,14 +580,14 @@ void SC_UpdateAppend(void) } /* Results will also be reported in HK */ - SC_OperData.HkPacket.AppendLoadCount++; - SC_OperData.HkPacket.AppendEntryCount = EntryCount; - SC_OperData.HkPacket.AppendByteCount = EntryIndex * SC_BYTES_IN_ATS_APPEND_ENTRY; + SC_OperData.HkPacket.Payload.AppendLoadCount++; + SC_OperData.HkPacket.Payload.AppendEntryCount = EntryCount; + SC_OperData.HkPacket.Payload.AppendByteCount = EntryIndex * SC_BYTES_IN_ATS_APPEND_ENTRY; SC_AppData.AppendWordCount = EntryIndex; CFE_EVS_SendEvent(SC_UPDATE_APPEND_EID, CFE_EVS_EventType_INFORMATION, "Update Append ATS Table: load count = %d, command count = %d, byte count = %d", - SC_OperData.HkPacket.AppendLoadCount, (int)EntryCount, (int)EntryIndex * SC_BYTES_IN_WORD); + SC_OperData.HkPacket.Payload.AppendLoadCount, (int)EntryCount, (int)EntryIndex * SC_BYTES_IN_WORD); } /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -623,7 +623,7 @@ void SC_ProcessAppend(uint16 AtsIndex) SC_OperData.AtsInfoTblAddr[AtsIndex].AtsSize += SC_AppData.AppendWordCount; /* add appended entries to ats process tables */ - for (i = 0; i < SC_OperData.HkPacket.AppendEntryCount; i++) + for (i = 0; i < SC_OperData.HkPacket.Payload.AppendEntryCount; i++) { /* get pointer to next appended entry */ EntryPtr = (SC_AtsEntry_t *)&SC_OperData.AtsTblAddr[AtsIndex][EntryIndex]; diff --git a/fsw/src/sc_rtsrq.c b/fsw/src/sc_rtsrq.c index 83a8a43..34b1f26 100644 --- a/fsw/src/sc_rtsrq.c +++ b/fsw/src/sc_rtsrq.c @@ -63,7 +63,7 @@ void SC_StartRtsCmd(const CFE_SB_Buffer_t *CmdPacket) /* ** Check start RTS parameters */ - RtsId = ((SC_RtsCmd_t *)CmdPacket)->RtsId; + RtsId = ((SC_RtsCmd_t *)CmdPacket)->Payload.RtsId; if ((RtsId > 0) && (RtsId <= SC_NUMBER_OF_RTS)) { @@ -108,10 +108,10 @@ void SC_StartRtsCmd(const CFE_SB_Buffer_t *CmdPacket) ** starting of the RTS */ SC_OperData.RtsCtrlBlckAddr->NumRtsActive++; - SC_OperData.HkPacket.RtsActiveCtr++; - SC_OperData.HkPacket.CmdCtr++; + SC_OperData.HkPacket.Payload.RtsActiveCtr++; + SC_OperData.HkPacket.Payload.CmdCtr++; - if (((SC_RtsCmd_t *)CmdPacket)->RtsId <= SC_LAST_RTS_WITH_EVENTS) + if (((SC_RtsCmd_t *)CmdPacket)->Payload.RtsId <= SC_LAST_RTS_WITH_EVENTS) { CFE_EVS_SendEvent(SC_RTS_START_INF_EID, CFE_EVS_EventType_INFORMATION, "RTS Number %03d Started", RtsId); @@ -129,8 +129,8 @@ void SC_StartRtsCmd(const CFE_SB_Buffer_t *CmdPacket) "Start RTS %03d Rejected: Invld Len Field for 1st Cmd in Sequence. Invld Cmd Length = %d", RtsId, (int)CmdLength); - SC_OperData.HkPacket.CmdErrCtr++; - SC_OperData.HkPacket.RtsActiveErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; + SC_OperData.HkPacket.Payload.RtsActiveErrCtr++; } /* end if - check command number */ } @@ -139,11 +139,11 @@ void SC_StartRtsCmd(const CFE_SB_Buffer_t *CmdPacket) CFE_EVS_SendEvent(SC_STARTRTS_CMD_NOT_LDED_ERR_EID, CFE_EVS_EventType_ERROR, "Start RTS %03d Rejected: RTS Not Loaded or In Use, Status: %d", - ((SC_RtsCmd_t *)CmdPacket)->RtsId, + ((SC_RtsCmd_t *)CmdPacket)->Payload.RtsId, SC_OperData.RtsInfoTblAddr[RtsIndex].RtsStatus); - SC_OperData.HkPacket.CmdErrCtr++; - SC_OperData.HkPacket.RtsActiveErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; + SC_OperData.HkPacket.Payload.RtsActiveErrCtr++; } /* end if */ } @@ -152,8 +152,8 @@ void SC_StartRtsCmd(const CFE_SB_Buffer_t *CmdPacket) CFE_EVS_SendEvent(SC_STARTRTS_CMD_DISABLED_ERR_EID, CFE_EVS_EventType_ERROR, "Start RTS %03d Rejected: RTS Disabled", RtsId); - SC_OperData.HkPacket.CmdErrCtr++; - SC_OperData.HkPacket.RtsActiveErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; + SC_OperData.HkPacket.Payload.RtsActiveErrCtr++; } /* end if */ } @@ -162,13 +162,13 @@ void SC_StartRtsCmd(const CFE_SB_Buffer_t *CmdPacket) CFE_EVS_SendEvent(SC_STARTRTS_CMD_INVALID_ERR_EID, CFE_EVS_EventType_ERROR, "Start RTS %03d Rejected: Invalid RTS ID", RtsId); - SC_OperData.HkPacket.CmdErrCtr++; - SC_OperData.HkPacket.RtsActiveErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; + SC_OperData.HkPacket.Payload.RtsActiveErrCtr++; } } else { /* the command length is invalid */ - SC_OperData.HkPacket.RtsActiveErrCtr++; + SC_OperData.HkPacket.Payload.RtsActiveErrCtr++; } } @@ -189,8 +189,8 @@ void SC_StartRtsGrpCmd(const CFE_SB_Buffer_t *CmdPacket) if (SC_VerifyCmdLength(&CmdPacket->Msg, sizeof(SC_RtsGrpCmd_t))) { - FirstId = ((SC_RtsGrpCmd_t *)CmdPacket)->FirstRtsId; - LastId = ((SC_RtsGrpCmd_t *)CmdPacket)->LastRtsId; + FirstId = ((SC_RtsGrpCmd_t *)CmdPacket)->Payload.FirstRtsId; + LastId = ((SC_RtsGrpCmd_t *)CmdPacket)->Payload.LastRtsId; /* make sure the specified group is valid */ if ((FirstId > 0) && (LastId > 0) && (FirstId <= SC_NUMBER_OF_RTS) && (LastId <= SC_NUMBER_OF_RTS) && @@ -220,7 +220,7 @@ void SC_StartRtsGrpCmd(const CFE_SB_Buffer_t *CmdPacket) /* maintain counters associated with starting RTS */ SC_OperData.RtsCtrlBlckAddr->NumRtsActive++; - SC_OperData.HkPacket.RtsActiveCtr++; + SC_OperData.HkPacket.Payload.RtsActiveCtr++; /* count the RTS that were actually started */ StartCount++; @@ -232,7 +232,7 @@ void SC_StartRtsGrpCmd(const CFE_SB_Buffer_t *CmdPacket) "Start RTS group error: rejected RTS ID %03d, RTS Not Loaded or In Use, Status: %d", SC_RTS_INDEX_TO_ID(RtsIndex), SC_OperData.RtsInfoTblAddr[RtsIndex].RtsStatus); - SC_OperData.HkPacket.RtsActiveErrCtr++; + SC_OperData.HkPacket.Payload.RtsActiveErrCtr++; } /* end if */ } @@ -242,7 +242,7 @@ void SC_StartRtsGrpCmd(const CFE_SB_Buffer_t *CmdPacket) "Start RTS group error: rejected RTS ID %03d, RTS Disabled", SC_RTS_INDEX_TO_ID(RtsIndex)); - SC_OperData.HkPacket.RtsActiveErrCtr++; + SC_OperData.HkPacket.Payload.RtsActiveErrCtr++; } /* end if */ } @@ -250,13 +250,13 @@ void SC_StartRtsGrpCmd(const CFE_SB_Buffer_t *CmdPacket) /* success */ CFE_EVS_SendEvent(SC_STARTRTSGRP_CMD_INF_EID, CFE_EVS_EventType_INFORMATION, "Start RTS group: FirstID=%d, LastID=%d, Modified=%d", FirstId, LastId, (int)StartCount); - SC_OperData.HkPacket.CmdCtr++; + SC_OperData.HkPacket.Payload.CmdCtr++; } else { /* error */ CFE_EVS_SendEvent(SC_STARTRTSGRP_CMD_ERR_EID, CFE_EVS_EventType_ERROR, "Start RTS group error: FirstID=%d, LastID=%d", FirstId, LastId); - SC_OperData.HkPacket.CmdErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; } } } @@ -274,7 +274,7 @@ void SC_StopRtsCmd(const CFE_SB_Buffer_t *CmdPacket) if (SC_VerifyCmdLength(&CmdPacket->Msg, sizeof(SC_RtsCmd_t))) { - RtsId = ((SC_RtsCmd_t *)CmdPacket)->RtsId; + RtsId = ((SC_RtsCmd_t *)CmdPacket)->Payload.RtsId; /* check the command parameter */ if (RtsId <= SC_NUMBER_OF_RTS) @@ -285,7 +285,7 @@ void SC_StopRtsCmd(const CFE_SB_Buffer_t *CmdPacket) /* stop the rts by calling a generic routine */ SC_KillRts(RtsIndex); - SC_OperData.HkPacket.CmdCtr++; + SC_OperData.HkPacket.Payload.CmdCtr++; CFE_EVS_SendEvent(SC_STOPRTS_CMD_INF_EID, CFE_EVS_EventType_INFORMATION, "RTS %03d Aborted", RtsId); } @@ -296,7 +296,7 @@ void SC_StopRtsCmd(const CFE_SB_Buffer_t *CmdPacket) CFE_EVS_SendEvent(SC_STOPRTS_CMD_ERR_EID, CFE_EVS_EventType_ERROR, "Stop RTS %03d rejected: Invalid RTS ID", RtsId); - SC_OperData.HkPacket.CmdErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; } /* end if */ } @@ -319,8 +319,8 @@ void SC_StopRtsGrpCmd(const CFE_SB_Buffer_t *CmdPacket) if (SC_VerifyCmdLength(&CmdPacket->Msg, sizeof(SC_RtsGrpCmd_t))) { - FirstId = ((SC_RtsGrpCmd_t *)CmdPacket)->FirstRtsId; - LastId = ((SC_RtsGrpCmd_t *)CmdPacket)->LastRtsId; + FirstId = ((SC_RtsGrpCmd_t *)CmdPacket)->Payload.FirstRtsId; + LastId = ((SC_RtsGrpCmd_t *)CmdPacket)->Payload.LastRtsId; /* make sure the specified group is valid */ if ((FirstId > 0) && (LastId > 0) && (FirstId <= SC_NUMBER_OF_RTS) && (LastId <= SC_NUMBER_OF_RTS) && @@ -343,13 +343,13 @@ void SC_StopRtsGrpCmd(const CFE_SB_Buffer_t *CmdPacket) /* success */ CFE_EVS_SendEvent(SC_STOPRTSGRP_CMD_INF_EID, CFE_EVS_EventType_INFORMATION, "Stop RTS group: FirstID=%d, LastID=%d, Modified=%d", FirstId, LastId, (int)StopCount); - SC_OperData.HkPacket.CmdCtr++; + SC_OperData.HkPacket.Payload.CmdCtr++; } else { /* error */ CFE_EVS_SendEvent(SC_STOPRTSGRP_CMD_ERR_EID, CFE_EVS_EventType_ERROR, "Stop RTS group error: FirstID=%d, LastID=%d", FirstId, LastId); - SC_OperData.HkPacket.CmdErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; } } } @@ -367,7 +367,7 @@ void SC_DisableRtsCmd(const CFE_SB_Buffer_t *CmdPacket) if (SC_VerifyCmdLength(&CmdPacket->Msg, sizeof(SC_RtsCmd_t))) { - RtsId = ((SC_RtsCmd_t *)CmdPacket)->RtsId; + RtsId = ((SC_RtsCmd_t *)CmdPacket)->Payload.RtsId; /* make sure tha specified rts is valid */ if (RtsId <= SC_NUMBER_OF_RTS) @@ -379,7 +379,7 @@ void SC_DisableRtsCmd(const CFE_SB_Buffer_t *CmdPacket) SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag = true; /* update the command status */ - SC_OperData.HkPacket.CmdCtr++; + SC_OperData.HkPacket.Payload.CmdCtr++; CFE_EVS_SendEvent(SC_DISABLE_RTS_DEB_EID, CFE_EVS_EventType_DEBUG, "Disabled RTS %03d", RtsId); } @@ -389,7 +389,7 @@ void SC_DisableRtsCmd(const CFE_SB_Buffer_t *CmdPacket) "Disable RTS %03d Rejected: Invalid RTS ID", RtsId); /* update the command error status */ - SC_OperData.HkPacket.CmdErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; } /* end if */ } } @@ -411,8 +411,8 @@ void SC_DisableRtsGrpCmd(const CFE_SB_Buffer_t *CmdPacket) if (SC_VerifyCmdLength(&CmdPacket->Msg, sizeof(SC_RtsGrpCmd_t))) { - FirstId = ((SC_RtsGrpCmd_t *)CmdPacket)->FirstRtsId; - LastId = ((SC_RtsGrpCmd_t *)CmdPacket)->LastRtsId; + FirstId = ((SC_RtsGrpCmd_t *)CmdPacket)->Payload.FirstRtsId; + LastId = ((SC_RtsGrpCmd_t *)CmdPacket)->Payload.LastRtsId; /* make sure the specified group is valid */ if ((FirstId > 0) && (LastId > 0) && (FirstId <= SC_NUMBER_OF_RTS) && (LastId <= SC_NUMBER_OF_RTS) && @@ -436,13 +436,13 @@ void SC_DisableRtsGrpCmd(const CFE_SB_Buffer_t *CmdPacket) CFE_EVS_SendEvent(SC_DISRTSGRP_CMD_INF_EID, CFE_EVS_EventType_INFORMATION, "Disable RTS group: FirstID=%d, LastID=%d, Modified=%d", FirstId, LastId, (int)DisableCount); - SC_OperData.HkPacket.CmdCtr++; + SC_OperData.HkPacket.Payload.CmdCtr++; } else { /* error */ CFE_EVS_SendEvent(SC_DISRTSGRP_CMD_ERR_EID, CFE_EVS_EventType_ERROR, "Disable RTS group error: FirstID=%d, LastID=%d", FirstId, LastId); - SC_OperData.HkPacket.CmdErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; } } } @@ -460,7 +460,7 @@ void SC_EnableRtsCmd(const CFE_SB_Buffer_t *CmdPacket) if (SC_VerifyCmdLength(&CmdPacket->Msg, sizeof(SC_RtsCmd_t))) { - RtsId = ((SC_RtsCmd_t *)CmdPacket)->RtsId; + RtsId = ((SC_RtsCmd_t *)CmdPacket)->Payload.RtsId; /* make sure the specified rts is valid */ if ((RtsId > 0) && (RtsId <= SC_NUMBER_OF_RTS)) @@ -472,7 +472,7 @@ void SC_EnableRtsCmd(const CFE_SB_Buffer_t *CmdPacket) SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag = false; /* update the command status */ - SC_OperData.HkPacket.CmdCtr++; + SC_OperData.HkPacket.Payload.CmdCtr++; CFE_EVS_SendEvent(SC_ENABLE_RTS_DEB_EID, CFE_EVS_EventType_DEBUG, "Enabled RTS %03d", RtsId); } @@ -482,7 +482,7 @@ void SC_EnableRtsCmd(const CFE_SB_Buffer_t *CmdPacket) "Enable RTS %03d Rejected: Invalid RTS ID", RtsId); /* update the command error status */ - SC_OperData.HkPacket.CmdErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; } /* end if */ } @@ -505,8 +505,8 @@ void SC_EnableRtsGrpCmd(const CFE_SB_Buffer_t *CmdPacket) if (SC_VerifyCmdLength(&CmdPacket->Msg, sizeof(SC_RtsGrpCmd_t))) { - FirstId = ((SC_RtsGrpCmd_t *)CmdPacket)->FirstRtsId; - LastId = ((SC_RtsGrpCmd_t *)CmdPacket)->LastRtsId; + FirstId = ((SC_RtsGrpCmd_t *)CmdPacket)->Payload.FirstRtsId; + LastId = ((SC_RtsGrpCmd_t *)CmdPacket)->Payload.LastRtsId; /* make sure the specified group is valid */ if ((FirstId > 0) && (LastId > 0) && (FirstId <= SC_NUMBER_OF_RTS) && (LastId <= SC_NUMBER_OF_RTS) && @@ -530,13 +530,13 @@ void SC_EnableRtsGrpCmd(const CFE_SB_Buffer_t *CmdPacket) CFE_EVS_SendEvent(SC_ENARTSGRP_CMD_INF_EID, CFE_EVS_EventType_INFORMATION, "Enable RTS group: FirstID=%d, LastID=%d, Modified=%d", FirstId, LastId, (int)EnableCount); - SC_OperData.HkPacket.CmdCtr++; + SC_OperData.HkPacket.Payload.CmdCtr++; } else { /* error */ CFE_EVS_SendEvent(SC_ENARTSGRP_CMD_ERR_EID, CFE_EVS_EventType_ERROR, "Enable RTS group error: FirstID=%d, LastID=%d", FirstId, LastId); - SC_OperData.HkPacket.CmdErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; } } } @@ -600,7 +600,7 @@ void SC_AutoStartRts(uint16 RtsNumber) /* ** Get the RTS ID to start. */ - CmdPkt.RtsId = RtsNumber; + CmdPkt.Payload.RtsId = RtsNumber; /* ** Now send the command back to SC diff --git a/fsw/src/sc_state.c b/fsw/src/sc_state.c index 483e73d..e7ae958 100644 --- a/fsw/src/sc_state.c +++ b/fsw/src/sc_state.c @@ -238,10 +238,10 @@ void SC_GetNextRtsCommand(void) ** Having a command that runs off of the end of the buffer ** is an error condition, so record it */ - SC_OperData.HkPacket.RtsCmdErrCtr++; + SC_OperData.HkPacket.Payload.RtsCmdErrCtr++; SC_OperData.RtsInfoTblAddr[RtsIndex].CmdErrCtr++; - SC_OperData.HkPacket.LastRtsErrSeq = SC_OperData.RtsCtrlBlckAddr->RtsNumber; - SC_OperData.HkPacket.LastRtsErrCmd = CmdOffset; + SC_OperData.HkPacket.Payload.LastRtsErrSeq = SC_OperData.RtsCtrlBlckAddr->RtsNumber; + SC_OperData.HkPacket.Payload.LastRtsErrCmd = CmdOffset; /* ** Stop the RTS from executing @@ -257,10 +257,10 @@ void SC_GetNextRtsCommand(void) { /* the command length is too large */ /* update the error information */ - SC_OperData.HkPacket.RtsCmdErrCtr++; + SC_OperData.HkPacket.Payload.RtsCmdErrCtr++; SC_OperData.RtsInfoTblAddr[RtsIndex].CmdErrCtr++; - SC_OperData.HkPacket.LastRtsErrSeq = SC_OperData.RtsCtrlBlckAddr->RtsNumber; - SC_OperData.HkPacket.LastRtsErrCmd = CmdOffset; + SC_OperData.HkPacket.Payload.LastRtsErrSeq = SC_OperData.RtsCtrlBlckAddr->RtsNumber; + SC_OperData.HkPacket.Payload.LastRtsErrCmd = CmdOffset; /* Stop the RTS from executing */ SC_KillRts(RtsIndex); diff --git a/fsw/src/sc_utils.c b/fsw/src/sc_utils.c index 1984fc7..10aa943 100644 --- a/fsw/src/sc_utils.c +++ b/fsw/src/sc_utils.c @@ -169,7 +169,7 @@ bool SC_VerifyCmdLength(const CFE_MSG_Message_t *Msg, size_t ExpectedLength) Result = false; if (CFE_SB_MsgIdToValue(MessageID) == SC_CMD_MID) { - SC_OperData.HkPacket.CmdErrCtr++; + SC_OperData.HkPacket.Payload.CmdErrCtr++; } } return (Result); diff --git a/fsw/tables/sc_ats1.c b/fsw/tables/sc_ats1.c index d6ff6ce..098fb18 100644 --- a/fsw/tables/sc_ats1.c +++ b/fsw/tables/sc_ats1.c @@ -101,19 +101,19 @@ SC_AtsTable1_t SC_Ats1 = { .ats.cmd1.CmdHeader = CFE_MSG_CMD_HDR_INIT(SC_CMD_MID, SC_MEMBER_SIZE(cmd1), SC_NOOP_CC, SC_NOOP_CKSUM), /* 2 */ - .ats.hdr2.CmdNumber = 2, - .ats.hdr2.TimeTag_MS = SC_CMD2_TIME >> 16, - .ats.hdr2.TimeTag_LS = SC_CMD2_TIME & 0xFFFF, - .ats.cmd2.CmdHeader = + .ats.hdr2.CmdNumber = 2, + .ats.hdr2.TimeTag_MS = SC_CMD2_TIME >> 16, + .ats.hdr2.TimeTag_LS = SC_CMD2_TIME & 0xFFFF, + .ats.cmd2.CmdHeader = CFE_MSG_CMD_HDR_INIT(SC_CMD_MID, SC_MEMBER_SIZE(cmd2), SC_ENABLE_RTS_CC, SC_ENABLE_RTS1_CKSUM), - .ats.cmd2.RtsId = 1, + .ats.cmd2.Payload.RtsId = 1, /* 3 */ - .ats.hdr3.CmdNumber = 3, - .ats.hdr3.TimeTag_MS = SC_CMD3_TIME >> 16, - .ats.hdr3.TimeTag_LS = SC_CMD3_TIME & 0xFFFF, - .ats.cmd3.CmdHeader = CFE_MSG_CMD_HDR_INIT(SC_CMD_MID, SC_MEMBER_SIZE(cmd3), SC_START_RTS_CC, SC_START_RTS1_CKSUM), - .ats.cmd3.RtsId = 1, + .ats.hdr3.CmdNumber = 3, + .ats.hdr3.TimeTag_MS = SC_CMD3_TIME >> 16, + .ats.hdr3.TimeTag_LS = SC_CMD3_TIME & 0xFFFF, + .ats.cmd3.CmdHeader = CFE_MSG_CMD_HDR_INIT(SC_CMD_MID, SC_MEMBER_SIZE(cmd3), SC_START_RTS_CC, SC_START_RTS1_CKSUM), + .ats.cmd3.Payload.RtsId = 1, /* 4 */ .ats.hdr4.CmdNumber = 4, diff --git a/fsw/tables/sc_rts001.c b/fsw/tables/sc_rts001.c index 6f666a4..4cba159 100644 --- a/fsw/tables/sc_rts001.c +++ b/fsw/tables/sc_rts001.c @@ -82,15 +82,15 @@ SC_RtsTable001_t SC_Rts001 = { .rts.cmd1.CmdHeader = CFE_MSG_CMD_HDR_INIT(SC_CMD_MID, SC_MEMBER_SIZE(cmd1), SC_NOOP_CC, SC_NOOP_CKSUM), /* 2 */ - .rts.hdr2.TimeTag = 5, - .rts.cmd2.CmdHeader = + .rts.hdr2.TimeTag = 5, + .rts.cmd2.CmdHeader = CFE_MSG_CMD_HDR_INIT(SC_CMD_MID, SC_MEMBER_SIZE(cmd2), SC_ENABLE_RTS_CC, SC_ENABLE_RTS2_CKSUM), - .rts.cmd2.RtsId = 2, + .rts.cmd2.Payload.RtsId = 2, /* 3 */ - .rts.hdr3.TimeTag = 5, - .rts.cmd3.CmdHeader = CFE_MSG_CMD_HDR_INIT(SC_CMD_MID, SC_MEMBER_SIZE(cmd3), SC_START_RTS_CC, SC_START_RTS2_CKSUM), - .rts.cmd3.RtsId = 2}; + .rts.hdr3.TimeTag = 5, + .rts.cmd3.CmdHeader = CFE_MSG_CMD_HDR_INIT(SC_CMD_MID, SC_MEMBER_SIZE(cmd3), SC_START_RTS_CC, SC_START_RTS2_CKSUM), + .rts.cmd3.Payload.RtsId = 2}; /* Macro for table structure */ CFE_TBL_FILEDEF(SC_Rts001, SC.RTS_TBL001, SC Example RTS_TBL001, sc_rts001.tbl) diff --git a/unit-test/sc_app_tests.c b/unit-test/sc_app_tests.c index c6bba1e..07a0ab6 100644 --- a/unit-test/sc_app_tests.c +++ b/unit-test/sc_app_tests.c @@ -276,7 +276,7 @@ void SC_AppInit_Test_NominalPowerOnReset(void) Expected_SC_OperData.AtsCmdStatusHandle[0] = 0; Expected_SC_OperData.AtsCmdStatusHandle[1] = 0; - Expected_SC_OperData.HkPacket.ContinueAtsOnFailureFlag = 1; + Expected_SC_OperData.HkPacket.Payload.ContinueAtsOnFailureFlag = 1; UtAssert_MemCmp(&SC_OperData.CmdPipe, &Expected_SC_OperData.CmdPipe, sizeof(Expected_SC_OperData.CmdPipe), "2"); UtAssert_MemCmp(&SC_OperData.AtsInfoHandle, &Expected_SC_OperData.AtsInfoHandle, @@ -346,7 +346,7 @@ void SC_AppInit_Test_Nominal(void) Expected_SC_AppData.NextCmdTime[SC_RTP] = SC_MAX_TIME; Expected_SC_AppData.AutoStartRTS = RTS_ID_AUTO_PROCESSOR; - Expected_SC_OperData.HkPacket.ContinueAtsOnFailureFlag = 1; + Expected_SC_OperData.HkPacket.Payload.ContinueAtsOnFailureFlag = 1; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); diff --git a/unit-test/sc_atsrq_tests.c b/unit-test/sc_atsrq_tests.c index bf4a3c9..27b4afe 100644 --- a/unit-test/sc_atsrq_tests.c +++ b/unit-test/sc_atsrq_tests.c @@ -91,7 +91,7 @@ void SC_StartAtsCmd_Test_NominalA(void) SC_InitTables(); - UT_CmdBuf.StartAtsCmd.AtsId = 1; + UT_CmdBuf.StartAtsCmd.Payload.AtsId = 1; SC_OperData.AtsInfoTblAddr[0].NumberOfCommands = 1; SC_OperData.AtsCtrlBlckAddr->AtpState = SC_IDLE; @@ -101,7 +101,7 @@ void SC_StartAtsCmd_Test_NominalA(void) /* Verify results */ UtAssert_True(SC_OperData.AtsCtrlBlckAddr->AtpState == SC_EXECUTING, "SC_OperData.AtsCtrlBlckAddr->AtpState == SC_EXECUTING"); - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, SC_STARTATS_CMD_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventType, CFE_EVS_EventType_INFORMATION); @@ -133,7 +133,7 @@ void SC_StartAtsCmd_Test_NominalB(void) SC_InitTables(); - UT_CmdBuf.StartAtsCmd.AtsId = 2; + UT_CmdBuf.StartAtsCmd.Payload.AtsId = 2; SC_OperData.AtsInfoTblAddr[1].NumberOfCommands = 1; SC_OperData.AtsCtrlBlckAddr->AtpState = SC_IDLE; @@ -143,7 +143,7 @@ void SC_StartAtsCmd_Test_NominalB(void) /* Verify results */ UtAssert_True(SC_OperData.AtsCtrlBlckAddr->AtpState == SC_EXECUTING, "SC_OperData.AtsCtrlBlckAddr->AtpState == SC_EXECUTING"); - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, SC_STARTATS_CMD_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventType, CFE_EVS_EventType_INFORMATION); @@ -179,7 +179,7 @@ void SC_StartAtsCmd_Test_CouldNotStart(void) SC_InitTables(); - UT_CmdBuf.StartAtsCmd.AtsId = 1; + UT_CmdBuf.StartAtsCmd.Payload.AtsId = 1; SC_OperData.AtsInfoTblAddr[0].NumberOfCommands = 1; SC_OperData.AtsCtrlBlckAddr->AtpState = SC_IDLE; @@ -190,7 +190,7 @@ void SC_StartAtsCmd_Test_CouldNotStart(void) SC_StartAtsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ATS_SKP_ALL_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -224,14 +224,14 @@ void SC_StartAtsCmd_Test_NoCommandsA(void) SC_InitTables(); - UT_CmdBuf.StartAtsCmd.AtsId = 1; + UT_CmdBuf.StartAtsCmd.Payload.AtsId = 1; SC_OperData.AtsInfoTblAddr[0].NumberOfCommands = 0; /* Execute the function being tested */ SC_StartAtsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTATS_CMD_NOT_LDED_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -265,14 +265,14 @@ void SC_StartAtsCmd_Test_NoCommandsB(void) SC_InitTables(); - UT_CmdBuf.StartAtsCmd.AtsId = 2; + UT_CmdBuf.StartAtsCmd.Payload.AtsId = 2; SC_OperData.AtsInfoTblAddr[1].NumberOfCommands = 0; /* Execute the function being tested */ SC_StartAtsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTATS_CMD_NOT_LDED_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -306,14 +306,14 @@ void SC_StartAtsCmd_Test_InUse(void) SC_InitTables(); - UT_CmdBuf.StartAtsCmd.AtsId = 1; + UT_CmdBuf.StartAtsCmd.Payload.AtsId = 1; SC_OperData.AtsCtrlBlckAddr->AtpState = SC_EXECUTING; /* Execute the function being tested */ SC_StartAtsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTATS_CMD_NOT_IDLE_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -347,14 +347,14 @@ void SC_StartAtsCmd_Test_InvalidAtsId(void) SC_InitTables(); - UT_CmdBuf.StartAtsCmd.AtsId = 99; + UT_CmdBuf.StartAtsCmd.Payload.AtsId = 99; SC_OperData.AtsCtrlBlckAddr->AtpState = SC_EXECUTING; /* Execute the function being tested */ SC_StartAtsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTATS_CMD_INVLD_ID_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -388,14 +388,14 @@ void SC_StartAtsCmd_Test_InvalidAtsIdZero(void) SC_InitTables(); - UT_CmdBuf.StartAtsCmd.AtsId = 0; + UT_CmdBuf.StartAtsCmd.Payload.AtsId = 0; SC_OperData.AtsCtrlBlckAddr->AtpState = SC_EXECUTING; /* Execute the function being tested */ SC_StartAtsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTATS_CMD_INVLD_ID_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -460,7 +460,7 @@ void SC_StopAtsCmd_Test_NominalA(void) SC_StopAtsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPATS_CMD_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); @@ -500,7 +500,7 @@ void SC_StopAtsCmd_Test_NominalB(void) SC_StopAtsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPATS_CMD_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); @@ -540,7 +540,7 @@ void SC_StopAtsCmd_Test_NoRunningAts(void) SC_StopAtsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPATS_NO_ATS_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); @@ -766,7 +766,7 @@ void SC_GroundSwitchCmd_Test_Nominal(void) /* Verify results */ UtAssert_True(SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == true, "SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == true"); - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_SWITCH_ATS_CMD_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); @@ -808,7 +808,7 @@ void SC_GroundSwitchCmd_Test_DestinationAtsNotLoaded(void) /* Verify results */ UtAssert_True(SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false, "SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false"); - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_SWITCH_ATS_CMD_NOT_LDED_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -849,7 +849,7 @@ void SC_GroundSwitchCmd_Test_AtpIdle(void) /* Verify results */ UtAssert_True(SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false, "SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false"); - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_SWITCH_ATS_CMD_IDLE_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1171,7 +1171,7 @@ void SC_InlineSwitch_Test_NominalA(void) UtAssert_True(SC_OperData.AtsCtrlBlckAddr->AtpState == SC_STARTING, "SC_OperData.AtsCtrlBlckAddr->AtpState == SC_STARTING"); - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_True(SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false, "SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false"); @@ -1222,7 +1222,7 @@ void SC_InlineSwitch_Test_NominalB(void) UtAssert_True(SC_OperData.AtsCtrlBlckAddr->AtpState == SC_STARTING, "SC_OperData.AtsCtrlBlckAddr->AtpState == SC_STARTING"); - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_True(SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false, "SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false"); @@ -1266,7 +1266,7 @@ void SC_InlineSwitch_Test_AllCommandsSkipped(void) /* Verify results */ UtAssert_True(Result == false, "Result == false"); - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_True(SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false, "SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false"); @@ -1304,7 +1304,7 @@ void SC_InlineSwitch_Test_DestinationAtsNotLoaded(void) /* Verify results */ UtAssert_True(Result == false, "Result == false"); - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_True(SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false, "SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false"); @@ -1372,7 +1372,7 @@ void SC_JumpAtsCmd_Test_SkipOneCmd(void) "SC_OperData.AtsCtrlBlckAddr->CmdNumber == SC_AppData.AtsTimeIndexBuffer[AtsIndex][0]"); UtAssert_True(SC_OperData.AtsCtrlBlckAddr->TimeIndexPtr == 1, "SC_OperData.AtsCtrlBlckAddr->TimeIndexPtr == 1"); UtAssert_True(SC_AppData.NextCmdTime[0] == 0, "SC_AppData.NextCmdTime[0] == 0"); - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, SC_JUMP_ATS_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventType, CFE_EVS_EventType_INFORMATION); @@ -1434,7 +1434,7 @@ void SC_JumpAtsCmd_Test_AllCommandsSkipped(void) SC_JumpAtsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_JUMPATS_CMD_STOPPED_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1476,7 +1476,7 @@ void SC_JumpAtsCmd_Test_NoRunningAts(void) SC_JumpAtsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_JUMPATS_CMD_NOT_ACT_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1537,7 +1537,7 @@ void SC_JumpAtsCmd_Test_AtsNotLoaded(void) "SC_OperData.AtsCtrlBlckAddr->CmdNumber == SC_AppData.AtsTimeIndexBuffer[AtsIndex][0]"); UtAssert_True(SC_OperData.AtsCtrlBlckAddr->TimeIndexPtr == 1, "SC_OperData.AtsCtrlBlckAddr->TimeIndexPtr == 1"); UtAssert_True(SC_AppData.NextCmdTime[0] == 0, "SC_AppData.NextCmdTime[0] == 0"); - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, SC_JUMP_ATS_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventType, CFE_EVS_EventType_INFORMATION); @@ -1602,15 +1602,15 @@ void ContinueAtsOnFailureCmd_Test_Nominal(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - UT_CmdBuf.SetContinueAtsOnFailureCmd.ContinueState = true; + UT_CmdBuf.SetContinueAtsOnFailureCmd.Payload.ContinueState = true; /* Execute the function being tested */ SC_ContinueAtsOnFailureCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.ContinueAtsOnFailureFlag == true, - "SC_OperData.HkPacket.ContinueAtsOnFailureFlag == true"); - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.ContinueAtsOnFailureFlag == true, + "SC_OperData.HkPacket.Payload.ContinueAtsOnFailureFlag == true"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_CONT_CMD_DEB_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); @@ -1646,15 +1646,15 @@ void ContinueAtsOnFailureCmd_Test_FalseState(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - UT_CmdBuf.SetContinueAtsOnFailureCmd.ContinueState = false; + UT_CmdBuf.SetContinueAtsOnFailureCmd.Payload.ContinueState = false; /* Execute the function being tested */ SC_ContinueAtsOnFailureCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.ContinueAtsOnFailureFlag == false, - "SC_OperData.HkPacket.ContinueAtsOnFailureFlag == false"); - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.ContinueAtsOnFailureFlag == false, + "SC_OperData.HkPacket.Payload.ContinueAtsOnFailureFlag == false"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_CONT_CMD_DEB_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); @@ -1691,13 +1691,13 @@ void ContinueAtsOnFailureCmd_Test_InvalidState(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - UT_CmdBuf.SetContinueAtsOnFailureCmd.ContinueState = 99; + UT_CmdBuf.SetContinueAtsOnFailureCmd.Payload.ContinueState = 99; /* Execute the function being tested */ SC_ContinueAtsOnFailureCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_CONT_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1768,16 +1768,16 @@ void SC_AppendAtsCmd_Test_Nominal(void) Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; Entry->CmdNumber = 1; - UT_CmdBuf.AppendAtsCmd.AtsId = 1; + UT_CmdBuf.AppendAtsCmd.Payload.AtsId = 1; SC_OperData.AtsInfoTblAddr[AtsIndex].NumberOfCommands = 1; - SC_OperData.HkPacket.AppendEntryCount = 1; + SC_OperData.HkPacket.Payload.AppendEntryCount = 1; /* Execute the function being tested */ SC_AppendAtsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.AppendCmdArg == 1, "SC_OperData.HkPacket.AppendCmdArg == 1"); - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.AppendCmdArg == 1, "SC_OperData.HkPacket.Payload.AppendCmdArg == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_APPEND_CMD_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); @@ -1813,14 +1813,14 @@ void SC_AppendAtsCmd_Test_InvalidAtsId(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - UT_CmdBuf.AppendAtsCmd.AtsId = 99; - SC_OperData.HkPacket.AppendEntryCount = 1; + UT_CmdBuf.AppendAtsCmd.Payload.AtsId = 99; + SC_OperData.HkPacket.Payload.AppendEntryCount = 1; /* Execute the function being tested */ SC_AppendAtsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_APPEND_CMD_ARG_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1856,14 +1856,14 @@ void SC_AppendAtsCmd_Test_InvalidAtsIdZero(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - UT_CmdBuf.AppendAtsCmd.AtsId = 0; - SC_OperData.HkPacket.AppendEntryCount = 1; + UT_CmdBuf.AppendAtsCmd.Payload.AtsId = 0; + SC_OperData.HkPacket.Payload.AppendEntryCount = 1; /* Execute the function being tested */ SC_AppendAtsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_APPEND_CMD_ARG_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1900,15 +1900,15 @@ void SC_AppendAtsCmd_Test_AtsTableEmpty(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - UT_CmdBuf.AppendAtsCmd.AtsId = 1; - SC_OperData.HkPacket.AppendEntryCount = 1; + UT_CmdBuf.AppendAtsCmd.Payload.AtsId = 1; + SC_OperData.HkPacket.Payload.AppendEntryCount = 1; SC_OperData.AtsInfoTblAddr[AtsIndex].NumberOfCommands = 0; /* Execute the function being tested */ SC_AppendAtsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_APPEND_CMD_TGT_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1945,15 +1945,15 @@ void SC_AppendAtsCmd_Test_AppendTableEmpty(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - UT_CmdBuf.AppendAtsCmd.AtsId = 1; - SC_OperData.HkPacket.AppendEntryCount = 0; + UT_CmdBuf.AppendAtsCmd.Payload.AtsId = 1; + SC_OperData.HkPacket.Payload.AppendEntryCount = 0; SC_OperData.AtsInfoTblAddr[AtsIndex].NumberOfCommands = 1; /* Execute the function being tested */ SC_AppendAtsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_APPEND_CMD_SRC_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1991,8 +1991,8 @@ void SC_AppendAtsCmd_Test_NoRoomForAppendInAts(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - UT_CmdBuf.AppendAtsCmd.AtsId = 1; - SC_OperData.HkPacket.AppendEntryCount = 1; + UT_CmdBuf.AppendAtsCmd.Payload.AtsId = 1; + SC_OperData.HkPacket.Payload.AppendEntryCount = 1; SC_OperData.AtsInfoTblAddr[AtsIndex].NumberOfCommands = 1; SC_OperData.AtsInfoTblAddr[AtsIndex].AtsSize = SC_ATS_BUFF_SIZE; SC_AppData.AppendWordCount = SC_ATS_BUFF_SIZE; @@ -2001,7 +2001,7 @@ void SC_AppendAtsCmd_Test_NoRoomForAppendInAts(void) SC_AppendAtsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_APPEND_CMD_FIT_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); diff --git a/unit-test/sc_cmds_tests.c b/unit-test/sc_cmds_tests.c index f79438d..44dfc3e 100644 --- a/unit-test/sc_cmds_tests.c +++ b/unit-test/sc_cmds_tests.c @@ -110,8 +110,8 @@ void SC_ProcessAtpCmd_Test_SwitchCmd(void) SC_ProcessAtpCmd(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 1, "SC_OperData.HkPacket.AtsCmdCtr == 1"); - UtAssert_True(SC_OperData.HkPacket.AtsCmdErrCtr == 0, "SC_OperData.HkPacket.AtsCmdErrCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdCtr == 1, "SC_OperData.HkPacket.Payload.AtsCmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdErrCtr == 0, "SC_OperData.HkPacket.Payload.AtsCmdErrCtr == 0"); UtAssert_True(SC_OperData.NumCmdsSec == 1, "SC_OperData.NumCmdsSec == 1"); UtAssert_True(SC_OperData.AtsCmdStatusTblAddr[0][0] == SC_EXECUTED, "SC_OperData.AtsCmdStatusTblAddr[0][0] == SC_EXECUTED"); @@ -172,8 +172,8 @@ void SC_ProcessAtpCmd_Test_NonSwitchCmd(void) SC_ProcessAtpCmd(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 1, "SC_OperData.HkPacket.AtsCmdCtr == 1"); - UtAssert_True(SC_OperData.HkPacket.AtsCmdErrCtr == 0, "SC_OperData.HkPacket.AtsCmdErrCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdCtr == 1, "SC_OperData.HkPacket.Payload.AtsCmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdErrCtr == 0, "SC_OperData.HkPacket.Payload.AtsCmdErrCtr == 0"); UtAssert_True(SC_OperData.NumCmdsSec == 1, "SC_OperData.NumCmdsSec == 1"); UtAssert_True(SC_OperData.AtsCmdStatusTblAddr[0][0] == SC_EXECUTED, "SC_OperData.AtsCmdStatusTblAddr[0][0] == SC_EXECUTED"); @@ -234,13 +234,13 @@ void SC_ProcessAtpCmd_Test_InlineSwitchError(void) SC_ProcessAtpCmd(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 0, "SC_OperData.HkPacket.AtsCmdCtr == 0"); - UtAssert_True(SC_OperData.HkPacket.AtsCmdErrCtr == 1, "SC_OperData.HkPacket.AtsCmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdCtr == 0, "SC_OperData.HkPacket.Payload.AtsCmdCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdErrCtr == 1, "SC_OperData.HkPacket.Payload.AtsCmdErrCtr == 1"); UtAssert_True(SC_OperData.NumCmdsSec == 1, "SC_OperData.NumCmdsSec == 1"); UtAssert_True(SC_OperData.AtsCmdStatusTblAddr[0][0] == SC_FAILED_DISTRIB, "SC_OperData.AtsCmdStatusTblAddr[0][0] == SC_FAILED_DISTRIB"); - UtAssert_True(SC_OperData.HkPacket.LastAtsErrSeq == 1, "SC_OperData.HkPacket.LastAtsErrSeq == 1"); - UtAssert_True(SC_OperData.HkPacket.LastAtsErrCmd == 1, "SC_OperData.HkPacket.LastAtsErrCmd == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastAtsErrSeq == 1, "SC_OperData.HkPacket.Payload.LastAtsErrSeq == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastAtsErrCmd == 1, "SC_OperData.HkPacket.Payload.LastAtsErrCmd == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); @@ -304,13 +304,13 @@ void SC_ProcessAtpCmd_Test_SBErrorAtsA(void) SC_ProcessAtpCmd(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 0, "SC_OperData.HkPacket.AtsCmdCtr == 0"); - UtAssert_True(SC_OperData.HkPacket.AtsCmdErrCtr == 1, "SC_OperData.HkPacket.AtsCmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdCtr == 0, "SC_OperData.HkPacket.Payload.AtsCmdCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdErrCtr == 1, "SC_OperData.HkPacket.Payload.AtsCmdErrCtr == 1"); UtAssert_True(SC_OperData.NumCmdsSec == 1, "SC_OperData.NumCmdsSec == 1"); UtAssert_True(SC_OperData.AtsCmdStatusTblAddr[0][0] == SC_FAILED_DISTRIB, "SC_OperData.AtsCmdStatusTblAddr[0][0] == SC_FAILED_DISTRIB"); - UtAssert_True(SC_OperData.HkPacket.LastAtsErrSeq == SC_ATSA, "SC_OperData.HkPacket.LastAtsErrSeq == SC_ATSA"); - UtAssert_True(SC_OperData.HkPacket.LastAtsErrCmd == 1, "SC_OperData.HkPacket.LastAtsErrCmd == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastAtsErrSeq == SC_ATSA, "SC_OperData.HkPacket.Payload.LastAtsErrSeq == SC_ATSA"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastAtsErrCmd == 1, "SC_OperData.HkPacket.Payload.LastAtsErrCmd == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ATS_DIST_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -390,13 +390,13 @@ void SC_ProcessAtpCmd_Test_SBErrorAtsB(void) SC_ProcessAtpCmd(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 0, "SC_OperData.HkPacket.AtsCmdCtr == 0"); - UtAssert_True(SC_OperData.HkPacket.AtsCmdErrCtr == 1, "SC_OperData.HkPacket.AtsCmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdCtr == 0, "SC_OperData.HkPacket.Payload.AtsCmdCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdErrCtr == 1, "SC_OperData.HkPacket.Payload.AtsCmdErrCtr == 1"); UtAssert_True(SC_OperData.NumCmdsSec == 1, "SC_OperData.NumCmdsSec == 1"); UtAssert_True(SC_OperData.AtsCmdStatusTblAddr[1][0] == SC_FAILED_DISTRIB, "SC_OperData.AtsCmdStatusTblAddr[0][0] == SC_FAILED_DISTRIB"); - UtAssert_True(SC_OperData.HkPacket.LastAtsErrSeq == SC_ATSB, "SC_OperData.HkPacket.LastAtsErrSeq == SC_ATSB"); - UtAssert_True(SC_OperData.HkPacket.LastAtsErrCmd == 1, "SC_OperData.HkPacket.LastAtsErrCmd == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastAtsErrSeq == SC_ATSB, "SC_OperData.HkPacket.Payload.LastAtsErrSeq == SC_ATSB"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastAtsErrCmd == 1, "SC_OperData.HkPacket.Payload.LastAtsErrCmd == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ATS_DIST_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -462,7 +462,7 @@ void SC_ProcessAtpCmd_Test_ChecksumFailedAtsA(void) SC_OperData.AtsCmdStatusTblAddr[0][0] = SC_LOADED; SC_AppData.AtsCmdIndexBuffer[0][0] = 0; - SC_OperData.HkPacket.ContinueAtsOnFailureFlag = false; + SC_OperData.HkPacket.Payload.ContinueAtsOnFailureFlag = false; /* Set to return false in order to generate error message SC_ATS_CHKSUM_ERR_EID */ ChecksumValid = false; @@ -479,10 +479,10 @@ void SC_ProcessAtpCmd_Test_ChecksumFailedAtsA(void) SC_ProcessAtpCmd(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 0, "SC_OperData.HkPacket.AtsCmdCtr == 0"); - UtAssert_True(SC_OperData.HkPacket.AtsCmdErrCtr == 1, "SC_OperData.HkPacket.AtsCmdErrCtr == 1"); - UtAssert_True(SC_OperData.HkPacket.LastAtsErrSeq == SC_ATSA, "SC_OperData.HkPacket.LastAtsErrSeq == SC_ATSA"); - UtAssert_True(SC_OperData.HkPacket.LastAtsErrCmd == 1, "SC_OperData.HkPacket.LastAtsErrCmd == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdCtr == 0, "SC_OperData.HkPacket.Payload.AtsCmdCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdErrCtr == 1, "SC_OperData.HkPacket.Payload.AtsCmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastAtsErrSeq == SC_ATSA, "SC_OperData.HkPacket.Payload.LastAtsErrSeq == SC_ATSA"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastAtsErrCmd == 1, "SC_OperData.HkPacket.Payload.LastAtsErrCmd == 1"); UtAssert_True(SC_OperData.AtsCmdStatusTblAddr[0][0] == SC_FAILED_CHECKSUM, "SC_OperData.AtsCmdStatusTblAddr[1][0] == SC_FAILED_CHECKSUM"); @@ -548,7 +548,7 @@ void SC_ProcessAtpCmd_Test_ChecksumFailedAtsB(void) SC_OperData.AtsCmdStatusTblAddr[1][0] = SC_LOADED; SC_AppData.AtsCmdIndexBuffer[1][0] = 0; - SC_OperData.HkPacket.ContinueAtsOnFailureFlag = false; + SC_OperData.HkPacket.Payload.ContinueAtsOnFailureFlag = false; /* Set to return false in order to generate error message SC_ATS_CHKSUM_ERR_EID */ ChecksumValid = false; @@ -565,10 +565,10 @@ void SC_ProcessAtpCmd_Test_ChecksumFailedAtsB(void) SC_ProcessAtpCmd(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 0, "SC_OperData.HkPacket.AtsCmdCtr == 0"); - UtAssert_True(SC_OperData.HkPacket.AtsCmdErrCtr == 1, "SC_OperData.HkPacket.AtsCmdErrCtr == 1"); - UtAssert_True(SC_OperData.HkPacket.LastAtsErrSeq == SC_ATSB, "SC_OperData.HkPacket.LastAtsErrSeq == SC_ATSB"); - UtAssert_True(SC_OperData.HkPacket.LastAtsErrCmd == 1, "SC_OperData.HkPacket.LastAtsErrCmd == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdCtr == 0, "SC_OperData.HkPacket.Payload.AtsCmdCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdErrCtr == 1, "SC_OperData.HkPacket.Payload.AtsCmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastAtsErrSeq == SC_ATSB, "SC_OperData.HkPacket.Payload.LastAtsErrSeq == SC_ATSB"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastAtsErrCmd == 1, "SC_OperData.HkPacket.Payload.LastAtsErrCmd == 1"); UtAssert_True(SC_OperData.AtsCmdStatusTblAddr[1][0] == SC_FAILED_CHECKSUM, "SC_OperData.AtsCmdStatusTblAddr[1][0] == SC_FAILED_CHECKSUM"); @@ -634,7 +634,7 @@ void SC_ProcessAtpCmd_Test_ChecksumFailedAtsAContinue(void) SC_OperData.AtsCmdStatusTblAddr[0][0] = SC_LOADED; SC_AppData.AtsCmdIndexBuffer[0][0] = 0; - SC_OperData.HkPacket.ContinueAtsOnFailureFlag = true; + SC_OperData.HkPacket.Payload.ContinueAtsOnFailureFlag = true; /* Set to return false in order to generate error message SC_ATS_CHKSUM_ERR_EID */ ChecksumValid = false; @@ -651,10 +651,10 @@ void SC_ProcessAtpCmd_Test_ChecksumFailedAtsAContinue(void) SC_ProcessAtpCmd(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 0, "SC_OperData.HkPacket.AtsCmdCtr == 0"); - UtAssert_True(SC_OperData.HkPacket.AtsCmdErrCtr == 1, "SC_OperData.HkPacket.AtsCmdErrCtr == 1"); - UtAssert_True(SC_OperData.HkPacket.LastAtsErrSeq == SC_ATSA, "SC_OperData.HkPacket.LastAtsErrSeq == SC_ATSA"); - UtAssert_True(SC_OperData.HkPacket.LastAtsErrCmd == 1, "SC_OperData.HkPacket.LastAtsErrCmd == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdCtr == 0, "SC_OperData.HkPacket.Payload.AtsCmdCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdErrCtr == 1, "SC_OperData.HkPacket.Payload.AtsCmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastAtsErrSeq == SC_ATSA, "SC_OperData.HkPacket.Payload.LastAtsErrSeq == SC_ATSA"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastAtsErrCmd == 1, "SC_OperData.HkPacket.Payload.LastAtsErrCmd == 1"); UtAssert_True(SC_OperData.AtsCmdStatusTblAddr[0][0] == SC_FAILED_CHECKSUM, "SC_OperData.AtsCmdStatusTblAddr[1][0] == SC_FAILED_CHECKSUM"); @@ -712,10 +712,10 @@ void SC_ProcessAtpCmd_Test_CmdNumberMismatchAtsA(void) SC_ProcessAtpCmd(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 0, "SC_OperData.HkPacket.AtsCmdCtr == 0"); - UtAssert_True(SC_OperData.HkPacket.AtsCmdErrCtr == 1, "SC_OperData.HkPacket.AtsCmdErrCtr == 1"); - UtAssert_True(SC_OperData.HkPacket.LastAtsErrSeq == SC_ATSA, "SC_OperData.HkPacket.LastAtsErrSeq == SC_ATSA"); - UtAssert_True(SC_OperData.HkPacket.LastAtsErrCmd == 1, "SC_OperData.HkPacket.LastAtsErrCmd == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdCtr == 0, "SC_OperData.HkPacket.Payload.AtsCmdCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdErrCtr == 1, "SC_OperData.HkPacket.Payload.AtsCmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastAtsErrSeq == SC_ATSA, "SC_OperData.HkPacket.Payload.LastAtsErrSeq == SC_ATSA"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastAtsErrCmd == 1, "SC_OperData.HkPacket.Payload.LastAtsErrCmd == 1"); UtAssert_True(SC_OperData.AtsCmdStatusTblAddr[0][0] == SC_SKIPPED, "SC_OperData.AtsCmdStatusTblAddr[0][0] == SC_SKIPPED"); @@ -782,10 +782,10 @@ void SC_ProcessAtpCmd_Test_CmdNumberMismatchAtsB(void) SC_ProcessAtpCmd(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 0, "SC_OperData.HkPacket.AtsCmdCtr == 0"); - UtAssert_True(SC_OperData.HkPacket.AtsCmdErrCtr == 1, "SC_OperData.HkPacket.AtsCmdErrCtr == 1"); - UtAssert_True(SC_OperData.HkPacket.LastAtsErrSeq == SC_ATSB, "SC_OperData.HkPacket.LastAtsErrSeq == SC_ATSB"); - UtAssert_True(SC_OperData.HkPacket.LastAtsErrCmd == 1, "SC_OperData.HkPacket.LastAtsErrCmd == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdCtr == 0, "SC_OperData.HkPacket.Payload.AtsCmdCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdErrCtr == 1, "SC_OperData.HkPacket.Payload.AtsCmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastAtsErrSeq == SC_ATSB, "SC_OperData.HkPacket.Payload.LastAtsErrSeq == SC_ATSB"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastAtsErrCmd == 1, "SC_OperData.HkPacket.Payload.LastAtsErrCmd == 1"); UtAssert_True(SC_OperData.AtsCmdStatusTblAddr[1][0] == SC_SKIPPED, "SC_OperData.AtsCmdStatusTblAddr[1][0] == SC_SKIPPED"); @@ -851,10 +851,10 @@ void SC_ProcessAtpCmd_Test_CmdNotLoaded(void) SC_ProcessAtpCmd(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 0, "SC_OperData.HkPacket.AtsCmdCtr == 0"); - UtAssert_True(SC_OperData.HkPacket.AtsCmdErrCtr == 1, "SC_OperData.HkPacket.AtsCmdErrCtr == 1"); - UtAssert_True(SC_OperData.HkPacket.LastAtsErrSeq == SC_ATSA, "SC_OperData.HkPacket.LastAtsErrSeq == SC_ATSA"); - UtAssert_True(SC_OperData.HkPacket.LastAtsErrCmd == 1, "SC_OperData.HkPacket.LastAtsErrCmd == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdCtr == 0, "SC_OperData.HkPacket.Payload.AtsCmdCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdErrCtr == 1, "SC_OperData.HkPacket.Payload.AtsCmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastAtsErrSeq == SC_ATSA, "SC_OperData.HkPacket.Payload.LastAtsErrSeq == SC_ATSA"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastAtsErrCmd == 1, "SC_OperData.HkPacket.Payload.LastAtsErrCmd == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ATS_SKP_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -904,7 +904,7 @@ void SC_ProcessAtpCmd_Test_CompareAbsTime(void) SC_ProcessAtpCmd(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 0, "SC_OperData.HkPacket.AtsCmdCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdCtr == 0, "SC_OperData.HkPacket.Payload.AtsCmdCtr == 0"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); @@ -945,7 +945,7 @@ void SC_ProcessAtpCmd_Test_NextProcNumber(void) SC_ProcessAtpCmd(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 0, "SC_OperData.HkPacket.AtsCmdCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdCtr == 0, "SC_OperData.HkPacket.Payload.AtsCmdCtr == 0"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); @@ -986,7 +986,7 @@ void SC_ProcessAtpCmd_Test_AtpState(void) SC_ProcessAtpCmd(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 0, "SC_OperData.HkPacket.AtsCmdCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdCtr == 0, "SC_OperData.HkPacket.Payload.AtsCmdCtr == 0"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); @@ -1044,7 +1044,7 @@ void SC_ProcessAtpCmd_Test_CmdMid(void) SC_ProcessAtpCmd(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 1, "SC_OperData.HkPacket.AtsCmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdCtr == 1, "SC_OperData.HkPacket.Payload.AtsCmdCtr == 1"); UtAssert_True(SC_OperData.NumCmdsSec == 1, "SC_OperData.NumCmdsSec == 1"); UtAssert_True(SC_OperData.AtsCmdStatusTblAddr[0][0] == SC_EXECUTED, "SC_OperData.AtsCmdStatusTblAddr[0][0] == SC_EXECUTED"); @@ -1082,8 +1082,8 @@ void SC_ProcessRtpCommand_Test_Nominal(void) SC_ProcessRtpCommand(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.RtsCmdCtr == 1, "SC_OperData.HkPacket.RtsCmdCtr == 1"); - UtAssert_True(SC_OperData.HkPacket.RtsCmdErrCtr == 0, "SC_OperData.HkPacket.RtsCmdErrCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsCmdCtr == 1, "SC_OperData.HkPacket.Payload.RtsCmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsCmdErrCtr == 0, "SC_OperData.HkPacket.Payload.RtsCmdErrCtr == 0"); UtAssert_True(SC_OperData.NumCmdsSec == 1, "SC_OperData.NumCmdsSec == 1"); UtAssert_True(SC_OperData.RtsInfoTblAddr[0].CmdCtr == 1, "SC_OperData.RtsInfoTblAddr[0].CmdCtr == 1"); UtAssert_True(SC_OperData.RtsInfoTblAddr[0].CmdErrCtr == 0, "SC_OperData.RtsInfoTblAddr[0].CmdErrCtr == 0"); @@ -1129,13 +1129,13 @@ void SC_ProcessRtpCommand_Test_BadSoftwareBusReturn(void) SC_ProcessRtpCommand(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.RtsCmdCtr == 0, "SC_OperData.HkPacket.RtsCmdCtr == 0"); - UtAssert_True(SC_OperData.HkPacket.RtsCmdErrCtr == 1, "SC_OperData.HkPacket.RtsCmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsCmdCtr == 0, "SC_OperData.HkPacket.Payload.RtsCmdCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsCmdErrCtr == 1, "SC_OperData.HkPacket.Payload.RtsCmdErrCtr == 1"); UtAssert_True(SC_OperData.NumCmdsSec == 1, "SC_OperData.NumCmdsSec == 1"); UtAssert_True(SC_OperData.RtsInfoTblAddr[0].CmdCtr == 0, "SC_OperData.RtsInfoTblAddr[0].CmdCtr == 0"); UtAssert_True(SC_OperData.RtsInfoTblAddr[0].CmdErrCtr == 1, "SC_OperData.RtsInfoTblAddr[0].CmdErrCtr == 1"); - UtAssert_True(SC_OperData.HkPacket.LastRtsErrSeq == 1, "SC_OperData.HkPacket.LastRtsErrSeq == 1"); - UtAssert_True(SC_OperData.HkPacket.LastRtsErrCmd == 0, "SC_OperData.HkPacket.LastRtsErrCmd == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastRtsErrSeq == 1, "SC_OperData.HkPacket.Payload.LastRtsErrSeq == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastRtsErrCmd == 0, "SC_OperData.HkPacket.Payload.LastRtsErrCmd == 0"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_RTS_DIST_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1181,13 +1181,13 @@ void SC_ProcessRtpCommand_Test_BadChecksum(void) SC_ProcessRtpCommand(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.RtsCmdCtr == 0, "SC_OperData.HkPacket.RtsCmdCtr == 0"); - UtAssert_True(SC_OperData.HkPacket.RtsCmdErrCtr == 1, "SC_OperData.HkPacket.RtsCmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsCmdCtr == 0, "SC_OperData.HkPacket.Payload.RtsCmdCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsCmdErrCtr == 1, "SC_OperData.HkPacket.Payload.RtsCmdErrCtr == 1"); UtAssert_True(SC_OperData.NumCmdsSec == 1, "SC_OperData.NumCmdsSec == 1"); UtAssert_True(SC_OperData.RtsInfoTblAddr[0].CmdCtr == 0, "SC_OperData.RtsInfoTblAddr[0].CmdCtr == 0"); UtAssert_True(SC_OperData.RtsInfoTblAddr[0].CmdErrCtr == 1, "SC_OperData.RtsInfoTblAddr[0].CmdErrCtr == 1"); - UtAssert_True(SC_OperData.HkPacket.LastRtsErrSeq == 1, "SC_OperData.HkPacket.LastRtsErrSeq == 1"); - UtAssert_True(SC_OperData.HkPacket.LastRtsErrCmd == 0, "SC_OperData.HkPacket.LastRtsErrCmd == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastRtsErrSeq == 1, "SC_OperData.HkPacket.Payload.LastRtsErrSeq == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastRtsErrCmd == 0, "SC_OperData.HkPacket.Payload.LastRtsErrCmd == 0"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_RTS_CHKSUM_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1368,22 +1368,22 @@ void SC_SendHkPacket_Test(void) SC_InitTables(); - SC_OperData.HkPacket.CmdErrCtr = 1; - SC_OperData.HkPacket.CmdCtr = 2; - SC_OperData.HkPacket.RtsActiveErrCtr = 3; - SC_OperData.HkPacket.RtsActiveCtr = 4; - SC_OperData.HkPacket.AtsCmdCtr = 5; - SC_OperData.HkPacket.AtsCmdErrCtr = 6; - SC_OperData.HkPacket.RtsCmdCtr = 7; - SC_OperData.HkPacket.RtsCmdErrCtr = 8; - SC_OperData.HkPacket.LastAtsErrSeq = 9; - SC_OperData.HkPacket.LastAtsErrCmd = 10; - SC_OperData.HkPacket.LastRtsErrSeq = 11; - SC_OperData.HkPacket.LastRtsErrCmd = 12; - SC_OperData.HkPacket.AppendCmdArg = 13; - SC_OperData.HkPacket.AppendEntryCount = 14; + SC_OperData.HkPacket.Payload.CmdErrCtr = 1; + SC_OperData.HkPacket.Payload.CmdCtr = 2; + SC_OperData.HkPacket.Payload.RtsActiveErrCtr = 3; + SC_OperData.HkPacket.Payload.RtsActiveCtr = 4; + SC_OperData.HkPacket.Payload.AtsCmdCtr = 5; + SC_OperData.HkPacket.Payload.AtsCmdErrCtr = 6; + SC_OperData.HkPacket.Payload.RtsCmdCtr = 7; + SC_OperData.HkPacket.Payload.RtsCmdErrCtr = 8; + SC_OperData.HkPacket.Payload.LastAtsErrSeq = 9; + SC_OperData.HkPacket.Payload.LastAtsErrCmd = 10; + SC_OperData.HkPacket.Payload.LastRtsErrSeq = 11; + SC_OperData.HkPacket.Payload.LastRtsErrCmd = 12; + SC_OperData.HkPacket.Payload.AppendCmdArg = 13; + SC_OperData.HkPacket.Payload.AppendEntryCount = 14; SC_AppData.AppendWordCount = 15; - SC_OperData.HkPacket.AppendLoadCount = 16; + SC_OperData.HkPacket.Payload.AppendLoadCount = 16; SC_OperData.AtsInfoTblAddr[0].AtsSize = 0; SC_OperData.AtsInfoTblAddr[1].AtsSize = 0; SC_OperData.AtsCtrlBlckAddr->AtsNumber = 17; @@ -1394,7 +1394,7 @@ void SC_SendHkPacket_Test(void) SC_AppData.NextCmdTime[1] = 0; SC_OperData.RtsCtrlBlckAddr->NumRtsActive = 20; SC_OperData.RtsCtrlBlckAddr->RtsNumber = 21; - SC_OperData.HkPacket.ContinueAtsOnFailureFlag = 1; + SC_OperData.HkPacket.Payload.ContinueAtsOnFailureFlag = 1; for (i = 0; i < SC_NUMBER_OF_RTS - 1; i++) { @@ -1406,61 +1406,61 @@ void SC_SendHkPacket_Test(void) SC_OperData.RtsInfoTblAddr[SC_NUMBER_OF_RTS - 1].RtsStatus = 0; LastRtsHkIndex = - sizeof(SC_OperData.HkPacket.RtsExecutingStatus) / sizeof(SC_OperData.HkPacket.RtsExecutingStatus[0]) - 1; + sizeof(SC_OperData.HkPacket.Payload.RtsExecutingStatus) / sizeof(SC_OperData.HkPacket.Payload.RtsExecutingStatus[0]) - 1; /* Execute the function being tested */ SC_SendHkPacket(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 2, "SC_OperData.HkPacket.CmdCtr == 2"); - UtAssert_True(SC_OperData.HkPacket.RtsActiveErrCtr == 3, "SC_OperData.HkPacket.RtsActiveErrCtr == 3"); - UtAssert_True(SC_OperData.HkPacket.RtsActiveCtr == 4, "SC_OperData.HkPacket.RtsActiveCtr == 4"); - UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 5, "SCSC_OperData.HkPacket.AtsCmdCtr == 5"); - UtAssert_True(SC_OperData.HkPacket.AtsCmdErrCtr == 6, "SC_OperData.HkPacket.AtsCmdErrCtr == 6"); - UtAssert_True(SC_OperData.HkPacket.RtsCmdCtr == 7, "SC_OperData.HkPacket.RtsCmdCtr == 7"); - UtAssert_True(SC_OperData.HkPacket.RtsCmdErrCtr == 8, "SC_OperData.HkPacket.RtsCmdErrCtr == 8"); - UtAssert_True(SC_OperData.HkPacket.LastAtsErrSeq == 9, "SC_OperData.HkPacket.LastAtsErrSeq == 9"); - UtAssert_True(SC_OperData.HkPacket.LastAtsErrCmd == 10, "SC_OperData.HkPacket.LastAtsErrCmd == 10"); - UtAssert_True(SC_OperData.HkPacket.LastRtsErrSeq == 11, "SC_OperData.HkPacket.LastRtsErrSeq == 11"); - UtAssert_True(SC_OperData.HkPacket.LastRtsErrCmd == 12, "SC_OperData.HkPacket.LastRtsErrCmd == 12"); - UtAssert_True(SC_OperData.HkPacket.AppendCmdArg == 13, "SC_OperData.HkPacket.AppendCmdArg == 13"); - UtAssert_True(SC_OperData.HkPacket.AppendEntryCount == 14, "SC_OperData.HkPacket.AppendEntryCount == 14"); - UtAssert_True(SC_OperData.HkPacket.AppendLoadCount == 16, "SC_OperData.HkPacket.AppendLoadCount == 16"); - UtAssert_True(SC_OperData.HkPacket.AtpFreeBytes[0] == + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 2, "SC_OperData.HkPacket.Payload.CmdCtr == 2"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsActiveErrCtr == 3, "SC_OperData.HkPacket.Payload.RtsActiveErrCtr == 3"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsActiveCtr == 4, "SC_OperData.HkPacket.Payload.RtsActiveCtr == 4"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdCtr == 5, "SCSC_OperData.HkPacket.Payload.AtsCmdCtr == 5"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdErrCtr == 6, "SC_OperData.HkPacket.Payload.AtsCmdErrCtr == 6"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsCmdCtr == 7, "SC_OperData.HkPacket.Payload.RtsCmdCtr == 7"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsCmdErrCtr == 8, "SC_OperData.HkPacket.Payload.RtsCmdErrCtr == 8"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastAtsErrSeq == 9, "SC_OperData.HkPacket.Payload.LastAtsErrSeq == 9"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastAtsErrCmd == 10, "SC_OperData.HkPacket.Payload.LastAtsErrCmd == 10"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastRtsErrSeq == 11, "SC_OperData.HkPacket.Payload.LastRtsErrSeq == 11"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastRtsErrCmd == 12, "SC_OperData.HkPacket.Payload.LastRtsErrCmd == 12"); + UtAssert_True(SC_OperData.HkPacket.Payload.AppendCmdArg == 13, "SC_OperData.HkPacket.Payload.AppendCmdArg == 13"); + UtAssert_True(SC_OperData.HkPacket.Payload.AppendEntryCount == 14, "SC_OperData.HkPacket.Payload.AppendEntryCount == 14"); + UtAssert_True(SC_OperData.HkPacket.Payload.AppendLoadCount == 16, "SC_OperData.HkPacket.Payload.AppendLoadCount == 16"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtpFreeBytes[0] == (SC_ATS_BUFF_SIZE32 * SC_BYTES_IN_WORD) - (SC_OperData.AtsInfoTblAddr[0].AtsSize * SC_BYTES_IN_WORD), - "SC_OperData.HkPacket.AtpFreeBytes[0] == (SC_ATS_BUFF_SIZE32 * SC_BYTES_IN_WORD)"); - UtAssert_True(SC_OperData.HkPacket.AtpFreeBytes[1] == + "SC_OperData.HkPacket.Payload.AtpFreeBytes[0] == (SC_ATS_BUFF_SIZE32 * SC_BYTES_IN_WORD)"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtpFreeBytes[1] == (SC_ATS_BUFF_SIZE32 * SC_BYTES_IN_WORD) - (SC_OperData.AtsInfoTblAddr[1].AtsSize * SC_BYTES_IN_WORD), - "SC_OperData.HkPacket.AtpFreeBytes[1] == (SC_ATS_BUFF_SIZE32 * SC_BYTES_IN_WORD)"); - UtAssert_True(SC_OperData.HkPacket.AtsNumber == 17, "SC_OperData.HkPacket.AtsNumber == 17"); - UtAssert_True(SC_OperData.HkPacket.AtpState == 18, "SC_OperData.HkPacket.AtpState == 18"); - UtAssert_True(SC_OperData.HkPacket.AtpCmdNumber == 19, "SC_OperData.HkPacket.AtpCmdNumber == 19"); - UtAssert_True(SC_OperData.HkPacket.SwitchPendFlag == 0, "SC_OperData.HkPacket.SwitchPendFlag == 0"); - UtAssert_True(SC_OperData.HkPacket.NextAtsTime == 0, "SC_OperData.HkPacket.NextAtsTime == 0"); - UtAssert_True(SC_OperData.HkPacket.NumRtsActive == 20, "SC_OperData.HkPacket.NumRtsActive == 20"); - UtAssert_True(SC_OperData.HkPacket.RtsNumber == 21, "SC_OperData.HkPacket.RtsNumber == 21"); - UtAssert_True(SC_OperData.HkPacket.NextRtsTime == 0, "SC_OperData.HkPacket.NextRtsTime == 0"); - UtAssert_True(SC_OperData.HkPacket.ContinueAtsOnFailureFlag == 1, - "SC_OperData.HkPacket.ContinueAtsOnFailureFlag == 1"); + "SC_OperData.HkPacket.Payload.AtpFreeBytes[1] == (SC_ATS_BUFF_SIZE32 * SC_BYTES_IN_WORD)"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsNumber == 17, "SC_OperData.HkPacket.Payload.AtsNumber == 17"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtpState == 18, "SC_OperData.HkPacket.Payload.AtpState == 18"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtpCmdNumber == 19, "SC_OperData.HkPacket.Payload.AtpCmdNumber == 19"); + UtAssert_True(SC_OperData.HkPacket.Payload.SwitchPendFlag == 0, "SC_OperData.HkPacket.Payload.SwitchPendFlag == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.NextAtsTime == 0, "SC_OperData.HkPacket.Payload.NextAtsTime == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.NumRtsActive == 20, "SC_OperData.HkPacket.Payload.NumRtsActive == 20"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsNumber == 21, "SC_OperData.HkPacket.Payload.RtsNumber == 21"); + UtAssert_True(SC_OperData.HkPacket.Payload.NextRtsTime == 0, "SC_OperData.HkPacket.Payload.NextRtsTime == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.ContinueAtsOnFailureFlag == 1, + "SC_OperData.HkPacket.Payload.ContinueAtsOnFailureFlag == 1"); /* Check first element */ - UtAssert_True(SC_OperData.HkPacket.RtsExecutingStatus[0] == 65535, - "SC_OperData.HkPacket.RtsExecutingStatus[0] == 65535"); - UtAssert_True(SC_OperData.HkPacket.RtsDisabledStatus[0] == 65535, - "SC_OperData.HkPacket.RtsDisabledStatus[0] == 65535"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsExecutingStatus[0] == 65535, + "SC_OperData.HkPacket.Payload.RtsExecutingStatus[0] == 65535"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsDisabledStatus[0] == 65535, + "SC_OperData.HkPacket.Payload.RtsDisabledStatus[0] == 65535"); /* Check middle element */ - UtAssert_True(SC_OperData.HkPacket.RtsExecutingStatus[2] == 65535, - "SC_OperData.HkPacket.RtsExecutingStatus[2] == 65535"); - UtAssert_True(SC_OperData.HkPacket.RtsDisabledStatus[2] == 65535, - "SC_OperData.HkPacket.RtsDisabledStatus[2] == 65535"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsExecutingStatus[2] == 65535, + "SC_OperData.HkPacket.Payload.RtsExecutingStatus[2] == 65535"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsDisabledStatus[2] == 65535, + "SC_OperData.HkPacket.Payload.RtsDisabledStatus[2] == 65535"); /* Check last element */ - UtAssert_INT32_EQ(SC_OperData.HkPacket.RtsExecutingStatus[LastRtsHkIndex], 32767); - UtAssert_INT32_EQ(SC_OperData.HkPacket.RtsDisabledStatus[LastRtsHkIndex], 32767); + UtAssert_INT32_EQ(SC_OperData.HkPacket.Payload.RtsExecutingStatus[LastRtsHkIndex], 32767); + UtAssert_INT32_EQ(SC_OperData.HkPacket.Payload.RtsDisabledStatus[LastRtsHkIndex], 32767); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); @@ -1491,8 +1491,8 @@ void SC_ProcessRequest_Test_CmdMID(void) SC_ProcessRequest(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 0, "SC_OperData.HkPacket.CmdErrCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 0, "SC_OperData.HkPacket.Payload.CmdErrCtr == 0"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_NOOP_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); @@ -1948,8 +1948,8 @@ void SC_ProcessRequest_Test_MIDError(void) SC_ProcessRequest(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 0, "CmdCtr == 0"); - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 0, "CmdCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_MID_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1990,8 +1990,8 @@ void SC_ProcessCommand_Test_NoOp(void) SC_ProcessCommand(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 0, "SC_OperData.HkPacket.CmdErrCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 0, "SC_OperData.HkPacket.Payload.CmdErrCtr == 0"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_NOOP_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); @@ -2026,8 +2026,8 @@ void SC_ProcessCommand_Test_NoOpNoVerifyCmdLength(void) SC_ProcessCommand(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 0, "SC_OperData.HkPacket.CmdCtr == 0"); - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 0, "SC_OperData.HkPacket.CmdErrCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 0, "SC_OperData.HkPacket.Payload.CmdCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 0, "SC_OperData.HkPacket.Payload.CmdErrCtr == 0"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); @@ -2061,14 +2061,14 @@ void SC_ProcessCommand_Test_ResetCounters(void) SC_ProcessCommand(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 0, "CmdCtr == 0"); - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 0, "CmdErrCtr == 0"); - UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 0, "AtsCmdCtr == 0"); - UtAssert_True(SC_OperData.HkPacket.AtsCmdErrCtr == 0, "AtsCmdErrCtr == 0"); - UtAssert_True(SC_OperData.HkPacket.RtsCmdCtr == 0, "RtsCmdCtr == 0"); - UtAssert_True(SC_OperData.HkPacket.RtsCmdErrCtr == 0, "RtsCmdErrCtr == 0"); - UtAssert_True(SC_OperData.HkPacket.RtsActiveCtr == 0, "RtsActiveCtr == 0"); - UtAssert_True(SC_OperData.HkPacket.RtsActiveErrCtr == 0, "RtsActiveErrCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 0, "CmdCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 0, "CmdErrCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdCtr == 0, "AtsCmdCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.AtsCmdErrCtr == 0, "AtsCmdErrCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsCmdCtr == 0, "RtsCmdCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsCmdErrCtr == 0, "RtsCmdErrCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsActiveCtr == 0, "RtsActiveCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsActiveErrCtr == 0, "RtsActiveErrCtr == 0"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_RESET_DEB_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); @@ -2127,7 +2127,7 @@ void SC_ProcessCommand_Test_StartAts(void) SC_InitTables(); - UT_CmdBuf.StartAtsCmd.AtsId = 1; + UT_CmdBuf.StartAtsCmd.Payload.AtsId = 1; /* Execute the function being tested */ SC_ProcessCommand(&UT_CmdBuf.Buf); @@ -3207,8 +3207,8 @@ void SC_ProcessCommand_Test_InvalidCmdError(void) SC_ProcessCommand(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 0, "CmdCtr == 0"); - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 0, "CmdCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_INVLD_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); diff --git a/unit-test/sc_loads_tests.c b/unit-test/sc_loads_tests.c index 33016d0..c52a06e 100644 --- a/unit-test/sc_loads_tests.c +++ b/unit-test/sc_loads_tests.c @@ -1310,8 +1310,8 @@ void SC_UpdateAppend_Test_Nominal(void) SC_UpdateAppend(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.AppendLoadCount == 1, "SC_OperData.HkPacket.AppendLoadCount == 1"); - UtAssert_True(SC_OperData.HkPacket.AppendEntryCount == 1, "SC_OperData.HkPacket.AppendEntryCount == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.AppendLoadCount == 1, "SC_OperData.HkPacket.Payload.AppendLoadCount == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.AppendEntryCount == 1, "SC_OperData.HkPacket.Payload.AppendEntryCount == 1"); UtAssert_True(SC_AppData.AppendWordCount == 15, "SC_AppData.AppendWordCount == 15"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_UPDATE_APPEND_EID); @@ -1363,8 +1363,8 @@ void SC_UpdateAppend_Test_CmdDoesNotFitBuffer(void) SC_UpdateAppend(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.AppendLoadCount == 1, "SC_OperData.HkPacket.AppendLoadCount == 1"); - UtAssert_True(SC_OperData.HkPacket.AppendEntryCount == 30, "SC_OperData.HkPacket.AppendEntryCount == 30"); + UtAssert_True(SC_OperData.HkPacket.Payload.AppendLoadCount == 1, "SC_OperData.HkPacket.Payload.AppendLoadCount == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.AppendEntryCount == 30, "SC_OperData.HkPacket.Payload.AppendEntryCount == 30"); UtAssert_True(SC_AppData.AppendWordCount == 1980, "SC_AppData.AppendWordCount == 1980"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_UPDATE_APPEND_EID); @@ -1408,8 +1408,8 @@ void SC_UpdateAppend_Test_InvalidCmdLengthTooLow(void) SC_UpdateAppend(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.AppendLoadCount == 1, "SC_OperData.HkPacket.AppendLoadCount == 1"); - UtAssert_True(SC_OperData.HkPacket.AppendEntryCount == 0, "SC_OperData.HkPacket.AppendEntryCount == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.AppendLoadCount == 1, "SC_OperData.HkPacket.Payload.AppendLoadCount == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.AppendEntryCount == 0, "SC_OperData.HkPacket.Payload.AppendEntryCount == 0"); UtAssert_True(SC_AppData.AppendWordCount == 0, "SC_AppData.AppendWordCount == 0"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_UPDATE_APPEND_EID); @@ -1453,8 +1453,8 @@ void SC_UpdateAppend_Test_InvalidCmdLengthTooHigh(void) SC_UpdateAppend(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.AppendLoadCount == 1, "SC_OperData.HkPacket.AppendLoadCount == 1"); - UtAssert_True(SC_OperData.HkPacket.AppendEntryCount == 0, "SC_OperData.HkPacket.AppendEntryCount == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.AppendLoadCount == 1, "SC_OperData.HkPacket.Payload.AppendLoadCount == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.AppendEntryCount == 0, "SC_OperData.HkPacket.Payload.AppendEntryCount == 0"); UtAssert_True(SC_AppData.AppendWordCount == 0, "SC_AppData.AppendWordCount == 0"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_UPDATE_APPEND_EID); @@ -1512,8 +1512,8 @@ void SC_UpdateAppend_Test_EndOfBuffer(void) SC_UpdateAppend(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.AppendLoadCount == 1, "SC_OperData.HkPacket.AppendLoadCount == 1"); - UtAssert_True(SC_OperData.HkPacket.AppendEntryCount == 31, "SC_OperData.HkPacket.AppendEntryCount == 31"); + UtAssert_True(SC_OperData.HkPacket.Payload.AppendLoadCount == 1, "SC_OperData.HkPacket.Payload.AppendLoadCount == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.AppendEntryCount == 31, "SC_OperData.HkPacket.Payload.AppendEntryCount == 31"); UtAssert_True(SC_AppData.AppendWordCount == 2000, "SC_AppData.AppendWordCount == 2000"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_UPDATE_APPEND_EID); @@ -1559,8 +1559,8 @@ void SC_UpdateAppend_Test_CmdNumberZero(void) SC_UpdateAppend(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.AppendLoadCount == 1, "SC_OperData.HkPacket.AppendLoadCount == 1"); - UtAssert_True(SC_OperData.HkPacket.AppendEntryCount == 0, "SC_OperData.HkPacket.AppendEntryCount == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.AppendLoadCount == 1, "SC_OperData.HkPacket.Payload.AppendLoadCount == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.AppendEntryCount == 0, "SC_OperData.HkPacket.Payload.AppendEntryCount == 0"); UtAssert_True(SC_AppData.AppendWordCount == 0, "SC_AppData.AppendWordCount == 0"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_UPDATE_APPEND_EID); @@ -1606,8 +1606,8 @@ void SC_UpdateAppend_Test_CmdNumberTooHigh(void) SC_UpdateAppend(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.AppendLoadCount == 1, "SC_OperData.HkPacket.AppendLoadCount == 1"); - UtAssert_True(SC_OperData.HkPacket.AppendEntryCount == 0, "SC_OperData.HkPacket.AppendEntryCount == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.AppendLoadCount == 1, "SC_OperData.HkPacket.Payload.AppendLoadCount == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.AppendEntryCount == 0, "SC_OperData.HkPacket.Payload.AppendEntryCount == 0"); UtAssert_True(SC_AppData.AppendWordCount == 0, "SC_AppData.AppendWordCount == 0"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_UPDATE_APPEND_EID); @@ -1651,7 +1651,7 @@ void SC_ProcessAppend_Test(void) Entry->CmdNumber = 1; SC_AppData.AppendWordCount = 1; - SC_OperData.HkPacket.AppendEntryCount = 1; + SC_OperData.HkPacket.Payload.AppendEntryCount = 1; SC_AppData.AtsCmdIndexBuffer[0][0] = 0; @@ -1714,7 +1714,7 @@ void SC_ProcessAppend_Test_CmdLoaded(void) Entry->CmdNumber = 1; SC_AppData.AppendWordCount = 1; - SC_OperData.HkPacket.AppendEntryCount = 1; + SC_OperData.HkPacket.Payload.AppendEntryCount = 1; SC_AppData.AtsCmdIndexBuffer[0][0] = 0; @@ -1774,7 +1774,7 @@ void SC_ProcessAppend_Test_NotExecuting(void) Entry->CmdNumber = 1; SC_AppData.AppendWordCount = 1; - SC_OperData.HkPacket.AppendEntryCount = 1; + SC_OperData.HkPacket.Payload.AppendEntryCount = 1; SC_AppData.AtsCmdIndexBuffer[0][0] = 0; @@ -1833,7 +1833,7 @@ void SC_ProcessAppend_Test_AtsNumber(void) Entry->CmdNumber = 1; SC_AppData.AppendWordCount = 1; - SC_OperData.HkPacket.AppendEntryCount = 1; + SC_OperData.HkPacket.Payload.AppendEntryCount = 1; SC_AppData.AtsCmdIndexBuffer[0][0] = 0; diff --git a/unit-test/sc_rtsrq_tests.c b/unit-test/sc_rtsrq_tests.c index 8836820..0a9ad1f 100644 --- a/unit-test/sc_rtsrq_tests.c +++ b/unit-test/sc_rtsrq_tests.c @@ -68,7 +68,7 @@ void SC_StartRtsCmd_Test_Nominal(void) Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; Entry->TimeTag = 0; - UT_CmdBuf.RtsCmd.RtsId = 1; + UT_CmdBuf.RtsCmd.Payload.RtsId = 1; SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag = false; SC_OperData.RtsInfoTblAddr[RtsIndex].RtsStatus = SC_LOADED; @@ -94,8 +94,8 @@ void SC_StartRtsCmd_Test_Nominal(void) UtAssert_True(SC_OperData.RtsInfoTblAddr[RtsIndex].UseCtr == 1, "SC_OperData.RtsInfoTblAddr[RtsIndex].UseCtr == 1"); UtAssert_True(SC_OperData.RtsCtrlBlckAddr->NumRtsActive == 1, "SC_OperData.RtsCtrlBlckAddr->NumRtsActive == 1"); - UtAssert_True(SC_OperData.HkPacket.RtsActiveCtr == 1, "SC_OperData.HkPacket.RtsActiveCtr == 1"); - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsActiveCtr == 1, "SC_OperData.HkPacket.Payload.RtsActiveCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_RTS_START_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); @@ -120,9 +120,9 @@ void SC_StartRtsCmd_Test_StartRtsNoEvents(void) SC_InitTables(); - UT_CmdBuf.RtsCmd.RtsId = SC_NUMBER_OF_RTS; + UT_CmdBuf.RtsCmd.Payload.RtsId = SC_NUMBER_OF_RTS; - RtsIndex = UT_CmdBuf.RtsCmd.RtsId - 1; + RtsIndex = UT_CmdBuf.RtsCmd.Payload.RtsId - 1; memset(&RtsCtrlBlck, 0, sizeof(RtsCtrlBlck)); memset(&RtsTable, 0, sizeof(RtsTable)); @@ -158,11 +158,11 @@ void SC_StartRtsCmd_Test_StartRtsNoEvents(void) UtAssert_True(SC_OperData.RtsInfoTblAddr[RtsIndex].UseCtr == 1, "SC_OperData.RtsInfoTblAddr[RtsIndex].UseCtr == 1"); UtAssert_True(SC_OperData.RtsCtrlBlckAddr->NumRtsActive == 1, "SC_OperData.RtsCtrlBlckAddr->NumRtsActive == 1"); - UtAssert_True(SC_OperData.HkPacket.RtsActiveCtr == 1, "SC_OperData.HkPacket.RtsActiveCtr == 1"); - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsActiveCtr == 1, "SC_OperData.HkPacket.Payload.RtsActiveCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); /* Handle if SC_LAST_RTS_WITH_EVENTS is the same as SC_NUM_OF_RTS */ - if (UT_CmdBuf.RtsCmd.RtsId > SC_LAST_RTS_WITH_EVENTS) + if (UT_CmdBuf.RtsCmd.Payload.RtsId > SC_LAST_RTS_WITH_EVENTS) { UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTS_CMD_DBG_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); @@ -198,7 +198,7 @@ void SC_StartRtsCmd_Test_InvalidCommandLength1(void) Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; Entry->TimeTag = 0; - UT_CmdBuf.RtsCmd.RtsId = 1; + UT_CmdBuf.RtsCmd.Payload.RtsId = 1; SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag = false; SC_OperData.RtsInfoTblAddr[RtsIndex].RtsStatus = SC_LOADED; @@ -249,7 +249,7 @@ void SC_StartRtsCmd_Test_InvalidCommandLength2(void) Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; Entry->TimeTag = 0; - UT_CmdBuf.RtsCmd.RtsId = 1; + UT_CmdBuf.RtsCmd.Payload.RtsId = 1; SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag = false; SC_OperData.RtsInfoTblAddr[RtsIndex].RtsStatus = SC_LOADED; @@ -299,7 +299,7 @@ void SC_StartRtsCmd_Test_RtsNotLoadedOrInUse(void) Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; Entry->TimeTag = 0; - UT_CmdBuf.RtsCmd.RtsId = 1; + UT_CmdBuf.RtsCmd.Payload.RtsId = 1; SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag = false; SC_OperData.RtsInfoTblAddr[RtsIndex].RtsStatus = SC_IDLE; @@ -343,7 +343,7 @@ void SC_StartRtsCmd_Test_RtsDisabled(void) Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; Entry->TimeTag = 0; - UT_CmdBuf.RtsCmd.RtsId = 1; + UT_CmdBuf.RtsCmd.Payload.RtsId = 1; SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag = true; SC_OperData.RtsInfoTblAddr[RtsIndex].RtsStatus = SC_LOADED; @@ -377,7 +377,7 @@ void SC_StartRtsCmd_Test_InvalidRtsId(void) SC_InitTables(); - UT_CmdBuf.RtsCmd.RtsId = SC_NUMBER_OF_RTS * 2; + UT_CmdBuf.RtsCmd.Payload.RtsId = SC_NUMBER_OF_RTS * 2; /* Set message size in order to satisfy if-statement after comment "Make sure the command is big enough, but not too * big" */ @@ -408,7 +408,7 @@ void SC_StartRtsCmd_Test_InvalidRtsIdZero(void) SC_InitTables(); - UT_CmdBuf.RtsCmd.RtsId = 0; + UT_CmdBuf.RtsCmd.Payload.RtsId = 0; /* Set message size in order to satisfy if-statement after comment "Make sure the command is big enough, but not too * big" */ @@ -437,7 +437,7 @@ void SC_StartRtsCmd_Test_NoVerifyLength(void) SC_StartRtsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.RtsActiveErrCtr == 1, "SC_OperData.HkPacket.RtsActiveErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsActiveErrCtr == 1, "SC_OperData.HkPacket.Payload.RtsActiveErrCtr == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); @@ -465,8 +465,8 @@ void SC_StartRtsGrpCmd_Test_Nominal(void) SC_OperData.RtsInfoTblAddr[RtsIndex].RtsStatus = SC_LOADED; SC_OperData.RtsInfoTblAddr[RtsIndex].UseCtr = 0; - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; - UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -485,8 +485,8 @@ void SC_StartRtsGrpCmd_Test_Nominal(void) UtAssert_True(SC_OperData.RtsInfoTblAddr[RtsIndex].UseCtr == 1, "SC_OperData.RtsInfoTblAddr[RtsIndex].UseCtr == 1"); UtAssert_True(SC_OperData.RtsCtrlBlckAddr->NumRtsActive == 1, "SC_OperData.RtsCtrlBlckAddr->NumRtsActive == 1"); - UtAssert_True(SC_OperData.HkPacket.RtsActiveCtr == 1, "SC_OperData.HkPacket.RtsActiveCtr == 1"); - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsActiveCtr == 1, "SC_OperData.HkPacket.Payload.RtsActiveCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTSGRP_CMD_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); @@ -509,8 +509,8 @@ void SC_StartRtsGrpCmd_Test_StartRtsGroupError(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = SC_NUMBER_OF_RTS * 2; - UT_CmdBuf.RtsGrpCmd.LastRtsId = SC_NUMBER_OF_RTS * 2; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = SC_NUMBER_OF_RTS * 2; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = SC_NUMBER_OF_RTS * 2; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -519,7 +519,7 @@ void SC_StartRtsGrpCmd_Test_StartRtsGroupError(void) SC_StartRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTSGRP_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -555,8 +555,8 @@ void SC_StartRtsGrpCmd_Test_FirstRtsIndex(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = SC_NUMBER_OF_RTS + 1; - UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = SC_NUMBER_OF_RTS + 1; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -565,7 +565,7 @@ void SC_StartRtsGrpCmd_Test_FirstRtsIndex(void) SC_StartRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTSGRP_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -588,8 +588,8 @@ void SC_StartRtsGrpCmd_Test_FirstRtsIndexZero(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 0; - UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = 0; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -598,7 +598,7 @@ void SC_StartRtsGrpCmd_Test_FirstRtsIndexZero(void) SC_StartRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTSGRP_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -622,8 +622,8 @@ void SC_StartRtsGrpCmd_Test_LastRtsIndex(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; - UT_CmdBuf.RtsGrpCmd.LastRtsId = SC_NUMBER_OF_RTS + 1; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = SC_NUMBER_OF_RTS + 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -632,7 +632,7 @@ void SC_StartRtsGrpCmd_Test_LastRtsIndex(void) SC_StartRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTSGRP_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -655,8 +655,8 @@ void SC_StartRtsGrpCmd_Test_LastRtsIndexZero(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; - UT_CmdBuf.RtsGrpCmd.LastRtsId = 0; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = 0; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -665,7 +665,7 @@ void SC_StartRtsGrpCmd_Test_LastRtsIndexZero(void) SC_StartRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTSGRP_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -689,8 +689,8 @@ void SC_StartRtsGrpCmd_Test_FirstLastRtsIndex(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 2; - UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = 2; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -699,7 +699,7 @@ void SC_StartRtsGrpCmd_Test_FirstLastRtsIndex(void) SC_StartRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTSGRP_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -740,8 +740,8 @@ void SC_StartRtsGrpCmd_Test_DisabledFlag(void) SC_OperData.RtsInfoTblAddr[RtsIndex].CmdCtr = 0; SC_OperData.RtsInfoTblAddr[RtsIndex].NextCommandPtr = 0; - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; - UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -758,9 +758,9 @@ void SC_StartRtsGrpCmd_Test_DisabledFlag(void) UtAssert_True(SC_OperData.RtsInfoTblAddr[RtsIndex].UseCtr == 0, "SC_OperData.RtsInfoTblAddr[RtsIndex].UseCtr == 0"); UtAssert_True(SC_OperData.RtsCtrlBlckAddr->NumRtsActive == 0, "SC_OperData.RtsCtrlBlckAddr->NumRtsActive == 0"); - UtAssert_True(SC_OperData.HkPacket.RtsActiveCtr == 0, "SC_OperData.HkPacket.RtsActiveCtr == 0"); - UtAssert_True(SC_OperData.HkPacket.RtsActiveErrCtr == 1, "SC_OperData.HkPacket.RtsActiveErrCtr == 1"); - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsActiveCtr == 0, "SC_OperData.HkPacket.Payload.RtsActiveCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsActiveErrCtr == 1, "SC_OperData.HkPacket.Payload.RtsActiveErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTSGRP_CMD_DISABLED_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -809,8 +809,8 @@ void SC_StartRtsGrpCmd_Test_RtsStatus(void) SC_OperData.RtsInfoTblAddr[RtsIndex].CmdCtr = 0; SC_OperData.RtsInfoTblAddr[RtsIndex].NextCommandPtr = 0; - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; - UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -829,9 +829,9 @@ void SC_StartRtsGrpCmd_Test_RtsStatus(void) UtAssert_True(SC_OperData.RtsInfoTblAddr[RtsIndex].UseCtr == 0, "SC_OperData.RtsInfoTblAddr[RtsIndex].UseCtr == 0"); UtAssert_True(SC_OperData.RtsCtrlBlckAddr->NumRtsActive == 0, "SC_OperData.RtsCtrlBlckAddr->NumRtsActive == 0"); - UtAssert_True(SC_OperData.HkPacket.RtsActiveCtr == 0, "SC_OperData.HkPacket.RtsActiveCtr == 0"); - UtAssert_True(SC_OperData.HkPacket.RtsActiveErrCtr == 1, "SC_OperData.HkPacket.RtsActiveErrCtr == 1"); - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsActiveCtr == 0, "SC_OperData.HkPacket.Payload.RtsActiveCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsActiveErrCtr == 1, "SC_OperData.HkPacket.Payload.RtsActiveErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTSGRP_CMD_NOT_LDED_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -863,7 +863,7 @@ void SC_StopRtsCmd_Test_Nominal(void) SC_InitTables(); - UT_CmdBuf.RtsCmd.RtsId = 1; + UT_CmdBuf.RtsCmd.Payload.RtsId = 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -872,7 +872,7 @@ void SC_StopRtsCmd_Test_Nominal(void) SC_StopRtsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPRTS_CMD_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); @@ -895,7 +895,7 @@ void SC_StopRtsCmd_Test_InvalidRts(void) SC_InitTables(); - UT_CmdBuf.RtsCmd.RtsId = SC_NUMBER_OF_RTS * 2; + UT_CmdBuf.RtsCmd.Payload.RtsId = SC_NUMBER_OF_RTS * 2; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -904,7 +904,7 @@ void SC_StopRtsCmd_Test_InvalidRts(void) SC_StopRtsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPRTS_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -940,8 +940,8 @@ void SC_StopRtsGrpCmd_Test_Nominal(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; - UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -950,7 +950,7 @@ void SC_StopRtsGrpCmd_Test_Nominal(void) SC_StopRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPRTSGRP_CMD_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); @@ -973,8 +973,8 @@ void SC_StopRtsGrpCmd_Test_Error(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = SC_NUMBER_OF_RTS * 2; - UT_CmdBuf.RtsGrpCmd.LastRtsId = SC_NUMBER_OF_RTS * 2; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = SC_NUMBER_OF_RTS * 2; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = SC_NUMBER_OF_RTS * 2; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -983,7 +983,7 @@ void SC_StopRtsGrpCmd_Test_Error(void) SC_StopRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPRTSGRP_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1030,8 +1030,8 @@ void SC_StopRtsGrpCmd_Test_NotExecuting(void) SC_OperData.RtsInfoTblAddr[RtsIndex].RtsStatus = SC_EXECUTING; - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; - UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1040,7 +1040,7 @@ void SC_StopRtsGrpCmd_Test_NotExecuting(void) SC_StopRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPRTSGRP_CMD_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); @@ -1063,8 +1063,8 @@ void SC_StopRtsGrpCmd_Test_FirstRtsIndex(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = SC_NUMBER_OF_RTS + 1; - UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = SC_NUMBER_OF_RTS + 1; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1073,7 +1073,7 @@ void SC_StopRtsGrpCmd_Test_FirstRtsIndex(void) SC_StopRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPRTSGRP_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1096,8 +1096,8 @@ void SC_StopRtsGrpCmd_Test_FirstRtsIndexZero(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 0; - UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = 0; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1106,7 +1106,7 @@ void SC_StopRtsGrpCmd_Test_FirstRtsIndexZero(void) SC_StopRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPRTSGRP_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1129,8 +1129,8 @@ void SC_StopRtsGrpCmd_Test_LastRtsIndex(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; - UT_CmdBuf.RtsGrpCmd.LastRtsId = SC_NUMBER_OF_RTS + 1; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = SC_NUMBER_OF_RTS + 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1139,7 +1139,7 @@ void SC_StopRtsGrpCmd_Test_LastRtsIndex(void) SC_StopRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPRTSGRP_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1162,8 +1162,8 @@ void SC_StopRtsGrpCmd_Test_LastRtsIndexZero(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; - UT_CmdBuf.RtsGrpCmd.LastRtsId = 0; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = 0; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1172,7 +1172,7 @@ void SC_StopRtsGrpCmd_Test_LastRtsIndexZero(void) SC_StopRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPRTSGRP_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1195,8 +1195,8 @@ void SC_StopRtsGrpCmd_Test_FirstLastRtsIndex(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 2; - UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = 2; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1205,7 +1205,7 @@ void SC_StopRtsGrpCmd_Test_FirstLastRtsIndex(void) SC_StopRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPRTSGRP_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1229,7 +1229,7 @@ void SC_DisableRtsCmd_Test_Nominal(void) SC_InitTables(); - UT_CmdBuf.RtsCmd.RtsId = 1; + UT_CmdBuf.RtsCmd.Payload.RtsId = 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1240,7 +1240,7 @@ void SC_DisableRtsCmd_Test_Nominal(void) /* Verify results */ UtAssert_True(SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag == true, "SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag == true"); - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_DISABLE_RTS_DEB_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); @@ -1263,7 +1263,7 @@ void SC_DisableRtsCmd_Test_InvalidRtsID(void) SC_InitTables(); - UT_CmdBuf.RtsCmd.RtsId = SC_NUMBER_OF_RTS * 2; + UT_CmdBuf.RtsCmd.Payload.RtsId = SC_NUMBER_OF_RTS * 2; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1272,7 +1272,7 @@ void SC_DisableRtsCmd_Test_InvalidRtsID(void) SC_DisableRtsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_DISRTS_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1309,8 +1309,8 @@ void SC_DisableRtsGrpCmd_Test_Nominal(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; - UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1321,7 +1321,7 @@ void SC_DisableRtsGrpCmd_Test_Nominal(void) /* Verify results */ UtAssert_True(SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag == true, "SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag == true"); - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_DISRTSGRP_CMD_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); @@ -1345,8 +1345,8 @@ void SC_DisableRtsGrpCmd_Test_Error(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = SC_NUMBER_OF_RTS * 2; - UT_CmdBuf.RtsGrpCmd.LastRtsId = SC_NUMBER_OF_RTS * 2; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = SC_NUMBER_OF_RTS * 2; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = SC_NUMBER_OF_RTS * 2; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1355,7 +1355,7 @@ void SC_DisableRtsGrpCmd_Test_Error(void) SC_DisableRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_DISRTSGRP_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1391,8 +1391,8 @@ void SC_DisableRtsGrpCmd_Test_FirstRtsIndex(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = SC_NUMBER_OF_RTS + 1; - UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = SC_NUMBER_OF_RTS + 1; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1401,7 +1401,7 @@ void SC_DisableRtsGrpCmd_Test_FirstRtsIndex(void) SC_DisableRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_DISRTSGRP_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1425,8 +1425,8 @@ void SC_DisableRtsGrpCmd_Test_FirstRtsIndexZero(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 0; - UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = 0; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1435,7 +1435,7 @@ void SC_DisableRtsGrpCmd_Test_FirstRtsIndexZero(void) SC_DisableRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_DISRTSGRP_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1459,8 +1459,8 @@ void SC_DisableRtsGrpCmd_Test_LastRtsIndex(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; - UT_CmdBuf.RtsGrpCmd.LastRtsId = SC_NUMBER_OF_RTS + 1; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = SC_NUMBER_OF_RTS + 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1469,7 +1469,7 @@ void SC_DisableRtsGrpCmd_Test_LastRtsIndex(void) SC_DisableRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_DISRTSGRP_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1493,8 +1493,8 @@ void SC_DisableRtsGrpCmd_Test_LastRtsIndexZero(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; - UT_CmdBuf.RtsGrpCmd.LastRtsId = 0; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = 0; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1503,7 +1503,7 @@ void SC_DisableRtsGrpCmd_Test_LastRtsIndexZero(void) SC_DisableRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_DISRTSGRP_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1527,8 +1527,8 @@ void SC_DisableRtsGrpCmd_Test_FirstLastRtsIndex(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 2; - UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = 2; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1537,7 +1537,7 @@ void SC_DisableRtsGrpCmd_Test_FirstLastRtsIndex(void) SC_DisableRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_DISRTSGRP_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1564,8 +1564,8 @@ void SC_DisableRtsGrpCmd_Test_DisabledFlag(void) SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag = true; - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; - UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1576,7 +1576,7 @@ void SC_DisableRtsGrpCmd_Test_DisabledFlag(void) /* Verify results */ UtAssert_True(SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag == true, "SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag == true"); - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_DISRTSGRP_CMD_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); @@ -1600,7 +1600,7 @@ void SC_EnableRtsCmd_Test_Nominal(void) SC_InitTables(); - UT_CmdBuf.RtsCmd.RtsId = 1; + UT_CmdBuf.RtsCmd.Payload.RtsId = 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1611,7 +1611,7 @@ void SC_EnableRtsCmd_Test_Nominal(void) /* Verify results */ UtAssert_True(SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag == false, "SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag == false"); - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ENABLE_RTS_DEB_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); @@ -1634,7 +1634,7 @@ void SC_EnableRtsCmd_Test_InvalidRtsID(void) SC_InitTables(); - UT_CmdBuf.RtsCmd.RtsId = SC_NUMBER_OF_RTS * 2; + UT_CmdBuf.RtsCmd.Payload.RtsId = SC_NUMBER_OF_RTS * 2; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1643,7 +1643,7 @@ void SC_EnableRtsCmd_Test_InvalidRtsID(void) SC_EnableRtsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ENARTS_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1666,7 +1666,7 @@ void SC_EnableRtsCmd_Test_InvalidRtsIDZero(void) SC_InitTables(); - UT_CmdBuf.RtsCmd.RtsId = 0; + UT_CmdBuf.RtsCmd.Payload.RtsId = 0; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1675,7 +1675,7 @@ void SC_EnableRtsCmd_Test_InvalidRtsIDZero(void) SC_EnableRtsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ENARTS_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1713,8 +1713,8 @@ void SC_EnableRtsGrpCmd_Test_Nominal(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; - UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1725,7 +1725,7 @@ void SC_EnableRtsGrpCmd_Test_Nominal(void) /* Verify results */ UtAssert_True(SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag == false, "SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag == false"); - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ENARTSGRP_CMD_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); @@ -1749,8 +1749,8 @@ void SC_EnableRtsGrpCmd_Test_Error(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = SC_NUMBER_OF_RTS * 2; - UT_CmdBuf.RtsGrpCmd.LastRtsId = SC_NUMBER_OF_RTS * 2; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = SC_NUMBER_OF_RTS * 2; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = SC_NUMBER_OF_RTS * 2; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1759,7 +1759,7 @@ void SC_EnableRtsGrpCmd_Test_Error(void) SC_EnableRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ENARTSGRP_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1795,8 +1795,8 @@ void SC_EnableRtsGrpCmd_Test_FirstRtsIndex(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = SC_NUMBER_OF_RTS + 1; - UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = SC_NUMBER_OF_RTS + 1; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1805,7 +1805,7 @@ void SC_EnableRtsGrpCmd_Test_FirstRtsIndex(void) SC_EnableRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ENARTSGRP_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1829,8 +1829,8 @@ void SC_EnableRtsGrpCmd_Test_FirstRtsIndexZero(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 0; - UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = 0; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1839,7 +1839,7 @@ void SC_EnableRtsGrpCmd_Test_FirstRtsIndexZero(void) SC_EnableRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ENARTSGRP_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1863,8 +1863,8 @@ void SC_EnableRtsGrpCmd_Test_LastRtsIndex(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; - UT_CmdBuf.RtsGrpCmd.LastRtsId = SC_NUMBER_OF_RTS + 1; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = SC_NUMBER_OF_RTS + 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1873,7 +1873,7 @@ void SC_EnableRtsGrpCmd_Test_LastRtsIndex(void) SC_EnableRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ENARTSGRP_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1897,8 +1897,8 @@ void SC_EnableRtsGrpCmd_Test_LastRtsIndexZero(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; - UT_CmdBuf.RtsGrpCmd.LastRtsId = 0; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = 0; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1907,7 +1907,7 @@ void SC_EnableRtsGrpCmd_Test_LastRtsIndexZero(void) SC_EnableRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ENARTSGRP_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1931,8 +1931,8 @@ void SC_EnableRtsGrpCmd_Test_FirstLastRtsIndex(void) SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 2; - UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = 2; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1941,7 +1941,7 @@ void SC_EnableRtsGrpCmd_Test_FirstLastRtsIndex(void) SC_EnableRtsGrpCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ENARTSGRP_CMD_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -1968,8 +1968,8 @@ void SC_EnableRtsGrpCmd_Test_DisabledFlag(void) SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag = false; SC_OperData.RtsInfoTblAddr[1].DisabledFlag = true; - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; - UT_CmdBuf.RtsGrpCmd.LastRtsId = 2; + UT_CmdBuf.RtsGrpCmd.Payload.FirstRtsId = 1; + UT_CmdBuf.RtsGrpCmd.Payload.LastRtsId = 2; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); @@ -1980,7 +1980,7 @@ void SC_EnableRtsGrpCmd_Test_DisabledFlag(void) /* Verify results */ UtAssert_True(SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag == false, "SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag == false"); - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 1, "SC_OperData.HkPacket.Payload.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ENARTSGRP_CMD_INF_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); diff --git a/unit-test/sc_state_tests.c b/unit-test/sc_state_tests.c index 2270b0a..2b3cb6a 100644 --- a/unit-test/sc_state_tests.c +++ b/unit-test/sc_state_tests.c @@ -571,15 +571,15 @@ void SC_GetNextRtsCommand_Test_RtsLengthError(void) SC_GetNextRtsCommand(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.RtsCmdErrCtr == 1, "SC_OperData.HkPacket.RtsCmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsCmdErrCtr == 1, "SC_OperData.HkPacket.Payload.RtsCmdErrCtr == 1"); UtAssert_True(SC_OperData.RtsInfoTblAddr[0].CmdErrCtr == 1, "SC_OperData.RtsInfoTblAddr[0].CmdErrCtr == 1"); - UtAssert_True(SC_OperData.HkPacket.LastRtsErrSeq == SC_OperData.RtsCtrlBlckAddr->RtsNumber, - "SC_OperData.HkPacket.LastRtsErrSeq == SC_OperData.RtsCtrlBlckAddr->RtsNumber"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastRtsErrSeq == SC_OperData.RtsCtrlBlckAddr->RtsNumber, + "SC_OperData.HkPacket.Payload.LastRtsErrSeq == SC_OperData.RtsCtrlBlckAddr->RtsNumber"); - UtAssert_True(SC_OperData.HkPacket.LastRtsErrCmd == + UtAssert_True(SC_OperData.HkPacket.Payload.LastRtsErrCmd == SC_OperData.RtsInfoTblAddr[0].NextCommandPtr + ((SC_PACKET_MIN_SIZE + SC_RTS_HEADER_SIZE + 3) / SC_BYTES_IN_WORD), - "SC_OperData.HkPacket.LastRtsErrCmd == SC_OperData.RtsInfoTblAddr[0].NextCommandPtr + " + "SC_OperData.HkPacket.Payload.LastRtsErrCmd == SC_OperData.RtsInfoTblAddr[0].NextCommandPtr + " "((SC_PACKET_MIN_SIZE + SC_RTS_HEADER_SIZE + 3) / SC_BYTES_IN_WORD)"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_RTS_LNGTH_ERR_EID); @@ -650,15 +650,15 @@ void SC_GetNextRtsCommand_Test_CommandLengthError(void) SC_GetNextRtsCommand(); /* Verify results */ - UtAssert_True(SC_OperData.HkPacket.RtsCmdErrCtr == 1, "SC_OperData.HkPacket.RtsCmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.RtsCmdErrCtr == 1, "SC_OperData.HkPacket.Payload.RtsCmdErrCtr == 1"); UtAssert_True(SC_OperData.RtsInfoTblAddr[0].CmdErrCtr == 1, "SC_OperData.RtsInfoTblAddr[0].CmdErrCtr == 1"); - UtAssert_True(SC_OperData.HkPacket.LastRtsErrSeq == SC_OperData.RtsCtrlBlckAddr->RtsNumber, - "SC_OperData.HkPacket.LastRtsErrSeq == SC_OperData.RtsCtrlBlckAddr->RtsNumber"); + UtAssert_True(SC_OperData.HkPacket.Payload.LastRtsErrSeq == SC_OperData.RtsCtrlBlckAddr->RtsNumber, + "SC_OperData.HkPacket.Payload.LastRtsErrSeq == SC_OperData.RtsCtrlBlckAddr->RtsNumber"); - UtAssert_True(SC_OperData.HkPacket.LastRtsErrCmd == + UtAssert_True(SC_OperData.HkPacket.Payload.LastRtsErrCmd == SC_OperData.RtsInfoTblAddr[0].NextCommandPtr + ((SC_PACKET_MIN_SIZE + SC_RTS_HEADER_SIZE + 3) / SC_BYTES_IN_WORD), - "SC_OperData.HkPacket.LastRtsErrCmd == SC_OperData.RtsInfoTblAddr[0].NextCommandPtr + " + "SC_OperData.HkPacket.Payload.LastRtsErrCmd == SC_OperData.RtsInfoTblAddr[0].NextCommandPtr + " "((SC_PACKET_MIN_SIZE + SC_RTS_HEADER_SIZE + 3) / SC_BYTES_IN_WORD)"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_RTS_CMD_LNGTH_ERR_EID); diff --git a/unit-test/sc_utils_tests.c b/unit-test/sc_utils_tests.c index d5aa700..2d5fe45 100644 --- a/unit-test/sc_utils_tests.c +++ b/unit-test/sc_utils_tests.c @@ -123,7 +123,7 @@ void SC_VerifyCmdLength_Test_Nominal(void) /* Verify results */ UtAssert_True(Result == true, "Result == true"); - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 0, "SC_OperData.HkPacket.CmdErrCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 0, "SC_OperData.HkPacket.Payload.CmdErrCtr == 0"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); @@ -155,8 +155,8 @@ void SC_VerifyCmdLength_Test_LenError(void) /* Verify results */ UtAssert_True(Result == false, "Result == false"); - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 0, "SC_OperData.HkPacket.CmdCtr == 0"); - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 0, "SC_OperData.HkPacket.Payload.CmdCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdErrCtr == 1, "SC_OperData.HkPacket.Payload.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_LEN_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); @@ -195,7 +195,7 @@ void SC_VerifyCmdLength_Test_LenErrorNotMID(void) /* Verify results */ UtAssert_True(Result == false, "Result == false"); - UtAssert_True(SC_OperData.HkPacket.CmdCtr == 0, "SC_OperData.HkPacket.CmdCtr == 0"); + UtAssert_True(SC_OperData.HkPacket.Payload.CmdCtr == 0, "SC_OperData.HkPacket.Payload.CmdCtr == 0"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_LEN_ERR_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR);