Merge branch 'master' into release_work

2 files changed, 31 insertions, 9 deletions

diff --git a/host/docs/dboards.rst b/host/docs/dboards.rst
index 42965b32f..959a1b300 100644
--- a/host/docs/dboards.rst
+++ b/host/docs/dboards.rst
@@ -258,6 +258,31 @@ Receive Gains:
 
 Bandwidth: 6MHz
 
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+TVRX2
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+The TVRX2 board has 2 real-mode subdevices.
+It is operated at a low IF.
+
+Receive Subdevices:
+* **Subdevice RX1:** real signal on antenna J100
+* **Subdevice RX2:** real signal on antenna J140
+
+Note: The TVRX2 has always-on AGC, the software controllable gain is the
+final gain stage which controls the AGC set-point for output to ADC.
+
+Receive Gains:
+
+* **IF**, Range: 0.0-30.0dB
+
+Bandwidth: 1.7MHz, 6MHz, 7MHz, 8MHz, 10MHz
+
+Sensors:
+
+* **lo_locked**: boolean for LO lock state
+* **rssi**: float for measured RSSI in dBm
+* **temperature**: float for measured temperature in degC
+
 ------------------------------------------------------------------------
 Daughterboard Modifications
 ------------------------------------------------------------------------
diff --git a/host/docs/usrp_e1xx.rst b/host/docs/usrp_e1xx.rst
index 036d2c02c..fcaa57716 100644
--- a/host/docs/usrp_e1xx.rst
+++ b/host/docs/usrp_e1xx.rst
@@ -35,12 +35,7 @@ To use the 61.44MHz clock rate, the USRP embedded will require two jumpers to be
 * J16 is a two pin header, remove the jumper (or leave it on pin1 only)
 * J15 is a three pin header, move the jumper to (pin1, pin2)
 
-Then run the following commands to record the setting into the EEPROM:
-::
-
-    cd <install-path>/share/uhd/utils
-    ./usrp_burn_mb_eeprom --key=mcr --val=61.44e6
-
+**Note:** See instructions below to communicate the desired clock rate into the UHD.
 
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Set other rates - uses internal VCO
@@ -50,11 +45,13 @@ To use other clock rates, the jumpers will need to be in the default position.
 * J16 is a two pin header, move the jumper to (pin1, pin2)
 * J15 is a three pin header, move the jumper to (pin2, pin3)
 
-Then run the following commands to record the setting into the EEPROM:
+To communicate the desired clock rate into the UHD,
+specify the a special device address argument,
+where the key is "master_clock_rate" and the value is a rate in Hz.
+Example:
 ::
 
-    cd <install-path>/share/uhd/utils
-    ./usrp_burn_mb_eeprom --key=mcr --val=<rate>
+    uhd_usrp_probe --args="master_clock_rate=52e6"
 
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Clock rate recovery - unbricking