VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-04 22:27:53 -04:00
Code Issues Projects Releases Wiki Activity

Dismiss HackRF output plugin

Browse Source
This commit is contained in:
f4exb 2017-01-08 10:27:57 +01:00
parent 85ed39c767
commit 5d51fde9f7
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/samplesink/CMakeLists.txt
View File

@ -7,14 +7,14 @@ if(LIBUSB_FOUND AND LIBBLADERF_FOUND)
add_subdirectory(bladerfoutput) add_subdirectory(bladerfoutput)
endif(LIBUSB_FOUND AND LIBBLADERF_FOUND) endif(LIBUSB_FOUND AND LIBBLADERF_FOUND)
find_package(LibHACKRF) #find_package(LibHACKRF)
if(LIBUSB_FOUND AND LIBHACKRF_FOUND) #if(LIBUSB_FOUND AND LIBHACKRF_FOUND)
add_subdirectory(hackrfoutput) # add_subdirectory(hackrfoutput)
endif(LIBUSB_FOUND AND LIBHACKRF_FOUND) 3endif(LIBUSB_FOUND AND LIBHACKRF_FOUND)
if (BUILD_DEBIAN) if (BUILD_DEBIAN)
add_subdirectory(bladerfoutput) add_subdirectory(bladerfoutput)
add_subdirectory(hackrfoutput) # add_subdirectory(hackrfoutput)
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
add_subdirectory(filesink) add_subdirectory(filesink)

1
plugins/samplesink/hackrfoutput/hackrfoutput.cpp
View File

@ -77,7 +77,6 @@ bool HackRFOutput::start(int device)
m_sampleSourceFifo.resize(m_settings.m_devSampleRate); // 1s long m_sampleSourceFifo.resize(m_settings.m_devSampleRate); // 1s long
if (m_deviceAPI->getSourceBuddies().size() > 0) if (m_deviceAPI->getSourceBuddies().size() > 0)
{ {
DeviceSourceAPI *buddy = m_deviceAPI->getSourceBuddies()[0]; DeviceSourceAPI *buddy = m_deviceAPI->getSourceBuddies()[0];

16
plugins/samplesink/hackrfoutput/hackrfoutputthread.cpp
View File

@ -21,8 +21,6 @@
#include "dsp/samplesourcefifo.h" #include "dsp/samplesourcefifo.h"
HackRFOutputThread *HackRFOutputThread::m_this = 0;
HackRFOutputThread::HackRFOutputThread(hackrf_device* dev, SampleSourceFifo* sampleFifo, QObject* parent) : HackRFOutputThread::HackRFOutputThread(hackrf_device* dev, SampleSourceFifo* sampleFifo, QObject* parent) :
QThread(parent), QThread(parent),
m_running(false), m_running(false),
@ -32,13 +30,12 @@ HackRFOutputThread::HackRFOutputThread(hackrf_device* dev, SampleSourceFifo* sam
m_samplerate(10), m_samplerate(10),
m_log2Interp(0) m_log2Interp(0)
{ {
m_this = this; qDebug("HackRFOutputThread::HackRFOutputThread: m_dev: %lx m_sampleFifo: %lx", (uint64_t) m_dev, (uint64_t) m_sampleFifo);
} }
HackRFOutputThread::~HackRFOutputThread() HackRFOutputThread::~HackRFOutputThread()
{ {
stopWork(); stopWork();
m_this = 0;
} }
void HackRFOutputThread::startWork() void HackRFOutputThread::startWork()
@ -76,7 +73,7 @@ void HackRFOutputThread::run()
//m_running = true; //m_running = true;
m_startWaiter.wakeAll(); m_startWaiter.wakeAll();
rc = (hackrf_error) hackrf_start_tx(m_dev, tx_callback, NULL); rc = (hackrf_error) hackrf_start_tx(m_dev, tx_callback, this);
if (rc != HACKRF_SUCCESS) if (rc != HACKRF_SUCCESS)
{ {
@ -84,6 +81,11 @@ void HackRFOutputThread::run()
} }
else else
{ {
qDebug("HackRFOutputThread::run: this: %lx start HackRF Tx: m_dev: %lx m_sampleFifo: %lx",
(uint64_t) this,
(uint64_t) m_dev,
(uint64_t) m_sampleFifo);
while ((m_running) && (hackrf_is_streaming(m_dev) == HACKRF_TRUE)) while ((m_running) && (hackrf_is_streaming(m_dev) == HACKRF_TRUE))
{ {
sleep(1); sleep(1);
@ -143,10 +145,10 @@ void HackRFOutputThread::callback(qint16* buf, qint32 len)
} }
} }
int HackRFOutputThread::tx_callback(hackrf_transfer* transfer) int HackRFOutputThread::tx_callback(hackrf_transfer* transfer)
{ {
HackRFOutputThread *thread = (HackRFOutputThread *) transfer->tx_ctx;
qint32 bytes_to_write = transfer->valid_length; qint32 bytes_to_write = transfer->valid_length;
m_this->callback((qint16 *) transfer->buffer, bytes_to_write); thread->callback((qint16 *) transfer->buffer, bytes_to_write);
return 0; return 0;
} }

1
plugins/samplesink/hackrfoutput/hackrfoutputthread.h
View File

@ -51,7 +51,6 @@ private:
int m_samplerate; int m_samplerate;
unsigned int m_log2Interp; unsigned int m_log2Interp;
static HackRFOutputThread *m_this;
Interpolators<qint16, SDR_SAMP_SZ, 12> m_interpolators; Interpolators<qint16, SDR_SAMP_SZ, 12> m_interpolators;