caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix pointNum in SA result for DFT mode with narrow spans

Browse Source
This commit is contained in:
Jan Käberich 2021-11-11 22:09:45 +01:00
parent 72f2a72445
commit 71b095cf2e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Software/VNA_embedded/Application/SpectrumAnalyzer.cpp
View File

@ -300,6 +300,10 @@ void SA::Work() {
if(!s.SignalID || signalIDstep >= signalIDsteps - 1) { if(!s.SignalID || signalIDstep >= signalIDsteps - 1) {
// this measurement point is done, handle result according to detector // this measurement point is done, handle result according to detector
for(uint16_t i=0;i<DFTpoints;i++) { for(uint16_t i=0;i<DFTpoints;i++) {
if(pointCnt + i >= points) {
// DFT covered more points than are required for the remaining sweep, can abort here
break;
}
uint16_t binIndex = (pointCnt + i) / binSize; uint16_t binIndex = (pointCnt + i) / binSize;
uint32_t pointInBin = (pointCnt + i) % binSize; uint32_t pointInBin = (pointCnt + i) % binSize;
bool lastPointInBin = pointInBin >= binSize - 1; bool lastPointInBin = pointInBin >= binSize - 1;
@ -386,7 +390,7 @@ void SA::Work() {
Communication::Send(packet); Communication::Send(packet);
} }
if(pointCnt < points - DFTpoints) { if(pointCnt + DFTpoints < points) {
pointCnt += DFTpoints; pointCnt += DFTpoints;
} else { } else {
pointCnt = 0; pointCnt = 0;