gatsby/df_datalink
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

bugfix: correct api call

Browse Source
This commit is contained in:
Gatsby Van
2024-03-02 13:13:20 +08:00
parent 1192f7b4cd
commit 633f6dff37
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
df_datalink_sp/src/networking/link_layer/scan.c
+4 -4
View File
@@ -406,7 +406,7 @@ int32_t L2_Scan_PktHandler(L2_INST *instPtr, uint8_t *msg)
L2_FrameGetChunk(msg, L2_MSG_ADV_SRC_POSZ, L2_MSG_ADV_SRC_POSZ_LEN, &nodePos); L2_FrameGetChunk(msg, L2_MSG_ADV_SRC_POSZ, L2_MSG_ADV_SRC_POSZ_LEN, &nodePos);
node->nodeInfo.pos.z = (double) nodePos; node->nodeInfo.pos.z = (double) nodePos;
node->nodeInfo.beamNo = Phy_LastScanBeamNo(instPtr->config.phyInstPtr); node->nodeInfo.beamNo = Phy_LastScanBeamNo(instPtr->config.phyInstPtr);
// log last scan beam number // log last scan beam number
instPtr->log.scanBeamNo = node->nodeInfo.beamNo; instPtr->log.scanBeamNo = node->nodeInfo.beamNo;
@@ -608,12 +608,12 @@ int32_t L2_Scan_Routine(L2_INST *instPtr, const L2_RTNE_TABLE_ENTRY *rtneEntry)
if (rtneEntry->dst == L2_GetNodeId(instPtr) || rtneEntry->dst == L2_BROADCAST_ID) if (rtneEntry->dst == L2_GetNodeId(instPtr) || rtneEntry->dst == L2_BROADCAST_ID)
{ {
torState = L2_TOR_RX; torState = L2_TOR_RX;
commNode = L2_GetNodeById(rtneEntry->dst); commNode = L2_GetNodeById(instPtr->nodeList, rtneEntry->dst);
} }
else if (rtneEntry->src == L2_GetNodeId(instPtr) || rtneEntry->src == L2_BROADCAST_ID) else if (rtneEntry->src == L2_GetNodeId(instPtr) || rtneEntry->src == L2_BROADCAST_ID)
{ {
torState = L2_TOR_TX; torState = L2_TOR_TX;
commNode = L2_GetNodeById(rtneEntry->src); commNode = L2_GetNodeById(instPtr->nodeList, rtneEntry->src);
} }
else else
{ {
@@ -624,7 +624,7 @@ int32_t L2_Scan_Routine(L2_INST *instPtr, const L2_RTNE_TABLE_ENTRY *rtneEntry)
instPtr->log.lastBeamWidth = PHY_ANT_BEAM_25; instPtr->log.lastBeamWidth = PHY_ANT_BEAM_25;
if (commNode != NULL) if (commNode != NULL)
{ {
Phy_SetBeamNo(commNode->nodeInfo.beamNo); Phy_SetBeamNo(instPtr->config.phyInstPtr, commNode->nodeInfo.beamNo);
} }
} }
else else
df_datalink_sp/src/networking/link_layer/service.c
+2 -2
View File
@@ -373,12 +373,12 @@ int32_t L2_Service_Routine(L2_INST *instPtr, const L2_RTNE_TABLE_ENTRY *rtneEntr
if (rtneEntry->src == L2_GetNodeId(instPtr)) if (rtneEntry->src == L2_GetNodeId(instPtr))
{ {
torState = L2_TOR_TX; torState = L2_TOR_TX;
commNode = L2_GetNodeById(rtneEntry->src); commNode = L2_GetNodeById(instPtr->nodeList, rtneEntry->src);
} }
else if (rtneEntry->dst == L2_GetNodeId(instPtr)) else if (rtneEntry->dst == L2_GetNodeId(instPtr))
{ {
torState = L2_TOR_RX; torState = L2_TOR_RX;
commNode = L2_GetNodeById(rtneEntry->src); commNode = L2_GetNodeById(instPtr->nodeList, rtneEntry->src);
} }
else else
{ {