VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-18 07:35:47 -05:00
Code Issues Projects Releases Wiki Activity

SDRPlay plugin: use mixer buffer gain in AM bands in place of LNA

Browse Source
This commit is contained in:
f4exb 2016-11-19 23:25:57 +01:00
parent f7b52cfcc6
commit 0a618e9f0b
1 changed files with 50 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
plugins/samplesource/sdrplay/sdrplayinput.cpp
View File

@ -236,7 +236,7 @@ bool SDRPlayInput::applySettings(const SDRPlaySettings& settings, bool forwardCh
forceGainSetting = true; forceGainSetting = true;
} }
if (m_settings.m_tunerGainMode) if (m_settings.m_tunerGainMode) // auto
{ {
if ((m_settings.m_tunerGain != settings.m_tunerGain) || forceGainSetting) if ((m_settings.m_tunerGain != settings.m_tunerGain) || forceGainSetting)
{ {
@ -252,18 +252,30 @@ bool SDRPlayInput::applySettings(const SDRPlaySettings& settings, bool forwardCh
} }
else else
{ {
int lnaGain;
if (m_settings.m_frequencyBandIndex < 3) // bands using AM mode
{
lnaGain = mirisdr_get_mixbuffer_gain(m_dev);
}
else
{
lnaGain = mirisdr_get_lna_gain(m_dev);
}
MsgReportSDRPlayGains *message = MsgReportSDRPlayGains::create( MsgReportSDRPlayGains *message = MsgReportSDRPlayGains::create(
mirisdr_get_lna_gain(m_dev), lnaGain,
mirisdr_get_mixer_gain(m_dev), mirisdr_get_mixer_gain(m_dev),
mirisdr_get_baseband_gain(m_dev), mirisdr_get_baseband_gain(m_dev),
mirisdr_get_tuner_gain(m_dev) mirisdr_get_tuner_gain(m_dev)
); );
getOutputMessageQueueToGUI()->push(message); getOutputMessageQueueToGUI()->push(message);
} }
} }
} }
} }
else else // manual
{ {
bool anyChange = false; bool anyChange = false;
@ -271,16 +283,33 @@ bool SDRPlayInput::applySettings(const SDRPlaySettings& settings, bool forwardCh
{ {
if(m_dev != 0) if(m_dev != 0)
{ {
int r = mirisdr_set_lna_gain(m_dev, settings.m_lnaOn ? 0 : 1); // mirisdr_set_lna_gain takes gain reduction if (m_settings.m_frequencyBandIndex < 3) // bands using AM mode
if (r != 0)
{ {
qDebug("SDRPlayInput::applySettings: could not set LNA gain"); int r = mirisdr_set_mixbuffer_gain(m_dev, settings.m_lnaOn ? 0 : 1); // mirisdr_set_mixbuffer_gain takes gain reduction
if (r != 0)
{
qDebug("SDRPlayInput::applySettings: could not set mixer buffer gain");
}
else
{
m_settings.m_lnaOn = settings.m_lnaOn;
anyChange = true;
}
} }
else else
{ {
m_settings.m_lnaOn = settings.m_lnaOn; int r = mirisdr_set_lna_gain(m_dev, settings.m_lnaOn ? 0 : 1); // mirisdr_set_lna_gain takes gain reduction
anyChange = true;
if (r != 0)
{
qDebug("SDRPlayInput::applySettings: could not set LNA gain");
}
else
{
m_settings.m_lnaOn = settings.m_lnaOn;
anyChange = true;
}
} }
} }
} }
@ -323,8 +352,19 @@ bool SDRPlayInput::applySettings(const SDRPlaySettings& settings, bool forwardCh
if (anyChange) if (anyChange)
{ {
int lnaGain;
if (m_settings.m_frequencyBandIndex < 3) // bands using AM mode
{
lnaGain = mirisdr_get_mixbuffer_gain(m_dev);
}
else
{
mirisdr_get_lna_gain(m_dev);
}
MsgReportSDRPlayGains *message = MsgReportSDRPlayGains::create( MsgReportSDRPlayGains *message = MsgReportSDRPlayGains::create(
mirisdr_get_lna_gain(m_dev), lnaGain,
mirisdr_get_mixer_gain(m_dev), mirisdr_get_mixer_gain(m_dev),
mirisdr_get_baseband_gain(m_dev), mirisdr_get_baseband_gain(m_dev),
mirisdr_get_tuner_gain(m_dev) mirisdr_get_tuner_gain(m_dev)