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

PlutoSDR input: fixed frequency setting from preset deserialization

Browse Source
This commit is contained in:
f4exb 2017-09-10 23:38:50 +02:00
parent 782d736db9
commit 8ff322c511
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp
View File

@ -103,6 +103,8 @@ qint64 PlutoSDRInputGui::getCenterFrequency() const
void PlutoSDRInputGui::setCenterFrequency(qint64 centerFrequency) void PlutoSDRInputGui::setCenterFrequency(qint64 centerFrequency)
{ {
m_settings.m_centerFrequency = centerFrequency; m_settings.m_centerFrequency = centerFrequency;
displaySettings();
sendSettings();
} }
QByteArray PlutoSDRInputGui::serialize() const QByteArray PlutoSDRInputGui::serialize() const
@ -264,6 +266,7 @@ void PlutoSDRInputGui::displaySettings()
ui->dcOffset->setChecked(m_settings.m_dcBlock); ui->dcOffset->setChecked(m_settings.m_dcBlock);
ui->iqImbalance->setChecked(m_settings.m_iqCorrection); ui->iqImbalance->setChecked(m_settings.m_iqCorrection);
ui->loPPM->setValue(m_settings.m_LOppmTenths);
ui->loPPMText->setText(QString("%1").arg(QString::number(m_settings.m_LOppmTenths/10.0, 'f', 1))); ui->loPPMText->setText(QString("%1").arg(QString::number(m_settings.m_LOppmTenths/10.0, 'f', 1)));
ui->swDecim->setCurrentIndex(m_settings.m_log2Decim); ui->swDecim->setCurrentIndex(m_settings.m_log2Decim);

6
plugins/samplesource/plutosdrinput/plutosdrinputgui.ui
View File

@ -216,10 +216,10 @@
<string>Local oscillator correction (ppm)</string> <string>Local oscillator correction (ppm)</string>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>-100</number> <number>-200</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>100</number> <number>200</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>
@ -881,7 +881,7 @@
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Device RSSI indication</string> <string>Device RSSI indication (dB)</string>
</property> </property>
<property name="text"> <property name="text">
<string>-100.00 dB</string> <string>-100.00 dB</string>

7
sdrbase/device/devicesourceapi.cpp
View File

@ -242,11 +242,16 @@ void DeviceSourceAPI::loadSourceSettings(const Preset* preset)
if (sourceConfig != 0) if (sourceConfig != 0)
{ {
qDebug("DeviceSourceAPI::loadSettings: deserializing source %s", qPrintable(m_sampleSourceId)); qDebug("DeviceSourceAPI::loadSettings: deserializing source %s[%d]: %s", qPrintable(m_sampleSourceId), m_sampleSourceSequence, qPrintable(m_sampleSourceSerial));
m_sampleSourcePluginInstanceUI->deserialize(*sourceConfig); m_sampleSourcePluginInstanceUI->deserialize(*sourceConfig);
} }
else
{
qDebug("DeviceSourceAPI::loadSettings: source %s[%d]: %s not found", qPrintable(m_sampleSourceId), m_sampleSourceSequence, qPrintable(m_sampleSourceSerial));
}
qint64 centerFrequency = preset->getCenterFrequency(); qint64 centerFrequency = preset->getCenterFrequency();
qDebug("DeviceSourceAPI::loadSettings: center frequency: %llu Hz", centerFrequency);
m_sampleSourcePluginInstanceUI->setCenterFrequency(centerFrequency); m_sampleSourcePluginInstanceUI->setCenterFrequency(centerFrequency);
} }
} }