diff options
| author | jcorgan | 2007-04-28 02:20:28 +0000 |
|---|---|---|
| committer | jcorgan | 2007-04-28 02:20:28 +0000 |
| commit | b26ea69676c09f5366a9e2f33b11ae5a7521ffe5 (patch) | |
| tree | 0641c1c25d6e827f70941e07f4611d0a2b6b83cd /gnuradio-examples/python/hier/digital/receive_path.py | |
| parent | 00696b9f754338de9362932c1ecfb1e144a38786 (diff) | |
| download | gnuradio-b26ea69676c09f5366a9e2f33b11ae5a7521ffe5.tar.gz gnuradio-b26ea69676c09f5366a9e2f33b11ae5a7521ffe5.tar.bz2 gnuradio-b26ea69676c09f5366a9e2f33b11ae5a7521ffe5.zip | |
Merged -r 5137:5174 from developer branch jcorgan/hb. Trunk passes distcheck. Converts gr.hier_block2 API to not use 'define_component' methodology anymore.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5177 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-examples/python/hier/digital/receive_path.py')
| -rw-r--r-- | gnuradio-examples/python/hier/digital/receive_path.py | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/gnuradio-examples/python/hier/digital/receive_path.py b/gnuradio-examples/python/hier/digital/receive_path.py index 64a547dce..fce7db162 100644 --- a/gnuradio-examples/python/hier/digital/receive_path.py +++ b/gnuradio-examples/python/hier/digital/receive_path.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2005,2006 Free Software Foundation, Inc. +# Copyright 2005,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -33,12 +33,9 @@ from pick_bitrate import pick_rx_bitrate # receive path # ///////////////////////////////////////////////////////////////////////////// -class receive_path(gr.hier_block2): +class receive_path(gr.top_block): def __init__(self, demod_class, rx_callback, options): - gr.hier_block2.__init__(self, "receive_path", - gr.io_signature(0,0,0), # Input signature - gr.io_signature(0,0,0)) # Output signature - + gr.top_block.__init__(self, "receive_path") options = copy.copy(options) # make a copy so we can destructively modify self._verbose = options.verbose @@ -112,18 +109,13 @@ class receive_path(gr.hier_block2): if self._verbose: self._print_verbage() - # Define the components - self.define_component("usrp", self.u) - self.define_component("channel_filter", gr.fft_filter_ccc(sw_decim, chan_coeffs)) - self.define_component("channel_probe", self.probe) - self.define_component("packet_receiver", self.packet_receiver) + self.channel_filter = gr.fft_filter_ccc(sw_decim, chan_coeffs) # connect the channel input filter to the carrier power detector - self.connect("usrp", 0, "channel_filter", 0) - self.connect("channel_filter", 0, "channel_probe", 0) + self.connect(self.u, self.channel_filter, self.probe) # connect channel filter to the packet receiver - self.connect("channel_filter", 0, "packet_receiver", 0) + self.connect(self.channel_filter, self.packet_receiver) def _setup_usrp_source(self): |