jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2026-01-06 08:40:05 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

omit response to commands

Browse source
This commit is contained in:
Jan Käberich 2024-04-07 14:22:57 +02:00
parent 5d3ce139b4
commit de3f3c092a
2 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Software/PC_Application/LibreVNA-GUI/scpi.cpp
View file

@ -120,6 +120,12 @@ QString SCPI::getResultName(SCPI::Result r)
case Result::Error:
default:
return "ERROR";
case Result::CmdError:
return "CMD_ERROR";
case Result::QueryError:
return "QUERY_ERROR";
case Result::ExecError:
return "EXEC_ERROR";
case Result::False:
return "FALSE";
case Result::True:
@ -150,7 +156,17 @@ void SCPI::process()
cmd.remove(0, 1);
}
auto response = lastNode->parse(cmd, lastNode);
emit output(response);
if(response == getResultName(Result::Error)) {
setFlag(Flag::CME);
} else if(response == getResultName(Result::QueryError)) {
setFlag(Flag::QYE);
} else if(response == getResultName(Result::ExecError)) {
setFlag(Flag::EXE);
} else if(response == getResultName(Result::Empty)) {
// do nothing
} else {
emit output(response);
}
}
}
}
@ -425,17 +441,25 @@ QString SCPINode::parse(QString cmd, SCPINode* &lastNode)
QString SCPICommand::execute(QStringList params)
{
if(fn_cmd == nullptr) {
return SCPI::getResultName(SCPI::Result::Error);
return SCPI::getResultName(SCPI::Result::CmdError);
} else {
return fn_cmd(params);
auto ret = fn_cmd(params);
if(ret == SCPI::getResultName(SCPI::Result::Error)) {
ret = SCPI::getResultName(SCPI::Result::CmdError);
}
return ret;
}
}
QString SCPICommand::query(QStringList params)
{
if(fn_query == nullptr) {
return SCPI::getResultName(SCPI::Result::Error);
return SCPI::getResultName(SCPI::Result::QueryError);
} else {
return fn_query(params);
auto ret = fn_query(params);
if(ret == SCPI::getResultName(SCPI::Result::Error)) {
ret = SCPI::getResultName(SCPI::Result::QueryError);
}
return ret;
}
}

3
Software/PC_Application/LibreVNA-GUI/scpi.h
View file

@ -77,6 +77,9 @@ public:
enum class Result {
Empty,
Error,
CmdError,
QueryError,
ExecError,
False,
True
};