Merge branch 'pr-421' into jph-wip-baseline-20231213

nasa · Dec 13, 2023 · 0d8844f · 0d8844f
2 parents cec724b + beaa27f
commit 0d8844f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/fsw/src/cf_app.c b/fsw/src/cf_app.c
@@ -194,7 +194,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)

diff --git a/fsw/src/cf_cfdp.c b/fsw/src/cf_cfdp.c
@@ -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;
@@ -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);
     }
 }