mirror of
https://github.com/f4exb/sdrangel.git
synced 2025-04-04 02:28:33 -04:00
DOA2: added as copy of Interferometer
This commit is contained in:
f4exb
parent
93e51e140b
commit
6290677889
@ -1,6 +1,7 @@
|
||||
project(channelmimo)
|
||||
|
||||
add_subdirectory(beamsteeringcwmod)
|
||||
add_subdirectory(doa2)
|
||||
|
||||
if (NOT SERVER_MODE)
|
||||
add_subdirectory(interferometer)
|
||||
|
||||
67
plugins/channelmimo/doa2/CMakeLists.txt
Normal file
67
plugins/channelmimo/doa2/CMakeLists.txt
Normal file
@ -0,0 +1,67 @@
|
||||
project(doa2)
|
||||
|
||||
set(doa2_SOURCES
|
||||
doa2.cpp
|
||||
doa2corr.cpp
|
||||
doa2settings.cpp
|
||||
doa2baseband.cpp
|
||||
doa2streamsink.cpp
|
||||
doa2plugin.cpp
|
||||
doa2webapiadapter.cpp
|
||||
)
|
||||
|
||||
set(doa2_HEADERS
|
||||
doa2.h
|
||||
doa2corr.h
|
||||
doa2settings.h
|
||||
doa2baseband.h
|
||||
doa2streamsink.h
|
||||
doa2plugin.h
|
||||
doa2webapiadapter.h
|
||||
)
|
||||
|
||||
include_directories(
|
||||
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
|
||||
${Boost_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
if (NOT SERVER_MODE)
|
||||
set(doa2_SOURCES
|
||||
${doa2_SOURCES}
|
||||
doa2gui.cpp
|
||||
doa2gui.ui
|
||||
)
|
||||
set(doa2_HEADERS
|
||||
${doa2_HEADERS}
|
||||
doa2gui.h
|
||||
)
|
||||
|
||||
set(TARGET_NAME doa2)
|
||||
set(TARGET_LIB "Qt5::Widgets")
|
||||
set(TARGET_LIB_GUI "sdrgui")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||
else()
|
||||
set(TARGET_NAME doa2srv)
|
||||
set(TARGET_LIB "")
|
||||
set(TARGET_LIB_GUI "")
|
||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||
endif()
|
||||
|
||||
add_library(${TARGET_NAME} SHARED
|
||||
${doa2_SOURCES}
|
||||
)
|
||||
|
||||
target_link_libraries(${TARGET_NAME}
|
||||
Qt5::Core
|
||||
${TARGET_LIB}
|
||||
sdrbase
|
||||
${TARGET_LIB_GUI}
|
||||
swagger
|
||||
)
|
||||
|
||||
install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})
|
||||
|
||||
# Install debug symbols
|
||||
if (WIN32)
|
||||
install(FILES $<TARGET_PDB_FILE:${TARGET_NAME}> CONFIGURATIONS Debug RelWithDebInfo DESTINATION ${INSTALL_FOLDER} )
|
||||
endif()
|
||||
600
plugins/channelmimo/doa2/doa2.cpp
Normal file
600
plugins/channelmimo/doa2/doa2.cpp
Normal file
@ -0,0 +1,600 @@
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Copyright (C) 2022 Edouard Griffiths, F4EXB //
|
||||
// //
|
||||
// This program is free software; you can redistribute it and/or modify //
|
||||
// it under the terms of the GNU General Public License as published by //
|
||||
// the Free Software Foundation as version 3 of the License, or //
|
||||
// (at your option) any later version. //
|
||||
// //
|
||||
// This program is distributed in the hope that it will be useful, //
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
|
||||
// GNU General Public License V3 for more details. //
|
||||
// //
|
||||
// You should have received a copy of the GNU General Public License //
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include <QThread>
|
||||
#include <QDebug>
|
||||
#include <QBuffer>
|
||||
#include <QNetworkAccessManager>
|
||||
#include <QNetworkReply>
|
||||
|
||||
#include "SWGChannelSettings.h"
|
||||
#include "SWGWorkspaceInfo.h"
|
||||
|
||||
#include "device/deviceapi.h"
|
||||
#include "dsp/hbfilterchainconverter.h"
|
||||
#include "dsp/dspcommands.h"
|
||||
#include "feature/feature.h"
|
||||
#include "maincore.h"
|
||||
|
||||
#include "doa2baseband.h"
|
||||
#include "doa2.h"
|
||||
|
||||
MESSAGE_CLASS_DEFINITION(DOA2::MsgConfigureDOA2, Message)
|
||||
MESSAGE_CLASS_DEFINITION(DOA2::MsgBasebandNotification, Message)
|
||||
|
||||
const char* const DOA2::m_channelIdURI = "sdrangel.channel.doa2";
|
||||
const char* const DOA2::m_channelId = "DOA2";
|
||||
const int DOA2::m_fftSize = 4096;
|
||||
|
||||
DOA2::DOA2(DeviceAPI *deviceAPI) :
|
||||
ChannelAPI(m_channelIdURI, ChannelAPI::StreamMIMO),
|
||||
m_deviceAPI(deviceAPI),
|
||||
m_spectrumVis(SDR_RX_SCALEF),
|
||||
m_guiMessageQueue(nullptr),
|
||||
m_frequencyOffset(0),
|
||||
m_deviceSampleRate(48000)
|
||||
{
|
||||
setObjectName(m_channelId);
|
||||
|
||||
m_thread = new QThread(this);
|
||||
m_basebandSink = new DOA2Baseband(m_fftSize);
|
||||
m_basebandSink->setSpectrumSink(&m_spectrumVis);
|
||||
m_basebandSink->setScopeSink(&m_scopeSink);
|
||||
m_basebandSink->moveToThread(m_thread);
|
||||
m_deviceAPI->addMIMOChannel(this);
|
||||
m_deviceAPI->addMIMOChannelAPI(this);
|
||||
|
||||
m_networkManager = new QNetworkAccessManager();
|
||||
QObject::connect(
|
||||
m_networkManager,
|
||||
&QNetworkAccessManager::finished,
|
||||
this,
|
||||
&DOA2::networkManagerFinished
|
||||
);
|
||||
}
|
||||
|
||||
DOA2::~DOA2()
|
||||
{
|
||||
QObject::disconnect(
|
||||
m_networkManager,
|
||||
&QNetworkAccessManager::finished,
|
||||
this,
|
||||
&DOA2::networkManagerFinished
|
||||
);
|
||||
delete m_networkManager;
|
||||
|
||||
m_deviceAPI->removeChannelSinkAPI(this);
|
||||
m_deviceAPI->removeMIMOChannel(this);
|
||||
delete m_basebandSink;
|
||||
delete m_thread;
|
||||
}
|
||||
|
||||
void DOA2::setDeviceAPI(DeviceAPI *deviceAPI)
|
||||
{
|
||||
if (deviceAPI != m_deviceAPI)
|
||||
{
|
||||
m_deviceAPI->removeChannelSinkAPI(this);
|
||||
m_deviceAPI->removeMIMOChannel(this);
|
||||
m_deviceAPI = deviceAPI;
|
||||
m_deviceAPI->addMIMOChannel(this);
|
||||
m_deviceAPI->addChannelSinkAPI(this);
|
||||
}
|
||||
}
|
||||
|
||||
void DOA2::startSinks()
|
||||
{
|
||||
if (m_deviceSampleRate != 0) {
|
||||
m_basebandSink->setBasebandSampleRate(m_deviceSampleRate);
|
||||
}
|
||||
|
||||
m_basebandSink->reset();
|
||||
m_thread->start();
|
||||
|
||||
DOA2Baseband::MsgConfigureChannelizer *msg = DOA2Baseband::MsgConfigureChannelizer::create(
|
||||
m_settings.m_log2Decim, m_settings.m_filterChainHash);
|
||||
m_basebandSink->getInputMessageQueue()->push(msg);
|
||||
}
|
||||
|
||||
void DOA2::stopSinks()
|
||||
{
|
||||
m_thread->exit();
|
||||
m_thread->wait();
|
||||
}
|
||||
|
||||
void DOA2::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, unsigned int sinkIndex)
|
||||
{
|
||||
m_basebandSink->feed(begin, end, sinkIndex);
|
||||
}
|
||||
|
||||
void DOA2::pull(SampleVector::iterator& begin, unsigned int nbSamples, unsigned int sourceIndex)
|
||||
{
|
||||
(void) begin;
|
||||
(void) nbSamples;
|
||||
(void) sourceIndex;
|
||||
}
|
||||
|
||||
void DOA2::applySettings(const DOA2Settings& settings, bool force)
|
||||
{
|
||||
qDebug() << "DOA2::applySettings: "
|
||||
<< "m_correlationType: " << settings.m_correlationType
|
||||
<< "m_filterChainHash: " << settings.m_filterChainHash
|
||||
<< "m_log2Decim: " << settings.m_log2Decim
|
||||
<< "m_phase: " << settings.m_phase
|
||||
<< "m_useReverseAPI: " << settings.m_useReverseAPI
|
||||
<< "m_reverseAPIAddress: " << settings.m_reverseAPIAddress
|
||||
<< "m_reverseAPIPort: " << settings.m_reverseAPIPort
|
||||
<< "m_reverseAPIDeviceIndex: " << settings.m_reverseAPIDeviceIndex
|
||||
<< "m_reverseAPIChannelIndex: " << settings.m_reverseAPIChannelIndex
|
||||
<< "m_title: " << settings.m_title;
|
||||
|
||||
QList<QString> reverseAPIKeys;
|
||||
|
||||
if ((m_settings.m_correlationType != settings.m_correlationType) || force) {
|
||||
reverseAPIKeys.append("correlationType");
|
||||
}
|
||||
if ((m_settings.m_filterChainHash != settings.m_filterChainHash) || force) {
|
||||
reverseAPIKeys.append("filterChainHash");
|
||||
}
|
||||
if ((m_settings.m_log2Decim != settings.m_log2Decim) || force) {
|
||||
reverseAPIKeys.append("log2Decim");
|
||||
}
|
||||
if ((m_settings.m_phase != settings.m_phase) || force) {
|
||||
reverseAPIKeys.append("phase");
|
||||
}
|
||||
if ((m_settings.m_title != settings.m_title) || force) {
|
||||
reverseAPIKeys.append("title");
|
||||
}
|
||||
|
||||
if ((m_settings.m_log2Decim != settings.m_log2Decim)
|
||||
|| (m_settings.m_filterChainHash != settings.m_filterChainHash) || force)
|
||||
{
|
||||
DOA2Baseband::MsgConfigureChannelizer *msg = DOA2Baseband::MsgConfigureChannelizer::create(
|
||||
settings.m_log2Decim, settings.m_filterChainHash);
|
||||
m_basebandSink->getInputMessageQueue()->push(msg);
|
||||
}
|
||||
|
||||
if ((m_settings.m_correlationType != settings.m_correlationType) || force)
|
||||
{
|
||||
DOA2Baseband::MsgConfigureCorrelation *msg = DOA2Baseband::MsgConfigureCorrelation::create(
|
||||
settings.m_correlationType);
|
||||
m_basebandSink->getInputMessageQueue()->push(msg);
|
||||
}
|
||||
|
||||
if ((m_settings.m_phase != settings.m_phase) || force) {
|
||||
m_basebandSink->setPhase(settings.m_phase);
|
||||
}
|
||||
|
||||
QList<ObjectPipe*> pipes;
|
||||
MainCore::instance()->getMessagePipes().getMessagePipes(this, "settings", pipes);
|
||||
|
||||
if (pipes.size() > 0) {
|
||||
sendChannelSettings(pipes, reverseAPIKeys, settings, force);
|
||||
}
|
||||
|
||||
m_settings = settings;
|
||||
}
|
||||
|
||||
void DOA2::handleInputMessages()
|
||||
{
|
||||
Message* message;
|
||||
|
||||
while ((message = m_inputMessageQueue.pop()) != 0)
|
||||
{
|
||||
if (handleMessage(*message))
|
||||
{
|
||||
delete message;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool DOA2::handleMessage(const Message& cmd)
|
||||
{
|
||||
if (MsgConfigureDOA2::match(cmd))
|
||||
{
|
||||
MsgConfigureDOA2& cfg = (MsgConfigureDOA2&) cmd;
|
||||
qDebug() << "DOA2::handleMessage: MsgConfigureDOA2";
|
||||
applySettings(cfg.getSettings(), cfg.getForce());
|
||||
return true;
|
||||
}
|
||||
else if (DSPMIMOSignalNotification::match(cmd))
|
||||
{
|
||||
DSPMIMOSignalNotification& notif = (DSPMIMOSignalNotification&) cmd;
|
||||
|
||||
qDebug() << "DOA2::handleMessage: DSPMIMOSignalNotification:"
|
||||
<< " inputSampleRate: " << notif.getSampleRate()
|
||||
<< " centerFrequency: " << notif.getCenterFrequency()
|
||||
<< " sourceElseSink: " << notif.getSourceOrSink()
|
||||
<< " streamIndex: " << notif.getIndex();
|
||||
|
||||
if (notif.getSourceOrSink()) // deals with source messages only
|
||||
{
|
||||
m_deviceSampleRate = notif.getSampleRate();
|
||||
calculateFrequencyOffset(); // This is when device sample rate changes
|
||||
|
||||
// Notify baseband sink of input sample rate change
|
||||
DOA2Baseband::MsgSignalNotification *sig = DOA2Baseband::MsgSignalNotification::create(
|
||||
m_deviceSampleRate, notif.getCenterFrequency(), notif.getIndex()
|
||||
);
|
||||
qDebug() << "DOA2::handleMessage: DSPMIMOSignalNotification: push to sink";
|
||||
m_basebandSink->getInputMessageQueue()->push(sig);
|
||||
|
||||
if (getMessageQueueToGUI())
|
||||
{
|
||||
qDebug() << "DOA2::handleMessage: DSPMIMOSignalNotification: push to GUI";
|
||||
MsgBasebandNotification *msg = MsgBasebandNotification::create(
|
||||
notif.getSampleRate(), notif.getCenterFrequency());
|
||||
getMessageQueueToGUI()->push(msg);
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
QByteArray DOA2::serialize() const
|
||||
{
|
||||
return m_settings.serialize();
|
||||
}
|
||||
|
||||
bool DOA2::deserialize(const QByteArray& data)
|
||||
{
|
||||
(void) data;
|
||||
if (m_settings.deserialize(data))
|
||||
{
|
||||
MsgConfigureDOA2 *msg = MsgConfigureDOA2::create(m_settings, true);
|
||||
m_inputMessageQueue.push(msg);
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_settings.resetToDefaults();
|
||||
MsgConfigureDOA2 *msg = MsgConfigureDOA2::create(m_settings, true);
|
||||
m_inputMessageQueue.push(msg);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
void DOA2::validateFilterChainHash(DOA2Settings& settings)
|
||||
{
|
||||
unsigned int s = 1;
|
||||
|
||||
for (unsigned int i = 0; i < settings.m_log2Decim; i++) {
|
||||
s *= 3;
|
||||
}
|
||||
|
||||
settings.m_filterChainHash = settings.m_filterChainHash >= s ? s-1 : settings.m_filterChainHash;
|
||||
}
|
||||
|
||||
void DOA2::calculateFrequencyOffset()
|
||||
{
|
||||
double shiftFactor = HBFilterChainConverter::getShiftFactor(m_settings.m_log2Decim, m_settings.m_filterChainHash);
|
||||
m_frequencyOffset = m_deviceSampleRate * shiftFactor;
|
||||
}
|
||||
|
||||
void DOA2::applyChannelSettings(uint32_t log2Decim, uint32_t filterChainHash)
|
||||
{
|
||||
DOA2Baseband::MsgConfigureChannelizer *msg = DOA2Baseband::MsgConfigureChannelizer::create(log2Decim, filterChainHash);
|
||||
m_basebandSink->getInputMessageQueue()->push(msg);
|
||||
}
|
||||
|
||||
int DOA2::webapiSettingsGet(
|
||||
SWGSDRangel::SWGChannelSettings& response,
|
||||
QString& errorMessage)
|
||||
{
|
||||
(void) errorMessage;
|
||||
response.setDoa2Settings(new SWGSDRangel::SWGDOA2Settings());
|
||||
response.getDoa2Settings()->init();
|
||||
webapiFormatChannelSettings(response, m_settings);
|
||||
return 200;
|
||||
}
|
||||
|
||||
int DOA2::webapiWorkspaceGet(
|
||||
SWGSDRangel::SWGWorkspaceInfo& response,
|
||||
QString& errorMessage)
|
||||
{
|
||||
(void) errorMessage;
|
||||
response.setIndex(m_settings.m_workspaceIndex);
|
||||
return 200;
|
||||
}
|
||||
|
||||
int DOA2::webapiSettingsPutPatch(
|
||||
bool force,
|
||||
const QStringList& channelSettingsKeys,
|
||||
SWGSDRangel::SWGChannelSettings& response,
|
||||
QString& errorMessage)
|
||||
{
|
||||
(void) errorMessage;
|
||||
DOA2Settings settings = m_settings;
|
||||
webapiUpdateChannelSettings(settings, channelSettingsKeys, response);
|
||||
|
||||
MsgConfigureDOA2 *msg = MsgConfigureDOA2::create(settings, force);
|
||||
m_inputMessageQueue.push(msg);
|
||||
|
||||
if (getMessageQueueToGUI()) // forward to GUI if any
|
||||
{
|
||||
MsgConfigureDOA2 *msgToGUI = MsgConfigureDOA2::create(settings, force);
|
||||
getMessageQueueToGUI()->push(msgToGUI);
|
||||
}
|
||||
|
||||
webapiFormatChannelSettings(response, settings);
|
||||
|
||||
return 200;
|
||||
}
|
||||
|
||||
void DOA2::webapiUpdateChannelSettings(
|
||||
DOA2Settings& settings,
|
||||
const QStringList& channelSettingsKeys,
|
||||
SWGSDRangel::SWGChannelSettings& response)
|
||||
{
|
||||
if (channelSettingsKeys.contains("rgbColor")) {
|
||||
settings.m_rgbColor = response.getDoa2Settings()->getRgbColor();
|
||||
}
|
||||
if (channelSettingsKeys.contains("title")) {
|
||||
settings.m_title = *response.getDoa2Settings()->getTitle();
|
||||
}
|
||||
if (channelSettingsKeys.contains("log2Decim")) {
|
||||
settings.m_log2Decim = response.getDoa2Settings()->getLog2Decim();
|
||||
}
|
||||
|
||||
if (channelSettingsKeys.contains("filterChainHash"))
|
||||
{
|
||||
settings.m_filterChainHash = response.getDoa2Settings()->getFilterChainHash();
|
||||
validateFilterChainHash(settings);
|
||||
}
|
||||
|
||||
if (channelSettingsKeys.contains("useReverseAPI")) {
|
||||
settings.m_useReverseAPI = response.getDoa2Settings()->getUseReverseApi() != 0;
|
||||
}
|
||||
if (channelSettingsKeys.contains("reverseAPIAddress")) {
|
||||
settings.m_reverseAPIAddress = *response.getDoa2Settings()->getReverseApiAddress();
|
||||
}
|
||||
if (channelSettingsKeys.contains("reverseAPIPort")) {
|
||||
settings.m_reverseAPIPort = response.getDoa2Settings()->getReverseApiPort();
|
||||
}
|
||||
if (channelSettingsKeys.contains("reverseAPIDeviceIndex")) {
|
||||
settings.m_reverseAPIDeviceIndex = response.getDoa2Settings()->getReverseApiDeviceIndex();
|
||||
}
|
||||
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
|
||||
settings.m_reverseAPIChannelIndex = response.getDoa2Settings()->getReverseApiChannelIndex();
|
||||
}
|
||||
if (settings.m_spectrumGUI && channelSettingsKeys.contains("spectrumConfig")) {
|
||||
settings.m_spectrumGUI->updateFrom(channelSettingsKeys, response.getDoa2Settings()->getSpectrumConfig());
|
||||
}
|
||||
if (settings.m_scopeGUI && channelSettingsKeys.contains("scopeConfig")) {
|
||||
settings.m_scopeGUI->updateFrom(channelSettingsKeys, response.getDoa2Settings()->getScopeConfig());
|
||||
}
|
||||
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
|
||||
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getDoa2Settings()->getChannelMarker());
|
||||
}
|
||||
if (settings.m_rollupState && channelSettingsKeys.contains("rollupState")) {
|
||||
settings.m_rollupState->updateFrom(channelSettingsKeys, response.getDoa2Settings()->getRollupState());
|
||||
}
|
||||
}
|
||||
|
||||
void DOA2::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const DOA2Settings& settings)
|
||||
{
|
||||
response.getDoa2Settings()->setRgbColor(settings.m_rgbColor);
|
||||
|
||||
if (response.getDoa2Settings()->getTitle()) {
|
||||
*response.getDoa2Settings()->getTitle() = settings.m_title;
|
||||
} else {
|
||||
response.getDoa2Settings()->setTitle(new QString(settings.m_title));
|
||||
}
|
||||
|
||||
response.getDoa2Settings()->setLog2Decim(settings.m_log2Decim);
|
||||
response.getDoa2Settings()->setFilterChainHash(settings.m_filterChainHash);
|
||||
response.getDoa2Settings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0);
|
||||
|
||||
if (response.getDoa2Settings()->getReverseApiAddress()) {
|
||||
*response.getDoa2Settings()->getReverseApiAddress() = settings.m_reverseAPIAddress;
|
||||
} else {
|
||||
response.getDoa2Settings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress));
|
||||
}
|
||||
|
||||
response.getDoa2Settings()->setReverseApiPort(settings.m_reverseAPIPort);
|
||||
response.getDoa2Settings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
|
||||
response.getDoa2Settings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
|
||||
|
||||
if (settings.m_spectrumGUI)
|
||||
{
|
||||
if (response.getDoa2Settings()->getSpectrumConfig())
|
||||
{
|
||||
settings.m_spectrumGUI->formatTo(response.getDoa2Settings()->getSpectrumConfig());
|
||||
}
|
||||
else
|
||||
{
|
||||
SWGSDRangel::SWGGLSpectrum *swgGLSpectrum = new SWGSDRangel::SWGGLSpectrum();
|
||||
settings.m_spectrumGUI->formatTo(swgGLSpectrum);
|
||||
response.getDoa2Settings()->setSpectrumConfig(swgGLSpectrum);
|
||||
}
|
||||
}
|
||||
|
||||
if (settings.m_scopeGUI)
|
||||
{
|
||||
if (response.getDoa2Settings()->getScopeConfig())
|
||||
{
|
||||
settings.m_scopeGUI->formatTo(response.getDoa2Settings()->getScopeConfig());
|
||||
}
|
||||
else
|
||||
{
|
||||
SWGSDRangel::SWGGLScope *swgGLScope = new SWGSDRangel::SWGGLScope();
|
||||
settings.m_scopeGUI->formatTo(swgGLScope);
|
||||
response.getDoa2Settings()->setScopeConfig(swgGLScope);
|
||||
}
|
||||
}
|
||||
|
||||
if (settings.m_channelMarker)
|
||||
{
|
||||
if (response.getDoa2Settings()->getChannelMarker())
|
||||
{
|
||||
settings.m_channelMarker->formatTo(response.getDoa2Settings()->getChannelMarker());
|
||||
}
|
||||
else
|
||||
{
|
||||
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||
response.getDoa2Settings()->setChannelMarker(swgChannelMarker);
|
||||
}
|
||||
}
|
||||
|
||||
if (settings.m_rollupState)
|
||||
{
|
||||
if (response.getDoa2Settings()->getRollupState())
|
||||
{
|
||||
settings.m_rollupState->formatTo(response.getDoa2Settings()->getRollupState());
|
||||
}
|
||||
else
|
||||
{
|
||||
SWGSDRangel::SWGRollupState *swgRollupState = new SWGSDRangel::SWGRollupState();
|
||||
settings.m_rollupState->formatTo(swgRollupState);
|
||||
response.getDoa2Settings()->setRollupState(swgRollupState);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void DOA2::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const DOA2Settings& settings, bool force)
|
||||
{
|
||||
SWGSDRangel::SWGChannelSettings *swgChannelSettings = new SWGSDRangel::SWGChannelSettings();
|
||||
webapiFormatChannelSettings(channelSettingsKeys, swgChannelSettings, settings, force);
|
||||
|
||||
QString channelSettingsURL = QString("http://%1:%2/sdrangel/deviceset/%3/channel/%4/settings")
|
||||
.arg(settings.m_reverseAPIAddress)
|
||||
.arg(settings.m_reverseAPIPort)
|
||||
.arg(settings.m_reverseAPIDeviceIndex)
|
||||
.arg(settings.m_reverseAPIChannelIndex);
|
||||
m_networkRequest.setUrl(QUrl(channelSettingsURL));
|
||||
m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
|
||||
|
||||
QBuffer *buffer = new QBuffer();
|
||||
buffer->open((QBuffer::ReadWrite));
|
||||
buffer->write(swgChannelSettings->asJson().toUtf8());
|
||||
buffer->seek(0);
|
||||
|
||||
// Always use PATCH to avoid passing reverse API settings
|
||||
QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer);
|
||||
reply->setParent(buffer);
|
||||
|
||||
delete swgChannelSettings;
|
||||
}
|
||||
|
||||
void DOA2::sendChannelSettings(
|
||||
const QList<ObjectPipe*>& pipes,
|
||||
QList<QString>& channelSettingsKeys,
|
||||
const DOA2Settings& settings,
|
||||
bool force)
|
||||
{
|
||||
for (const auto& pipe : pipes)
|
||||
{
|
||||
MessageQueue *messageQueue = qobject_cast<MessageQueue*>(pipe->m_element);
|
||||
|
||||
if (messageQueue)
|
||||
{
|
||||
SWGSDRangel::SWGChannelSettings *swgChannelSettings = new SWGSDRangel::SWGChannelSettings();
|
||||
webapiFormatChannelSettings(channelSettingsKeys, swgChannelSettings, settings, force);
|
||||
MainCore::MsgChannelSettings *msg = MainCore::MsgChannelSettings::create(
|
||||
this,
|
||||
channelSettingsKeys,
|
||||
swgChannelSettings,
|
||||
force
|
||||
);
|
||||
messageQueue->push(msg);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void DOA2::webapiFormatChannelSettings(
|
||||
QList<QString>& channelSettingsKeys,
|
||||
SWGSDRangel::SWGChannelSettings *swgChannelSettings,
|
||||
const DOA2Settings& settings,
|
||||
bool force
|
||||
)
|
||||
{
|
||||
swgChannelSettings->setDirection(2); // MIMO sink
|
||||
swgChannelSettings->setOriginatorChannelIndex(getIndexInDeviceSet());
|
||||
swgChannelSettings->setOriginatorDeviceSetIndex(getDeviceSetIndex());
|
||||
swgChannelSettings->setChannelType(new QString("DOA2"));
|
||||
swgChannelSettings->setDoa2Settings(new SWGSDRangel::SWGDOA2Settings());
|
||||
SWGSDRangel::SWGDOA2Settings *swgDOA2Settings = swgChannelSettings->getDoa2Settings();
|
||||
|
||||
// transfer data that has been modified. When force is on transfer all data except reverse API data
|
||||
|
||||
if (channelSettingsKeys.contains("rgbColor") || force) {
|
||||
swgDOA2Settings->setRgbColor(settings.m_rgbColor);
|
||||
}
|
||||
if (channelSettingsKeys.contains("title") || force) {
|
||||
swgDOA2Settings->setTitle(new QString(settings.m_title));
|
||||
}
|
||||
if (channelSettingsKeys.contains("log2Decim") || force) {
|
||||
swgDOA2Settings->setLog2Decim(settings.m_log2Decim);
|
||||
}
|
||||
if (channelSettingsKeys.contains("filterChainHash") || force) {
|
||||
swgDOA2Settings->setFilterChainHash(settings.m_filterChainHash);
|
||||
}
|
||||
|
||||
if (settings.m_spectrumGUI)
|
||||
{
|
||||
if (channelSettingsKeys.contains("spectrumConfig") || force) {
|
||||
settings.m_spectrumGUI->formatTo(swgDOA2Settings->getSpectrumConfig());
|
||||
}
|
||||
}
|
||||
|
||||
if (settings.m_scopeGUI)
|
||||
{
|
||||
if (channelSettingsKeys.contains("scopeConfig") || force) {
|
||||
settings.m_scopeGUI->formatTo(swgDOA2Settings->getScopeConfig());
|
||||
}
|
||||
}
|
||||
|
||||
if (settings.m_channelMarker && (channelSettingsKeys.contains("channelMarker") || force))
|
||||
{
|
||||
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
|
||||
settings.m_channelMarker->formatTo(swgChannelMarker);
|
||||
swgDOA2Settings->setChannelMarker(swgChannelMarker);
|
||||
}
|
||||
|
||||
if (settings.m_rollupState && (channelSettingsKeys.contains("rollupState") || force))
|
||||
{
|
||||
SWGSDRangel::SWGRollupState *swgRollupState = new SWGSDRangel::SWGRollupState();
|
||||
settings.m_rollupState->formatTo(swgRollupState);
|
||||
swgDOA2Settings->setRollupState(swgRollupState);
|
||||
}
|
||||
}
|
||||
|
||||
void DOA2::networkManagerFinished(QNetworkReply *reply)
|
||||
{
|
||||
QNetworkReply::NetworkError replyError = reply->error();
|
||||
|
||||
if (replyError)
|
||||
{
|
||||
qWarning() << "DOA2::networkManagerFinished:"
|
||||
<< " error(" << (int) replyError
|
||||
<< "): " << replyError
|
||||
<< ": " << reply->errorString();
|
||||
}
|
||||
else
|
||||
{
|
||||
QString answer = reply->readAll();
|
||||
answer.chop(1); // remove last \n
|
||||
qDebug("DOA2::networkManagerFinished: reply:\n%s", answer.toStdString().c_str());
|
||||
}
|
||||
|
||||
reply->deleteLater();
|
||||
}
|
||||
197
plugins/channelmimo/doa2/doa2.h
Normal file
197
plugins/channelmimo/doa2/doa2.h
Normal file
@ -0,0 +1,197 @@
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Copyright (C) 2022 Edouard Griffiths, F4EXB //
|
||||
// //
|
||||
// This program is free software; you can redistribute it and/or modify //
|
||||
// it under the terms of the GNU General Public License as published by //
|
||||
// the Free Software Foundation as version 3 of the License, or //
|
||||
// (at your option) any later version. //
|
||||
// //
|
||||
// This program is distributed in the hope that it will be useful, //
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
|
||||
// GNU General Public License V3 for more details. //
|
||||
// //
|
||||
// You should have received a copy of the GNU General Public License //
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef INCLUDE_DOA2_H
|
||||
#define INCLUDE_DOA2_H
|
||||
|
||||
#include <vector>
|
||||
#include <QNetworkRequest>
|
||||
|
||||
#include "dsp/mimochannel.h"
|
||||
#include "dsp/spectrumvis.h"
|
||||
#include "dsp/scopevis.h"
|
||||
#include "channel/channelapi.h"
|
||||
#include "util/messagequeue.h"
|
||||
#include "util/message.h"
|
||||
|
||||
#include "doa2settings.h"
|
||||
|
||||
class QThread;
|
||||
class DeviceAPI;
|
||||
class DOA2Baseband;
|
||||
class QNetworkReply;
|
||||
class QNetworkAccessManager;
|
||||
class ObjectPipe;
|
||||
|
||||
class DOA2: public MIMOChannel, public ChannelAPI
|
||||
{
|
||||
public:
|
||||
class MsgConfigureDOA2 : public Message {
|
||||
MESSAGE_CLASS_DECLARATION
|
||||
|
||||
public:
|
||||
const DOA2Settings& getSettings() const { return m_settings; }
|
||||
bool getForce() const { return m_force; }
|
||||
|
||||
static MsgConfigureDOA2* create(const DOA2Settings& settings, bool force)
|
||||
{
|
||||
return new MsgConfigureDOA2(settings, force);
|
||||
}
|
||||
|
||||
private:
|
||||
DOA2Settings m_settings;
|
||||
bool m_force;
|
||||
|
||||
MsgConfigureDOA2(const DOA2Settings& settings, bool force) :
|
||||
Message(),
|
||||
m_settings(settings),
|
||||
m_force(force)
|
||||
{ }
|
||||
};
|
||||
|
||||
class MsgBasebandNotification : public Message {
|
||||
MESSAGE_CLASS_DECLARATION
|
||||
|
||||
public:
|
||||
static MsgBasebandNotification* create(int sampleRate, qint64 centerFrequency) {
|
||||
return new MsgBasebandNotification(sampleRate, centerFrequency);
|
||||
}
|
||||
|
||||
int getSampleRate() const { return m_sampleRate; }
|
||||
qint64 getCenterFrequency() const { return m_centerFrequency; }
|
||||
|
||||
private:
|
||||
|
||||
MsgBasebandNotification(int sampleRate, qint64 centerFrequency) :
|
||||
Message(),
|
||||
m_sampleRate(sampleRate),
|
||||
m_centerFrequency(centerFrequency)
|
||||
{ }
|
||||
|
||||
int m_sampleRate;
|
||||
qint64 m_centerFrequency;
|
||||
};
|
||||
|
||||
DOA2(DeviceAPI *deviceAPI);
|
||||
virtual ~DOA2();
|
||||
virtual void destroy() { delete this; }
|
||||
virtual void setDeviceAPI(DeviceAPI *deviceAPI);
|
||||
virtual DeviceAPI *getDeviceAPI() { return m_deviceAPI; }
|
||||
|
||||
virtual void startSinks(); //!< thread start()
|
||||
virtual void stopSinks(); //!< thread exit() and wait()
|
||||
virtual void startSources() {}
|
||||
virtual void stopSources() {}
|
||||
virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, unsigned int sinkIndex);
|
||||
virtual void pull(SampleVector::iterator& begin, unsigned int nbSamples, unsigned int sourceIndex);
|
||||
virtual void pushMessage(Message *msg) { m_inputMessageQueue.push(msg); }
|
||||
virtual QString getMIMOName() { return objectName(); }
|
||||
|
||||
virtual void getIdentifier(QString& id) { id = objectName(); }
|
||||
virtual QString getIdentifier() const { return objectName(); }
|
||||
virtual void getTitle(QString& title) { title = "DOA 2 sources"; }
|
||||
virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }
|
||||
virtual void setCenterFrequency(qint64) {}
|
||||
uint32_t getDeviceSampleRate() const { return m_deviceSampleRate; }
|
||||
|
||||
virtual QByteArray serialize() const;
|
||||
virtual bool deserialize(const QByteArray& data);
|
||||
|
||||
virtual int getNbSinkStreams() const { return 2; }
|
||||
virtual int getNbSourceStreams() const { return 0; }
|
||||
|
||||
virtual qint64 getStreamCenterFrequency(int streamIndex, bool sinkElseSource) const
|
||||
{
|
||||
(void) streamIndex;
|
||||
(void) sinkElseSource;
|
||||
return m_frequencyOffset;
|
||||
}
|
||||
|
||||
virtual void setMessageQueueToGUI(MessageQueue *queue) { m_guiMessageQueue = queue; }
|
||||
MessageQueue *getMessageQueueToGUI() { return m_guiMessageQueue; }
|
||||
|
||||
SpectrumVis *getSpectrumVis() { return &m_spectrumVis; }
|
||||
ScopeVis *getScopeVis() { return &m_scopeSink; }
|
||||
void applyChannelSettings(uint32_t log2Decim, uint32_t filterChainHash);
|
||||
|
||||
virtual int webapiSettingsGet(
|
||||
SWGSDRangel::SWGChannelSettings& response,
|
||||
QString& errorMessage);
|
||||
|
||||
virtual int webapiSettingsPutPatch(
|
||||
bool force,
|
||||
const QStringList& channelSettingsKeys,
|
||||
SWGSDRangel::SWGChannelSettings& response,
|
||||
QString& errorMessage);
|
||||
|
||||
virtual int webapiWorkspaceGet(
|
||||
SWGSDRangel::SWGWorkspaceInfo& query,
|
||||
QString& errorMessage);
|
||||
|
||||
static void webapiFormatChannelSettings(
|
||||
SWGSDRangel::SWGChannelSettings& response,
|
||||
const DOA2Settings& settings);
|
||||
|
||||
static void webapiUpdateChannelSettings(
|
||||
DOA2Settings& settings,
|
||||
const QStringList& channelSettingsKeys,
|
||||
SWGSDRangel::SWGChannelSettings& response);
|
||||
|
||||
static const char* const m_channelIdURI;
|
||||
static const char* const m_channelId;
|
||||
static const int m_fftSize;
|
||||
|
||||
private:
|
||||
DeviceAPI *m_deviceAPI;
|
||||
QThread *m_thread;
|
||||
SpectrumVis m_spectrumVis;
|
||||
ScopeVis m_scopeSink;
|
||||
DOA2Baseband* m_basebandSink;
|
||||
DOA2Settings m_settings;
|
||||
MessageQueue *m_guiMessageQueue; //!< Input message queue to the GUI
|
||||
|
||||
QNetworkAccessManager *m_networkManager;
|
||||
QNetworkRequest m_networkRequest;
|
||||
|
||||
int64_t m_frequencyOffset;
|
||||
uint32_t m_deviceSampleRate;
|
||||
int m_count0, m_count1;
|
||||
|
||||
virtual bool handleMessage(const Message& cmd); //!< Processing of a message. Returns true if message has actually been processed
|
||||
void applySettings(const DOA2Settings& settings, bool force = false);
|
||||
static void validateFilterChainHash(DOA2Settings& settings);
|
||||
void calculateFrequencyOffset();
|
||||
void webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const DOA2Settings& settings, bool force);
|
||||
void sendChannelSettings(
|
||||
const QList<ObjectPipe*>& pipes,
|
||||
QList<QString>& channelSettingsKeys,
|
||||
const DOA2Settings& settings,
|
||||
bool force
|
||||
);
|
||||
void webapiFormatChannelSettings(
|
||||
QList<QString>& channelSettingsKeys,
|
||||
SWGSDRangel::SWGChannelSettings *swgChannelSettings,
|
||||
const DOA2Settings& settings,
|
||||
bool force
|
||||
);
|
||||
|
||||
private slots:
|
||||
void handleInputMessages();
|
||||
void networkManagerFinished(QNetworkReply *reply);
|
||||
};
|
||||
|
||||
#endif // INCLUDE_DOA2_H
|
||||
263
plugins/channelmimo/doa2/doa2baseband.cpp
Normal file
263
plugins/channelmimo/doa2/doa2baseband.cpp
Normal file
@ -0,0 +1,263 @@
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Copyright (C) 2022 Edouard Griffiths, F4EXB //
|
||||
// //
|
||||
// This program is free software; you can redistribute it and/or modify //
|
||||
// it under the terms of the GNU General Public License as published by //
|
||||
// the Free Software Foundation as version 3 of the License, or //
|
||||
// (at your option) any later version. //
|
||||
// //
|
||||
// This program is distributed in the hope that it will be useful, //
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
|
||||
// GNU General Public License V3 for more details. //
|
||||
// //
|
||||
// You should have received a copy of the GNU General Public License //
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include <QMutexLocker>
|
||||
#include <QDebug>
|
||||
|
||||
#include "dsp/downchannelizer.h"
|
||||
#include "dsp/basebandsamplesink.h"
|
||||
#include "dsp/scopevis.h"
|
||||
#include "dsp/dspcommands.h"
|
||||
|
||||
#include "doa2baseband.h"
|
||||
#include "doa2settings.h"
|
||||
|
||||
|
||||
MESSAGE_CLASS_DEFINITION(DOA2Baseband::MsgConfigureChannelizer, Message)
|
||||
MESSAGE_CLASS_DEFINITION(DOA2Baseband::MsgSignalNotification, Message)
|
||||
MESSAGE_CLASS_DEFINITION(DOA2Baseband::MsgConfigureCorrelation, Message)
|
||||
|
||||
DOA2Baseband::DOA2Baseband(int fftSize) :
|
||||
m_correlator(fftSize),
|
||||
m_spectrumSink(nullptr),
|
||||
m_scopeSink(nullptr),
|
||||
m_mutex(QMutex::Recursive)
|
||||
{
|
||||
m_sampleMIFifo.init(2, 96000 * 8);
|
||||
m_vbegin.resize(2);
|
||||
|
||||
for (int i = 0; i < 2; i++)
|
||||
{
|
||||
m_sinks[i].setStreamIndex(i);
|
||||
m_channelizers[i] = new DownChannelizer(&m_sinks[i]);
|
||||
m_sizes[i] = 0;
|
||||
}
|
||||
|
||||
QObject::connect(
|
||||
&m_sampleMIFifo,
|
||||
&SampleMIFifo::dataSyncReady,
|
||||
this,
|
||||
&DOA2Baseband::handleData,
|
||||
Qt::QueuedConnection
|
||||
);
|
||||
|
||||
connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()));
|
||||
m_lastStream = 0;
|
||||
}
|
||||
|
||||
DOA2Baseband::~DOA2Baseband()
|
||||
{
|
||||
for (int i = 0; i < 2; i++)
|
||||
{
|
||||
delete m_channelizers[i];
|
||||
}
|
||||
}
|
||||
|
||||
void DOA2Baseband::reset()
|
||||
{
|
||||
QMutexLocker mutexLocker(&m_mutex);
|
||||
m_sampleMIFifo.reset();
|
||||
|
||||
for (int i = 0; i < 2; i++) {
|
||||
m_sinks[i].reset();
|
||||
}
|
||||
}
|
||||
|
||||
void DOA2Baseband::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, unsigned int streamIndex)
|
||||
{
|
||||
if (streamIndex > 1) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (streamIndex == m_lastStream) {
|
||||
qWarning("DOA2Baseband::feed: twice same stream in a row: %u", streamIndex);
|
||||
}
|
||||
|
||||
m_lastStream = streamIndex;
|
||||
m_vbegin[streamIndex] = begin;
|
||||
m_sizes[streamIndex] = end - begin;
|
||||
|
||||
if (streamIndex == 1)
|
||||
{
|
||||
if (m_sizes[0] != m_sizes[1])
|
||||
{
|
||||
qWarning("DOA2Baseband::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
|
||||
{
|
||||
m_sampleMIFifo.writeSync(m_vbegin, m_sizes[0]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void DOA2Baseband::handleData()
|
||||
{
|
||||
QMutexLocker mutexLocker(&m_mutex);
|
||||
|
||||
const std::vector<SampleVector>& data = m_sampleMIFifo.getData();
|
||||
|
||||
unsigned int ipart1begin;
|
||||
unsigned int ipart1end;
|
||||
unsigned int ipart2begin;
|
||||
unsigned int ipart2end;
|
||||
|
||||
while ((m_sampleMIFifo.fillSync() > 0) && (m_inputMessageQueue.size() == 0))
|
||||
{
|
||||
m_sampleMIFifo.readSync(ipart1begin, ipart1end, ipart2begin, ipart2end);
|
||||
|
||||
if (ipart1begin != ipart1end) { // first part of FIFO data
|
||||
processFifo(data, ipart1begin, ipart1end);
|
||||
}
|
||||
|
||||
if (ipart2begin != ipart2end) { // second part of FIFO data (used when block wraps around)
|
||||
processFifo(data, ipart2begin, ipart2end);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void DOA2Baseband::processFifo(const std::vector<SampleVector>& 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);
|
||||
}
|
||||
|
||||
run();
|
||||
}
|
||||
|
||||
void DOA2Baseband::run()
|
||||
{
|
||||
if (m_correlator.performCorr(m_sinks[0].getData(), m_sinks[0].getSize(), m_sinks[1].getData(), m_sinks[1].getSize()))
|
||||
{
|
||||
if (m_scopeSink)
|
||||
{
|
||||
std::vector<SampleVector::const_iterator> vbegin;
|
||||
vbegin.push_back(m_correlator.m_tcorr.begin());
|
||||
m_scopeSink->feed(vbegin, m_correlator.m_processed);
|
||||
}
|
||||
|
||||
if (m_spectrumSink)
|
||||
{
|
||||
if ((m_correlator.getCorrType() == DOA2Settings::CorrelationFFT)
|
||||
|| (m_correlator.getCorrType() == DOA2Settings::CorrelationIFFT)
|
||||
|| (m_correlator.getCorrType() == DOA2Settings::CorrelationIFFT2)
|
||||
|| (m_correlator.getCorrType() == DOA2Settings::CorrelationIFFTStar))
|
||||
{
|
||||
m_spectrumSink->feed(m_correlator.m_scorr.begin(), m_correlator.m_scorr.begin() + m_correlator.m_processed, false);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_spectrumSink->feed(m_correlator.m_tcorr.begin(), m_correlator.m_tcorr.begin() + m_correlator.m_processed, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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]);
|
||||
}
|
||||
}
|
||||
|
||||
void DOA2Baseband::handleInputMessages()
|
||||
{
|
||||
qDebug("DOA2Baseband::handleInputMessage");
|
||||
Message* message;
|
||||
|
||||
while ((message = m_inputMessageQueue.pop()) != 0)
|
||||
{
|
||||
if (handleMessage(*message)) {
|
||||
delete message;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool DOA2Baseband::handleMessage(const Message& cmd)
|
||||
{
|
||||
if (MsgConfigureChannelizer::match(cmd))
|
||||
{
|
||||
QMutexLocker mutexLocker(&m_mutex);
|
||||
MsgConfigureChannelizer& cfg = (MsgConfigureChannelizer&) cmd;
|
||||
int log2Decim = cfg.getLog2Decim();
|
||||
int filterChainHash = cfg.getFilterChainHash();
|
||||
|
||||
qDebug() << "DOA2Baseband::handleMessage: MsgConfigureChannelizer:"
|
||||
<< " log2Decim: " << log2Decim
|
||||
<< " filterChainHash: " << filterChainHash;
|
||||
|
||||
for (int i = 0; i < 2; i++)
|
||||
{
|
||||
m_channelizers[i]->setDecimation(log2Decim, filterChainHash);
|
||||
m_sinks[i].reset();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
else if (MsgSignalNotification::match(cmd))
|
||||
{
|
||||
QMutexLocker mutexLocker(&m_mutex);
|
||||
MsgSignalNotification& cfg = (MsgSignalNotification&) cmd;
|
||||
int inputSampleRate = cfg.getInputSampleRate();
|
||||
qint64 centerFrequency = cfg.getCenterFrequency();
|
||||
int streamIndex = cfg.getStreamIndex();
|
||||
|
||||
qDebug() << "DOA2Baseband::handleMessage: MsgSignalNotification:"
|
||||
<< " inputSampleRate: " << inputSampleRate
|
||||
<< " centerFrequency: " << centerFrequency
|
||||
<< " streamIndex: " << streamIndex;
|
||||
|
||||
if (streamIndex < 2)
|
||||
{
|
||||
m_channelizers[streamIndex]->setBasebandSampleRate(inputSampleRate);
|
||||
m_sinks[streamIndex].reset();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
else if (MsgConfigureCorrelation::match(cmd))
|
||||
{
|
||||
QMutexLocker mutexLocker(&m_mutex);
|
||||
MsgConfigureCorrelation& cfg = (MsgConfigureCorrelation&) cmd;
|
||||
DOA2Settings::CorrelationType correlationType = cfg.getCorrelationType();
|
||||
|
||||
qDebug() << "DOA2Baseband::handleMessage: MsgConfigureCorrelation:"
|
||||
<< " correlationType: " << correlationType;
|
||||
|
||||
m_correlator.setCorrType(correlationType);
|
||||
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
qDebug("DOA2Baseband::handleMessage: unhandled: %s", cmd.getIdentifier());
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
void DOA2Baseband ::setBasebandSampleRate(unsigned int sampleRate)
|
||||
{
|
||||
for (int istream = 0; istream < 2; istream++)
|
||||
{
|
||||
m_channelizers[istream]->setBasebandSampleRate(sampleRate);
|
||||
m_sinks[istream].reset();
|
||||
}
|
||||
}
|
||||
137
plugins/channelmimo/doa2/doa2baseband.h
Normal file
137
plugins/channelmimo/doa2/doa2baseband.h
Normal file
@ -0,0 +1,137 @@
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Copyright (C) 2022 Edouard Griffiths, F4EXB //
|
||||
// //
|
||||
// This program is free software; you can redistribute it and/or modify //
|
||||
// it under the terms of the GNU General Public License as published by //
|
||||
// the Free Software Foundation as version 3 of the License, or //
|
||||
// (at your option) any later version. //
|
||||
// //
|
||||
// This program is distributed in the hope that it will be useful, //
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
|
||||
// GNU General Public License V3 for more details. //
|
||||
// //
|
||||
// You should have received a copy of the GNU General Public License //
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef INCLUDE_DOA2BASEBAND_H
|
||||
#define INCLUDE_DOA2BASEBAND_H
|
||||
|
||||
#include <QObject>
|
||||
#include <QMutex>
|
||||
|
||||
#include "dsp/samplemififo.h"
|
||||
#include "util/messagequeue.h"
|
||||
#include "doa2streamsink.h"
|
||||
#include "doa2corr.h"
|
||||
|
||||
class DownChannelizer;
|
||||
class BasebandSampleSink;
|
||||
class ScopeVis;
|
||||
|
||||
class DOA2Baseband : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
class MsgConfigureChannelizer : public Message {
|
||||
MESSAGE_CLASS_DECLARATION
|
||||
|
||||
public:
|
||||
int getLog2Decim() const { return m_log2Decim; }
|
||||
int getFilterChainHash() const { return m_filterChainHash; }
|
||||
|
||||
static MsgConfigureChannelizer* create(unsigned int log2Decim, unsigned int filterChainHash) {
|
||||
return new MsgConfigureChannelizer(log2Decim, filterChainHash);
|
||||
}
|
||||
|
||||
private:
|
||||
unsigned int m_log2Decim;
|
||||
unsigned int m_filterChainHash;
|
||||
|
||||
MsgConfigureChannelizer(unsigned int log2Decim, unsigned int filterChainHash) :
|
||||
Message(),
|
||||
m_log2Decim(log2Decim),
|
||||
m_filterChainHash(filterChainHash)
|
||||
{ }
|
||||
};
|
||||
|
||||
class MsgConfigureCorrelation : public Message {
|
||||
MESSAGE_CLASS_DECLARATION
|
||||
|
||||
public:
|
||||
DOA2Settings::CorrelationType getCorrelationType() const { return m_correlationType; }
|
||||
|
||||
static MsgConfigureCorrelation *create(DOA2Settings::CorrelationType correlationType) {
|
||||
return new MsgConfigureCorrelation(correlationType);
|
||||
}
|
||||
|
||||
private:
|
||||
DOA2Settings::CorrelationType m_correlationType;
|
||||
|
||||
MsgConfigureCorrelation(DOA2Settings::CorrelationType correlationType) :
|
||||
Message(),
|
||||
m_correlationType(correlationType)
|
||||
{}
|
||||
};
|
||||
|
||||
class MsgSignalNotification : public Message {
|
||||
MESSAGE_CLASS_DECLARATION
|
||||
|
||||
public:
|
||||
int getInputSampleRate() const { return m_inputSampleRate; }
|
||||
qint64 getCenterFrequency() const { return m_centerFrequency; }
|
||||
int getStreamIndex() const { return m_streamIndex; }
|
||||
|
||||
static MsgSignalNotification* create(int inputSampleRate, qint64 centerFrequency, int streamIndex) {
|
||||
return new MsgSignalNotification(inputSampleRate, centerFrequency, streamIndex);
|
||||
}
|
||||
private:
|
||||
int m_inputSampleRate;
|
||||
qint64 m_centerFrequency;
|
||||
int m_streamIndex;
|
||||
|
||||
MsgSignalNotification(int inputSampleRate, qint64 centerFrequency, int streamIndex) :
|
||||
Message(),
|
||||
m_inputSampleRate(inputSampleRate),
|
||||
m_centerFrequency(centerFrequency),
|
||||
m_streamIndex(streamIndex)
|
||||
{ }
|
||||
};
|
||||
|
||||
DOA2Baseband(int fftSize);
|
||||
~DOA2Baseband();
|
||||
void reset();
|
||||
|
||||
MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } //!< Get the queue for asynchronous inbound communication
|
||||
|
||||
void setSpectrumSink(BasebandSampleSink *spectrumSink) { m_spectrumSink = spectrumSink; }
|
||||
void setScopeSink(ScopeVis *scopeSink) { m_scopeSink = scopeSink; }
|
||||
void setPhase(int phase) { m_correlator.setPhase(phase); }
|
||||
|
||||
void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, unsigned int streamIndex);
|
||||
void setBasebandSampleRate(unsigned int sampleRate);
|
||||
|
||||
private:
|
||||
void processFifo(const std::vector<SampleVector>& data, unsigned int ibegin, unsigned int iend);
|
||||
void run();
|
||||
bool handleMessage(const Message& cmd);
|
||||
|
||||
DOA2Correlator m_correlator;
|
||||
SampleMIFifo m_sampleMIFifo;
|
||||
std::vector<SampleVector::const_iterator> m_vbegin;
|
||||
int m_sizes[2];
|
||||
DOA2StreamSink m_sinks[2];
|
||||
DownChannelizer *m_channelizers[2];
|
||||
BasebandSampleSink *m_spectrumSink;
|
||||
ScopeVis *m_scopeSink;
|
||||
MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication
|
||||
QMutex m_mutex;
|
||||
unsigned int m_lastStream;
|
||||
|
||||
private slots:
|
||||
void handleInputMessages();
|
||||
void handleData(); //!< Handle data when samples have to be processed
|
||||
};
|
||||
|
||||
#endif // INCLUDE_DOA2BASEBAND_H
|
||||
725
plugins/channelmimo/doa2/doa2corr.cpp
Normal file
725
plugins/channelmimo/doa2/doa2corr.cpp
Normal file
@ -0,0 +1,725 @@
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Copyright (C) 2022 Edouard Griffiths, F4EXB //
|
||||
// //
|
||||
// This program is free software; you can redistribute it and/or modify //
|
||||
// it under the terms of the GNU General Public License as published by //
|
||||
// the Free Software Foundation as version 3 of the License, or //
|
||||
// (at your option) any later version. //
|
||||
// //
|
||||
// This program is distributed in the hope that it will be useful, //
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
|
||||
// GNU General Public License V3 for more details. //
|
||||
// //
|
||||
// You should have received a copy of the GNU General Public License //
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include <algorithm>
|
||||
#include <functional>
|
||||
|
||||
#include "dsp/dspengine.h"
|
||||
#include "dsp/fftfactory.h"
|
||||
#include "dsp/fftengine.h"
|
||||
|
||||
#include "doa2corr.h"
|
||||
|
||||
std::complex<float> s2c(const Sample& s)
|
||||
{
|
||||
return std::complex<float>{s.real() / SDR_RX_SCALEF, s.imag() / SDR_RX_SCALEF};
|
||||
}
|
||||
|
||||
std::complex<float> s2cNorm(const Sample& s)
|
||||
{
|
||||
float x = s.real() / SDR_RX_SCALEF;
|
||||
float y = s.imag() / SDR_RX_SCALEF;
|
||||
float m = sqrt(x*x + y*y);
|
||||
return std::complex<float>{x/m, y/m};
|
||||
}
|
||||
|
||||
Sample sFirst(const Sample& a, const Sample& b) {
|
||||
(void) b;
|
||||
return a;
|
||||
}
|
||||
|
||||
Sample sSecond(const Sample& a, const Sample& b) {
|
||||
(void) a;
|
||||
return b;
|
||||
}
|
||||
|
||||
Sample sSecondInv(const Sample& a, const Sample& b) {
|
||||
(void) a;
|
||||
return Sample{-b.real(), -b.imag()};
|
||||
}
|
||||
|
||||
Sample sAdd(const Sample& a, const Sample& b) { //!< Sample addition
|
||||
return Sample{(a.real()+b.real())/2, (a.imag()+b.imag())/2};
|
||||
}
|
||||
|
||||
Sample sAddInv(const Sample& a, const Sample& b) { //!< Sample addition
|
||||
return Sample{(a.real()-b.real())/2, (a.imag()+b.imag())/2};
|
||||
}
|
||||
|
||||
Sample sMulConj(const Sample& a, const Sample& b) { //!< Sample multiply with conjugate
|
||||
Sample s;
|
||||
// Integer processing
|
||||
int64_t ax = a.real();
|
||||
int64_t ay = a.imag();
|
||||
int64_t bx = b.real();
|
||||
int64_t by = b.imag();
|
||||
int64_t x = ax*bx + ay*by;
|
||||
int64_t y = ay*bx - ax*by;
|
||||
s.setReal(x>>(SDR_RX_SAMP_SZ-1));
|
||||
s.setImag(y>>(SDR_RX_SAMP_SZ-1));
|
||||
// Floating point processing (in practice there is no significant performance difference)
|
||||
// float ax = a.real() / SDR_RX_SCALEF;
|
||||
// float ay = a.imag() / SDR_RX_SCALEF;
|
||||
// float bx = b.real() / SDR_RX_SCALEF;
|
||||
// float by = b.imag() / SDR_RX_SCALEF;
|
||||
// float x = ax*bx + ay*by;
|
||||
// float y = ay*bx - ax*by;
|
||||
// s.setReal(x*SDR_RX_SCALEF);
|
||||
// s.setImag(y*SDR_RX_SCALEF);
|
||||
return s;
|
||||
}
|
||||
|
||||
Sample sMulConjInv(const Sample& a, const Sample& b) { //!< Sample multiply with conjugate
|
||||
Sample s;
|
||||
// Integer processing
|
||||
int64_t ax = a.real();
|
||||
int64_t ay = a.imag();
|
||||
int64_t bx = -b.real();
|
||||
int64_t by = -b.imag();
|
||||
int64_t x = ax*bx + ay*by;
|
||||
int64_t y = ay*bx - ax*by;
|
||||
s.setReal(x>>(SDR_RX_SAMP_SZ-1));
|
||||
s.setImag(y>>(SDR_RX_SAMP_SZ-1));
|
||||
return s;
|
||||
}
|
||||
|
||||
Sample invfft2s(const std::complex<float>& a) { //!< Complex float to Sample for 1 side time correlation
|
||||
Sample s;
|
||||
s.setReal(a.real()/2.0f);
|
||||
s.setImag(a.imag()/2.0f);
|
||||
return s;
|
||||
}
|
||||
|
||||
Sample invfft2s2(const std::complex<float>& a) { //!< Complex float to Sample for 2 sides time correlation
|
||||
Sample s;
|
||||
s.setReal(a.real());
|
||||
s.setImag(a.imag());
|
||||
return s;
|
||||
}
|
||||
|
||||
Sample invfft2star(const std::complex<float>& a) { //!< Complex float to Sample for 1 side time correlation
|
||||
Sample s;
|
||||
s.setReal(a.real()/2.82842712475f); // 2*sqrt(2)
|
||||
s.setImag(a.imag()/2.82842712475f);
|
||||
return s;
|
||||
}
|
||||
|
||||
DOA2Correlator::DOA2Correlator(int fftSize) :
|
||||
m_corrType(DOA2Settings::CorrelationAdd),
|
||||
m_fftSize(fftSize)
|
||||
{
|
||||
setPhase(0);
|
||||
FFTFactory *fftFactory = DSPEngine::instance()->getFFTFactory();
|
||||
m_window.create(FFTWindow::Function::Hanning, fftSize);
|
||||
m_data0w.resize(m_fftSize);
|
||||
m_data1w.resize(m_fftSize);
|
||||
|
||||
for (int i = 0; i < 2; i++)
|
||||
{
|
||||
m_fftSequences[i] = fftFactory->getEngine(2*fftSize, false, &m_fft[i]); // internally twice the data FFT size
|
||||
m_fft2Sequences[i] = fftFactory->getEngine(fftSize, false, &m_fft2[i]);
|
||||
}
|
||||
|
||||
m_invFFTSequence = fftFactory->getEngine(2*fftSize, true, &m_invFFT);
|
||||
m_invFFT2Sequence = fftFactory->getEngine(fftSize, true, &m_invFFT2);
|
||||
|
||||
m_dataj = new std::complex<float>[2*fftSize]; // receives actual FFT result hence twice the data FFT size
|
||||
m_scorr.resize(fftSize);
|
||||
m_tcorr.resize(fftSize);
|
||||
m_scorrSize = fftSize;
|
||||
m_tcorrSize = fftSize;
|
||||
}
|
||||
|
||||
DOA2Correlator::~DOA2Correlator()
|
||||
{
|
||||
FFTFactory *fftFactory = DSPEngine::instance()->getFFTFactory();
|
||||
fftFactory->releaseEngine(2*m_fftSize, true, m_invFFTSequence);
|
||||
fftFactory->releaseEngine(m_fftSize, true, m_invFFT2Sequence);
|
||||
delete[] m_dataj;
|
||||
|
||||
for (int i = 0; i < 2; i++)
|
||||
{
|
||||
fftFactory->releaseEngine(2*m_fftSize, false, m_fftSequences[i]);
|
||||
fftFactory->releaseEngine(m_fftSize, false, m_fft2Sequences[i]);
|
||||
}
|
||||
}
|
||||
|
||||
bool DOA2Correlator::performCorr(
|
||||
const SampleVector& data0,
|
||||
unsigned int size0,
|
||||
const SampleVector& data1,
|
||||
unsigned int size1
|
||||
)
|
||||
{
|
||||
bool results = false;
|
||||
|
||||
if (m_phase == 0)
|
||||
{
|
||||
switch (m_corrType)
|
||||
{
|
||||
case DOA2Settings::Correlation0:
|
||||
results = performOpCorr(data0, size0, data1, size1, sFirst);
|
||||
break;
|
||||
case DOA2Settings::Correlation1:
|
||||
results = performOpCorr(data0, size0, data1, size1, sSecond);
|
||||
break;
|
||||
case DOA2Settings::CorrelationAdd:
|
||||
results = performOpCorr(data0, size0, data1, size1, sAdd);
|
||||
break;
|
||||
case DOA2Settings::CorrelationMultiply:
|
||||
results = performOpCorr(data0, size0, data1, size1, sMulConj);
|
||||
break;
|
||||
case DOA2Settings::CorrelationIFFT:
|
||||
results = performIFFTCorr(data0, size0, data1, size1);
|
||||
break;
|
||||
case DOA2Settings::CorrelationIFFTStar:
|
||||
results = performIFFTCorr(data0, size0, data1, size1, true);
|
||||
break;
|
||||
case DOA2Settings::CorrelationFFT:
|
||||
results = performFFTProd(data0, size0, data1, size1);
|
||||
break;
|
||||
case DOA2Settings::CorrelationIFFT2:
|
||||
results = performIFFT2Corr(data0, size0, data1, size1);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
else if ((m_phase == -180) || (m_phase == 180))
|
||||
{
|
||||
if ((m_corrType == DOA2Settings::CorrelationIFFT)
|
||||
|| (m_corrType == DOA2Settings::CorrelationIFFT2)
|
||||
|| (m_corrType == DOA2Settings::CorrelationIFFTStar)
|
||||
|| (m_corrType == DOA2Settings::CorrelationFFT))
|
||||
{
|
||||
if (size1 > m_data1p.size()) {
|
||||
m_data1p.resize(size1);
|
||||
}
|
||||
|
||||
std::transform(
|
||||
data1.begin(),
|
||||
data1.begin() + size1,
|
||||
m_data1p.begin(),
|
||||
[](const Sample& s) -> Sample {
|
||||
return Sample{-s.real(), -s.imag()};
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
switch (m_corrType)
|
||||
{
|
||||
case DOA2Settings::Correlation0:
|
||||
results = performOpCorr(data0, size0, data1, size1, sFirst);
|
||||
break;
|
||||
case DOA2Settings::Correlation1:
|
||||
results = performOpCorr(data0, size0, data1, size1, sSecondInv);
|
||||
break;
|
||||
case DOA2Settings::CorrelationAdd:
|
||||
results = performOpCorr(data0, size0, data1, size1, sAddInv);
|
||||
break;
|
||||
case DOA2Settings::CorrelationMultiply:
|
||||
results = performOpCorr(data0, size0, data1, size1, sMulConjInv);
|
||||
break;
|
||||
case DOA2Settings::CorrelationIFFT:
|
||||
results = performIFFTCorr(data0, size0, m_data1p, size1);
|
||||
break;
|
||||
case DOA2Settings::CorrelationIFFTStar:
|
||||
results = performIFFTCorr(data0, size0, m_data1p, size1, true);
|
||||
break;
|
||||
case DOA2Settings::CorrelationFFT:
|
||||
results = performFFTProd(data0, size0, m_data1p, size1);
|
||||
break;
|
||||
case DOA2Settings::CorrelationIFFT2:
|
||||
results = performIFFT2Corr(data0, size0, m_data1p, size1);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (size1 > m_data1p.size()) {
|
||||
m_data1p.resize(size1);
|
||||
}
|
||||
|
||||
std::transform(
|
||||
data1.begin(),
|
||||
data1.begin() + size1,
|
||||
m_data1p.begin(),
|
||||
[this](const Sample& s) -> Sample {
|
||||
Sample t;
|
||||
int64_t sx = s.real();
|
||||
int64_t sy = s.imag();
|
||||
int64_t x = sx*m_cos + sy*m_sin;
|
||||
int64_t y = sy*m_cos - sx*m_sin;
|
||||
t.setReal(x>>(SDR_RX_SAMP_SZ-1));
|
||||
t.setImag(y>>(SDR_RX_SAMP_SZ-1));
|
||||
return t;
|
||||
}
|
||||
);
|
||||
|
||||
switch (m_corrType)
|
||||
{
|
||||
case DOA2Settings::Correlation0:
|
||||
results = performOpCorr(data0, size0, m_data1p, size1, sFirst);
|
||||
break;
|
||||
case DOA2Settings::Correlation1:
|
||||
results = performOpCorr(data0, size0, m_data1p, size1, sSecond);
|
||||
break;
|
||||
case DOA2Settings::CorrelationAdd:
|
||||
results = performOpCorr(data0, size0, m_data1p, size1, sAdd);
|
||||
break;
|
||||
case DOA2Settings::CorrelationMultiply:
|
||||
results = performOpCorr(data0, size0, m_data1p, size1, sMulConj);
|
||||
break;
|
||||
case DOA2Settings::CorrelationIFFT:
|
||||
results = performIFFTCorr(data0, size0, m_data1p, size1);
|
||||
break;
|
||||
case DOA2Settings::CorrelationIFFTStar:
|
||||
results = performIFFTCorr(data0, size0, m_data1p, size1, true);
|
||||
break;
|
||||
case DOA2Settings::CorrelationFFT:
|
||||
results = performFFTProd(data0, size0, m_data1p, size1);
|
||||
break;
|
||||
case DOA2Settings::CorrelationIFFT2:
|
||||
results = performIFFT2Corr(data0, size0, m_data1p, size1);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return results;
|
||||
}
|
||||
|
||||
bool DOA2Correlator::performOpCorr(
|
||||
const SampleVector& data0,
|
||||
unsigned int size0,
|
||||
const SampleVector& data1,
|
||||
unsigned int size1,
|
||||
Sample sampleOp(const Sample& a, const Sample& b)
|
||||
)
|
||||
{
|
||||
unsigned int size = std::min(size0, size1);
|
||||
adjustTCorrSize(size);
|
||||
|
||||
std::transform(
|
||||
data0.begin(),
|
||||
data0.begin() + size,
|
||||
data1.begin(),
|
||||
m_tcorr.begin(),
|
||||
sampleOp
|
||||
);
|
||||
|
||||
m_processed = size;
|
||||
m_remaining[0] = size0 - size;
|
||||
m_remaining[1] = size1 - size;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool DOA2Correlator::performIFFTCorr(
|
||||
const SampleVector& data0,
|
||||
unsigned int size0,
|
||||
const SampleVector& data1,
|
||||
unsigned int size1,
|
||||
bool star
|
||||
)
|
||||
{
|
||||
unsigned int size = std::min(size0, size1);
|
||||
int nfft = 0;
|
||||
SampleVector::const_iterator begin0 = data0.begin();
|
||||
SampleVector::const_iterator begin1 = data1.begin();
|
||||
adjustSCorrSize(size);
|
||||
adjustTCorrSize(size);
|
||||
|
||||
while (size >= m_fftSize)
|
||||
{
|
||||
// FFT[0]
|
||||
std::transform(
|
||||
begin0,
|
||||
begin0 + m_fftSize,
|
||||
m_fft[0]->in(),
|
||||
s2c
|
||||
);
|
||||
m_window.apply(m_fft[0]->in());
|
||||
std::fill(m_fft[0]->in() + m_fftSize, m_fft[0]->in() + 2*m_fftSize, std::complex<float>{0, 0});
|
||||
m_fft[0]->transform();
|
||||
|
||||
// FFT[1]
|
||||
std::transform(
|
||||
begin1,
|
||||
begin1 + m_fftSize,
|
||||
m_fft[1]->in(),
|
||||
s2c
|
||||
);
|
||||
m_window.apply(m_fft[1]->in());
|
||||
std::fill(m_fft[1]->in() + m_fftSize, m_fft[1]->in() + 2*m_fftSize, std::complex<float>{0, 0});
|
||||
m_fft[1]->transform();
|
||||
|
||||
// conjugate FFT[1]
|
||||
std::transform(
|
||||
m_fft[1]->out(),
|
||||
m_fft[1]->out() + 2*m_fftSize,
|
||||
m_dataj,
|
||||
[](const std::complex<float>& c) -> std::complex<float> {
|
||||
return std::conj(c);
|
||||
}
|
||||
);
|
||||
|
||||
// product of FFT[1]* with FFT[0] and store in inverse FFT input
|
||||
std::transform(
|
||||
m_fft[0]->out(),
|
||||
m_fft[0]->out() + 2*m_fftSize,
|
||||
m_dataj,
|
||||
m_invFFT->in(),
|
||||
[](std::complex<float>& a, const std::complex<float>& b) -> std::complex<float> {
|
||||
return (a*b);
|
||||
}
|
||||
);
|
||||
|
||||
// copy product to correlation spectrum - convert and scale to FFT size and Hanning window
|
||||
std::transform(
|
||||
m_invFFT->in(),
|
||||
m_invFFT->in() + m_fftSize,
|
||||
m_scorr.begin() + nfft*m_fftSize,
|
||||
[this](const std::complex<float>& a) -> Sample {
|
||||
Sample s;
|
||||
s.setReal(a.real()*(SDR_RX_SCALEF/m_fftSize));
|
||||
s.setImag(a.imag()*(SDR_RX_SCALEF/m_fftSize));
|
||||
return s;
|
||||
}
|
||||
);
|
||||
|
||||
// do the inverse FFT to get time correlation
|
||||
m_invFFT->transform();
|
||||
|
||||
if (star)
|
||||
{
|
||||
// sum first half with the reversed second half as one is the conjugate of the other this should yield constant phase
|
||||
*m_tcorr.begin() = invfft2star(m_invFFT->out()[0]); // t = 0
|
||||
std::reverse(m_invFFT->out() + m_fftSize, m_invFFT->out() + 2*m_fftSize);
|
||||
std::transform(
|
||||
m_invFFT->out() + 1,
|
||||
m_invFFT->out() + m_fftSize,
|
||||
m_invFFT->out() + m_fftSize,
|
||||
m_tcorr.begin() + nfft*m_fftSize,
|
||||
[](const std::complex<float>& a, const std::complex<float>& b) -> Sample {
|
||||
Sample s;
|
||||
std::complex<float> sum = a + b;
|
||||
s.setReal(sum.real()/12.0f);
|
||||
s.setImag(sum.imag()/12.0f);
|
||||
return s;
|
||||
}
|
||||
);
|
||||
}
|
||||
else
|
||||
{
|
||||
std::transform(
|
||||
m_invFFT->out(),
|
||||
m_invFFT->out() + m_fftSize,
|
||||
m_tcorr.begin() + nfft*m_fftSize,
|
||||
[](const std::complex<float>& a) -> Sample {
|
||||
Sample s;
|
||||
s.setReal(a.real()/6.0f);
|
||||
s.setImag(a.imag()/6.0f);
|
||||
return s;
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
size -= m_fftSize;
|
||||
begin0 += m_fftSize;
|
||||
begin1 += m_fftSize;
|
||||
nfft++;
|
||||
}
|
||||
|
||||
// update the samples counters
|
||||
m_processed = nfft*m_fftSize;
|
||||
m_remaining[0] = size0 - nfft*m_fftSize;
|
||||
m_remaining[1] = size1 - nfft*m_fftSize;
|
||||
|
||||
return nfft > 0;
|
||||
}
|
||||
|
||||
bool DOA2Correlator::performIFFT2Corr(
|
||||
const SampleVector& data0,
|
||||
unsigned int size0,
|
||||
const SampleVector& data1,
|
||||
unsigned int size1
|
||||
)
|
||||
{
|
||||
unsigned int size = std::min(size0, size1);
|
||||
int nfft = 0;
|
||||
SampleVector::const_iterator begin0 = data0.begin();
|
||||
SampleVector::const_iterator begin1 = data1.begin();
|
||||
adjustSCorrSize(size);
|
||||
adjustTCorrSize(size);
|
||||
|
||||
while (size >= m_fftSize)
|
||||
{
|
||||
// FFT[0]
|
||||
std::transform(
|
||||
begin0,
|
||||
begin0 + m_fftSize,
|
||||
m_fft2[0]->in(),
|
||||
s2c
|
||||
);
|
||||
m_window.apply(m_fft2[0]->in());
|
||||
m_fft2[0]->transform();
|
||||
|
||||
// FFT[1]
|
||||
std::transform(
|
||||
begin1,
|
||||
begin1 + m_fftSize,
|
||||
m_fft2[1]->in(),
|
||||
s2c
|
||||
);
|
||||
m_window.apply(m_fft2[1]->in());
|
||||
m_fft2[1]->transform();
|
||||
|
||||
// conjugate FFT[1]
|
||||
std::transform(
|
||||
m_fft2[1]->out(),
|
||||
m_fft2[1]->out() + m_fftSize,
|
||||
m_dataj,
|
||||
[](const std::complex<float>& c) -> std::complex<float> {
|
||||
return std::conj(c);
|
||||
}
|
||||
);
|
||||
|
||||
// product of FFT[1]* with FFT[0] and store in inverse FFT input
|
||||
std::transform(
|
||||
m_fft2[0]->out(),
|
||||
m_fft2[0]->out() + m_fftSize,
|
||||
m_dataj,
|
||||
m_invFFT2->in(),
|
||||
[](std::complex<float>& a, const std::complex<float>& b) -> std::complex<float> {
|
||||
return (a*b);
|
||||
}
|
||||
);
|
||||
|
||||
// copy product to correlation spectrum - convert and scale to FFT size
|
||||
std::transform(
|
||||
m_invFFT2->in(),
|
||||
m_invFFT2->in() + m_fftSize,
|
||||
m_scorr.begin() + nfft*m_fftSize,
|
||||
[this](const std::complex<float>& a) -> Sample {
|
||||
Sample s;
|
||||
s.setReal(a.real()*(SDR_RX_SCALEF/m_fftSize));
|
||||
s.setImag(a.imag()*(SDR_RX_SCALEF/m_fftSize));
|
||||
return s;
|
||||
}
|
||||
);
|
||||
|
||||
// do the inverse FFT to get time correlation
|
||||
m_invFFT2->transform();
|
||||
std::transform(
|
||||
m_invFFT2->out() + m_fftSize/2,
|
||||
m_invFFT2->out() + m_fftSize,
|
||||
m_tcorr.begin() + nfft*m_fftSize,
|
||||
[](const std::complex<float>& a) -> Sample {
|
||||
Sample s;
|
||||
s.setReal(a.real()/3.0f);
|
||||
s.setImag(a.imag()/3.0f);
|
||||
return s;
|
||||
}
|
||||
);
|
||||
std::transform(
|
||||
m_invFFT2->out(),
|
||||
m_invFFT2->out() + m_fftSize/2,
|
||||
m_tcorr.begin() + nfft*m_fftSize + m_fftSize/2,
|
||||
[](const std::complex<float>& a) -> Sample {
|
||||
Sample s;
|
||||
s.setReal(a.real()/3.0f);
|
||||
s.setImag(a.imag()/3.0f);
|
||||
return s;
|
||||
}
|
||||
);
|
||||
|
||||
size -= m_fftSize;
|
||||
begin0 += m_fftSize;
|
||||
begin1 += m_fftSize;
|
||||
nfft++;
|
||||
}
|
||||
|
||||
// update the samples counters
|
||||
m_processed = nfft*m_fftSize;
|
||||
m_remaining[0] = size0 - nfft*m_fftSize;
|
||||
m_remaining[1] = size1 - nfft*m_fftSize;
|
||||
|
||||
return nfft > 0;
|
||||
}
|
||||
|
||||
bool DOA2Correlator::performFFTProd(
|
||||
const SampleVector& data0,
|
||||
unsigned int size0,
|
||||
const SampleVector& data1,
|
||||
unsigned int size1
|
||||
)
|
||||
{
|
||||
unsigned int size = std::min(size0, size1);
|
||||
int nfft = 0;
|
||||
SampleVector::const_iterator begin0 = data0.begin();
|
||||
SampleVector::const_iterator begin1 = data1.begin();
|
||||
adjustSCorrSize(size);
|
||||
adjustTCorrSize(size);
|
||||
|
||||
while (size >= m_fftSize)
|
||||
{
|
||||
// FFT[0]
|
||||
std::transform(
|
||||
begin0,
|
||||
begin0 + m_fftSize,
|
||||
m_fft2[0]->in(),
|
||||
s2cNorm
|
||||
);
|
||||
m_window.apply(m_fft2[0]->in());
|
||||
m_fft2[0]->transform();
|
||||
|
||||
// FFT[1]
|
||||
std::transform(
|
||||
begin1,
|
||||
begin1 + m_fftSize,
|
||||
m_fft2[1]->in(),
|
||||
s2cNorm
|
||||
);
|
||||
m_window.apply(m_fft2[1]->in());
|
||||
m_fft2[1]->transform();
|
||||
|
||||
// conjugate FFT[1]
|
||||
std::transform(
|
||||
m_fft2[1]->out(),
|
||||
m_fft2[1]->out() + m_fftSize,
|
||||
m_dataj,
|
||||
[](const std::complex<float>& c) -> std::complex<float> {
|
||||
return std::conj(c);
|
||||
}
|
||||
);
|
||||
|
||||
// product of FFT[1]* with FFT[0] and store in both results
|
||||
std::transform(
|
||||
m_fft2[0]->out(),
|
||||
m_fft2[0]->out() + m_fftSize,
|
||||
m_dataj,
|
||||
m_invFFT2->in(),
|
||||
[this](std::complex<float>& a, const std::complex<float>& b) -> std::complex<float> {
|
||||
return (a*b);
|
||||
}
|
||||
);
|
||||
|
||||
// copy product to time domain - re-order, convert and scale to FFT size
|
||||
std::transform(
|
||||
m_invFFT2->in(),
|
||||
m_invFFT2->in() + m_fftSize/2,
|
||||
m_tcorr.begin() + nfft*m_fftSize + m_fftSize/2,
|
||||
[](const std::complex<float>& a) -> Sample {
|
||||
Sample s;
|
||||
s.setReal(a.real()/2.0f);
|
||||
s.setImag(a.imag()/2.0f);
|
||||
return s;
|
||||
}
|
||||
);
|
||||
std::transform(
|
||||
m_invFFT2->in() + m_fftSize/2,
|
||||
m_invFFT2->in() + m_fftSize,
|
||||
m_tcorr.begin() + nfft*m_fftSize,
|
||||
[](const std::complex<float>& a) -> Sample {
|
||||
Sample s;
|
||||
s.setReal(a.real()/2.0f);
|
||||
s.setImag(a.imag()/2.0f);
|
||||
return s;
|
||||
}
|
||||
);
|
||||
|
||||
// feed spectrum with the sum
|
||||
std::transform(
|
||||
begin0,
|
||||
begin0 + m_fftSize,
|
||||
begin1,
|
||||
m_scorr.begin() + nfft*m_fftSize,
|
||||
sAdd
|
||||
);
|
||||
|
||||
size -= m_fftSize;
|
||||
begin0 += m_fftSize;
|
||||
begin1 += m_fftSize;
|
||||
nfft++;
|
||||
}
|
||||
|
||||
// update the samples counters
|
||||
m_processed = nfft*m_fftSize;
|
||||
m_remaining[0] = size0 - nfft*m_fftSize;
|
||||
m_remaining[1] = size1 - nfft*m_fftSize;
|
||||
|
||||
return nfft > 0;
|
||||
}
|
||||
|
||||
void DOA2Correlator::adjustSCorrSize(int size)
|
||||
{
|
||||
int nFFTSize = (size/m_fftSize)*m_fftSize;
|
||||
|
||||
if (nFFTSize > m_scorrSize)
|
||||
{
|
||||
m_scorr.resize(nFFTSize);
|
||||
m_scorrSize = nFFTSize;
|
||||
}
|
||||
}
|
||||
|
||||
void DOA2Correlator::adjustTCorrSize(int size)
|
||||
{
|
||||
int nFFTSize = (size/m_fftSize)*m_fftSize;
|
||||
|
||||
if (nFFTSize > m_tcorrSize)
|
||||
{
|
||||
m_tcorr.resize(nFFTSize);
|
||||
m_tcorrSize = nFFTSize;
|
||||
}
|
||||
}
|
||||
|
||||
void DOA2Correlator::setPhase(int phase)
|
||||
{
|
||||
m_phase = phase;
|
||||
|
||||
if (phase == 0)
|
||||
{
|
||||
m_sin = 0;
|
||||
m_cos = 1<<(SDR_RX_SAMP_SZ-1);
|
||||
}
|
||||
else if (phase == 90)
|
||||
{
|
||||
m_sin = 1<<(SDR_RX_SAMP_SZ-1);
|
||||
m_cos = 0;
|
||||
}
|
||||
else if (phase == -90)
|
||||
{
|
||||
m_sin = -(1<<(SDR_RX_SAMP_SZ-1));
|
||||
m_cos = 0;
|
||||
}
|
||||
else if ((phase == -180) || (phase == 180))
|
||||
{
|
||||
m_sin = 0;
|
||||
m_cos = -(1<<(SDR_RX_SAMP_SZ-1));
|
||||
}
|
||||
else
|
||||
{
|
||||
m_phase = phase % 180;
|
||||
double d_sin = sin(M_PI*(m_phase/180.0)) * (1<<(SDR_RX_SAMP_SZ-1));
|
||||
double d_cos = cos(M_PI*(m_phase/180.0)) * (1<<(SDR_RX_SAMP_SZ-1));
|
||||
m_sin = d_sin;
|
||||
m_cos = d_cos;
|
||||
}
|
||||
}
|
||||
109
plugins/channelmimo/doa2/doa2corr.h
Normal file
109
plugins/channelmimo/doa2/doa2corr.h
Normal file
@ -0,0 +1,109 @@
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Copyright (C) 2022 Edouard Griffiths, F4EXB //
|
||||
// //
|
||||
// This program is free software; you can redistribute it and/or modify //
|
||||
// it under the terms of the GNU General Public License as published by //
|
||||
// the Free Software Foundation as version 3 of the License, or //
|
||||
// (at your option) any later version. //
|
||||
// //
|
||||
// This program is distributed in the hope that it will be useful, //
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
|
||||
// GNU General Public License V3 for more details. //
|
||||
// //
|
||||
// You should have received a copy of the GNU General Public License //
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef INCLUDE_DOA2CORR_H
|
||||
#define INCLUDE_DOA2CORR_H
|
||||
|
||||
#include <complex>
|
||||
#include <QObject>
|
||||
|
||||
#include "dsp/dsptypes.h"
|
||||
#include "dsp/fftwindow.h"
|
||||
#include "util/message.h"
|
||||
|
||||
#include "doa2settings.h"
|
||||
|
||||
class FFTEngine;
|
||||
|
||||
class DOA2Correlator : public QObject {
|
||||
Q_OBJECT
|
||||
public:
|
||||
DOA2Correlator(int fftSize);
|
||||
~DOA2Correlator();
|
||||
|
||||
void setCorrType(DOA2Settings::CorrelationType corrType) { m_corrType = corrType; }
|
||||
DOA2Settings::CorrelationType getCorrType() const { return m_corrType; }
|
||||
bool performCorr( //!< Returns true if results were produced
|
||||
const SampleVector& data0,
|
||||
unsigned int size0,
|
||||
const SampleVector& data1,
|
||||
unsigned int size1
|
||||
);
|
||||
int getFullFFTSize() const { return 2*m_fftSize; }
|
||||
void setPhase(int phase);
|
||||
|
||||
SampleVector m_scorr; //!< raw correlation result (spectrum) - Sample vector expected
|
||||
SampleVector m_tcorr; //!< correlation result (time or spectrum inverse FFT) - Sample vector expected
|
||||
int m_processed; //!< number of samples processed at the end of correlation
|
||||
int m_remaining[2]; //!< number of samples remaining per member at the end of correlation
|
||||
|
||||
signals:
|
||||
void dataReady(int start, int stop);
|
||||
|
||||
private:
|
||||
bool performOpCorr( //!< Returns true if results were produced
|
||||
const SampleVector& data0,
|
||||
unsigned int size0,
|
||||
const SampleVector& data1,
|
||||
unsigned int size1,
|
||||
Sample sampleOp(const Sample& a, const Sample& b)
|
||||
);
|
||||
bool performIFFTCorr( //!< Returns true if results were produced
|
||||
const SampleVector& data0,
|
||||
unsigned int size0,
|
||||
const SampleVector& data1,
|
||||
unsigned int size1,
|
||||
bool star = false
|
||||
);
|
||||
bool performIFFT2Corr( //!< Returns true if results were produced
|
||||
const SampleVector& data0,
|
||||
unsigned int size0,
|
||||
const SampleVector& data1,
|
||||
unsigned int size1
|
||||
);
|
||||
bool performFFTProd( //!< Returns true if results were produced
|
||||
const SampleVector& data0,
|
||||
unsigned int size0,
|
||||
const SampleVector& data1,
|
||||
unsigned int size1
|
||||
);
|
||||
void adjustSCorrSize(int size);
|
||||
void adjustTCorrSize(int size);
|
||||
|
||||
DOA2Settings::CorrelationType m_corrType;
|
||||
unsigned int m_fftSize; //!< FFT length
|
||||
FFTEngine *m_fft[2]; //!< FFT engines (double FFT)
|
||||
FFTEngine *m_invFFT; //!< Inverse FFT engine (double FFT)
|
||||
FFTEngine *m_fft2[2]; //!< FFT engines
|
||||
FFTEngine *m_invFFT2; //!< Inverse FFT engine
|
||||
unsigned int m_fftSequences[2]; //!< FFT factory engine sequences
|
||||
unsigned int m_invFFTSequence; //!< Inverse FFT engine sequence
|
||||
unsigned int m_fft2Sequences[2]; //!< FFT engines sequences
|
||||
unsigned int m_invFFT2Sequence; //!< Inverse FFT engine sequence
|
||||
FFTWindow m_window; //!< FFT window
|
||||
std::complex<float> *m_dataj; //!< conjuate of FFT transform
|
||||
SampleVector m_data0w; //!< windowed data 0
|
||||
SampleVector m_data1w; //!< windowed data 1
|
||||
SampleVector m_data1p; //!< data1 with phase correction
|
||||
int m_scorrSize; //!< spectrum correlations vector size
|
||||
int m_tcorrSize; //!< time correlations vector size
|
||||
int m_phase; //!< phase correction
|
||||
int64_t m_sin; //!< scaled sine of phase correction
|
||||
int64_t m_cos; //!< scaled cosine of phase correction
|
||||
};
|
||||
|
||||
#endif // INCLUDE_DOA2CORR_H
|
||||
372
plugins/channelmimo/doa2/doa2gui.cpp
Normal file
372
plugins/channelmimo/doa2/doa2gui.cpp
Normal file
@ -0,0 +1,372 @@
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Copyright (C) 2022 Edouard Griffiths, F4EXB //
|
||||
// //
|
||||
// This program is free software; you can redistribute it and/or modify //
|
||||
// it under the terms of the GNU General Public License as published by //
|
||||
// the Free Software Foundation as version 3 of the License, or //
|
||||
// (at your option) any later version. //
|
||||
// //
|
||||
// This program is distributed in the hope that it will be useful, //
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
|
||||
// GNU General Public License V3 for more details. //
|
||||
// //
|
||||
// You should have received a copy of the GNU General Public License //
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include <QLocale>
|
||||
|
||||
#include "device/deviceuiset.h"
|
||||
#include "gui/basicchannelsettingsdialog.h"
|
||||
#include "dsp/hbfilterchainconverter.h"
|
||||
#include "dsp/scopevis.h"
|
||||
#include "dsp/spectrumvis.h"
|
||||
#include "maincore.h"
|
||||
|
||||
#include "doa2gui.h"
|
||||
#include "doa2.h"
|
||||
#include "ui_doa2gui.h"
|
||||
|
||||
DOA2GUI* DOA2GUI::create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, MIMOChannel *channelMIMO)
|
||||
{
|
||||
DOA2GUI* gui = new DOA2GUI(pluginAPI, deviceUISet, channelMIMO);
|
||||
return gui;
|
||||
}
|
||||
|
||||
void DOA2GUI::destroy()
|
||||
{
|
||||
delete this;
|
||||
}
|
||||
|
||||
void DOA2GUI::resetToDefaults()
|
||||
{
|
||||
m_settings.resetToDefaults();
|
||||
displaySettings();
|
||||
applySettings(true);
|
||||
}
|
||||
|
||||
QByteArray DOA2GUI::serialize() const
|
||||
{
|
||||
return m_settings.serialize();
|
||||
}
|
||||
|
||||
bool DOA2GUI::deserialize(const QByteArray& data)
|
||||
{
|
||||
if (m_settings.deserialize(data))
|
||||
{
|
||||
displaySettings();
|
||||
applySettings(true);
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
resetToDefaults();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
MessageQueue* DOA2GUI::getInputMessageQueue()
|
||||
{
|
||||
return &m_inputMessageQueue;
|
||||
}
|
||||
|
||||
bool DOA2GUI::handleMessage(const Message& message)
|
||||
{
|
||||
if (DOA2::MsgBasebandNotification::match(message))
|
||||
{
|
||||
DOA2::MsgBasebandNotification& notif = (DOA2::MsgBasebandNotification&) message;
|
||||
m_sampleRate = notif.getSampleRate();
|
||||
m_centerFrequency = notif.getCenterFrequency();
|
||||
displayRateAndShift();
|
||||
updateAbsoluteCenterFrequency();
|
||||
return true;
|
||||
}
|
||||
else if (DOA2::MsgConfigureDOA2::match(message))
|
||||
{
|
||||
const DOA2::MsgConfigureDOA2& notif = (const DOA2::MsgConfigureDOA2&) message;
|
||||
m_settings = notif.getSettings();
|
||||
ui->scopeGUI->updateSettings();
|
||||
ui->spectrumGUI->updateSettings();
|
||||
m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
|
||||
displaySettings();
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
DOA2GUI::DOA2GUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, MIMOChannel *channelMIMO, QWidget* parent) :
|
||||
ChannelGUI(parent),
|
||||
ui(new Ui::DOA2GUI),
|
||||
m_pluginAPI(pluginAPI),
|
||||
m_deviceUISet(deviceUISet),
|
||||
m_sampleRate(48000),
|
||||
m_centerFrequency(435000000),
|
||||
m_tickCount(0)
|
||||
{
|
||||
setAttribute(Qt::WA_DeleteOnClose, true);
|
||||
m_helpURL = "plugins/channelmimo/doa2/readme.md";
|
||||
RollupContents *rollupContents = getRollupContents();
|
||||
ui->setupUi(rollupContents);
|
||||
setSizePolicy(rollupContents->sizePolicy());
|
||||
rollupContents->arrangeRollups();
|
||||
connect(rollupContents, SIGNAL(widgetRolled(QWidget*,bool)), this, SLOT(onWidgetRolled(QWidget*,bool)));
|
||||
connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onMenuDialogCalled(const QPoint &)));
|
||||
|
||||
m_doa2 = (DOA2*) channelMIMO;
|
||||
m_spectrumVis = m_doa2->getSpectrumVis();
|
||||
m_spectrumVis->setGLSpectrum(ui->glSpectrum);
|
||||
m_scopeVis = m_doa2->getScopeVis();
|
||||
m_scopeVis->setGLScope(ui->glScope);
|
||||
m_doa2->setMessageQueueToGUI(getInputMessageQueue());
|
||||
m_sampleRate = m_doa2->getDeviceSampleRate();
|
||||
|
||||
ui->glSpectrum->setDisplayWaterfall(true);
|
||||
ui->glSpectrum->setDisplayMaxHold(true);
|
||||
ui->glSpectrum->setCenterFrequency(0);
|
||||
ui->glSpectrum->setSampleRate(m_sampleRate);
|
||||
ui->glSpectrum->setSsbSpectrum(false);
|
||||
ui->glSpectrum->setLsbDisplay(false);
|
||||
ui->glScope->setTraceModulo(DOA2::m_fftSize);
|
||||
|
||||
ui->glScope->connectTimer(MainCore::instance()->getMasterTimer());
|
||||
connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
|
||||
|
||||
m_channelMarker.blockSignals(true);
|
||||
m_channelMarker.addStreamIndex(1);
|
||||
m_channelMarker.setColor(m_settings.m_rgbColor);
|
||||
m_channelMarker.setCenterFrequency(0);
|
||||
m_channelMarker.setTitle("DOA 2 source");
|
||||
m_channelMarker.blockSignals(false);
|
||||
m_channelMarker.setVisible(true); // activate signal on the last setting only
|
||||
|
||||
m_settings.setChannelMarker(&m_channelMarker);
|
||||
m_settings.setRollupState(&m_rollupState);
|
||||
m_settings.setScopeGUI(ui->scopeGUI);
|
||||
m_settings.setSpectrumGUI(ui->spectrumGUI);
|
||||
|
||||
m_deviceUISet->addChannelMarker(&m_channelMarker);
|
||||
|
||||
ui->spectrumGUI->setBuddies(m_spectrumVis, ui->glSpectrum);
|
||||
ui->scopeGUI->setBuddies(m_scopeVis->getInputMessageQueue(), m_scopeVis, ui->glScope);
|
||||
|
||||
m_scopeVis->setTraceChunkSize(DOA2::m_fftSize); // Set scope trace length unit to FFT size
|
||||
ui->scopeGUI->traceLengthChange();
|
||||
|
||||
connect(getInputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages()));
|
||||
|
||||
displaySettings();
|
||||
makeUIConnections();
|
||||
displayRateAndShift();
|
||||
applySettings(true);
|
||||
}
|
||||
|
||||
DOA2GUI::~DOA2GUI()
|
||||
{
|
||||
delete ui;
|
||||
}
|
||||
|
||||
void DOA2GUI::blockApplySettings(bool block)
|
||||
{
|
||||
m_doApplySettings = !block;
|
||||
}
|
||||
|
||||
void DOA2GUI::applySettings(bool force)
|
||||
{
|
||||
if (m_doApplySettings)
|
||||
{
|
||||
setTitleColor(m_channelMarker.getColor());
|
||||
|
||||
DOA2::MsgConfigureDOA2* message = DOA2::MsgConfigureDOA2::create(m_settings, force);
|
||||
m_doa2->getInputMessageQueue()->push(message);
|
||||
}
|
||||
}
|
||||
|
||||
void DOA2GUI::displaySettings()
|
||||
{
|
||||
ui->correlationType->setCurrentIndex((int) m_settings.m_correlationType);
|
||||
|
||||
m_channelMarker.blockSignals(true);
|
||||
m_channelMarker.setCenterFrequency(0);
|
||||
m_channelMarker.setTitle(m_settings.m_title);
|
||||
m_channelMarker.setBandwidth(m_sampleRate);
|
||||
m_channelMarker.setMovable(false); // do not let user move the center arbitrarily
|
||||
m_channelMarker.blockSignals(false);
|
||||
m_channelMarker.setColor(m_settings.m_rgbColor); // activate signal on the last setting only
|
||||
|
||||
setTitleColor(m_settings.m_rgbColor);
|
||||
setWindowTitle(m_channelMarker.getTitle());
|
||||
setTitle(m_channelMarker.getTitle());
|
||||
|
||||
blockApplySettings(true);
|
||||
ui->decimationFactor->setCurrentIndex(m_settings.m_log2Decim);
|
||||
applyDecimation();
|
||||
ui->phaseCorrection->setValue(m_settings.m_phase);
|
||||
ui->phaseCorrectionText->setText(tr("%1").arg(m_settings.m_phase));
|
||||
getRollupContents()->restoreState(m_rollupState);
|
||||
updateAbsoluteCenterFrequency();
|
||||
blockApplySettings(false);
|
||||
}
|
||||
|
||||
void DOA2GUI::displayRateAndShift()
|
||||
{
|
||||
int shift = m_shiftFrequencyFactor * m_sampleRate;
|
||||
double channelSampleRate = ((double) m_sampleRate) / (1<<m_settings.m_log2Decim);
|
||||
QLocale loc;
|
||||
ui->offsetFrequencyText->setText(tr("%1 Hz").arg(loc.toString(shift)));
|
||||
ui->channelRateText->setText(tr("%1k").arg(QString::number(channelSampleRate / 1000.0, 'g', 5)));
|
||||
m_channelMarker.setCenterFrequency(shift);
|
||||
m_channelMarker.setBandwidth(channelSampleRate);
|
||||
ui->glSpectrum->setSampleRate(channelSampleRate);
|
||||
m_scopeVis->setLiveRate(channelSampleRate);
|
||||
}
|
||||
|
||||
void DOA2GUI::leaveEvent(QEvent*)
|
||||
{
|
||||
m_channelMarker.setHighlighted(false);
|
||||
}
|
||||
|
||||
void DOA2GUI::enterEvent(QEvent*)
|
||||
{
|
||||
m_channelMarker.setHighlighted(true);
|
||||
}
|
||||
|
||||
void DOA2GUI::handleSourceMessages()
|
||||
{
|
||||
Message* message;
|
||||
|
||||
while ((message = getInputMessageQueue()->pop()) != 0)
|
||||
{
|
||||
if (handleMessage(*message))
|
||||
{
|
||||
delete message;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void DOA2GUI::onWidgetRolled(QWidget* widget, bool rollDown)
|
||||
{
|
||||
(void) widget;
|
||||
(void) rollDown;
|
||||
|
||||
RollupContents *rollupContents = getRollupContents();
|
||||
|
||||
if (rollupContents->hasExpandableWidgets()) {
|
||||
setSizePolicy(sizePolicy().horizontalPolicy(), QSizePolicy::Expanding);
|
||||
} else {
|
||||
setSizePolicy(sizePolicy().horizontalPolicy(), QSizePolicy::Fixed);
|
||||
}
|
||||
|
||||
int h = rollupContents->height() + getAdditionalHeight();
|
||||
resize(width(), h);
|
||||
|
||||
rollupContents->saveState(m_rollupState);
|
||||
applySettings();
|
||||
}
|
||||
|
||||
void DOA2GUI::onMenuDialogCalled(const QPoint &p)
|
||||
{
|
||||
if (m_contextMenuType == ContextMenuChannelSettings)
|
||||
{
|
||||
BasicChannelSettingsDialog dialog(&m_channelMarker, this);
|
||||
dialog.setUseReverseAPI(m_settings.m_useReverseAPI);
|
||||
dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress);
|
||||
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
|
||||
dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex);
|
||||
dialog.setReverseAPIChannelIndex(m_settings.m_reverseAPIChannelIndex);
|
||||
dialog.setDefaultTitle(m_displayedName);
|
||||
|
||||
dialog.move(p);
|
||||
dialog.exec();
|
||||
|
||||
m_settings.m_rgbColor = m_channelMarker.getColor().rgb();
|
||||
m_settings.m_title = m_channelMarker.getTitle();
|
||||
m_settings.m_useReverseAPI = dialog.useReverseAPI();
|
||||
m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
|
||||
m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
|
||||
m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
|
||||
m_settings.m_reverseAPIChannelIndex = dialog.getReverseAPIChannelIndex();
|
||||
|
||||
setWindowTitle(m_settings.m_title);
|
||||
setTitle(m_channelMarker.getTitle());
|
||||
setTitleColor(m_settings.m_rgbColor);
|
||||
|
||||
applySettings();
|
||||
}
|
||||
|
||||
resetContextMenuType();
|
||||
}
|
||||
|
||||
void DOA2GUI::on_decimationFactor_currentIndexChanged(int index)
|
||||
{
|
||||
m_settings.m_log2Decim = index;
|
||||
applyDecimation();
|
||||
}
|
||||
|
||||
void DOA2GUI::on_position_valueChanged(int value)
|
||||
{
|
||||
m_settings.m_filterChainHash = value;
|
||||
applyPosition();
|
||||
}
|
||||
|
||||
void DOA2GUI::on_phaseCorrection_valueChanged(int value)
|
||||
{
|
||||
m_settings.m_phase = value;
|
||||
ui->phaseCorrectionText->setText(tr("%1").arg(value));
|
||||
applySettings();
|
||||
}
|
||||
|
||||
void DOA2GUI::on_correlationType_currentIndexChanged(int index)
|
||||
{
|
||||
m_settings.m_correlationType = (DOA2Settings::CorrelationType) index;
|
||||
applySettings();
|
||||
}
|
||||
|
||||
void DOA2GUI::applyDecimation()
|
||||
{
|
||||
uint32_t maxHash = 1;
|
||||
|
||||
for (uint32_t i = 0; i < m_settings.m_log2Decim; i++) {
|
||||
maxHash *= 3;
|
||||
}
|
||||
|
||||
ui->position->setMaximum(maxHash-1);
|
||||
ui->position->setValue(m_settings.m_filterChainHash);
|
||||
m_settings.m_filterChainHash = ui->position->value();
|
||||
applyPosition();
|
||||
}
|
||||
|
||||
void DOA2GUI::applyPosition()
|
||||
{
|
||||
ui->filterChainIndex->setText(tr("%1").arg(m_settings.m_filterChainHash));
|
||||
QString s;
|
||||
m_shiftFrequencyFactor = HBFilterChainConverter::convertToString(m_settings.m_log2Decim, m_settings.m_filterChainHash, s);
|
||||
ui->filterChainText->setText(s);
|
||||
|
||||
displayRateAndShift();
|
||||
updateAbsoluteCenterFrequency();
|
||||
applySettings();
|
||||
}
|
||||
|
||||
void DOA2GUI::tick()
|
||||
{
|
||||
if (++m_tickCount == 20) { // once per second
|
||||
m_tickCount = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void DOA2GUI::makeUIConnections()
|
||||
{
|
||||
QObject::connect(ui->decimationFactor, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &DOA2GUI::on_decimationFactor_currentIndexChanged);
|
||||
QObject::connect(ui->position, &QSlider::valueChanged, this, &DOA2GUI::on_position_valueChanged);
|
||||
QObject::connect(ui->phaseCorrection, &QSlider::valueChanged, this, &DOA2GUI::on_phaseCorrection_valueChanged);
|
||||
QObject::connect(ui->correlationType, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &DOA2GUI::on_correlationType_currentIndexChanged);
|
||||
}
|
||||
|
||||
void DOA2GUI::updateAbsoluteCenterFrequency()
|
||||
{
|
||||
setStatusFrequency(m_centerFrequency + m_shiftFrequencyFactor * m_sampleRate);
|
||||
}
|
||||
107
plugins/channelmimo/doa2/doa2gui.h
Normal file
107
plugins/channelmimo/doa2/doa2gui.h
Normal file
@ -0,0 +1,107 @@
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Copyright (C) 2022 Edouard Griffiths, F4EXB //
|
||||
// //
|
||||
// This program is free software; you can redistribute it and/or modify //
|
||||
// it under the terms of the GNU General Public License as published by //
|
||||
// the Free Software Foundation as version 3 of the License, or //
|
||||
// (at your option) any later version. //
|
||||
// //
|
||||
// This program is distributed in the hope that it will be useful, //
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
|
||||
// GNU General Public License V3 for more details. //
|
||||
// //
|
||||
// You should have received a copy of the GNU General Public License //
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef INCLUDE_DOA2GUI_H
|
||||
#define INCLUDE_DOA2GUI_H
|
||||
|
||||
#include "channel/channelgui.h"
|
||||
#include "dsp/channelmarker.h"
|
||||
#include "util/movingaverage.h"
|
||||
#include "util/messagequeue.h"
|
||||
#include "settings/rollupstate.h"
|
||||
|
||||
#include "doa2settings.h"
|
||||
|
||||
class PluginAPI;
|
||||
class DeviceUISet;
|
||||
class MIMOChannel;
|
||||
class DOA2;
|
||||
class SpectrumVis;
|
||||
class ScopeVis;
|
||||
|
||||
namespace Ui {
|
||||
class DOA2GUI;
|
||||
}
|
||||
|
||||
class DOA2GUI : public ChannelGUI {
|
||||
Q_OBJECT
|
||||
public:
|
||||
static DOA2GUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, MIMOChannel *mimoChannel);
|
||||
|
||||
virtual void destroy();
|
||||
virtual void resetToDefaults();
|
||||
virtual QByteArray serialize() const;
|
||||
virtual bool deserialize(const QByteArray& data);
|
||||
virtual MessageQueue* getInputMessageQueue();
|
||||
virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; };
|
||||
virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; };
|
||||
virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; };
|
||||
virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; };
|
||||
virtual QString getTitle() const { return m_settings.m_title; };
|
||||
virtual QColor getTitleColor() const { return m_settings.m_rgbColor; };
|
||||
virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; }
|
||||
virtual bool getHidden() const { return m_settings.m_hidden; }
|
||||
virtual ChannelMarker& getChannelMarker() { return m_channelMarker; }
|
||||
virtual int getStreamIndex() const { return -1; }
|
||||
virtual void setStreamIndex(int streamIndex) { (void) streamIndex; }
|
||||
|
||||
private:
|
||||
Ui::DOA2GUI* ui;
|
||||
PluginAPI* m_pluginAPI;
|
||||
DeviceUISet* m_deviceUISet;
|
||||
ChannelMarker m_channelMarker;
|
||||
RollupState m_rollupState;
|
||||
DOA2Settings m_settings;
|
||||
int m_sampleRate;
|
||||
qint64 m_centerFrequency;
|
||||
double m_shiftFrequencyFactor; //!< Channel frequency shift factor
|
||||
bool m_doApplySettings;
|
||||
MovingAverageUtil<double, double, 40> m_channelPowerAvg;
|
||||
DOA2 *m_doa2;
|
||||
SpectrumVis* m_spectrumVis;
|
||||
ScopeVis* m_scopeVis;
|
||||
MessageQueue m_inputMessageQueue;
|
||||
uint32_t m_tickCount;
|
||||
|
||||
explicit DOA2GUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, MIMOChannel *rxChannel, QWidget* parent = nullptr);
|
||||
virtual ~DOA2GUI();
|
||||
|
||||
void blockApplySettings(bool block);
|
||||
void applySettings(bool force = false);
|
||||
void applyDecimation();
|
||||
void applyPosition();
|
||||
void displaySettings();
|
||||
void displayRateAndShift();
|
||||
bool handleMessage(const Message& message);
|
||||
void makeUIConnections();
|
||||
void updateAbsoluteCenterFrequency();
|
||||
|
||||
void leaveEvent(QEvent*);
|
||||
void enterEvent(QEvent*);
|
||||
|
||||
private slots:
|
||||
void handleSourceMessages();
|
||||
void on_decimationFactor_currentIndexChanged(int index);
|
||||
void on_position_valueChanged(int value);
|
||||
void on_phaseCorrection_valueChanged(int value);
|
||||
void on_correlationType_currentIndexChanged(int index);
|
||||
void onWidgetRolled(QWidget* widget, bool rollDown);
|
||||
void onMenuDialogCalled(const QPoint& p);
|
||||
void tick();
|
||||
};
|
||||
|
||||
#endif // INCLUDE_DOA2GUI_H
|
||||
529
plugins/channelmimo/doa2/doa2gui.ui
Normal file
529
plugins/channelmimo/doa2/doa2gui.ui
Normal file
@ -0,0 +1,529 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>DOA2GUI</class>
|
||||
<widget class="RollupContents" name="DOA2GUI">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>720</width>
|
||||
<height>770</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>720</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Liberation Sans</family>
|
||||
<pointsize>9</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>DOA 2 Sources</string>
|
||||
</property>
|
||||
<widget class="QWidget" name="settingsContainer" native="true">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>10</y>
|
||||
<width>718</width>
|
||||
<height>81</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>718</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Settings</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<property name="spacing">
|
||||
<number>3</number>
|
||||
</property>
|
||||
<property name="leftMargin">
|
||||
<number>2</number>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>2</number>
|
||||
</property>
|
||||
<property name="rightMargin">
|
||||
<number>2</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>2</number>
|
||||
</property>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="decimationLayer">
|
||||
<property name="spacing">
|
||||
<number>3</number>
|
||||
</property>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="decimationStageLayer">
|
||||
<item>
|
||||
<widget class="QLabel" name="decimationLabel">
|
||||
<property name="text">
|
||||
<string>Dec</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QComboBox" name="decimationFactor">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>55</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Decimation factor</string>
|
||||
</property>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>1</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>2</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>4</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>8</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>16</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>32</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>64</string>
|
||||
</property>
|
||||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="channelRateText">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>50</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Effective channel rate (kS/s)</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>0000k</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="filterChainText">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>50</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Filter chain stages left to right (L: low, C: center, H: high) </string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>LLLLLL</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="Line" name="line">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Corr</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QComboBox" name="correlationType">
|
||||
<property name="toolTip">
|
||||
<string>Correlation type</string>
|
||||
</property>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>A</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>B</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>A+B</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>A.B*</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>IFFT</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>IFFT*</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>FFT</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>IFFT2</string>
|
||||
</property>
|
||||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="phaseCorrectionLabel">
|
||||
<property name="text">
|
||||
<string>Ph</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QSlider" name="phaseCorrection">
|
||||
<property name="toolTip">
|
||||
<string>Phase correction on stream 1</string>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<number>-180</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>180</number>
|
||||
</property>
|
||||
<property name="pageStep">
|
||||
<number>1</number>
|
||||
</property>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="phaseCorrectionText">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>28</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Phase correction on stream 1 in degrees</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>-180</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="offsetFrequencyText">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>85</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Offset frequency with thousands separator (Hz)</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>-9,999,999 Hz</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="decimationShiftLayer">
|
||||
<property name="rightMargin">
|
||||
<number>10</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QLabel" name="positionLabel">
|
||||
<property name="text">
|
||||
<string>Pos</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QSlider" name="position">
|
||||
<property name="toolTip">
|
||||
<string>Center frequency position</string>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>2</number>
|
||||
</property>
|
||||
<property name="pageStep">
|
||||
<number>1</number>
|
||||
</property>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="filterChainIndex">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>24</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Filter chain hash code</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>000</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="spectrumContainer" native="true">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>98</y>
|
||||
<width>720</width>
|
||||
<height>284</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>718</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Frequency domain</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayoutSpectrum">
|
||||
<property name="spacing">
|
||||
<number>2</number>
|
||||
</property>
|
||||
<property name="leftMargin">
|
||||
<number>2</number>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>2</number>
|
||||
</property>
|
||||
<property name="rightMargin">
|
||||
<number>2</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>2</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="GLSpectrum" name="glSpectrum" native="true">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>200</width>
|
||||
<height>250</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Liberation Mono</family>
|
||||
<pointsize>8</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="GLSpectrumGUI" name="spectrumGUI" native="true"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="scopeContainer" native="true">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>390</y>
|
||||
<width>720</width>
|
||||
<height>334</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>718</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Time domain</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayoutScope">
|
||||
<property name="spacing">
|
||||
<number>2</number>
|
||||
</property>
|
||||
<property name="leftMargin">
|
||||
<number>3</number>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>3</number>
|
||||
</property>
|
||||
<property name="rightMargin">
|
||||
<number>3</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>3</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="GLScope" name="glScope" native="true">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>200</width>
|
||||
<height>300</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Liberation Mono</family>
|
||||
<pointsize>8</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="GLScopeGUI" name="scopeGUI" native="true"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
<class>RollupContents</class>
|
||||
<extends>QWidget</extends>
|
||||
<header>gui/rollupcontents.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>GLSpectrum</class>
|
||||
<extends>QWidget</extends>
|
||||
<header>gui/glspectrum.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>GLSpectrumGUI</class>
|
||||
<extends>QWidget</extends>
|
||||
<header>gui/glspectrumgui.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>GLScope</class>
|
||||
<extends>QWidget</extends>
|
||||
<header>gui/glscope.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>GLScopeGUI</class>
|
||||
<extends>QWidget</extends>
|
||||
<header>gui/glscopegui.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources>
|
||||
<include location="../../../sdrgui/resources/res.qrc"/>
|
||||
</resources>
|
||||
<connections/>
|
||||
</ui>
|
||||
94
plugins/channelmimo/doa2/doa2plugin.cpp
Normal file
94
plugins/channelmimo/doa2/doa2plugin.cpp
Normal file
@ -0,0 +1,94 @@
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Copyright (C) 2022 Edouard Griffiths, F4EXB //
|
||||
// //
|
||||
// This program is free software; you can redistribute it and/or modify //
|
||||
// it under the terms of the GNU General Public License as published by //
|
||||
// the Free Software Foundation as version 3 of the License, or //
|
||||
// (at your option) any later version. //
|
||||
// //
|
||||
// This program is distributed in the hope that it will be useful, //
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
|
||||
// GNU General Public License V3 for more details. //
|
||||
// //
|
||||
// You should have received a copy of the GNU General Public License //
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "doa2plugin.h"
|
||||
|
||||
#include <QtPlugin>
|
||||
#include "plugin/pluginapi.h"
|
||||
|
||||
#ifndef SERVER_MODE
|
||||
#include "doa2gui.h"
|
||||
#endif
|
||||
#include "doa2.h"
|
||||
#include "doa2webapiadapter.h"
|
||||
#include "doa2plugin.h"
|
||||
|
||||
const PluginDescriptor DOA2Plugin::m_pluginDescriptor = {
|
||||
DOA2::m_channelId,
|
||||
QStringLiteral("DOA 2 sources"),
|
||||
QStringLiteral("7.3.0"),
|
||||
QStringLiteral("(c) Edouard Griffiths, F4EXB"),
|
||||
QStringLiteral("https://github.com/f4exb/sdrangel"),
|
||||
true,
|
||||
QStringLiteral("https://github.com/f4exb/sdrangel")
|
||||
};
|
||||
|
||||
DOA2Plugin::DOA2Plugin(QObject* parent) :
|
||||
QObject(parent),
|
||||
m_pluginAPI(0)
|
||||
{
|
||||
}
|
||||
|
||||
const PluginDescriptor& DOA2Plugin::getPluginDescriptor() const
|
||||
{
|
||||
return m_pluginDescriptor;
|
||||
}
|
||||
|
||||
void DOA2Plugin::initPlugin(PluginAPI* pluginAPI)
|
||||
{
|
||||
m_pluginAPI = pluginAPI;
|
||||
|
||||
// register channel MIMO
|
||||
m_pluginAPI->registerMIMOChannel(DOA2::m_channelIdURI, DOA2::m_channelId, this);
|
||||
}
|
||||
|
||||
void DOA2Plugin::createMIMOChannel(DeviceAPI *deviceAPI, MIMOChannel **bs, ChannelAPI **cs) const
|
||||
{
|
||||
if (bs || cs)
|
||||
{
|
||||
DOA2 *instance = new DOA2(deviceAPI);
|
||||
|
||||
if (bs) {
|
||||
*bs = instance;
|
||||
}
|
||||
|
||||
if (cs) {
|
||||
*cs = instance;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef SERVER_MODE
|
||||
ChannelGUI* DOA2Plugin::createMIMOChannelGUI(
|
||||
DeviceUISet *deviceUISet,
|
||||
MIMOChannel *mimoChannel) const
|
||||
{
|
||||
(void) deviceUISet;
|
||||
(void) mimoChannel;
|
||||
return nullptr;
|
||||
}
|
||||
#else
|
||||
ChannelGUI* DOA2Plugin::createMIMOChannelGUI(DeviceUISet *deviceUISet, MIMOChannel *mimoChannel) const
|
||||
{
|
||||
return DOA2GUI::create(m_pluginAPI, deviceUISet, mimoChannel);
|
||||
}
|
||||
#endif
|
||||
|
||||
ChannelWebAPIAdapter* DOA2Plugin::createChannelWebAPIAdapter() const
|
||||
{
|
||||
return new DOA2WebAPIAdapter();
|
||||
}
|
||||
49
plugins/channelmimo/doa2/doa2plugin.h
Normal file
49
plugins/channelmimo/doa2/doa2plugin.h
Normal file
@ -0,0 +1,49 @@
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Copyright (C) 2022 Edouard Griffiths, F4EXB //
|
||||
// //
|
||||
// This program is free software; you can redistribute it and/or modify //
|
||||
// it under the terms of the GNU General Public License as published by //
|
||||
// the Free Software Foundation as version 3 of the License, or //
|
||||
// (at your option) any later version. //
|
||||
// //
|
||||
// This program is distributed in the hope that it will be useful, //
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
|
||||
// GNU General Public License V3 for more details. //
|
||||
// //
|
||||
// You should have received a copy of the GNU General Public License //
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef PLUGINS_CHANNELMIMO_DOA2_DOA2PLUGIN_H_
|
||||
#define PLUGINS_CHANNELMIMO_DOA2_DOA2PLUGIN_H_
|
||||
|
||||
|
||||
#include <QObject>
|
||||
#include "plugin/plugininterface.h"
|
||||
|
||||
class DeviceUISet;
|
||||
class MIMOChannel;
|
||||
|
||||
class DOA2Plugin : public QObject, PluginInterface {
|
||||
Q_OBJECT
|
||||
Q_INTERFACES(PluginInterface)
|
||||
Q_PLUGIN_METADATA(IID "sdrangel.channelmimo.doa2")
|
||||
|
||||
public:
|
||||
explicit DOA2Plugin(QObject* parent = nullptr);
|
||||
|
||||
const PluginDescriptor& getPluginDescriptor() const;
|
||||
void initPlugin(PluginAPI* pluginAPI);
|
||||
|
||||
virtual void createMIMOChannel(DeviceAPI *deviceAPI, MIMOChannel **bs, ChannelAPI **cs) const;
|
||||
virtual ChannelGUI* createMIMOChannelGUI(DeviceUISet *deviceUISet, MIMOChannel *mimoChannel) const;
|
||||
virtual ChannelWebAPIAdapter* createChannelWebAPIAdapter() const;
|
||||
|
||||
private:
|
||||
static const PluginDescriptor m_pluginDescriptor;
|
||||
|
||||
PluginAPI* m_pluginAPI;
|
||||
};
|
||||
|
||||
#endif /* PLUGINS_CHANNELMIMO_DOA2_DOA2PLUGIN_H_ */
|
||||
160
plugins/channelmimo/doa2/doa2settings.cpp
Normal file
160
plugins/channelmimo/doa2/doa2settings.cpp
Normal file
@ -0,0 +1,160 @@
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Copyright (C) 2022 Edouard Griffiths, F4EXB //
|
||||
// //
|
||||
// This program is free software; you can redistribute it and/or modify //
|
||||
// it under the terms of the GNU General Public License as published by //
|
||||
// the Free Software Foundation as version 3 of the License, or //
|
||||
// (at your option) any later version. //
|
||||
// //
|
||||
// This program is distributed in the hope that it will be useful, //
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
|
||||
// GNU General Public License V3 for more details. //
|
||||
// //
|
||||
// You should have received a copy of the GNU General Public License //
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include <QColor>
|
||||
|
||||
#include "dsp/dspengine.h"
|
||||
#include "util/simpleserializer.h"
|
||||
#include "settings/serializable.h"
|
||||
|
||||
#include "doa2settings.h"
|
||||
|
||||
DOA2Settings::DOA2Settings() :
|
||||
m_channelMarker(nullptr),
|
||||
m_spectrumGUI(nullptr),
|
||||
m_scopeGUI(nullptr),
|
||||
m_rollupState(nullptr)
|
||||
{
|
||||
resetToDefaults();
|
||||
}
|
||||
|
||||
void DOA2Settings::resetToDefaults()
|
||||
{
|
||||
m_correlationType = CorrelationAdd;
|
||||
m_rgbColor = QColor(250, 174, 120).rgb();
|
||||
m_title = "DOA 2 sources";
|
||||
m_log2Decim = 0;
|
||||
m_filterChainHash = 0;
|
||||
m_phase = 0;
|
||||
m_reverseAPIAddress = "127.0.0.1";
|
||||
m_reverseAPIPort = 8888;
|
||||
m_reverseAPIDeviceIndex = 0;
|
||||
m_reverseAPIChannelIndex = 0;
|
||||
m_workspaceIndex = 0;
|
||||
m_hidden = false;
|
||||
}
|
||||
|
||||
QByteArray DOA2Settings::serialize() const
|
||||
{
|
||||
SimpleSerializer s(1);
|
||||
|
||||
s.writeS32(2, (int) m_correlationType);
|
||||
s.writeU32(3, m_rgbColor);
|
||||
s.writeString(4, m_title);
|
||||
s.writeU32(5, m_log2Decim);
|
||||
s.writeU32(6, m_filterChainHash);
|
||||
s.writeBool(7, m_useReverseAPI);
|
||||
s.writeString(8, m_reverseAPIAddress);
|
||||
s.writeU32(9, m_reverseAPIPort);
|
||||
s.writeU32(10, m_reverseAPIDeviceIndex);
|
||||
s.writeU32(11, m_reverseAPIChannelIndex);
|
||||
s.writeS32(12, m_phase);
|
||||
s.writeS32(13,m_workspaceIndex);
|
||||
s.writeBlob(14, m_geometryBytes);
|
||||
s.writeBool(15, m_hidden);
|
||||
|
||||
if (m_spectrumGUI) {
|
||||
s.writeBlob(20, m_spectrumGUI->serialize());
|
||||
}
|
||||
if (m_scopeGUI) {
|
||||
s.writeBlob(21, m_scopeGUI->serialize());
|
||||
}
|
||||
if (m_channelMarker) {
|
||||
s.writeBlob(22, m_channelMarker->serialize());
|
||||
}
|
||||
if (m_rollupState) {
|
||||
s.writeBlob(23, m_rollupState->serialize());
|
||||
}
|
||||
|
||||
return s.final();
|
||||
}
|
||||
|
||||
bool DOA2Settings::deserialize(const QByteArray& data)
|
||||
{
|
||||
SimpleDeserializer d(data);
|
||||
|
||||
if(!d.isValid())
|
||||
{
|
||||
resetToDefaults();
|
||||
return false;
|
||||
}
|
||||
|
||||
if(d.getVersion() == 1)
|
||||
{
|
||||
QByteArray bytetmp;
|
||||
int tmp;
|
||||
quint32 utmp;
|
||||
|
||||
d.readS32(2, &tmp, 0);
|
||||
m_correlationType = (CorrelationType) tmp;
|
||||
d.readU32(3, &m_rgbColor);
|
||||
d.readString(4, &m_title, "Interpolator");
|
||||
d.readU32(5, &utmp, 0);
|
||||
m_log2Decim = utmp > 6 ? 6 : utmp;
|
||||
d.readU32(6, &m_filterChainHash, 0);
|
||||
d.readBool(7, &m_useReverseAPI, false);
|
||||
d.readString(8, &m_reverseAPIAddress, "127.0.0.1");
|
||||
d.readU32(9, &utmp, 0);
|
||||
|
||||
if ((utmp > 1023) && (utmp < 65535)) {
|
||||
m_reverseAPIPort = utmp;
|
||||
} else {
|
||||
m_reverseAPIPort = 8888;
|
||||
}
|
||||
|
||||
d.readU32(10, &utmp, 0);
|
||||
m_reverseAPIDeviceIndex = utmp > 99 ? 99 : utmp;
|
||||
d.readU32(11, &utmp, 0);
|
||||
m_reverseAPIChannelIndex = utmp > 99 ? 99 : utmp;
|
||||
d.readS32(12, &tmp, 0);
|
||||
m_phase = tmp < -180 ? -180 : tmp > 180 ? 180 : tmp;
|
||||
d.readS32(13, &m_workspaceIndex);
|
||||
d.readBlob(14, &m_geometryBytes);
|
||||
d.readBool(15, &m_hidden, false);
|
||||
|
||||
if (m_spectrumGUI)
|
||||
{
|
||||
d.readBlob(20, &bytetmp);
|
||||
m_spectrumGUI->deserialize(bytetmp);
|
||||
}
|
||||
|
||||
if (m_scopeGUI)
|
||||
{
|
||||
d.readBlob(21, &bytetmp);
|
||||
m_scopeGUI->deserialize(bytetmp);
|
||||
}
|
||||
|
||||
if (m_channelMarker)
|
||||
{
|
||||
d.readBlob(22, &bytetmp);
|
||||
m_channelMarker->deserialize(bytetmp);
|
||||
}
|
||||
|
||||
if (m_rollupState)
|
||||
{
|
||||
d.readBlob(23, &bytetmp);
|
||||
m_rollupState->deserialize(bytetmp);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
resetToDefaults();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
70
plugins/channelmimo/doa2/doa2settings.h
Normal file
70
plugins/channelmimo/doa2/doa2settings.h
Normal file
@ -0,0 +1,70 @@
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Copyright (C) 2022 Edouard Griffiths, F4EXB //
|
||||
// //
|
||||
// This program is free software; you can redistribute it and/or modify //
|
||||
// it under the terms of the GNU General Public License as published by //
|
||||
// the Free Software Foundation as version 3 of the License, or //
|
||||
// (at your option) any later version. //
|
||||
// //
|
||||
// This program is distributed in the hope that it will be useful, //
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
|
||||
// GNU General Public License V3 for more details. //
|
||||
// //
|
||||
// You should have received a copy of the GNU General Public License //
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef INCLUDE_DOA2SETTINGS_H
|
||||
#define INCLUDE_DOA2SETTINGS_H
|
||||
|
||||
#include <QByteArray>
|
||||
#include <QString>
|
||||
|
||||
class Serializable;
|
||||
|
||||
struct DOA2Settings
|
||||
{
|
||||
enum CorrelationType
|
||||
{
|
||||
Correlation0,
|
||||
Correlation1,
|
||||
CorrelationAdd,
|
||||
CorrelationMultiply,
|
||||
CorrelationIFFT,
|
||||
CorrelationIFFTStar,
|
||||
CorrelationFFT,
|
||||
CorrelationIFFT2
|
||||
};
|
||||
|
||||
CorrelationType m_correlationType;
|
||||
quint32 m_rgbColor;
|
||||
QString m_title;
|
||||
uint32_t m_log2Decim;
|
||||
uint32_t m_filterChainHash;
|
||||
int m_phase;
|
||||
bool m_useReverseAPI;
|
||||
QString m_reverseAPIAddress;
|
||||
uint16_t m_reverseAPIPort;
|
||||
uint16_t m_reverseAPIDeviceIndex;
|
||||
uint16_t m_reverseAPIChannelIndex;
|
||||
int m_workspaceIndex;
|
||||
QByteArray m_geometryBytes;
|
||||
bool m_hidden;
|
||||
|
||||
Serializable *m_channelMarker;
|
||||
Serializable *m_spectrumGUI;
|
||||
Serializable *m_scopeGUI;
|
||||
Serializable *m_rollupState;
|
||||
|
||||
DOA2Settings();
|
||||
void resetToDefaults();
|
||||
void setRollupState(Serializable *rollupState) { m_rollupState = rollupState; }
|
||||
void setChannelMarker(Serializable *channelMarker) { m_channelMarker = channelMarker; }
|
||||
void setSpectrumGUI(Serializable *spectrumGUI) { m_spectrumGUI = spectrumGUI; }
|
||||
void setScopeGUI(Serializable *scopeGUI) { m_scopeGUI = scopeGUI; }
|
||||
QByteArray serialize() const;
|
||||
bool deserialize(const QByteArray& data);
|
||||
};
|
||||
|
||||
#endif // INCLUDE_DOA2SETTINGS_H
|
||||
49
plugins/channelmimo/doa2/doa2streamsink.cpp
Normal file
49
plugins/channelmimo/doa2/doa2streamsink.cpp
Normal file
@ -0,0 +1,49 @@
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Copyright (C) 2022 Edouard Griffiths, F4EXB //
|
||||
// //
|
||||
// This program is free software; you can redistribute it and/or modify //
|
||||
// it under the terms of the GNU General Public License as published by //
|
||||
// the Free Software Foundation as version 3 of the License, or //
|
||||
// (at your option) any later version. //
|
||||
// //
|
||||
// This program is distributed in the hope that it will be useful, //
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
|
||||
// GNU General Public License V3 for more details. //
|
||||
// //
|
||||
// You should have received a copy of the GNU General Public License //
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include <QMutexLocker>
|
||||
#include <QDebug>
|
||||
|
||||
#include "doa2streamsink.h"
|
||||
|
||||
DOA2StreamSink::DOA2StreamSink() :
|
||||
m_streamIndex(0),
|
||||
m_dataSize(0),
|
||||
m_bufferSize(0),
|
||||
m_dataStart(0)
|
||||
{}
|
||||
|
||||
DOA2StreamSink::~DOA2StreamSink()
|
||||
{}
|
||||
|
||||
void DOA2StreamSink::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end)
|
||||
{
|
||||
m_dataSize = (end - begin) + m_dataStart;
|
||||
|
||||
if (m_dataSize > m_bufferSize)
|
||||
{
|
||||
m_data.resize(m_dataSize);
|
||||
m_bufferSize = m_dataSize;
|
||||
}
|
||||
|
||||
std::copy(begin, end, m_data.begin() + m_dataStart);
|
||||
}
|
||||
|
||||
void DOA2StreamSink::reset()
|
||||
{
|
||||
m_dataStart = 0;
|
||||
}
|
||||
51
plugins/channelmimo/doa2/doa2streamsink.h
Normal file
51
plugins/channelmimo/doa2/doa2streamsink.h
Normal file
@ -0,0 +1,51 @@
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Copyright (C) 2022 Edouard Griffiths, F4EXB //
|
||||
// //
|
||||
// This program is free software; you can redistribute it and/or modify //
|
||||
// it under the terms of the GNU General Public License as published by //
|
||||
// the Free Software Foundation as version 3 of the License, or //
|
||||
// (at your option) any later version. //
|
||||
// //
|
||||
// This program is distributed in the hope that it will be useful, //
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
|
||||
// GNU General Public License V3 for more details. //
|
||||
// //
|
||||
// You should have received a copy of the GNU General Public License //
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef SDRBASE_DOA2STREAMSINK_H_
|
||||
#define SDRBASE_DOA2STREAMSINK_H_
|
||||
|
||||
#include "dsp/channelsamplesink.h"
|
||||
|
||||
|
||||
class DOA2StreamSink : public ChannelSampleSink
|
||||
{
|
||||
public:
|
||||
DOA2StreamSink();
|
||||
virtual ~DOA2StreamSink();
|
||||
|
||||
virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end);
|
||||
|
||||
void reset();
|
||||
unsigned int getStreamIndex() const { return m_streamIndex; }
|
||||
void setStreamIndex(unsigned int streamIndex) { m_streamIndex = streamIndex; }
|
||||
SampleVector& getData() { return m_data; }
|
||||
int getSize() const { return m_dataSize; }
|
||||
void setDataStart(int dataStart) { m_dataStart = dataStart; }
|
||||
|
||||
private:
|
||||
unsigned int m_streamIndex;
|
||||
SampleVector m_data;
|
||||
int m_dataSize;
|
||||
int m_bufferSize;
|
||||
int m_dataStart;
|
||||
|
||||
uint32_t m_log2Decim;
|
||||
uint32_t m_filterChainHash;
|
||||
};
|
||||
|
||||
|
||||
#endif // SDRBASE_DOA2STREAMSINK_H_
|
||||
385
plugins/channelmimo/doa2/doa2webapiadapter.cpp
Normal file
385
plugins/channelmimo/doa2/doa2webapiadapter.cpp
Normal file
@ -0,0 +1,385 @@
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Copyright (C) 2022 Edouard Griffiths, F4EXB. //
|
||||
// //
|
||||
// This program is free software; you can redistribute it and/or modify //
|
||||
// it under the terms of the GNU General Public License as published by //
|
||||
// the Free Software Foundation as version 3 of the License, or //
|
||||
// (at your option) any later version. //
|
||||
// //
|
||||
// This program is distributed in the hope that it will be useful, //
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
|
||||
// GNU General Public License V3 for more details. //
|
||||
// //
|
||||
// You should have received a copy of the GNU General Public License //
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include <QString>
|
||||
|
||||
#include "SWGChannelSettings.h"
|
||||
#include "doa2webapiadapter.h"
|
||||
|
||||
DOA2WebAPIAdapter::DOA2WebAPIAdapter()
|
||||
{
|
||||
m_settings.setScopeGUI(&m_glScopeSettings);
|
||||
m_settings.setSpectrumGUI(&m_SpectrumSettings);
|
||||
}
|
||||
|
||||
DOA2WebAPIAdapter::~DOA2WebAPIAdapter()
|
||||
{}
|
||||
|
||||
int DOA2WebAPIAdapter::webapiSettingsGet(
|
||||
SWGSDRangel::SWGChannelSettings& response,
|
||||
QString& errorMessage)
|
||||
{
|
||||
(void) errorMessage;
|
||||
response.setDoa2Settings(new SWGSDRangel::SWGDOA2Settings());
|
||||
response.getDoa2Settings()->init();
|
||||
webapiFormatChannelSettings(response, m_settings, m_glScopeSettings, m_SpectrumSettings);
|
||||
return 200;
|
||||
}
|
||||
|
||||
void DOA2WebAPIAdapter::webapiFormatChannelSettings(
|
||||
SWGSDRangel::SWGChannelSettings& response,
|
||||
const DOA2Settings& settings,
|
||||
const GLScopeSettings& scopeSettings,
|
||||
const SpectrumSettings& spectrumSettings)
|
||||
{
|
||||
response.getDoa2Settings()->setCorrelationType((int) settings.m_correlationType);
|
||||
response.getDoa2Settings()->setRgbColor(settings.m_rgbColor);
|
||||
response.getDoa2Settings()->setTitle(new QString(settings.m_title));
|
||||
|
||||
// scope
|
||||
SWGSDRangel::SWGGLScope *swgScope = new SWGSDRangel::SWGGLScope();
|
||||
swgScope->init();
|
||||
response.getDoa2Settings()->setScopeConfig(swgScope);
|
||||
swgScope->setDisplayMode(scopeSettings.m_displayMode);
|
||||
swgScope->setGridIntensity(scopeSettings.m_gridIntensity);
|
||||
swgScope->setTime(scopeSettings.m_time);
|
||||
swgScope->setTimeOfs(scopeSettings.m_timeOfs);
|
||||
swgScope->setTraceIntensity(scopeSettings.m_traceIntensity);
|
||||
swgScope->setTraceLenMult(scopeSettings.m_traceLenMult);
|
||||
swgScope->setTrigPre(scopeSettings.m_trigPre);
|
||||
|
||||
// array of traces
|
||||
swgScope->setTracesData(new QList<SWGSDRangel::SWGTraceData *>);
|
||||
std::vector<GLScopeSettings::TraceData>::const_iterator traceIt = scopeSettings.m_tracesData.begin();
|
||||
|
||||
for (; traceIt != scopeSettings.m_tracesData.end(); ++traceIt)
|
||||
{
|
||||
swgScope->getTracesData()->append(new SWGSDRangel::SWGTraceData);
|
||||
swgScope->getTracesData()->back()->setAmp(traceIt->m_amp);
|
||||
swgScope->getTracesData()->back()->setHasTextOverlay(traceIt->m_hasTextOverlay ? 1 : 0);
|
||||
swgScope->getTracesData()->back()->setStreamIndex(traceIt->m_streamIndex);
|
||||
swgScope->getTracesData()->back()->setOfs(traceIt->m_ofs);
|
||||
swgScope->getTracesData()->back()->setProjectionType((int) traceIt->m_projectionType);
|
||||
swgScope->getTracesData()->back()->setTextOverlay(new QString(traceIt->m_textOverlay));
|
||||
swgScope->getTracesData()->back()->setTraceColor(qColorToInt(traceIt->m_traceColor));
|
||||
swgScope->getTracesData()->back()->setTraceColorB(traceIt->m_traceColorB);
|
||||
swgScope->getTracesData()->back()->setTraceColorG(traceIt->m_traceColorG);
|
||||
swgScope->getTracesData()->back()->setTraceColorR(traceIt->m_traceColorR);
|
||||
swgScope->getTracesData()->back()->setTraceDelay(traceIt->m_traceDelay);
|
||||
swgScope->getTracesData()->back()->setTraceDelayCoarse(traceIt->m_traceDelayCoarse);
|
||||
swgScope->getTracesData()->back()->setTraceDelayFine(traceIt->m_traceDelayFine);
|
||||
swgScope->getTracesData()->back()->setTriggerDisplayLevel(traceIt->m_triggerDisplayLevel);
|
||||
swgScope->getTracesData()->back()->setViewTrace(traceIt->m_viewTrace ? 1 : 0);
|
||||
}
|
||||
|
||||
// array of triggers
|
||||
swgScope->setTriggersData(new QList<SWGSDRangel::SWGTriggerData *>);
|
||||
std::vector<GLScopeSettings::TriggerData>::const_iterator triggerIt = scopeSettings.m_triggersData.begin();
|
||||
|
||||
for (; triggerIt != scopeSettings.m_triggersData.end(); ++triggerIt)
|
||||
{
|
||||
swgScope->getTriggersData()->append(new SWGSDRangel::SWGTriggerData);
|
||||
swgScope->getTriggersData()->back()->setInputIndex(triggerIt->m_inputIndex);
|
||||
swgScope->getTriggersData()->back()->setProjectionType((int) triggerIt->m_projectionType);
|
||||
swgScope->getTriggersData()->back()->setTriggerBothEdges(triggerIt->m_triggerBothEdges ? 1 : 0);
|
||||
swgScope->getTriggersData()->back()->setTriggerColor(qColorToInt(triggerIt->m_triggerColor));
|
||||
swgScope->getTriggersData()->back()->setTriggerColorB(triggerIt->m_triggerColorB);
|
||||
swgScope->getTriggersData()->back()->setTriggerColorG(triggerIt->m_triggerColorG);
|
||||
swgScope->getTriggersData()->back()->setTriggerColorR(triggerIt->m_triggerColorR);
|
||||
swgScope->getTriggersData()->back()->setTriggerDelay(triggerIt->m_triggerDelay);
|
||||
swgScope->getTriggersData()->back()->setTriggerDelayCoarse(triggerIt->m_triggerDelayCoarse);
|
||||
swgScope->getTriggersData()->back()->setTriggerDelayFine(triggerIt->m_triggerDelayFine);
|
||||
swgScope->getTriggersData()->back()->setTriggerDelayMult(triggerIt->m_triggerDelayMult);
|
||||
swgScope->getTriggersData()->back()->setTriggerHoldoff(triggerIt->m_triggerHoldoff ? 1 : 0);
|
||||
swgScope->getTriggersData()->back()->setTriggerLevel(triggerIt->m_triggerLevel);
|
||||
swgScope->getTriggersData()->back()->setTriggerLevelCoarse(triggerIt->m_triggerLevelCoarse);
|
||||
swgScope->getTriggersData()->back()->setTriggerLevelFine(triggerIt->m_triggerLevelFine);
|
||||
swgScope->getTriggersData()->back()->setTriggerPositiveEdge(triggerIt->m_triggerPositiveEdge ? 1 : 0);
|
||||
swgScope->getTriggersData()->back()->setTriggerRepeat(triggerIt->m_triggerRepeat);
|
||||
}
|
||||
|
||||
// spectrum
|
||||
SWGSDRangel::SWGGLSpectrum *swgSpectrum = new SWGSDRangel::SWGGLSpectrum();
|
||||
swgSpectrum->init();
|
||||
response.getDoa2Settings()->setSpectrumConfig(swgSpectrum);
|
||||
swgSpectrum->setAveragingMode((int) spectrumSettings.m_averagingMode);
|
||||
swgSpectrum->setAveragingValue(SpectrumSettings::getAveragingValue(spectrumSettings.m_averagingIndex, spectrumSettings.m_averagingMode));
|
||||
swgSpectrum->setDecay(spectrumSettings.m_decay);
|
||||
swgSpectrum->setDecayDivisor(spectrumSettings.m_decayDivisor);
|
||||
swgSpectrum->setDisplayCurrent(spectrumSettings.m_displayCurrent ? 1 : 0);
|
||||
swgSpectrum->setDisplayGrid(spectrumSettings.m_displayGrid ? 1 : 0);
|
||||
swgSpectrum->setDisplayGridIntensity(spectrumSettings.m_displayGridIntensity);
|
||||
swgSpectrum->setDisplayHistogram(spectrumSettings.m_displayHistogram ? 1 : 0);
|
||||
swgSpectrum->setDisplayMaxHold(spectrumSettings.m_displayMaxHold ? 1 : 0);
|
||||
swgSpectrum->setDisplayTraceIntensity(spectrumSettings.m_displayTraceIntensity);
|
||||
swgSpectrum->setDisplayWaterfall(spectrumSettings.m_displayWaterfall ? 1 : 0);
|
||||
swgSpectrum->setFftOverlap(spectrumSettings.m_fftOverlap);
|
||||
swgSpectrum->setFftSize(spectrumSettings.m_fftSize);
|
||||
swgSpectrum->setFpsPeriodMs(spectrumSettings.m_fpsPeriodMs);
|
||||
}
|
||||
|
||||
int DOA2WebAPIAdapter::webapiSettingsPutPatch(
|
||||
bool force,
|
||||
const QStringList& channelSettingsKeys,
|
||||
SWGSDRangel::SWGChannelSettings& response,
|
||||
QString& errorMessage)
|
||||
{
|
||||
(void) force; // no action
|
||||
(void) errorMessage;
|
||||
webapiUpdateChannelSettings(m_settings, m_glScopeSettings, m_SpectrumSettings, channelSettingsKeys, response);
|
||||
return 200;
|
||||
}
|
||||
|
||||
void DOA2WebAPIAdapter::webapiUpdateChannelSettings(
|
||||
DOA2Settings& settings,
|
||||
GLScopeSettings& scopeSettings,
|
||||
SpectrumSettings& spectrumSettings,
|
||||
const QStringList& channelSettingsKeys,
|
||||
SWGSDRangel::SWGChannelSettings& response)
|
||||
{
|
||||
if (channelSettingsKeys.contains("correlationType")) {
|
||||
settings.m_correlationType = (DOA2Settings::CorrelationType) response.getDoa2Settings()->getCorrelationType();
|
||||
}
|
||||
if (channelSettingsKeys.contains("rgbColor")) {
|
||||
settings.m_rgbColor = response.getDoa2Settings()->getRgbColor();
|
||||
}
|
||||
if (channelSettingsKeys.contains("title")) {
|
||||
settings.m_title = *response.getDoa2Settings()->getTitle();
|
||||
}
|
||||
// scope
|
||||
if (channelSettingsKeys.contains("scopeConfig"))
|
||||
{
|
||||
if (channelSettingsKeys.contains("scopeConfig.displayMode")) {
|
||||
scopeSettings.m_displayMode = (GLScopeSettings::DisplayMode) response.getDoa2Settings()->getScopeConfig()->getDisplayMode();
|
||||
}
|
||||
if (channelSettingsKeys.contains("scopeConfig.gridIntensity")) {
|
||||
scopeSettings.m_gridIntensity = response.getDoa2Settings()->getScopeConfig()->getGridIntensity();
|
||||
}
|
||||
if (channelSettingsKeys.contains("scopeConfig.time")) {
|
||||
scopeSettings.m_time = response.getDoa2Settings()->getScopeConfig()->getTime();
|
||||
}
|
||||
if (channelSettingsKeys.contains("scopeConfig.timeOfs")) {
|
||||
scopeSettings.m_timeOfs = response.getDoa2Settings()->getScopeConfig()->getTimeOfs();
|
||||
}
|
||||
if (channelSettingsKeys.contains("scopeConfig.traceIntensity")) {
|
||||
scopeSettings.m_traceIntensity = response.getDoa2Settings()->getScopeConfig()->getTraceIntensity();
|
||||
}
|
||||
if (channelSettingsKeys.contains("scopeConfig.traceLenMult")) {
|
||||
scopeSettings.m_traceLenMult = response.getDoa2Settings()->getScopeConfig()->getTraceLenMult();
|
||||
}
|
||||
if (channelSettingsKeys.contains("scopeConfig.trigPre")) {
|
||||
scopeSettings.m_trigPre = response.getDoa2Settings()->getScopeConfig()->getTrigPre();
|
||||
}
|
||||
// traces
|
||||
if (channelSettingsKeys.contains("scopeConfig.tracesData"))
|
||||
{
|
||||
QList<SWGSDRangel::SWGTraceData *> *tracesData = response.getDoa2Settings()->getScopeConfig()->getTracesData();
|
||||
scopeSettings.m_tracesData.clear();
|
||||
|
||||
for (int i = 0; i < 10; i++) // no more than 10 traces anyway
|
||||
{
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1]").arg(i)))
|
||||
{
|
||||
SWGSDRangel::SWGTraceData *traceData = tracesData->at(i);
|
||||
scopeSettings.m_tracesData.push_back(GLScopeSettings::TraceData());
|
||||
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].streamIndex").arg(i))) {
|
||||
scopeSettings.m_tracesData.back().m_streamIndex = traceData->getStreamIndex();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].amp").arg(i))) {
|
||||
scopeSettings.m_tracesData.back().m_amp = traceData->getAmp();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].hasTextOverlay").arg(i))) {
|
||||
scopeSettings.m_tracesData.back().m_hasTextOverlay = traceData->getHasTextOverlay() != 0;
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].streamIndex").arg(i))) {
|
||||
scopeSettings.m_tracesData.back().m_streamIndex = traceData->getStreamIndex();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].ofs").arg(i))) {
|
||||
scopeSettings.m_tracesData.back().m_ofs = traceData->getOfs();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].projectionType").arg(i))) {
|
||||
scopeSettings.m_tracesData.back().m_projectionType = (Projector::ProjectionType) traceData->getProjectionType();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].traceColor").arg(i))) {
|
||||
scopeSettings.m_tracesData.back().m_traceColor = intToQColor(traceData->getTraceColor());
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].traceColorB").arg(i))) {
|
||||
scopeSettings.m_tracesData.back().m_traceColorB = traceData->getTraceColorB();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].traceColorG").arg(i))) {
|
||||
scopeSettings.m_tracesData.back().m_traceColorG = traceData->getTraceColorG();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].traceColorR").arg(i))) {
|
||||
scopeSettings.m_tracesData.back().m_traceColorR = traceData->getTraceColorR();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].traceDelay").arg(i))) {
|
||||
scopeSettings.m_tracesData.back().m_traceDelay = traceData->getTraceDelay();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].traceDelayCoarse").arg(i))) {
|
||||
scopeSettings.m_tracesData.back().m_traceDelayCoarse = traceData->getTraceDelayCoarse();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].traceDelayFine").arg(i))) {
|
||||
scopeSettings.m_tracesData.back().m_traceDelayFine = traceData->getTraceDelayFine();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].triggerDisplayLevel").arg(i))) {
|
||||
scopeSettings.m_tracesData.back().m_triggerDisplayLevel = traceData->getTriggerDisplayLevel();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].viewTrace").arg(i))) {
|
||||
scopeSettings.m_tracesData.back().m_viewTrace = traceData->getViewTrace() != 0;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
// triggers
|
||||
if (channelSettingsKeys.contains("scopeConfig.triggersData"))
|
||||
{
|
||||
QList<SWGSDRangel::SWGTriggerData *> *triggersData = response.getDoa2Settings()->getScopeConfig()->getTriggersData();
|
||||
scopeSettings.m_triggersData.clear();
|
||||
|
||||
for (int i = 0; i < 10; i++) // no more than 10 triggers anyway
|
||||
{
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.triggersData[%1]").arg(i)))
|
||||
{
|
||||
SWGSDRangel::SWGTriggerData *triggerData = triggersData->at(i);
|
||||
scopeSettings.m_triggersData.push_back(GLScopeSettings::TriggerData());
|
||||
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.triggersData[%1].streamIndex").arg(i))) {
|
||||
scopeSettings.m_triggersData.back().m_streamIndex = triggerData->getStreamIndex();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.triggersData[%1].inputIndex").arg(i))) {
|
||||
scopeSettings.m_triggersData.back().m_inputIndex = triggerData->getInputIndex();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.triggersData[%1].projectionType").arg(i))) {
|
||||
scopeSettings.m_triggersData.back().m_projectionType = (Projector::ProjectionType) triggerData->getProjectionType();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.triggersData[%1].triggerBothEdges").arg(i))) {
|
||||
scopeSettings.m_triggersData.back().m_triggerBothEdges = triggerData->getTriggerBothEdges() != 0;
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.tracesData[%1].triggerColor").arg(i))) {
|
||||
scopeSettings.m_tracesData.back().m_traceColor = intToQColor(triggerData->getTriggerColor());
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.triggersData[%1].triggerColorB").arg(i))) {
|
||||
scopeSettings.m_triggersData.back().m_triggerColorB = triggerData->getTriggerColorB();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.triggersData[%1].triggerColorG").arg(i))) {
|
||||
scopeSettings.m_triggersData.back().m_triggerColorG = triggerData->getTriggerColorG();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.triggersData[%1].triggerColorR").arg(i))) {
|
||||
scopeSettings.m_triggersData.back().m_triggerColorR = triggerData->getTriggerColorR();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.triggersData[%1].triggerDelay").arg(i))) {
|
||||
scopeSettings.m_triggersData.back().m_triggerDelay = triggerData->getTriggerDelay();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.triggersData[%1].triggerDelayCoarse").arg(i))) {
|
||||
scopeSettings.m_triggersData.back().m_triggerDelayCoarse = triggerData->getTriggerDelayCoarse();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.triggersData[%1].triggerDelayFine").arg(i))) {
|
||||
scopeSettings.m_triggersData.back().m_triggerDelayFine = triggerData->getTriggerDelayFine();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.triggersData[%1].triggerDelayMult").arg(i))) {
|
||||
scopeSettings.m_triggersData.back().m_triggerDelayMult = triggerData->getTriggerDelayMult();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.triggersData[%1].triggerHoldoff").arg(i))) {
|
||||
scopeSettings.m_triggersData.back().m_triggerHoldoff = triggerData->getTriggerHoldoff();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.triggersData[%1].triggerLevel").arg(i))) {
|
||||
scopeSettings.m_triggersData.back().m_triggerLevel = triggerData->getTriggerLevel();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.triggersData[%1].triggerLevelCoarse").arg(i))) {
|
||||
scopeSettings.m_triggersData.back().m_triggerLevelCoarse = triggerData->getTriggerLevelCoarse();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.triggersData[%1].triggerLevelFine").arg(i))) {
|
||||
scopeSettings.m_triggersData.back().m_triggerLevelFine = triggerData->getTriggerLevelFine();
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.triggersData[%1].triggerPositiveEdge").arg(i))) {
|
||||
scopeSettings.m_triggersData.back().m_triggerPositiveEdge = triggerData->getTriggerPositiveEdge() != 0;
|
||||
}
|
||||
if (channelSettingsKeys.contains(QString("scopeConfig.triggersData[%1].triggerRepeat").arg(i))) {
|
||||
scopeSettings.m_triggersData.back().m_triggerRepeat = triggerData->getTriggerRepeat() != 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// spectrum
|
||||
if (channelSettingsKeys.contains("spectrumConfig"))
|
||||
{
|
||||
if (channelSettingsKeys.contains("spectrumConfig.averagingMode")) {
|
||||
spectrumSettings.m_averagingMode = (SpectrumSettings::AveragingMode) response.getDoa2Settings()->getSpectrumConfig()->getAveragingMode();
|
||||
}
|
||||
if (channelSettingsKeys.contains("spectrumConfig.averagingValue"))
|
||||
{
|
||||
spectrumSettings.m_averagingValue = response.getDoa2Settings()->getSpectrumConfig()->getAveragingValue();
|
||||
spectrumSettings.m_averagingIndex = SpectrumSettings::getAveragingIndex(spectrumSettings.m_averagingValue, spectrumSettings.m_averagingMode);
|
||||
}
|
||||
if (channelSettingsKeys.contains("spectrumConfig.decay")) {
|
||||
spectrumSettings.m_decay = response.getDoa2Settings()->getSpectrumConfig()->getDecay();
|
||||
}
|
||||
if (channelSettingsKeys.contains("spectrumConfig.decayDivisor")) {
|
||||
spectrumSettings.m_decayDivisor = response.getDoa2Settings()->getSpectrumConfig()->getDecayDivisor();
|
||||
}
|
||||
if (channelSettingsKeys.contains("spectrumConfig.displayCurrent")) {
|
||||
spectrumSettings.m_displayCurrent = response.getDoa2Settings()->getSpectrumConfig()->getDisplayCurrent() != 0;
|
||||
}
|
||||
if (channelSettingsKeys.contains("spectrumConfig.displayGrid")) {
|
||||
spectrumSettings.m_displayGrid = response.getDoa2Settings()->getSpectrumConfig()->getDisplayGrid() != 0;
|
||||
}
|
||||
if (channelSettingsKeys.contains("spectrumConfig.displayGridIntensity")) {
|
||||
spectrumSettings.m_displayGridIntensity = response.getDoa2Settings()->getSpectrumConfig()->getDisplayGridIntensity();
|
||||
}
|
||||
if (channelSettingsKeys.contains("spectrumConfig.displayHistogram")) {
|
||||
spectrumSettings.m_displayHistogram = response.getDoa2Settings()->getSpectrumConfig()->getDisplayHistogram() != 0;
|
||||
}
|
||||
if (channelSettingsKeys.contains("spectrumConfig.displayMaxHold")) {
|
||||
spectrumSettings.m_displayMaxHold = response.getDoa2Settings()->getSpectrumConfig()->getDisplayMaxHold() != 0;
|
||||
}
|
||||
if (channelSettingsKeys.contains("spectrumConfig.displayTraceIntensity")) {
|
||||
spectrumSettings.m_displayTraceIntensity = response.getDoa2Settings()->getSpectrumConfig()->getDisplayTraceIntensity();
|
||||
}
|
||||
if (channelSettingsKeys.contains("spectrumConfig.displayWaterfall")) {
|
||||
spectrumSettings.m_displayWaterfall = response.getDoa2Settings()->getSpectrumConfig()->getDisplayWaterfall() != 0;
|
||||
}
|
||||
if (channelSettingsKeys.contains("spectrumConfig.fftOverlap")) {
|
||||
spectrumSettings.m_fftOverlap = response.getDoa2Settings()->getSpectrumConfig()->getFftOverlap();
|
||||
}
|
||||
if (channelSettingsKeys.contains("spectrumConfig.fftSize")) {
|
||||
spectrumSettings.m_fftSize = response.getDoa2Settings()->getSpectrumConfig()->getFftSize();
|
||||
}
|
||||
if (channelSettingsKeys.contains("spectrumConfig.fpsPeriodMs")) {
|
||||
spectrumSettings.m_fpsPeriodMs = response.getDoa2Settings()->getSpectrumConfig()->getFpsPeriodMs();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int DOA2WebAPIAdapter::qColorToInt(const QColor& color)
|
||||
{
|
||||
return 256*256*color.blue() + 256*color.green() + color.red();
|
||||
}
|
||||
|
||||
QColor DOA2WebAPIAdapter::intToQColor(int intColor)
|
||||
{
|
||||
int r = intColor % 256;
|
||||
int bg = intColor / 256;
|
||||
int g = bg % 256;
|
||||
int b = bg / 256;
|
||||
return QColor(r, g, b);
|
||||
}
|
||||
69
plugins/channelmimo/doa2/doa2webapiadapter.h
Normal file
69
plugins/channelmimo/doa2/doa2webapiadapter.h
Normal file
@ -0,0 +1,69 @@
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Copyright (C) 2022 Edouard Griffiths, F4EXB. //
|
||||
// //
|
||||
// This program is free software; you can redistribute it and/or modify //
|
||||
// it under the terms of the GNU General Public License as published by //
|
||||
// the Free Software Foundation as version 3 of the License, or //
|
||||
// (at your option) any later version. //
|
||||
// //
|
||||
// This program is distributed in the hope that it will be useful, //
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
|
||||
// GNU General Public License V3 for more details. //
|
||||
// //
|
||||
// You should have received a copy of the GNU General Public License //
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef INCLUDE_DOA2_WEBAPIADAPTER_H
|
||||
#define INCLUDE_DOA2_WEBAPIADAPTER_H
|
||||
|
||||
#include "channel/channelwebapiadapter.h"
|
||||
#include "dsp/glscopesettings.h"
|
||||
#include "dsp/spectrumsettings.h"
|
||||
#include "doa2settings.h"
|
||||
|
||||
/**
|
||||
* Standalone API adapter only for the settings
|
||||
*/
|
||||
class DOA2WebAPIAdapter : public ChannelWebAPIAdapter {
|
||||
public:
|
||||
DOA2WebAPIAdapter();
|
||||
virtual ~DOA2WebAPIAdapter();
|
||||
|
||||
virtual QByteArray serialize() const { return m_settings.serialize(); }
|
||||
virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
|
||||
|
||||
virtual int webapiSettingsGet(
|
||||
SWGSDRangel::SWGChannelSettings& response,
|
||||
QString& errorMessage);
|
||||
|
||||
virtual int webapiSettingsPutPatch(
|
||||
bool force,
|
||||
const QStringList& channelSettingsKeys,
|
||||
SWGSDRangel::SWGChannelSettings& response,
|
||||
QString& errorMessage);
|
||||
|
||||
static void webapiFormatChannelSettings(
|
||||
SWGSDRangel::SWGChannelSettings& response,
|
||||
const DOA2Settings& settings,
|
||||
const GLScopeSettings& scopeSettings,
|
||||
const SpectrumSettings& spectrumSettings);
|
||||
|
||||
static void webapiUpdateChannelSettings(
|
||||
DOA2Settings& settings,
|
||||
GLScopeSettings& scopeSettings,
|
||||
SpectrumSettings& spectrumSettings,
|
||||
const QStringList& channelSettingsKeys,
|
||||
SWGSDRangel::SWGChannelSettings& response);
|
||||
|
||||
private:
|
||||
DOA2Settings m_settings;
|
||||
GLScopeSettings m_glScopeSettings;
|
||||
SpectrumSettings m_SpectrumSettings;
|
||||
|
||||
static int qColorToInt(const QColor& color);
|
||||
static QColor intToQColor(int intColor);
|
||||
};
|
||||
|
||||
#endif // INCLUDE_DOA2_WEBAPIADAPTER_H
|
||||
160
plugins/channelmimo/doa2/readme.md
Normal file
160
plugins/channelmimo/doa2/readme.md
Normal file
@ -0,0 +1,160 @@
|
||||
<h1>Interferometer plugin</h1>
|
||||
|
||||
<h2>Introduction</h2>
|
||||
|
||||
This MIMO reception only (MI) plugin can be used to study phase difference between two coherent streams. It must be connected to a device that exposes at least two input streams and will connect to streams 0 and 1 as channels A and B respectively.
|
||||
|
||||
<h2>Interface</h2>
|
||||
|
||||
The top and bottom bars of the channel window are described [here](../../../sdrgui/channel/readme.md)
|
||||
|
||||
|
||||
|
||||
The interface is divided in 3 sections that will be detailed next:
|
||||
- A: settings. These are the plugin controls
|
||||
- B: spectrum (frequency domain). This is a spectrum display analogous to other spectrum displays. Its input varies depending on the correlation function selected. Details on the spectrum view and controls can be found [here](../../../sdrgui/gui/spectrum.md)
|
||||
- C: scope (time domain). This is a scope display analogous to other scope displays. Its input varies depending on the correlation function selected. For FFT type correlation this is not a time domain but a frequency domain display transposed to time analogous to a frequency sweep.
|
||||
|
||||
<h2>A. Settings section</h2>
|
||||
|
||||
|
||||
|
||||
<h3>A.1. Decimation</h3>
|
||||
|
||||
Input streams from baseband are decimated by a power of two. Use this combo to select from 0 (no decimation) to 64 (2^6). The resulting channel sample rate is displayed next (A.2)
|
||||
|
||||
<h3>A.2. Channel sample rate</h3>
|
||||
|
||||
This is the channel sample rate in kilo or mega samples per second indicated by the `k` or `M` letter.
|
||||
|
||||
<h3>A.3. Half-band filter chain sequence display</h3>
|
||||
|
||||
This string represents the sequence of half-band filters used in the decimation from device baseband to channel stream and controlled by (A.7). Each character represents a filter type:
|
||||
|
||||
- **L**: lower half-band
|
||||
- **H**: higher half-band
|
||||
- **C**: centered
|
||||
|
||||
<h3>A.4. Correlation function</h3>
|
||||
|
||||
This combo selects which function is applied to A and B channel inputs to obtain resulting correlation signal.
|
||||
- **A**: A channel only (no correlation)
|
||||
- **B**: B channel only (no correlation)
|
||||
- **A+B**: This is the complex sum of A and B
|
||||
- **A.B***: This is the complex multiplication of A with the conjugate of B
|
||||
- **IFFT**: This is a time correlation obtained by FFT. The FFT of A is multiplied by the conjugate of the FFT of B and the result is passed to an IFFT to obtain the final result. This can be used for passive radar.
|
||||
- **IFFT***: Same FFT operations as above but the IFFT is handled differently: sums the first half of IFFT with the reversed second half as one is the conjugate of the other so this should yield constant phase
|
||||
- **FFT**: The FFT of A is multiplied by the conjugate of the FFT of B (no IFFT) thus the result is in the frequency domain. This is sometimes called "interspectrum". It can be used in practice to evaluate the direction of arrival (DOA) of a plane wave (see next)
|
||||
- **IFFT2**: Same as IFFT but looks at the entire time domain including "negative" times.
|
||||
|
||||
<h4>Spectrum and scope inputs</h4>
|
||||
|
||||
The spectrum and scope displays inputs vary depending on the correlation types and are summarized in the table below:
|
||||
|
||||
<table>
|
||||
<tr>
|
||||
<th>Correlation type</th>
|
||||
<th>Spectrum</th>
|
||||
<th>Scope</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>A</td>
|
||||
<td>FFT(A)</td>
|
||||
<td>A(t)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>B</td>
|
||||
<td>FFT(B)</td>
|
||||
<td>B(t)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>A+B</td>
|
||||
<td>FFT(A+B)</td>
|
||||
<td>(A+B)(t)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>A.B*</td>
|
||||
<td>FFT(A.B*)</td>
|
||||
<td>(A.B*)(t)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>IFFT</td>
|
||||
<td>FFT(A)*FFT(B)*</td>
|
||||
<td>IFFT(FFT(A).FFT(B)*)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>IFFT</td>
|
||||
<td>FFT(A)*FFT(B)*</td>
|
||||
<td>IFFT(FFT(A).FFT(B)*) with special manipulation (see above)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>FFT</td>
|
||||
<td>FFT(A)*FFT(B)* over 1 FFT length</td>
|
||||
<td>FFT(A)*FFT(B)* possibly over several FFT lengths depending on trace length</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>IFFT2</td>
|
||||
<td>FFT(A)*FFT(B)*</td>
|
||||
<td>IFFT(FFT(A).FFT(B)*) with positive and negative times</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<h4>Direction Of Arrival (DOA) estimation with FFT correlation</h4>
|
||||
|
||||
The "FFT" correlation function can be selected for DOA estimation. "A.B*" should yield similar results but is less precise because FFT analysis helps in removing non essential contributions. The FFT analysis can also show different DOAs for signals at different frequencies.
|
||||
|
||||
It assumes that channel A is connected to the antenna of reference (device stream 0) and channel B is connected to the second antenna (device stream 1) in the following configuration:
|
||||
|
||||
|
||||
|
||||
The scope is configured to have X and Y displays with Y1 set to a magnitude display projection and X to a phase related projection. See scope controls in C section for setup. Here are the different possibilities:
|
||||
- **X**: Phi, DOAP, DOAN
|
||||
- **Y1**: Mag, MagSq, MagDB (this one is usually the most convenient)
|
||||
|
||||
You will select the XY display on the scope and you can use the polar grid display to show phase or direction angles directly.
|
||||
|
||||
Angles are counted from -π to π and normalized to π for display thus displayed from -1.0 to 1.0
|
||||
|
||||
The phase difference on X input (`Phi` selected) is then the actual phase difference between the reference signal A and the second signal B. Thus for a given phase difference the wave may come from the positive side of angles (0 to π) or the negative side (-π to 0). Angles of arrival are referenced to the axis perpendicular to the axis passing by the two antennas.
|
||||
|
||||
|
||||
|
||||
Thus when antennas are separated by half the wavelength the relation between the angle of arrival θ and the phase difference φ can be expressed as:
|
||||
|
||||
φ = π cos(θ) thus θ = acos(φ / π)
|
||||
|
||||
This angle can be displayed directly when `DOAP` (positive angles) or `DOAN` (negative angles) is selected for X input.
|
||||
|
||||
Thus a possible procedure to determine DOA could be the following:
|
||||
|
||||
1. Arrange antennas axis so that the phase difference φ or DOA angle θ is roughly π/2 (zero phase difference)
|
||||
2. Make an assumption for the wave to come from the positive or negative angles side
|
||||
3. Rotate the antennas axis slightly and if the DOA angle moves in the direction corresponding to your assumption (2) then the assumption is correct and the wave is coming from the side corresponding to your assumption. You can then refine the antenna axis direction to obtain a π/2 or -π/2 angle depending from which side the wave is coming. The scope `DOAP` projection is for waves coming from the positive angles side and `DOAN` for the negative angles side
|
||||
4. If when performing previous step (3) the DOA angle moves in the opposite direction to the one corresponding to your assumption then the wave is coming from the opposite side w.r to your assumption. You can then refine the antenna axis direction to obtain a ±π/2 DOA as in (3).
|
||||
5. Once the ±π/2 DOA angle (zero phase difference) is obtained at λ/2 distance between antennas you can move your antennas further apart to refine the ±π/2 DOA angle.
|
||||
|
||||
<h3>A.5. Phase difference correction</h3>
|
||||
|
||||
This is the phase correction in degrees applied to signal in channel B.
|
||||
|
||||
<h3>A.6 Center frequency shift</h3>
|
||||
|
||||
This is the shift of the channel center frequency from the device center frequency. Its value is driven by the baseband sample rate, the decimation factor (A.1) and the filter chain sequence (A.7).
|
||||
|
||||
<h3>A.7. Half-band filter chain sequence adjust</h3>
|
||||
|
||||
The slider moves the channel center frequency roughly from the lower to the higher frequency in the device baseband. The number on the right represents the filter sequence as the decimal value of a base 3 number. Each base 3 digit represents the filter type and its sequence from MSB to LSB in the filter chain:
|
||||
|
||||
- **0**: lower half-band
|
||||
- **1**: centered
|
||||
- **2**: higher half-band
|
||||
|
||||
The resulting filter chain sequence is represented in (A.3)
|
||||
|
||||
<h2>B. Spectrum display</h2>
|
||||
|
||||
This is the spectrum (frequency domain) display. This display and controls are identical to all spectrum displays in the software. Further details on spectrum controls can be found [here](https://github.com/f4exb/sdrangel/tree/master/sdrgui#4-spectrum-display-control)
|
||||
|
||||
<h2>C. Scope display</h2>
|
||||
|
||||
This is the scope (mainly time domain) display. This display and controls are identical to all scope displays in the software. Further details can be found in [Channel Analyzer documentation](../../channelrx/chanalyzer/readme.md)
|
||||
@ -36,6 +36,7 @@
|
||||
<file>webapi/doc/swagger/include/DATVDemod.yaml</file>
|
||||
<file>webapi/doc/swagger/include/DATVMod.yaml</file>
|
||||
<file>webapi/doc/swagger/include/DemodAnalyzer.yaml</file>
|
||||
<file>webapi/doc/swagger/include/DOA2.yaml</file>
|
||||
<file>webapi/doc/swagger/include/DSDDemod.yaml</file>
|
||||
<file>webapi/doc/swagger/include/DeviceActions.yaml</file>
|
||||
<file>webapi/doc/swagger/include/DeviceSettings.yaml</file>
|
||||
|
||||
@ -3543,6 +3543,9 @@ margin-bottom: 20px;
|
||||
"DABDemodSettings" : {
|
||||
"$ref" : "#/definitions/DABDemodSettings"
|
||||
},
|
||||
"DOA2Settings" : {
|
||||
"$ref" : "#/definitions/DOA2Settings"
|
||||
},
|
||||
"DSDDemodSettings" : {
|
||||
"$ref" : "#/definitions/DSDDemodSettings"
|
||||
},
|
||||
@ -4522,6 +4525,55 @@ margin-bottom: 20px;
|
||||
}
|
||||
},
|
||||
"description" : "DATVMod"
|
||||
};
|
||||
defs.DOA2Settings = {
|
||||
"properties" : {
|
||||
"correlationType" : {
|
||||
"type" : "integer",
|
||||
"description" : "see DOA2Settings::CorrelationType"
|
||||
},
|
||||
"rgbColor" : {
|
||||
"type" : "integer"
|
||||
},
|
||||
"title" : {
|
||||
"type" : "string"
|
||||
},
|
||||
"log2Decim" : {
|
||||
"type" : "integer"
|
||||
},
|
||||
"filterChainHash" : {
|
||||
"type" : "integer"
|
||||
},
|
||||
"useReverseAPI" : {
|
||||
"type" : "integer",
|
||||
"description" : "Synchronize with reverse API (1 for yes, 0 for no)"
|
||||
},
|
||||
"reverseAPIAddress" : {
|
||||
"type" : "string"
|
||||
},
|
||||
"reverseAPIPort" : {
|
||||
"type" : "integer"
|
||||
},
|
||||
"reverseAPIDeviceIndex" : {
|
||||
"type" : "integer"
|
||||
},
|
||||
"reverseAPIChannelIndex" : {
|
||||
"type" : "integer"
|
||||
},
|
||||
"spectrumConfig" : {
|
||||
"$ref" : "#/definitions/GLSpectrum"
|
||||
},
|
||||
"scopeConfig" : {
|
||||
"$ref" : "#/definitions/GLScope"
|
||||
},
|
||||
"channelMarker" : {
|
||||
"$ref" : "#/definitions/ChannelMarker"
|
||||
},
|
||||
"rollupState" : {
|
||||
"$ref" : "#/definitions/RollupState"
|
||||
}
|
||||
},
|
||||
"description" : "DOA2"
|
||||
};
|
||||
defs.DSDDemodReport = {
|
||||
"properties" : {
|
||||
@ -56060,7 +56112,7 @@ except ApiException as e:
|
||||
</div>
|
||||
<div id="generator">
|
||||
<div class="content">
|
||||
Generated 2022-05-25T12:47:57.273+02:00
|
||||
Generated 2022-05-27T00:17:01.671+02:00
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -49,6 +49,8 @@ ChannelSettings:
|
||||
$ref: "/doc/swagger/include/DATVDemod.yaml#/DATVDemodSettings"
|
||||
DABDemodSettings:
|
||||
$ref: "/doc/swagger/include/DABDemod.yaml#/DABDemodSettings"
|
||||
DOA2Settings:
|
||||
$ref: "/doc/swagger/include/DOA2.yaml#/DOA2Settings"
|
||||
DSDDemodSettings:
|
||||
$ref: "/doc/swagger/include/DSDDemod.yaml#/DSDDemodSettings"
|
||||
FileSinkSettings:
|
||||
|
||||
33
sdrbase/resources/webapi/doc/swagger/include/DOA2.yaml
Normal file
33
sdrbase/resources/webapi/doc/swagger/include/DOA2.yaml
Normal file
@ -0,0 +1,33 @@
|
||||
DOA2Settings:
|
||||
description: DOA2
|
||||
properties:
|
||||
correlationType:
|
||||
description: see DOA2Settings::CorrelationType
|
||||
type: integer
|
||||
rgbColor:
|
||||
type: integer
|
||||
title:
|
||||
type: string
|
||||
log2Decim:
|
||||
type: integer
|
||||
filterChainHash:
|
||||
type: integer
|
||||
useReverseAPI:
|
||||
description: Synchronize with reverse API (1 for yes, 0 for no)
|
||||
type: integer
|
||||
reverseAPIAddress:
|
||||
type: string
|
||||
reverseAPIPort:
|
||||
type: integer
|
||||
reverseAPIDeviceIndex:
|
||||
type: integer
|
||||
reverseAPIChannelIndex:
|
||||
type: integer
|
||||
spectrumConfig:
|
||||
$ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum"
|
||||
scopeConfig:
|
||||
$ref: "/doc/swagger/include/GLScope.yaml#/GLScope"
|
||||
channelMarker:
|
||||
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||
rollupState:
|
||||
$ref: "/doc/swagger/include/RollupState.yaml#/RollupState"
|
||||
@ -4471,6 +4471,11 @@ bool WebAPIRequestMapper::getChannelSettings(
|
||||
channelSettings->setDabDemodSettings(new SWGSDRangel::SWGDABDemodSettings());
|
||||
channelSettings->getDabDemodSettings()->fromJsonObject(settingsJsonObject);
|
||||
}
|
||||
else if (channelSettingsKey == "DOA2Settings")
|
||||
{
|
||||
channelSettings->setDoa2Settings(new SWGSDRangel::SWGDOA2Settings());
|
||||
channelSettings->getDoa2Settings()->fromJsonObject(settingsJsonObject);
|
||||
}
|
||||
else if (channelSettingsKey == "DSDDemodSettings")
|
||||
{
|
||||
channelSettings->setDsdDemodSettings(new SWGSDRangel::SWGDSDDemodSettings());
|
||||
|
||||
@ -40,6 +40,7 @@ const QMap<QString, QString> WebAPIUtils::m_channelURIToSettingsKey = {
|
||||
{"sdrangel.channel.demodatv", "ATVDemodSettings"},
|
||||
{"sdrangel.channel.demoddatv", "DATVDemodSettings"},
|
||||
{"sdrangel.channel.dabdemod", "DABDemodSettings"},
|
||||
{"sdrangel.channel.doa2", "DOA2Settings"},
|
||||
{"sdrangel.channel.dsddemod", "DSDDemodSettings"},
|
||||
{"sdrangel.channel.filesink", "FileSinkSettings"},
|
||||
{"sdrangel.channeltx.filesource", "FileSourceSettings"},
|
||||
@ -144,6 +145,7 @@ const QMap<QString, QString> WebAPIUtils::m_channelTypeToSettingsKey = {
|
||||
{"DATVDemod", "DATVDemodSettings"},
|
||||
{"DATVMod", "DATVModSettings"},
|
||||
{"DABDemod", "DABDemodSettings"},
|
||||
{"DOA2", "DOA2Settings"},
|
||||
{"DSDDemod", "DSDDemodSettings"},
|
||||
{"FileSink", "FileSinkSettings"},
|
||||
{"FileSource", "FileSourceSettings"},
|
||||
|
||||
@ -49,6 +49,8 @@ ChannelSettings:
|
||||
$ref: "http://swgserver:8081/api/swagger/include/DATVDemod.yaml#/DATVDemodSettings"
|
||||
DABDemodSettings:
|
||||
$ref: "http://swgserver:8081/api/swagger/include/DABDemod.yaml#/DABDemodSettings"
|
||||
DOA2Settings:
|
||||
$ref: "http://swgserver:8081/api/swagger/include/DOA2.yaml#/DOA2Settings"
|
||||
DSDDemodSettings:
|
||||
$ref: "http://swgserver:8081/api/swagger/include/DSDDemod.yaml#/DSDDemodSettings"
|
||||
FileSinkSettings:
|
||||
|
||||
33
swagger/sdrangel/api/swagger/include/DOA2.yaml
Normal file
33
swagger/sdrangel/api/swagger/include/DOA2.yaml
Normal file
@ -0,0 +1,33 @@
|
||||
DOA2Settings:
|
||||
description: DOA2
|
||||
properties:
|
||||
correlationType:
|
||||
description: see DOA2Settings::CorrelationType
|
||||
type: integer
|
||||
rgbColor:
|
||||
type: integer
|
||||
title:
|
||||
type: string
|
||||
log2Decim:
|
||||
type: integer
|
||||
filterChainHash:
|
||||
type: integer
|
||||
useReverseAPI:
|
||||
description: Synchronize with reverse API (1 for yes, 0 for no)
|
||||
type: integer
|
||||
reverseAPIAddress:
|
||||
type: string
|
||||
reverseAPIPort:
|
||||
type: integer
|
||||
reverseAPIDeviceIndex:
|
||||
type: integer
|
||||
reverseAPIChannelIndex:
|
||||
type: integer
|
||||
spectrumConfig:
|
||||
$ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum"
|
||||
scopeConfig:
|
||||
$ref: "http://swgserver:8081/api/swagger/include/GLScope.yaml#/GLScope"
|
||||
channelMarker:
|
||||
$ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker"
|
||||
rollupState:
|
||||
$ref: "http://swgserver:8081/api/swagger/include/RollupState.yaml#/RollupState"
|
||||
@ -3543,6 +3543,9 @@ margin-bottom: 20px;
|
||||
"DABDemodSettings" : {
|
||||
"$ref" : "#/definitions/DABDemodSettings"
|
||||
},
|
||||
"DOA2Settings" : {
|
||||
"$ref" : "#/definitions/DOA2Settings"
|
||||
},
|
||||
"DSDDemodSettings" : {
|
||||
"$ref" : "#/definitions/DSDDemodSettings"
|
||||
},
|
||||
@ -4522,6 +4525,55 @@ margin-bottom: 20px;
|
||||
}
|
||||
},
|
||||
"description" : "DATVMod"
|
||||
};
|
||||
defs.DOA2Settings = {
|
||||
"properties" : {
|
||||
"correlationType" : {
|
||||
"type" : "integer",
|
||||
"description" : "see DOA2Settings::CorrelationType"
|
||||
},
|
||||
"rgbColor" : {
|
||||
"type" : "integer"
|
||||
},
|
||||
"title" : {
|
||||
"type" : "string"
|
||||
},
|
||||
"log2Decim" : {
|
||||
"type" : "integer"
|
||||
},
|
||||
"filterChainHash" : {
|
||||
"type" : "integer"
|
||||
},
|
||||
"useReverseAPI" : {
|
||||
"type" : "integer",
|
||||
"description" : "Synchronize with reverse API (1 for yes, 0 for no)"
|
||||
},
|
||||
"reverseAPIAddress" : {
|
||||
"type" : "string"
|
||||
},
|
||||
"reverseAPIPort" : {
|
||||
"type" : "integer"
|
||||
},
|
||||
"reverseAPIDeviceIndex" : {
|
||||
"type" : "integer"
|
||||
},
|
||||
"reverseAPIChannelIndex" : {
|
||||
"type" : "integer"
|
||||
},
|
||||
"spectrumConfig" : {
|
||||
"$ref" : "#/definitions/GLSpectrum"
|
||||
},
|
||||
"scopeConfig" : {
|
||||
"$ref" : "#/definitions/GLScope"
|
||||
},
|
||||
"channelMarker" : {
|
||||
"$ref" : "#/definitions/ChannelMarker"
|
||||
},
|
||||
"rollupState" : {
|
||||
"$ref" : "#/definitions/RollupState"
|
||||
}
|
||||
},
|
||||
"description" : "DOA2"
|
||||
};
|
||||
defs.DSDDemodReport = {
|
||||
"properties" : {
|
||||
@ -56060,7 +56112,7 @@ except ApiException as e:
|
||||
</div>
|
||||
<div id="generator">
|
||||
<div class="content">
|
||||
Generated 2022-05-25T12:47:57.273+02:00
|
||||
Generated 2022-05-27T00:17:01.671+02:00
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -68,6 +68,8 @@ SWGChannelSettings::SWGChannelSettings() {
|
||||
m_datv_demod_settings_isSet = false;
|
||||
dab_demod_settings = nullptr;
|
||||
m_dab_demod_settings_isSet = false;
|
||||
doa2_settings = nullptr;
|
||||
m_doa2_settings_isSet = false;
|
||||
dsd_demod_settings = nullptr;
|
||||
m_dsd_demod_settings_isSet = false;
|
||||
file_sink_settings = nullptr;
|
||||
@ -174,6 +176,8 @@ SWGChannelSettings::init() {
|
||||
m_datv_demod_settings_isSet = false;
|
||||
dab_demod_settings = new SWGDABDemodSettings();
|
||||
m_dab_demod_settings_isSet = false;
|
||||
doa2_settings = new SWGDOA2Settings();
|
||||
m_doa2_settings_isSet = false;
|
||||
dsd_demod_settings = new SWGDSDDemodSettings();
|
||||
m_dsd_demod_settings_isSet = false;
|
||||
file_sink_settings = new SWGFileSinkSettings();
|
||||
@ -290,6 +294,9 @@ SWGChannelSettings::cleanup() {
|
||||
if(dab_demod_settings != nullptr) {
|
||||
delete dab_demod_settings;
|
||||
}
|
||||
if(doa2_settings != nullptr) {
|
||||
delete doa2_settings;
|
||||
}
|
||||
if(dsd_demod_settings != nullptr) {
|
||||
delete dsd_demod_settings;
|
||||
}
|
||||
@ -430,6 +437,8 @@ SWGChannelSettings::fromJsonObject(QJsonObject &pJson) {
|
||||
|
||||
::SWGSDRangel::setValue(&dab_demod_settings, pJson["DABDemodSettings"], "SWGDABDemodSettings", "SWGDABDemodSettings");
|
||||
|
||||
::SWGSDRangel::setValue(&doa2_settings, pJson["DOA2Settings"], "SWGDOA2Settings", "SWGDOA2Settings");
|
||||
|
||||
::SWGSDRangel::setValue(&dsd_demod_settings, pJson["DSDDemodSettings"], "SWGDSDDemodSettings", "SWGDSDDemodSettings");
|
||||
|
||||
::SWGSDRangel::setValue(&file_sink_settings, pJson["FileSinkSettings"], "SWGFileSinkSettings", "SWGFileSinkSettings");
|
||||
@ -564,6 +573,9 @@ SWGChannelSettings::asJsonObject() {
|
||||
if((dab_demod_settings != nullptr) && (dab_demod_settings->isSet())){
|
||||
toJsonValue(QString("DABDemodSettings"), dab_demod_settings, obj, QString("SWGDABDemodSettings"));
|
||||
}
|
||||
if((doa2_settings != nullptr) && (doa2_settings->isSet())){
|
||||
toJsonValue(QString("DOA2Settings"), doa2_settings, obj, QString("SWGDOA2Settings"));
|
||||
}
|
||||
if((dsd_demod_settings != nullptr) && (dsd_demod_settings->isSet())){
|
||||
toJsonValue(QString("DSDDemodSettings"), dsd_demod_settings, obj, QString("SWGDSDDemodSettings"));
|
||||
}
|
||||
@ -855,6 +867,16 @@ SWGChannelSettings::setDabDemodSettings(SWGDABDemodSettings* dab_demod_settings)
|
||||
this->m_dab_demod_settings_isSet = true;
|
||||
}
|
||||
|
||||
SWGDOA2Settings*
|
||||
SWGChannelSettings::getDoa2Settings() {
|
||||
return doa2_settings;
|
||||
}
|
||||
void
|
||||
SWGChannelSettings::setDoa2Settings(SWGDOA2Settings* doa2_settings) {
|
||||
this->doa2_settings = doa2_settings;
|
||||
this->m_doa2_settings_isSet = true;
|
||||
}
|
||||
|
||||
SWGDSDDemodSettings*
|
||||
SWGChannelSettings::getDsdDemodSettings() {
|
||||
return dsd_demod_settings;
|
||||
@ -1210,6 +1232,9 @@ SWGChannelSettings::isSet(){
|
||||
if(dab_demod_settings && dab_demod_settings->isSet()){
|
||||
isObjectUpdated = true; break;
|
||||
}
|
||||
if(doa2_settings && doa2_settings->isSet()){
|
||||
isObjectUpdated = true; break;
|
||||
}
|
||||
if(dsd_demod_settings && dsd_demod_settings->isSet()){
|
||||
isObjectUpdated = true; break;
|
||||
}
|
||||
|
||||
@ -38,6 +38,7 @@
|
||||
#include "SWGDABDemodSettings.h"
|
||||
#include "SWGDATVDemodSettings.h"
|
||||
#include "SWGDATVModSettings.h"
|
||||
#include "SWGDOA2Settings.h"
|
||||
#include "SWGDSDDemodSettings.h"
|
||||
#include "SWGFileSinkSettings.h"
|
||||
#include "SWGFileSourceSettings.h"
|
||||
@ -147,6 +148,9 @@ public:
|
||||
SWGDABDemodSettings* getDabDemodSettings();
|
||||
void setDabDemodSettings(SWGDABDemodSettings* dab_demod_settings);
|
||||
|
||||
SWGDOA2Settings* getDoa2Settings();
|
||||
void setDoa2Settings(SWGDOA2Settings* doa2_settings);
|
||||
|
||||
SWGDSDDemodSettings* getDsdDemodSettings();
|
||||
void setDsdDemodSettings(SWGDSDDemodSettings* dsd_demod_settings);
|
||||
|
||||
@ -298,6 +302,9 @@ private:
|
||||
SWGDABDemodSettings* dab_demod_settings;
|
||||
bool m_dab_demod_settings_isSet;
|
||||
|
||||
SWGDOA2Settings* doa2_settings;
|
||||
bool m_doa2_settings_isSet;
|
||||
|
||||
SWGDSDDemodSettings* dsd_demod_settings;
|
||||
bool m_dsd_demod_settings_isSet;
|
||||
|
||||
|
||||
419
swagger/sdrangel/code/qt5/client/SWGDOA2Settings.cpp
Normal file
419
swagger/sdrangel/code/qt5/client/SWGDOA2Settings.cpp
Normal file
@ -0,0 +1,419 @@
|
||||
/**
|
||||
* SDRangel
|
||||
* This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time ---
|
||||
*
|
||||
* OpenAPI spec version: 7.0.0
|
||||
* Contact: f4exb06@gmail.com
|
||||
*
|
||||
* NOTE: This class is auto generated by the swagger code generator program.
|
||||
* https://github.com/swagger-api/swagger-codegen.git
|
||||
* Do not edit the class manually.
|
||||
*/
|
||||
|
||||
|
||||
#include "SWGDOA2Settings.h"
|
||||
|
||||
#include "SWGHelpers.h"
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonArray>
|
||||
#include <QObject>
|
||||
#include <QDebug>
|
||||
|
||||
namespace SWGSDRangel {
|
||||
|
||||
SWGDOA2Settings::SWGDOA2Settings(QString* json) {
|
||||
init();
|
||||
this->fromJson(*json);
|
||||
}
|
||||
|
||||
SWGDOA2Settings::SWGDOA2Settings() {
|
||||
correlation_type = 0;
|
||||
m_correlation_type_isSet = false;
|
||||
rgb_color = 0;
|
||||
m_rgb_color_isSet = false;
|
||||
title = nullptr;
|
||||
m_title_isSet = false;
|
||||
log2_decim = 0;
|
||||
m_log2_decim_isSet = false;
|
||||
filter_chain_hash = 0;
|
||||
m_filter_chain_hash_isSet = false;
|
||||
use_reverse_api = 0;
|
||||
m_use_reverse_api_isSet = false;
|
||||
reverse_api_address = nullptr;
|
||||
m_reverse_api_address_isSet = false;
|
||||
reverse_api_port = 0;
|
||||
m_reverse_api_port_isSet = false;
|
||||
reverse_api_device_index = 0;
|
||||
m_reverse_api_device_index_isSet = false;
|
||||
reverse_api_channel_index = 0;
|
||||
m_reverse_api_channel_index_isSet = false;
|
||||
spectrum_config = nullptr;
|
||||
m_spectrum_config_isSet = false;
|
||||
scope_config = nullptr;
|
||||
m_scope_config_isSet = false;
|
||||
channel_marker = nullptr;
|
||||
m_channel_marker_isSet = false;
|
||||
rollup_state = nullptr;
|
||||
m_rollup_state_isSet = false;
|
||||
}
|
||||
|
||||
SWGDOA2Settings::~SWGDOA2Settings() {
|
||||
this->cleanup();
|
||||
}
|
||||
|
||||
void
|
||||
SWGDOA2Settings::init() {
|
||||
correlation_type = 0;
|
||||
m_correlation_type_isSet = false;
|
||||
rgb_color = 0;
|
||||
m_rgb_color_isSet = false;
|
||||
title = new QString("");
|
||||
m_title_isSet = false;
|
||||
log2_decim = 0;
|
||||
m_log2_decim_isSet = false;
|
||||
filter_chain_hash = 0;
|
||||
m_filter_chain_hash_isSet = false;
|
||||
use_reverse_api = 0;
|
||||
m_use_reverse_api_isSet = false;
|
||||
reverse_api_address = new QString("");
|
||||
m_reverse_api_address_isSet = false;
|
||||
reverse_api_port = 0;
|
||||
m_reverse_api_port_isSet = false;
|
||||
reverse_api_device_index = 0;
|
||||
m_reverse_api_device_index_isSet = false;
|
||||
reverse_api_channel_index = 0;
|
||||
m_reverse_api_channel_index_isSet = false;
|
||||
spectrum_config = new SWGGLSpectrum();
|
||||
m_spectrum_config_isSet = false;
|
||||
scope_config = new SWGGLScope();
|
||||
m_scope_config_isSet = false;
|
||||
channel_marker = new SWGChannelMarker();
|
||||
m_channel_marker_isSet = false;
|
||||
rollup_state = new SWGRollupState();
|
||||
m_rollup_state_isSet = false;
|
||||
}
|
||||
|
||||
void
|
||||
SWGDOA2Settings::cleanup() {
|
||||
|
||||
|
||||
if(title != nullptr) {
|
||||
delete title;
|
||||
}
|
||||
|
||||
|
||||
|
||||
if(reverse_api_address != nullptr) {
|
||||
delete reverse_api_address;
|
||||
}
|
||||
|
||||
|
||||
|
||||
if(spectrum_config != nullptr) {
|
||||
delete spectrum_config;
|
||||
}
|
||||
if(scope_config != nullptr) {
|
||||
delete scope_config;
|
||||
}
|
||||
if(channel_marker != nullptr) {
|
||||
delete channel_marker;
|
||||
}
|
||||
if(rollup_state != nullptr) {
|
||||
delete rollup_state;
|
||||
}
|
||||
}
|
||||
|
||||
SWGDOA2Settings*
|
||||
SWGDOA2Settings::fromJson(QString &json) {
|
||||
QByteArray array (json.toStdString().c_str());
|
||||
QJsonDocument doc = QJsonDocument::fromJson(array);
|
||||
QJsonObject jsonObject = doc.object();
|
||||
this->fromJsonObject(jsonObject);
|
||||
return this;
|
||||
}
|
||||
|
||||
void
|
||||
SWGDOA2Settings::fromJsonObject(QJsonObject &pJson) {
|
||||
::SWGSDRangel::setValue(&correlation_type, pJson["correlationType"], "qint32", "");
|
||||
|
||||
::SWGSDRangel::setValue(&rgb_color, pJson["rgbColor"], "qint32", "");
|
||||
|
||||
::SWGSDRangel::setValue(&title, pJson["title"], "QString", "QString");
|
||||
|
||||
::SWGSDRangel::setValue(&log2_decim, pJson["log2Decim"], "qint32", "");
|
||||
|
||||
::SWGSDRangel::setValue(&filter_chain_hash, pJson["filterChainHash"], "qint32", "");
|
||||
|
||||
::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
|
||||
|
||||
::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
|
||||
|
||||
::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", "");
|
||||
|
||||
::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", "");
|
||||
|
||||
::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
|
||||
|
||||
::SWGSDRangel::setValue(&spectrum_config, pJson["spectrumConfig"], "SWGGLSpectrum", "SWGGLSpectrum");
|
||||
|
||||
::SWGSDRangel::setValue(&scope_config, pJson["scopeConfig"], "SWGGLScope", "SWGGLScope");
|
||||
|
||||
::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
|
||||
|
||||
::SWGSDRangel::setValue(&rollup_state, pJson["rollupState"], "SWGRollupState", "SWGRollupState");
|
||||
|
||||
}
|
||||
|
||||
QString
|
||||
SWGDOA2Settings::asJson ()
|
||||
{
|
||||
QJsonObject* obj = this->asJsonObject();
|
||||
|
||||
QJsonDocument doc(*obj);
|
||||
QByteArray bytes = doc.toJson();
|
||||
delete obj;
|
||||
return QString(bytes);
|
||||
}
|
||||
|
||||
QJsonObject*
|
||||
SWGDOA2Settings::asJsonObject() {
|
||||
QJsonObject* obj = new QJsonObject();
|
||||
if(m_correlation_type_isSet){
|
||||
obj->insert("correlationType", QJsonValue(correlation_type));
|
||||
}
|
||||
if(m_rgb_color_isSet){
|
||||
obj->insert("rgbColor", QJsonValue(rgb_color));
|
||||
}
|
||||
if(title != nullptr && *title != QString("")){
|
||||
toJsonValue(QString("title"), title, obj, QString("QString"));
|
||||
}
|
||||
if(m_log2_decim_isSet){
|
||||
obj->insert("log2Decim", QJsonValue(log2_decim));
|
||||
}
|
||||
if(m_filter_chain_hash_isSet){
|
||||
obj->insert("filterChainHash", QJsonValue(filter_chain_hash));
|
||||
}
|
||||
if(m_use_reverse_api_isSet){
|
||||
obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
|
||||
}
|
||||
if(reverse_api_address != nullptr && *reverse_api_address != QString("")){
|
||||
toJsonValue(QString("reverseAPIAddress"), reverse_api_address, obj, QString("QString"));
|
||||
}
|
||||
if(m_reverse_api_port_isSet){
|
||||
obj->insert("reverseAPIPort", QJsonValue(reverse_api_port));
|
||||
}
|
||||
if(m_reverse_api_device_index_isSet){
|
||||
obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index));
|
||||
}
|
||||
if(m_reverse_api_channel_index_isSet){
|
||||
obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
|
||||
}
|
||||
if((spectrum_config != nullptr) && (spectrum_config->isSet())){
|
||||
toJsonValue(QString("spectrumConfig"), spectrum_config, obj, QString("SWGGLSpectrum"));
|
||||
}
|
||||
if((scope_config != nullptr) && (scope_config->isSet())){
|
||||
toJsonValue(QString("scopeConfig"), scope_config, obj, QString("SWGGLScope"));
|
||||
}
|
||||
if((channel_marker != nullptr) && (channel_marker->isSet())){
|
||||
toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker"));
|
||||
}
|
||||
if((rollup_state != nullptr) && (rollup_state->isSet())){
|
||||
toJsonValue(QString("rollupState"), rollup_state, obj, QString("SWGRollupState"));
|
||||
}
|
||||
|
||||
return obj;
|
||||
}
|
||||
|
||||
qint32
|
||||
SWGDOA2Settings::getCorrelationType() {
|
||||
return correlation_type;
|
||||
}
|
||||
void
|
||||
SWGDOA2Settings::setCorrelationType(qint32 correlation_type) {
|
||||
this->correlation_type = correlation_type;
|
||||
this->m_correlation_type_isSet = true;
|
||||
}
|
||||
|
||||
qint32
|
||||
SWGDOA2Settings::getRgbColor() {
|
||||
return rgb_color;
|
||||
}
|
||||
void
|
||||
SWGDOA2Settings::setRgbColor(qint32 rgb_color) {
|
||||
this->rgb_color = rgb_color;
|
||||
this->m_rgb_color_isSet = true;
|
||||
}
|
||||
|
||||
QString*
|
||||
SWGDOA2Settings::getTitle() {
|
||||
return title;
|
||||
}
|
||||
void
|
||||
SWGDOA2Settings::setTitle(QString* title) {
|
||||
this->title = title;
|
||||
this->m_title_isSet = true;
|
||||
}
|
||||
|
||||
qint32
|
||||
SWGDOA2Settings::getLog2Decim() {
|
||||
return log2_decim;
|
||||
}
|
||||
void
|
||||
SWGDOA2Settings::setLog2Decim(qint32 log2_decim) {
|
||||
this->log2_decim = log2_decim;
|
||||
this->m_log2_decim_isSet = true;
|
||||
}
|
||||
|
||||
qint32
|
||||
SWGDOA2Settings::getFilterChainHash() {
|
||||
return filter_chain_hash;
|
||||
}
|
||||
void
|
||||
SWGDOA2Settings::setFilterChainHash(qint32 filter_chain_hash) {
|
||||
this->filter_chain_hash = filter_chain_hash;
|
||||
this->m_filter_chain_hash_isSet = true;
|
||||
}
|
||||
|
||||
qint32
|
||||
SWGDOA2Settings::getUseReverseApi() {
|
||||
return use_reverse_api;
|
||||
}
|
||||
void
|
||||
SWGDOA2Settings::setUseReverseApi(qint32 use_reverse_api) {
|
||||
this->use_reverse_api = use_reverse_api;
|
||||
this->m_use_reverse_api_isSet = true;
|
||||
}
|
||||
|
||||
QString*
|
||||
SWGDOA2Settings::getReverseApiAddress() {
|
||||
return reverse_api_address;
|
||||
}
|
||||
void
|
||||
SWGDOA2Settings::setReverseApiAddress(QString* reverse_api_address) {
|
||||
this->reverse_api_address = reverse_api_address;
|
||||
this->m_reverse_api_address_isSet = true;
|
||||
}
|
||||
|
||||
qint32
|
||||
SWGDOA2Settings::getReverseApiPort() {
|
||||
return reverse_api_port;
|
||||
}
|
||||
void
|
||||
SWGDOA2Settings::setReverseApiPort(qint32 reverse_api_port) {
|
||||
this->reverse_api_port = reverse_api_port;
|
||||
this->m_reverse_api_port_isSet = true;
|
||||
}
|
||||
|
||||
qint32
|
||||
SWGDOA2Settings::getReverseApiDeviceIndex() {
|
||||
return reverse_api_device_index;
|
||||
}
|
||||
void
|
||||
SWGDOA2Settings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) {
|
||||
this->reverse_api_device_index = reverse_api_device_index;
|
||||
this->m_reverse_api_device_index_isSet = true;
|
||||
}
|
||||
|
||||
qint32
|
||||
SWGDOA2Settings::getReverseApiChannelIndex() {
|
||||
return reverse_api_channel_index;
|
||||
}
|
||||
void
|
||||
SWGDOA2Settings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) {
|
||||
this->reverse_api_channel_index = reverse_api_channel_index;
|
||||
this->m_reverse_api_channel_index_isSet = true;
|
||||
}
|
||||
|
||||
SWGGLSpectrum*
|
||||
SWGDOA2Settings::getSpectrumConfig() {
|
||||
return spectrum_config;
|
||||
}
|
||||
void
|
||||
SWGDOA2Settings::setSpectrumConfig(SWGGLSpectrum* spectrum_config) {
|
||||
this->spectrum_config = spectrum_config;
|
||||
this->m_spectrum_config_isSet = true;
|
||||
}
|
||||
|
||||
SWGGLScope*
|
||||
SWGDOA2Settings::getScopeConfig() {
|
||||
return scope_config;
|
||||
}
|
||||
void
|
||||
SWGDOA2Settings::setScopeConfig(SWGGLScope* scope_config) {
|
||||
this->scope_config = scope_config;
|
||||
this->m_scope_config_isSet = true;
|
||||
}
|
||||
|
||||
SWGChannelMarker*
|
||||
SWGDOA2Settings::getChannelMarker() {
|
||||
return channel_marker;
|
||||
}
|
||||
void
|
||||
SWGDOA2Settings::setChannelMarker(SWGChannelMarker* channel_marker) {
|
||||
this->channel_marker = channel_marker;
|
||||
this->m_channel_marker_isSet = true;
|
||||
}
|
||||
|
||||
SWGRollupState*
|
||||
SWGDOA2Settings::getRollupState() {
|
||||
return rollup_state;
|
||||
}
|
||||
void
|
||||
SWGDOA2Settings::setRollupState(SWGRollupState* rollup_state) {
|
||||
this->rollup_state = rollup_state;
|
||||
this->m_rollup_state_isSet = true;
|
||||
}
|
||||
|
||||
|
||||
bool
|
||||
SWGDOA2Settings::isSet(){
|
||||
bool isObjectUpdated = false;
|
||||
do{
|
||||
if(m_correlation_type_isSet){
|
||||
isObjectUpdated = true; break;
|
||||
}
|
||||
if(m_rgb_color_isSet){
|
||||
isObjectUpdated = true; break;
|
||||
}
|
||||
if(title && *title != QString("")){
|
||||
isObjectUpdated = true; break;
|
||||
}
|
||||
if(m_log2_decim_isSet){
|
||||
isObjectUpdated = true; break;
|
||||
}
|
||||
if(m_filter_chain_hash_isSet){
|
||||
isObjectUpdated = true; break;
|
||||
}
|
||||
if(m_use_reverse_api_isSet){
|
||||
isObjectUpdated = true; break;
|
||||
}
|
||||
if(reverse_api_address && *reverse_api_address != QString("")){
|
||||
isObjectUpdated = true; break;
|
||||
}
|
||||
if(m_reverse_api_port_isSet){
|
||||
isObjectUpdated = true; break;
|
||||
}
|
||||
if(m_reverse_api_device_index_isSet){
|
||||
isObjectUpdated = true; break;
|
||||
}
|
||||
if(m_reverse_api_channel_index_isSet){
|
||||
isObjectUpdated = true; break;
|
||||
}
|
||||
if(spectrum_config && spectrum_config->isSet()){
|
||||
isObjectUpdated = true; break;
|
||||
}
|
||||
if(scope_config && scope_config->isSet()){
|
||||
isObjectUpdated = true; break;
|
||||
}
|
||||
if(channel_marker && channel_marker->isSet()){
|
||||
isObjectUpdated = true; break;
|
||||
}
|
||||
if(rollup_state && rollup_state->isSet()){
|
||||
isObjectUpdated = true; break;
|
||||
}
|
||||
}while(false);
|
||||
return isObjectUpdated;
|
||||
}
|
||||
}
|
||||
|
||||
141
swagger/sdrangel/code/qt5/client/SWGDOA2Settings.h
Normal file
141
swagger/sdrangel/code/qt5/client/SWGDOA2Settings.h
Normal file
@ -0,0 +1,141 @@
|
||||
/**
|
||||
* SDRangel
|
||||
* This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time ---
|
||||
*
|
||||
* OpenAPI spec version: 7.0.0
|
||||
* Contact: f4exb06@gmail.com
|
||||
*
|
||||
* NOTE: This class is auto generated by the swagger code generator program.
|
||||
* https://github.com/swagger-api/swagger-codegen.git
|
||||
* Do not edit the class manually.
|
||||
*/
|
||||
|
||||
/*
|
||||
* SWGDOA2Settings.h
|
||||
*
|
||||
* DOA2
|
||||
*/
|
||||
|
||||
#ifndef SWGDOA2Settings_H_
|
||||
#define SWGDOA2Settings_H_
|
||||
|
||||
#include <QJsonObject>
|
||||
|
||||
|
||||
#include "SWGChannelMarker.h"
|
||||
#include "SWGGLScope.h"
|
||||
#include "SWGGLSpectrum.h"
|
||||
#include "SWGRollupState.h"
|
||||
#include <QString>
|
||||
|
||||
#include "SWGObject.h"
|
||||
#include "export.h"
|
||||
|
||||
namespace SWGSDRangel {
|
||||
|
||||
class SWG_API SWGDOA2Settings: public SWGObject {
|
||||
public:
|
||||
SWGDOA2Settings();
|
||||
SWGDOA2Settings(QString* json);
|
||||
virtual ~SWGDOA2Settings();
|
||||
void init();
|
||||
void cleanup();
|
||||
|
||||
virtual QString asJson () override;
|
||||
virtual QJsonObject* asJsonObject() override;
|
||||
virtual void fromJsonObject(QJsonObject &json) override;
|
||||
virtual SWGDOA2Settings* fromJson(QString &jsonString) override;
|
||||
|
||||
qint32 getCorrelationType();
|
||||
void setCorrelationType(qint32 correlation_type);
|
||||
|
||||
qint32 getRgbColor();
|
||||
void setRgbColor(qint32 rgb_color);
|
||||
|
||||
QString* getTitle();
|
||||
void setTitle(QString* title);
|
||||
|
||||
qint32 getLog2Decim();
|
||||
void setLog2Decim(qint32 log2_decim);
|
||||
|
||||
qint32 getFilterChainHash();
|
||||
void setFilterChainHash(qint32 filter_chain_hash);
|
||||
|
||||
qint32 getUseReverseApi();
|
||||
void setUseReverseApi(qint32 use_reverse_api);
|
||||
|
||||
QString* getReverseApiAddress();
|
||||
void setReverseApiAddress(QString* reverse_api_address);
|
||||
|
||||
qint32 getReverseApiPort();
|
||||
void setReverseApiPort(qint32 reverse_api_port);
|
||||
|
||||
qint32 getReverseApiDeviceIndex();
|
||||
void setReverseApiDeviceIndex(qint32 reverse_api_device_index);
|
||||
|
||||
qint32 getReverseApiChannelIndex();
|
||||
void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
|
||||
|
||||
SWGGLSpectrum* getSpectrumConfig();
|
||||
void setSpectrumConfig(SWGGLSpectrum* spectrum_config);
|
||||
|
||||
SWGGLScope* getScopeConfig();
|
||||
void setScopeConfig(SWGGLScope* scope_config);
|
||||
|
||||
SWGChannelMarker* getChannelMarker();
|
||||
void setChannelMarker(SWGChannelMarker* channel_marker);
|
||||
|
||||
SWGRollupState* getRollupState();
|
||||
void setRollupState(SWGRollupState* rollup_state);
|
||||
|
||||
|
||||
virtual bool isSet() override;
|
||||
|
||||
private:
|
||||
qint32 correlation_type;
|
||||
bool m_correlation_type_isSet;
|
||||
|
||||
qint32 rgb_color;
|
||||
bool m_rgb_color_isSet;
|
||||
|
||||
QString* title;
|
||||
bool m_title_isSet;
|
||||
|
||||
qint32 log2_decim;
|
||||
bool m_log2_decim_isSet;
|
||||
|
||||
qint32 filter_chain_hash;
|
||||
bool m_filter_chain_hash_isSet;
|
||||
|
||||
qint32 use_reverse_api;
|
||||
bool m_use_reverse_api_isSet;
|
||||
|
||||
QString* reverse_api_address;
|
||||
bool m_reverse_api_address_isSet;
|
||||
|
||||
qint32 reverse_api_port;
|
||||
bool m_reverse_api_port_isSet;
|
||||
|
||||
qint32 reverse_api_device_index;
|
||||
bool m_reverse_api_device_index_isSet;
|
||||
|
||||
qint32 reverse_api_channel_index;
|
||||
bool m_reverse_api_channel_index_isSet;
|
||||
|
||||
SWGGLSpectrum* spectrum_config;
|
||||
bool m_spectrum_config_isSet;
|
||||
|
||||
SWGGLScope* scope_config;
|
||||
bool m_scope_config_isSet;
|
||||
|
||||
SWGChannelMarker* channel_marker;
|
||||
bool m_channel_marker_isSet;
|
||||
|
||||
SWGRollupState* rollup_state;
|
||||
bool m_rollup_state_isSet;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif /* SWGDOA2Settings_H_ */
|
||||
@ -95,6 +95,7 @@
|
||||
#include "SWGDATVDemodSettings.h"
|
||||
#include "SWGDATVModReport.h"
|
||||
#include "SWGDATVModSettings.h"
|
||||
#include "SWGDOA2Settings.h"
|
||||
#include "SWGDSDDemodReport.h"
|
||||
#include "SWGDSDDemodSettings.h"
|
||||
#include "SWGDVSerialDevice.h"
|
||||
@ -738,6 +739,11 @@ namespace SWGSDRangel {
|
||||
obj->init();
|
||||
return obj;
|
||||
}
|
||||
if(QString("SWGDOA2Settings").compare(type) == 0) {
|
||||
SWGDOA2Settings *obj = new SWGDOA2Settings();
|
||||
obj->init();
|
||||
return obj;
|
||||
}
|
||||
if(QString("SWGDSDDemodReport").compare(type) == 0) {
|
||||
SWGDSDDemodReport *obj = new SWGDSDDemodReport();
|
||||
obj->init();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user