1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-01 21:54:55 -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
+3 -1
View File
@@ -99,7 +99,9 @@ PluginInterface::SamplingDevices AirspyPlugin::enumSampleSources()
m_hardwareID,
m_deviceTypeID,
serial_str,
i));
i,
true,
0));
qDebug("AirspyPlugin::enumSampleSources: enumerated Airspy device #%d", i);
}
@@ -67,7 +67,9 @@ PluginInterface::SamplingDevices BlderfInputPlugin::enumSampleSources()
m_hardwareID,
m_deviceTypeID,
QString(devinfo[i].serial),
i));
i,
true,
0));
}
if (devinfo)
+3 -1
View File
@@ -65,7 +65,9 @@ PluginInterface::SamplingDevices FCDProPlugin::enumSampleSources()
fcd_traits<Pro>::hardwareID,
fcd_traits<Pro>::interfaceIID,
serialNumber,
i));
i,
true,
0));
device_info = device_info->next;
i++;
@@ -67,7 +67,9 @@ PluginInterface::SamplingDevices FCDProPlusPlugin::enumSampleSources()
fcd_traits<ProPlus>::hardwareID,
fcd_traits<ProPlus>::interfaceIID,
serialNumber,
i));
i,
true,
0));
device_info = device_info->next;
i++;
@@ -63,7 +63,9 @@ PluginInterface::SamplingDevices FileSourcePlugin::enumSampleSources()
m_hardwareID,
m_deviceTypeID,
QString::null,
i));
i,
true,
0));
}
return result;
@@ -98,7 +98,9 @@ PluginInterface::SamplingDevices HackRFInputPlugin::enumSampleSources()
m_hardwareID,
m_deviceTypeID,
serial_str,
i));
i,
true,
0));
qDebug("HackRFPlugin::enumSampleSources: enumerated HackRF device #%d", i);
@@ -83,13 +83,22 @@ PluginInterface::SamplingDevices LimeSDRInputPlugin::enumSampleSources()
std::string serial("N/D");
findSerial((const char *) deviceList[i], serial);
qDebug("LimeSDRInputPlugin::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_nbRxChannels; j++)
{
qDebug("LimeSDRInputPlugin::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,
true,
j));
}
}
}
@@ -73,7 +73,9 @@ PluginInterface::SamplingDevices PlutoSDRInputPlugin::enumSampleSources()
m_hardwareID,
m_deviceTypeID,
serial_str,
i));
i,
true,
0));
qDebug("PlutoSDRInputPlugin::enumSampleSources: enumerated PlutoSDR device #%d", i);
}
+3 -1
View File
@@ -57,7 +57,9 @@ PluginInterface::SamplingDevices RTLSDRPlugin::enumSampleSources()
m_hardwareID,
m_deviceTypeID,
QString(serial),
i));
i,
true,
0));
}
return result;
}
@@ -64,7 +64,9 @@ PluginInterface::SamplingDevices SDRdaemonSourcePlugin::enumSampleSources()
m_hardwareID,
m_deviceTypeID,
QString::null,
i));
i,
true,
0));
}
return result;
@@ -77,7 +77,9 @@ PluginInterface::SamplingDevices SDRPlayPlugin::enumSampleSources()
m_hardwareID,
m_deviceTypeID,
QString(serial),
i));
i,
true,
0));
}
return result;