diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/doxygen/other/main_page.dox | 6 | ||||
| -rw-r--r-- | docs/sphinx/gnuradio_sphinx.py | 4 | ||||
| -rw-r--r-- | docs/sphinx/source/gr/index.rst | 25 | ||||
| -rw-r--r-- | docs/sphinx/source/gr/misc_blk.rst | 4 | ||||
| -rw-r--r-- | docs/sphinx/source/gr/sink_blk.rst | 6 | ||||
| -rw-r--r-- | docs/sphinx/source/gr/slicedice_blk.rst | 5 | ||||
| -rw-r--r-- | docs/sphinx/source/gr/source_blk.rst | 6 |
7 files changed, 5 insertions, 51 deletions
diff --git a/docs/doxygen/other/main_page.dox b/docs/doxygen/other/main_page.dox index f9e335061c..deb6f8ebf8 100644 --- a/docs/doxygen/other/main_page.dox +++ b/docs/doxygen/other/main_page.dox @@ -80,7 +80,7 @@ them. self.src = analog.noise_source_c(gr.GR_GAUSSIAN, amp) self.flt = filter.fir_filter_ccf(1, taps) - self.snk = gr.null_sink(gr.sizeof_gr_complex) + self.snk = blocks.null_sink(gr.sizeof_gr_complex) self.connect(self.src, self.flt, self.snk) @@ -226,7 +226,7 @@ class mytb(gr.top_block): self.src1 = analog.noise_source_c(analog.GR_GAUSSIAN, 1) self.add = blocks.add_cc() self.sub = blocks.sub_cc() - self.head = gr.head(gr.sizeof_gr_complex, 1000000) + self.head = blocks.head(gr.sizeof_gr_complex, 1000000) self.snk = blocks.file_sink(gr.sizeof_gr_complex, "output.32fc") self.connect(self.src0, (self.add,0)) @@ -281,7 +281,7 @@ class mytb(gr.top_block): self.src1 = analog.noise_source_c(analog.GR_GAUSSIAN, 1) self.add = blocks.add_cc() self.sub = blocks.sub_cc() - self.head = gr.head(gr.sizeof_gr_complex, 1000000) + self.head = blocks.head(gr.sizeof_gr_complex, 1000000) self.snk = blocks.file_sink(gr.sizeof_gr_complex, "output.32fc") self.connect(self.src0, (self.add,0)) diff --git a/docs/sphinx/gnuradio_sphinx.py b/docs/sphinx/gnuradio_sphinx.py index e8ca867f8c..9955bf7317 100644 --- a/docs/sphinx/gnuradio_sphinx.py +++ b/docs/sphinx/gnuradio_sphinx.py @@ -113,8 +113,8 @@ class OldBlockDocumenter(FunctionDocumenter): """ Specialized Documenter subclass for gnuradio blocks. - It merges together the documentation for the generator function (e.g. gr.head) - with the wrapped sptr (e.g. gr.gr_head_sptr) to keep the documentation + It merges together the documentation for the generator function (e.g. blocks.head) + with the wrapped sptr (e.g. gr::blocks::head::sptr) to keep the documentation tidier. """ objtype = 'oldblock' diff --git a/docs/sphinx/source/gr/index.rst b/docs/sphinx/source/gr/index.rst index bd43888ec7..8da9504030 100644 --- a/docs/sphinx/source/gr/index.rst +++ b/docs/sphinx/source/gr/index.rst @@ -22,12 +22,6 @@ Signal Sources :nosignatures: gnuradio.gr.lfsr_32k_source_s - gnuradio.gr.null_source - gnuradio.gr.vector_source_b - gnuradio.gr.vector_source_c - gnuradio.gr.vector_source_f - gnuradio.gr.vector_source_i - gnuradio.gr.vector_source_s Signal Sinks ^^^^^^^^^^^^ @@ -37,12 +31,6 @@ Signal Sinks gnuradio.gr.check_counting_s gnuradio.gr.check_lfsr_32k_s - gnuradio.gr.null_sink - gnuradio.gr.vector_sink_b - gnuradio.gr.vector_sink_c - gnuradio.gr.vector_sink_f - gnuradio.gr.vector_sink_i - gnuradio.gr.vector_sink_s gnuradio.gr.histo_sink_f gnuradio.gr.oscope_sink_f @@ -64,20 +52,7 @@ Miscellaneous Blocks .. autosummary:: :nosignatures: - gnuradio.gr.copy - gnuradio.gr.kludge_copy - gnuradio.gr.nop gnuradio.gr.pa_2x2_phase_combiner - gnuradio.gr.channel_model - -Slicing and Dicing Streams -^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. autosummary:: - :nosignatures: - - gnuradio.gr.head - gnuradio.gr.skiphead Miscellaneous ------------- diff --git a/docs/sphinx/source/gr/misc_blk.rst b/docs/sphinx/source/gr/misc_blk.rst index a4dcc58a2d..9028adc660 100644 --- a/docs/sphinx/source/gr/misc_blk.rst +++ b/docs/sphinx/source/gr/misc_blk.rst @@ -1,8 +1,4 @@ gnuradio.gr: Miscellaneous Blocks ================================= -.. autooldblock:: gnuradio.gr.copy -.. autooldblock:: gnuradio.gr.kludge_copy -.. autooldblock:: gnuradio.gr.nop .. autooldblock:: gnuradio.gr.pa_2x2_phase_combiner -.. autooldblock:: gnuradio.gr.channel_model diff --git a/docs/sphinx/source/gr/sink_blk.rst b/docs/sphinx/source/gr/sink_blk.rst index 1e82765456..b5ca85aff8 100644 --- a/docs/sphinx/source/gr/sink_blk.rst +++ b/docs/sphinx/source/gr/sink_blk.rst @@ -3,11 +3,5 @@ gnuradio.gr: Signal Sinks .. autooldblock:: gnuradio.gr.check_counting_s .. autooldblock:: gnuradio.gr.check_lfsr_32k_s -.. autooldblock:: gnuradio.gr.null_sink -.. autooldblock:: gnuradio.gr.vector_sink_b -.. autooldblock:: gnuradio.gr.vector_sink_c -.. autooldblock:: gnuradio.gr.vector_sink_f -.. autooldblock:: gnuradio.gr.vector_sink_i -.. autooldblock:: gnuradio.gr.vector_sink_s .. autooldblock:: gnuradio.gr.histo_sink_f .. autooldblock:: gnuradio.gr.oscope_sink_f diff --git a/docs/sphinx/source/gr/slicedice_blk.rst b/docs/sphinx/source/gr/slicedice_blk.rst deleted file mode 100644 index 9ade1667d5..0000000000 --- a/docs/sphinx/source/gr/slicedice_blk.rst +++ /dev/null @@ -1,5 +0,0 @@ -gnuradio.gr: Slicing and Dicing Streams -======================================= - -.. autooldblock:: gnuradio.gr.head -.. autooldblock:: gnuradio.gr.skiphead diff --git a/docs/sphinx/source/gr/source_blk.rst b/docs/sphinx/source/gr/source_blk.rst index 1ef77349f6..18e7e679a9 100644 --- a/docs/sphinx/source/gr/source_blk.rst +++ b/docs/sphinx/source/gr/source_blk.rst @@ -2,10 +2,4 @@ gnuradio.gr: Signal Sources =========================== .. autooldblock:: gnuradio.gr.lfsr_32k_source_s -.. autooldblock:: gnuradio.gr.null_source -.. autooldblock:: gnuradio.gr.vector_source_b -.. autooldblock:: gnuradio.gr.vector_source_c -.. autooldblock:: gnuradio.gr.vector_source_f -.. autooldblock:: gnuradio.gr.vector_source_i -.. autooldblock:: gnuradio.gr.vector_source_s |