VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-07 08:24:43 -04:00
Code Issues Projects Releases Wiki Activity

SoapySDR support: fixed tunable elements inital settings

Browse Source
This commit is contained in:
f4exb
2018-11-15 22:25:33 +01:00
parent cb9d300109
commit 2ab09f7e6c
6 changed files with 70 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesink/soapysdroutput/soapysdroutput.cpp
+32
View File
@@ -44,6 +44,7 @@ SoapySDROutput::SoapySDROutput(DeviceSinkAPI *deviceAPI) :
{
openDevice();
initGainSettings(m_settings);
initTunableElementsSettings(m_settings);
initStreamArgSettings(m_settings);
initDeviceArgSettings(m_settings);
}
@@ -263,6 +264,26 @@ void SoapySDROutput::initGainSettings(SoapySDROutputSettings& settings)
updateGains(m_deviceShared.m_device, m_deviceShared.m_channel, settings);
}
void SoapySDROutput::initTunableElementsSettings(SoapySDROutputSettings& settings)
{
const DeviceSoapySDRParams::ChannelSettings* channelSettings = m_deviceShared.m_deviceParams->getTxChannelSettings(m_deviceShared.m_channel);
settings.m_tunableElements.clear();
bool first = true;
for (const auto &it : channelSettings->m_frequencySettings)
{
if (first)
{
first = false;
continue;
}
settings.m_tunableElements[QString(it.m_name.c_str())] = 0.0;
}
updateTunableElements(m_deviceShared.m_device, m_deviceShared.m_channel, settings);
}
const SoapySDR::ArgInfoList& SoapySDROutput::getStreamArgInfoList()
{
const DeviceSoapySDRParams::ChannelSettings* channelSettings = m_deviceShared.m_deviceParams->getTxChannelSettings(m_deviceShared.m_channel);
@@ -692,6 +713,17 @@ void SoapySDROutput::updateGains(SoapySDR::Device *dev, int requestedChannel, So
}
}
void SoapySDROutput::updateTunableElements(SoapySDR::Device *dev, int requestedChannel, SoapySDROutputSettings& settings)
{
if (dev == 0) {
return;
}
for (const auto &name : settings.m_tunableElements.keys()) {
settings.m_tunableElements[name] = dev->getFrequency(SOAPY_SDR_TX, requestedChannel, name.toStdString());
}
}
bool SoapySDROutput::handleMessage(const Message& message)
{
if (MsgConfigureSoapySDROutput::match(message))