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

Fix #48, remove references to CCSDS types #49

Merged
merged 2 commits into from
Jun 2, 2020
Merged

Fix #48, remove references to CCSDS types #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a589163
Merge pull request #47 from nasa/integration-candidate
astrogeco May 13, 2020
b04c6be
Fix #48, remove references to CCSDS types
jphickey May 28, 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
6 changes: 3 additions & 3 deletions fsw/src/ci_lab_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ static CFE_EVS_BinFilter_t CI_LAB_EventFilters[] =
*/
int32 CI_LAB_Noop(const CI_LAB_Noop_t *data);
int32 CI_LAB_ResetCounters(const CI_LAB_ResetCounters_t *data);
int32 CI_LAB_ReportHousekeeping(const CCSDS_CommandPacket_t *data);
int32 CI_LAB_ReportHousekeeping(const CFE_SB_CmdHdr_t *data);

/** * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* CI_Lab_AppMain() -- Application entry point and main process loop */
Expand Down Expand Up @@ -232,7 +232,7 @@ void CI_LAB_ProcessCommandPacket(void)
break;

case CI_LAB_SEND_HK_MID:
CI_LAB_ReportHousekeeping((const CCSDS_CommandPacket_t *)CI_LAB_Global.MsgPtr);
CI_LAB_ReportHousekeeping((const CFE_SB_CmdHdr_t *)CI_LAB_Global.MsgPtr);
break;

default:
Expand Down Expand Up @@ -318,7 +318,7 @@ int32 CI_LAB_ResetCounters(const CI_LAB_ResetCounters_t *data)
/* telemetry, packetize it and send it to the housekeeping task via */
/* the software bus */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
int32 CI_LAB_ReportHousekeeping(const CCSDS_CommandPacket_t *data)
int32 CI_LAB_ReportHousekeeping(const CFE_SB_CmdHdr_t *data)
{
CI_LAB_Global.HkBuffer.HkTlm.Payload.SocketConnected = CI_LAB_Global.SocketConnected;
CFE_SB_TimeStampMsg(&CI_LAB_Global.HkBuffer.MsgHdr);
Expand Down
1 change: 0 additions & 1 deletion fsw/src/ci_lab_app.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
#include "cfe_es.h"

#include "osapi.h"
#include "ccsds.h"

#include <string.h>
#include <errno.h>
Expand Down