diff --git a/df_datalink_sp/src/networking/link_layer/link_layer.c b/df_datalink_sp/src/networking/link_layer/link_layer.c index ae8dc00..30048ed 100644 --- a/df_datalink_sp/src/networking/link_layer/link_layer.c +++ b/df_datalink_sp/src/networking/link_layer/link_layer.c @@ -383,15 +383,15 @@ void L2_FrameStateUpdate(L2_INST *instPtr) // -- send slot status if (instPtr->tor.curr == L2_TOR_RX) { - instPtr->rxSlotLog.tuNo = instPtr->frameNum.last; - instPtr->rxSlotLog.slotNo = instPtr->slotNum.last; - instPtr->rxSlotLog.frameType = instPtr->frame.last; + instPtr->rxSlotLog.tuNo = L2_GetCurrentFrameNum(instPtr); + instPtr->rxSlotLog.slotNo = L2_GetCurrentSlotNum(instPtr); + instPtr->rxSlotLog.frameType = recvType; memset(instPtr->rxSlotLog.payload, 0x00, sizeof(instPtr->rxSlotLog.payload)); if (isValid == true) { memcpy(instPtr->rxSlotLog.payload, instPtr->recvPktData, - Phy_GetFrameLen(L2_L2frame2L1frame(instPtr->frame.last))); + Phy_GetFrameLen(L2_L2frame2L1frame(recvType))); TIME_WORD timeWrod; Phy_GetLastReceivedFrameSyncTimeStamp(phyRef, &timeWrod); instPtr->rxSlotLog.tmStamp = timeWrod.frac_part; @@ -407,19 +407,20 @@ void L2_FrameStateUpdate(L2_INST *instPtr) instPtr->rxSlotLog.tmStamp = 0; instPtr->rxSlotLog.tmDevi = 0; instPtr->rxSlotLog.freqDevi = 0; + memset(instPtr->rxSlotLog.payload, 0x00, sizeof(instPtr->rxSlotLog.payload)); } SysMonitor_UpdateRecvSlotLog(&(instPtr->rxSlotLog)); } // -- send slot status if (instPtr->tor.next == L2_TOR_TX) { - instPtr->txSlotLog.tuNo = instPtr->frameNum.curr; - instPtr->txSlotLog.slotNo = instPtr->slotNum.curr; - instPtr->txSlotLog.frameType = instPtr->frame.curr; + instPtr->txSlotLog.tuNo = L2_GetCurrentFrameNum(instPtr); + instPtr->txSlotLog.slotNo = L2_GetCurrentSlotNum(instPtr); + instPtr->txSlotLog.frameType = sendType; memset(instPtr->rxSlotLog.payload, 0x00, sizeof(instPtr->txSlotLog.payload)); memcpy(instPtr->txSlotLog.payload, - instPtr->recvPktData, - Phy_GetFrameLen(L2_L2frame2L1frame(instPtr->frame.curr))); + instPtr->sendPktData, + Phy_GetFrameLen(L2_L2frame2L1frame(sendType))); instPtr->txSlotLog.tmStamp = 0; instPtr->txSlotLog.tmDevi = 0; instPtr->txSlotLog.freqDevi = 0;