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

use max harmonic frequency for limiting span when harmonic mixing enabled

Browse Source
This commit is contained in:
Jan Käberich 2021-04-17 23:22:14 +02:00
parent 9db83a608d
commit 26dc68fb73
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Software/PC_Application/VNA/vna.cpp
View File

@ -708,15 +708,16 @@ void VNA::SetCenterFreq(double freq)
void VNA::SetSpan(double span) 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; auto old_center = (settings.f_start + settings.f_stop) / 2;
if(old_center < Device::Info().limits_minFreq + span / 2) { if(old_center < Device::Info().limits_minFreq + span / 2) {
// would shift start frequency below minimum // would shift start frequency below minimum
settings.f_start = Device::Info().limits_minFreq; settings.f_start = Device::Info().limits_minFreq;
settings.f_stop = Device::Info().limits_minFreq + span; 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 // would shift stop frequency above maximum
settings.f_start = Device::Info().limits_maxFreq - span; settings.f_start = maxFreq - span;
settings.f_stop = Device::Info().limits_maxFreq; settings.f_stop = maxFreq;
} else { } else {
settings.f_start = old_center - span / 2; settings.f_start = old_center - span / 2;
settings.f_stop = settings.f_start + span; settings.f_stop = settings.f_start + span;