From 0731c0256fc431825edc032e9e18ef2922632356 Mon Sep 17 00:00:00 2001 From: Moritz Fischer Date: Tue, 5 May 2015 09:33:58 -0700 Subject: doc: e300: gpio: Fix typo for GPIO example. The example code given in the docs would set the wrong bit. Signed-off-by: Moritz Fischer --- host/docs/gpio_api.dox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'host') diff --git a/host/docs/gpio_api.dox b/host/docs/gpio_api.dox index 186f28093..d3bb4f0a9 100644 --- a/host/docs/gpio_api.dox +++ b/host/docs/gpio_api.dox @@ -158,7 +158,7 @@ GPIO bank, where the controlled GPIO is now GPIO3 instead of GPIO6. usrp_e300->set_gpio_attr("INT0", "DDR", GPIO_DDR, ATR_MASKS); // let's manually set GPIO4 high - usrp_e300->set_gpio_attr("INT0", "OUT", 1, MAN_GPIO_MASK); + usrp_e300->set_gpio_attr("INT0", "OUT", (1 << 4), MAN_GPIO_MASK); // finally, let's set up GPIO6 as we described above usrp_e300->set_gpio_attr("INT0", "ATR_0X", 0, AMP_GPIO_MASK); -- cgit v1.2.3 From f4f1e5671df49572c77fe5ee0823846709540bb6 Mon Sep 17 00:00:00 2001 From: Moritz Fischer Date: Tue, 5 May 2015 09:43:50 -0700 Subject: doc: e300: Remove bandwidth promises. Signed-off-by: Moritz Fischer --- host/docs/usrp_e3x0.dox | 1 - 1 file changed, 1 deletion(-) (limited to 'host') diff --git a/host/docs/usrp_e3x0.dox b/host/docs/usrp_e3x0.dox index 2965f4dad..717e864da 100644 --- a/host/docs/usrp_e3x0.dox +++ b/host/docs/usrp_e3x0.dox @@ -21,7 +21,6 @@ - Timed commands in FPGA - Timed sampling in FPGA - 16-bit fixed point sample mode (sc16) - - Up to 10 MHz of RF bandwidth with 16-bit samples \section e3x0_getting_started Getting started -- cgit v1.2.3 From ebc54485b8754756b1deafb15cce366e77f2f039 Mon Sep 17 00:00:00 2001 From: Moritz Fischer Date: Tue, 5 May 2015 15:39:18 -0700 Subject: doc: e3x0: Added partno. for E310 locking power connector. Signed-off-by: Moritz Fischer --- host/docs/usrp_e3x0.dox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'host') diff --git a/host/docs/usrp_e3x0.dox b/host/docs/usrp_e3x0.dox index 717e864da..a14553734 100644 --- a/host/docs/usrp_e3x0.dox +++ b/host/docs/usrp_e3x0.dox @@ -276,7 +276,7 @@ You may need to change the USRP's IP address for several reasons: \image html e3x0_rp_overlay.png "USRP E310 Rear Panel" -- **PWR**: Locking connector for the USRP-E Series power supply +- **PWR**: Locking connector (Kycon KLDHCX-0202-A-LT) for the USRP-E Series power supply - **1G ETH**: RJ45 port for Ethernet interfaces - **USB**: USB 2.0 Port - **SERIAL**: Micro USB connection for serial uart console -- cgit v1.2.3 From 5c5bbac3e0bf553981c38ee8b1503f1154d7f6c6 Mon Sep 17 00:00:00 2001 From: michael-west Date: Mon, 4 May 2015 15:14:32 -0700 Subject: B200: Made find function properly ignore missing "product" value (BUG #770) --- host/lib/usrp/b200/b200_impl.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'host') diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp index 724f5f8b9..bd07fcaee 100644 --- a/host/lib/usrp/b200/b200_impl.cpp +++ b/host/lib/usrp/b200/b200_impl.cpp @@ -171,10 +171,8 @@ static device_addrs_t b200_find(const device_addr_t &hint) new_addr["product"] = B2X0_STR_NAMES[get_b200_type(mb_eeprom)]; } catch (const uhd::runtime_error &e) { // No problem if this fails -- this is just device discovery, after all. - UHD_MSG(error) << e.what() << std::endl; - // Skip this loop. - continue; } + //this is a found b200 when the hint serial and name match or blank if ( (not hint.has_key("name") or hint["name"] == new_addr["name"]) and -- cgit v1.2.3