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

Improve taking de-embedding measurements

Browse source 
- Automatically restart measurement even when the sweep was stopped
- Fix crash due to zeroed de-embedding reference impedance
- Fix crash due to not cleaned up dialog pointer with dangling connections
- Automatically excite the correct ports for the measurement
This commit is contained in:
Jan Käberich 2024-05-17 19:07:34 +02:00
parent e1168f2a32
commit fe08937bb7
5 changed files with 56 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp
View file

@ -192,6 +192,18 @@ VNA::VNA(AppWindow *window, QString name)
enableDeembeddingAction->setEnabled(false);
manualDeembed->setEnabled(false);
});
connect(&deembedding, &Deembedding::triggerMeasurement, [=]() {
// de-embedding measurement requested
wasRunningBeforeDeembeddingMeasurement = running;
Run();
});
connect(&deembedding, &Deembedding::finishedMeasurement, [=](){
if(wasRunningBeforeDeembeddingMeasurement) {
Run();
} else {
Stop();
}
});
// Tools menu
auto toolsMenu = new QMenu("Tools", window);
@ -1220,6 +1232,7 @@ void VNA::SetPoints(unsigned int points)
settings.activeSegment = 0;
}
emit pointsChanged(points);
deembedding.setPointsInSweepForMeasurement(points);
settings.npoints = points;
SettingsChanged();
}
@ -1799,9 +1812,18 @@ void VNA::ConfigureDevice(bool resetTraces, std::function<void(bool)> cb)
s.excitedPorts.push_back(i);
}
} else {
for(unsigned int i=1;i<=DeviceDriver::getInfo(window->getDevice()).Limits.VNA.ports;i++) {
if(traceModel.PortExcitationRequired(i))
s.excitedPorts.push_back(i);
if(deembedding.isMeasuring()) {
// use the required ports for the de-embedding measurement
for(auto p : deembedding.getAffectedPorts()) {
s.excitedPorts.push_back(p);
}
} else {
// use the required ports from the trace model
for(unsigned int i=1;i<=DeviceDriver::getInfo(window->getDevice()).Limits.VNA.ports;i++) {
if(traceModel.PortExcitationRequired(i)) {
s.excitedPorts.push_back(i);
}
}
}
}
settings.excitedPorts = s.excitedPorts;