mirror of
https://github.com/f4exb/sdrangel.git
synced 2026-06-02 14:04:46 -04:00
MIMO: add channel to TestMI (1)
This commit is contained in:
f4exb
@@ -25,6 +25,7 @@
|
||||
|
||||
#include "SWGDeviceSettings.h"
|
||||
#include "SWGDeviceState.h"
|
||||
#include "SWGTestMISettings.h"
|
||||
|
||||
#include "device/deviceapi.h"
|
||||
#include "dsp/dspcommands.h"
|
||||
@@ -44,16 +45,17 @@ MESSAGE_CLASS_DEFINITION(TestMI::MsgStartStop, Message)
|
||||
TestMI::TestMI(DeviceAPI *deviceAPI) :
|
||||
m_deviceAPI(deviceAPI),
|
||||
m_settings(),
|
||||
m_testSourceThread(0),
|
||||
m_deviceDescription(),
|
||||
m_running(false),
|
||||
m_masterTimer(deviceAPI->getMasterTimer())
|
||||
{
|
||||
m_fileSink = new FileRecord(QString("test_%1.sdriq").arg(m_deviceAPI->getDeviceUID()));
|
||||
m_deviceAPI->setNbSourceStreams(1);
|
||||
m_deviceAPI->setNbSourceStreams(2);
|
||||
m_deviceAPI->addSourceStream(); // Add a new source stream data set in the engine
|
||||
m_deviceAPI->addSourceStream(); // Add a new source stream data set in the engine
|
||||
m_deviceAPI->addAncillarySink(m_fileSink);
|
||||
m_sampleSinkFifos.push_back(SampleSinkFifo(96000 * 4));
|
||||
m_sampleSinkFifos.push_back(SampleSinkFifo(96000 * 4));
|
||||
m_networkManager = new QNetworkAccessManager();
|
||||
connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*)));
|
||||
}
|
||||
@@ -69,6 +71,7 @@ TestMI::~TestMI()
|
||||
|
||||
m_deviceAPI->removeAncillarySink(m_fileSink);
|
||||
m_deviceAPI->removeLastSourceStream(); // Remove the last source stream data set in the engine
|
||||
m_deviceAPI->removeLastSourceStream(); // Remove the last source stream data set in the engine
|
||||
delete m_fileSink;
|
||||
}
|
||||
|
||||
@@ -88,9 +91,13 @@ bool TestMI::start()
|
||||
|
||||
if (m_running) stop();
|
||||
|
||||
m_testSourceThread = new TestMIThread(&m_sampleSinkFifos[0]);
|
||||
m_testSourceThread->setSamplerate(m_settings.m_sampleRate);
|
||||
m_testSourceThread->startStop(true);
|
||||
m_testSourceThreads.push_back(new TestMIThread(&m_sampleSinkFifos[0]));
|
||||
m_testSourceThreads.back()->setSamplerate(m_settings.m_streams[0].m_sampleRate);
|
||||
m_testSourceThreads.back()->startStop(true);
|
||||
|
||||
m_testSourceThreads.push_back(new TestMIThread(&m_sampleSinkFifos[1]));
|
||||
m_testSourceThreads.back()->setSamplerate(m_settings.m_streams[1].m_sampleRate);
|
||||
m_testSourceThreads.back()->startStop(true);
|
||||
|
||||
mutexLocker.unlock();
|
||||
|
||||
@@ -104,13 +111,15 @@ void TestMI::stop()
|
||||
{
|
||||
QMutexLocker mutexLocker(&m_mutex);
|
||||
|
||||
if (m_testSourceThread != 0)
|
||||
{
|
||||
m_testSourceThread->startStop(false);
|
||||
m_testSourceThread->deleteLater();
|
||||
m_testSourceThread = 0;
|
||||
}
|
||||
std::vector<TestMIThread*>::iterator it = m_testSourceThreads.begin();
|
||||
|
||||
for (; it != m_testSourceThreads.end(); ++it)
|
||||
{
|
||||
(*it)->startStop(false);
|
||||
(*it)->deleteLater();
|
||||
}
|
||||
|
||||
m_testSourceThreads.clear();
|
||||
m_running = false;
|
||||
}
|
||||
|
||||
@@ -148,29 +157,38 @@ const QString& TestMI::getDeviceDescription() const
|
||||
|
||||
int TestMI::getSourceSampleRate(int index) const
|
||||
{
|
||||
(void) index;
|
||||
return m_settings.m_sampleRate/(1<<m_settings.m_log2Decim);
|
||||
if (index < (int) m_settings.m_streams.size()) {
|
||||
return m_settings.m_streams[index].m_sampleRate/(1<<m_settings.m_streams[index].m_log2Decim);
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
quint64 TestMI::getSourceCenterFrequency(int index) const
|
||||
{
|
||||
(void) index;
|
||||
return m_settings.m_centerFrequency;
|
||||
if (index < (int) m_settings.m_streams.size()) {
|
||||
return m_settings.m_streams[index].m_centerFrequency;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
void TestMI::setSourceCenterFrequency(qint64 centerFrequency, int index)
|
||||
{
|
||||
(void) index;
|
||||
TestMISettings settings = m_settings;
|
||||
settings.m_centerFrequency = centerFrequency;
|
||||
TestMISettings settings = m_settings; // note: calls copy constructor
|
||||
|
||||
MsgConfigureTestSource* message = MsgConfigureTestSource::create(settings, false);
|
||||
m_inputMessageQueue.push(message);
|
||||
|
||||
if (m_guiMessageQueue)
|
||||
if (index < (int) settings.m_streams.size())
|
||||
{
|
||||
MsgConfigureTestSource* messageToGUI = MsgConfigureTestSource::create(settings, false);
|
||||
m_guiMessageQueue->push(messageToGUI);
|
||||
settings.m_streams[index].m_centerFrequency = centerFrequency;
|
||||
|
||||
MsgConfigureTestSource* message = MsgConfigureTestSource::create(settings, false);
|
||||
m_inputMessageQueue.push(message);
|
||||
|
||||
if (m_guiMessageQueue)
|
||||
{
|
||||
MsgConfigureTestSource* messageToGUI = MsgConfigureTestSource::create(settings, false);
|
||||
m_guiMessageQueue->push(messageToGUI);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -243,204 +261,213 @@ bool TestMI::handleMessage(const Message& message)
|
||||
|
||||
bool TestMI::applySettings(const TestMISettings& settings, bool force)
|
||||
{
|
||||
QList<QString> reverseAPIKeys;
|
||||
DeviceSettingsKeys deviceSettingsKeys;
|
||||
|
||||
if ((m_settings.m_autoCorrOptions != settings.m_autoCorrOptions) || force)
|
||||
QList<QList<QString>> streamReverseAPIKeys; // FIXME: one set of keys per streams
|
||||
|
||||
for (unsigned int istream = 0; istream < m_settings.m_streams.size(); istream++)
|
||||
{
|
||||
reverseAPIKeys.append("autoCorrOptions");
|
||||
deviceSettingsKeys.m_streamsSettingsKeys.push_back(QList<QString>());
|
||||
QList<QString>& reverseAPIKeys = streamReverseAPIKeys.back();
|
||||
|
||||
switch(settings.m_autoCorrOptions)
|
||||
if ((m_settings.m_streams[istream].m_autoCorrOptions != settings.m_streams[istream].m_autoCorrOptions) || force)
|
||||
{
|
||||
case TestMISettings::AutoCorrDC:
|
||||
m_deviceAPI->configureCorrections(true, false);
|
||||
break;
|
||||
case TestMISettings::AutoCorrDCAndIQ:
|
||||
m_deviceAPI->configureCorrections(true, true);
|
||||
break;
|
||||
case TestMISettings::AutoCorrNone:
|
||||
default:
|
||||
m_deviceAPI->configureCorrections(false, false);
|
||||
break;
|
||||
}
|
||||
}
|
||||
reverseAPIKeys.append("autoCorrOptions");
|
||||
|
||||
if ((m_settings.m_sampleRate != settings.m_sampleRate) || force)
|
||||
{
|
||||
reverseAPIKeys.append("sampleRate");
|
||||
|
||||
if (m_testSourceThread != 0)
|
||||
{
|
||||
m_testSourceThread->setSamplerate(settings.m_sampleRate);
|
||||
qDebug("TestMI::applySettings: sample rate set to %d", settings.m_sampleRate);
|
||||
}
|
||||
}
|
||||
|
||||
if ((m_settings.m_log2Decim != settings.m_log2Decim) || force)
|
||||
{
|
||||
reverseAPIKeys.append("log2Decim");
|
||||
|
||||
if (m_testSourceThread != 0)
|
||||
{
|
||||
m_testSourceThread->setLog2Decimation(settings.m_log2Decim);
|
||||
qDebug() << "TestMI::applySettings: set decimation to " << (1<<settings.m_log2Decim);
|
||||
}
|
||||
}
|
||||
|
||||
if ((m_settings.m_centerFrequency != settings.m_centerFrequency)
|
||||
|| (m_settings.m_fcPos != settings.m_fcPos)
|
||||
|| (m_settings.m_frequencyShift != settings.m_frequencyShift)
|
||||
|| (m_settings.m_sampleRate != settings.m_sampleRate)
|
||||
|| (m_settings.m_log2Decim != settings.m_log2Decim) || force)
|
||||
{
|
||||
reverseAPIKeys.append("centerFrequency");
|
||||
reverseAPIKeys.append("fcPos");
|
||||
reverseAPIKeys.append("frequencyShift");
|
||||
|
||||
qint64 deviceCenterFrequency = DeviceSampleSource::calculateDeviceCenterFrequency(
|
||||
settings.m_centerFrequency,
|
||||
0, // no transverter mode
|
||||
settings.m_log2Decim,
|
||||
(DeviceSampleSource::fcPos_t) settings.m_fcPos,
|
||||
settings.m_sampleRate,
|
||||
DeviceSampleSource::FrequencyShiftScheme::FSHIFT_STD,
|
||||
false);
|
||||
|
||||
int frequencyShift = settings.m_frequencyShift;
|
||||
quint32 devSampleRate = settings.m_sampleRate;
|
||||
|
||||
if (settings.m_log2Decim != 0)
|
||||
{
|
||||
frequencyShift += DeviceSampleSource::calculateFrequencyShift(
|
||||
settings.m_log2Decim,
|
||||
(DeviceSampleSource::fcPos_t) settings.m_fcPos,
|
||||
settings.m_sampleRate,
|
||||
DeviceSampleSource::FSHIFT_STD);
|
||||
}
|
||||
|
||||
if (m_testSourceThread != 0)
|
||||
{
|
||||
m_testSourceThread->setFcPos((int) settings.m_fcPos);
|
||||
m_testSourceThread->setFrequencyShift(frequencyShift);
|
||||
qDebug() << "TestMI::applySettings:"
|
||||
<< " center freq: " << settings.m_centerFrequency << " Hz"
|
||||
<< " device center freq: " << deviceCenterFrequency << " Hz"
|
||||
<< " device sample rate: " << devSampleRate << "Hz"
|
||||
<< " Actual sample rate: " << devSampleRate/(1<<m_settings.m_log2Decim) << "Hz"
|
||||
<< " f shift: " << settings.m_frequencyShift;
|
||||
}
|
||||
}
|
||||
|
||||
if ((m_settings.m_amplitudeBits != settings.m_amplitudeBits) || force)
|
||||
{
|
||||
reverseAPIKeys.append("amplitudeBits");
|
||||
|
||||
if (m_testSourceThread != 0) {
|
||||
m_testSourceThread->setAmplitudeBits(settings.m_amplitudeBits);
|
||||
}
|
||||
}
|
||||
|
||||
if ((m_settings.m_dcFactor != settings.m_dcFactor) || force)
|
||||
{
|
||||
reverseAPIKeys.append("dcFactor");
|
||||
|
||||
if (m_testSourceThread != 0) {
|
||||
m_testSourceThread->setDCFactor(settings.m_dcFactor);
|
||||
}
|
||||
}
|
||||
|
||||
if ((m_settings.m_iFactor != settings.m_iFactor) || force)
|
||||
{
|
||||
reverseAPIKeys.append("iFactor");
|
||||
|
||||
if (m_testSourceThread != 0) {
|
||||
m_testSourceThread->setIFactor(settings.m_iFactor);
|
||||
}
|
||||
}
|
||||
|
||||
if ((m_settings.m_qFactor != settings.m_qFactor) || force)
|
||||
{
|
||||
reverseAPIKeys.append("qFactor");
|
||||
|
||||
if (m_testSourceThread != 0) {
|
||||
m_testSourceThread->setQFactor(settings.m_qFactor);
|
||||
}
|
||||
}
|
||||
|
||||
if ((m_settings.m_phaseImbalance != settings.m_phaseImbalance) || force)
|
||||
{
|
||||
reverseAPIKeys.append("phaseImbalance");
|
||||
|
||||
if (m_testSourceThread != 0) {
|
||||
m_testSourceThread->setPhaseImbalance(settings.m_phaseImbalance);
|
||||
}
|
||||
}
|
||||
|
||||
if ((m_settings.m_sampleSizeIndex != settings.m_sampleSizeIndex) || force)
|
||||
{
|
||||
reverseAPIKeys.append("sampleSizeIndex");
|
||||
|
||||
if (m_testSourceThread != 0) {
|
||||
m_testSourceThread->setBitSize(settings.m_sampleSizeIndex);
|
||||
}
|
||||
}
|
||||
|
||||
if ((m_settings.m_sampleRate != settings.m_sampleRate)
|
||||
|| (m_settings.m_centerFrequency != settings.m_centerFrequency)
|
||||
|| (m_settings.m_log2Decim != settings.m_log2Decim)
|
||||
|| (m_settings.m_fcPos != settings.m_fcPos) || force)
|
||||
{
|
||||
int sampleRate = settings.m_sampleRate/(1<<settings.m_log2Decim);
|
||||
DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, settings.m_centerFrequency);
|
||||
m_fileSink->handleMessage(*notif); // forward to file sink
|
||||
DSPDeviceMIMOEngine::SignalNotification *engineNotif = new DSPDeviceMIMOEngine::SignalNotification(
|
||||
sampleRate, settings.m_centerFrequency, true, 0);
|
||||
m_deviceAPI->getDeviceEngineInputMessageQueue()->push(engineNotif);
|
||||
}
|
||||
|
||||
if ((m_settings.m_modulationTone != settings.m_modulationTone) || force)
|
||||
{
|
||||
reverseAPIKeys.append("modulationTone");
|
||||
|
||||
if (m_testSourceThread != 0) {
|
||||
m_testSourceThread->setToneFrequency(settings.m_modulationTone * 10);
|
||||
}
|
||||
}
|
||||
|
||||
if ((m_settings.m_modulation != settings.m_modulation) || force)
|
||||
{
|
||||
reverseAPIKeys.append("modulation");
|
||||
|
||||
if (m_testSourceThread != 0)
|
||||
{
|
||||
m_testSourceThread->setModulation(settings.m_modulation);
|
||||
|
||||
if (settings.m_modulation == TestMISettings::ModulationPattern0) {
|
||||
m_testSourceThread->setPattern0();
|
||||
} else if (settings.m_modulation == TestMISettings::ModulationPattern1) {
|
||||
m_testSourceThread->setPattern1();
|
||||
} else if (settings.m_modulation == TestMISettings::ModulationPattern2) {
|
||||
m_testSourceThread->setPattern2();
|
||||
switch(settings.m_streams[istream].m_autoCorrOptions)
|
||||
{
|
||||
case TestMIStreamSettings::AutoCorrDC:
|
||||
m_deviceAPI->configureCorrections(true, false, istream);
|
||||
break;
|
||||
case TestMIStreamSettings::AutoCorrDCAndIQ:
|
||||
m_deviceAPI->configureCorrections(true, true, istream);
|
||||
break;
|
||||
case TestMIStreamSettings::AutoCorrNone:
|
||||
default:
|
||||
m_deviceAPI->configureCorrections(false, false, istream);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ((m_settings.m_amModulation != settings.m_amModulation) || force)
|
||||
{
|
||||
reverseAPIKeys.append("amModulation");
|
||||
if ((m_settings.m_streams[istream].m_sampleRate != settings.m_streams[istream].m_sampleRate) || force)
|
||||
{
|
||||
reverseAPIKeys.append("sampleRate");
|
||||
|
||||
if (m_testSourceThread != 0) {
|
||||
m_testSourceThread->setAMModulation(settings.m_amModulation / 100.0f);
|
||||
if ((istream < m_testSourceThreads.size()) && (m_testSourceThreads[istream]))
|
||||
{
|
||||
m_testSourceThreads[istream]->setSamplerate(settings.m_streams[istream].m_sampleRate);
|
||||
qDebug("TestMI::applySettings: sample rate set to %d", settings.m_streams[istream].m_sampleRate);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ((m_settings.m_fmDeviation != settings.m_fmDeviation) || force)
|
||||
{
|
||||
reverseAPIKeys.append("fmDeviation");
|
||||
if ((m_settings.m_streams[istream].m_log2Decim != settings.m_streams[istream].m_log2Decim) || force)
|
||||
{
|
||||
reverseAPIKeys.append("log2Decim");
|
||||
|
||||
if (m_testSourceThread != 0) {
|
||||
m_testSourceThread->setFMDeviation(settings.m_fmDeviation * 100.0f);
|
||||
if ((istream < m_testSourceThreads.size()) && (m_testSourceThreads[istream]))
|
||||
{
|
||||
m_testSourceThreads[istream]->setLog2Decimation(settings.m_streams[istream].m_log2Decim);
|
||||
qDebug() << "TestMI::applySettings: set decimation to " << (1<<settings.m_streams[istream].m_log2Decim);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ((m_settings.m_streams[istream].m_centerFrequency != settings.m_streams[istream].m_centerFrequency)
|
||||
|| (m_settings.m_streams[istream].m_fcPos != settings.m_streams[istream].m_fcPos)
|
||||
|| (m_settings.m_streams[istream].m_frequencyShift != settings.m_streams[istream].m_frequencyShift)
|
||||
|| (m_settings.m_streams[istream].m_sampleRate != settings.m_streams[istream].m_sampleRate)
|
||||
|| (m_settings.m_streams[istream].m_log2Decim != settings.m_streams[istream].m_log2Decim) || force)
|
||||
{
|
||||
reverseAPIKeys.append("centerFrequency");
|
||||
reverseAPIKeys.append("fcPos");
|
||||
reverseAPIKeys.append("frequencyShift");
|
||||
|
||||
qint64 deviceCenterFrequency = DeviceSampleSource::calculateDeviceCenterFrequency(
|
||||
settings.m_streams[istream].m_centerFrequency,
|
||||
0, // no transverter mode
|
||||
settings.m_streams[istream].m_log2Decim,
|
||||
(DeviceSampleSource::fcPos_t) settings.m_streams[istream].m_fcPos,
|
||||
settings.m_streams[istream].m_sampleRate,
|
||||
DeviceSampleSource::FrequencyShiftScheme::FSHIFT_STD,
|
||||
false);
|
||||
|
||||
int frequencyShift = settings.m_streams[istream].m_frequencyShift;
|
||||
quint32 devSampleRate = settings.m_streams[istream].m_sampleRate;
|
||||
|
||||
if (settings.m_streams[istream].m_log2Decim != 0)
|
||||
{
|
||||
frequencyShift += DeviceSampleSource::calculateFrequencyShift(
|
||||
settings.m_streams[istream].m_log2Decim,
|
||||
(DeviceSampleSource::fcPos_t) settings.m_streams[istream].m_fcPos,
|
||||
settings.m_streams[istream].m_sampleRate,
|
||||
DeviceSampleSource::FSHIFT_STD);
|
||||
}
|
||||
|
||||
if ((istream < m_testSourceThreads.size()) && (m_testSourceThreads[istream]))
|
||||
{
|
||||
m_testSourceThreads[istream]->setFcPos((int) settings.m_streams[istream].m_fcPos);
|
||||
m_testSourceThreads[istream]->setFrequencyShift(frequencyShift);
|
||||
qDebug() << "TestMI::applySettings:"
|
||||
<< " istream: " << istream
|
||||
<< " center freq: " << settings.m_streams[istream].m_centerFrequency << " Hz"
|
||||
<< " device center freq: " << deviceCenterFrequency << " Hz"
|
||||
<< " device sample rate: " << devSampleRate << "Hz"
|
||||
<< " Actual sample rate: " << devSampleRate/(1<<m_settings.m_streams[istream].m_log2Decim) << "Hz"
|
||||
<< " f shift: " << settings.m_streams[istream].m_frequencyShift;
|
||||
}
|
||||
}
|
||||
|
||||
if ((m_settings.m_streams[istream].m_amplitudeBits != settings.m_streams[istream].m_amplitudeBits) || force)
|
||||
{
|
||||
reverseAPIKeys.append("amplitudeBits");
|
||||
|
||||
if ((istream < m_testSourceThreads.size()) && (m_testSourceThreads[istream])) {
|
||||
m_testSourceThreads[istream]->setAmplitudeBits(settings.m_streams[istream].m_amplitudeBits);
|
||||
}
|
||||
}
|
||||
|
||||
if ((m_settings.m_streams[istream].m_dcFactor != settings.m_streams[istream].m_dcFactor) || force)
|
||||
{
|
||||
reverseAPIKeys.append("dcFactor");
|
||||
|
||||
if ((istream < m_testSourceThreads.size()) && (m_testSourceThreads[istream])) {
|
||||
m_testSourceThreads[istream]->setDCFactor(settings.m_streams[istream].m_dcFactor);
|
||||
}
|
||||
}
|
||||
|
||||
if ((m_settings.m_streams[istream].m_iFactor != settings.m_streams[istream].m_iFactor) || force)
|
||||
{
|
||||
reverseAPIKeys.append("iFactor");
|
||||
|
||||
if ((istream < m_testSourceThreads.size()) && (m_testSourceThreads[istream])) {
|
||||
m_testSourceThreads[istream]->setIFactor(settings.m_streams[istream].m_iFactor);
|
||||
}
|
||||
}
|
||||
|
||||
if ((m_settings.m_streams[istream].m_qFactor != settings.m_streams[istream].m_qFactor) || force)
|
||||
{
|
||||
reverseAPIKeys.append("qFactor");
|
||||
|
||||
if ((istream < m_testSourceThreads.size()) && (m_testSourceThreads[istream])) {
|
||||
m_testSourceThreads[istream]->setQFactor(settings.m_streams[istream].m_qFactor);
|
||||
}
|
||||
}
|
||||
|
||||
if ((m_settings.m_streams[istream].m_phaseImbalance != settings.m_streams[istream].m_phaseImbalance) || force)
|
||||
{
|
||||
reverseAPIKeys.append("phaseImbalance");
|
||||
|
||||
if ((istream < m_testSourceThreads.size()) && (m_testSourceThreads[istream])) {
|
||||
m_testSourceThreads[istream]->setPhaseImbalance(settings.m_streams[istream].m_phaseImbalance);
|
||||
}
|
||||
}
|
||||
|
||||
if ((m_settings.m_streams[istream].m_sampleSizeIndex != settings.m_streams[istream].m_sampleSizeIndex) || force)
|
||||
{
|
||||
reverseAPIKeys.append("sampleSizeIndex");
|
||||
|
||||
if ((istream < m_testSourceThreads.size()) && (m_testSourceThreads[istream])) {
|
||||
m_testSourceThreads[istream]->setBitSize(settings.m_streams[istream].m_sampleSizeIndex);
|
||||
}
|
||||
}
|
||||
|
||||
if ((m_settings.m_streams[istream].m_sampleRate != settings.m_streams[istream].m_sampleRate)
|
||||
|| (m_settings.m_streams[istream].m_centerFrequency != settings.m_streams[istream].m_centerFrequency)
|
||||
|| (m_settings.m_streams[istream].m_log2Decim != settings.m_streams[istream].m_log2Decim)
|
||||
|| (m_settings.m_streams[istream].m_fcPos != settings.m_streams[istream].m_fcPos) || force)
|
||||
{
|
||||
int sampleRate = settings.m_streams[istream].m_sampleRate/(1<<settings.m_streams[istream].m_log2Decim);
|
||||
DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, settings.m_streams[istream].m_centerFrequency);
|
||||
m_fileSink->handleMessage(*notif); // forward to file sink
|
||||
DSPDeviceMIMOEngine::SignalNotification *engineNotif = new DSPDeviceMIMOEngine::SignalNotification(
|
||||
sampleRate, settings.m_streams[istream].m_centerFrequency, true, 0);
|
||||
m_deviceAPI->getDeviceEngineInputMessageQueue()->push(engineNotif);
|
||||
}
|
||||
|
||||
if ((m_settings.m_streams[istream].m_modulationTone != settings.m_streams[istream].m_modulationTone) || force)
|
||||
{
|
||||
reverseAPIKeys.append("modulationTone");
|
||||
|
||||
if ((istream < m_testSourceThreads.size()) && (m_testSourceThreads[istream])) {
|
||||
m_testSourceThreads[istream]->setToneFrequency(settings.m_streams[istream].m_modulationTone * 10);
|
||||
}
|
||||
}
|
||||
|
||||
if ((m_settings.m_streams[istream].m_modulation != settings.m_streams[istream].m_modulation) || force)
|
||||
{
|
||||
reverseAPIKeys.append("modulation");
|
||||
|
||||
if ((istream < m_testSourceThreads.size()) && (m_testSourceThreads[istream]))
|
||||
{
|
||||
m_testSourceThreads[istream]->setModulation(settings.m_streams[istream].m_modulation);
|
||||
|
||||
if (settings.m_streams[istream].m_modulation == TestMIStreamSettings::ModulationPattern0) {
|
||||
m_testSourceThreads[istream]->setPattern0();
|
||||
} else if (settings.m_streams[istream].m_modulation == TestMIStreamSettings::ModulationPattern1) {
|
||||
m_testSourceThreads[istream]->setPattern1();
|
||||
} else if (settings.m_streams[istream].m_modulation == TestMIStreamSettings::ModulationPattern2) {
|
||||
m_testSourceThreads[istream]->setPattern2();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ((m_settings.m_streams[istream].m_amModulation != settings.m_streams[istream].m_amModulation) || force)
|
||||
{
|
||||
reverseAPIKeys.append("amModulation");
|
||||
|
||||
if ((istream < m_testSourceThreads.size()) && (m_testSourceThreads[istream])) {
|
||||
m_testSourceThreads[istream]->setAMModulation(settings.m_streams[istream].m_amModulation / 100.0f);
|
||||
}
|
||||
}
|
||||
|
||||
if ((m_settings.m_streams[istream].m_fmDeviation != settings.m_streams[istream].m_fmDeviation) || force)
|
||||
{
|
||||
reverseAPIKeys.append("fmDeviation");
|
||||
|
||||
if ((istream < m_testSourceThreads.size()) && (m_testSourceThreads[istream])) {
|
||||
m_testSourceThreads[istream]->setFMDeviation(settings.m_streams[istream].m_fmDeviation * 100.0f);
|
||||
}
|
||||
}
|
||||
} // for each stream index
|
||||
|
||||
if (settings.m_useReverseAPI)
|
||||
{
|
||||
@@ -449,7 +476,7 @@ bool TestMI::applySettings(const TestMISettings& settings, bool force)
|
||||
(m_settings.m_reverseAPIAddress != settings.m_reverseAPIAddress) ||
|
||||
(m_settings.m_reverseAPIPort != settings.m_reverseAPIPort) ||
|
||||
(m_settings.m_reverseAPIDeviceIndex != settings.m_reverseAPIDeviceIndex);
|
||||
webapiReverseSendSettings(reverseAPIKeys, settings, fullUpdate || force);
|
||||
webapiReverseSendSettings(deviceSettingsKeys, settings, fullUpdate || force);
|
||||
}
|
||||
|
||||
m_settings = settings;
|
||||
@@ -504,62 +531,75 @@ int TestMI::webapiSettingsPutPatch(
|
||||
(void) errorMessage;
|
||||
TestMISettings settings = m_settings;
|
||||
|
||||
if (deviceSettingsKeys.contains("centerFrequency")) {
|
||||
settings.m_centerFrequency = response.getTestMiSettings()->getCenterFrequency();
|
||||
if (deviceSettingsKeys.contains("streams"))
|
||||
{
|
||||
QList<SWGSDRangel::SWGTestMiStreamSettings*> *streamsSettings = response.getTestMiSettings()->getStreams();
|
||||
QList<SWGSDRangel::SWGTestMiStreamSettings*>::const_iterator it = streamsSettings->begin();
|
||||
|
||||
for (; it != streamsSettings->end(); ++it)
|
||||
{
|
||||
int istream = (*it)->getStreamIndex();
|
||||
|
||||
if (deviceSettingsKeys.contains(tr("streams[%1].centerFrequency").arg(istream))) {
|
||||
settings.m_streams[istream].m_centerFrequency = (*it)->getCenterFrequency();
|
||||
}
|
||||
if (deviceSettingsKeys.contains(tr("streams[%1].frequencyShift").arg(istream))) {
|
||||
settings.m_streams[istream].m_frequencyShift = (*it)->getFrequencyShift();
|
||||
}
|
||||
if (deviceSettingsKeys.contains(tr("streams[%1].sampleRate").arg(istream))) {
|
||||
settings.m_streams[istream].m_sampleRate = (*it)->getSampleRate();
|
||||
}
|
||||
if (deviceSettingsKeys.contains(tr("streams[%1].log2Decim").arg(istream))) {
|
||||
settings.m_streams[istream].m_log2Decim = (*it)->getLog2Decim();
|
||||
}
|
||||
if (deviceSettingsKeys.contains(tr("streams[%1].fcPos").arg(istream))) {
|
||||
int fcPos = (*it)->getFcPos();
|
||||
fcPos = fcPos < 0 ? 0 : fcPos > 2 ? 2 : fcPos;
|
||||
settings.m_streams[istream].m_fcPos = (TestMIStreamSettings::fcPos_t) fcPos;
|
||||
}
|
||||
if (deviceSettingsKeys.contains(tr("streams[%1].sampleSizeIndex").arg(istream))) {
|
||||
int sampleSizeIndex = (*it)->getSampleSizeIndex();
|
||||
sampleSizeIndex = sampleSizeIndex < 0 ? 0 : sampleSizeIndex > 1 ? 2 : sampleSizeIndex;
|
||||
settings.m_streams[istream].m_sampleSizeIndex = sampleSizeIndex;
|
||||
}
|
||||
if (deviceSettingsKeys.contains(tr("streams[%1].amplitudeBits").arg(istream))) {
|
||||
settings.m_streams[istream].m_amplitudeBits = (*it)->getAmplitudeBits();
|
||||
}
|
||||
if (deviceSettingsKeys.contains(tr("streams[%1].autoCorrOptions").arg(istream))) {
|
||||
int autoCorrOptions = (*it)->getAutoCorrOptions();
|
||||
autoCorrOptions = autoCorrOptions < 0 ? 0 : autoCorrOptions >= TestMIStreamSettings::AutoCorrLast ? TestMIStreamSettings::AutoCorrLast-1 : autoCorrOptions;
|
||||
settings.m_streams[istream].m_sampleSizeIndex = (TestMIStreamSettings::AutoCorrOptions) autoCorrOptions;
|
||||
}
|
||||
if (deviceSettingsKeys.contains(tr("streams[%1].modulation").arg(istream))) {
|
||||
int modulation = (*it)->getModulation();
|
||||
modulation = modulation < 0 ? 0 : modulation >= TestMIStreamSettings::ModulationLast ? TestMIStreamSettings::ModulationLast-1 : modulation;
|
||||
settings.m_streams[istream].m_modulation = (TestMIStreamSettings::Modulation) modulation;
|
||||
}
|
||||
if (deviceSettingsKeys.contains(tr("streams[%1].modulationTone").arg(istream))) {
|
||||
settings.m_streams[istream].m_modulationTone = (*it)->getModulationTone();
|
||||
}
|
||||
if (deviceSettingsKeys.contains(tr("streams[%1].amModulation").arg(istream))) {
|
||||
settings.m_streams[istream].m_amModulation = (*it)->getAmModulation();
|
||||
};
|
||||
if (deviceSettingsKeys.contains(tr("streams[%1].fmDeviation").arg(istream))) {
|
||||
settings.m_streams[istream].m_fmDeviation = (*it)->getFmDeviation();
|
||||
};
|
||||
if (deviceSettingsKeys.contains(tr("streams[%1].dcFactor").arg(istream))) {
|
||||
settings.m_streams[istream].m_dcFactor = (*it)->getDcFactor();
|
||||
};
|
||||
if (deviceSettingsKeys.contains(tr("streams[%1].iFactor").arg(istream))) {
|
||||
settings.m_streams[istream].m_iFactor = (*it)->getIFactor();
|
||||
};
|
||||
if (deviceSettingsKeys.contains(tr("streams[%1].qFactor").arg(istream))) {
|
||||
settings.m_streams[istream].m_qFactor = (*it)->getQFactor();
|
||||
};
|
||||
if (deviceSettingsKeys.contains(tr("streams[%1].phaseImbalance").arg(istream))) {
|
||||
settings.m_streams[istream].m_phaseImbalance = (*it)->getPhaseImbalance();
|
||||
};
|
||||
}
|
||||
|
||||
}
|
||||
if (deviceSettingsKeys.contains("frequencyShift")) {
|
||||
settings.m_frequencyShift = response.getTestMiSettings()->getFrequencyShift();
|
||||
}
|
||||
if (deviceSettingsKeys.contains("sampleRate")) {
|
||||
settings.m_sampleRate = response.getTestMiSettings()->getSampleRate();
|
||||
}
|
||||
if (deviceSettingsKeys.contains("log2Decim")) {
|
||||
settings.m_log2Decim = response.getTestMiSettings()->getLog2Decim();
|
||||
}
|
||||
if (deviceSettingsKeys.contains("fcPos")) {
|
||||
int fcPos = response.getTestMiSettings()->getFcPos();
|
||||
fcPos = fcPos < 0 ? 0 : fcPos > 2 ? 2 : fcPos;
|
||||
settings.m_fcPos = (TestMISettings::fcPos_t) fcPos;
|
||||
}
|
||||
if (deviceSettingsKeys.contains("sampleSizeIndex")) {
|
||||
int sampleSizeIndex = response.getTestMiSettings()->getSampleSizeIndex();
|
||||
sampleSizeIndex = sampleSizeIndex < 0 ? 0 : sampleSizeIndex > 1 ? 2 : sampleSizeIndex;
|
||||
settings.m_sampleSizeIndex = sampleSizeIndex;
|
||||
}
|
||||
if (deviceSettingsKeys.contains("amplitudeBits")) {
|
||||
settings.m_amplitudeBits = response.getTestMiSettings()->getAmplitudeBits();
|
||||
}
|
||||
if (deviceSettingsKeys.contains("autoCorrOptions")) {
|
||||
int autoCorrOptions = response.getTestMiSettings()->getAutoCorrOptions();
|
||||
autoCorrOptions = autoCorrOptions < 0 ? 0 : autoCorrOptions >= TestMISettings::AutoCorrLast ? TestMISettings::AutoCorrLast-1 : autoCorrOptions;
|
||||
settings.m_sampleSizeIndex = (TestMISettings::AutoCorrOptions) autoCorrOptions;
|
||||
}
|
||||
if (deviceSettingsKeys.contains("modulation")) {
|
||||
int modulation = response.getTestMiSettings()->getModulation();
|
||||
modulation = modulation < 0 ? 0 : modulation >= TestMISettings::ModulationLast ? TestMISettings::ModulationLast-1 : modulation;
|
||||
settings.m_modulation = (TestMISettings::Modulation) modulation;
|
||||
}
|
||||
if (deviceSettingsKeys.contains("modulationTone")) {
|
||||
settings.m_modulationTone = response.getTestMiSettings()->getModulationTone();
|
||||
}
|
||||
if (deviceSettingsKeys.contains("amModulation")) {
|
||||
settings.m_amModulation = response.getTestMiSettings()->getAmModulation();
|
||||
};
|
||||
if (deviceSettingsKeys.contains("fmDeviation")) {
|
||||
settings.m_fmDeviation = response.getTestMiSettings()->getFmDeviation();
|
||||
};
|
||||
if (deviceSettingsKeys.contains("dcFactor")) {
|
||||
settings.m_dcFactor = response.getTestMiSettings()->getDcFactor();
|
||||
};
|
||||
if (deviceSettingsKeys.contains("iFactor")) {
|
||||
settings.m_iFactor = response.getTestMiSettings()->getIFactor();
|
||||
};
|
||||
if (deviceSettingsKeys.contains("qFactor")) {
|
||||
settings.m_qFactor = response.getTestMiSettings()->getQFactor();
|
||||
};
|
||||
if (deviceSettingsKeys.contains("phaseImbalance")) {
|
||||
settings.m_phaseImbalance = response.getTestMiSettings()->getPhaseImbalance();
|
||||
};
|
||||
|
||||
if (deviceSettingsKeys.contains("fileRecordName")) {
|
||||
settings.m_fileRecordName = *response.getTestMiSettings()->getFileRecordName();
|
||||
}
|
||||
@@ -591,22 +631,32 @@ int TestMI::webapiSettingsPutPatch(
|
||||
|
||||
void TestMI::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response, const TestMISettings& settings)
|
||||
{
|
||||
response.getTestMiSettings()->setCenterFrequency(settings.m_centerFrequency);
|
||||
response.getTestMiSettings()->setFrequencyShift(settings.m_frequencyShift);
|
||||
response.getTestMiSettings()->setSampleRate(settings.m_sampleRate);
|
||||
response.getTestMiSettings()->setLog2Decim(settings.m_log2Decim);
|
||||
response.getTestMiSettings()->setFcPos((int) settings.m_fcPos);
|
||||
response.getTestMiSettings()->setSampleSizeIndex((int) settings.m_sampleSizeIndex);
|
||||
response.getTestMiSettings()->setAmplitudeBits(settings.m_amplitudeBits);
|
||||
response.getTestMiSettings()->setAutoCorrOptions((int) settings.m_autoCorrOptions);
|
||||
response.getTestMiSettings()->setModulation((int) settings.m_modulation);
|
||||
response.getTestMiSettings()->setModulationTone(settings.m_modulationTone);
|
||||
response.getTestMiSettings()->setAmModulation(settings.m_amModulation);
|
||||
response.getTestMiSettings()->setFmDeviation(settings.m_fmDeviation);
|
||||
response.getTestMiSettings()->setDcFactor(settings.m_dcFactor);
|
||||
response.getTestMiSettings()->setIFactor(settings.m_iFactor);
|
||||
response.getTestMiSettings()->setQFactor(settings.m_qFactor);
|
||||
response.getTestMiSettings()->setPhaseImbalance(settings.m_phaseImbalance);
|
||||
std::vector<TestMIStreamSettings>::const_iterator it = settings.m_streams.begin();
|
||||
int istream = 0;
|
||||
|
||||
for (; it != settings.m_streams.end(); ++it, istream++)
|
||||
{
|
||||
QList<SWGSDRangel::SWGTestMiStreamSettings*> *streams = response.getTestMiSettings()->getStreams();
|
||||
streams->append(new SWGSDRangel::SWGTestMiStreamSettings);
|
||||
streams->back()->init();
|
||||
streams->back()->setStreamIndex(istream);
|
||||
streams->back()->setCenterFrequency(it->m_centerFrequency);
|
||||
streams->back()->setFrequencyShift(it->m_frequencyShift);
|
||||
streams->back()->setSampleRate(it->m_sampleRate);
|
||||
streams->back()->setLog2Decim(it->m_log2Decim);
|
||||
streams->back()->setFcPos((int) it->m_fcPos);
|
||||
streams->back()->setSampleSizeIndex((int) it->m_sampleSizeIndex);
|
||||
streams->back()->setAmplitudeBits(it->m_amplitudeBits);
|
||||
streams->back()->setAutoCorrOptions((int) it->m_autoCorrOptions);
|
||||
streams->back()->setModulation((int) it->m_modulation);
|
||||
streams->back()->setModulationTone(it->m_modulationTone);
|
||||
streams->back()->setAmModulation(it->m_amModulation);
|
||||
streams->back()->setFmDeviation(it->m_fmDeviation);
|
||||
streams->back()->setDcFactor(it->m_dcFactor);
|
||||
streams->back()->setIFactor(it->m_iFactor);
|
||||
streams->back()->setQFactor(it->m_qFactor);
|
||||
streams->back()->setPhaseImbalance(it->m_phaseImbalance);
|
||||
}
|
||||
|
||||
if (response.getTestMiSettings()->getFileRecordName()) {
|
||||
*response.getTestMiSettings()->getFileRecordName() = settings.m_fileRecordName;
|
||||
@@ -626,7 +676,7 @@ void TestMI::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response
|
||||
response.getTestMiSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
|
||||
}
|
||||
|
||||
void TestMI::webapiReverseSendSettings(QList<QString>& deviceSettingsKeys, const TestMISettings& settings, bool force)
|
||||
void TestMI::webapiReverseSendSettings(const DeviceSettingsKeys& deviceSettingsKeys, const TestMISettings& settings, bool force)
|
||||
{
|
||||
SWGSDRangel::SWGDeviceSettings *swgDeviceSettings = new SWGSDRangel::SWGDeviceSettings();
|
||||
swgDeviceSettings->setDirection(0); // single Rx
|
||||
@@ -637,55 +687,71 @@ void TestMI::webapiReverseSendSettings(QList<QString>& deviceSettingsKeys, const
|
||||
|
||||
// transfer data that has been modified. When force is on transfer all data except reverse API data
|
||||
|
||||
if (deviceSettingsKeys.contains("centerFrequency") || force) {
|
||||
swgTestMISettings->setCenterFrequency(settings.m_centerFrequency);
|
||||
QList<QList<QString>>::const_iterator it = deviceSettingsKeys.m_streamsSettingsKeys.begin();
|
||||
int istream = 0;
|
||||
|
||||
for (; it != deviceSettingsKeys.m_streamsSettingsKeys.end(); ++it, istream++)
|
||||
{
|
||||
if ((it->size() > 0) || force)
|
||||
{
|
||||
QList<SWGSDRangel::SWGTestMiStreamSettings*> *streams = swgTestMISettings->getStreams();
|
||||
streams->append(new SWGSDRangel::SWGTestMiStreamSettings);
|
||||
streams->back()->init();
|
||||
streams->back()->setStreamIndex(istream);
|
||||
const QList<QString>& streamSettingsKeys = *it;
|
||||
|
||||
if (streamSettingsKeys.contains("centerFrequency") || force) {
|
||||
streams->back()->setCenterFrequency(settings.m_streams[istream].m_centerFrequency);
|
||||
}
|
||||
if (streamSettingsKeys.contains("frequencyShift") || force) {
|
||||
streams->back()->setFrequencyShift(settings.m_streams[istream].m_frequencyShift);
|
||||
}
|
||||
if (streamSettingsKeys.contains("sampleRate") || force) {
|
||||
streams->back()->setSampleRate(settings.m_streams[istream].m_sampleRate);
|
||||
}
|
||||
if (streamSettingsKeys.contains("log2Decim") || force) {
|
||||
streams->back()->setLog2Decim(settings.m_streams[istream].m_log2Decim);
|
||||
}
|
||||
if (streamSettingsKeys.contains("fcPos") || force) {
|
||||
streams->back()->setFcPos((int) settings.m_streams[istream].m_fcPos);
|
||||
}
|
||||
if (streamSettingsKeys.contains("sampleSizeIndex") || force) {
|
||||
streams->back()->setSampleSizeIndex(settings.m_streams[istream].m_sampleSizeIndex);
|
||||
}
|
||||
if (streamSettingsKeys.contains("amplitudeBits") || force) {
|
||||
streams->back()->setAmplitudeBits(settings.m_streams[istream].m_amplitudeBits);
|
||||
}
|
||||
if (streamSettingsKeys.contains("autoCorrOptions") || force) {
|
||||
streams->back()->setAutoCorrOptions((int) settings.m_streams[istream].m_sampleSizeIndex);
|
||||
}
|
||||
if (streamSettingsKeys.contains("modulation") || force) {
|
||||
streams->back()->setModulation((int) settings.m_streams[istream].m_modulation);
|
||||
}
|
||||
if (streamSettingsKeys.contains("modulationTone")) {
|
||||
streams->back()->setModulationTone(settings.m_streams[istream].m_modulationTone);
|
||||
}
|
||||
if (streamSettingsKeys.contains("amModulation") || force) {
|
||||
streams->back()->setAmModulation(settings.m_streams[istream].m_amModulation);
|
||||
};
|
||||
if (streamSettingsKeys.contains("fmDeviation") || force) {
|
||||
streams->back()->setFmDeviation(settings.m_streams[istream].m_fmDeviation);
|
||||
};
|
||||
if (streamSettingsKeys.contains("dcFactor") || force) {
|
||||
streams->back()->setDcFactor(settings.m_streams[istream].m_dcFactor);
|
||||
};
|
||||
if (streamSettingsKeys.contains("iFactor") || force) {
|
||||
streams->back()->setIFactor(settings.m_streams[istream].m_iFactor);
|
||||
};
|
||||
if (streamSettingsKeys.contains("qFactor") || force) {
|
||||
streams->back()->setQFactor(settings.m_streams[istream].m_qFactor);
|
||||
};
|
||||
if (streamSettingsKeys.contains("phaseImbalance") || force) {
|
||||
streams->back()->setPhaseImbalance(settings.m_streams[istream].m_phaseImbalance);
|
||||
};
|
||||
}
|
||||
}
|
||||
if (deviceSettingsKeys.contains("frequencyShift") || force) {
|
||||
swgTestMISettings->setFrequencyShift(settings.m_frequencyShift);
|
||||
}
|
||||
if (deviceSettingsKeys.contains("sampleRate") || force) {
|
||||
swgTestMISettings->setSampleRate(settings.m_sampleRate);
|
||||
}
|
||||
if (deviceSettingsKeys.contains("log2Decim") || force) {
|
||||
swgTestMISettings->setLog2Decim(settings.m_log2Decim);
|
||||
}
|
||||
if (deviceSettingsKeys.contains("fcPos") || force) {
|
||||
swgTestMISettings->setFcPos((int) settings.m_fcPos);
|
||||
}
|
||||
if (deviceSettingsKeys.contains("sampleSizeIndex") || force) {
|
||||
swgTestMISettings->setSampleSizeIndex(settings.m_sampleSizeIndex);
|
||||
}
|
||||
if (deviceSettingsKeys.contains("amplitudeBits") || force) {
|
||||
swgTestMISettings->setAmplitudeBits(settings.m_amplitudeBits);
|
||||
}
|
||||
if (deviceSettingsKeys.contains("autoCorrOptions") || force) {
|
||||
swgTestMISettings->setAutoCorrOptions((int) settings.m_sampleSizeIndex);
|
||||
}
|
||||
if (deviceSettingsKeys.contains("modulation") || force) {
|
||||
swgTestMISettings->setModulation((int) settings.m_modulation);
|
||||
}
|
||||
if (deviceSettingsKeys.contains("modulationTone")) {
|
||||
swgTestMISettings->setModulationTone(settings.m_modulationTone);
|
||||
}
|
||||
if (deviceSettingsKeys.contains("amModulation") || force) {
|
||||
swgTestMISettings->setAmModulation(settings.m_amModulation);
|
||||
};
|
||||
if (deviceSettingsKeys.contains("fmDeviation") || force) {
|
||||
swgTestMISettings->setFmDeviation(settings.m_fmDeviation);
|
||||
};
|
||||
if (deviceSettingsKeys.contains("dcFactor") || force) {
|
||||
swgTestMISettings->setDcFactor(settings.m_dcFactor);
|
||||
};
|
||||
if (deviceSettingsKeys.contains("iFactor") || force) {
|
||||
swgTestMISettings->setIFactor(settings.m_iFactor);
|
||||
};
|
||||
if (deviceSettingsKeys.contains("qFactor") || force) {
|
||||
swgTestMISettings->setQFactor(settings.m_qFactor);
|
||||
};
|
||||
if (deviceSettingsKeys.contains("phaseImbalance") || force) {
|
||||
swgTestMISettings->setPhaseImbalance(settings.m_phaseImbalance);
|
||||
};
|
||||
if (deviceSettingsKeys.contains("fileRecordName") || force) {
|
||||
|
||||
if (deviceSettingsKeys.m_commonSettingsKeys.contains("fileRecordName") || force) {
|
||||
swgTestMISettings->setFileRecordName(new QString(settings.m_fileRecordName));
|
||||
}
|
||||
|
||||
@@ -700,8 +766,6 @@ void TestMI::webapiReverseSendSettings(QList<QString>& deviceSettingsKeys, const
|
||||
buffer->open((QBuffer::ReadWrite));
|
||||
buffer->write(swgDeviceSettings->asJson().toUtf8());
|
||||
buffer->seek(0);
|
||||
// qDebug("TestMI::webapiReverseSendSettings: %s", channelSettingsURL.toStdString().c_str());
|
||||
// qDebug("TestMI::webapiReverseSendSettings: query:\n%s", swgDeviceSettings->asJson().toStdString().c_str());
|
||||
|
||||
// Always use PATCH to avoid passing reverse API settings
|
||||
m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer);
|
||||
|
||||
Reference in New Issue
Block a user