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

BladeRF2 MIMO (2)

Browse Source
This commit is contained in:
f4exb
2019-09-26 23:51:31 +02:00
parent 6bcf8caa21
commit 208b9f4ebf
3 changed files with 15 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplemimo/bladerf2mimo/bladerf2mithread.cpp
+9 -23
View File
@@ -16,14 +16,15 @@
///////////////////////////////////////////////////////////////////////////////////
#include "bladerf2/devicebladerf2shared.h"
#include "dsp/samplesinkfifo.h"
#include "dsp/samplemififo.h"
#include "bladerf2mithread.h"
BladeRF2MIThread::BladeRF2MIThread(struct bladerf* dev, QObject* parent) :
QThread(parent),
m_running(false),
m_dev(dev)
m_dev(dev),
m_sampleFifo(nullptr)
{
qDebug("BladeRF2MIThread::BladeRF2MIThread");
m_buf = new qint16[2*DeviceBladeRF2::blockSize*2];
@@ -82,22 +83,6 @@ int BladeRF2MIThread::getFcPos() const
return m_fcPos;
}
void BladeRF2MIThread::setFifo(unsigned int channel, SampleSinkFifo *sampleFifo)
{
if (channel < 2) {
m_sampleFifo[channel] = sampleFifo;
}
}
SampleSinkFifo *BladeRF2MIThread::getFifo(unsigned int channel)
{
if (channel < 2) {
return m_sampleFifo[channel];
} else {
return nullptr;
}
}
void BladeRF2MIThread::run()
{
int res;
@@ -143,12 +128,15 @@ void BladeRF2MIThread::callback(const qint16* buf, qint32 samplesPerChannel)
return;
}
std::vector<SampleVector::const_iterator> vbegin;
for (unsigned int channel = 0; channel < 2; channel++)
{
if (m_sampleFifo[channel]) {
channelCallback(&buf[2*samplesPerChannel*channel], 2*samplesPerChannel, channel);
}
channelCallback(&buf[2*samplesPerChannel*channel], 2*samplesPerChannel, channel);
vbegin.push_back(m_convertBuffer[channel].begin());
}
m_sampleFifo->writeSync(vbegin, samplesPerChannel/(1<<m_log2Decim));
}
void BladeRF2MIThread::channelCallback(const qint16* buf, qint32 len, int channel)
@@ -240,6 +228,4 @@ void BladeRF2MIThread::channelCallback(const qint16* buf, qint32 len, int channe
}
}
}
m_sampleFifo[channel]->write(m_convertBuffer[channel].begin(), it);
}