diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-05-05 17:11:33 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-05-05 17:11:33 -0700 |
| commit | e81f9ee3c7405b99cd4f06e5076205fcce1b95a5 (patch) | |
| tree | b6d354e428a612a159f7fc325f00ee73278317d1 /host | |
| parent | a0b808e158e75369cfe6f4c97224952664939fdd (diff) | |
| parent | 5c5bbac3e0bf553981c38ee8b1503f1154d7f6c6 (diff) | |
| download | uhd-e81f9ee3c7405b99cd4f06e5076205fcce1b95a5.tar.gz uhd-e81f9ee3c7405b99cd4f06e5076205fcce1b95a5.tar.bz2 uhd-e81f9ee3c7405b99cd4f06e5076205fcce1b95a5.zip | |
Merge branch 'maint'
Diffstat (limited to 'host')
| -rw-r--r-- | host/docs/gpio_api.dox | 2 | ||||
| -rw-r--r-- | host/docs/usrp_e3x0.dox | 3 |
2 files changed, 2 insertions, 3 deletions
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); diff --git a/host/docs/usrp_e3x0.dox b/host/docs/usrp_e3x0.dox index 91682f0b9..d5e18dbb1 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 @@ -277,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 |