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-examples/python/hier/dect/gmsk2.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-examples/python/hier/dect/gmsk2.py')
| -rw-r--r-- | gnuradio-examples/python/hier/dect/gmsk2.py | 38 |
1 files changed, 8 insertions, 30 deletions
diff --git a/gnuradio-examples/python/hier/dect/gmsk2.py b/gnuradio-examples/python/hier/dect/gmsk2.py index 578873eed5..f7107241f2 100644 --- a/gnuradio-examples/python/hier/dect/gmsk2.py +++ b/gnuradio-examples/python/hier/dect/gmsk2.py @@ -106,14 +106,7 @@ class gmsk2_mod(gr.hier_block2): if verbose: self._print_verbage() - # Define and connect components - self.define_component("nrz", self.nrz) - self.define_component("filter", self.gaussian_filter) - self.define_component("fmmod", self.fmmod) - self.connect("self", 0, "nrz", 0) - self.connect("nrz", 0, "filter", 0) - self.connect("filter", 0, "fmmod", 0) - self.connect("fmmod", 0, "self", 0) + self.connect(self, self.nrz, self.gaussian_filter, self.fmmod, self) if log: self._setup_logging() @@ -125,7 +118,6 @@ class gmsk2_mod(gr.hier_block2): return 1 bits_per_symbol = staticmethod(bits_per_symbol) # make it a static method. - def _print_verbage(self): print "bits per symbol = %d" % self.bits_per_symbol() print "Gaussian filter bt = %.2f" % self._bt @@ -133,12 +125,9 @@ class gmsk2_mod(gr.hier_block2): def _setup_logging(self): print "Modulation logging turned on." - self.define_component("nrz_log", gr.file_sink(gr.sizeof_float, "nrz.dat")) - self.define_component("filter_log", gr.file_sink(gr.sizeof_float, "gaussian_filter.dat")) - self.define_component("fmmod_log", gr.file_sink(gr.sizeof_gr_complex, "fmmod.dat")) - self.connect("nrz", 0, "nrz_log", 0) - self.connect("filter", 0, "filter_log", 0) - self.connect("fmmod", 0, "fmmod_log", 0) + self.connect(self.nrz, gr.file_sink(gr.sizeof_float, "nrz.dat")) + self.connect(self.gaussian_filter, gr.file_sink(gr.sizeof_float, "gaussian_filter.dat")) + self.connect(self.fmmod, gr.file_sink(gr.sizeof_gr_complex, "fmmod.dat")) def add_options(parser): """ @@ -232,14 +221,7 @@ class gmsk2_demod(gr.hier_block2): if verbose: self._print_verbage() - # Define and connect components - self.define_component("fmdemod", self.fmdemod) - self.define_component("clock_recovery", self.clock_recovery) - self.define_component("slicer", self.slicer) - self.connect("self", 0, "fmdemod", 0) - self.connect("fmdemod", 0, "clock_recovery", 0) - self.connect("clock_recovery", 0, "slicer", 0) - self.connect("slicer", 0, "self", 0) + self.connect(self, self.fmdemod, self.clock_recovery, self.slicer, self) if log: self._setup_logging() @@ -251,7 +233,6 @@ class gmsk2_demod(gr.hier_block2): return 1 bits_per_symbol = staticmethod(bits_per_symbol) # make it a static method. - def _print_verbage(self): print "bits per symbol = %d" % self.bits_per_symbol() print "M&M clock recovery omega = %f" % self._omega @@ -263,12 +244,9 @@ class gmsk2_demod(gr.hier_block2): def _setup_logging(self): print "Demodulation logging turned on." - self.define_component("fmdemod_log", gr.file_sink(gr.sizeof_float, "fmdemod.dat")) - self.define_component("clock_recovery_log", gr.file_sink(gr.sizeof_float, "clock_recovery.dat")) - self.define_component("slicer_log", gr.file_sink(gr.sizeof_char, "slicer.dat")) - self.connect("fmdemod", 0, "fmdemod_log", 0) - self.connect("clock_recovery", 0, "clock_recovery_log", 0) - self.connect("slicer", 0, "slicer_log", 0) + self.connect(fmdemod, gr.file_sink(gr.sizeof_float, "fmdemod.dat")) + self.connect(clock_recovery, gr.file_sink(gr.sizeof_float, "clock_recovery.dat")) + self.connect(slicer, gr.file_sink(gr.sizeof_char, "slicer.dat")) def add_options(parser): """ |