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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Documentation/UserManual/ProgrammingGuide.pdf
View File

Binary file not shown.

40
Documentation/UserManual/ProgrammingGuide.tex
View File

@ -346,8 +346,26 @@ These commands change or query VNA settings. Although most of them are available
\query{Queries the currently selected number of points}{VNA:ACQuisition:POINTS?}{None}{points}
\subsubsection{VNA:ACQuisition:AVG}
\event{Sets the number of sweeps over which a moving average is calculated}{VNA:ACQuisition:AVG}{<sweeps>}
\query{Queries the currently configured number of sweeps}{VNA:ACQuisition:AVG?}{None}{sweeps}
\event{Sets the number of sweeps over which a moving average is calculated}{VNA:ACQuisition:AVG}{<averaging sweeps>}
\query{Queries the currently configured number of sweeps}{VNA:ACQuisition:AVG?}{None}{<averaging sweeps>}
\subsubsection{VNA:ACQuisition:AVGLEVel}
\query{Queries the number of sweeps that have been acquired by the average function.}{VNA:ACQuisition:AVGLVLel?}{None}{<acquired sweeps>}
<acquired sweeps> resets to zero whenever a setting is changed. It is incremented at the end of each sweep, but will not go above the number of configured sweeps for the averaging.
Example (assuming <averaging sweep> = 3):
\begin{longtable}{p{.2\textwidth} | p{.2\textwidth} }
\textbf{\# of active sweep} & \textbf{<acquired sweeps>}\\
\hline
1 & 0\\
2 & 1\\
3 & 2\\
4 & 3\\
5 & 3\\
\end{longtable}
\subsubsection{VNA:ACQuisition:FINished}
\query{Queries whether the average filter has reached a steady state (that is <acquired sweeps> = <averaging sweeps>)}{VNA:ACQuisition:FINished?}{None}{TRUE or FALSE}
\subsubsection{VNA:STIMulus:LVL}
\event{Sets the output power of the stimulus signal}{VNA:STIMulus:LVL}{<power>, in dBm}
@ -513,6 +531,24 @@ These commands change or query spectrum analyzer settings. Although most of them
\event{Sets the number of sweeps over which a moving average is calculated}{SA:ACQuisition:AVG}{<sweeps>}
\query{Queries the currently configured number of sweeps}{SA:ACQuisition:AVG?}{None}{sweeps}
\subsubsection{SA:ACQuisition:AVGLEVel}
\query{Queries the number of sweeps that have been acquired by the average function.}{SA:ACQuisition:AVGLVLel?}{None}{<acquired sweeps>}
<acquired sweeps> resets to zero whenever a setting is changed. It is incremented at the end of each sweep, but will not go above the number of configured sweeps for the averaging.
Example (assuming <averaging sweep> = 3):
\begin{longtable}{p{.2\textwidth} | p{.2\textwidth} }
\textbf{\# of active sweep} & \textbf{<acquired sweeps>}\\
\hline
1 & 0\\
2 & 1\\
3 & 2\\
4 & 3\\
5 & 3\\
\end{longtable}
\subsubsection{SA:ACQuisition:FINished}
\query{Queries whether the average filter has reached a steady state (that is <acquired sweeps> = <averaging sweeps>)}{SA:ACQuisition:FINished?}{None}{TRUE or FALSE}
\subsubsection{SA:ACQuisition:SIGid}
\event{Enables/disables signal identification}{SA:ACQuisition:SIGid}{<enabled>, option are TRUE, FALSE, 1 or 0}
\query{Queries whether signal identification is enabled}{SA:ACQuisition:SIGid?}{None}{TRUE or FALSE}

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;