From 26dc68fb739fcd5b89430bfb5039448fbcac8cfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20K=C3=A4berich?= Date: Sat, 17 Apr 2021 23:22:14 +0200 Subject: [PATCH] use max harmonic frequency for limiting span when harmonic mixing enabled --- Software/PC_Application/VNA/vna.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Software/PC_Application/VNA/vna.cpp b/Software/PC_Application/VNA/vna.cpp index ffb3e5a..d82a54d 100644 --- a/Software/PC_Application/VNA/vna.cpp +++ b/Software/PC_Application/VNA/vna.cpp @@ -708,15 +708,16 @@ void VNA::SetCenterFreq(double freq) void VNA::SetSpan(double span) { + auto maxFreq = Preferences::getInstance().Acquisition.harmonicMixing ? Device::Info().limits_maxFreqHarmonic : Device::Info().limits_maxFreq; auto old_center = (settings.f_start + settings.f_stop) / 2; if(old_center < Device::Info().limits_minFreq + span / 2) { // would shift start frequency below minimum settings.f_start = Device::Info().limits_minFreq; settings.f_stop = Device::Info().limits_minFreq + span; - } else if(old_center > Device::Info().limits_maxFreq - span / 2) { + } else if(old_center > maxFreq - span / 2) { // would shift stop frequency above maximum - settings.f_start = Device::Info().limits_maxFreq - span; - settings.f_stop = Device::Info().limits_maxFreq; + settings.f_start = maxFreq - span; + settings.f_stop = maxFreq; } else { settings.f_start = old_center - span / 2; settings.f_stop = settings.f_start + span;