jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2026-04-04 14:07:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Additional SCPI commands: checking for end of sweep

Browse source
This commit is contained in:
Jan Käberich 2021-06-11 18:53:31 +02:00
parent 973862588b
commit cf401fcb01
5 changed files with 51 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.cpp
View file

@ -784,6 +784,12 @@ void SpectrumAnalyzer::SetupSCPI()
}, [=](QStringList) -> QString {
return QString::number(averages);
}));
scpi_acq->add(new SCPICommand("AVGLEVel", nullptr, [=](QStringList) -> QString {
return QString::number(average.getLevel());
}));
scpi_acq->add(new SCPICommand("FINished", nullptr, [=](QStringList) -> QString {
return average.getLevel() == averages ? "TRUE" : "FALSE";
}));
scpi_acq->add(new SCPICommand("SIGid", [=](QStringList params) -> QString {
if (params.size() != 1) {
return "ERROR";

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

@ -968,6 +968,12 @@ void VNA::SetupSCPI()
}, [=](QStringList) -> QString {
return QString::number(averages);
}));
scpi_acq->add(new SCPICommand("AVGLEVel", nullptr, [=](QStringList) -> QString {
return QString::number(average.getLevel());
}));
scpi_acq->add(new SCPICommand("FINished", nullptr, [=](QStringList) -> QString {
return average.getLevel() == averages ? "TRUE" : "FALSE";
}));
auto scpi_stim = new SCPINode("STIMulus");
SCPINode::add(scpi_stim);
scpi_stim->add(new SCPICommand("LVL", [=](QStringList params) -> QString {

2
Software/PC_Application/scpi.cpp
View file

@ -26,7 +26,7 @@ bool SCPI::match(QString s1, QString s2)
QString SCPI::alternateName(QString name)
{
while(name[name.size()-1].isLower()) {
while(name.size() > 0 && name[name.size()-1].isLower()) {
name.chop(1);
}
return name;