VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

VISA: Prevent crash if VISA library not available

This commit is contained in:
Jon Beniston 2022-09-16 14:48:17 +01:00
parent ce5837a392
commit 3bd0776706
1 changed files with 91 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sdrbase/util/visa.cpp
View File

@ -52,7 +52,7 @@ VISA::VISA() :
viFindRsrc = (ViStatus (*) (ViSession vi, ViString expr, ViPFindList li, ViPUInt32 retCnt, ViChar desc[])) libraryFunc(visaLibrary, "viFindRsrc");
viFindNext = (ViStatus (*) (ViSession vi, ViChar desc[])) libraryFunc(visaLibrary, "viFindNext");
if (viOpenDefaultRM && viOpen && viClose && viPrintf) {
if (viOpenDefaultRM && viOpen && viClose && viPrintf && viFindRsrc && viFindNext) {
m_available = true;
}
}
@ -111,8 +111,11 @@ void VISA::close(ViSession session)
QStringList VISA::processCommands(ViSession session, const QString& commands, bool *error)
{
QStringList list = commands.split("\n");
QStringList results;
if (isAvailable())
{
QStringList list = commands.split("\n");
ViStatus status;
if (error) {
@ -147,12 +150,20 @@ QStringList VISA::processCommands(ViSession session, const QString& commands, bo
}
}
}
}
else if (error)
{
*error = true;
}
return results;
}
QStringList VISA::findResources()
{
QStringList resources;
if (isAvailable())
{
ViChar rsrc[VI_FIND_BUFLEN];
ViFindList list;
ViRsrc matches = rsrc;
@ -170,10 +181,13 @@ QStringList VISA::findResources()
}
}
}
}
return resources;
}
bool VISA::identification(ViSession session, QString &manufacturer, QString &model, QString &serialNumber, QString &revision)
{
if (isAvailable())
{
QStringList result = processCommands(session, "*IDN?");
if ((result.size() == 1) && (!result[0].isEmpty()))
@ -200,6 +214,7 @@ bool VISA::identification(ViSession session, QString &manufacturer, QString &mod
<< "revision: " << revision;
return true;
}
}
return false;
}
@ -207,6 +222,9 @@ bool VISA::identification(ViSession session, QString &manufacturer, QString &mod
QList<VISA::Instrument> VISA::instruments(QRegularExpression *filter)
{
QList<VISA::Instrument> instruments;
if (isAvailable())
{
QStringList resourceList = findResources();
for (auto const &resource : resourceList)
@ -230,6 +248,7 @@ QList<VISA::Instrument> VISA::instruments(QRegularExpression *filter)
close(session);
}
}
}
return instruments;
}