mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-09-20 11:56:36 -04:00
Fixed missing display settings of transverted data where missing
This commit is contained in:
parent
0ac871cb5c
commit
83883efcb5
@ -53,7 +53,8 @@ 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)
|
||||||
{
|
{
|
||||||
|
@ -247,6 +247,9 @@ void BladeRF2OutputGui::displaySettings()
|
|||||||
{
|
{
|
||||||
blockApplySettings(true);
|
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->centerFrequency->setValue(m_settings.m_centerFrequency / 1000);
|
||||||
ui->LOppm->setValue(m_settings.m_LOppmTenths);
|
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)));
|
||||||
@ -257,6 +260,7 @@ void BladeRF2OutputGui::displaySettings()
|
|||||||
|
|
||||||
ui->gainText->setText(tr("%1 dB").arg(m_settings.m_globalGain));
|
ui->gainText->setText(tr("%1 dB").arg(m_settings.m_globalGain));
|
||||||
ui->gain->setValue(m_settings.m_globalGain);
|
ui->gain->setValue(m_settings.m_globalGain);
|
||||||
|
ui->biasTee->setChecked(m_settings.m_biasTee);
|
||||||
|
|
||||||
blockApplySettings(false);
|
blockApplySettings(false);
|
||||||
}
|
}
|
||||||
|
@ -318,6 +318,9 @@ void LimeSDROutputGUI::updateDACRate()
|
|||||||
|
|
||||||
void LimeSDROutputGUI::displaySettings()
|
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->setExternalClockFrequency(m_settings.m_extClockFreq);
|
||||||
ui->extClock->setExternalClockActive(m_settings.m_extClock);
|
ui->extClock->setExternalClockActive(m_settings.m_extClock);
|
||||||
|
|
||||||
|
@ -259,6 +259,9 @@ void BladeRF2InputGui::displaySettings()
|
|||||||
{
|
{
|
||||||
blockApplySettings(true);
|
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->centerFrequency->setValue(m_settings.m_centerFrequency / 1000);
|
||||||
ui->LOppm->setValue(m_settings.m_LOppmTenths);
|
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)));
|
||||||
|
@ -319,6 +319,9 @@ void LimeSDRInputGUI::updateSampleRateAndFrequency()
|
|||||||
|
|
||||||
void LimeSDRInputGUI::displaySettings()
|
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->setExternalClockFrequency(m_settings.m_extClockFreq);
|
||||||
ui->extClock->setExternalClockActive(m_settings.m_extClock);
|
ui->extClock->setExternalClockActive(m_settings.m_extClock);
|
||||||
|
|
||||||
|
@ -347,14 +347,14 @@ bool XTRXInput::start()
|
|||||||
xtrxInputThread->setFifo(requestedChannel, &m_sampleFifo);
|
xtrxInputThread->setFifo(requestedChannel, &m_sampleFifo);
|
||||||
xtrxInputThread->setLog2Decimation(requestedChannel, m_settings.m_log2SoftDecim);
|
xtrxInputThread->setLog2Decimation(requestedChannel, m_settings.m_log2SoftDecim);
|
||||||
|
|
||||||
|
applySettings(m_settings, true);
|
||||||
|
|
||||||
if (needsStart)
|
if (needsStart)
|
||||||
{
|
{
|
||||||
qDebug("XTRXInput::start: (re)start thread");
|
qDebug("XTRXInput::start: (re)start thread");
|
||||||
xtrxInputThread->startWork();
|
xtrxInputThread->startWork();
|
||||||
}
|
}
|
||||||
|
|
||||||
applySettings(m_settings, true);
|
|
||||||
|
|
||||||
qDebug("XTRXInput::start: started");
|
qDebug("XTRXInput::start: started");
|
||||||
m_running = true;
|
m_running = true;
|
||||||
|
|
||||||
@ -426,8 +426,8 @@ void XTRXInput::stop()
|
|||||||
((DeviceXTRXShared*) (*it)->getBuddySharedPtr())->m_thread = 0;
|
((DeviceXTRXShared*) (*it)->getBuddySharedPtr())->m_thread = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
xtrxInputThread->startWork();
|
|
||||||
applySettings(m_settings, true);
|
applySettings(m_settings, true);
|
||||||
|
xtrxInputThread->startWork();
|
||||||
}
|
}
|
||||||
|
|
||||||
m_running = false;
|
m_running = false;
|
||||||
|
Loading…
Reference in New Issue
Block a user