From 3e46de86be9771d72a16338b8896ca1f2d445dcc Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Thu, 28 May 2020 16:11:02 -0400 Subject: [PATCH] Fix #68, remove references to CCSDS types Applications should only use types provided by CFE_SB. --- fsw/src/sample_app.c | 4 ++-- fsw/src/sample_app.h | 2 +- unit-test/coveragetest/coveragetest_sample_app.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fsw/src/sample_app.c b/fsw/src/sample_app.c index 1686c5d..75bffae 100644 --- a/fsw/src/sample_app.c +++ b/fsw/src/sample_app.c @@ -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: @@ -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; diff --git a/fsw/src/sample_app.h b/fsw/src/sample_app.h index a7c2c47..14ab525 100644 --- a/fsw/src/sample_app.h +++ b/fsw/src/sample_app.h @@ -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); diff --git a/unit-test/coveragetest/coveragetest_sample_app.c b/unit-test/coveragetest/coveragetest_sample_app.c index 81cd5fc..5578f67 100644 --- a/unit-test/coveragetest/coveragetest_sample_app.c +++ b/unit-test/coveragetest/coveragetest_sample_app.c @@ -249,7 +249,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; @@ -302,7 +302,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; @@ -361,9 +361,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));