diff --git a/plugins/samplesink/xtrxoutput/xtrxoutput.cpp b/plugins/samplesink/xtrxoutput/xtrxoutput.cpp index a623cb212..bdeed42b5 100644 --- a/plugins/samplesink/xtrxoutput/xtrxoutput.cpp +++ b/plugins/samplesink/xtrxoutput/xtrxoutput.cpp @@ -776,6 +776,7 @@ bool XTRXOutput::applySettings(const XTRXOutputSettings& settings, bool force, b << " m_log2SoftInterp: " << m_settings.m_log2SoftInterp << " m_gain: " << m_settings.m_gain << " m_lpfBW: " << m_settings.m_lpfBW + << " m_pwrmode: " << m_settings.m_pwrmode << " m_ncoEnable: " << m_settings.m_ncoEnable << " m_ncoFrequency: " << m_settings.m_ncoFrequency << " m_antennaPath: " << m_settings.m_antennaPath diff --git a/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp b/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp index 9ae6fe5ca..8962fe39f 100644 --- a/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp +++ b/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp @@ -242,6 +242,15 @@ void XTRXOutputGUI::handleInputMessages() delete message; } + else if (XTRXOutput::MsgConfigureXTRX::match(*message)) + { + qDebug("XTRXOutputGUI::handleInputMessages: MsgConfigureXTRX"); + const XTRXOutput::MsgConfigureXTRX& cfg = (XTRXOutput::MsgConfigureXTRX&) *message; + m_settings = cfg.getSettings(); + displaySettings(); + + delete message; + } else { if (handleMessage(*message)) { @@ -283,6 +292,7 @@ void XTRXOutputGUI::displaySettings() updateDACRate(); ui->lpf->setValue(m_settings.m_lpfBW / 1000); + ui->pwrmode->setCurrentIndex(m_settings.m_pwrmode); ui->gain->setValue(m_settings.m_gain); ui->gainText->setText(tr("%1").arg(m_settings.m_gain)); diff --git a/plugins/samplesource/xtrxinput/xtrxinput.cpp b/plugins/samplesource/xtrxinput/xtrxinput.cpp index c634e4aed..28684e9ec 100644 --- a/plugins/samplesource/xtrxinput/xtrxinput.cpp +++ b/plugins/samplesource/xtrxinput/xtrxinput.cpp @@ -866,6 +866,25 @@ bool XTRXInput::applySettings(const XTRXInputSettings& settings, bool force, boo // apply settings + qDebug() << "XTRXInput::applySettings: center freq: " << m_settings.m_centerFrequency << " Hz" + << " device stream sample rate: " << getDevSampleRate() << "S/s" + << " sample rate with soft decimation: " << getSampleRate() << "S/s" + << " m_devSampleRate: " << m_settings.m_devSampleRate + << " m_dcBlock: " << m_settings.m_dcBlock + << " m_iqCorrection: " << m_settings.m_iqCorrection + << " m_log2SoftDecim: " << m_settings.m_log2SoftDecim + << " m_gain: " << m_settings.m_gain + << " m_lpfBW: " << m_settings.m_lpfBW + << " m_pwrmode: " << m_settings.m_pwrmode + << " m_ncoEnable: " << m_settings.m_ncoEnable + << " m_ncoFrequency: " << m_settings.m_ncoFrequency + << " m_antennaPath: " << m_settings.m_antennaPath + << " m_extClock: " << m_settings.m_extClock + << " m_extClockFreq: " << m_settings.m_extClockFreq + << " force: " << force + << " forceNCOFrequency: " << forceNCOFrequency + << " doLPCalibration: " << doLPCalibration; + if ((m_settings.m_dcBlock != settings.m_dcBlock) || force) { reverseAPIKeys.append("dcBlock"); @@ -1300,22 +1319,6 @@ bool XTRXInput::applySettings(const XTRXInputSettings& settings, bool force, boo } } - qDebug() << "XTRXInput::applySettings: center freq: " << m_settings.m_centerFrequency << " Hz" - << " device stream sample rate: " << getDevSampleRate() << "S/s" - << " sample rate with soft decimation: " << getSampleRate() << "S/s" - << " m_devSampleRate: " << m_settings.m_devSampleRate - << " m_log2SoftDecim: " << m_settings.m_log2SoftDecim - << " m_gain: " << m_settings.m_gain - << " m_lpfBW: " << m_settings.m_lpfBW - << " m_ncoEnable: " << m_settings.m_ncoEnable - << " m_ncoFrequency: " << m_settings.m_ncoFrequency - << " m_antennaPath: " << m_settings.m_antennaPath - << " m_extClock: " << m_settings.m_extClock - << " m_extClockFreq: " << m_settings.m_extClockFreq - << " force: " << force - << " forceNCOFrequency: " << forceNCOFrequency - << " doLPCalibration: " << doLPCalibration; - return true; } diff --git a/plugins/samplesource/xtrxinput/xtrxinputgui.cpp b/plugins/samplesource/xtrxinput/xtrxinputgui.cpp index 679aef884..89940ce37 100644 --- a/plugins/samplesource/xtrxinput/xtrxinputgui.cpp +++ b/plugins/samplesource/xtrxinput/xtrxinputgui.cpp @@ -244,6 +244,15 @@ void XTRXInputGUI::handleInputMessages() delete message; } + else if (XTRXInput::MsgConfigureXTRX::match(*message)) + { + qDebug("XTRXInputGUI::handleInputMessages: MsgConfigureXTRX"); + const XTRXInput::MsgConfigureXTRX& cfg = (XTRXInput::MsgConfigureXTRX&) *message; + m_settings = cfg.getSettings(); + displaySettings(); + + delete message; + } else { if (handleMessage(*message)) { @@ -288,6 +297,7 @@ void XTRXInputGUI::displaySettings() updateADCRate(); ui->lpf->setValue(m_settings.m_lpfBW / 1000); + ui->pwrmode->setCurrentIndex(m_settings.m_pwrmode); ui->gain->setValue(m_settings.m_gain); ui->gainText->setText(tr("%1").arg(m_settings.m_gain));