diff options
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/blks2impl/fm_emph.py | 6 | ||||
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/blks2impl/nbfm_tx.py | 4 | ||||
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/blks2impl/rational_resampler.py | 8 | ||||
| -rwxr-xr-x | gr-filter/examples/fmtest.py | 5 | ||||
| -rwxr-xr-x | gr-filter/examples/reconstruction.py | 2 | ||||
| -rwxr-xr-x | gr-qtgui/examples/pyqt_const_c.py | 4 | ||||
| -rwxr-xr-x | gr-qtgui/examples/pyqt_example_c.py | 4 | ||||
| -rwxr-xr-x | gr-qtgui/examples/pyqt_freq_c.py | 4 | ||||
| -rwxr-xr-x | gr-qtgui/examples/pyqt_time_c.py | 4 | ||||
| -rwxr-xr-x | gr-qtgui/examples/pyqt_waterfall_c.py | 4 |
10 files changed, 22 insertions, 23 deletions
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/fm_emph.py b/gnuradio-core/src/python/gnuradio/blks2impl/fm_emph.py index 29e052f6f5..080ebe151f 100644 --- a/gnuradio-core/src/python/gnuradio/blks2impl/fm_emph.py +++ b/gnuradio-core/src/python/gnuradio/blks2impl/fm_emph.py @@ -19,7 +19,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr +from gnuradio import gr, filter import math @@ -68,7 +68,7 @@ class fm_deemph(gr.hier_block2): global plot1 plot1 = gru.gnuplot_freqz (gru.freqz (btaps, ataps), fs, True) - deemph = gr.iir_filter_ffd(btaps, ataps) + deemph = filter.iir_filter_ffd(btaps, ataps) self.connect(self, deemph, self) # @@ -147,5 +147,5 @@ class fm_preemph(gr.hier_block2): global plot2 plot2 = gru.gnuplot_freqz (gru.freqz (btaps, ataps), fs, True) - preemph = gr.iir_filter_ffd(btaps, ataps) + preemph = filter.iir_filter_ffd(btaps, ataps) self.connect(self, preemph, self) diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/nbfm_tx.py b/gnuradio-core/src/python/gnuradio/blks2impl/nbfm_tx.py index a2c4310467..75e96f2374 100644 --- a/gnuradio-core/src/python/gnuradio/blks2impl/nbfm_tx.py +++ b/gnuradio-core/src/python/gnuradio/blks2impl/nbfm_tx.py @@ -20,7 +20,7 @@ # import math -from gnuradio import gr, optfir +from gnuradio import gr, optfir, filter from gnuradio.blks2impl.fm_emph import fm_preemph #from gnuradio import ctcss @@ -66,7 +66,7 @@ class nbfm_tx(gr.hier_block2): 40) # stopband atten dB #print "len(interp_taps) =", len(interp_taps) - self.interpolator = gr.interp_fir_filter_fff (interp_factor, interp_taps) + self.interpolator = filter.interp_fir_filter_fff (interp_factor, interp_taps) self.preemph = fm_preemph (quad_rate, tau=tau) diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/rational_resampler.py b/gnuradio-core/src/python/gnuradio/blks2impl/rational_resampler.py index 02c8421d9e..33b5b0b1f3 100644 --- a/gnuradio-core/src/python/gnuradio/blks2impl/rational_resampler.py +++ b/gnuradio-core/src/python/gnuradio/blks2impl/rational_resampler.py @@ -19,7 +19,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gru +from gnuradio import gr, gru, filter _plot = None @@ -105,7 +105,7 @@ class rational_resampler_fff(_rational_resampler_base): Rational resampling polyphase FIR filter with float input, float output and float taps. """ - _rational_resampler_base.__init__(self, gr.rational_resampler_base_fff, + _rational_resampler_base.__init__(self, filter.rational_resampler_base_fff, interpolation, decimation, taps, fractional_bw) class rational_resampler_ccf(_rational_resampler_base): @@ -114,7 +114,7 @@ class rational_resampler_ccf(_rational_resampler_base): Rational resampling polyphase FIR filter with complex input, complex output and float taps. """ - _rational_resampler_base.__init__(self, gr.rational_resampler_base_ccf, + _rational_resampler_base.__init__(self, filter.rational_resampler_base_ccf, interpolation, decimation, taps, fractional_bw) class rational_resampler_ccc(_rational_resampler_base): @@ -123,5 +123,5 @@ class rational_resampler_ccc(_rational_resampler_base): Rational resampling polyphase FIR filter with complex input, complex output and complex taps. """ - _rational_resampler_base.__init__(self, gr.rational_resampler_base_ccc, + _rational_resampler_base.__init__(self, filter.rational_resampler_base_ccc, interpolation, decimation, taps, fractional_bw) diff --git a/gr-filter/examples/fmtest.py b/gr-filter/examples/fmtest.py index 9b02526d9b..7b7489335b 100755 --- a/gr-filter/examples/fmtest.py +++ b/gr-filter/examples/fmtest.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, blks2 -from gnuradio import filter +from gnuradio import gr, blks2, filter import sys, math, time try: @@ -84,7 +83,7 @@ class fmtest(gr.top_block): self.head = gr.head(gr.sizeof_gr_complex, self._nsamples) self.snk_tx = gr.vector_sink_c() - self.channel = blks2.channel_model(0.1) + self.channel = filter.channel_model(0.1) self.connect(self.sum, self.head, self.channel, self.snk_tx) diff --git a/gr-filter/examples/reconstruction.py b/gr-filter/examples/reconstruction.py index 9e38f3669c..f4908006fc 100755 --- a/gr-filter/examples/reconstruction.py +++ b/gr-filter/examples/reconstruction.py @@ -64,7 +64,7 @@ def main(): src = gr.vector_source_b(data.astype(scipy.uint8).tolist(), False) mod = digital.bpsk_mod(samples_per_symbol=2) - chan = gr.channel_model(npwr) + chan = filter.channel_model(npwr) rrc = filter.fft_filter_ccc(1, rrc_taps) # Split it up into pieces diff --git a/gr-qtgui/examples/pyqt_const_c.py b/gr-qtgui/examples/pyqt_const_c.py index e3cc3e527e..125124ebc5 100755 --- a/gr-qtgui/examples/pyqt_const_c.py +++ b/gr-qtgui/examples/pyqt_const_c.py @@ -20,7 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr +from gnuradio import gr, filter import sys try: @@ -142,7 +142,7 @@ class my_top_block(gr.top_block): src1 = gr.sig_source_c(Rs, gr.GR_SIN_WAVE, f1, 0.5, 0) src2 = gr.sig_source_c(Rs, gr.GR_SIN_WAVE, f2, 0.5, 0) src = gr.add_cc() - channel = gr.channel_model(0.001) + channel = filter.channel_model(0.001) thr = gr.throttle(gr.sizeof_gr_complex, 100*npts) self.snk1 = qtgui.const_sink_c(npts, "Constellation Example", 1) diff --git a/gr-qtgui/examples/pyqt_example_c.py b/gr-qtgui/examples/pyqt_example_c.py index 0b43fce0e5..d5dc86ab56 100755 --- a/gr-qtgui/examples/pyqt_example_c.py +++ b/gr-qtgui/examples/pyqt_example_c.py @@ -20,7 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr +from gnuradio import gr, filter import sys try: @@ -142,7 +142,7 @@ class my_top_block(gr.top_block): src1 = gr.sig_source_c(Rs, gr.GR_SIN_WAVE, f1, 0.1, 0) src2 = gr.sig_source_c(Rs, gr.GR_SIN_WAVE, f2, 0.1, 0) src = gr.add_cc() - channel = gr.channel_model(0.001) + channel = filter.channel_model(0.001) thr = gr.throttle(gr.sizeof_gr_complex, 100*fftsize) self.snk1 = qtgui.sink_c(fftsize, gr.firdes.WIN_BLACKMAN_hARRIS, 0, Rs, diff --git a/gr-qtgui/examples/pyqt_freq_c.py b/gr-qtgui/examples/pyqt_freq_c.py index 0422046204..984cd4a9ae 100755 --- a/gr-qtgui/examples/pyqt_freq_c.py +++ b/gr-qtgui/examples/pyqt_freq_c.py @@ -20,7 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr +from gnuradio import gr, filter import sys try: @@ -142,7 +142,7 @@ class my_top_block(gr.top_block): src1 = gr.sig_source_c(Rs, gr.GR_SIN_WAVE, f1, 0.1, 0) src2 = gr.sig_source_c(Rs, gr.GR_SIN_WAVE, f2, 0.1, 0) src = gr.add_cc() - channel = gr.channel_model(0.01) + channel = filter.channel_model(0.01) thr = gr.throttle(gr.sizeof_gr_complex, 100*npts) self.snk1 = qtgui.freq_sink_c(npts, gr.firdes.WIN_BLACKMAN_hARRIS, 0, Rs, diff --git a/gr-qtgui/examples/pyqt_time_c.py b/gr-qtgui/examples/pyqt_time_c.py index 255cd1c855..cadee33cad 100755 --- a/gr-qtgui/examples/pyqt_time_c.py +++ b/gr-qtgui/examples/pyqt_time_c.py @@ -20,7 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr +from gnuradio import gr, filter import sys try: @@ -142,7 +142,7 @@ class my_top_block(gr.top_block): src1 = gr.sig_source_c(Rs, gr.GR_SIN_WAVE, f1, 0.1, 0) src2 = gr.sig_source_c(Rs, gr.GR_SIN_WAVE, f2, 0.1, 0) src = gr.add_cc() - channel = gr.channel_model(0.01) + channel = filter.channel_model(0.01) thr = gr.throttle(gr.sizeof_gr_complex, 100*npts) self.snk1 = qtgui.time_sink_c(npts, Rs, "Complex Time Example", 1) diff --git a/gr-qtgui/examples/pyqt_waterfall_c.py b/gr-qtgui/examples/pyqt_waterfall_c.py index b7f8396ff3..1399879c0e 100755 --- a/gr-qtgui/examples/pyqt_waterfall_c.py +++ b/gr-qtgui/examples/pyqt_waterfall_c.py @@ -20,7 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr +from gnuradio import gr, filter import sys try: @@ -142,7 +142,7 @@ class my_top_block(gr.top_block): src1 = gr.sig_source_c(Rs, gr.GR_SIN_WAVE, f1, 0.1, 0) src2 = gr.sig_source_c(Rs, gr.GR_SIN_WAVE, f2, 0.1, 0) src = gr.add_cc() - channel = gr.channel_model(0.01) + channel = filter.channel_model(0.01) thr = gr.throttle(gr.sizeof_gr_complex, 100*npts) self.snk1 = qtgui.waterfall_sink_c(npts, gr.firdes.WIN_BLACKMAN_hARRIS, 0, Rs, |