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

CLS/ESE/ESR commands

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

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

@ -8,12 +8,41 @@ SCPI::SCPI() :
WAIexecuting = false;
OPCQueryScheduled = false;
OCAS = false;
ESR = 0x00;
SESR = 0x00;
ESE = 0xFF;
add(new SCPICommand("*CLS", [=](QStringList) {
SESR = 0x00;
OCAS = false;
OPCQueryScheduled = false;
return SCPI::getResultName(SCPI::Result::Empty);
}, nullptr));
add(new SCPICommand("*ESE", [=](QStringList params){
unsigned long long newval;
if(!SCPI::paramToULongLong(params, 0, newval) || newval >= 256) {
return SCPI::getResultName(SCPI::Result::Error);
} else {
ESE = newval;
return SCPI::getResultName(SCPI::Result::Empty);
}
}, [=](QStringList){
return QString::number(ESE);
}));
add(new SCPICommand("*ESR", nullptr, [=](QStringList){
auto ret = QString::number(SESR);
SESR = 0x00;
return ret;
}));
add(new SCPICommand("*OPC", [=](QStringList){
// OPC command
if(isOperationPending()) {
OCAS = true;
} else {
// operation already complete
setFlag(Flag::OPC);
}
return SCPI::getResultName(SCPI::Result::Empty);
}, [=](QStringList) -> QString {
@ -194,17 +223,17 @@ void SCPI::someOperationCompleted()
void SCPI::setFlag(Flag flag)
{
ESR |= ((int) flag);
SESR |= ((int) flag);
}
void SCPI::clearFlag(Flag flag)
{
ESR &= ~((int) flag);
SESR &= ~((int) flag);
}
bool SCPI::getFlag(Flag flag)
{
return ESR & (int) flag;
return SESR & (int) flag;
}
SCPINode::~SCPINode()

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

@ -112,7 +112,8 @@ private:
void clearFlag(Flag flag);
bool getFlag(Flag flag);
unsigned int ESR;
unsigned int SESR;
unsigned int ESE;
bool OCAS;
bool OPCQueryScheduled;