From 5cb5ffff59af613d7a6641b26273901e286d871e Mon Sep 17 00:00:00 2001 From: Gatsby Van Date: Tue, 26 Dec 2023 21:52:01 +0800 Subject: [PATCH] miscellaneous update, omit redundant FIXME flag. --- datalink814_ge/src/linklayer/net_mgmt.c | 1 - datalink814_ge/src/linklayer/net_scan.c | 3 +-- datalink814_ge/src/linklayer/time_sync.c | 2 +- datalink814_ge/src/mpc/mpc_ctrl.c | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/datalink814_ge/src/linklayer/net_mgmt.c b/datalink814_ge/src/linklayer/net_mgmt.c index 2402b03..d453df2 100644 --- a/datalink814_ge/src/linklayer/net_mgmt.c +++ b/datalink814_ge/src/linklayer/net_mgmt.c @@ -704,7 +704,6 @@ int32_t MgmtNet_PktHandler(L2_INST* instPtr) { // Member Node update state with received message if(L2_GetNodeId(instPtr) != L2_NODE_HEAD && mgmtMsgLog->isValid == true ){ L2_NODE_STATE newState = L2_NONE_STATE; - // FIXME : switch (mgmtMsgLog->nextNetState) { case NET_INI_STAGE: newState = L2_INIT_STATE; diff --git a/datalink814_ge/src/linklayer/net_scan.c b/datalink814_ge/src/linklayer/net_scan.c index e2dc93b..66edb2f 100644 --- a/datalink814_ge/src/linklayer/net_scan.c +++ b/datalink814_ge/src/linklayer/net_scan.c @@ -170,7 +170,7 @@ static int32_t ScanMsg_Packing(L2_INST* instPtr, BIT_ARRAY* bitarr, L2_MSG_TYPE dataChunk = L2_GetNextSlotNum(instPtr) % L2_SLOTS_PER_SUBFRAME; FrameInsertChunk(bitarr, BM_MSG_TSLOT_NUM_OFFSET, BM_MSG_TSLOT_NUM_LEN, dataChunk); - /* FIXME : Only for test */ + /* FIXME: dummy data, only for test */ /* longitude. */ dataChunk = 203; FrameInsertChunk(bitarr, BM_MSG_LONGITUDE_OFFSET, BM_MSG_LONGITUDE_LEN, dataChunk); @@ -838,7 +838,6 @@ void ScanNet_Reset(L2_SCAN_FSM* scanFSMPtr) { scanFSMPtr->w2acqTimeout = 0; scanFSMPtr->scanStage = L2_SCAN_NONE_STAGE; scanFSMPtr->scanMode = L2_SCAN_INTRA_MODE; - // FIXME: Only for test scanFSMPtr->BMrcvLog.Height = 0; scanFSMPtr->BMrcvLog.Latitude = 0; scanFSMPtr->BMrcvLog.Longitude = 0; diff --git a/datalink814_ge/src/linklayer/time_sync.c b/datalink814_ge/src/linklayer/time_sync.c index 19e17da..37513df 100644 --- a/datalink814_ge/src/linklayer/time_sync.c +++ b/datalink814_ge/src/linklayer/time_sync.c @@ -169,7 +169,7 @@ void RTT_GetFrameStart(L2_INST* instPtr, TIME_WORD *tmStamp, L2_TOR_TYPE torType Phy_GetLastReceivedFrameSyncTimeStamp(phyRef, &timeStamp); timeDiff = (uint64_t) timeStamp.frac_part; timeDiff += ((uint64_t)timeStamp.int_part) * TIME_FRAC_MAX; - Phy_GetLastSlotStartTimeStamp(phyRef, tmStamp); + Phy_GetLastReceivedSlotStartTimeStamp(phyRef, tmStamp); timeDiff -= ((uint64_t) tmStamp->int_part) * TIME_FRAC_MAX; timeDiff -= (uint64_t) tmStamp->frac_part; timeDiff = (int64_t)Phy_GetTimeComp(L2_L2frame2L1frame(L2_GetLastFrameType(instPtr))) - timeDiff; diff --git a/datalink814_ge/src/mpc/mpc_ctrl.c b/datalink814_ge/src/mpc/mpc_ctrl.c index 7b07213..99bc6ab 100644 --- a/datalink814_ge/src/mpc/mpc_ctrl.c +++ b/datalink814_ge/src/mpc/mpc_ctrl.c @@ -206,7 +206,7 @@ int MPC_MsgHandler(MPC_INST* instPtr){ MPC_GetChunk(mpcRxMsgBuff, TEST_REQ_CMD_OFFSET, TEST_REQ_CMD_LEN, &dataChunk); if((uint8_t)dataChunk == TEST_REQ_CMD_START){ MPC_GetChunk(mpcRxMsgBuff, TEST_MODE_SET_OFFSET, TEST_MODE_SET_LEN, &dataChunk); - // FIXME + // TODO: check. if((uint8_t)dataChunk == TEST_MODE_HEAD){ l2Config.myType = L2_NODE_HEAD; l2Config.myId = 1;