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

Interferometer (6)

Browse Source
This commit is contained in:
f4exb 2019-09-24 02:46:14 +02:00
parent 4981ff190e
commit 6bcf8caa21
5 changed files with 61 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,6 +97,15 @@ void Interferometer::stop()
void Interferometer::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, unsigned int sinkIndex)
{
if (sinkIndex == 0) {
m_count0 = end - begin;
} else if (sinkIndex == 1) {
m_count1 = end - begin;
if (m_count1 != m_count0) {
qDebug("Interferometer::feed: c0: %d 1: %d", m_count0, m_count1);
}
}
m_sink->feed(begin, end, sinkIndex);
}
@ -179,6 +188,7 @@ bool Interferometer::handleMessage(const Message& cmd)
InterferometerSink::MsgSignalNotification *sig = InterferometerSink::MsgSignalNotification::create(
m_deviceSampleRate, notif.getCenterFrequency(), notif.getIndex()
);
qDebug() << "Interferometer::handleMessage: DSPMIMOSignalNotification: push to sink";
m_sink->getInputMessageQueue()->push(sig);
// Redo the channelizer stuff with the new sample rate to re-synchronize everything

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

@ -158,6 +158,7 @@ private:
int64_t m_frequencyOffset;
uint32_t m_deviceSampleRate;
int m_count0, m_count1;
void applySettings(const InterferometerSettings& settings, bool force = false);
static void validateFilterChainHash(InterferometerSettings& settings);

3
plugins/channelmimo/interferometer/interferometercorr.cpp
View File

