diff -Nru soapybladerf-0.3.2.2.c83cc2b/bladeRF_Registation.cpp soapybladerf-0.3.3/bladeRF_Registation.cpp --- soapybladerf-0.3.2.2.c83cc2b/bladeRF_Registation.cpp 2016-09-02 05:29:51.000000000 +0000 +++ soapybladerf-0.3.3/bladeRF_Registation.cpp 2017-04-30 06:35:58.000000000 +0000 @@ -2,7 +2,7 @@ * This file is part of the bladeRF project: * http://www.github.com/nuand/bladeRF * - * Copyright (C) 2015-2016 Josh Blum + * Copyright (C) 2015-2017 Josh Blum * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -31,16 +31,19 @@ SoapySDR::Kwargs args; args["backend"] = bladerf_backend_str(info.backend); + args["serial"] = std::string(info.serial); - char deviceStr[100]; - sprintf(deviceStr, "0x%02X:0x%02X", int(info.usb_bus), int(info.usb_addr)); - args["device"] = deviceStr; - - char instanceStr[100]; - sprintf(instanceStr, "%u", info.instance); - args["instance"] = instanceStr; + char buff[100]; + int r = std::sprintf(buff, "0x%02X:0x%02X", int(info.usb_bus), int(info.usb_addr)); + if (r > 0) args["device"] = std::string(buff, r); + + r = std::sprintf(buff, "%u", info.instance); + if (r > 0) args["instance"] = std::string(buff, r); + + std::string shortSerial(std::string(info.serial)); + shortSerial.replace(8, 16, ".."); + args["label"] = "BladeRF #" + args["instance"] + " [" + shortSerial + "]"; - args["serial"] = std::string(info.serial); return args; } diff -Nru soapybladerf-0.3.2.2.c83cc2b/Changelog.txt soapybladerf-0.3.3/Changelog.txt --- soapybladerf-0.3.2.2.c83cc2b/Changelog.txt 2016-09-02 05:29:51.000000000 +0000 +++ soapybladerf-0.3.3/Changelog.txt 2017-04-30 06:35:58.000000000 +0000 @@ -1,6 +1,7 @@ -Release 0.3.3 (pending) +Release 0.3.3 (2017-04-29) ========================== +- Added label convention to bladerf discovery routine - Update debian files for SoapySDR module ABI format Release 0.3.2 (2016-05-20) diff -Nru soapybladerf-0.3.2.2.c83cc2b/debian/changelog soapybladerf-0.3.3/debian/changelog --- soapybladerf-0.3.2.2.c83cc2b/debian/changelog 2016-09-02 05:32:18.000000000 +0000 +++ soapybladerf-0.3.3/debian/changelog 2017-04-30 06:36:23.000000000 +0000 @@ -1,8 +1,14 @@ -soapybladerf (0.3.2.2.c83cc2b-myriadrf1~trusty) trusty; urgency=low +soapybladerf (0.3.3-myriadrf1~trusty) trusty; urgency=low * PPA helper upload script - -- Josh Blum Thu, 01 Sep 2016 22:32:15 -0700 + -- Josh Blum Sat, 29 Apr 2017 23:36:23 -0700 + +soapybladerf (0.3.3-1) unstable; urgency=low + + * Release 0.3.3 (2017-04-29) + + -- Josh Blum Sat, 29 Apr 2017 15:10:52 -0000 soapybladerf (0.3.2) unstable; urgency=low diff -Nru soapybladerf-0.3.2.2.c83cc2b/debian/control soapybladerf-0.3.3/debian/control --- soapybladerf-0.3.2.2.c83cc2b/debian/control 2016-09-02 05:32:18.000000000 +0000 +++ soapybladerf-0.3.3/debian/control 2017-04-30 06:36:23.000000000 +0000 @@ -12,7 +12,7 @@ Vcs-Git: https://github.com/pothosware/SoapyBladeRF.git Vcs-Browser: https://github.com/pothosware/SoapyBladeRF -Package: soapysdr0.5-2-module-bladerf +Package: soapysdr0.6-module-bladerf Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} @@ -21,7 +21,7 @@ Package: soapysdr-module-bladerf Architecture: all -Depends: soapysdr0.5-2-module-bladerf, ${misc:Depends} +Depends: soapysdr0.6-module-bladerf, ${misc:Depends} Description: Soapy BladeRF - BladeRF device support for Soapy SDR. A Soapy module that supports BladeRF devices within the Soapy API. . diff -Nru soapybladerf-0.3.2.2.c83cc2b/debian/soapysdr0.5-2-module-bladerf.install soapybladerf-0.3.3/debian/soapysdr0.5-2-module-bladerf.install --- soapybladerf-0.3.2.2.c83cc2b/debian/soapysdr0.5-2-module-bladerf.install 2016-09-02 05:32:18.000000000 +0000 +++ soapybladerf-0.3.3/debian/soapysdr0.5-2-module-bladerf.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/* diff -Nru soapybladerf-0.3.2.2.c83cc2b/debian/soapysdr0.6-module-bladerf.install soapybladerf-0.3.3/debian/soapysdr0.6-module-bladerf.install --- soapybladerf-0.3.2.2.c83cc2b/debian/soapysdr0.6-module-bladerf.install 1970-01-01 00:00:00.000000000 +0000 +++ soapybladerf-0.3.3/debian/soapysdr0.6-module-bladerf.install 2017-04-30 06:36:23.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/*