[hamradio-commits] [soapyuhd] 01/04: New upstream version 0.3.2

[Andreas E. Bombe]

This is an automated email from the git hooks/post-receive script.

aeb pushed a commit to branch master
in repository soapyuhd.

commit 11cf7242e10d1e34de21b34356c400057e56a011
Author: Andreas Bombe <aeb at debian.org>
Date:   Wed Jan 25 01:25:28 2017 +0100

    New upstream version 0.3.2
---
 Changelog.txt               |  5 ++++-
 SoapyUHDDevice.cpp          |  5 +++--
 UHDSoapyDevice.cpp          | 22 ++++++++++++++++++++++
 debian/changelog            |  6 ++++++
 debian/rules                |  8 ++++++++
 debian/uhd-soapysdr.install |  4 ++++
 6 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 2f147b4..80ea60d 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,6 +1,9 @@
-Release 0.3.2 (pending)
+Release 0.3.2 (2017-01-22)
 ==========================
 
+- Added tx/rx_subdev device argument for uhd device
+- Added corrections hooks for soapy devices in uhd
+- Symlinks to workaround uhd 3.10 multi-arch bug
 - Minor corrections for license and copyright text
 - Update debian files for SoapySDR module ABI format
 
diff --git a/SoapyUHDDevice.cpp b/SoapyUHDDevice.cpp
index 7e03608..9764977 100644
--- a/SoapyUHDDevice.cpp
+++ b/SoapyUHDDevice.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2015 Josh Blum
+// Copyright (c) 2014-2016 Josh Blum
 // SPDX-License-Identifier: GPL-3.0
 
 /***********************************************************************
@@ -37,7 +37,8 @@ public:
         _type(args.at("type")),
         _isNetworkDevice(args.count("addr") != 0)
     {
-        return;
+        if (args.count("rx_subdev") != 0) _dev->set_tx_subdev_spec(args.at("rx_subdev"));
+        if (args.count("tx_subdev") != 0) _dev->set_tx_subdev_spec(args.at("tx_subdev"));
     }
 
     /*******************************************************************
diff --git a/UHDSoapyDevice.cpp b/UHDSoapyDevice.cpp
index 36fcec5..b850d29 100644
--- a/UHDSoapyDevice.cpp
+++ b/UHDSoapyDevice.cpp
@@ -378,6 +378,28 @@ void UHDSoapyDevice::setupChannelHooks(const int dir, const size_t chan, const s
         .subscribe(boost::bind(&SoapySDR::Device::setBandwidth, _device, dir, chan, _1));
     _tree->create<uhd::meta_range_t>(rf_fe_path / "bandwidth" / "range")
         .publish(boost::bind(&UHDSoapyDevice::get_bw_range, this, dir, chan));
+
+    //corrections
+    if (_device->hasDCOffsetMode(dir, chan))
+    {
+        _tree->create<bool>(rf_fe_path / "dc_offset" / "enable")
+            .publish(boost::bind(&SoapySDR::Device::getDCOffsetMode, _device, dir, chan))
+            .subscribe(boost::bind(&SoapySDR::Device::setDCOffsetMode, _device, dir, chan, _1));
+    }
+
+    if (_device->hasDCOffset(dir, chan))
+    {
+        _tree->create<std::complex<double>>(rf_fe_path / "dc_offset" / "value")
+            .publish(boost::bind(&SoapySDR::Device::getDCOffset, _device, dir, chan))
+            .subscribe(boost::bind(&SoapySDR::Device::setDCOffset, _device, dir, chan, _1));
+    }
+
+    if (_device->hasIQBalance(dir, chan))
+    {
+        _tree->create<std::complex<double>>(rf_fe_path / "iq_balance" / "value")
+            .publish(boost::bind(&SoapySDR::Device::getIQBalance, _device, dir, chan))
+            .subscribe(boost::bind(&SoapySDR::Device::setIQBalance, _device, dir, chan, _1));
+    }
 }
 
 void UHDSoapyDevice::setupFakeChannelHooks(const int dir, const size_t /*chan*/, const std::string &dirName, const std::string &chName)
diff --git a/debian/changelog b/debian/changelog
index 8053fd7..a38c553 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+soapyuhd (0.3.2-1) unstable; urgency=low
+
+  * Release 0.3.2 (2017-01-22)
+
+ -- Josh Blum <josh at pothosware.com>  Sun, 22 Jan 2017 14:54:04 -0800
+
 soapyuhd (0.3.1) unstable; urgency=low
 
   * Release 0.3.1 (2016-08-13)
diff --git a/debian/rules b/debian/rules
index 6eb429c..f2840fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,3 +15,11 @@ override_dh_auto_configure:
 
 override_dh_installchangelogs:
 	dh_installchangelogs Changelog.txt
+
+#Note: uhd 3.10 broke the multi-arch module support.
+#The rules file creates a symlink to work around this.
+override_dh_install:
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/uhd/modules/$(DEB_HOST_MULTIARCH)
+	ln -s /usr/lib/$(DEB_HOST_MULTIARCH)/uhd/modules/libsoapySupport.so \
+		$(CURDIR)/debian/tmp/usr/lib/uhd/modules/$(DEB_HOST_MULTIARCH)/libsoapySupport.so
+	dh_install
diff --git a/debian/uhd-soapysdr.install b/debian/uhd-soapysdr.install
index 4fe2e38..8ff22f7 100644
--- a/debian/uhd-soapysdr.install
+++ b/debian/uhd-soapysdr.install
@@ -1 +1,5 @@
 usr/lib/*/uhd/modules/
+
+#Note: uhd 3.10 broke the multi-arch module support.
+#The rules file creates a symlink to work around this.
+usr/lib/uhd/modules/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/soapyuhd.git