diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-04-07 17:42:07 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-04-07 17:42:07 -0700 |
| commit | 088b852844692e9d366e3e44336883adf0305623 (patch) | |
| tree | c25d8faef3a3364a3716c4a935c6a60c7d6515dc /host/docs | |
| parent | 2bdc0e2e31a302fb6016d0338c68acb13612e398 (diff) | |
| parent | 1a002d38ac27656d0bae4a06314add0f586195d1 (diff) | |
| download | uhd-088b852844692e9d366e3e44336883adf0305623.tar.gz uhd-088b852844692e9d366e3e44336883adf0305623.tar.bz2 uhd-088b852844692e9d366e3e44336883adf0305623.zip | |
Merge branch 'maint'
Conflicts:
host/lib/usrp/cores/gpio_core_200.cpp
Diffstat (limited to 'host/docs')
| -rw-r--r-- | host/docs/install.dox | 2 | ||||
| -rw-r--r-- | host/docs/usrp_b200.dox | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/host/docs/install.dox b/host/docs/install.dox index fc029b3e5..a6c96b2d3 100644 --- a/host/docs/install.dox +++ b/host/docs/install.dox @@ -101,7 +101,7 @@ This is an automated way of installing UHD from source. See also \ref build_pybo We recommend using MacPorts and actively support UHD development on OS X via this method. Using MacPorts, the correct hardware device images are automatically installed for you, -and there are no post install tasks. WIth a single command, you can be up and running in short order. +and there are no post install tasks. With a single command, you can be up and running in short order. If you do not already have MacPorts installed, you will need to install it first. Make sure to follow the MacPorts shell environment changes needed such that MacPorts installed executables are found before all others. These are the only changes to the shell environment needed to execute any MacPorts-installed executable. Setting any DYLD environment variable (e.g., DYLD_LIBRARY_PATH) for general use is highly discouraged, because doing so, in our experience, leads to problems down the road that are very difficult to diagnose. OSX provides robust means for correcting DYLD-based issues even after dependencies are installed. diff --git a/host/docs/usrp_b200.dox b/host/docs/usrp_b200.dox index a5b2ad947..c846e916f 100644 --- a/host/docs/usrp_b200.dox +++ b/host/docs/usrp_b200.dox @@ -185,7 +185,7 @@ Below is a table of the B200mini LED indicators and their meanings: </tr> </table> -TX LED indicators are on when transimitting data and off when no samples are +TX LED indicators are on when transmitting data and off when no samples are available to transmit. RX LED indicators are on when sending samples to the host and off when unable to do so. This means that TX/RX activity LED indicators will blink off in a temporary transmit underflow or receive overflow |