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

Interferometer: change to sample MIMO FIFO. BaldeRF2: reviewed apply settings placement

Browse Source
This commit is contained in:
f4exb 2019-10-04 08:35:09 +02:00
parent eb662b88ad
commit 2ebcb42bd9
4 changed files with 62 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/channelmimo/interferometer/interferometer.cpp
View File

@ -86,6 +86,7 @@ void Interferometer::setScopeSink(BasebandSampleSink *scopeSink)
void Interferometer::start()
{
m_sink->reset();
m_thread->start();
}

74
plugins/channelmimo/interferometer/interferometersink.cpp
View File

@ -32,20 +32,22 @@ InterferometerSink::InterferometerSink(int fftSize) :
m_spectrumSink(nullptr),
m_scopeSink(nullptr)
{
m_sampleMIFifo.init(2, 96000 * 4);
for (int i = 0; i < 2; i++)
{
m_sinkFifos[i].setSize(96000 * 4);
m_sinks[i].setStreamIndex(i);
m_channelizers[i] = new DownChannelizer(&m_sinks[i]);
QObject::connect(
&m_sinkFifos[i],
&SampleSinkFifo::dataReady,
this,
[=](){ this->handleSinkFifo(i); },
Qt::QueuedConnection
);
}
QObject::connect(
&m_sampleMIFifo,
&SampleMIFifo::dataAsyncReady,
this,
&InterferometerSink::handleDataAsync,
Qt::QueuedConnection
);
connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()));
}
@ -57,29 +59,30 @@ InterferometerSink::~InterferometerSink()
}
}
void InterferometerSink::reset()
{
m_sampleMIFifo.reset();
}
void InterferometerSink::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, unsigned int streamIndex)
{
if (streamIndex > 1) {
return;
}
m_sinkFifos[streamIndex].write(begin, end);
m_sampleMIFifo.writeAsync(begin, end - begin, streamIndex);
}
void InterferometerSink::handleSinkFifo(unsigned int sinkIndex)
void InterferometerSink::handleDataAsync(int sinkIndex)
{
int samplesDone = 0;
SampleVector::const_iterator part1begin;
SampleVector::const_iterator part1end;
SampleVector::const_iterator part2begin;
SampleVector::const_iterator part2end;
while ((m_sinkFifos[sinkIndex].fill() > 0)
&& (m_inputMessageQueue.size() == 0))
//&& (samplesDone < m_channelizers[sinkIndex]->getInputSampleRate()))
while ((m_sampleMIFifo.fillAsync(sinkIndex) > 0) && (m_inputMessageQueue.size() == 0))
{
SampleVector::iterator part1begin;
SampleVector::iterator part1end;
SampleVector::iterator part2begin;
SampleVector::iterator part2end;
unsigned int count = m_sinkFifos[sinkIndex].readBegin(m_sinkFifos[sinkIndex].fill(), &part1begin, &part1end, &part2begin, &part2end);
m_sampleMIFifo.readAsync(&part1begin, &part1end, &part2begin, &part2end, sinkIndex);
if (part1begin != part1end) { // first part of FIFO data
//qDebug("InterferometerSink::handleSinkFifo: part1-stream: %u count: %u", sinkIndex, count);
@ -91,14 +94,39 @@ void InterferometerSink::handleSinkFifo(unsigned int sinkIndex)
processFifo(part2begin, part2end, sinkIndex);
}
m_sinkFifos[sinkIndex].readCommit((unsigned int) count); // adjust FIFO pointers
samplesDone += count;
}
// int samplesDone = 0;
// while ((m_sinkFifos[sinkIndex].fill() > 0)
// && (m_inputMessageQueue.size() == 0))
// //&& (samplesDone < m_channelizers[sinkIndex]->getInputSampleRate()))
// {
// SampleVector::iterator part1begin;
// SampleVector::iterator part1end;
// SampleVector::iterator part2begin;
// SampleVector::iterator part2end;
// unsigned int count = m_sinkFifos[sinkIndex].readBegin(m_sinkFifos[sinkIndex].fill(), &part1begin, &part1end, &part2begin, &part2end);
// if (part1begin != part1end) { // first part of FIFO data
// //qDebug("InterferometerSink::handleSinkFifo: part1-stream: %u count: %u", sinkIndex, count);
// processFifo(part1begin, part1end, sinkIndex);
// }
// if (part2begin != part2end) { // second part of FIFO data (used when block wraps around)
// //qDebug("InterferometerSink::handleSinkFifo: part2-stream: %u count: %u", sinkIndex, count);
// processFifo(part2begin, part2end, sinkIndex);
// }
// m_sinkFifos[sinkIndex].readCommit((unsigned int) count); // adjust FIFO pointers
// samplesDone += count;
// }
//qDebug("InterferometerSink::handleSinkFifo: done");
}
void InterferometerSink::processFifo(const SampleVector::iterator& vbegin, const SampleVector::iterator& vend, unsigned int sinkIndex)
void InterferometerSink::processFifo(const SampleVector::const_iterator& vbegin, const SampleVector::const_iterator& vend, unsigned int sinkIndex)
{
// if (sinkIndex == 0) {
// m_count0 = vend - vbegin;

10
plugins/channelmimo/interferometer/interferometersink.h
View File

@ -21,7 +21,7 @@
#include <QObject>
//#include "dsp/samplesinkvector.h"
#include "dsp/samplesinkfifo.h"
#include "dsp/samplemififo.h"
#include "interferometerstreamsink.h"
#include "interferometercorr.h"
@ -99,6 +99,8 @@ public:
InterferometerSink(int fftSize);
~InterferometerSink();
void reset();
MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } //!< Get the queue for asynchronous inbound communication
void setSpectrumSink(BasebandSampleSink *spectrumSink) { m_spectrumSink = spectrumSink; }
@ -108,12 +110,12 @@ public:
void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, unsigned int streamIndex);
private:
void processFifo(const SampleVector::iterator& vbegin, const SampleVector::iterator& vend, unsigned int sinkIndex);
void processFifo(const SampleVector::const_iterator& vbegin, const SampleVector::const_iterator& vend, unsigned int sinkIndex);
void run();
bool handleMessage(const Message& cmd);
InterferometerCorrelator m_correlator;
SampleSinkFifo m_sinkFifos[2];
SampleMIFifo m_sampleMIFifo;
InterferometerStreamSink m_sinks[2];
DownChannelizer *m_channelizers[2];
BasebandSampleSink *m_spectrumSink;
@ -123,7 +125,7 @@ private:
private slots:
void handleInputMessages();
void handleSinkFifo(unsigned int sinkIndex); //!< Handle data when samples have to be processed
void handleDataAsync(int sinkIndex); //!< Handle data when samples have to be processed
};
#endif // INCLUDE_INTERFEROMETERSINK_H

