diff --git a/plugins/channelmimo/interferometer/CMakeLists.txt b/plugins/channelmimo/interferometer/CMakeLists.txt index 65176dd8c..016206ae6 100644 --- a/plugins/channelmimo/interferometer/CMakeLists.txt +++ b/plugins/channelmimo/interferometer/CMakeLists.txt @@ -5,7 +5,7 @@ set(interferometer_SOURCES interferometer.cpp interferometercorr.cpp interferometersettings.cpp - interferometersink.cpp + interferometerbaseband.cpp interferometerstreamsink.cpp interferometerwebapiadapter.cpp ) @@ -15,7 +15,7 @@ set(interferometer_HEADERS interferometer.h interferometercorr.h interferometersettings.h - interferometersink.h + interferometerbaseband.h interferometerstreamsink.h interferometerwebapiadapter.h ) diff --git a/plugins/channelmimo/interferometer/interferometer.cpp b/plugins/channelmimo/interferometer/interferometer.cpp index 0beade475..b079aec35 100644 --- a/plugins/channelmimo/interferometer/interferometer.cpp +++ b/plugins/channelmimo/interferometer/interferometer.cpp @@ -29,7 +29,7 @@ #include "SWGChannelSettings.h" -#include "interferometersink.h" +#include "interferometerbaseband.h" #include "interferometer.h" MESSAGE_CLASS_DEFINITION(Interferometer::MsgConfigureInterferometer, Message) @@ -51,7 +51,7 @@ Interferometer::Interferometer(DeviceAPI *deviceAPI) : setObjectName(m_channelId); m_thread = new QThread(this); - m_sink = new InterferometerSink(m_fftSize); + m_sink = new InterferometerBaseband(m_fftSize); m_sink->moveToThread(m_thread); m_deviceAPI->addMIMOChannel(this); m_deviceAPI->addMIMOChannelAPI(this); @@ -126,14 +126,14 @@ void Interferometer::applySettings(const InterferometerSettings& settings, bool if ((m_settings.m_log2Decim != settings.m_log2Decim) || (m_settings.m_filterChainHash != settings.m_filterChainHash) || force) { - InterferometerSink::MsgConfigureChannelizer *msg = InterferometerSink::MsgConfigureChannelizer::create( + InterferometerBaseband::MsgConfigureChannelizer *msg = InterferometerBaseband::MsgConfigureChannelizer::create( settings.m_log2Decim, settings.m_filterChainHash); m_sink->getInputMessageQueue()->push(msg); } if ((m_settings.m_correlationType != settings.m_correlationType) || force) { - InterferometerSink::MsgConfigureCorrelation *msg = InterferometerSink::MsgConfigureCorrelation::create( + InterferometerBaseband::MsgConfigureCorrelation *msg = InterferometerBaseband::MsgConfigureCorrelation::create( settings.m_correlationType); m_sink->getInputMessageQueue()->push(msg); } @@ -183,14 +183,14 @@ bool Interferometer::handleMessage(const Message& cmd) calculateFrequencyOffset(); // This is when device sample rate changes // Notify sink of input sample rate change - InterferometerSink::MsgSignalNotification *sig = InterferometerSink::MsgSignalNotification::create( + InterferometerBaseband::MsgSignalNotification *sig = InterferometerBaseband::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 - InterferometerSink::MsgConfigureChannelizer *msg = InterferometerSink::MsgConfigureChannelizer::create( + InterferometerBaseband::MsgConfigureChannelizer *msg = InterferometerBaseband::MsgConfigureChannelizer::create( m_settings.m_log2Decim, m_settings.m_filterChainHash); m_sink->getInputMessageQueue()->push(msg); @@ -254,7 +254,7 @@ void Interferometer::calculateFrequencyOffset() void Interferometer::applyChannelSettings(uint32_t log2Decim, uint32_t filterChainHash) { - InterferometerSink::MsgConfigureChannelizer *msg = InterferometerSink::MsgConfigureChannelizer::create(log2Decim, filterChainHash); + InterferometerBaseband::MsgConfigureChannelizer *msg = InterferometerBaseband::MsgConfigureChannelizer::create(log2Decim, filterChainHash); m_sink->getInputMessageQueue()->push(msg); } diff --git a/plugins/channelmimo/interferometer/interferometer.h b/plugins/channelmimo/interferometer/interferometer.h index 6aa439c34..c26b4c06d 100644 --- a/plugins/channelmimo/interferometer/interferometer.h +++ b/plugins/channelmimo/interferometer/interferometer.h @@ -30,7 +30,7 @@ class QThread; class DeviceAPI; -class InterferometerSink; +class InterferometerBaseband; class QNetworkReply; class QNetworkAccessManager; class BasebandSampleSink; @@ -149,7 +149,7 @@ public: private: DeviceAPI *m_deviceAPI; QThread *m_thread; - InterferometerSink* m_sink; + InterferometerBaseband* m_sink; BasebandSampleSink* m_spectrumSink; BasebandSampleSink* m_scopeSink; InterferometerSettings m_settings; diff --git a/plugins/channelmimo/interferometer/interferometersink.cpp b/plugins/channelmimo/interferometer/interferometerbaseband.cpp similarity index 81% rename from plugins/channelmimo/interferometer/interferometersink.cpp rename to plugins/channelmimo/interferometer/interferometerbaseband.cpp index 364d116db..770f58da3 100644 --- a/plugins/channelmimo/interferometer/interferometersink.cpp +++ b/plugins/channelmimo/interferometer/interferometerbaseband.cpp @@ -21,14 +21,14 @@ #include "dsp/downchannelizer.h" #include "dsp/dspcommands.h" -#include "interferometersink.h" +#include "interferometerbaseband.h" -MESSAGE_CLASS_DEFINITION(InterferometerSink::MsgConfigureChannelizer, Message) -MESSAGE_CLASS_DEFINITION(InterferometerSink::MsgSignalNotification, Message) -MESSAGE_CLASS_DEFINITION(InterferometerSink::MsgConfigureCorrelation, Message) +MESSAGE_CLASS_DEFINITION(InterferometerBaseband::MsgConfigureChannelizer, Message) +MESSAGE_CLASS_DEFINITION(InterferometerBaseband::MsgSignalNotification, Message) +MESSAGE_CLASS_DEFINITION(InterferometerBaseband::MsgConfigureCorrelation, Message) -InterferometerSink::InterferometerSink(int fftSize) : +InterferometerBaseband::InterferometerBaseband(int fftSize) : m_correlator(fftSize), m_spectrumSink(nullptr), m_scopeSink(nullptr), @@ -48,7 +48,7 @@ InterferometerSink::InterferometerSink(int fftSize) : &m_sampleMIFifo, &SampleMIFifo::dataSyncReady, this, - &InterferometerSink::handleData, + &InterferometerBaseband::handleData, Qt::QueuedConnection ); @@ -56,7 +56,7 @@ InterferometerSink::InterferometerSink(int fftSize) : m_lastStream = 0; } -InterferometerSink::~InterferometerSink() +InterferometerBaseband::~InterferometerBaseband() { for (int i = 0; i < 2; i++) { @@ -64,7 +64,7 @@ InterferometerSink::~InterferometerSink() } } -void InterferometerSink::reset() +void InterferometerBaseband::reset() { QMutexLocker mutexLocker(&m_mutex); m_sampleMIFifo.reset(); @@ -74,14 +74,14 @@ void InterferometerSink::reset() } } -void InterferometerSink::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, unsigned int streamIndex) +void InterferometerBaseband::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, unsigned int streamIndex) { if (streamIndex > 1) { return; } if (streamIndex == m_lastStream) { - qWarning("InterferometerSink::feed: twice same stream in a row: %u", streamIndex); + qWarning("InterferometerBaseband::feed: twice same stream in a row: %u", streamIndex); } m_lastStream = streamIndex; @@ -92,7 +92,7 @@ void InterferometerSink::feed(const SampleVector::const_iterator& begin, const S { if (m_sizes[0] != m_sizes[1]) { - qWarning("InterferometerSink::feed: unequal sizes: [0]: %d [1]: %d", m_sizes[0], m_sizes[1]); + qWarning("InterferometerBaseband::feed: unequal sizes: [0]: %d [1]: %d", m_sizes[0], m_sizes[1]); m_sampleMIFifo.writeSync(m_vbegin, std::min(m_sizes[0], m_sizes[1])); } else @@ -102,7 +102,7 @@ void InterferometerSink::feed(const SampleVector::const_iterator& begin, const S } } -void InterferometerSink::handleData() +void InterferometerBaseband::handleData() { QMutexLocker mutexLocker(&m_mutex); @@ -127,7 +127,7 @@ void InterferometerSink::handleData() } } -void InterferometerSink::processFifo(const std::vector& data, unsigned int ibegin, unsigned int iend) +void InterferometerBaseband::processFifo(const std::vector& data, unsigned int ibegin, unsigned int iend) { for (unsigned int stream = 0; stream < 2; stream++) { m_channelizers[stream]->feed(data[stream].begin() + ibegin, data[stream].begin() + iend, false); @@ -136,7 +136,7 @@ void InterferometerSink::processFifo(const std::vector& data, unsi run(); } -void InterferometerSink::run() +void InterferometerBaseband::run() { if (m_correlator.performCorr(m_sinks[0].getData(), m_sinks[0].getSize(), m_sinks[1].getData(), m_sinks[1].getSize())) { @@ -172,9 +172,9 @@ void InterferometerSink::run() } } -void InterferometerSink::handleInputMessages() +void InterferometerBaseband::handleInputMessages() { - qDebug("InterferometerSink::handleInputMessage"); + qDebug("InterferometerBaseband::handleInputMessage"); Message* message; while ((message = m_inputMessageQueue.pop()) != 0) @@ -185,7 +185,7 @@ void InterferometerSink::handleInputMessages() } } -bool InterferometerSink::handleMessage(const Message& cmd) +bool InterferometerBaseband::handleMessage(const Message& cmd) { if (MsgConfigureChannelizer::match(cmd)) { @@ -194,7 +194,7 @@ bool InterferometerSink::handleMessage(const Message& cmd) int log2Decim = cfg.getLog2Decim(); int filterChainHash = cfg.getFilterChainHash(); - qDebug() << "InterferometerSink::handleMessage: MsgConfigureChannelizer:" + qDebug() << "InterferometerBaseband::handleMessage: MsgConfigureChannelizer:" << " log2Decim: " << log2Decim << " filterChainHash: " << filterChainHash; @@ -215,7 +215,7 @@ bool InterferometerSink::handleMessage(const Message& cmd) qint64 centerFrequency = cfg.getCenterFrequency(); int streamIndex = cfg.getStreamIndex(); - qDebug() << "InterferometerSink::handleMessage: MsgSignalNotification:" + qDebug() << "InterferometerBaseband::handleMessage: MsgSignalNotification:" << " inputSampleRate: " << inputSampleRate << " centerFrequency: " << centerFrequency << " streamIndex: " << streamIndex; @@ -233,7 +233,7 @@ bool InterferometerSink::handleMessage(const Message& cmd) MsgConfigureCorrelation& cfg = (MsgConfigureCorrelation&) cmd; InterferometerSettings::CorrelationType correlationType = cfg.getCorrelationType(); - qDebug() << "InterferometerSink::handleMessage: MsgConfigureCorrelation:" + qDebug() << "InterferometerBaseband::handleMessage: MsgConfigureCorrelation:" << " correlationType: " << correlationType; m_correlator.setCorrType(correlationType); @@ -242,7 +242,7 @@ bool InterferometerSink::handleMessage(const Message& cmd) } else { - qDebug("InterferometerSink::handleMessage: unhandled: %s", cmd.getIdentifier()); + qDebug("InterferometerBaseband::handleMessage: unhandled: %s", cmd.getIdentifier()); return false; } } \ No newline at end of file diff --git a/plugins/channelmimo/interferometer/interferometersink.h b/plugins/channelmimo/interferometer/interferometerbaseband.h similarity index 95% rename from plugins/channelmimo/interferometer/interferometersink.h rename to plugins/channelmimo/interferometer/interferometerbaseband.h index adc45ac2b..f61655018 100644 --- a/plugins/channelmimo/interferometer/interferometersink.h +++ b/plugins/channelmimo/interferometer/interferometerbaseband.h @@ -15,8 +15,8 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// -#ifndef INCLUDE_INTERFEROMETERSINK_H -#define INCLUDE_INTERFEROMETERSINK_H +#ifndef INCLUDE_INTERFEROMETERBASEBAND_H +#define INCLUDE_INTERFEROMETERBASEBAND_H #include #include @@ -29,7 +29,7 @@ class DownChannelizer; class BasebandSampleSink; -class InterferometerSink : public QObject +class InterferometerBaseband : public QObject { Q_OBJECT public: @@ -98,8 +98,8 @@ public: { } }; - InterferometerSink(int fftSize); - ~InterferometerSink(); + InterferometerBaseband(int fftSize); + ~InterferometerBaseband(); void reset(); MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } //!< Get the queue for asynchronous inbound communication @@ -132,4 +132,4 @@ private slots: void handleData(); //!< Handle data when samples have to be processed }; -#endif // INCLUDE_INTERFEROMETERSINK_H +#endif // INCLUDE_INTERFEROMETERBASEBAND_H