Skip to content
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

Jump to bottom

Integration Candidate: 2020-05-27 #71

Merged
merged 8 commits into from
Jun 10, 2020
Merged

Integration Candidate: 2020-05-27 #71

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bf9bc92
Fix #66, Add extended context information to event hook
jphickey May 20, 2020
3e46de8
Fix #68, remove references to CCSDS types
jphickey May 28, 2020
7865c79
Merge pull request #67 from jphickey/fix-66-event-hook-context
astrogeco Jun 2, 2020
aa39e2d
Merge pull request #69 from jphickey/fix-68-ccsds-refs
astrogeco Jun 2, 2020
3874dbf
HOTFIX: Use non-deprecated symbol.
jphickey Jun 8, 2020
878a8a3
Increase version to 1.1.9 and update ReadMe
Jun 10, 2020
d4a857b
HOTFIX: Remove hardcoded version number check
skliper Jun 10, 2020
0e0c71c
HOTFIX: Fix ReadMe version changes for 1.1.10
astrogeco Jun 10, 2020
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/src/sample_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ void SAMPLE_ProcessCommandPacket( CFE_SB_MsgPtr_t Msg )
break;

case SAMPLE_APP_SEND_HK_MID:
SAMPLE_ReportHousekeeping((CCSDS_CommandPacket_t *)Msg);
SAMPLE_ReportHousekeeping((CFE_SB_CmdHdr_t *)Msg);
break;

default:
Expand Down Expand Up @@ -348,7 +348,7 @@ void SAMPLE_ProcessGroundCommand( CFE_SB_MsgPtr_t Msg )
/* telemetry, packetize it and send it to the housekeeping task via */
/* the software bus */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
int32 SAMPLE_ReportHousekeeping( const CCSDS_CommandPacket_t *Msg )
int32 SAMPLE_ReportHousekeeping( const CFE_SB_CmdHdr_t *Msg )
{
int i;

Expand Down
2 changes: 1 addition & 1 deletion fsw/src/sample_app.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ void SAMPLE_AppMain(void);
int32 SAMPLE_AppInit(void);
void SAMPLE_ProcessCommandPacket(CFE_SB_MsgPtr_t Msg);
void SAMPLE_ProcessGroundCommand(CFE_SB_MsgPtr_t Msg);
int32 SAMPLE_ReportHousekeeping(const CCSDS_CommandPacket_t *Msg);
int32 SAMPLE_ReportHousekeeping(const CFE_SB_CmdHdr_t *Msg);
int32 SAMPLE_ResetCounters(const SAMPLE_ResetCounters_t *Msg);
int32 SAMPLE_Process(const SAMPLE_Process_t *Msg);
int32 SAMPLE_Noop(const SAMPLE_Noop_t *Msg);
Expand Down
8 changes: 4 additions & 4 deletions unit-test/coveragetest/coveragetest_sample_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ void Test_SAMPLE_ProcessCommandPacket(void)
union
{
CFE_SB_Msg_t Base;
CCSDS_CommandPacket_t Cmd;
CFE_SB_CmdHdr_t Cmd;
SAMPLE_Noop_t Noop;
SAMPLE_ResetCounters_t Reset;
SAMPLE_Process_t Process;
Expand Down Expand Up @@ -331,7 +331,7 @@ void Test_SAMPLE_ProcessGroundCommand(void)
union
{
CFE_SB_Msg_t Base;
CCSDS_CommandPacket_t Cmd;
CFE_SB_CmdHdr_t Cmd;
SAMPLE_Noop_t Noop;
SAMPLE_ResetCounters_t Reset;
SAMPLE_Process_t Process;
Expand Down Expand Up @@ -390,9 +390,9 @@ void Test_SAMPLE_ReportHousekeeping(void)
{
/*
* Test Case For:
* void SAMPLE_ReportHousekeeping( const CCSDS_CommandPacket_t *Msg )
* void SAMPLE_ReportHousekeeping( const CFE_SB_CmdHdr_t *Msg )
*/
CCSDS_CommandPacket_t CmdMsg;
CFE_SB_CmdHdr_t CmdMsg;
SAMPLE_HkTlm_t HkTelemetryMsg;

memset(&CmdMsg, 0, sizeof(CmdMsg));
Expand Down