XiaQingMiao/datalink_nc_mode
1
0
Fork 0
forked from gatsby/datalink_repo
Code Pull Requests Activity

add scanCnt to L2_SCAN_FSM

Browse Source
This commit is contained in:
Gatsby Van
2023-12-20 18:40:57 +08:00
parent a983e32a26
commit d8d4b33853
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
datalink814_ge/src/linklayer/linklayer814_types.h
+1
View File
@@ -244,6 +244,7 @@ typedef struct {
bool isLocked; // init acq done. bool isLocked; // init acq done.
bool isBmRcved;// bm received. bool isBmRcved;// bm received.
bool isAcked; // 2way acq done. bool isAcked; // 2way acq done.
uint32_t scanCnt;
uint32_t bmTimeout; uint32_t bmTimeout;
uint32_t w2acqTimeout; uint32_t w2acqTimeout;
SCAN_STAGE scanStage; // only for member node SCAN_STAGE scanStage; // only for member node
datalink814_ge/src/linklayer/net_scan.c
+2 -3
View File
@@ -440,7 +440,7 @@ static int32_t Scan_InitScanHandler(L2_INST* instPtr) {
else { else {
/* Antenna setting (reserved.) */ /* Antenna setting (reserved.) */
L2_SetupNextSlot(instPtr, L2_TOR_RX, L2_INTRA_SCAN_FRAME); L2_SetupNextSlot(instPtr, L2_TOR_RX, L2_INTRA_SCAN_FRAME);
scanCnt++; scanFsmPtr->scanCnt++;
} }
} }
else if(scanFsmPtr->scanMode == INTER_CLUSTER_MODE){ else if(scanFsmPtr->scanMode == INTER_CLUSTER_MODE){
@@ -448,12 +448,11 @@ static int32_t Scan_InitScanHandler(L2_INST* instPtr) {
StageUpdate(scanFsmPtr, BM_ADVT_STAGE); StageUpdate(scanFsmPtr, BM_ADVT_STAGE);
/* Antenna setting (reserved.) */ /* Antenna setting (reserved.) */
L2_SetupNextSlot(instPtr, L2_TOR_RX, L2_INTER_BM_FRAME); L2_SetupNextSlot(instPtr, L2_TOR_RX, L2_INTER_BM_FRAME);
scanCnt = 0;
} /* Otherwise remain INIT_SCAN_STAGE */ } /* Otherwise remain INIT_SCAN_STAGE */
else { else {
/* Antenna setting (reserved.) */ /* Antenna setting (reserved.) */
L2_SetupNextSlot(instPtr, L2_TOR_RX, L2_INTER_SCAN_FRAME); L2_SetupNextSlot(instPtr, L2_TOR_RX, L2_INTER_SCAN_FRAME);
scanCnt++; scanFsmPtr->scanCnt++;
} }
} }
else{ else{