From 43adf2bff2e7c05f407b86d9734f3bb67cdc7914 Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Tue, 19 Feb 2013 15:03:19 -0500
Subject: uhd: fixing incorrect module names for UHD examples.
---
gr-uhd/examples/python/usrp_am_mw_rcv.py | 1 +
gr-uhd/examples/python/usrp_nbfm_ptt.py | 33 ++++++++++++++-------------
gr-uhd/examples/python/usrp_spectrum_sense.py | 12 ++++++----
gr-uhd/examples/python/usrp_wfm_rcv.py | 2 +-
gr-uhd/examples/python/usrp_wfm_rcv_fmdet.py | 2 +-
gr-uhd/examples/python/usrp_wfm_rcv_nogui.py | 2 +-
gr-uhd/examples/python/usrp_wfm_rcv_sca.py | 2 +-
7 files changed, 29 insertions(+), 25 deletions(-)
(limited to 'gr-uhd/examples/python')
diff --git a/gr-uhd/examples/python/usrp_am_mw_rcv.py b/gr-uhd/examples/python/usrp_am_mw_rcv.py
index 51b065e794..6e9c3fed67 100755
--- a/gr-uhd/examples/python/usrp_am_mw_rcv.py
+++ b/gr-uhd/examples/python/usrp_am_mw_rcv.py
@@ -21,6 +21,7 @@
#
from gnuradio import gr, eng_notation
+from gnuradio import blocks
from gnuradio import filter
from gnuradio import analog
from gnuradio import audio
diff --git a/gr-uhd/examples/python/usrp_nbfm_ptt.py b/gr-uhd/examples/python/usrp_nbfm_ptt.py
index 651204a050..76e1f47c3c 100755
--- a/gr-uhd/examples/python/usrp_nbfm_ptt.py
+++ b/gr-uhd/examples/python/usrp_nbfm_ptt.py
@@ -28,6 +28,7 @@ from optparse import OptionParser
from gnuradio import gr, audio, uhd
from gnuradio import analog
from gnuradio import blocks
+from gnuradio import filter
from gnuradio.eng_option import eng_option
from gnuradio.wxgui import stdgui2, fftsink2, scopesink2, slider, form
@@ -304,20 +305,20 @@ class transmit_path(gr.hier_block2):
self.audio = audio.source(int(self.audio_rate), audio_input)
self.audio_amp = blocks.multiply_const_ff(self.audio_gain)
- lpf = gr.firdes.low_pass (1, # gain
- self.audio_rate, # sampling rate
- 3800, # low pass cutoff freq
- 300, # width of trans. band
- gr.firdes.WIN_HANN) # filter type
+ lpf = filter.firdes.low_pass(1, # gain
+ self.audio_rate, # sampling rate
+ 3800, # low pass cutoff freq
+ 300, # width of trans. band
+ filter.firdes.WIN_HANN) # filter type
- hpf = gr.firdes.high_pass (1, # gain
- self.audio_rate, # sampling rate
- 325, # low pass cutoff freq
- 50, # width of trans. band
- gr.firdes.WIN_HANN) # filter type
+ hpf = filter.firdes.high_pass(1, # gain
+ self.audio_rate, # sampling rate
+ 325, # low pass cutoff freq
+ 50, # width of trans. band
+ filter.firdes.WIN_HANN) # filter type
audio_taps = convolve(array(lpf),array(hpf))
- self.audio_filt = gr.fir_filter_fff(1,audio_taps)
+ self.audio_filt = filter.fir_filter_fff(1,audio_taps)
self.pl = analog.ctcss_gen_f(self.audio_rate,123.0)
self.add_pl = blocks.add_ff()
@@ -390,11 +391,11 @@ class receive_path(gr.hier_block2):
# Create filter to get actual channel we want
nfilts = 32
- chan_coeffs = gr.firdes.low_pass (nfilts, # gain
- nfilts*dev_rate, # sampling rate
- 13e3, # low pass cutoff freq
- 4e3, # width of trans. band
- gr.firdes.WIN_HANN) # filter type
+ chan_coeffs = filter.firdes.low_pass(nfilts, # gain
+ nfilts*dev_rate, # sampling rate
+ 13e3, # low pass cutoff freq
+ 4e3, # width of trans. band
+ filter.firdes.WIN_HANN) # filter type
rrate = self.quad_rate / dev_rate
self.resamp = filter.pfb.arb_resampler_ccf(rrate, chan_coeffs, nfilts)
diff --git a/gr-uhd/examples/python/usrp_spectrum_sense.py b/gr-uhd/examples/python/usrp_spectrum_sense.py
index 62349da941..8456d8bdf2 100755
--- a/gr-uhd/examples/python/usrp_spectrum_sense.py
+++ b/gr-uhd/examples/python/usrp_spectrum_sense.py
@@ -20,9 +20,11 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, eng_notation, window
+from gnuradio import gr, eng_notation
from gnuradio import blocks
from gnuradio import audio
+from gnuradio import filter
+from gnuradio import fft
from gnuradio import uhd
from gnuradio.eng_option import eng_option
from optparse import OptionParser
@@ -154,8 +156,8 @@ class my_top_block(gr.top_block):
s2v = blocks.stream_to_vector(gr.sizeof_gr_complex, self.fft_size)
- mywindow = window.blackmanharris(self.fft_size)
- fft = gr.fft_vcc(self.fft_size, True, mywindow)
+ mywindow = filter.window.blackmanharris(self.fft_size)
+ ffter = fft.fft_vcc(self.fft_size, True, mywindow)
power = 0
for tap in mywindow:
power += tap*tap
@@ -186,8 +188,8 @@ class my_top_block(gr.top_block):
dwell_delay)
# FIXME leave out the log10 until we speed it up
- #self.connect(self.u, s2v, fft, c2mag, log, stats)
- self.connect(self.u, s2v, fft, c2mag, stats)
+ #self.connect(self.u, s2v, ffter, c2mag, log, stats)
+ self.connect(self.u, s2v, ffter, c2mag, stats)
if options.gain is None:
# if no gain was specified, use the mid-point in dB
diff --git a/gr-uhd/examples/python/usrp_wfm_rcv.py b/gr-uhd/examples/python/usrp_wfm_rcv.py
index 30c23dc77e..c11c18980c 100755
--- a/gr-uhd/examples/python/usrp_wfm_rcv.py
+++ b/gr-uhd/examples/python/usrp_wfm_rcv.py
@@ -20,7 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, optfir, audio, uhd
+from gnuradio import gr, audio, uhd
from gnuradio import blocks
from gnuradio import filter
from gnuradio import analog
diff --git a/gr-uhd/examples/python/usrp_wfm_rcv_fmdet.py b/gr-uhd/examples/python/usrp_wfm_rcv_fmdet.py
index e486449a7f..599f0bc460 100755
--- a/gr-uhd/examples/python/usrp_wfm_rcv_fmdet.py
+++ b/gr-uhd/examples/python/usrp_wfm_rcv_fmdet.py
@@ -20,7 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, audio, uhdf
+from gnuradio import gr, audio, uhd
from gnuradio import blocks
from gnuradio import filter
from gnuradio import analog
diff --git a/gr-uhd/examples/python/usrp_wfm_rcv_nogui.py b/gr-uhd/examples/python/usrp_wfm_rcv_nogui.py
index d855d37bcb..134df3b39e 100755
--- a/gr-uhd/examples/python/usrp_wfm_rcv_nogui.py
+++ b/gr-uhd/examples/python/usrp_wfm_rcv_nogui.py
@@ -20,7 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, optfir, audio, uhd
+from gnuradio import gr, audio, uhd
from gnuradio import blocks
from gnuradio import filter
from gnuradio import analog
diff --git a/gr-uhd/examples/python/usrp_wfm_rcv_sca.py b/gr-uhd/examples/python/usrp_wfm_rcv_sca.py
index 53d1fa5f00..5cbbcd1d8a 100755
--- a/gr-uhd/examples/python/usrp_wfm_rcv_sca.py
+++ b/gr-uhd/examples/python/usrp_wfm_rcv_sca.py
@@ -150,7 +150,7 @@ class wfm_rx_sca_block (stdgui2.std_top_block):
demod_rate, # sampling rate
max_sca_dev, # cutoff freq
max_sca_dev/3, # trans. band
- analog.firdes.WIN_HANN) # filter type
+ filter.firdes.WIN_HANN) # filter type
self.ddc = filter.freq_xlating_fir_filter_fcf(sca_chanfilt_decim, # decim rate
sca_chan_coeffs, # taps
--
cgit v1.2.3