VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Perseus support (3)

This commit is contained in:
f4exb 2018-02-07 08:39:09 +01:00
parent fb2114a9f3
commit becbe0f96e
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devices/perseus/deviceperseus.h
View File

@ -25,11 +25,14 @@ public:
static DevicePerseus& instance(); static DevicePerseus& instance();
void scan() { m_scan.scan(m_nbDevices); } void scan() { m_scan.scan(m_nbDevices); }
void getSerials(std::vector<std::string>& serials) const { m_scan.getSerials(serials); } void getSerials(std::vector<std::string>& serials) const { m_scan.getSerials(serials); }
int getSequenceFromSerial(const std::string& serial) const { return m_scan.getSequenceFromSerial(serial); }
protected: protected:
DevicePerseus(); DevicePerseus();
DevicePerseus(const DevicePerseus&) : m_nbDevices(0) {} DevicePerseus(const DevicePerseus&) : m_nbDevices(0) {}
DevicePerseus& operator=(const DevicePerseus& other __attribute__((unused))) { return *this; } DevicePerseus& operator=(const DevicePerseus& other __attribute__((unused))) { return *this; }
~DevicePerseus(); ~DevicePerseus();
private: private:
int m_nbDevices; int m_nbDevices;
DevicePerseusScan m_scan; DevicePerseusScan m_scan;

16
devices/perseus/deviceperseusscan.cpp
View File

@ -37,14 +37,14 @@ void DevicePerseusScan::scan(int nbDevices)
continue; continue;
} }
// if (perseus_firmware_download(descr, 0) < 0) { if (perseus_firmware_download(descr, 0) < 0) {
// qCritical("DevicePerseusScan::scan: firmware download error: %s", perseus_errorstr()); qCritical("DevicePerseusScan::scan: firmware download error: %s", perseus_errorstr());
// continue; continue;
// } }
// else else
// { {
// qInfo("DevicePerseusScan::scan: device #%d firmware downloaded", deviceIndex); qInfo("DevicePerseusScan::scan: device #%d firmware downloaded", deviceIndex);
// } }
if (perseus_get_product_id(descr,&prodid) < 0) { if (perseus_get_product_id(descr,&prodid) < 0) {
qCritical("DevicePerseusScan::scan: get product id error: %s", perseus_errorstr()); qCritical("DevicePerseusScan::scan: get product id error: %s", perseus_errorstr());

6
plugins/samplesource/CMakeLists.txt
View File

@ -71,6 +71,12 @@ if(CM256CC_FOUND AND LIBNANOMSG_FOUND)
add_subdirectory(sdrdaemonsource) add_subdirectory(sdrdaemonsource)
endif(CM256CC_FOUND AND LIBNANOMSG_FOUND) endif(CM256CC_FOUND AND LIBNANOMSG_FOUND)
find_package(LibPerseus)
if(LIBUSB_FOUND AND RX_SAMPLE_24BIT AND LIBPERSEUS_FOUND)
message(STATUS "Add Persesus plugin")
add_subdirectory(perseus)
endif(LIBUSB_FOUND AND LIBPERSEUS_FOUND)
if (BUILD_DEBIAN) if (BUILD_DEBIAN)
if (LIBNANOMSG_FOUND) if (LIBNANOMSG_FOUND)
add_subdirectory(sdrdaemonsource) add_subdirectory(sdrdaemonsource)

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

@ -16,14 +16,13 @@
#include <QtPlugin> #include <QtPlugin>
#include <QAction> #include <QAction>
#include <perseus-sdr.h> #include "perseus-sdr.h"
#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 "airspyhfplugin.h" #include "perseusplugin.h"
#include "airspyhfgui.h" #include "perseusgui.h"
const PluginDescriptor PerseusPlugin::m_pluginDescriptor = { const PluginDescriptor PerseusPlugin::m_pluginDescriptor = {
QString("Perseus Input"), QString("Perseus Input"),