From f9230800e1643af8b804b9791dafe2692a9ca4a4 Mon Sep 17 00:00:00 2001 From: Sergey Musikhin <musihin_sergei@mail.ru> Date: Thu, 10 Jun 2021 12:55:10 +0000 Subject: [PATCH] bias_tee warnings, remove set_bias_tee from source and sink - now it is in bladerf_common --- lib/bladerf/bladerf_common.cc | 11 +++++++---- lib/bladerf/bladerf_sink_c.cc | 5 ----- lib/bladerf/bladerf_source_c.cc | 5 ----- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/lib/bladerf/bladerf_common.cc b/lib/bladerf/bladerf_common.cc index 96c7d48..11d4065 100644 --- a/lib/bladerf/bladerf_common.cc +++ b/lib/bladerf/bladerf_common.cc @@ -287,10 +287,13 @@ void bladerf_common::init(dict_t const &dict, bladerf_direction direction) }; if(dict.count(ch_label("bias_tee"))) { - auto status = bladerf_set_bias_tee(_dev.get(), ch, _get(dict, ch_label("bias_tee")) == "True"); - if (status != 0) { - BLADERF_WARNING("bladerf_set_bias_tee: " - << bladerf_strerror(status)); + auto status = bladerf_set_bias_tee(_dev.get(), ch, + _get(dict, ch_label("bias_tee")) == "True"); + if (BLADERF_ERR_UNSUPPORTED == status) { + // unsupported, but not worth crashing out + BLADERF_WARNING("Bias-tee not supported by device"); + } else if (status != 0) { + BLADERF_THROW_STATUS(status, "Failed to set bias-tee"); } } } diff --git a/lib/bladerf/bladerf_sink_c.cc b/lib/bladerf/bladerf_sink_c.cc index ca18746..1dbf3b5 100644 --- a/lib/bladerf/bladerf_sink_c.cc +++ b/lib/bladerf/bladerf_sink_c.cc @@ -91,11 +91,6 @@ bladerf_sink_c::bladerf_sink_c(const std::string &args) : "and will have no effect."); } - /* Bias tee */ - if (dict.count("biastee")) { - set_biastee_mode(dict["biastee"]); - } - /* Initialize channel <-> antenna map */ for (std::string ant : get_antennas()) { _chanmap[str2channel(ant)] = -1; diff --git a/lib/bladerf/bladerf_source_c.cc b/lib/bladerf/bladerf_source_c.cc index 0fc570f..c140f7f 100644 --- a/lib/bladerf/bladerf_source_c.cc +++ b/lib/bladerf/bladerf_source_c.cc @@ -102,11 +102,6 @@ bladerf_source_c::bladerf_source_c(const std::string &args) : } } - /* Bias tee */ - if (dict.count("biastee")) { - set_biastee_mode(dict["biastee"]); - } - /* Loopback */ set_loopback_mode(dict.count("loopback") ? dict["loopback"] : "none"); -- GitLab