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/usrp/usrp_fft.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/usrp/usrp_fft.py')
-rwxr-xr-x | gnuradio-examples/python/hier/usrp/usrp_fft.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/gnuradio-examples/python/hier/usrp/usrp_fft.py b/gnuradio-examples/python/hier/usrp/usrp_fft.py index 5cd5c14822..b312130044 100755 --- a/gnuradio-examples/python/hier/usrp/usrp_fft.py +++ b/gnuradio-examples/python/hier/usrp/usrp_fft.py @@ -74,7 +74,6 @@ class app_top_block(stdgui2.std_top_block): self.show_debug_info = True self.u = usrp.source_c(decim_rate=options.decim) - self.define_component("usrp", self.u) if options.rx_subdev_spec is None: options.rx_subdev_spec = pick_subdevice(self.u) self.u.set_mux(usrp.determine_rx_mux_value(self.u, options.rx_subdev_spec)) @@ -99,11 +98,8 @@ class app_top_block(stdgui2.std_top_block): self.scope = scopesink2.scope_sink_c(panel, sample_rate=input_rate) else: self.scope = fftsink2.fft_sink_c (panel, fft_size=1024, sample_rate=input_rate) - self.define_component("scope", self.scope) - # Ultimately this will be - # self.connect("usrp scope") - self.connect("usrp", 0, "scope", 0) + self.connect(self.u, self.scope) self._build_gui(vbox) |