jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2026-04-17 20:33:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Optional harmonic mixing

Browse source
This commit is contained in:
Jan Käberich 2020-12-18 15:03:01 +01:00
parent d6ef96914a
commit 49e0b901fd
8 changed files with 76 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Software/PC_Application/VNA/vna.cpp
View file

@ -817,8 +817,15 @@ void VNA::StartCalibrationMeasurement(Calibration::Measurement m)
void VNA::ConstrainAndUpdateFrequencies()
{
if(settings.f_stop > Device::Info().limits_maxFreq) {
settings.f_stop = Device::Info().limits_maxFreq;
auto pref = Preferences::getInstance();
double maxFreq;
if(pref.Acquisition.harmonicMixing) {
maxFreq = Device::Info().limits_maxFreqHarmonic;
} else {
maxFreq = Device::Info().limits_maxFreq;
}
if(settings.f_stop > maxFreq) {
settings.f_stop = maxFreq;
}
if(settings.f_start > settings.f_stop) {
settings.f_start = settings.f_stop;