Skip to content

Fix #73, Make implicit padding in HK_AppData_t explicit #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thnkslprpt wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −6
Open

Fix #73, Make implicit padding in HK_AppData_t explicit #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions fsw/inc/hk_extern_typedefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/************************************************************************
* NASA Docket No. GSC-18,447-1, and identified as “CFS CFDP (CF)
* Application version 3.0.0”
* NASA Docket No. GSC-18,919-1, and identified as “Core Flight
* System (cFS) Housekeeping (HK) Application version 2.5.1”
*
* Copyright (c) 2019 United States Government as represented by the
* Administrator of the National Aeronautics and Space Administration.
Expand Down
4 changes: 2 additions & 2 deletions fsw/src/hk_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,10 @@ void HK_AppMain(void)
else
{
CFE_EVS_SendEvent(HK_RCV_MSG_ERR_EID, CFE_EVS_EventType_ERROR,
"HK_APP Exiting due to CFE_SB_RcvMsg error 0x%08X", (unsigned int)Status);
"HK_APP Exiting due to CFE_SB_ReceiveBuffer error 0x%08X", (unsigned int)Status);

/* Write to syslog in case there is a problem with event services */
CFE_ES_WriteToSysLog("HK_APP Exiting due to CFE_SB_RcvMsg error 0x%08X\n", (unsigned int)Status);
CFE_ES_WriteToSysLog("HK_APP Exiting due to CFE_SB_ReceiveBuffer error 0x%08X\n", (unsigned int)Status);

HK_AppData.RunStatus = CFE_ES_RunStatus_APP_ERROR;
}
Expand Down
3 changes: 2 additions & 1 deletion fsw/src/hk_app.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ typedef struct
CFE_SB_PipeId_t CmdPipe; /**< \brief Pipe Id for HK command pipe */
uint8 CmdCounter; /**< \brief Number of valid commands received */
uint8 ErrCounter; /**< \brief Number of invalid commands received */
uint16 Padding; /**< \brief Padding for structure alignment */

uint16 MissingDataCtr; /**< \brief Number of times missing data was detected */
uint16 CombinedPacketsSent; /**< \brief Count of combined output msgs sent */
Expand All @@ -77,7 +78,7 @@ typedef struct
CFE_TBL_Handle_t CopyTableHandle; /**< \brief Copy Table handle */
CFE_TBL_Handle_t RuntimeTableHandle; /**< \brief Run-time table handle */

hk_copy_table_entry_t * CopyTablePtr; /**< \brief Ptr to copy table entry */
hk_copy_table_entry_t *CopyTablePtr; /**< \brief Ptr to copy table entry */
hk_runtime_tbl_entry_t *RuntimeTablePtr; /**< \brief Ptr to run-time table entry */

uint8 MemPoolBuffer[HK_NUM_BYTES_IN_MEM_POOL]; /**< \brief HK mempool buffer */
Expand Down
2 changes: 1 addition & 1 deletion unit-test/hk_app_tests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ void Test_HK_AppMain_RcvBufFail(void)
int32 strCmpResult;
char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH];
snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH,
"HK_APP Exiting due to CFE_SB_RcvMsg error 0x%%08X");
"HK_APP Exiting due to CFE_SB_ReceiveBuffer error 0x%%08X");

/* Set return codes for table functions so that HK_TableInit
* succeeds. */
Expand Down
Loading