From d8d4b3385386d5cdcf529d821686589aa5910e79 Mon Sep 17 00:00:00 2001 From: Gatsby Van Date: Wed, 20 Dec 2023 18:40:57 +0800 Subject: [PATCH] add scanCnt to L2_SCAN_FSM --- datalink814_ge/src/linklayer/linklayer814_types.h | 1 + datalink814_ge/src/linklayer/net_scan.c | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/datalink814_ge/src/linklayer/linklayer814_types.h b/datalink814_ge/src/linklayer/linklayer814_types.h index ce14166..17a60a2 100644 --- a/datalink814_ge/src/linklayer/linklayer814_types.h +++ b/datalink814_ge/src/linklayer/linklayer814_types.h @@ -244,6 +244,7 @@ typedef struct { bool isLocked; // init acq done. bool isBmRcved;// bm received. bool isAcked; // 2way acq done. + uint32_t scanCnt; uint32_t bmTimeout; uint32_t w2acqTimeout; SCAN_STAGE scanStage; // only for member node diff --git a/datalink814_ge/src/linklayer/net_scan.c b/datalink814_ge/src/linklayer/net_scan.c index 7949fa6..1848346 100644 --- a/datalink814_ge/src/linklayer/net_scan.c +++ b/datalink814_ge/src/linklayer/net_scan.c @@ -440,7 +440,7 @@ static int32_t Scan_InitScanHandler(L2_INST* instPtr) { else { /* Antenna setting (reserved.) */ L2_SetupNextSlot(instPtr, L2_TOR_RX, L2_INTRA_SCAN_FRAME); - scanCnt++; + scanFsmPtr->scanCnt++; } } else if(scanFsmPtr->scanMode == INTER_CLUSTER_MODE){ @@ -448,12 +448,11 @@ static int32_t Scan_InitScanHandler(L2_INST* instPtr) { StageUpdate(scanFsmPtr, BM_ADVT_STAGE); /* Antenna setting (reserved.) */ L2_SetupNextSlot(instPtr, L2_TOR_RX, L2_INTER_BM_FRAME); - scanCnt = 0; } /* Otherwise remain INIT_SCAN_STAGE */ else { /* Antenna setting (reserved.) */ L2_SetupNextSlot(instPtr, L2_TOR_RX, L2_INTER_SCAN_FRAME); - scanCnt++; + scanFsmPtr->scanCnt++; } } else{