From f688aaa2205ca2408f3cfc2a55327bd35ce9522b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20K=C3=A4berich?= Date: Sat, 13 Nov 2021 19:26:27 +0100 Subject: [PATCH] Additional debug output for point numbers --- .../SpectrumAnalyzer/spectrumanalyzer.cpp | 10 ++++++++++ Software/PC_Application/VNA/vna.cpp | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.cpp b/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.cpp index cb99744..b66be51 100644 --- a/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.cpp +++ b/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.cpp @@ -413,6 +413,11 @@ using namespace std; void SpectrumAnalyzer::NewDatapoint(Protocol::SpectrumAnalyzerResult d) { + if(d.pointNum >= settings.pointNum) { + qWarning() << "Ignoring point with too large point number (" << d.pointNum << ")"; + return; + } + d = average.process(d); if(normalize.measuring) { @@ -451,6 +456,11 @@ void SpectrumAnalyzer::NewDatapoint(Protocol::SpectrumAnalyzerResult d) UpdateAverageCount(); markerModel->updateMarkers(); } + static unsigned int lastPoint = 0; + if(d.pointNum > 0 && d.pointNum != lastPoint + 1) { + qWarning() << "Got point" << d.pointNum << "but last received point was" << lastPoint << "("<<(d.pointNum-lastPoint-1)<<"missed points)"; + } + lastPoint = d.pointNum; } void SpectrumAnalyzer::SettingsChanged() diff --git a/Software/PC_Application/VNA/vna.cpp b/Software/PC_Application/VNA/vna.cpp index 13b8881..40073fa 100644 --- a/Software/PC_Application/VNA/vna.cpp +++ b/Software/PC_Application/VNA/vna.cpp @@ -760,6 +760,11 @@ using namespace std; void VNA::NewDatapoint(Protocol::Datapoint d) { + if(d.pointNum >= settings.npoints) { + qWarning() << "Ignoring point with too large point number (" << d.pointNum << ")"; + return; + } + d = average.process(d); if(calMeasuring) { if(average.currentSweep() == averages) {