Skip to content

Fix #155, Add check for CFE_SB_NO_MESSAGE #156

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

Closed
anhvan989 wants to merge 1 commit into from
Closed

Fix #155, Add check for CFE_SB_NO_MESSAGE #156

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
2 changes: 1 addition & 1 deletion fsw/src/sc_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ void SC_AppMain(void)
/* Invoke command handlers */
SC_ProcessRequest(BufPtr);
}
else if (Result == CFE_SB_TIME_OUT)
else if (Result == CFE_SB_TIME_OUT || Result == CFE_SB_NO_MESSAGE)
{
/* no action, but also no error */
}
Expand Down
7 changes: 5 additions & 2 deletions unit-test/sc_app_tests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,15 @@ void SC_AppMain_Test_Nominal(void)
UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false);

/* Load return buffer to make loop execute twice */
/* Load return buffer to make loop execute three times */
UT_SetDeferredRetcode(UT_KEY(CFE_ES_RunLoop), 1, true);
UT_SetDeferredRetcode(UT_KEY(CFE_ES_RunLoop), 1, true);
UT_SetDeferredRetcode(UT_KEY(CFE_ES_RunLoop), 1, true);


/* Return timeout first time through, will default to success on second */
/* Return timeout first time through, no message on the second, will default to success on the third */
UT_SetDeferredRetcode(UT_KEY(CFE_SB_ReceiveBuffer), 1, CFE_SB_TIME_OUT);
UT_SetDeferredRetcode(UT_KEY(CFE_SB_ReceiveBuffer), 1, CFE_SB_NO_MESSAGE);

/* Set table addresses */
UT_SetHandlerFunction(UT_KEY(CFE_TBL_GetAddress), UT_Handler_CFE_TBL_GetAddress, NULL);
Expand Down
Loading