@ -109,6 +109,9 @@ bool InterferometerCorrelator::performOpCorr(
)
{
unsigned int size = std::min(size0, size1);
// if (size0 != size1) {
// qDebug("InterferometerCorrelator::performOpCorr: size0: %d, size1: %d", size0, size1);
// }
adjustTCorrSize(size);
std::transform(

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

@ -36,7 +36,7 @@ InterferometerSink::InterferometerSink(int fftSize) :
{
m_sinkFifos[i].setSize(96000 * 4);
m_sinks[i].setStreamIndex(i);
m_channelizers[i] = new DownChannelizer(&m_sinks[i]);
//m_channelizers[i] = new DownChannelizer(&m_sinks[i]);
// QObject::connect(
// &m_sinkBuffers[i],
// &SampleSinkVector::dataReady,
@ -60,7 +60,7 @@ InterferometerSink::~InterferometerSink()
{
for (int i = 0; i < 2; i++)
{
delete m_channelizers[i];
//delete m_channelizers[i];
}
}
@ -91,7 +91,9 @@ void InterferometerSink::handleSinkFifo(unsigned int sinkIndex)
{
int samplesDone = 0;
while ((m_sinkFifos[sinkIndex].fill() > 0) && (m_inputMessageQueue.size() == 0) && (samplesDone < m_channelizers[sinkIndex]->getInputSampleRate()))
while ((m_sinkFifos[sinkIndex].fill() > 0)
&& (m_inputMessageQueue.size() == 0))
//&& (samplesDone < m_channelizers[sinkIndex]->getInputSampleRate()))
{
SampleVector::iterator part1begin;
SampleVector::iterator part1end;
@ -102,14 +104,20 @@ void InterferometerSink::handleSinkFifo(unsigned int sinkIndex)
if (part1begin != part1end) { // first part of FIFO data
//qDebug("InterferometerSink::handleSinkFifo: part1-stream: %u count: %u", sinkIndex, count);
processFifo(part1begin, part1end, sinkIndex);
m_vectorBuffer.write(part1begin, part1end, false);
//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_vectorBuffer.append(part2begin, part2end);
//processFifo(part2begin, part2end, sinkIndex);
}
SampleVector::iterator vbegin, vend;
m_vectorBuffer.read(vbegin, vend);
processFifo(vbegin, vend, sinkIndex);
m_sinkFifos[sinkIndex].readCommit((unsigned int) count); // adjust FIFO pointers
samplesDone += count;
}
@ -119,7 +127,17 @@ void InterferometerSink::handleSinkFifo(unsigned int sinkIndex)
void InterferometerSink::processFifo(const SampleVector::iterator& vbegin, const SampleVector::iterator& vend, unsigned int sinkIndex)
{
m_channelizers[sinkIndex]->feed(vbegin, vend, false);
if (sinkIndex == 0) {
m_count0 = vend - vbegin;
} else if (sinkIndex == 1) {
m_count1 = vend - vbegin;
if (m_count1 != m_count0) {
qDebug("InterferometerSink::processFifo: c0: %d 1: %d", m_count0, m_count1);
}
}
//m_channelizers[sinkIndex]->feed(vbegin, vend, false);
m_sinks[sinkIndex].feed(vbegin, vend, false);
if (sinkIndex == 1) {
run();
@ -128,6 +146,10 @@ void InterferometerSink::processFifo(const SampleVector::iterator& vbegin, const
void InterferometerSink::run()
{
if (m_sinks[0].getSize() != m_sinks[1].getSize()) {
qDebug("InterferometerSink::run: size0: %d, size1: %d", m_sinks[0].getSize(), m_sinks[1].getSize());
}
if (m_correlator.performCorr(m_sinks[0].getData(), m_sinks[0].getSize(), m_sinks[1].getData(), m_sinks[1].getSize()))
{
if (m_scopeSink) {
@ -144,20 +166,21 @@ void InterferometerSink::run()
}
}
for (int i = 0; i < 2; i++)
{
std::copy(
m_sinks[i].getData().begin() + m_correlator.m_processed,
m_sinks[i].getData().begin() + m_correlator.m_processed + m_correlator.m_remaining[i],
m_sinks[i].getData().begin()
);
// for (int i = 0; i < 2; i++)
// {
// std::copy(
// m_sinks[i].getData().begin() + m_correlator.m_processed,
// m_sinks[i].getData().begin() + m_correlator.m_processed + m_correlator.m_remaining[i],
// m_sinks[i].getData().begin()
// );
m_sinks[i].setDataStart(m_correlator.m_remaining[i]);
}
// m_sinks[i].setDataStart(m_correlator.m_remaining[i]);
// }
}
void InterferometerSink::handleInputMessages()
{
qDebug("InterferometerSink::handleInputMessage");
Message* message;
while ((message = m_inputMessageQueue.pop()) != 0)
@ -183,9 +206,9 @@ bool InterferometerSink::handleMessage(const Message& cmd)
for (int i = 0; i < 2; i++)
{
m_channelizers[i]->set(m_channelizers[i]->getInputMessageQueue(),
log2Decim,
filterChainHash);
// m_channelizers[i]->set(m_channelizers[i]->getInputMessageQueue(),
// log2Decim,
// filterChainHash);
}
return true;
@ -204,8 +227,8 @@ bool InterferometerSink::handleMessage(const Message& cmd)
if (streamIndex < 2)
{
DSPSignalNotification *notif = new DSPSignalNotification(inputSampleRate, centerFrequency);
m_channelizers[streamIndex]->getInputMessageQueue()->push(notif);
// DSPSignalNotification *notif = new DSPSignalNotification(inputSampleRate, centerFrequency);
// m_channelizers[streamIndex]->getInputMessageQueue()->push(notif);
}
return true;

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

@ -22,6 +22,7 @@
//#include "dsp/samplesinkvector.h"
#include "dsp/samplesinkfifo.h"
#include "dsp/samplesinkvector.h"
#include "interferometerstreamsink.h"
#include "interferometercorr.h"
@ -119,11 +120,13 @@ private:
BasebandSampleSink *m_spectrumSink;
BasebandSampleSink *m_scopeSink;
MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication
SampleSinkVector m_vectorBuffer;
int m_count0, m_count1;
private slots:
//void handleSinkBuffer(unsigned int sinkIndex); //!< Handle data when samples have to be processed
void handleSinkFifo(unsigned int sinkIndex); //!< Handle data when samples have to be processed
void handleInputMessages();
void handleSinkFifo(unsigned int sinkIndex); //!< Handle data when samples have to be processed
};
#endif // INCLUDE_INTERFEROMETERSINK_H