VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-08 17:04:46 -04:00
Code Issues Projects Releases Wiki Activity

New preset design: changed device registration

Browse Source
This commit is contained in:
f4exb
2015-09-30 06:57:40 +02:00
parent f50e717c20
commit a1efdcc8dc
13 changed files with 176 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/airspy/airspyplugin.cpp
+6 -5
View File
@@ -91,11 +91,12 @@ PluginInterface::SampleSourceDevices AirspyPlugin::enumSampleSources()
QString serial_str = QString::number(serial_msb, 16) + QString::number(serial_lsb, 16);
uint64_t serial_num = (((uint64_t) serial_msb)<<32) + serial_lsb;
QString displayedName(QString("Airspy #%1 0x%2").arg(i).arg(serial_str));
SimpleSerializer s(1);
s.writeS32(1, i);
s.writeString(2, serial_str);
s.writeU64(3, serial_num);
result.append(SampleSourceDevice(displayedName, "org.osmocom.sdr.samplesource.airspy", s.final()));
result.append(SampleSourceDevice(displayedName,
"org.osmocom.sdr.samplesource.airspy",
serial_str,
i));
qDebug("AirspyPlugin::enumSampleSources: enumerated Airspy device #%d", i);
}
plugins/samplesource/bladerf/bladerfplugin.cpp
+5 -4
View File
@@ -58,10 +58,11 @@ PluginInterface::SampleSourceDevices BlderfPlugin::enumSampleSources()
for(int i = 0; i < count; i++)
{
QString displayedName(QString("BladeRF #%1 %2 (%3,%4)").arg(devinfo[i].instance).arg(devinfo[i].serial).arg(devinfo[i].usb_bus).arg(devinfo[i].usb_addr));
SimpleSerializer s(1);
s.writeS32(1, i);
s.writeString(2, devinfo[i].serial);
result.append(SampleSourceDevice(displayedName, "org.osmocom.sdr.samplesource.bladerf", s.final()));
result.append(SampleSourceDevice(displayedName,
"org.osmocom.sdr.samplesource.bladerf",
QString(devinfo[i].serial),
i));
}
if (devinfo)
plugins/samplesource/fcdpro/fcdproplugin.cpp
+6 -4
View File
@@ -54,16 +54,18 @@ PluginInterface::SampleSourceDevices FCDProPlugin::enumSampleSources()
{
SampleSourceDevices result;
int i = 1;
int i = 0;
struct hid_device_info *device_info = hid_enumerate(fcd_traits<Pro>::vendorId, fcd_traits<Pro>::productId);
while (device_info != 0)
{
QString serialNumber = QString::fromWCharArray(device_info->serial_number);
QString displayedName(QString("%1 #%2 %3").arg(fcd_traits<Pro>::displayedName).arg(i).arg(serialNumber));
SimpleSerializer s(1);
s.writeS32(1, 0);
result.append(SampleSourceDevice(displayedName, fcd_traits<Pro>::interfaceIID, s.final()));
result.append(SampleSourceDevice(displayedName,
fcd_traits<Pro>::interfaceIID,
QString::null,
i));
device_info = device_info->next;
i++;
plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
+6 -4
View File
@@ -52,16 +52,18 @@ PluginInterface::SampleSourceDevices FCDProPlusPlugin::enumSampleSources()
{
SampleSourceDevices result;
int i = 1;
int i = 0;
struct hid_device_info *device_info = hid_enumerate(fcd_traits<ProPlus>::vendorId, fcd_traits<ProPlus>::productId);
while (device_info != 0)
{
QString serialNumber = QString::fromWCharArray(device_info->serial_number);
QString displayedName(QString("%1 #%2 %3").arg(fcd_traits<ProPlus>::displayedName).arg(i).arg(serialNumber));
SimpleSerializer s(1);
s.writeS32(1, 0);
result.append(SampleSourceDevice(displayedName, fcd_traits<ProPlus>::interfaceIID, s.final()));
result.append(SampleSourceDevice(displayedName,
fcd_traits<ProPlus>::interfaceIID,
QString::null,
i));
device_info = device_info->next;
i++;
plugins/samplesource/filesource/filesourceplugin.cpp
+5 -1
View File
@@ -59,7 +59,11 @@ PluginInterface::SampleSourceDevices FileSourcePlugin::enumSampleSources()
SimpleSerializer s(1);
s.writeS32(1, i);
s.writeString(2, "");
result.append(SampleSourceDevice(displayedName, "org.osmocom.sdr.samplesource.filesource", s.final()));
result.append(SampleSourceDevice(displayedName,
"org.osmocom.sdr.samplesource.filesource",
QString::null,
i));
}
return result;
plugins/samplesource/hackrf/hackrfplugin.cpp
+5 -1
View File
@@ -98,7 +98,11 @@ PluginInterface::SampleSourceDevices HackRFPlugin::enumSampleSources()
s.writeS32(1, i);
s.writeString(2, serial_str);
s.writeU64(3, serial_num);
result.append(SampleSourceDevice(displayedName, m_deviceTypeID, s.final()));
result.append(SampleSourceDevice(displayedName, m_deviceTypeID,
serial_str,
i));
qDebug("HackRFPlugin::enumSampleSources: enumerated HackRF device #%d", i);
hackrf_close(hackrf_ptr);
plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
+5 -3
View File
@@ -48,9 +48,11 @@ PluginInterface::SampleSourceDevices RTLSDRPlugin::enumSampleSources()
if(rtlsdr_get_device_usb_strings((uint32_t)i, vendor, product, serial) != 0)
continue;
QString displayedName(QString("RTL-SDR #%1 (%2 #%3)").arg(i + 1).arg(product).arg(serial));
SimpleSerializer s(1);
s.writeS32(1, i);
result.append(SampleSourceDevice(displayedName, "org.osmocom.sdr.samplesource.rtl-sdr", s.final()));
result.append(SampleSourceDevice(displayedName,
"org.osmocom.sdr.samplesource.rtl-sdr",
QString(serial),
i));
}
return result;
}