jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2026-01-09 18:20:11 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

do not set OPC bit for *OPC?, allow exponential notation in integer parameters

Browse source
This commit is contained in:
Jan Käberich 2024-04-12 12:23:54 +02:00
parent 73ba0f9692
commit 5e75802bf4
2 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@ SCPI::SCPI() :
SCPINode("")
{
WAIexecuting = false;
OPCsetBitScheduled = false;
OPCQueryScheduled = false;
OCAS = false;
SESR = 0x00;
@ -39,6 +40,7 @@ SCPI::SCPI() :
add(new SCPICommand("*OPC", [=](QStringList){
// OPC command
if(isOperationPending()) {
OPCsetBitScheduled = true;
OCAS = true;
} else {
// operation already complete
@ -55,7 +57,6 @@ SCPI::SCPI() :
} else {
// no operation, can return immediately
OCAS = false;
setFlag(Flag::OPC);
return "1";
}
}));
@ -110,8 +111,14 @@ bool SCPI::paramToULongLong(QStringList params, int index, unsigned long long &d
if(index >= params.size()) {
return false;
}
bool okay;
dest = params[index].toULongLong(&okay);
double res;
bool okay = paramToDouble(params, index, res);
if(res > std::numeric_limits<unsigned long long>::max() || res < std::numeric_limits<unsigned long long>::min()) {
okay = false;
}
if(okay) {
dest = res;
}
return okay;
}
@ -120,8 +127,14 @@ bool SCPI::paramToLong(QStringList params, int index, long &dest)
if(index >= params.size()) {
return false;
}
bool okay;
dest = params[index].toLong(&okay);
double res;
bool okay = paramToDouble(params, index, res);
if(res > std::numeric_limits<long>::max() || res < std::numeric_limits<long>::min()) {
okay = false;
}
if(okay) {
dest = res;
}
return okay;
}
@ -131,10 +144,10 @@ bool SCPI::paramToBool(QStringList params, int index, bool &dest)
return false;
}
bool okay = false;
if(params[index] == "TRUE") {
if(params[index] == "TRUE" || params[index] == "ON" || params[index] == "1") {
dest = true;
okay = true;
} else if(params[index] == "FALSE") {
} else if(params[index] == "FALSE" || params[index] == "OFF" || params[index] == "0") {
dest = false;
okay = true;
}
@ -188,7 +201,9 @@ void SCPI::process()
if(response == getResultName(Result::Error)) {
setFlag(Flag::CME);
} else if(response == getResultName(Result::QueryError)) {
setFlag(Flag::QYE);
setFlag(Flag::CME);
} else if(response == getResultName(Result::CmdError)) {
setFlag(Flag::CME);
} else if(response == getResultName(Result::ExecError)) {
setFlag(Flag::EXE);
} else if(response == getResultName(Result::Empty)) {
@ -207,7 +222,10 @@ void SCPI::someOperationCompleted()
// all operations are complete
if(OCAS) {
OCAS = false;
setFlag(Flag::OPC);
if(OPCsetBitScheduled) {
setFlag(Flag::OPC);
OPCsetBitScheduled = false;
}
if(OPCQueryScheduled) {
output("1");
OPCQueryScheduled = false;

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

@ -116,6 +116,7 @@ private:
unsigned int ESE;
bool OCAS;
bool OPCsetBitScheduled;
bool OPCQueryScheduled;
bool WAIexecuting;