Merge branch 'next' into lime

6 files changed, 66 insertions, 8 deletions

diff --git a/src/output/SDR.cpp b/src/output/SDR.cpp
index 95b54f9..01312ff 100644
--- a/src/output/SDR.cpp
+++ b/src/output/SDR.cpp
@@ -76,6 +76,7 @@ SDR::SDR(SDRDeviceConfig& config, std::shared_ptr<SDRDevice> device) :
 
     RC_ADD_PARAMETER(txgain, "TX gain");
     RC_ADD_PARAMETER(rxgain, "RX gain for DPD feedback");
+    RC_ADD_PARAMETER(bandwidth, "Analog front-end bandwidth");
     RC_ADD_PARAMETER(freq, "Transmission frequency");
     RC_ADD_PARAMETER(muting, "Mute the output by stopping the transmitter");
     RC_ADD_PARAMETER(temp, "Temperature in degrees C of the device");
@@ -381,6 +382,10 @@ void SDR::set_parameter(const string& parameter, const string& value)
         ss >> m_config.rxgain;
         m_device->set_rxgain(m_config.rxgain);
     }
+    else if (parameter == "bandwidth") {
+        ss >> m_config.bandwidth;
+        m_device->set_bandwidth(m_config.bandwidth);
+    }
     else if (parameter == "freq") {
         ss >> m_config.frequency;
         m_device->tune(m_config.lo_offset, m_config.frequency);
@@ -415,6 +420,9 @@ const string SDR::get_parameter(const string& parameter) const
     else if (parameter == "rxgain") {
         ss << m_config.rxgain;
     }
+    else if (parameter == "bandwidth") {
+        ss << m_config.bandwidth;
+    }
     else if (parameter == "freq") {
         ss << m_config.frequency;
     }
diff --git a/src/output/SDRDevice.h b/src/output/SDRDevice.h
index 7ab4bc8..d84ebf9 100644
--- a/src/output/SDRDevice.h
+++ b/src/output/SDRDevice.h
@@ -63,7 +63,9 @@ struct SDRDeviceConfig {
     double txgain = 0.0;
     double rxgain = 0.0;
     bool enableSync = false;
+    double bandwidth = 0.0;
     unsigned upsample = 1;
+
     // When working with timestamps, mute the frames that
     // do not have a timestamp
     bool muteNoTimestamps = false;
@@ -124,6 +126,8 @@ class SDRDevice {
         virtual double get_real_secs(void) const = 0;
         virtual void set_rxgain(double rxgain) = 0;
         virtual double get_rxgain(void) const = 0;
+        virtual void set_bandwidth(double bandwidth) = 0;
+        virtual double get_bandwidth(void) const = 0;
         virtual size_t receive_frame(
                 complexf *buf,
                 size_t num_samples,
diff --git a/src/output/Soapy.cpp b/src/output/Soapy.cpp
index 8c84b84..4846279 100644
--- a/src/output/Soapy.cpp
+++ b/src/output/Soapy.cpp
@@ -2,7 +2,7 @@
    Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Her Majesty the
    Queen in Right of Canada (Communications Research Center Canada)
 
-   Copyright (C) 2018
+   Copyright (C) 2019
    Matthias P. Braendli, matthias.braendli@mpb.li
 
     http://opendigitalradio.org
@@ -90,15 +90,23 @@ Soapy::Soapy(SDRDeviceConfig& config) :
         std::fixed << std::setprecision(3) <<
         m_conf.frequency / 1000.0 << " kHz.";
 
+    if (m_conf.bandwidth > 0) {
+        m_device->setBandwidth(SOAPY_SDR_TX, 0, m_conf.bandwidth);
+        m_device->setBandwidth(SOAPY_SDR_RX, 0, m_conf.bandwidth);
+        etiLog.level(info) << "SoapySDR:Actual TX bandwidth: " <<
+            std::fixed << std::setprecision(2) <<
+            m_device->getBandwidth(SOAPY_SDR_TX, 0);
+    }
+
     m_device->setGain(SOAPY_SDR_TX, 0, m_conf.txgain);
-    etiLog.level(info) << "SoapySDR:Actual tx gain: " <<
+    etiLog.level(info) << "SoapySDR:Actual TX gain: " <<
         std::fixed << std::setprecision(2) <<
         m_device->getGain(SOAPY_SDR_TX, 0);
 
     if (not m_conf.tx_antenna.empty()) {
         m_device->setAntenna(SOAPY_SDR_TX, 0, m_conf.tx_antenna);
     }
-    etiLog.level(info) << "SoapySDR:Actual tx antenna: " <<
+    etiLog.level(info) << "SoapySDR:Actual TX antenna: " <<
         m_device->getAntenna(SOAPY_SDR_TX, 0);
 
     if (m_device->hasHardwareTime()) {
@@ -157,6 +165,20 @@ double Soapy::get_txgain(void) const
     return m_device->getGain(SOAPY_SDR_TX, 0);
 }
 
+void Soapy::set_bandwidth(double bandwidth)
+{
+    m_conf.bandwidth = bandwidth;
+    if (not m_device) throw runtime_error("Soapy device not set up");
+    m_device->setBandwidth(SOAPY_SDR_TX, 0, m_conf.bandwidth);
+    m_device->setBandwidth(SOAPY_SDR_RX, 0, m_conf.bandwidth);
+}
+
+double Soapy::get_bandwidth(void) const
+{
+    if (not m_device) throw runtime_error("Soapy device not set up");
+    return m_device->getBandwidth(SOAPY_SDR_TX, 0);
+}
+
 SDRDevice::RunStatistics Soapy::get_run_statistics(void) const
 {
     RunStatistics rs;
diff --git a/src/output/Soapy.h b/src/output/Soapy.h
index 9feb0b8..4ee53ca 100644
--- a/src/output/Soapy.h
+++ b/src/output/Soapy.h
@@ -2,7 +2,7 @@
    Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Her Majesty the
    Queen in Right of Canada (Communications Research Center Canada)
 
-   Copyright (C) 2018
+   Copyright (C) 2019
    Matthias P. Braendli, matthias.braendli@mpb.li
 
     http://opendigitalradio.org
@@ -63,6 +63,8 @@ class Soapy : public Output::SDRDevice
         virtual double get_tx_freq(void) const override;
         virtual void set_txgain(double txgain) override;
         virtual double get_txgain(void) const override;
+        virtual void set_bandwidth(double bandwidth) override;
+        virtual double get_bandwidth(void) const override;
         virtual void transmit_frame(const struct FrameData& frame) override;
         virtual RunStatistics get_run_statistics(void) const override;
         virtual double get_real_secs(void) const override;
diff --git a/src/output/UHD.cpp b/src/output/UHD.cpp
index c6c500b..3cf5aef 100644
--- a/src/output/UHD.cpp
+++ b/src/output/UHD.cpp
@@ -2,7 +2,7 @@
    Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Her Majesty the
    Queen in Right of Canada (Communications Research Center Canada)
 
-   Copyright (C) 2018
+   Copyright (C) 2019
    Matthias P. Braendli, matthias.braendli@mpb.li
 
     http://opendigitalradio.org
@@ -193,6 +193,15 @@ UHD::UHD(SDRDeviceConfig& config) :
         throw std::runtime_error("Cannot set USRP sample rate. Aborted.");
     }
 
+    if (m_conf.bandwidth > 0) {
+        m_usrp->set_tx_bandwidth(m_conf.bandwidth);
+        m_usrp->set_rx_bandwidth(m_conf.bandwidth);
+
+        etiLog.level(info) << "OutputUHD:Actual TX bandwidth: " <<
+            std::fixed << std::setprecision(2) <<
+            m_usrp->get_tx_bandwidth();
+    }
+
     tune(m_conf.lo_offset, m_conf.frequency);
 
     m_conf.frequency = m_usrp->get_tx_freq();
@@ -294,6 +303,18 @@ double UHD::get_txgain(void) const
     return m_usrp->get_tx_gain();
 }
 
+void UHD::set_bandwidth(double bandwidth)
+{
+    m_usrp->set_tx_bandwidth(bandwidth);
+    m_usrp->set_rx_bandwidth(bandwidth);
+    m_conf.bandwidth = m_usrp->get_tx_bandwidth();
+}
+
+double UHD::get_bandwidth(void) const
+{
+    return m_usrp->get_tx_bandwidth();
+}
+
 void UHD::transmit_frame(const struct FrameData& frame)
 {
     const double tx_timeout = 20.0;
@@ -338,8 +359,7 @@ void UHD::transmit_frame(const struct FrameData& frame)
 
         num_acc_samps += num_tx_samps;
 
-        md_tx.time_spec = md_tx.time_spec +
-            uhd::time_spec_t(0, num_tx_samps/m_conf.sampleRate);
+        md_tx.time_spec += uhd::time_spec_t(0, num_tx_samps/m_conf.sampleRate);
 
         if (num_tx_samps == 0) {
             etiLog.log(warn,
diff --git a/src/output/UHD.h b/src/output/UHD.h
index f42b6e8..29867fb 100644
--- a/src/output/UHD.h
+++ b/src/output/UHD.h
@@ -2,7 +2,7 @@
    Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Her Majesty the
    Queen in Right of Canada (Communications Research Center Canada)
 
-   Copyright (C) 2018
+   Copyright (C) 2019
    Matthias P. Braendli, matthias.braendli@mpb.li
 
     http://opendigitalradio.org
@@ -77,6 +77,8 @@ class UHD : public Output::SDRDevice
         virtual double get_tx_freq(void) const override;
         virtual void set_txgain(double txgain) override;
         virtual double get_txgain(void) const override;
+        virtual void set_bandwidth(double bandwidth) override;
+        virtual double get_bandwidth(void) const override;
         virtual void transmit_frame(const struct FrameData& frame) override;
         virtual RunStatistics get_run_statistics(void) const override;
         virtual double get_real_secs(void) const override;