VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-06 15:17:48 -04:00
Code Issues Projects Releases Wiki Activity

PlutoSDR output: use settings in modulator (2)

Browse Source
This commit is contained in:
f4exb 2017-10-10 21:38:38 +02:00
parent 558249112b
commit 7c4f97827e
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/channeltx/modam/ammod.cpp
View File

@ -274,15 +274,18 @@ bool AMMod::handleMessage(const Message& cmd)
m_config.m_outputSampleRate = notif.getSampleRate(); m_config.m_outputSampleRate = notif.getSampleRate();
m_config.m_inputFrequencyOffset = notif.getFrequencyOffset(); m_config.m_inputFrequencyOffset = notif.getFrequencyOffset();
m_settings.m_outputSampleRate = notif.getSampleRate(); AMModSettings settings = m_settings;
m_settings.m_inputFrequencyOffset = notif.getFrequencyOffset();
apply(); settings.m_basebandSampleRate = notif.getBasebandSampleRate();
settings.m_outputSampleRate = notif.getSampleRate();
settings.m_inputFrequencyOffset = notif.getFrequencyOffset();
applySettings(settings);
qDebug() << "AMMod::handleMessage: MsgChannelizerNotification:" qDebug() << "AMMod::handleMessage: MsgChannelizerNotification:"
<< " m_basebandSampleRate: " << m_config.m_basebandSampleRate << " m_basebandSampleRate: " << settings.m_basebandSampleRate
<< " m_outputSampleRate: " << m_config.m_outputSampleRate << " m_outputSampleRate: " << settings.m_outputSampleRate
<< " m_inputFrequencyOffset: " << m_config.m_inputFrequencyOffset; << " m_inputFrequencyOffset: " << settings.m_inputFrequencyOffset;
return true; return true;
} }
@ -293,12 +296,16 @@ bool AMMod::handleMessage(const Message& cmd)
AMModSettings settings = cfg.getSettings(); AMModSettings settings = cfg.getSettings();
// These settings are set with DownChannelizer::MsgChannelizerNotification // These settings are set with DownChannelizer::MsgChannelizerNotification
settings.m_basebandSampleRate = m_settings.m_basebandSampleRate;
settings.m_outputSampleRate = m_settings.m_outputSampleRate; settings.m_outputSampleRate = m_settings.m_outputSampleRate;
settings.m_inputFrequencyOffset = m_settings.m_inputFrequencyOffset; settings.m_inputFrequencyOffset = m_settings.m_inputFrequencyOffset;
applySettings(settings, cfg.getForce()); applySettings(settings, cfg.getForce());
qDebug() << "AMMod::handleMessage: MsgConfigureAMMod:" qDebug() << "AMMod::handleMessage: MsgConfigureAMMod:"
<< " m_basebandSampleRate: " << settings.m_basebandSampleRate
<< " m_outputSampleRate: " << settings.m_outputSampleRate
<< " m_inputFrequencyOffset: " << settings.m_inputFrequencyOffset
<< " m_rfBandwidth: " << settings.m_rfBandwidth << " m_rfBandwidth: " << settings.m_rfBandwidth
<< " m_modFactor: " << settings.m_modFactor << " m_modFactor: " << settings.m_modFactor
<< " m_toneFrequency: " << settings.m_toneFrequency << " m_toneFrequency: " << settings.m_toneFrequency

18
plugins/channeltx/modam/ammodgui.cpp
View File

@ -409,16 +409,16 @@ void AMModGUI::applySettings(bool force __attribute((unused)))
ui->deltaFrequency->setValue(m_channelMarker.getCenterFrequency()); ui->deltaFrequency->setValue(m_channelMarker.getCenterFrequency());
// AMMod::MsgConfigureAMMod* message = AMMod::MsgConfigureAMMod::create( m_settings, force); AMMod::MsgConfigureAMMod* message = AMMod::MsgConfigureAMMod::create( m_settings, force);
// m_amMod->getInputMessageQueue()->push(message); m_amMod->getInputMessageQueue()->push(message);
m_amMod->configure(m_amMod->getInputMessageQueue(), // m_amMod->configure(m_amMod->getInputMessageQueue(),
m_settings.m_rfBandwidth, // m_settings.m_rfBandwidth,
m_settings.m_modFactor, // m_settings.m_modFactor,
m_settings.m_toneFrequency, // m_settings.m_toneFrequency,
m_settings.m_volumeFactor, // m_settings.m_volumeFactor,
m_settings.m_channelMute, // m_settings.m_channelMute,
m_settings.m_playLoop); // m_settings.m_playLoop);
} }
} }