diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-18 11:24:22 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-18 11:24:22 -0700 |
| commit | 714ef5678f4d1ec9c7cb11283d2cedd36d547f9f (patch) | |
| tree | 50474a3e1fe3b2829abc65653ae1f0d3f112c62a | |
| parent | 9954d0394f7ba5c301f3e6d3e4fccdc90ad1d3c8 (diff) | |
| parent | d2c35958e3de08601d9e192ab70d19c71a03c77b (diff) | |
Merge branch 'master' into next
| -rw-r--r-- | docs/sphinx/source/index.rst | 2 | ||||
| -rw-r--r-- | docs/sphinx/source/uhd.rst | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/docs/sphinx/source/index.rst b/docs/sphinx/source/index.rst index ea80abc230..4211eeab11 100644 --- a/docs/sphinx/source/index.rst +++ b/docs/sphinx/source/index.rst @@ -32,7 +32,7 @@ Core Framework gnuradio.qtgui <qtgui/index> gnuradio.wxgui <wxgui/index> -Harware Interfaces +Hardware Interfaces ------------------ .. autosummary:: diff --git a/docs/sphinx/source/uhd.rst b/docs/sphinx/source/uhd.rst index 92f4bdc8c2..d9ecf3a519 100644 --- a/docs/sphinx/source/uhd.rst +++ b/docs/sphinx/source/uhd.rst @@ -6,4 +6,13 @@ gnuradio.uhd .. autooldblock:: gnuradio.uhd.usrp_sink .. autooldblock:: gnuradio.uhd.usrp_source .. autooldblock:: gnuradio.uhd.amsg_source +.. autoclass:: gnuradio.uhd.stream_cmd_t +.. autoclass:: gnuradio.uhd.time_spec_t +.. autoclass:: gnuradio.uhd.meta_range_t +.. autoclass:: gnuradio.uhd.stream_args_t +.. autoclass:: gnuradio.uhd.device_addr_t +.. autoclass:: gnuradio.uhd.tune_request_t +.. autoclass:: gnuradio.uhd.tune_result_t +.. autoclass:: gnuradio.uhd.sensor_value_t + |