diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-04-28 02:20:28 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-04-28 02:20:28 +0000 |
| commit | b26ea69676c09f5366a9e2f33b11ae5a7521ffe5 (patch) | |
| tree | 0641c1c25d6e827f70941e07f4611d0a2b6b83cd /gnuradio-core/src/python/gnuradio/blksimpl2/pkt.py | |
| parent | 00696b9f754338de9362932c1ecfb1e144a38786 (diff) | |
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-core/src/python/gnuradio/blksimpl2/pkt.py')
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/blksimpl2/pkt.py | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/gnuradio-core/src/python/gnuradio/blksimpl2/pkt.py b/gnuradio-core/src/python/gnuradio/blksimpl2/pkt.py index 1e1dae17a4..c94c27338f 100644 --- a/gnuradio-core/src/python/gnuradio/blksimpl2/pkt.py +++ b/gnuradio-core/src/python/gnuradio/blksimpl2/pkt.py @@ -1,5 +1,5 @@ # -# Copyright 2005,2006 Free Software Foundation, Inc. +# Copyright 2005,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -67,11 +67,7 @@ class mod_pkts(gr.hier_block2): # accepts messages from the outside world self._pkt_input = gr.message_source(gr.sizeof_char, msgq_limit) - self.define_component("packet_source", self._pkt_input) - self.define_component("modulator", self._modulator) - - self.connect("packet_source", 0, "modulator", 0) - self.connect("modulator", 0, "self", 0) + self.connect(self._pkt_input, self._modulator, self) def send_pkt(self, payload='', eof=False): """ @@ -136,13 +132,9 @@ class demod_pkts(gr.hier_block2): self._rcvd_pktq = gr.msg_queue() # holds packets from the PHY - self.define_component("demodulator", self._demodulator) - self.define_component("correlator", gr.correlate_access_code_bb(access_code, threshold)) - self.define_component("framer_sink", gr.framer_sink_1(self._rcvd_pktq)) - - self.connect("self", 0, "demodulator",0) - self.connect("demodulator", 0, "correlator", 0) - self.connect("correlator", 0, "framer_sink", 0) + self._correlator = gr.correlate_access_code_bb(access_code, threshold) + self._framer_sink = gr.framer_sink_1(self._rcvd_pktq) + self.connect(self, self._demodulator, self._correlator, self._framer_sink) self._watcher = _queue_watcher_thread(self._rcvd_pktq, callback) |