1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-24 03:02:29 -04:00

XTRX fixes (2)

This commit is contained in:
f4exb 2019-01-17 01:27:07 +01:00
parent 5109253d8b
commit 3826b1faeb
2 changed files with 4 additions and 5 deletions

View File

@ -53,8 +53,7 @@ bool DeviceXTRX::open(const char* deviceStr)
int res; int res;
qDebug("DeviceXTRX::open: serial: %s", (const char *) deviceStr); qDebug("DeviceXTRX::open: serial: %s", (const char *) deviceStr);
//res = xtrx_open(deviceStr, XTRX_O_RESET | 4, &m_dev); res = xtrx_open(deviceStr, XTRX_O_RESET | 4, &m_dev);
res = xtrx_open(deviceStr, 4, &m_dev);
if (res) if (res)
{ {

View File

@ -332,14 +332,14 @@ bool XTRXOutput::start()
xtrxOutputThread->setFifo(requestedChannel, &m_sampleSourceFifo); xtrxOutputThread->setFifo(requestedChannel, &m_sampleSourceFifo);
xtrxOutputThread->setLog2Interpolation(requestedChannel, m_settings.m_log2SoftInterp); xtrxOutputThread->setLog2Interpolation(requestedChannel, m_settings.m_log2SoftInterp);
applySettings(m_settings, true);
if (needsStart) if (needsStart)
{ {
qDebug("XTRXOutput::start: (re)start thread"); qDebug("XTRXOutput::start: (re)start thread");
xtrxOutputThread->startWork(); xtrxOutputThread->startWork();
} }
applySettings(m_settings, true);
qDebug("XTRXOutput::start: started"); qDebug("XTRXOutput::start: started");
m_running = true; m_running = true;
@ -411,8 +411,8 @@ void XTRXOutput::stop()
((DeviceXTRXShared*) (*it)->getBuddySharedPtr())->m_thread = 0; ((DeviceXTRXShared*) (*it)->getBuddySharedPtr())->m_thread = 0;
} }
xtrxOutputThread->startWork();
applySettings(m_settings, true); applySettings(m_settings, true);
xtrxOutputThread->startWork();
} }
m_running = false; m_running = false;