Skip to content

Commit

Permalink
Merge pull request #421 from thnkslprpt/fix-199-use-CFE_MSG_PTR-macro
Browse files Browse the repository at this point in the history
Fix #199, Use `CFE_MSG_PTR` instead of `&(x).Msg`
  • Loading branch information
dmknutsen authored Dec 15, 2023
2 parents 515e3a8 + beaa27f commit 27f7532
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions fsw/src/cf_app.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ CF_AppData_t CF_AppData;
*-----------------------------------------------------------------*/
void CF_HkCmd(void)
{
CFE_MSG_SetMsgTime(&CF_AppData.hk.TelemetryHeader.Msg, CFE_TIME_GetTime());
/* return value ignored */ CFE_SB_TransmitMsg(&CF_AppData.hk.TelemetryHeader.Msg, true);
CFE_MSG_SetMsgTime(CFE_MSG_PTR(CF_AppData.hk.TelemetryHeader), CFE_TIME_GetTime());
/* return value ignored */ CFE_SB_TransmitMsg(CFE_MSG_PTR(CF_AppData.hk.TelemetryHeader), true);
}

/*----------------------------------------------------------------
Expand Down Expand Up @@ -205,7 +205,7 @@ CFE_Status_t CF_Init(void)

CF_AppData.run_status = CFE_ES_RunStatus_APP_RUN;

CFE_MSG_Init(&CF_AppData.hk.TelemetryHeader.Msg, CFE_SB_ValueToMsgId(CF_HK_TLM_MID), sizeof(CF_AppData.hk));
CFE_MSG_Init(CFE_MSG_PTR(CF_AppData.hk.TelemetryHeader), CFE_SB_ValueToMsgId(CF_HK_TLM_MID), sizeof(CF_AppData.hk));

status = CFE_EVS_Register(NULL, 0, CFE_EVS_EventFilter_BINARY);
if (status != CFE_SUCCESS)
Expand Down
4 changes: 2 additions & 2 deletions fsw/src/cf_cfdp.c
Original file line number Diff line number Diff line change
Expand Up @@ -1723,7 +1723,7 @@ void CF_CFDP_SendEotPkt(CF_Transaction_t *txn)
{
EotPktPtr = (void *)BufPtr;

CFE_MSG_Init(&EotPktPtr->TelemetryHeader.Msg, CFE_SB_ValueToMsgId(CF_EOT_TLM_MID), sizeof(*EotPktPtr));
CFE_MSG_Init(CFE_MSG_PTR(EotPktPtr->TelemetryHeader), CFE_SB_ValueToMsgId(CF_EOT_TLM_MID), sizeof(*EotPktPtr));

EotPktPtr->Payload.channel = txn->chan_num;
EotPktPtr->Payload.direction = txn->history->dir;
Expand All @@ -1739,7 +1739,7 @@ void CF_CFDP_SendEotPkt(CF_Transaction_t *txn)
/*
** Timestamp and send eod of transaction telemetry
*/
CFE_SB_TimeStampMsg(&EotPktPtr->TelemetryHeader.Msg);
CFE_SB_TimeStampMsg(CFE_MSG_PTR(EotPktPtr->TelemetryHeader));
CFE_SB_TransmitBuffer(BufPtr, true);
}
}
Expand Down

0 comments on commit 27f7532

Please sign in to comment.