VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-29 05:22:25 -04:00
Code Issues Projects Releases Wiki Activity

Metis MISO: set s[ectrum sink input back in GUI. Fixes #1145

Browse Source
This commit is contained in:
f4exb 2022-02-11 01:04:09 +01:00
parent fce235b2bc
commit 04ed8d3d0b
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/samplemimo/metismiso/metismiso.cpp
View File

@ -312,8 +312,8 @@ bool MetisMISO::applySettings(const MetisMISOSettings& settings, bool force)
<< " m_dcBlock:" << settings.m_dcBlock << " m_dcBlock:" << settings.m_dcBlock
<< " m_iqCorrection:" << settings.m_iqCorrection << " m_iqCorrection:" << settings.m_iqCorrection
<< " m_txDrive:" << settings.m_txDrive << " m_txDrive:" << settings.m_txDrive
<< " m_streamIndex:" << m_settings.m_streamIndex << " m_streamIndex:" << settings.m_streamIndex
<< " m_spectrumStreamIndex:" << m_settings.m_spectrumStreamIndex << " m_spectrumStreamIndex:" << settings.m_spectrumStreamIndex
<< " m_useReverseAPI: " << settings.m_useReverseAPI << " m_useReverseAPI: " << settings.m_useReverseAPI
<< " m_reverseAPIAddress: " << settings.m_reverseAPIAddress << " m_reverseAPIAddress: " << settings.m_reverseAPIAddress
<< " m_reverseAPIPort: " << settings.m_reverseAPIPort << " m_reverseAPIPort: " << settings.m_reverseAPIPort
@ -448,15 +448,8 @@ bool MetisMISO::applySettings(const MetisMISOSettings& settings, bool force)
reverseAPIKeys.append("streamIndex"); reverseAPIKeys.append("streamIndex");
} }
if ((m_settings.m_spectrumStreamIndex != settings.m_spectrumStreamIndex) || force) if ((m_settings.m_spectrumStreamIndex != settings.m_spectrumStreamIndex) || force) {
{
reverseAPIKeys.append("spectrumStreamIndex"); reverseAPIKeys.append("spectrumStreamIndex");
if (settings.m_spectrumStreamIndex < MetisMISOSettings::m_maxReceivers) {
m_deviceAPI->setSpectrumSinkInput(true, m_settings.m_spectrumStreamIndex);
} else {
m_deviceAPI->setSpectrumSinkInput(false, 0);
}
} }
if (propagateSettings) { if (propagateSettings) {

4
plugins/samplemimo/metismiso/metismisogui.cpp
View File

@ -138,11 +138,13 @@ void MetisMISOGui::on_streamIndex_currentIndexChanged(int index)
if (m_settings.m_spectrumStreamIndex < MetisMISOSettings::m_maxReceivers) if (m_settings.m_spectrumStreamIndex < MetisMISOSettings::m_maxReceivers)
{ {
m_deviceUISet->m_spectrum->setDisplayedStream(true, index); m_deviceUISet->m_spectrum->setDisplayedStream(true, index);
m_deviceUISet->m_deviceAPI->setSpectrumSinkInput(true, m_settings.m_spectrumStreamIndex);
m_deviceUISet->setSpectrumScalingFactor(SDR_RX_SCALEF); m_deviceUISet->setSpectrumScalingFactor(SDR_RX_SCALEF);
} }
else else
{ {
m_deviceUISet->m_spectrum->setDisplayedStream(false, 0); m_deviceUISet->m_spectrum->setDisplayedStream(false, 0);
m_deviceUISet->m_deviceAPI->setSpectrumSinkInput(false, 0);
m_deviceUISet->setSpectrumScalingFactor(SDR_TX_SCALEF); m_deviceUISet->setSpectrumScalingFactor(SDR_TX_SCALEF);
} }
@ -168,11 +170,13 @@ void MetisMISOGui::on_spectrumSource_currentIndexChanged(int index)
if (m_settings.m_spectrumStreamIndex < MetisMISOSettings::m_maxReceivers) if (m_settings.m_spectrumStreamIndex < MetisMISOSettings::m_maxReceivers)
{ {
m_deviceUISet->m_spectrum->setDisplayedStream(true, index); m_deviceUISet->m_spectrum->setDisplayedStream(true, index);
m_deviceUISet->m_deviceAPI->setSpectrumSinkInput(true, m_settings.m_spectrumStreamIndex);
m_deviceUISet->setSpectrumScalingFactor(SDR_RX_SCALEF); m_deviceUISet->setSpectrumScalingFactor(SDR_RX_SCALEF);
} }
else else
{ {
m_deviceUISet->m_spectrum->setDisplayedStream(false, 0); m_deviceUISet->m_spectrum->setDisplayedStream(false, 0);
m_deviceUISet->m_deviceAPI->setSpectrumSinkInput(false, 0);
m_deviceUISet->setSpectrumScalingFactor(SDR_TX_SCALEF); m_deviceUISet->setSpectrumScalingFactor(SDR_TX_SCALEF);
} }