Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package soapy-bladerf for openSUSE:Factory checked in at 2026-11-16 09:08:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/soapy-bladerf (Old) and /work/SRC/openSUSE:Factory/.soapy-bladerf.new.1251 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "soapy-bladerf" Mon Nov 16 09:08:02 2026 rev:10 rq:1397532 version:0.4.4 Changes: -------- --- /work/SRC/openSUSE:Factory/soapy-bladerf/soapy-bladerf.changes 2026-10-15 12:18:59.700194683 +0200 +++ /work/SRC/openSUSE:Factory/.soapy-bladerf.new.1251/soapy-bladerf.changes 2026-11-16 09:13:29.623434773 +0100 @@ -1,0 +2,7 @@ +Sat Nov 14 07:45:15 UTC 2026 - Martin Pluskal <[email protected]> + +- Update to version 0.4.4: + * Add FIR filter settings on BladeRF 2.0 + * Add DAC Trim settings on BladeRF 2.0 + +------------------------------------------------------------------- Old: ---- SoapyBladeRF-soapy-bladerf-0.4.3.tar.gz New: ---- SoapyBladeRF-soapy-bladerf-0.4.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ soapy-bladerf.spec ++++++ --- /var/tmp/diff_new_pack.vBQlmU/_old 2026-11-16 09:13:30.231460264 +0100 +++ /var/tmp/diff_new_pack.vBQlmU/_new 2026-11-16 09:13:30.232460306 +0100 @@ -20,7 +20,7 @@ %define soapy_modver 0.8-3 %define soapy_modname soapysdr%{soapy_modver}-module-bladerf Name: soapy-bladerf -Version: 0.4.3 +Version: 0.4.4 Release: 0 Summary: SoapySDR BladeRF module License: LGPL-2.1-or-later ++++++ SoapyBladeRF-soapy-bladerf-0.4.3.tar.gz -> SoapyBladeRF-soapy-bladerf-0.4.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SoapyBladeRF-soapy-bladerf-0.4.3/Changelog.txt new/SoapyBladeRF-soapy-bladerf-0.4.4/Changelog.txt --- old/SoapyBladeRF-soapy-bladerf-0.4.3/Changelog.txt 2026-10-10 16:10:06.000000000 +0200 +++ new/SoapyBladeRF-soapy-bladerf-0.4.4/Changelog.txt 2026-11-13 08:55:31.000000000 +0100 @@ -1,3 +1,9 @@ +Release 0.4.4 (2026-11-13) +========================== + +- Add FIR filter settings on BladeRF 2.0 +- Add DAC Trim settings on BladeRF 2.0 + Release 0.4.3 (2026-10-10) ========================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SoapyBladeRF-soapy-bladerf-0.4.3/bladeRF_Settings.cpp new/SoapyBladeRF-soapy-bladerf-0.4.4/bladeRF_Settings.cpp --- old/SoapyBladeRF-soapy-bladerf-0.4.3/bladeRF_Settings.cpp 2026-10-10 16:10:06.000000000 +0200 +++ new/SoapyBladeRF-soapy-bladerf-0.4.4/bladeRF_Settings.cpp 2026-11-13 08:55:31.000000000 +0100 @@ -25,8 +25,70 @@ #include <stdexcept> #include <cstdio> #include <cmath> +#include <utility> //pair +#include <vector> //! convert bladerf range to a soapysdr range +// The AD9361 FIR modes libbladeRF takes for bladerf_set_rfic_rx_fir and bladerf_set_rfic_tx_fir, +// by the names the rx_fir and tx_fir settings use. CUSTOM is left out: libbladeRF does not use it. +static const std::vector<std::pair<std::string, bladerf_rfic_rxfir>> rxFirModes{ + {"bypass", BLADERF_RFIC_RXFIR_BYPASS}, + {"dec1", BLADERF_RFIC_RXFIR_DEC1}, + {"dec2", BLADERF_RFIC_RXFIR_DEC2}, + {"dec4", BLADERF_RFIC_RXFIR_DEC4}, +}; +static const std::vector<std::pair<std::string, bladerf_rfic_txfir>> txFirModes{ + {"bypass", BLADERF_RFIC_TXFIR_BYPASS}, + {"int1", BLADERF_RFIC_TXFIR_INT1}, + {"int2", BLADERF_RFIC_TXFIR_INT2}, + {"int4", BLADERF_RFIC_TXFIR_INT4}, +}; + +// The setting description for one FIR direction: its modes as options, `def` the default. +template <typename Mode> +static SoapySDR::ArgInfo firArgInfo(const std::string &key, const std::string &def, const std::string &name, + const std::vector<std::pair<std::string, Mode>> &modes) +{ + SoapySDR::ArgInfo info; + info.key = key; + info.value = def; + info.name = name; + info.description = name + " (bladeRF 2.0 only). libbladeRF sets dec4/int4 itself below ~521 ksps, " + "and puts back its defaults (dec1, bypass) when the rate rises above that again."; + info.type = SoapySDR::ArgInfo::STRING; + for (const auto &mode : modes) + { + info.options.push_back(mode.first); + info.optionNames.push_back(mode.first); + } + return info; +} + +// The name of `mode` in `modes`, or "unknown" for a mode outside the table (CUSTOM). +template <typename Mode> +static std::string firModeName(const std::vector<std::pair<std::string, Mode>> &modes, const Mode mode) +{ + for (const auto &entry : modes) + { + if (entry.second == mode) return entry.first; + } + return "unknown"; +} + +// The mode named `value` in `modes`; throws std::invalid_argument for any other name. +template <typename Mode> +static Mode firModeOf(const std::string &key, const std::vector<std::pair<std::string, Mode>> &modes, + const std::string &value) +{ + std::string names; + for (const auto &entry : modes) + { + if (entry.first == value) return entry.second; + names += (names.empty() ? "" : ", ") + entry.first; + } + throw std::invalid_argument("writeSetting(" + key + ", " + value + ") expects one of " + names); +} + static SoapySDR::Range toRange(const bladerf_range* range) { return SoapySDR::Range(range->min*range->scale, range->max*range->scale, range->step*range->scale); @@ -1199,6 +1261,20 @@ setArgs.push_back(biasTeeRx); + // VCTCXO trim DAC + SoapySDR::ArgInfo trimDac; + trimDac.key = "trim_dac"; + trimDac.value = ""; + trimDac.name = "VCTCXO trim DAC"; + trimDac.description = "Reference oscillator trim DAC value, as hex (0x1d33) or decimal (7475)"; + trimDac.type = SoapySDR::ArgInfo::STRING; + + setArgs.push_back(trimDac); + + // AD9361 FIR filters + setArgs.push_back(firArgInfo("rx_fir", "dec1", "RX FIR filter", rxFirModes)); + setArgs.push_back(firArgInfo("tx_fir", "bypass", "TX FIR filter", txFirModes)); + return setArgs; } @@ -1234,6 +1310,35 @@ return "false"; } else if (key == "biastee_rx") { return "false"; + } else if (key == "trim_dac") { + uint16_t trim = 0; + const int ret = bladerf_trim_dac_read(_dev, &trim); + if (ret != 0) + { + SoapySDR::logf(SOAPY_SDR_ERROR, "bladerf_trim_dac_read() returned %s", _err2str(ret).c_str()); + throw std::runtime_error("readSetting() " + _err2str(ret)); + } + char hex[8]; + std::snprintf(hex, sizeof(hex), "0x%04x", trim); + return hex; + } else if (key == "rx_fir") { + bladerf_rfic_rxfir fir = BLADERF_RFIC_RXFIR_BYPASS; + const int ret = bladerf_get_rfic_rx_fir(_dev, &fir); + if (ret != 0) + { + SoapySDR::logf(SOAPY_SDR_ERROR, "bladerf_get_rfic_rx_fir() returned %s", _err2str(ret).c_str()); + throw std::runtime_error("readSetting() " + _err2str(ret)); + } + return firModeName(rxFirModes, fir); + } else if (key == "tx_fir") { + bladerf_rfic_txfir fir = BLADERF_RFIC_TXFIR_BYPASS; + const int ret = bladerf_get_rfic_tx_fir(_dev, &fir); + if (ret != 0) + { + SoapySDR::logf(SOAPY_SDR_ERROR, "bladerf_get_rfic_tx_fir() returned %s", _err2str(ret).c_str()); + throw std::runtime_error("readSetting() " + _err2str(ret)); + } + return firModeName(txFirModes, fir); } SoapySDR_logf(SOAPY_SDR_WARNING, "Unknown setting '%s'", key.c_str()); @@ -1552,6 +1657,58 @@ } } } + else if (key == "trim_dac") + { + // Hex with a 0x prefix, otherwise decimal, so a leading zero never reads as octal. + const bool isHex = value.size() > 2 and value[0] == '0' and (value[1] == 'x' or value[1] == 'X'); + const std::string digits = isHex ? value.substr(2) : value; + unsigned long trim = 0; + size_t used = 0; + try + { + trim = std::stoul(digits, &used, isHex ? 16 : 10); + } + catch (const std::exception &) + { + used = 0; + } + if (digits.empty() or used != digits.size() or trim > 0xffff) + { + throw std::invalid_argument("writeSetting(trim_dac, " + value + ") expects 0 to 0xffff"); + } + const int ret = bladerf_trim_dac_write(_dev, static_cast<uint16_t>(trim)); + if (ret != 0) + { + SoapySDR::logf(SOAPY_SDR_ERROR, "bladerf_trim_dac_write(%s) returned %s", + value.c_str(), + _err2str(ret).c_str()); + throw std::runtime_error("writeSetting() " + _err2str(ret)); + } + } + else if (key == "rx_fir") + { + // libbladeRF refuses anything but dec4 while the rate is below ~521 ksps. + const int ret = bladerf_set_rfic_rx_fir(_dev, firModeOf(key, rxFirModes, value)); + if (ret != 0) + { + SoapySDR::logf(SOAPY_SDR_ERROR, "bladerf_set_rfic_rx_fir(%s) returned %s", + value.c_str(), + _err2str(ret).c_str()); + throw std::runtime_error("writeSetting() " + _err2str(ret)); + } + } + else if (key == "tx_fir") + { + // libbladeRF refuses anything but int4 while the rate is below ~521 ksps. + const int ret = bladerf_set_rfic_tx_fir(_dev, firModeOf(key, txFirModes, value)); + if (ret != 0) + { + SoapySDR::logf(SOAPY_SDR_ERROR, "bladerf_set_rfic_tx_fir(%s) returned %s", + value.c_str(), + _err2str(ret).c_str()); + throw std::runtime_error("writeSetting() " + _err2str(ret)); + } + } else { throw std::runtime_error("writeSetting(" + key + ") unknown setting"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/SoapyBladeRF-soapy-bladerf-0.4.3/debian/changelog new/SoapyBladeRF-soapy-bladerf-0.4.4/debian/changelog --- old/SoapyBladeRF-soapy-bladerf-0.4.3/debian/changelog 2026-10-10 16:10:06.000000000 +0200 +++ new/SoapyBladeRF-soapy-bladerf-0.4.4/debian/changelog 2026-11-13 08:55:31.000000000 +0100 @@ -1,3 +1,9 @@ +soapybladerf (0.4.4-1) unstable; urgency=low + + * Release 0.4.4 (2026-11-13) + + -- Christian W. Zuckschwerdt <[email protected]> Fri, 13 Nov 2026 08:00:00 -0000 + soapybladerf (0.4.3-1) unstable; urgency=low * Release 0.4.3 (2026-10-10)
