From b68412521f55d61429ecfe091b0b18d02c78becd Mon Sep 17 00:00:00 2001 From: Andrej Rode Date: Tue, 8 Nov 2016 18:18:48 -0800 Subject: devtest: test_base add wait time between uhd_usrp_probe calls --- host/tests/devtest/uhd_test_base.py | 1 + 1 file changed, 1 insertion(+) (limited to 'host') diff --git a/host/tests/devtest/uhd_test_base.py b/host/tests/devtest/uhd_test_base.py index 07a95ae3d..ae094c94b 100755 --- a/host/tests/devtest/uhd_test_base.py +++ b/host/tests/devtest/uhd_test_base.py @@ -57,6 +57,7 @@ class uhd_test_case(unittest.TestCase): if self.results_file and os.path.isfile(self.results_file): self.results = yaml.safe_load(open(self.results_file).read()) or {} self.args_str = os.getenv('_UHD_TEST_ARGS_STR', "") + time.sleep(15) # Wait for x300 devices to reclaim them self.usrp_info = get_usrp_list(self.args_str)[0] if not self.results.has_key(self.usrp_info['serial']): self.results[self.usrp_info['serial']] = {} -- cgit v1.2.3 From 69ad966a29575679a9ac77975b3352ba29a68139 Mon Sep 17 00:00:00 2001 From: Ashish Chaudhari Date: Mon, 14 Nov 2016 16:46:39 -0800 Subject: n230: Make second dual-eth addr consistent with standard - The second address argument was changed from "secondary-addr" to "second_addr" --- host/lib/usrp/n230/n230_impl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'host') diff --git a/host/lib/usrp/n230/n230_impl.cpp b/host/lib/usrp/n230/n230_impl.cpp index 24ef5d97d..015140fcc 100644 --- a/host/lib/usrp/n230/n230_impl.cpp +++ b/host/lib/usrp/n230/n230_impl.cpp @@ -201,8 +201,8 @@ n230_impl::n230_impl(const uhd::device_addr_t& dev_addr) //Initialize addresses std::vector ip_addrs(1, dev_addr["addr"]); - if (dev_addr.has_key("secondary-addr")) { - ip_addrs.push_back(dev_addr["secondary-addr"]); + if (dev_addr.has_key("second_addr")) { + ip_addrs.push_back(dev_addr["second_addr"]); } //Read EEPROM and perform version checks before talking to HW -- cgit v1.2.3