From 83883efcb52387eb319841509ecc3e02a5e285c0 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Wed, 16 Jan 2019 21:28:35 +0100
Subject: [PATCH] Fixed missing display settings of transverted data where
 missing

---
 devices/xtrx/devicextrx.cpp                             | 3 ++-
 plugins/samplesink/bladerf2output/bladerf2outputgui.cpp | 4 ++++
 plugins/samplesink/limesdroutput/limesdroutputgui.cpp   | 3 +++
 plugins/samplesource/bladerf2input/bladerf2inputgui.cpp | 3 +++
 plugins/samplesource/limesdrinput/limesdrinputgui.cpp   | 3 +++
 plugins/samplesource/xtrxinput/xtrxinput.cpp            | 6 +++---
 6 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/devices/xtrx/devicextrx.cpp b/devices/xtrx/devicextrx.cpp
index 6ca841709..20efc6cc2 100644
--- a/devices/xtrx/devicextrx.cpp
+++ b/devices/xtrx/devicextrx.cpp
@@ -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)
     {
diff --git a/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp b/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp
index 06a77316d..2d2aa3b06 100644
--- a/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp
+++ b/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp
@@ -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);
 }
diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp
index f74f0f40b..ebce5d13d 100644
--- a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp
+++ b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp
@@ -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);
 
diff --git a/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp b/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp
index 6a3167e6d..48644c7d9 100644
--- a/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp
+++ b/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp
@@ -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)));
diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp
index 13ccb5c4e..a22513f2b 100644
--- a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp
+++ b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp
@@ -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);
 
diff --git a/plugins/samplesource/xtrxinput/xtrxinput.cpp b/plugins/samplesource/xtrxinput/xtrxinput.cpp
index 28684e9ec..158c83d06 100644
--- a/plugins/samplesource/xtrxinput/xtrxinput.cpp
+++ b/plugins/samplesource/xtrxinput/xtrxinput.cpp
@@ -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;