1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-05 15:34:57 -04:00

Added Rx/Tx indicator, channel index and claiming device set index to the SamplingDevice struct used for device enumeration

This commit is contained in:
f4exb
2017-11-01 10:37:00 +01:00
parent 9293d4bc14
commit 66b06dcd08
18 changed files with 93 additions and 36 deletions
@@ -66,7 +66,9 @@ PluginInterface::SamplingDevices BladerfOutputPlugin::enumSampleSinks()
m_hardwareID,
m_deviceTypeID,
QString(devinfo[i].serial),
i));
i,
false,
0));
}
if (devinfo)
@@ -63,7 +63,9 @@ PluginInterface::SamplingDevices FileSinkPlugin::enumSampleSinks()
m_hardwareID,
m_deviceTypeID,
QString::null,
i));
i,
false,
0));
}
return result;
@@ -97,7 +97,9 @@ PluginInterface::SamplingDevices HackRFOutputPlugin::enumSampleSinks()
m_hardwareID,
m_deviceTypeID,
serial_str,
i));
i,
false,
0));
qDebug("HackRFOutputPlugin::enumSampleSinks: enumerated HackRF device #%d", i);
@@ -24,6 +24,7 @@
#include "plugin/pluginapi.h"
#include "util/simpleserializer.h"
#include "device/devicesinkapi.h"
#include "limesdr/devicelimesdrparam.h"
#include "limesdroutputgui.h"
#include "limesdroutputplugin.h"
@@ -82,13 +83,22 @@ PluginInterface::SamplingDevices LimeSDROutputPlugin::enumSampleSinks()
std::string serial("N/D");
findSerial((const char *) deviceList[i], serial);
qDebug("LimeSDROutputPlugin::enumSampleSources: device #%d: %s", i, (char *) deviceList[i]);
QString displayedName(QString("LimeSDR[%1] %2").arg(i).arg(serial.c_str()));
result.append(SamplingDevice(displayedName,
m_hardwareID,
m_deviceTypeID,
QString(deviceList[i]),
i));
DeviceLimeSDRParams limeSDRParams;
limeSDRParams.open(deviceList[i]);
limeSDRParams.close();
for (unsigned int j = 0; j < limeSDRParams.m_nbTxChannels; j++)
{
qDebug("LimeSDROutputPlugin::enumSampleSources: device #%d channel %u: %s", i, j, (char *) deviceList[i]);
QString displayedName(QString("LimeSDR[%1:%2] %3").arg(i).arg(j).arg(serial.c_str()));
result.append(SamplingDevice(displayedName,
m_hardwareID,
m_deviceTypeID,
QString(deviceList[i]),
i,
false,
j));
}
}
}
@@ -73,7 +73,9 @@ PluginInterface::SamplingDevices PlutoSDROutputPlugin::enumSampleSinks()
m_hardwareID,
m_deviceTypeID,
serial_str,
i));
i,
false,
0));
qDebug("PlutoSDROutputPlugin::enumSampleSources: enumerated PlutoSDR device #%d", i);
}
@@ -64,7 +64,9 @@ PluginInterface::SamplingDevices SDRdaemonSinkPlugin::enumSampleSinks()
m_hardwareID,
m_deviceTypeID,
QString::null,
i));
i,
false,
0));
}
return result;