Handle more than two ports in SCPI and SA/SG GUI

This commit is contained in:
Jan Käberich 2022-08-23 00:37:25 +02:00
parent 4107c6ca73
commit 2b591aa362
12 changed files with 135 additions and 123 deletions

View file

@ -373,6 +373,8 @@ bool VirtualDevice::setSA(const VirtualDevice::SASettings &s, std::function<void
results.clear();
bool success = true;
for(unsigned int i=0;i<devices.size();i++) {
sd.trackingGenerator = 0;
sd.trackingGeneratorPort = 0;
if(s.trackingGenerator) {
if(CompoundDevice::PortMapping::findActiveStage(cdev->portMapping, i, 0) == s.trackingPort) {
sd.trackingGenerator = 1;
@ -381,10 +383,6 @@ bool VirtualDevice::setSA(const VirtualDevice::SASettings &s, std::function<void
sd.trackingGenerator = 1;
sd.trackingGeneratorPort = 1;
}
} else {
// not used
sd.trackingGenerator = 0;
sd.trackingGeneratorPort = 0;
}
sd.syncMaster = i == 0 ? 1 : 0;
success &= devices[i]->Configure(sd, [=](Device::TransmissionResult r){