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

PlutoSDR input: implemented input class interim state (2)

Browse Source
This commit is contained in:
f4exb
2017-09-07 06:15:39 +02:00
parent 7b437e41ba
commit 5a05cf14bb
6 changed files with 78 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/plutosdrinput/plutosdrinput.cpp
+11 -2
View File
@@ -254,9 +254,11 @@ bool PlutoSDRInput::applySettings(const PlutoSDRInputSettings& settings, bool fo
// - device to host sample rate is changed
// - rate governor is changed
// - FIR filter decimation is changed
// - FIR filter is enabled or disabled
if ((m_settings.m_devSampleRate != settings.m_devSampleRate) ||
(m_settings.m_rateGovernor != settings.m_rateGovernor) ||
(m_settings.m_lpfFIRlog2Decim != settings.m_lpfFIRlog2Decim) || force)
(m_settings.m_lpfFIRlog2Decim != settings.m_lpfFIRlog2Decim) ||
(m_settings.m_lpfFIREnable != settings.m_lpfFIREnable) || force)
{
suspendAllOtherThreads = true;
suspendOwnThread = true;
@@ -300,8 +302,15 @@ bool PlutoSDRInput::applySettings(const PlutoSDRInputSettings& settings, bool fo
// Change affecting device baseband sample rate potentially affecting all buddies device/host sample rate
if ((m_settings.m_devSampleRate != settings.m_devSampleRate) ||
(m_settings.m_rateGovernor != settings.m_rateGovernor) ||
(m_settings.m_lpfFIRlog2Decim != settings.m_lpfFIRlog2Decim) || force)
(m_settings.m_lpfFIRlog2Decim != settings.m_lpfFIRlog2Decim) ||
(m_settings.m_lpfFIREnable != settings.m_lpfFIREnable) || force)
{
std::vector<std::string> params;
params.push_back(QString(tr("in_voltage_sampling_frequency=%1").arg(settings.m_devSampleRate)).toStdString());
QString rateGovStr;
PlutoSDRInputSettings::translateGovernor(settings.m_rateGovernor, rateGovStr);
params.push_back(QString(tr("trx_rate_governor=%1").arg(rateGovStr)).toStdString());
params.push_back(QString(tr("in_voltage_filter_fir_en=%1").arg(settings.m_lpfFIREnable ? 1 : 0)).toStdString());
forwardChangeAllDSP = true;
}
plugins/samplesource/plutosdrinput/plutosdrinput.h
+1 -1
View File
@@ -44,7 +44,7 @@ public:
}
private:
MsgConfigurePlutoSDR m_settings;
PlutoSDRInputSettings m_settings;
bool m_force;
MsgConfigurePlutoSDR(const PlutoSDRInputSettings& settings, bool force) :
plugins/samplesource/plutosdrinput/plutosdrinputsettings.cpp
+16
View File
@@ -129,3 +129,19 @@ bool PlutoSDRInputSettings::deserialize(const QByteArray& data)
return false;
}
}
void PlutoSDRInputSettings::translateGovernor(RateGovernor gov, QString& s)
{
switch(gov)
{
case RATEGOV_NORMAL:
s = "normal";
break;
case RATEGOV_HIGHOSR:
s = "highest_osr";
break;
default:
s = "highest_osr";
break;
}
}
plugins/samplesource/plutosdrinput/plutosdrinputsettings.h
+1
View File
@@ -81,6 +81,7 @@ struct PlutoSDRInputSettings {
void resetToDefaults();
QByteArray serialize() const;
bool deserialize(const QByteArray& data);
static void translateGovernor(RateGovernor gov, QString& s);
};
#endif /* _PLUTOSDR_PLUTOSDRINPUTSETTINGS_H_ */