diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
| commit | eea870b1dd9c5b90dfa7d94e6a15ffe44cfbee7f (patch) | |
| tree | af3aa889c94cff9c503edefeaf19cb3635693bfb /docs | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/doxygen/Doxyfile.in | 101 | ||||
| -rw-r--r-- | docs/doxygen/Doxyfile.swig_doc.in | 2 | ||||
| -rw-r--r-- | docs/doxygen/other/extra_pages.dox | 4 | ||||
| -rw-r--r-- | docs/doxygen/other/metadata.dox | 2 | ||||
| -rw-r--r-- | docs/doxygen/other/pmt.dox | 4 | ||||
| -rw-r--r-- | docs/doxygen/other/thread_affinity.dox | 8 | ||||
| -rw-r--r-- | docs/sphinx/source/audio/index.rst | 4 | ||||
| -rw-r--r-- | docs/sphinx/source/digital/blocks.rst | 69 | ||||
| -rw-r--r-- | docs/sphinx/source/digital/index.rst | 1 | ||||
| -rw-r--r-- | docs/sphinx/source/gr/index.rst | 11 | ||||
| -rw-r--r-- | docs/sphinx/source/gr/sink_blk.rst | 5 | ||||
| -rw-r--r-- | docs/sphinx/source/index.rst | 24 | ||||
| -rw-r--r-- | docs/sphinx/source/noaa.rst | 6 | ||||
| -rw-r--r-- | docs/sphinx/source/pager/blks.rst | 10 | ||||
| -rw-r--r-- | docs/sphinx/source/trellis/blks.rst | 118 | ||||
| -rw-r--r-- | docs/sphinx/source/uhd.rst | 6 | ||||
| -rw-r--r-- | docs/sphinx/source/video_sdl.rst | 4 | ||||
| -rw-r--r-- | docs/sphinx/source/vocoder/blks.rst | 32 | ||||
| -rw-r--r-- | docs/sphinx/source/wxgui/blks.rst | 3 | ||||
| -rw-r--r-- | docs/sphinx/source/wxgui/index.rst | 2 |
20 files changed, 205 insertions, 211 deletions
diff --git a/docs/doxygen/Doxyfile.in b/docs/doxygen/Doxyfile.in index ccd647134b..fdc7e1066b 100644 --- a/docs/doxygen/Doxyfile.in +++ b/docs/doxygen/Doxyfile.in @@ -580,48 +580,71 @@ EXCLUDE = @abs_top_builddir@/docs/doxygen/html \ @abs_top_builddir@/docs/doxygen/xml \ @abs_top_builddir@/docs/doxygen/other/doxypy.py \ @abs_top_builddir@/dtools \ - @abs_top_builddir@/gnuradio-core/src/lib/bug_work_around_6.cc \ - @abs_top_builddir@/gnuradio-core/src/lib/gengen/generate_all.py \ - @abs_top_builddir@/gnuradio-core/src/lib/gengen/generate_common.py \ - @abs_top_builddir@/gnuradio-core/src/lib/missing/bug_work_around_8.cc \ - @abs_top_builddir@/gnuradio-core/src/lib/missing/getopt.h \ - @abs_top_builddir@/gnuradio-core/src/lib/runtime/gr_error_handler.cc \ - @abs_top_builddir@/gnuradio-core/src/lib/swig \ - @abs_top_builddir@/gnuradio-core/src/python/bin \ - @abs_top_builddir@/gnuradio-core/src/python/build_utils.py \ - @abs_top_builddir@/gnuradio-core/src/python/build_utils_codes.py \ - @abs_top_builddir@/gnuradio-core/src/python/gnuradio/gr/gr_threading.py \ - @abs_top_builddir@/gnuradio-core/src/python/gnuradio/gr/gr_threading_23.py \ - @abs_top_builddir@/gnuradio-core/src/python/gnuradio/gr/gr_threading_24.py \ - @abs_top_builddir@/gnuradio-core/src/tests \ - @abs_top_builddir@/gnuradio-core/src/utils \ - @abs_top_builddir@/gnuradio-examples/python/apps/hf_radio/output.py \ - @abs_top_builddir@/gnuradio-examples/python/apps/hf_radio/ui.py \ - @abs_top_builddir@/gr-atsc/src/lib/atsc.cc \ - @abs_top_builddir@/gr-atsc/src/lib/atsc.py \ - @abs_top_builddir@/gr-atsc/src/lib/gen_encoder.py \ - @abs_top_builddir@/gr-atsc/src/python \ - @abs_top_builddir@/gr-atsc/src/python \ - @abs_top_builddir@/gr-audio-alsa/src/audio-alsa.py \ - @abs_top_builddir@/gr-audio-oss/src/audio_oss.py \ - @abs_top_builddir@/gr-audio-osx/src/test_audio_loop.py \ - @abs_top_builddir@/gr-gsm-fr-vocoder/src/lib/gsm \ - @abs_top_builddir@/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.py \ - @abs_top_builddir@/gr-gsm-fr-vocoder/src/python/encdec.py \ - @abs_top_builddir@/gr-howto-write-a-block \ - @abs_top_builddir@/gr-pager/src/pager_swig.py \ + @abs_top_builddir@/gnuradio-runtime/lib/runtime/gr_error_handler.cc \ + @abs_top_builddir@/gnuradio-runtime/swig \ + @abs_top_builddir@/gnuradio-runtime/python/build_utils.py \ + @abs_top_builddir@/gnuradio-runtime/python/build_utils_codes.py \ + @abs_top_builddir@/gnuradio-runtime/python/gnuradio/gr/gr_threading.py \ + @abs_top_builddir@/gnuradio-runtime/python/gnuradio/gr/gr_threading_23.py \ + @abs_top_builddir@/gnuradio-runtime/python/gnuradio/gr/gr_threading_24.py \ + @abs_top_builddir@/gr-atsc/swig/atsc_swig.py \ + @abs_top_builddir@/gr-atsc/lib/gen_encoder.py \ + @abs_top_builddir@/gr-atsc/python \ + @abs_top_builddir@/gr-pager/swig/pager_swig.py \ @abs_top_builddir@/gr-trellis/doc \ - @abs_top_builddir@/gr-trellis/src/lib/generate_all.py \ - @abs_top_builddir@/gr-trellis/src/lib/generate_trellis.py \ - @abs_top_builddir@/gr-trellis/src/lib/trellis.py \ - @abs_top_builddir@/gr-video-sdl/src/video_sdl.py \ - @abs_top_builddir@/gr-wxgui/src/python \ + @abs_top_builddir@/gr-trellis/swig/trellis_swig.py \ + @abs_top_builddir@/gr-video-sdl/swig/video_sdl_swig.py \ + @abs_top_builddir@/gr-wxgui/python \ @abs_top_builddir@/grc \ @abs_top_builddir@/_CPack_Packages \ @abs_top_srcdir@/cmake \ - @abs_top_srcdir@/gr-qtgui/lib \ - @abs_top_srcdir@/gr-howto-write-a-block \ - @abs_top_srcdir@/gr-utils/python/modtool/gr-newmod + @abs_top_srcdir@/gr-utils/python/modtool/gr-newmod \ + @abs_top_srcdir@/docs/doxygen/doxyxml/example \ + @abs_top_srcdir@/docs/sphinx \ + @abs_top_srcdir@/gnuradio-runtime/lib \ + @abs_top_builddir@/gnuradio-runtime/lib \ + @abs_top_srcdir@/gr-analog/lib \ + @abs_top_builddir@/gr-analog/lib \ + @abs_top_srcdir@/gr-atsc/lib \ + @abs_top_builddir@/gr-atsc/lib \ + @abs_top_srcdir@/gr-audio/lib \ + @abs_top_builddir@/gr-audio/lib \ + @abs_top_srcdir@/gr-blocks/lib \ + @abs_top_builddir@/gr-blocks/lib \ + @abs_top_srcdir@/gr-channels/lib \ + @abs_top_builddir@/gr-channels/lib \ + @abs_top_srcdir@/gr-comedi/lib \ + @abs_top_builddir@/gr-comedi/lib \ + @abs_top_srcdir@/gr-digital/lib \ + @abs_top_builddir@/gr-digital/lib \ + @abs_top_srcdir@/gr-fcd/lib \ + @abs_top_builddir@/gr-fcd/lib \ + @abs_top_srcdir@/gr-fec/lib \ + @abs_top_builddir@/gr-fec/lib \ + @abs_top_srcdir@/gr-filter/lib \ + @abs_top_builddir@/gr-filter/lib \ + @abs_top_srcdir@/gr-noaa/lib \ + @abs_top_builddir@/gr-noaa/lib \ + @abs_top_srcdir@/gr-pager/lib \ + @abs_top_builddir@/gr-pager/lib \ + @abs_top_srcdir@/gr-qtgui/lib \ + @abs_top_builddir@/gr-qtgui/lib \ + @abs_top_srcdir@/gr-shd/lib \ + @abs_top_builddir@/gr-shd/lib \ + @abs_top_srcdir@/gr-trellis/lib \ + @abs_top_builddir@/gr-trellis/lib \ + @abs_top_srcdir@/gr-uhd/lib \ + @abs_top_builddir@/gr-uhd/lib \ + @abs_top_srcdir@/gr-utils/lib \ + @abs_top_builddir@/gr-utils/lib \ + @abs_top_srcdir@/gr-video-sdl/lib \ + @abs_top_builddir@/gr-video-sdl/lib \ + @abs_top_srcdir@/gr-vocoder/lib \ + @abs_top_builddir@/gr-vocoder/lib \ + @abs_top_srcdir@/gr-wavelet/lib \ + @abs_top_builddir@/gr-wavelet/lib \ + @abs_top_srcdir@/gr-wxgui/lib \ + @abs_top_builddir@/gr-wxgui/lib # The EXCLUDE_SYMLINKS tag can be used select whether or not files or # directories that are symbolic links (a Unix filesystem feature) are excluded @@ -1254,7 +1277,7 @@ SEARCH_INCLUDES = YES # contain include files that are not input files but should be processed by # the preprocessor. -INCLUDE_PATH = @abs_top_builddir@/gruel/src/lib/pmt/ +INCLUDE_PATH = @abs_top_builddir@/gnuradio-runtime/lib/pmt/ # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard # patterns (like *.h and *.hpp) to filter out the header-files in the diff --git a/docs/doxygen/Doxyfile.swig_doc.in b/docs/doxygen/Doxyfile.swig_doc.in index 8f6182ca83..c1423b30c2 100644 --- a/docs/doxygen/Doxyfile.swig_doc.in +++ b/docs/doxygen/Doxyfile.swig_doc.in @@ -591,7 +591,7 @@ RECURSIVE = YES # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = @CMAKE_SOURCE_DIR@/gr-qtgui/lib +EXCLUDE = # The EXCLUDE_SYMLINKS tag can be used select whether or not files or # directories that are symbolic links (a Unix filesystem feature) are excluded diff --git a/docs/doxygen/other/extra_pages.dox b/docs/doxygen/other/extra_pages.dox index 94c741864d..8d9b69a87b 100644 --- a/docs/doxygen/other/extra_pages.dox +++ b/docs/doxygen/other/extra_pages.dox @@ -122,11 +122,11 @@ built or installed. The -DENABLE_DEFAULT=False can be used to disable all components. Individual components can then be selectively turned back -on. For example, just buidling the Volk and Gruel libraries can be +on. For example, just buidling the Volk library can be done with this: \code -cmake -DENABLE_DEFAULT=Off -DENABLE_VOLK=True -DENABLE_GRUEL=True <srcdir> +cmake -DENABLE_DEFAULT=Off -DENABLE_VOLK=True <srcdir> \endcode diff --git a/docs/doxygen/other/metadata.dox b/docs/doxygen/other/metadata.dox index 76553c696a..03ebe591e4 100644 --- a/docs/doxygen/other/metadata.dox +++ b/docs/doxygen/other/metadata.dox @@ -309,7 +309,7 @@ into the metadata to keep track of later. The date in this case is encoded as a vector of uint16 with [day, month, year]. \code - from gruel import pmt + import pmt from gnuradio import blocks key = pmt.intern("date") diff --git a/docs/doxygen/other/pmt.dox b/docs/doxygen/other/pmt.dox index ba97863a08..04f58aafc8 100644 --- a/docs/doxygen/other/pmt.dox +++ b/docs/doxygen/other/pmt.dox @@ -173,7 +173,7 @@ reference to the old dictionary. This just keeps our number of variables small. \code -from gruel import pmt +import pmt key0 = pmt.intern("int") val0 = pmt.from_long(123) @@ -303,7 +303,7 @@ ready to be written to a file and then deserialize it back to its original PMT. \code -from gruel import pmt +import pmt key0 = pmt.intern("int") val0 = pmt.from_long(123) diff --git a/docs/doxygen/other/thread_affinity.dox b/docs/doxygen/other/thread_affinity.dox index 235266febd..2f31d9ce53 100644 --- a/docs/doxygen/other/thread_affinity.dox +++ b/docs/doxygen/other/thread_affinity.dox @@ -6,8 +6,8 @@ In the thread-per-block scheduler, you can set the block's core affinity. Each block can be pinned to a group cores or be set back to use the standard kernel scheduler. -The implementation is done by adding new functions to the GRUEL -library: +The implementation is done by adding new functions to the threading +section of the gnuradio-runtime library: \code gr_thread_t get_current_thread_id(); @@ -21,7 +21,7 @@ library: The ability to set a thread's affinity to a core or groups of cores is not implemented in the Boost thread library, and so we have made our -own portability library. In particular, the gruel::gr_thread_t type is +own portability library. In particular, the gr::thread::gr_thread_t type is defined as the thread type for the given system. The other functions are designed to be portable as well by calling the specific implementation for the thread affinity for a particular platform. @@ -43,7 +43,7 @@ Each block has two new data members: - threaded: a boolean value that is true if the block is attached to a thread. -- thread: a gruel::gr_thread_t handle to the block's thread. +- thread: a gr::thread::gr_thread_t handle to the block's thread. A block can set and unset it's affinity at any time using the following member functions: diff --git a/docs/sphinx/source/audio/index.rst b/docs/sphinx/source/audio/index.rst index d0bc4f3c08..31d53567b8 100644 --- a/docs/sphinx/source/audio/index.rst +++ b/docs/sphinx/source/audio/index.rst @@ -3,5 +3,5 @@ gnuradio.audio .. automodule:: gnuradio.audio -.. autooldblock:: gnuradio.audio.source -.. autooldblock:: gnuradio.audio.sink +.. autoblock:: gnuradio.audio.source +.. autoblock:: gnuradio.audio.sink diff --git a/docs/sphinx/source/digital/blocks.rst b/docs/sphinx/source/digital/blocks.rst index 32eb25608b..2c5218c372 100644 --- a/docs/sphinx/source/digital/blocks.rst +++ b/docs/sphinx/source/digital/blocks.rst @@ -1,41 +1,40 @@ gnuradio.digital: Signal Processing Blocks ========================================== -.. autooldblock:: gnuradio.digital.fll_band_edge_cc -.. autooldblock:: gnuradio.digital.kurtotic_equalizer_cc -.. autooldblock:: gnuradio.digital.lms_dd_equalizer_cc -.. autooldblock:: gnuradio.digital.mpsk_receiver_cc -.. autooldblock:: gnuradio.digital.mpsk_snr_est_cc -.. autooldblock:: gnuradio.digital.clock_recovery_mm_cc -.. autooldblock:: gnuradio.digital.clock_recovery_mm_ff -.. autooldblock:: gnuradio.digital.constellation_decoder_cb -.. autooldblock:: gnuradio.digital.constellation_receiver_cb -.. autooldblock:: gnuradio.digital.correlate_access_code_bb -.. autooldblock:: gnuradio.digital.costas_loop_cc -.. autooldblock:: gnuradio.digital.cma_equalizer_cc -.. autooldblock:: gnuradio.digital.binary_slicer_fb -.. autooldblock:: gnuradio.digital.gmskmod_bc -.. autooldblock:: gnuradio.digital.probe_mpsk_snr_est_c -.. autooldblock:: gnuradio.digital.cpmmod_bc -.. autooldblock:: gnuradio.digital.glfsr_source_b -.. autooldblock:: gnuradio.digital.glfsr_source_f -.. autooldblock:: gnuradio.digital.framer_sink_1 -.. autooldblock:: gnuradio.digital.framer_sink_1 -.. autooldblock:: gnuradio.digital.additive_scrambler_bb -.. autooldblock:: gnuradio.digital.descrambler_bb -.. autooldblock:: gnuradio.digital.diff_decoder_bb -.. autooldblock:: gnuradio.digital.diff_encoder_bb -.. autooldblock:: gnuradio.digital.map_bb -.. autooldblock:: gnuradio.digital.scrambler_bb -.. autooldblock:: gnuradio.digital.pn_correlator_cc -.. autooldblock:: gnuradio.digital.simple_framer -.. autooldblock:: gnuradio.digital.bytes_to_syms -.. autooldblock:: gnuradio.digital.chunks_to_symbols_bc -.. autooldblock:: gnuradio.digital.chunks_to_symbols_bf -.. autooldblock:: gnuradio.digital.chunks_to_symbols_ic -.. autooldblock:: gnuradio.digital.chunks_to_symbols_if -.. autooldblock:: gnuradio.digital.chunks_to_symbols_sc -.. autooldblock:: gnuradio.digital.chunks_to_symbols_sf +.. autoblock:: gnuradio.digital.fll_band_edge_cc +.. autoblock:: gnuradio.digital.kurtotic_equalizer_cc +.. autoblock:: gnuradio.digital.lms_dd_equalizer_cc +.. autoblock:: gnuradio.digital.mpsk_receiver_cc +.. autoblock:: gnuradio.digital.mpsk_snr_est_cc +.. autoblock:: gnuradio.digital.clock_recovery_mm_cc +.. autoblock:: gnuradio.digital.clock_recovery_mm_ff +.. autoblock:: gnuradio.digital.constellation_decoder_cb +.. autoblock:: gnuradio.digital.constellation_receiver_cb +.. autoblock:: gnuradio.digital.correlate_access_code_bb +.. autoblock:: gnuradio.digital.costas_loop_cc +.. autoblock:: gnuradio.digital.cma_equalizer_cc +.. autoblock:: gnuradio.digital.binary_slicer_fb +.. autoblock:: gnuradio.digital.gmskmod_bc +.. autoblock:: gnuradio.digital.probe_mpsk_snr_est_c +.. autoblock:: gnuradio.digital.cpmmod_bc +.. autoblock:: gnuradio.digital.glfsr_source_b +.. autoblock:: gnuradio.digital.glfsr_source_f +.. autoblock:: gnuradio.digital.framer_sink_1 +.. autoblock:: gnuradio.digital.framer_sink_1 +.. autoblock:: gnuradio.digital.additive_scrambler_bb +.. autoblock:: gnuradio.digital.descrambler_bb +.. autoblock:: gnuradio.digital.diff_decoder_bb +.. autoblock:: gnuradio.digital.diff_encoder_bb +.. autoblock:: gnuradio.digital.map_bb +.. autoblock:: gnuradio.digital.scrambler_bb +.. autoblock:: gnuradio.digital.pn_correlator_cc +.. autoblock:: gnuradio.digital.simple_framer +.. autoblock:: gnuradio.digital.chunks_to_symbols_bc +.. autoblock:: gnuradio.digital.chunks_to_symbols_bf +.. autoblock:: gnuradio.digital.chunks_to_symbols_ic +.. autoblock:: gnuradio.digital.chunks_to_symbols_if +.. autoblock:: gnuradio.digital.chunks_to_symbols_sc +.. autoblock:: gnuradio.digital.chunks_to_symbols_sf .. autopyblock:: gnuradio.digital.generic_demod .. autopyblock:: gnuradio.digital.generic_mod .. autopyblock:: gnuradio.digital.bpsk.dbpsk_demod diff --git a/docs/sphinx/source/digital/index.rst b/docs/sphinx/source/digital/index.rst index 14c84fe4bb..adf8065aca 100644 --- a/docs/sphinx/source/digital/index.rst +++ b/docs/sphinx/source/digital/index.rst @@ -36,7 +36,6 @@ Signal Processing Blocks gnuradio.digital.scrambler_bb gnuradio.digital.pn_correlator_cc gnuradio.digital.simple_framer - gnuradio.digital.bytes_to_syms gnuradio.digital.chunks_to_symbols_bc gnuradio.digital.chunks_to_symbols_bf gnuradio.digital.chunks_to_symbols_ic diff --git a/docs/sphinx/source/gr/index.rst b/docs/sphinx/source/gr/index.rst index 777ec7fa68..9ae25d38cf 100644 --- a/docs/sphinx/source/gr/index.rst +++ b/docs/sphinx/source/gr/index.rst @@ -15,17 +15,6 @@ Top Block and Hierarchical Block Base Classes gnuradio.gr.top_block gnuradio.gr.hier_block2 - -Signal Sinks -^^^^^^^^^^^^ - -.. autosummary:: - :nosignatures: - - gnuradio.gr.histo_sink_f - gnuradio.gr.oscope_sink_f - - Miscellaneous ------------- diff --git a/docs/sphinx/source/gr/sink_blk.rst b/docs/sphinx/source/gr/sink_blk.rst deleted file mode 100644 index 06fea4dcf9..0000000000 --- a/docs/sphinx/source/gr/sink_blk.rst +++ /dev/null @@ -1,5 +0,0 @@ -gnuradio.gr: Signal Sinks -========================= - -.. autooldblock:: gnuradio.gr.histo_sink_f -.. autooldblock:: gnuradio.gr.oscope_sink_f diff --git a/docs/sphinx/source/index.rst b/docs/sphinx/source/index.rst index 4211eeab11..fd7a2421e0 100644 --- a/docs/sphinx/source/index.rst +++ b/docs/sphinx/source/index.rst @@ -18,6 +18,7 @@ Core Framework gnuradio.gr_unittest gnuradio.qtgui gnuradio.wxgui + gnuradio.window .. toctree:: :hidden: @@ -31,9 +32,10 @@ Core Framework gnuradio.fft <fft> gnuradio.qtgui <qtgui/index> gnuradio.wxgui <wxgui/index> + gnuradio.window <window/index> Hardware Interfaces ------------------- +------------------- .. autosummary:: :nosignatures: @@ -90,33 +92,15 @@ Framework Extensions .. toctree:: :hidden: - coding <gr/coding_blk> - converter <gr/converter_blk> - demodulation <gr/demodulation_blk> - dft <gr/dft_blk> - filter <gr/filter_blk> - filter_design <gr/filter_design> internal <gr/internal> - level <gr/level_blk> - math <gr/math_blk> - misc <gr/misc> - misc <gr/misc_blk> - modulation <gr/modulation_blk> - sink <gr/sink_blk> - slicedice <gr/slicedice_blk> - source <gr/source_blk> - sync <gr/sync_blk> top_block <gr/top_block> - + misc <gr/misc> atsc_blks <atsc/blks> - blks <blks2/blks> - blks2_utilities <blks2/utilities> digital_blocks <digital/blocks> constellations <digital/constellations> ofdm <digital/ofdm> pkt_utils <digital/pkt_utils> digital_utilities <digital/utilities> - optfir <optfir/detail> pager_blks <pager/blks> pyqt_filter <pyqt_filter> pyqt_plot <pyqt_plot> diff --git a/docs/sphinx/source/noaa.rst b/docs/sphinx/source/noaa.rst index 65461f99b8..06c7078130 100644 --- a/docs/sphinx/source/noaa.rst +++ b/docs/sphinx/source/noaa.rst @@ -3,6 +3,6 @@ gnuradio.noaa .. automodule:: gnuradio.noaa -.. autooldblock:: gnuradio.noaa.hrpt_decoder -.. autooldblock:: gnuradio.noaa.hrpt_deframer -.. autooldblock:: gnuradio.noaa.hrpt_pll_cf +.. autoblock:: gnuradio.noaa.hrpt_decoder +.. autoblock:: gnuradio.noaa.hrpt_deframer +.. autoblock:: gnuradio.noaa.hrpt_pll_cf diff --git a/docs/sphinx/source/pager/blks.rst b/docs/sphinx/source/pager/blks.rst index a36103d1fa..9b5a2ca70d 100644 --- a/docs/sphinx/source/pager/blks.rst +++ b/docs/sphinx/source/pager/blks.rst @@ -1,9 +1,9 @@ gnuradio.pager: Signal Processing Blocks ======================================== -.. autooldblock:: gnuradio.pager.flex_deinterleave +.. autoblock:: gnuradio.pager.flex_deinterleave .. autopyblock:: gnuradio.pager.flex_demod -.. autooldblock:: gnuradio.pager.flex_frame -.. autooldblock:: gnuradio.pager.flex_parse -.. autooldblock:: gnuradio.pager.flex_sync -.. autooldblock:: gnuradio.pager.slicer_fb +.. autoblock:: gnuradio.pager.flex_frame +.. autoblock:: gnuradio.pager.flex_parse +.. autoblock:: gnuradio.pager.flex_sync +.. autoblock:: gnuradio.pager.slicer_fb diff --git a/docs/sphinx/source/trellis/blks.rst b/docs/sphinx/source/trellis/blks.rst index d82319bad6..a2eda07d61 100644 --- a/docs/sphinx/source/trellis/blks.rst +++ b/docs/sphinx/source/trellis/blks.rst @@ -1,62 +1,62 @@ gnuradio.trellis: Signal Processing Blocks ========================================== -.. autooldblock:: gnuradio.trellis.constellation_metrics_cf -.. autooldblock:: gnuradio.trellis.encoder_bb -.. autooldblock:: gnuradio.trellis.encoder_bi -.. autooldblock:: gnuradio.trellis.encoder_bs -.. autooldblock:: gnuradio.trellis.encoder_ii -.. autooldblock:: gnuradio.trellis.encoder_si -.. autooldblock:: gnuradio.trellis.encoder_ss -.. autooldblock:: gnuradio.trellis.metrics_c -.. autooldblock:: gnuradio.trellis.metrics_f -.. autooldblock:: gnuradio.trellis.metrics_i -.. autooldblock:: gnuradio.trellis.metrics_s -.. autooldblock:: gnuradio.trellis.pccc_decoder_b -.. autooldblock:: gnuradio.trellis.pccc_decoder_combined_cb -.. autooldblock:: gnuradio.trellis.pccc_decoder_combined_ci -.. autooldblock:: gnuradio.trellis.pccc_decoder_combined_cs -.. autooldblock:: gnuradio.trellis.pccc_decoder_combined_fb -.. autooldblock:: gnuradio.trellis.pccc_decoder_combined_fi -.. autooldblock:: gnuradio.trellis.pccc_decoder_combined_fs -.. autooldblock:: gnuradio.trellis.pccc_decoder_i -.. autooldblock:: gnuradio.trellis.pccc_decoder_s -.. autooldblock:: gnuradio.trellis.pccc_encoder_bb -.. autooldblock:: gnuradio.trellis.pccc_encoder_bi -.. autooldblock:: gnuradio.trellis.pccc_encoder_bs -.. autooldblock:: gnuradio.trellis.pccc_encoder_ii -.. autooldblock:: gnuradio.trellis.pccc_encoder_si -.. autooldblock:: gnuradio.trellis.pccc_encoder_ss -.. autooldblock:: gnuradio.trellis.permutation -.. autooldblock:: gnuradio.trellis.sccc_decoder_b -.. autooldblock:: gnuradio.trellis.sccc_decoder_combined_cb -.. autooldblock:: gnuradio.trellis.sccc_decoder_combined_ci -.. autooldblock:: gnuradio.trellis.sccc_decoder_combined_cs -.. autooldblock:: gnuradio.trellis.sccc_decoder_combined_fb -.. autooldblock:: gnuradio.trellis.sccc_decoder_combined_fi -.. autooldblock:: gnuradio.trellis.sccc_decoder_combined_fs -.. autooldblock:: gnuradio.trellis.sccc_decoder_i -.. autooldblock:: gnuradio.trellis.sccc_decoder_s -.. autooldblock:: gnuradio.trellis.sccc_encoder_bb -.. autooldblock:: gnuradio.trellis.sccc_encoder_bi -.. autooldblock:: gnuradio.trellis.sccc_encoder_bs -.. autooldblock:: gnuradio.trellis.sccc_encoder_ii -.. autooldblock:: gnuradio.trellis.sccc_encoder_si -.. autooldblock:: gnuradio.trellis.sccc_encoder_ss -.. autooldblock:: gnuradio.trellis.siso_combined_f -.. autooldblock:: gnuradio.trellis.siso_f -.. autooldblock:: gnuradio.trellis.viterbi_b -.. autooldblock:: gnuradio.trellis.viterbi_combined_cb -.. autooldblock:: gnuradio.trellis.viterbi_combined_ci -.. autooldblock:: gnuradio.trellis.viterbi_combined_cs -.. autooldblock:: gnuradio.trellis.viterbi_combined_fb -.. autooldblock:: gnuradio.trellis.viterbi_combined_fi -.. autooldblock:: gnuradio.trellis.viterbi_combined_fs -.. autooldblock:: gnuradio.trellis.viterbi_combined_ib -.. autooldblock:: gnuradio.trellis.viterbi_combined_ii -.. autooldblock:: gnuradio.trellis.viterbi_combined_is -.. autooldblock:: gnuradio.trellis.viterbi_combined_sb -.. autooldblock:: gnuradio.trellis.viterbi_combined_si -.. autooldblock:: gnuradio.trellis.viterbi_combined_ss -.. autooldblock:: gnuradio.trellis.viterbi_i -.. autooldblock:: gnuradio.trellis.viterbi_s +.. autoblock:: gnuradio.trellis.constellation_metrics_cf +.. autoblock:: gnuradio.trellis.encoder_bb +.. autoblock:: gnuradio.trellis.encoder_bi +.. autoblock:: gnuradio.trellis.encoder_bs +.. autoblock:: gnuradio.trellis.encoder_ii +.. autoblock:: gnuradio.trellis.encoder_si +.. autoblock:: gnuradio.trellis.encoder_ss +.. autoblock:: gnuradio.trellis.metrics_c +.. autoblock:: gnuradio.trellis.metrics_f +.. autoblock:: gnuradio.trellis.metrics_i +.. autoblock:: gnuradio.trellis.metrics_s +.. autoblock:: gnuradio.trellis.pccc_decoder_b +.. autoblock:: gnuradio.trellis.pccc_decoder_combined_cb +.. autoblock:: gnuradio.trellis.pccc_decoder_combined_ci +.. autoblock:: gnuradio.trellis.pccc_decoder_combined_cs +.. autoblock:: gnuradio.trellis.pccc_decoder_combined_fb +.. autoblock:: gnuradio.trellis.pccc_decoder_combined_fi +.. autoblock:: gnuradio.trellis.pccc_decoder_combined_fs +.. autoblock:: gnuradio.trellis.pccc_decoder_i +.. autoblock:: gnuradio.trellis.pccc_decoder_s +.. autoblock:: gnuradio.trellis.pccc_encoder_bb +.. autoblock:: gnuradio.trellis.pccc_encoder_bi +.. autoblock:: gnuradio.trellis.pccc_encoder_bs +.. autoblock:: gnuradio.trellis.pccc_encoder_ii +.. autoblock:: gnuradio.trellis.pccc_encoder_si +.. autoblock:: gnuradio.trellis.pccc_encoder_ss +.. autoblock:: gnuradio.trellis.permutation +.. autoblock:: gnuradio.trellis.sccc_decoder_b +.. autoblock:: gnuradio.trellis.sccc_decoder_combined_cb +.. autoblock:: gnuradio.trellis.sccc_decoder_combined_ci +.. autoblock:: gnuradio.trellis.sccc_decoder_combined_cs +.. autoblock:: gnuradio.trellis.sccc_decoder_combined_fb +.. autoblock:: gnuradio.trellis.sccc_decoder_combined_fi +.. autoblock:: gnuradio.trellis.sccc_decoder_combined_fs +.. autoblock:: gnuradio.trellis.sccc_decoder_i +.. autoblock:: gnuradio.trellis.sccc_decoder_s +.. autoblock:: gnuradio.trellis.sccc_encoder_bb +.. autoblock:: gnuradio.trellis.sccc_encoder_bi +.. autoblock:: gnuradio.trellis.sccc_encoder_bs +.. autoblock:: gnuradio.trellis.sccc_encoder_ii +.. autoblock:: gnuradio.trellis.sccc_encoder_si +.. autoblock:: gnuradio.trellis.sccc_encoder_ss +.. autoblock:: gnuradio.trellis.siso_combined_f +.. autoblock:: gnuradio.trellis.siso_f +.. autoblock:: gnuradio.trellis.viterbi_b +.. autoblock:: gnuradio.trellis.viterbi_combined_cb +.. autoblock:: gnuradio.trellis.viterbi_combined_ci +.. autoblock:: gnuradio.trellis.viterbi_combined_cs +.. autoblock:: gnuradio.trellis.viterbi_combined_fb +.. autoblock:: gnuradio.trellis.viterbi_combined_fi +.. autoblock:: gnuradio.trellis.viterbi_combined_fs +.. autoblock:: gnuradio.trellis.viterbi_combined_ib +.. autoblock:: gnuradio.trellis.viterbi_combined_ii +.. autoblock:: gnuradio.trellis.viterbi_combined_is +.. autoblock:: gnuradio.trellis.viterbi_combined_sb +.. autoblock:: gnuradio.trellis.viterbi_combined_si +.. autoblock:: gnuradio.trellis.viterbi_combined_ss +.. autoblock:: gnuradio.trellis.viterbi_i +.. autoblock:: gnuradio.trellis.viterbi_s diff --git a/docs/sphinx/source/uhd.rst b/docs/sphinx/source/uhd.rst index d9ecf3a519..1f381e23b9 100644 --- a/docs/sphinx/source/uhd.rst +++ b/docs/sphinx/source/uhd.rst @@ -3,9 +3,9 @@ gnuradio.uhd .. automodule:: gnuradio.uhd -.. autooldblock:: gnuradio.uhd.usrp_sink -.. autooldblock:: gnuradio.uhd.usrp_source -.. autooldblock:: gnuradio.uhd.amsg_source +.. autoblock:: gnuradio.uhd.usrp_sink +.. autoblock:: gnuradio.uhd.usrp_source +.. autoblock:: gnuradio.uhd.amsg_source .. autoclass:: gnuradio.uhd.stream_cmd_t .. autoclass:: gnuradio.uhd.time_spec_t .. autoclass:: gnuradio.uhd.meta_range_t diff --git a/docs/sphinx/source/video_sdl.rst b/docs/sphinx/source/video_sdl.rst index 6be88d788c..e4fc5acac3 100644 --- a/docs/sphinx/source/video_sdl.rst +++ b/docs/sphinx/source/video_sdl.rst @@ -3,5 +3,5 @@ gnuradio.video_sdl .. automodule:: gnuradio.video_sdl -.. autooldblock:: gnuradio.video_sdl.sink_s -.. autooldblock:: gnuradio.video_sdl.sink_uc +.. autoblock:: gnuradio.video_sdl.sink_s +.. autoblock:: gnuradio.video_sdl.sink_uc diff --git a/docs/sphinx/source/vocoder/blks.rst b/docs/sphinx/source/vocoder/blks.rst index 34eda9d250..ea20bc44be 100644 --- a/docs/sphinx/source/vocoder/blks.rst +++ b/docs/sphinx/source/vocoder/blks.rst @@ -1,19 +1,19 @@ gnuradio.vocoder ================ -.. autooldblock:: gnuradio.vocoder.alaw_decode_bs -.. autooldblock:: gnuradio.vocoder.alaw_encode_sb -.. autooldblock:: gnuradio.vocoder.codec2_decode_ps -.. autooldblock:: gnuradio.vocoder.codec2_encode_sp -.. autooldblock:: gnuradio.vocoder.cvsd_decode_bs -.. autooldblock:: gnuradio.vocoder.cvsd_encode_sb -.. autooldblock:: gnuradio.vocoder.g721_decode_bs -.. autooldblock:: gnuradio.vocoder.g721_encode_sb -.. autooldblock:: gnuradio.vocoder.g723_24_decode_bs -.. autooldblock:: gnuradio.vocoder.g723_24_encode_sb -.. autooldblock:: gnuradio.vocoder.g723_40_decode_bs -.. autooldblock:: gnuradio.vocoder.g723_40_encode_sb -.. autooldblock:: gnuradio.vocoder.gsm_fr_decode_ps -.. autooldblock:: gnuradio.vocoder.gsm_fr_encode_sp -.. autooldblock:: gnuradio.vocoder.ulaw_decode_bs -.. autooldblock:: gnuradio.vocoder.ulaw_encode_sb +.. autoblock:: gnuradio.vocoder.alaw_decode_bs +.. autoblock:: gnuradio.vocoder.alaw_encode_sb +.. autoblock:: gnuradio.vocoder.codec2_decode_ps +.. autoblock:: gnuradio.vocoder.codec2_encode_sp +.. autoblock:: gnuradio.vocoder.cvsd_decode_bs +.. autoblock:: gnuradio.vocoder.cvsd_encode_sb +.. autoblock:: gnuradio.vocoder.g721_decode_bs +.. autoblock:: gnuradio.vocoder.g721_encode_sb +.. autoblock:: gnuradio.vocoder.g723_24_decode_bs +.. autoblock:: gnuradio.vocoder.g723_24_encode_sb +.. autoblock:: gnuradio.vocoder.g723_40_decode_bs +.. autoblock:: gnuradio.vocoder.g723_40_encode_sb +.. autoblock:: gnuradio.vocoder.gsm_fr_decode_ps +.. autoblock:: gnuradio.vocoder.gsm_fr_encode_sp +.. autoblock:: gnuradio.vocoder.ulaw_decode_bs +.. autoblock:: gnuradio.vocoder.ulaw_encode_sb diff --git a/docs/sphinx/source/wxgui/blks.rst b/docs/sphinx/source/wxgui/blks.rst index c304ea0a83..930474ed19 100644 --- a/docs/sphinx/source/wxgui/blks.rst +++ b/docs/sphinx/source/wxgui/blks.rst @@ -1,6 +1,9 @@ gnuradio.wxgui ===================== +.. autoblock:: gnuradio.wxgui.histo_sink_f +.. autoblock:: gnuradio.wxgui.oscope_sink_f + .. autopyblock:: gnuradio.wxgui.constsink_gl.const_sink_c .. autopyblock:: gnuradio.wxgui.fftsink2.fft_sink_c .. autopyblock:: gnuradio.wxgui.fftsink2.fft_sink_f diff --git a/docs/sphinx/source/wxgui/index.rst b/docs/sphinx/source/wxgui/index.rst index f3fa4f3370..af0a34a483 100644 --- a/docs/sphinx/source/wxgui/index.rst +++ b/docs/sphinx/source/wxgui/index.rst @@ -6,6 +6,8 @@ gnuradio.wxgui .. autosummary:: :nosignatures: + gnuradio.wxgui.histo_sink_f + gnuradio.wxgui.oscope_sink_f gnuradio.wxgui.common.const_sink_c gnuradio.wxgui.fftsink2.fft_sink_c gnuradio.wxgui.fftsink2.fft_sink_f |