10
plugins/samplemimo/bladerf2mimo/bladerf2mimo.cpp
View File

@ -142,8 +142,6 @@ void BladeRF2MIMO::init()
m_fileSinks.push_back(new FileRecord(QString("test_1_%1.sdriq").arg(m_deviceAPI->getDeviceUID())));
m_deviceAPI->addAncillarySink(m_fileSinks[0], 0);
m_deviceAPI->addAncillarySink(m_fileSinks[1], 1);
applySettings(m_settings, true);
}
bool BladeRF2MIMO::start()
@ -154,6 +152,8 @@ bool BladeRF2MIMO::start()
return false;
}
applySettings(m_settings, true);
if (m_rxElseTx) {
startRx();
} else {
@ -186,10 +186,7 @@ void BladeRF2MIMO::startRx()
}
m_sourceThread->startWork();
mutexLocker.unlock();
applySettings(m_settings, true);
m_runningRx = true;
}
@ -426,7 +423,8 @@ bool BladeRF2MIMO::applySettings(const BladeRF2MIMOSettings& settings, bool forc
<< " m_useReverseAPI: " << settings.m_useReverseAPI
<< " m_reverseAPIAddress: " << settings.m_reverseAPIAddress
<< " m_reverseAPIPort: " << settings.m_reverseAPIPort
<< " m_reverseAPIDeviceIndex: " << settings.m_reverseAPIDeviceIndex;
<< " m_reverseAPIDeviceIndex: " << settings.m_reverseAPIDeviceIndex
<< " force: " << force;
struct bladerf *dev = m_dev ? m_dev->getDev() : nullptr;