VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-24 11:12:27 -04:00
Code Issues Projects Releases Wiki Activity

Perseus support (10)

Browse Source
This commit is contained in:
f4exb 2018-02-08 18:37:34 +01:00
parent 3ac1be034a
commit aaace4c55b
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/samplesource/perseus/CMakeLists.txt
View File

@ -5,7 +5,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(perseus_SOURCES set(perseus_SOURCES
perseusgui.cpp perseusgui.cpp
perseusinput.cpp perseusinput.cpp
# perseusplugin.cpp perseusplugin.cpp
perseussettings.cpp perseussettings.cpp
perseusthread.cpp perseusthread.cpp
) )
@ -13,7 +13,7 @@ set(perseus_SOURCES
set(perseus_HEADERS set(perseus_HEADERS
perseusgui.h perseusgui.h
perseusinput.h perseusinput.h
# perseusplugin.h perseusplugin.h
perseussettings.h perseussettings.h
perseusthread.h perseusthread.h
) )
@ -63,6 +63,7 @@ target_link_libraries(inputperseus
sdrbase sdrbase
sdrgui sdrgui
swagger swagger
perseusdevice
) )
else (BUILD_DEBIAN) else (BUILD_DEBIAN)
target_link_libraries(inputperseus target_link_libraries(inputperseus
@ -71,6 +72,7 @@ target_link_libraries(inputperseus
sdrbase sdrbase
sdrgui sdrgui
swagger swagger
perseusdevice
) )
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)

3
plugins/samplesource/perseus/perseusplugin.cpp
View File

@ -21,6 +21,7 @@
#include <device/devicesourceapi.h> #include <device/devicesourceapi.h>
#include "plugin/pluginapi.h" #include "plugin/pluginapi.h"
#include "util/simpleserializer.h" #include "util/simpleserializer.h"
#include "perseus/deviceperseus.h"
#include "perseusplugin.h" #include "perseusplugin.h"
#include "perseusgui.h" #include "perseusgui.h"
@ -35,7 +36,7 @@ const PluginDescriptor PerseusPlugin::m_pluginDescriptor = {
const QString PerseusPlugin::m_hardwareID = "Perseus"; const QString PerseusPlugin::m_hardwareID = "Perseus";
const QString PerseusPlugin::m_deviceTypeID = PERSEUS_DEVICE_TYPE_ID; const QString PerseusPlugin::m_deviceTypeID = PERSEUS_DEVICE_TYPE_ID;
const int AirspyHFPlugin::m_maxDevices = 32; const int PerseusPlugin::m_maxDevices = 32;
PerseusPlugin::PerseusPlugin(QObject* parent) : PerseusPlugin::PerseusPlugin(QObject* parent) :
QObject(parent) QObject(parent)

2
plugins/samplesource/perseus/perseusthread.cpp
View File

@ -17,6 +17,8 @@
#include <QtGlobal> #include <QtGlobal>
#include "perseusthread.h" #include "perseusthread.h"
PerseusThread *PerseusThread::m_this = 0;
PerseusThread::PerseusThread(perseus_descr* dev, SampleSinkFifo* sampleFifo, QObject* parent) : PerseusThread::PerseusThread(perseus_descr* dev, SampleSinkFifo* sampleFifo, QObject* parent) :
QThread(parent), QThread(parent),
m_running(false), m_running(false),

6
sdrbase/plugin/pluginmanager.cpp
View File

@ -121,18 +121,18 @@ void PluginManager::loadPluginsDir(const QDir& dir)
{ {
if (fileName.endsWith(".so") || fileName.endsWith(".dll") || fileName.endsWith(".dylib")) if (fileName.endsWith(".so") || fileName.endsWith(".dll") || fileName.endsWith(".dylib"))
{ {
qDebug() << "PluginManager::loadPlugins: fileName: " << qPrintable(fileName); qDebug() << "PluginManager::loadPluginsDir: fileName: " << qPrintable(fileName);
QPluginLoader* loader = new QPluginLoader(pluginsDir.absoluteFilePath(fileName)); QPluginLoader* loader = new QPluginLoader(pluginsDir.absoluteFilePath(fileName));
PluginInterface* plugin = qobject_cast<PluginInterface*>(loader->instance()); PluginInterface* plugin = qobject_cast<PluginInterface*>(loader->instance());
if (loader->isLoaded()) if (loader->isLoaded())
{ {
qInfo("PluginManager::loadPlugins: loaded plugin %s", qPrintable(fileName)); qInfo("PluginManager::loadPluginsDir: loaded plugin %s", qPrintable(fileName));
} }
else else
{ {
qWarning() << "PluginManager::loadPlugins: " << qPrintable(loader->errorString()); qWarning() << "PluginManager::loadPluginsDir: " << qPrintable(loader->errorString());
} }
if (plugin != 0) if (plugin != 0)