VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

PlutoSDR input/output: do not apply settings to self when coming from a buddy change. Fixes #1690

This commit is contained in:
f4exb 2023-07-11 11:44:25 +02:00
parent d1116b564a
commit c4debeef8e
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/samplesink/plutosdroutput/plutosdroutput.cpp
View File

@ -210,14 +210,14 @@ bool PlutoSDROutput::handleMessage(const Message& message)
else if (DevicePlutoSDRShared::MsgCrossReportToBuddy::match(message)) // message from buddy
{
DevicePlutoSDRShared::MsgCrossReportToBuddy& conf = (DevicePlutoSDRShared::MsgCrossReportToBuddy&) message;
m_settings.m_devSampleRate = conf.getDevSampleRate();
m_settings.m_lpfFIRlog2Interp = conf.getLpfFiRlog2IntDec();
m_settings.m_lpfFIRBW = conf.getLpfFirbw();
m_settings.m_LOppmTenths = conf.getLoPPMTenths();
PlutoSDROutputSettings newSettings = m_settings;
newSettings.m_devSampleRate = conf.getDevSampleRate();
newSettings.m_lpfFIRlog2Interp = conf.getLpfFiRlog2IntDec();
newSettings.m_lpfFIRBW = conf.getLpfFirbw();
newSettings.m_LOppmTenths = conf.getLoPPMTenths();
newSettings.m_lpfFIREnable = conf.isLpfFirEnable();
applySettings(newSettings, QList<QString>{"devSampleRate", "lpfFIRlog2Interp", "lpfFIRBW", "LOppmTenths", "lpfFIREnable"});
m_settings.applySettings(QList<QString>{"devSampleRate", "lpfFIRlog2Interp", "lpfFIRBW", "LOppmTenths", "lpfFIREnable"}, newSettings);
return true;
}

11
plugins/samplesource/plutosdrinput/plutosdrinput.cpp
View File

@ -234,13 +234,14 @@ bool PlutoSDRInput::handleMessage(const Message& message)
else if (DevicePlutoSDRShared::MsgCrossReportToBuddy::match(message)) // message from buddy
{
DevicePlutoSDRShared::MsgCrossReportToBuddy& conf = (DevicePlutoSDRShared::MsgCrossReportToBuddy&) message;
m_settings.m_devSampleRate = conf.getDevSampleRate();
m_settings.m_lpfFIRlog2Decim = conf.getLpfFiRlog2IntDec();
m_settings.m_lpfFIRBW = conf.getLpfFirbw();
m_settings.m_LOppmTenths = conf.getLoPPMTenths();
PlutoSDRInputSettings newSettings = m_settings;
newSettings.m_devSampleRate = conf.getDevSampleRate();
newSettings.m_lpfFIRlog2Decim = conf.getLpfFiRlog2IntDec();
newSettings.m_lpfFIRBW = conf.getLpfFirbw();
newSettings.m_LOppmTenths = conf.getLoPPMTenths();
newSettings.m_lpfFIREnable = conf.isLpfFirEnable();
applySettings(newSettings, QList<QString>{"devSampleRate", "lpfFIRlog2Decim", "lpfFIRBW", "LOppmTenths", "lpfFIREnable"});
m_settings.applySettings(QList<QString>{"devSampleRate", "lpfFIRlog2Decim", "lpfFIRBW", "LOppmTenths", "lpfFIREnable"}, newSettings);
return true;
}