VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

XTRX input: small fixes and code formatting

This commit is contained in:
f4exb 2018-12-30 00:45:33 +01:00
parent 7d9b6f200e
commit 9db1c67b31
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
plugins/samplesource/xtrxinput/xtrxinput.cpp
View File

@ -323,10 +323,11 @@ bool XTRXInput::start()
return false; return false;
} }
if (m_running) { stop(); } if (m_running) {
stop();
}
if (!acquireChannel()) if (!acquireChannel()) {
{
return false; return false;
} }
@ -346,7 +347,6 @@ bool XTRXInput::start()
} }
m_XTRXInputThread->setLog2Decimation(m_settings.m_log2SoftDecim); m_XTRXInputThread->setLog2Decimation(m_settings.m_log2SoftDecim);
m_XTRXInputThread->startWork(); m_XTRXInputThread->startWork();
m_deviceShared.m_thread = m_XTRXInputThread; m_deviceShared.m_thread = m_XTRXInputThread;
@ -358,6 +358,7 @@ bool XTRXInput::start()
void XTRXInput::stop() void XTRXInput::stop()
{ {
qDebug("XTRXInput::stop"); qDebug("XTRXInput::stop");
disconnect(m_XTRXInputThread, SIGNAL(finished()), this, SLOT(threadFinished()));
if (m_XTRXInputThread != 0) if (m_XTRXInputThread != 0)
{ {
@ -412,7 +413,7 @@ int XTRXInput::getSampleRate() const
quint64 XTRXInput::getCenterFrequency() const quint64 XTRXInput::getCenterFrequency() const
{ {
return m_settings.m_centerFrequency; return m_settings.m_centerFrequency + (m_settings.m_ncoEnable ? m_settings.m_ncoFrequency : 0);
} }
void XTRXInput::setCenterFrequency(qint64 centerFrequency) void XTRXInput::setCenterFrequency(qint64 centerFrequency)
@ -705,7 +706,7 @@ void XTRXInput::apply_gain_pga(double gain)
{ {
if (xtrx_set_gain(m_deviceShared.m_deviceParams->getDevice(), if (xtrx_set_gain(m_deviceShared.m_deviceParams->getDevice(),
XTRX_CH_AB /*m_deviceShared.m_channel*/, XTRX_CH_AB /*m_deviceShared.m_channel*/,
XTRX_RX_TIA_GAIN, XTRX_RX_PGA_GAIN,
gain, gain,
NULL) < 0) NULL) < 0)
{ {
@ -853,7 +854,6 @@ bool XTRXInput::applySettings(const XTRXInputSettings& settings, bool force, boo
} }
#endif #endif
if ((m_settings.m_log2SoftDecim != settings.m_log2SoftDecim) || force) if ((m_settings.m_log2SoftDecim != settings.m_log2SoftDecim) || force)
{ {
forwardChangeOwnDSP = true; forwardChangeOwnDSP = true;
@ -911,6 +911,7 @@ bool XTRXInput::applySettings(const XTRXInputSettings& settings, bool force, boo
suspendTxBuddies(); suspendTxBuddies();
double master = (settings.m_log2HardDecim == 0) ? 0 : (settings.m_devSampleRate * 4 * (1 << settings.m_log2HardDecim)); double master = (settings.m_log2HardDecim == 0) ? 0 : (settings.m_devSampleRate * 4 * (1 << settings.m_log2HardDecim));
if (m_deviceShared.set_samplerate(settings.m_devSampleRate, if (m_deviceShared.set_samplerate(settings.m_devSampleRate,
master, //(settings.m_devSampleRate<<settings.m_log2HardDecim)*4, master, //(settings.m_devSampleRate<<settings.m_log2HardDecim)*4,
false) < 0) false) < 0)
@ -923,16 +924,15 @@ bool XTRXInput::applySettings(const XTRXInputSettings& settings, bool force, boo
{ {
m_deviceShared.m_deviceParams->m_log2OvSRRx = settings.m_log2HardDecim; m_deviceShared.m_deviceParams->m_log2OvSRRx = settings.m_log2HardDecim;
m_deviceShared.m_deviceParams->m_sampleRate = settings.m_devSampleRate; m_deviceShared.m_deviceParams->m_sampleRate = settings.m_devSampleRate;
doChangeFreq = true; doChangeFreq = true;
forceNCOFrequency = true; forceNCOFrequency = true;
qDebug("XTRXInput::applySettings: set sample rate set to %f with oversampling of %d",
qDebug("XTRXInput::applySettings: sample rate set to %f with oversampling of %d",
settings.m_devSampleRate, settings.m_devSampleRate,
1<<settings.m_log2HardDecim); 1<<settings.m_log2HardDecim);
} }
// TODO hangs!!!
// TODO hnags!!!
resumeTxBuddies(); resumeTxBuddies();
resumeRxBuddies(); resumeRxBuddies();
@ -962,15 +962,15 @@ bool XTRXInput::applySettings(const XTRXInputSettings& settings, bool force, boo
} }
if (doGainLna) if (doGainLna)
{ {
apply_gain_auto(m_settings.m_lnaGain); apply_gain_lna(m_settings.m_lnaGain);
} }
if (doGainTia) if (doGainTia)
{ {
apply_gain_auto(tia_to_db(m_settings.m_tiaGain)); apply_gain_tia(tia_to_db(m_settings.m_tiaGain));
} }
if (doGainPga) if (doGainPga)
{ {
apply_gain_auto(m_settings.m_pgaGain); apply_gain_pga(m_settings.m_pgaGain);
} }
if (doChangeFreq) if (doChangeFreq)
@ -1020,7 +1020,6 @@ bool XTRXInput::applySettings(const XTRXInputSettings& settings, bool force, boo
} }
} }
// forward changes to buddies or oneself // forward changes to buddies or oneself
if (forwardChangeAllDSP) if (forwardChangeAllDSP)