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

bugfix: correct coarse frequency formulation.

Browse Source
This commit is contained in:
Gatsby Van
2023-12-27 15:23:16 +08:00
parent 677b8b4af5
commit 6bf35c8c5d
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
datalink814_ge/src/phy_ctrl/phy_ctrl.c
+6 -6
View File
@@ -666,18 +666,18 @@ double Phy_GetCoarseFreqEst(PHY_INST *instPtr)
return INFINITY; // FIXME return INFINITY; // FIXME
} }
regValue = PhyRead(instPtr, COASE_FREQEST); regValue = PhyRead(instPtr, COASE_FREQEST);
acqFreqIdx = (regValue >> COASE_FREQEST_ACQ_SHIFT) && COASE_FREQEST_ACQ_MASK; acqFreqIdx = (regValue & COASE_FREQEST_ACQ_MASK) >> COASE_FREQEST_ACQ_SHIFT;
acqFreqIdx = 80 - acqFreqIdx; syncFreqIdx = (regValue & COASE_FREQEST_SYNC_MASK) >> COASE_FREQEST_SYNC_SHIFT;
syncFreqIdx = (regValue >> COASE_FREQEST_SYNC_SHIFT) && COASE_FREQEST_SYNC_MASK;
syncFreqIdx = 8 - syncFreqIdx;
if (frameType >= L1_200KBPS_5MS_FRAME) if (frameType >= L1_200KBPS_5MS_FRAME)
{ {
freqEst = (double)acqFreqIdx * (250e3 / 4); // 1.5M Rc
freqEst = (double)(80 - acqFreqIdx) * (31.25e3 / 4);
freqEst += (double)syncFreqIdx * 1.5e6 / 64 / 128; freqEst += (double)syncFreqIdx * 1.5e6 / 64 / 128;
} }
else else
{ {
freqEst = acqFreqIdx * (250e3 / 4); // 12M Rc
freqEst = (double)(8 - acqFreqIdx) * (250e3 / 4);
freqEst += (double)syncFreqIdx * 12e6 / 64 / 128; freqEst += (double)syncFreqIdx * 12e6 / 64 / 128;
} }
datalink814_ge/src/phy_ctrl/phy_ctrlreg.h
+2 -2
View File
@@ -225,8 +225,8 @@
#define COASE_FREQEST_ACQ_SHIFT 0 #define COASE_FREQEST_ACQ_SHIFT 0
#define COASE_FREQEST_ACQ_WIDTH 8 #define COASE_FREQEST_ACQ_WIDTH 8
#define COASE_FREQEST_ACQ_MASK 0x000000FFU #define COASE_FREQEST_ACQ_MASK 0x000000FFU
#define COASE_FREQEST_SYNC_SHIFT 0 #define COASE_FREQEST_SYNC_SHIFT 8
#define COASE_FREQEST_SYNC_WIDTH 16 #define COASE_FREQEST_SYNC_WIDTH 8
#define COASE_FREQEST_SYNC_MASK 0x000FF00U #define COASE_FREQEST_SYNC_MASK 0x000FF00U
/** /**