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

Tx support: interim state (1)

Browse Source
This commit is contained in:
f4exb
2016-12-29 12:41:10 +01:00
parent ddb3c6909b
commit f68f949c19
34 changed files with 433 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesink/CMakeLists.txt
+11
View File
@@ -1,4 +1,15 @@
project(samplesink)
find_package(LibUSB)
find_package(LibBLADERF)
if(LIBUSB_FOUND AND LIBBLADERF_FOUND)
add_subdirectory(bladerfoutput)
endif(LIBUSB_FOUND AND LIBBLADERF_FOUND)
if (BUILD_DEBIAN)
add_subdirectory(bladerfoutput)
endif (BUILD_DEBIAN)
add_subdirectory(filesink)
plugins/samplesink/filesink/filesinkplugin.cpp
+3 -1
View File
@@ -25,13 +25,14 @@
const PluginDescriptor FileSinkPlugin::m_pluginDescriptor = {
QString("File sink output"),
QString("2.2.1"),
QString("3.0.0"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,
QString("https://github.com/f4exb/sdrangel")
};
const QString FileSinkPlugin::m_hardwareID = "FileSink";
const QString FileSinkPlugin::m_deviceTypeID = FILESINK_DEVICE_TYPE_ID;
FileSinkPlugin::FileSinkPlugin(QObject* parent) :
@@ -59,6 +60,7 @@ PluginInterface::SamplingDevices FileSinkPlugin::enumSampleSinks()
QString displayedName(QString("FileSink[%1]").arg(i));
result.append(SamplingDevice(displayedName,
m_hardwareID,
m_deviceTypeID,
QString::null,
i));
plugins/samplesink/filesink/filesinkplugin.h
+2 -1
View File
@@ -39,7 +39,8 @@ public:
virtual SamplingDevices enumSampleSinks();
virtual PluginGUI* createSampleSinkPluginGUI(const QString& sourceId, QWidget **widget, DeviceSinkAPI *deviceAPI);
static const QString m_deviceTypeID;
static const QString m_hardwareID;
static const QString m_deviceTypeID;
private:
static const PluginDescriptor m_pluginDescriptor;
plugins/samplesource/airspy/airspyplugin.cpp
+3 -1
View File
@@ -27,13 +27,14 @@
const PluginDescriptor AirspyPlugin::m_pluginDescriptor = {
QString("Airspy Input"),
QString("2.0.0"),
QString("3.0.0"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,
QString("https://github.com/f4exb/sdrangel")
};
const QString AirspyPlugin::m_hardwareID = "Airspy";
const QString AirspyPlugin::m_deviceTypeID = AIRSPY_DEVICE_TYPE_ID;
AirspyPlugin::AirspyPlugin(QObject* parent) :
@@ -95,6 +96,7 @@ PluginInterface::SamplingDevices AirspyPlugin::enumSampleSources()
QString displayedName(QString("Airspy[%1] %2").arg(i).arg(serial_str));
result.append(SamplingDevice(displayedName,
m_hardwareID,
m_deviceTypeID,
serial_str,
i));
plugins/samplesource/airspy/airspyplugin.h
+2 -1
View File
@@ -38,7 +38,8 @@ public:
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_deviceTypeID;
static const QString m_hardwareID;
static const QString m_deviceTypeID;
private:
static const PluginDescriptor m_pluginDescriptor;
plugins/samplesource/bladerfinput/bladerfinputplugin.cpp
+3 -1
View File
@@ -27,13 +27,14 @@
const PluginDescriptor BlderfInputPlugin::m_pluginDescriptor = {
QString("BladerRF Input"),
QString("2.0.0"),
QString("3.0.0"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,
QString("https://github.com/f4exb/sdrangel")
};
const QString BlderfInputPlugin::m_hardwareID = "BladeRF";
const QString BlderfInputPlugin::m_deviceTypeID = BLADERF_DEVICE_TYPE_ID;
BlderfInputPlugin::BlderfInputPlugin(QObject* parent) :
@@ -63,6 +64,7 @@ PluginInterface::SamplingDevices BlderfInputPlugin::enumSampleSources()
QString displayedName(QString("BladeRF[%1] %2").arg(devinfo[i].instance).arg(devinfo[i].serial));
result.append(SamplingDevice(displayedName,
m_hardwareID,
m_deviceTypeID,
QString(devinfo[i].serial),
i));
plugins/samplesource/bladerfinput/bladerfinputplugin.h
+2 -1
View File
@@ -38,7 +38,8 @@ public:
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_deviceTypeID;
static const QString m_hardwareID;
static const QString m_deviceTypeID;
private:
static const PluginDescriptor m_pluginDescriptor;
plugins/samplesource/fcdpro/fcdproplugin.cpp
+2 -3
View File
@@ -34,8 +34,6 @@ const PluginDescriptor FCDProPlugin::m_pluginDescriptor = {
QString("https://github.com/f4exb/sdrangel")
};
const QString FCDProPlugin::m_deviceTypeID = FCDPRO_DEVICE_TYPE_ID;
FCDProPlugin::FCDProPlugin(QObject* parent) :
QObject(parent)
{
@@ -64,7 +62,8 @@ PluginInterface::SamplingDevices FCDProPlugin::enumSampleSources()
QString displayedName(QString("%1[%2] %3").arg(fcd_traits<Pro>::displayedName).arg(i).arg(serialNumber));
result.append(SamplingDevice(displayedName,
fcd_traits<Pro>::interfaceIID,
fcd_traits<Pro>::hardwareID,
fcd_traits<Pro>::interfaceIID,
serialNumber,
i));
plugins/samplesource/fcdpro/fcdproplugin.h
-2
View File
@@ -22,8 +22,6 @@ public:
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_deviceTypeID;
private:
static const PluginDescriptor m_pluginDescriptor;
};
plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
+1
View File
@@ -64,6 +64,7 @@ PluginInterface::SamplingDevices FCDProPlusPlugin::enumSampleSources()
QString displayedName(QString("%1[%2] %3").arg(fcd_traits<ProPlus>::displayedName).arg(i).arg(serialNumber));
result.append(SamplingDevice(displayedName,
fcd_traits<ProPlus>::hardwareID,
fcd_traits<ProPlus>::interfaceIID,
serialNumber,
i));
plugins/samplesource/filesource/filesourceplugin.cpp
+3 -1
View File
@@ -25,13 +25,14 @@
const PluginDescriptor FileSourcePlugin::m_pluginDescriptor = {
QString("File source input"),
QString("2.1.5"),
QString("3.0.0"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,
QString("https://github.com/f4exb/sdrangel")
};
const QString FileSourcePlugin::m_hardwareID = "FileSource";
const QString FileSourcePlugin::m_deviceTypeID = FILESOURCE_DEVICE_TYPE_ID;
FileSourcePlugin::FileSourcePlugin(QObject* parent) :
@@ -59,6 +60,7 @@ PluginInterface::SamplingDevices FileSourcePlugin::enumSampleSources()
QString displayedName(QString("FileSource[%1]").arg(i));
result.append(SamplingDevice(displayedName,
m_hardwareID,
m_deviceTypeID,
QString::null,
i));
plugins/samplesource/filesource/filesourceplugin.h
+2 -1
View File
@@ -38,7 +38,8 @@ public:
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_deviceTypeID;
static const QString m_hardwareID;
static const QString m_deviceTypeID;
private:
static const PluginDescriptor m_pluginDescriptor;
plugins/samplesource/hackrfinput/hackrfinputplugin.cpp
+5 -2
View File
@@ -29,13 +29,14 @@
const PluginDescriptor HackRFInputPlugin::m_pluginDescriptor = {
QString("HackRF Input"),
QString("2.0.0"),
QString("3.0.0"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,
QString("https://github.com/f4exb/sdrangel")
};
const QString HackRFInputPlugin::m_hardwareID = "HackRF";
const QString HackRFInputPlugin::m_deviceTypeID = HACKRF_DEVICE_TYPE_ID;
HackRFInputPlugin::HackRFInputPlugin(QObject* parent) :
@@ -92,7 +93,9 @@ PluginInterface::SamplingDevices HackRFInputPlugin::enumSampleSources()
uint64_t serial_num = (((uint64_t) serial_msb)<<32) + serial_lsb;
QString displayedName(QString("HackRF[%1] %2").arg(i).arg(serial_str));
result.append(SamplingDevice(displayedName, m_deviceTypeID,
result.append(SamplingDevice(displayedName,
m_hardwareID,
m_deviceTypeID,
serial_str,
i));
plugins/samplesource/hackrfinput/hackrfinputplugin.h
+2 -1
View File
@@ -38,7 +38,8 @@ public:
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_deviceTypeID;
static const QString m_hardwareID;
static const QString m_deviceTypeID;
private:
static const PluginDescriptor m_pluginDescriptor;
plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
+3 -1
View File
@@ -11,13 +11,14 @@
const PluginDescriptor RTLSDRPlugin::m_pluginDescriptor = {
QString("RTL-SDR Input"),
QString("2.1.6"),
QString("3.0.0"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,
QString("https://github.com/f4exb/sdrangel")
};
const QString RTLSDRPlugin::m_hardwareID = "RTLSDR";
const QString RTLSDRPlugin::m_deviceTypeID = RTLSDR_DEVICE_TYPE_ID;
RTLSDRPlugin::RTLSDRPlugin(QObject* parent) :
@@ -53,6 +54,7 @@ PluginInterface::SamplingDevices RTLSDRPlugin::enumSampleSources()
QString displayedName(QString("RTL-SDR[%1] %2").arg(i).arg(serial));
result.append(SamplingDevice(displayedName,
m_hardwareID,
m_deviceTypeID,
QString(serial),
i));
plugins/samplesource/rtlsdr/rtlsdrplugin.h
+2 -1
View File
@@ -22,7 +22,8 @@ public:
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_deviceTypeID;
static const QString m_hardwareID;
static const QString m_deviceTypeID;
private:
static const PluginDescriptor m_pluginDescriptor;
plugins/samplesource/sdrdaemon/sdrdaemonplugin.cpp
+3 -1
View File
@@ -25,13 +25,14 @@
const PluginDescriptor SDRdaemonPlugin::m_pluginDescriptor = {
QString("SDRdaemon input"),
QString("2.0.0"),
QString("3.0.0"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,
QString("https://github.com/f4exb/sdrangel")
};
const QString SDRdaemonPlugin::m_hardwareID = "SDRdaemon";
const QString SDRdaemonPlugin::m_deviceTypeID = SDRDAEMON_DEVICE_TYPE_ID;
SDRdaemonPlugin::SDRdaemonPlugin(QObject* parent) :
@@ -59,6 +60,7 @@ PluginInterface::SamplingDevices SDRdaemonPlugin::enumSampleSources()
QString displayedName(QString("SDRdaemon[%1]").arg(i));
result.append(SamplingDevice(displayedName,
m_hardwareID,
m_deviceTypeID,
QString::null,
i));
plugins/samplesource/sdrdaemon/sdrdaemonplugin.h
+2 -1
View File
@@ -38,7 +38,8 @@ public:
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_deviceTypeID;
static const QString m_hardwareID;
static const QString m_deviceTypeID;
private:
static const PluginDescriptor m_pluginDescriptor;
plugins/samplesource/sdrdaemonfec/sdrdaemonfecplugin.cpp
+3 -1
View File
@@ -27,13 +27,14 @@
const PluginDescriptor SDRdaemonFECPlugin::m_pluginDescriptor = {
QString("SDRdaemon with FEC input"),
QString("2.1.0"),
QString("3.0.0"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,
QString("https://github.com/f4exb/sdrangel")
};
const QString SDRdaemonFECPlugin::m_hardwareID = "SDRdaemonFEC";
const QString SDRdaemonFECPlugin::m_deviceTypeID = SDRDAEMONFEC_DEVICE_TYPE_ID;
SDRdaemonFECPlugin::SDRdaemonFECPlugin(QObject* parent) :
@@ -61,6 +62,7 @@ PluginInterface::SamplingDevices SDRdaemonFECPlugin::enumSampleSources()
QString displayedName(QString("SDRdaemonFEC[%1]").arg(i));
result.append(SamplingDevice(displayedName,
m_hardwareID,
m_deviceTypeID,
QString::null,
i));
plugins/samplesource/sdrdaemonfec/sdrdaemonfecplugin.h
+2 -1
View File
@@ -38,7 +38,8 @@ public:
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_deviceTypeID;
static const QString m_hardwareID;
static const QString m_deviceTypeID;
private:
static const PluginDescriptor m_pluginDescriptor;
plugins/samplesource/sdrplay/sdrplayplugin.cpp
+4 -2
View File
@@ -24,14 +24,15 @@
#include <device/devicesourceapi.h>
const PluginDescriptor SDRPlayPlugin::m_pluginDescriptor = {
QString("SDRPlay Input"),
QString("2.3.0"),
QString("SDRPlay RSP1 Input"),
QString("3.0.0"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,
QString("https://github.com/f4exb/sdrangel")
};
const QString SDRPlayPlugin::m_hardwareID = "SDRplay1";
const QString SDRPlayPlugin::m_deviceTypeID = SDRPLAY_DEVICE_TYPE_ID;
SDRPlayPlugin::SDRPlayPlugin(QObject* parent) :
@@ -73,6 +74,7 @@ PluginInterface::SamplingDevices SDRPlayPlugin::enumSampleSources()
QString displayedName(QString("SDRPlay[%1] %2").arg(i).arg(serial));
result.append(SamplingDevice(displayedName,
m_hardwareID,
m_deviceTypeID,
QString(serial),
i));
plugins/samplesource/sdrplay/sdrplayplugin.h
+1
View File
@@ -38,6 +38,7 @@ public:
virtual SamplingDevices enumSampleSources();
virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
static const QString m_hardwareID;
static const QString m_deviceTypeID;
private: