From 6800bc769ee186927feb6cbb1b840131940d1bc5 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Tue, 16 Jan 2018 01:01:24 +0100
Subject: [PATCH] RTL-SDR: implemented tuner bandwidth control

---
 debian/changelog                              |  3 +-
 .../hackrfinput/hackrfinputplugin.cpp         |  2 +-
 plugins/samplesource/rtlsdr/rtlsdrgui.cpp     | 10 ++++
 plugins/samplesource/rtlsdr/rtlsdrgui.h       |  1 +
 plugins/samplesource/rtlsdr/rtlsdrgui.ui      | 46 ++++++++++++++++++-
 plugins/samplesource/rtlsdr/rtlsdrinput.cpp   | 17 +++++++
 .../samplesource/rtlsdr/rtlsdrsettings.cpp    |  3 ++
 plugins/samplesource/rtlsdr/rtlsdrsettings.h  |  1 +
 8 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bd7a7c408..74af1c415 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 sdrangel (3.11.0-1) unstable; urgency=medium
 
   * AirspyHF: support
-  * RTL-SDR: refactored 8 bit samples shifting during decimation 
+  * Refactored 8 bit samples shifting during decimation (RTL-SDR and HackRF Rx) 
+  * RTL-SDR: implemented RF filter control (tuner bandwidth)
   * GUI: show REST API URL in about dialog
 
  -- Edouard Griffiths, F4EXB <f4exb06@gmail.com>  Sat, 13 Jan 2018 12:14:18 +0100
diff --git a/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp
index 258c1719f..19bdbb9db 100644
--- a/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp
+++ b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp
@@ -32,7 +32,7 @@
 
 const PluginDescriptor HackRFInputPlugin::m_pluginDescriptor = {
 	QString("HackRF Input"),
-	QString("3.9.0"),
+	QString("3.11.0"),
 	QString("(c) Edouard Griffiths, F4EXB"),
 	QString("https://github.com/f4exb/sdrangel"),
 	true,
diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp
index 863760caa..7b97cc9c8 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp
+++ b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp
@@ -49,6 +49,9 @@ RTLSDRGui::RTLSDRGui(DeviceUISet *deviceUISet, QWidget* parent) :
     ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow));
     ui->sampleRate->setValueRange(7, RTLSDRInput::sampleRateHighRangeMin, RTLSDRInput::sampleRateHighRangeMax);
 
+    ui->rfBW->setColorMapper(ColorMapper(ColorMapper::GrayYellow));
+    ui->rfBW->setValueRange(4, 350, 8000);
+
 	connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware()));
 	connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
 	m_statusTimer.start(500);
@@ -247,6 +250,7 @@ void RTLSDRGui::displaySettings()
     updateFrequencyLimits();
 	ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000);
 	ui->sampleRate->setValue(m_settings.m_devSampleRate);
+	ui->rfBW->setValue(m_settings.m_rfBandwidth / 1000);
 	ui->dcOffset->setChecked(m_settings.m_dcBlock);
 	ui->iqImbalance->setChecked(m_settings.m_iqImbalance);
 	ui->ppm->setValue(m_settings.m_loPpmCorrection);
@@ -435,6 +439,12 @@ void RTLSDRGui::on_sampleRate_changed(quint64 value)
     sendSettings();
 }
 
+void RTLSDRGui::on_rfBW_changed(quint64 value)
+{
+    m_settings.m_rfBandwidth = value * 1000;
+    sendSettings();
+}
+
 void RTLSDRGui::on_lowSampleRate_toggled(bool checked)
 {
     if (checked) {
diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.h b/plugins/samplesource/rtlsdr/rtlsdrgui.h
index a7d6bf37a..f2c838618 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrgui.h
+++ b/plugins/samplesource/rtlsdr/rtlsdrgui.h
@@ -78,6 +78,7 @@ private slots:
     void handleInputMessages();
 	void on_centerFrequency_changed(quint64 value);
 	void on_sampleRate_changed(quint64 value);
+    void on_rfBW_changed(quint64 value);
 	void on_lowSampleRate_toggled(bool checked);
 	void on_dcOffset_toggled(bool checked);
 	void on_iqImbalance_toggled(bool checked);
diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.ui b/plugins/samplesource/rtlsdr/rtlsdrgui.ui
index 358850187..5cfd01cb9 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrgui.ui
+++ b/plugins/samplesource/rtlsdr/rtlsdrgui.ui
@@ -471,7 +471,7 @@
         <string>RTLSDR special direct sampling mode (HF Bands)</string>
        </property>
        <property name="text">
-        <string>No-mod Direct Sampling</string>
+        <string>No-mod DS</string>
        </property>
       </widget>
      </item>
@@ -488,6 +488,48 @@
        </property>
       </spacer>
      </item>
+     <item>
+      <widget class="QLabel" name="rfBWabel">
+       <property name="text">
+        <string>RFBW</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="ValueDial" name="rfBW" native="true">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>32</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="font">
+        <font>
+         <family>DejaVu Sans Mono</family>
+         <pointsize>12</pointsize>
+        </font>
+       </property>
+       <property name="cursor">
+        <cursorShape>PointingHandCursor</cursorShape>
+       </property>
+       <property name="toolTip">
+        <string>RF filter bandwidth (kHz)</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="rfBWUnits">
+       <property name="text">
+        <string>kHz</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>
@@ -572,7 +614,7 @@
    <item>
     <layout class="QHBoxLayout" name="fillerLayout">
      <item>
-      <spacer name="filerVerticalSpacer">
+      <spacer name="verticalSpacer">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
diff --git a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp
index d85bddd35..8236ec205 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp
+++ b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp
@@ -515,6 +515,23 @@ bool RTLSDRInput::applySettings(const RTLSDRSettings& settings, bool force)
         }
     }
 
+    if ((m_settings.m_rfBandwidth != settings.m_rfBandwidth) || force)
+    {
+        m_settings.m_rfBandwidth = settings.m_rfBandwidth;
+
+        if (m_dev != 0)
+        {
+            if (rtlsdr_set_tuner_bandwidth( m_dev, m_settings.m_rfBandwidth) != 0)
+            {
+                qCritical("RTLSDRInput::applySettings: could not set RF bandwidth to %u", m_settings.m_rfBandwidth);
+            }
+            else
+            {
+                qDebug() << "RTLSDRInput::applySettings: set RF bandwidth to " << m_settings.m_rfBandwidth;
+            }
+        }
+    }
+
     if (forwardChange)
     {
         int sampleRate = m_settings.m_devSampleRate/(1<<m_settings.m_log2Decim);
diff --git a/plugins/samplesource/rtlsdr/rtlsdrsettings.cpp b/plugins/samplesource/rtlsdr/rtlsdrsettings.cpp
index 703306865..479fa6c96 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrsettings.cpp
+++ b/plugins/samplesource/rtlsdr/rtlsdrsettings.cpp
@@ -38,6 +38,7 @@ void RTLSDRSettings::resetToDefaults()
 	m_noModMode = false;
     m_transverterMode = false;
 	m_transverterDeltaFrequency = 0;
+	m_rfBandwidth = 2500 * 1000; // Hz
 }
 
 QByteArray RTLSDRSettings::serialize() const
@@ -56,6 +57,7 @@ QByteArray RTLSDRSettings::serialize() const
     s.writeBool(11, m_noModMode);
     s.writeBool(12, m_transverterMode);
     s.writeS64(13, m_transverterDeltaFrequency);
+    s.writeU32(14, m_rfBandwidth);
 
 	return s.final();
 }
@@ -87,6 +89,7 @@ bool RTLSDRSettings::deserialize(const QByteArray& data)
         d.readBool(11, &m_noModMode, false);
         d.readBool(12, &m_transverterMode, false);
         d.readS64(13, &m_transverterDeltaFrequency, 0);
+        d.readU32(4, &m_rfBandwidth, 2500 * 1000);
 
 		return true;
 	}
diff --git a/plugins/samplesource/rtlsdr/rtlsdrsettings.h b/plugins/samplesource/rtlsdr/rtlsdrsettings.h
index d9c9a2476..32303eff5 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrsettings.h
+++ b/plugins/samplesource/rtlsdr/rtlsdrsettings.h
@@ -37,6 +37,7 @@ struct RTLSDRSettings {
 	bool m_noModMode;
     bool m_transverterMode;
 	qint64 m_transverterDeltaFrequency;
+	quint32 m_rfBandwidth; //!< RF filter bandwidth in Hz
 
 	RTLSDRSettings();
 	void resetToDefaults();