From 2228c5c95c2c03bf4b453a14d38f43514603337b Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Tue, 27 Sep 2016 14:44:18 -0700 Subject: Legacy: Improve awareness of tick rates in a streamer Prevents incorrect errors about conflicting tickrates in a streamer --- host/lib/rfnoc/tick_node_ctrl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'host/lib') diff --git a/host/lib/rfnoc/tick_node_ctrl.cpp b/host/lib/rfnoc/tick_node_ctrl.cpp index fa5c7b6a1..5548194ae 100644 --- a/host/lib/rfnoc/tick_node_ctrl.cpp +++ b/host/lib/rfnoc/tick_node_ctrl.cpp @@ -37,9 +37,9 @@ double tick_node_ctrl::get_tick_rate( std::set< node_ctrl_base::sptr > explored_nodes(_explored_nodes); explored_nodes.insert(shared_from_this()); // Here, we need all up- and downstream nodes - std::vector< sptr > neighbouring_tick_nodes = find_downstream_node(); + std::vector< sptr > neighbouring_tick_nodes = find_downstream_node(true); { - std::vector< sptr > upstream_neighbouring_tick_nodes = find_upstream_node(); + std::vector< sptr > upstream_neighbouring_tick_nodes = find_upstream_node(true); neighbouring_tick_nodes.insert( neighbouring_tick_nodes.end(), upstream_neighbouring_tick_nodes.begin(), -- cgit v1.2.3 From d96950503bec5feef0704fe476d0ebe4c4787c3d Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Thu, 29 Sep 2016 11:59:20 -0700 Subject: Fix warning in e300_remote_codec_ctrl.cpp for gcc. The bigger question is why uhd forces the e300 code to have an implementation of an empty function. But, suppress the warning and let people fight about design later. Signed-off-by: Philip Balister --- host/lib/usrp/e300/e300_remote_codec_ctrl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'host/lib') diff --git a/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp b/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp index cb2583b1b..6ec39131d 100644 --- a/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp +++ b/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp @@ -36,8 +36,8 @@ public: { } - void set_timed_spi(uhd::spi_iface::sptr spi_iface, boost::uint32_t slave_num) {}; - void set_safe_spi(uhd::spi_iface::sptr spi_iface, boost::uint32_t slave_num) {}; + void set_timed_spi(uhd::spi_iface::sptr, boost::uint32_t ) {}; + void set_safe_spi(uhd::spi_iface::sptr, boost::uint32_t ) {}; double set_gain(const std::string &which, const double value) { -- cgit v1.2.3 From ad5b10677c91494f87c363e9096b7a2e61e414f6 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Tue, 18 Oct 2016 16:26:11 -0700 Subject: b200: Make sure no GPS settings are applied when no gpsdo present. This changes the exception message thrown when gpsdo is selected as a clock source, but does not change the exception. Note that before, during its first run, the B2x0 would happily accept gpsdo as a clock source even when none was present. --- host/lib/usrp/b200/b200_impl.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'host/lib') diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp index 33f0850eb..9bd2799c2 100644 --- a/host/lib/usrp/b200/b200_impl.cpp +++ b/host/lib/usrp/b200/b200_impl.cpp @@ -1041,8 +1041,11 @@ void b200_impl::update_clock_source(const std::string &source) } _adf4001_iface->set_lock_to_ext_ref(true); } - else if (_gps and source == "gpsdo") + else if (source == "gpsdo") { + if (not _gps or not _gps->gps_detected()) { + throw uhd::key_error("update_clock_source: gpsdo selected, but no gpsdo detected!"); + } if (_gpio_state.ref_sel != 1) { _gpio_state.ref_sel = 1; -- cgit v1.2.3