VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-15 12:51:49 -05:00
Code Issues Projects Releases Wiki Activity

Perseus support (6)

Browse Source
This commit is contained in:
f4exb 2018-02-07 23:44:20 +01:00
parent 1f0f5d2520
commit 70ce8f1044
4 changed files with 168 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@ set(perseus_SOURCES
# perseusinput.cpp
# perseusplugin.cpp
perseussettings.cpp
# perseusthread.cpp
perseusthread.cpp
)
set(perseus_HEADERS
@ -15,7 +15,7 @@ set(perseus_HEADERS
# perseusinput.h
# perseusplugin.h
perseussettings.h
# perseusthread.h
perseusthread.h
)
set(perseus_FORMS
@ -27,15 +27,15 @@ include_directories(
.
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
${LIBAIRSPYHFSRC}
${LIBAIRSPYHFSRC}/libperseus/src
${LIBPERSEUSSRC}
${LIBPERSEUSSRC}/libperseus/src
)
else (BUILD_DEBIAN)
include_directories(
.
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
${LIBAIRSPYHF_INCLUDE_DIR}
${LIBPERSEUS_INCLUDE_DIR}
)
endif (BUILD_DEBIAN)
@ -65,7 +65,7 @@ target_link_libraries(inputperseus
else (BUILD_DEBIAN)
target_link_libraries(inputperseus
${QT_LIBRARIES}
${LIBAIRSPYHF_LIBRARIES}
${LIBPERSEUS_LIBRARIES}
sdrbase
sdrgui
swagger

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

@ -17,12 +17,56 @@
#include <QtGlobal>
#include "perseusthread.h"
PerseusThread::PerseusThread(perseus_descr* dev, SampleSinkFifo* sampleFifo, QObject* parent) :
QThread(parent),
m_running(false),
m_dev(dev),
m_convertBuffer(PERSEUS_NBSAMPLES),
m_sampleFifo(sampleFifo),
m_samplerate(10),
m_log2Decim(0)
{
m_this = this;
}
PerseusThread::~PerseusThread()
{
stopWork();
m_this = 0;
}
void PerseusThread::startWork()
{
m_startWaitMutex.lock();
start();
while(!m_running)
m_startWaiter.wait(&m_startWaitMutex, 100);
m_startWaitMutex.unlock();
}
void PerseusThread::stopWork()
{
qDebug("AirspyThread::stopWork");
m_running = false;
wait();
}
void PerseusThread::setSamplerate(uint32_t samplerate)
{
m_samplerate = samplerate;
}
void PerseusThread::setLog2Decimation(unsigned int log2_decim)
{
m_log2Decim = log2_decim;
}
void PerseusThread::run()
{
m_running = true;
m_startWaiter.wakeAll();
int rc = perseus_start_async_input(m_dev, 6*1024, rx_callback, 0);
int rc = perseus_start_async_input(m_dev, PERSEUS_BLOCKSIZE, rx_callback, 0);
if (rc < 0) {
qCritical("PerseusThread::run: failed to start Perseus Rx: %s", perseus_errorstr());
@ -47,12 +91,30 @@ void PerseusThread::run()
void PerseusThread::callback(const uint8_t* buf, qint32 len)
{
SampleVector::iterator it = m_convertBuffer.begin();
switch (m_log2Decim)
{
case 0:
m_decimators32.decimate1(&it, (TripleByteLE<qint32>*) buf, len);
break;
case 1:
m_decimators64.decimate2_cen(&it, (TripleByteLE<qint64>*) buf, len);
break;
case 2:
m_decimators64.decimate4_cen(&it, (TripleByteLE<qint64>*) buf, len);
break;
default:
break;
}
int PerseusThread::rx_callback(void *buf, int buf_size, void *extra)
m_sampleFifo->write(m_convertBuffer.begin(), it);
}
int PerseusThread::rx_callback(void *buf, int buf_size, void *extra __attribute__((unused)))
{
qint32 nbIAndQ = buf_size / 3; // 3 bytes per I or Q
m_this->callback((uint8_t*) buf, nbIAndQ);
return 0;
}

12
plugins/samplesource/perseus/perseusthread.h
View File

@ -22,8 +22,11 @@
#include <QWaitCondition>
#include "perseus-sdr.h"
//#define PERSEUS_NBSAMPLES = 1024 // Number of I/Q samples in each callback from Perseus
//#define PERSEUS_BLOCKSIZE = 6*PERSEUS_NBSAMPLES // Perseus sends 2*3 bytes samples
#include "dsp/samplesinkfifo.h"
#include "dsp/decimators.h"
#define PERSEUS_NBSAMPLES 1024 // Number of I/Q samples in each callback from Perseus
#define PERSEUS_BLOCKSIZE 6*PERSEUS_NBSAMPLES // Perseus sends 2*3 bytes samples
class PerseusThread : public QThread {
Q_OBJECT
@ -43,7 +46,7 @@ private:
bool m_running;
perseus_descr* m_dev;
qint32 m_buf[2*1024];
qint32 m_buf[2*PERSEUS_NBSAMPLES];
SampleVector m_convertBuffer;
SampleSinkFifo* m_sampleFifo;
@ -51,7 +54,8 @@ private:
unsigned int m_log2Decim;
static PerseusThread *m_this;
Decimators m_decimators;
Decimators<qint64, TripleByteLE<qint32>, SDR_RX_SAMP_SZ, 16> m_decimators32;
Decimators<qint64, TripleByteLE<qint64>, SDR_RX_SAMP_SZ, 16> m_decimators64;
void run();
void callback(const uint8_t* buf, qint32 len); // inner call back

90
sdrbase/dsp/decimators.h
View File

@ -192,6 +192,96 @@ struct decimation_shifts<24, 8>
static const uint post64 = 0;
};
template<typename T>
struct TripleByteLE
{
uint8_t b0;
uint8_t b1;
uint8_t b2;
typedef union {
struct {
int32_t i;
} __attribute__((__packed__));
struct {
uint8_t i0;
uint8_t i1;
uint8_t i2;
uint8_t i3;
} __attribute__((__packed__));
} isample;
operator T() const {
isample s;
s.i0 = 0;
s.i1 = b0;
s.i2 = b1;
s.i3 = b2;
return s.i;
}
} __attribute__((__packed__));
template<>
struct TripleByteLE<qint32>
{
uint8_t b0;
uint8_t b1;
uint8_t b2;
typedef union {
struct {
qint32 i;
} __attribute__((__packed__));
struct {
uint8_t i0;
uint8_t i1;
uint8_t i2;
uint8_t i3;
} __attribute__((__packed__));
} isample;
operator qint32() const {
isample s;
s.i0 = 0;
s.i1 = b0;
s.i2 = b1;
s.i3 = b2;
return s.i >> 8;
}
} __attribute__((__packed__));
template<>
struct TripleByteLE<qint64>
{
uint8_t b0;
uint8_t b1;
uint8_t b2;
typedef union {
struct {
qint64 i;
} __attribute__((__packed__));
struct {
uint32_t ia;
uint8_t i0;
uint8_t i1;
uint8_t i2;
uint8_t i3;
} __attribute__((__packed__));
} isample;
operator qint64() const {
isample s;
s.ia = 0;
s.i0 = 0;
s.i1 = b0;
s.i2 = b1;
s.i3 = b2;
return s.i >> 40;
}
} __attribute__((__packed__));
template<typename AccuType, typename T, uint SdrBits, uint InputBits>
class Decimators
{