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

Fixed missing display settings of transverted data where missing

This commit is contained in:
f4exb 2019-01-16 21:28:35 +01:00
parent 0ac871cb5c
commit 83883efcb5
6 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devices/xtrx/devicextrx.cpp
View File

@ -53,7 +53,8 @@ bool DeviceXTRX::open(const char* deviceStr)
int res;
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)
{

4
plugins/samplesink/bladerf2output/bladerf2outputgui.cpp
View File

@ -247,6 +247,9 @@ void BladeRF2OutputGui::displaySettings()
{
blockApplySettings(true);
ui->transverter->setDeltaFrequency(m_settings.m_transverterDeltaFrequency);
ui->transverter->setDeltaFrequencyActive(m_settings.m_transverterMode);
ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000);
ui->LOppm->setValue(m_settings.m_LOppmTenths);
ui->LOppmText->setText(QString("%1").arg(QString::number(m_settings.m_LOppmTenths/10.0, 'f', 1)));
@ -257,6 +260,7 @@ void BladeRF2OutputGui::displaySettings()
ui->gainText->setText(tr("%1 dB").arg(m_settings.m_globalGain));
ui->gain->setValue(m_settings.m_globalGain);
ui->biasTee->setChecked(m_settings.m_biasTee);
blockApplySettings(false);
}

3
plugins/samplesink/limesdroutput/limesdroutputgui.cpp
View File

@ -318,6 +318,9 @@ void LimeSDROutputGUI::updateDACRate()
void LimeSDROutputGUI::displaySettings()
{
ui->transverter->setDeltaFrequency(m_settings.m_transverterDeltaFrequency);
ui->transverter->setDeltaFrequencyActive(m_settings.m_transverterMode);
ui->extClock->setExternalClockFrequency(m_settings.m_extClockFreq);
ui->extClock->setExternalClockActive(m_settings.m_extClock);

3
plugins/samplesource/bladerf2input/bladerf2inputgui.cpp
View File

@ -259,6 +259,9 @@ void BladeRF2InputGui::displaySettings()
{
blockApplySettings(true);
ui->transverter->setDeltaFrequency(m_settings.m_transverterDeltaFrequency);
ui->transverter->setDeltaFrequencyActive(m_settings.m_transverterMode);
ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000);
ui->LOppm->setValue(m_settings.m_LOppmTenths);
ui->LOppmText->setText(QString("%1").arg(QString::number(m_settings.m_LOppmTenths/10.0, 'f', 1)));

3
plugins/samplesource/limesdrinput/limesdrinputgui.cpp
View File

@ -319,6 +319,9 @@ void LimeSDRInputGUI::updateSampleRateAndFrequency()
void LimeSDRInputGUI::displaySettings()
{
ui->transverter->setDeltaFrequency(m_settings.m_transverterDeltaFrequency);
ui->transverter->setDeltaFrequencyActive(m_settings.m_transverterMode);
ui->extClock->setExternalClockFrequency(m_settings.m_extClockFreq);
ui->extClock->setExternalClockActive(m_settings.m_extClock);

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

@ -347,14 +347,14 @@ bool XTRXInput::start()
xtrxInputThread->setFifo(requestedChannel, &m_sampleFifo);
xtrxInputThread->setLog2Decimation(requestedChannel, m_settings.m_log2SoftDecim);
applySettings(m_settings, true);
if (needsStart)
{
qDebug("XTRXInput::start: (re)start thread");
xtrxInputThread->startWork();
}
applySettings(m_settings, true);
qDebug("XTRXInput::start: started");
m_running = true;
@ -426,8 +426,8 @@ void XTRXInput::stop()
((DeviceXTRXShared*) (*it)->getBuddySharedPtr())->m_thread = 0;
}
xtrxInputThread->startWork();
applySettings(m_settings, true);
xtrxInputThread->startWork();
}
m_running = false;