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

Test source: Make settings assignments atomic. Part of #1329

Browse Source
This commit is contained in:
f4exb
2022-10-29 19:18:45 +02:00
parent cd656a1dee
commit 922cfc695e
6 changed files with 224 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/testsource/testsourceinput.cpp
+50 -72
View File
@@ -80,7 +80,7 @@ void TestSourceInput::destroy()
void TestSourceInput::init()
{
applySettings(m_settings, true);
applySettings(m_settings, QList<QString>(), true);
}
bool TestSourceInput::start()
@@ -111,7 +111,7 @@ bool TestSourceInput::start()
mutexLocker.unlock();
applySettings(m_settings, true);
applySettings(m_settings, QList<QString>(), true);
return true;
}
@@ -146,12 +146,12 @@ bool TestSourceInput::deserialize(const QByteArray& data)
success = false;
}
MsgConfigureTestSource* message = MsgConfigureTestSource::create(m_settings, true);
MsgConfigureTestSource* message = MsgConfigureTestSource::create(m_settings, QList<QString>(), true);
m_inputMessageQueue.push(message);
if (m_guiMessageQueue)
{
MsgConfigureTestSource* messageToGUI = MsgConfigureTestSource::create(m_settings, true);
MsgConfigureTestSource* messageToGUI = MsgConfigureTestSource::create(m_settings, QList<QString>(), true);
m_guiMessageQueue->push(messageToGUI);
}
@@ -178,12 +178,12 @@ void TestSourceInput::setCenterFrequency(qint64 centerFrequency)
TestSourceSettings settings = m_settings;
settings.m_centerFrequency = centerFrequency;
MsgConfigureTestSource* message = MsgConfigureTestSource::create(settings, false);
MsgConfigureTestSource* message = MsgConfigureTestSource::create(settings, QList<QString>{"centerFrequency"}, false);
m_inputMessageQueue.push(message);
if (m_guiMessageQueue)
{
MsgConfigureTestSource* messageToGUI = MsgConfigureTestSource::create(settings, false);
MsgConfigureTestSource* messageToGUI = MsgConfigureTestSource::create(settings, QList<QString>{"centerFrequency"}, false);
m_guiMessageQueue->push(messageToGUI);
}
}
@@ -195,7 +195,7 @@ bool TestSourceInput::handleMessage(const Message& message)
MsgConfigureTestSource& conf = (MsgConfigureTestSource&) message;
qDebug() << "TestSourceInput::handleMessage: MsgConfigureTestSource";
bool success = applySettings(conf.getSettings(), conf.getForce());
bool success = applySettings(conf.getSettings(), conf.getSettingsKeys(), conf.getForce());
if (!success)
{
@@ -233,14 +233,12 @@ bool TestSourceInput::handleMessage(const Message& message)
}
}
bool TestSourceInput::applySettings(const TestSourceSettings& settings, bool force)
bool TestSourceInput::applySettings(const TestSourceSettings& settings, const QList<QString>& settingsKeys, bool force)
{
QList<QString> reverseAPIKeys;
qDebug() << "TestSourceInput::applySettings: force:" << force << settings.getDebugString(settingsKeys, force);
if ((m_settings.m_autoCorrOptions != settings.m_autoCorrOptions) || force)
if (settingsKeys.contains("autoCorrOptions") || force)
{
reverseAPIKeys.append("autoCorrOptions");
switch(settings.m_autoCorrOptions)
{
case TestSourceSettings::AutoCorrDC:
@@ -256,10 +254,8 @@ bool TestSourceInput::applySettings(const TestSourceSettings& settings, bool for
}
}
if ((m_settings.m_sampleRate != settings.m_sampleRate) || force)
if (settingsKeys.contains("sampleRate") || force)
{
reverseAPIKeys.append("sampleRate");
if (m_testSourceWorker != 0)
{
m_testSourceWorker->setSamplerate(settings.m_sampleRate);
@@ -267,10 +263,8 @@ bool TestSourceInput::applySettings(const TestSourceSettings& settings, bool for
}
}
if ((m_settings.m_log2Decim != settings.m_log2Decim) || force)
if (settingsKeys.contains("log2Decim") || force)
{
reverseAPIKeys.append("log2Decim");
if (m_testSourceWorker != 0)
{
m_testSourceWorker->setLog2Decimation(settings.m_log2Decim);
@@ -278,16 +272,12 @@ bool TestSourceInput::applySettings(const TestSourceSettings& settings, bool for
}
}
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)
if (settingsKeys.contains("centerFrequency")
|| settingsKeys.contains("fcPos")
|| settingsKeys.contains("frequencyShift")
|| settingsKeys.contains("sampleRate")
|| settingsKeys.contains("log2Decim") || force)
{
reverseAPIKeys.append("centerFrequency");
reverseAPIKeys.append("fcPos");
reverseAPIKeys.append("frequencyShift");
qint64 deviceCenterFrequency = DeviceSampleSource::calculateDeviceCenterFrequency(
settings.m_centerFrequency,
0, // no transverter mode
@@ -322,83 +312,71 @@ bool TestSourceInput::applySettings(const TestSourceSettings& settings, bool for
}
}
if ((m_settings.m_amplitudeBits != settings.m_amplitudeBits) || force)
if (settingsKeys.contains("amplitudeBits") || force)
{
reverseAPIKeys.append("amplitudeBits");
if (m_testSourceWorker != 0) {
m_testSourceWorker->setAmplitudeBits(settings.m_amplitudeBits);
}
}
if ((m_settings.m_dcFactor != settings.m_dcFactor) || force)
if (settingsKeys.contains("dcFactor") || force)
{
reverseAPIKeys.append("dcFactor");
if (m_testSourceWorker != 0) {
m_testSourceWorker->setDCFactor(settings.m_dcFactor);
}
}
if ((m_settings.m_iFactor != settings.m_iFactor) || force)
if (settingsKeys.contains("iFactor") || force)
{
reverseAPIKeys.append("iFactor");
if (m_testSourceWorker != 0) {
m_testSourceWorker->setIFactor(settings.m_iFactor);
}
}
if ((m_settings.m_qFactor != settings.m_qFactor) || force)
if (settingsKeys.contains("qFactor") || force)
{
reverseAPIKeys.append("qFactor");
if (m_testSourceWorker != 0) {
m_testSourceWorker->setQFactor(settings.m_qFactor);
}
}
if ((m_settings.m_phaseImbalance != settings.m_phaseImbalance) || force)
if (settingsKeys.contains("phaseImbalance") || force)
{
reverseAPIKeys.append("phaseImbalance");
if (m_testSourceWorker != 0) {
m_testSourceWorker->setPhaseImbalance(settings.m_phaseImbalance);
}
}
if ((m_settings.m_sampleSizeIndex != settings.m_sampleSizeIndex) || force)
if (settingsKeys.contains("sampleSizeIndex") || force)
{
reverseAPIKeys.append("sampleSizeIndex");
if (m_testSourceWorker != 0) {
m_testSourceWorker->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)
// 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)
if (settingsKeys.contains("sampleRate")
|| settingsKeys.contains("centerFrequency")
|| settingsKeys.contains("log2Decim")
|| settingsKeys.contains("fcPos") || force)
{
int sampleRate = settings.m_sampleRate/(1<<settings.m_log2Decim);
DSPSignalNotification *notif = new DSPSignalNotification(sampleRate, settings.m_centerFrequency);
m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
}
if ((m_settings.m_modulationTone != settings.m_modulationTone) || force)
if (settingsKeys.contains("modulationTone") || force)
{
reverseAPIKeys.append("modulationTone");
if (m_testSourceWorker != 0) {
m_testSourceWorker->setToneFrequency(settings.m_modulationTone * 10);
}
}
if ((m_settings.m_modulation != settings.m_modulation) || force)
if (settingsKeys.contains("modulation") || force)
{
reverseAPIKeys.append("modulation");
if (m_testSourceWorker != 0)
{
m_testSourceWorker->setModulation(settings.m_modulation);
@@ -413,35 +391,35 @@ bool TestSourceInput::applySettings(const TestSourceSettings& settings, bool for
}
}
if ((m_settings.m_amModulation != settings.m_amModulation) || force)
if (settingsKeys.contains("amModulation") || force)
{
reverseAPIKeys.append("amModulation");
if (m_testSourceWorker != 0) {
m_testSourceWorker->setAMModulation(settings.m_amModulation / 100.0f);
}
}
if ((m_settings.m_fmDeviation != settings.m_fmDeviation) || force)
if (settingsKeys.contains("fmDeviation") || force)
{
reverseAPIKeys.append("fmDeviation");
if (m_testSourceWorker != 0) {
m_testSourceWorker->setFMDeviation(settings.m_fmDeviation * 100.0f);
}
}
if (settings.m_useReverseAPI)
if (settingsKeys.contains("useReverseAPI"))
{
qDebug("TestSourceInput::applySettings: call webapiReverseSendSettings");
bool fullUpdate = ((m_settings.m_useReverseAPI != settings.m_useReverseAPI) && settings.m_useReverseAPI) ||
(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);
bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) ||
settingsKeys.contains("reverseAPIAddress") ||
settingsKeys.contains("reverseAPIPort") ||
settingsKeys.contains("reverseAPIDeviceIndex");
webapiReverseSendSettings(settingsKeys, settings, fullUpdate || force);
}
if (force) {
m_settings = settings;
} else {
m_settings.applySettings(settingsKeys, settings);
}
m_settings = settings;
return true;
}
@@ -494,12 +472,12 @@ int TestSourceInput::webapiSettingsPutPatch(
TestSourceSettings settings = m_settings;
webapiUpdateDeviceSettings(settings, deviceSettingsKeys, response);
MsgConfigureTestSource *msg = MsgConfigureTestSource::create(settings, force);
MsgConfigureTestSource *msg = MsgConfigureTestSource::create(settings, deviceSettingsKeys, force);
m_inputMessageQueue.push(msg);
if (m_guiMessageQueue) // forward to GUI if any
{
MsgConfigureTestSource *msgToGUI = MsgConfigureTestSource::create(settings, force);
MsgConfigureTestSource *msgToGUI = MsgConfigureTestSource::create(settings, deviceSettingsKeys, force);
m_guiMessageQueue->push(msgToGUI);
}
@@ -613,7 +591,7 @@ void TestSourceInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings&
response.getTestSourceSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
}
void TestSourceInput::webapiReverseSendSettings(QList<QString>& deviceSettingsKeys, const TestSourceSettings& settings, bool force)
void TestSourceInput::webapiReverseSendSettings(const QList<QString>& deviceSettingsKeys, const TestSourceSettings& settings, bool force)
{
SWGSDRangel::SWGDeviceSettings *swgDeviceSettings = new SWGSDRangel::SWGDeviceSettings();
swgDeviceSettings->setDirection(0); // single Rx