jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2026-04-06 06:53:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Zerospan mode for spectrum analyzer mode

Browse source
This commit is contained in:
Jan Käberich 2022-06-26 22:53:12 +02:00
parent 6adac7ebb4
commit 8492b38936
9 changed files with 96 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Software/VNA_embedded/Application/SpectrumAnalyzer.cpp
View file

@ -36,6 +36,10 @@ static uint8_t attenuator;
static int64_t trackingFreq;
static bool trackingLowband;
static uint64_t firstPointTime;
static bool firstPoint;
static bool zerospan;
static void StartNextSample() {
uint64_t freq = s.f_start + (s.f_stop - s.f_start) * pointCnt / (points - 1);
freq = Cal::FrequencyCorrectionToDevice(freq);
@ -205,6 +209,8 @@ void SA::Setup(Protocol::SpectrumAnalyzerSettings settings) {
points += s.pointNum - points % s.pointNum;
binSize = points / s.pointNum;
LOG_DEBUG("%u displayed points, resulting in %lu points and bins of size %u", s.pointNum, points, binSize);
zerospan = (s.f_start == s.f_stop);
// set initial state
pointCnt = 0;
// enable the required hardware resources
@ -256,6 +262,7 @@ void SA::Setup(Protocol::SpectrumAnalyzerSettings settings) {
}
lastLO2 = 0;
firstPoint = true;
active = true;
StartNextSample();
}
@ -375,7 +382,19 @@ void SA::Work() {
// Send result to application
p.type = Protocol::PacketType::SpectrumAnalyzerResult;
// measurements are already up to date, fill remaining fields
p.spectrumResult.frequency = s.f_start + (s.f_stop - s.f_start) * binIndex / (s.pointNum - 1);
if(zerospan) {
uint64_t timestamp = HW::getLastISRTimestamp();
if(firstPoint) {
p.spectrumResult.us = 0;
firstPointTime = timestamp;
firstPoint = false;
} else {
p.spectrumResult.us = timestamp - firstPointTime;
}
} else {
// non-zero span, set frequency
p.spectrumResult.frequency = s.f_start + (s.f_stop - s.f_start) * binIndex / (s.pointNum - 1);
}
// scale approximately (constant determined empirically)
p.spectrumResult.port1 /= 253000000.0;
p.spectrumResult.port2 /= 253000000.0;