diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-12-21 15:11:39 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-12-21 21:19:13 -0500 |
| commit | 55d3e4a47958be287648a2021f7e92d81086b2d9 (patch) | |
| tree | ae0195c457f2cf2734376679cc88c2d728040680 /gr-analog/python | |
| parent | fa781237f341a74a243a9fb930daee7e62c3a682 (diff) | |
blocks: removes blocks moved to gr-blocks from gnuradio-core.
Also fixes up some other missing moves.
Diffstat (limited to 'gr-analog/python')
| -rw-r--r-- | gr-analog/python/am_demod.py | 3 | ||||
| -rw-r--r-- | gr-analog/python/standard_squelch.py | 15 | ||||
| -rw-r--r-- | gr-analog/python/wfm_rcv_fmdet.py | 16 | ||||
| -rw-r--r-- | gr-analog/python/wfm_rcv_pll.py | 16 |
4 files changed, 28 insertions, 22 deletions
diff --git a/gr-analog/python/am_demod.py b/gr-analog/python/am_demod.py index 2730aa2622..64a3909f51 100644 --- a/gr-analog/python/am_demod.py +++ b/gr-analog/python/am_demod.py @@ -20,6 +20,7 @@ # from gnuradio import gr +from gnuradio import blocks from gnuradio import filter class am_demod_cf(gr.hier_block2): @@ -43,7 +44,7 @@ class am_demod_cf(gr.hier_block2): gr.io_signature(1, 1, gr.sizeof_float)) # Input signature MAG = gr.complex_to_mag() - DCR = gr.add_const_ff(-1.0) + DCR = blocks.add_const_ff(-1.0) audio_taps = filter.optfir.low_pass(0.5, # Filter gain channel_rate, # Sample rate diff --git a/gr-analog/python/standard_squelch.py b/gr-analog/python/standard_squelch.py index 986397a48e..c1fa406b48 100644 --- a/gr-analog/python/standard_squelch.py +++ b/gr-analog/python/standard_squelch.py @@ -21,6 +21,7 @@ import math from gnuradio import gr +from gnuradio import blocks from gnuradio import filter class standard_squelch(gr.hier_block2): @@ -29,23 +30,23 @@ class standard_squelch(gr.hier_block2): gr.io_signature(1, 1, gr.sizeof_float), # Input signature gr.io_signature(1, 1, gr.sizeof_float)) # Output signature - self.input_node = gr.add_const_ff(0) # FIXME kludge + self.input_node = blocks.add_const_ff(0) # FIXME kludge self.low_iir = filter.iir_filter_ffd((0.0193,0,-0.0193),(1,1.9524,-0.9615)) - self.low_square = gr.multiply_ff() + self.low_square = blocks.multiply_ff() self.low_smooth = filter.single_pole_iir_filter_ff(1/(0.01*audio_rate)) # 100ms time constant self.hi_iir = filter.iir_filter_ffd((0.0193,0,-0.0193),(1,1.3597,-0.9615)) - self.hi_square = gr.multiply_ff() + self.hi_square = blocks.multiply_ff() self.hi_smooth = filter.single_pole_iir_filter_ff(1/(0.01*audio_rate)) - self.sub = gr.sub_ff(); - self.add = gr.add_ff(); + self.sub = blocks.sub_ff(); + self.add = blocks.add_ff(); self.gate = gr.threshold_ff(0.3,0.43,0) self.squelch_lpf = filter.single_pole_iir_filter_ff(1/(0.01*audio_rate)) - self.div = gr.divide_ff() - self.squelch_mult = gr.multiply_ff() + self.div = blocks.divide_ff() + self.squelch_mult = blocks.multiply_ff() self.connect(self, self.input_node) self.connect(self.input_node, (self.squelch_mult, 0)) diff --git a/gr-analog/python/wfm_rcv_fmdet.py b/gr-analog/python/wfm_rcv_fmdet.py index 0fc9de1b88..735b39912f 100644 --- a/gr-analog/python/wfm_rcv_fmdet.py +++ b/gr-analog/python/wfm_rcv_fmdet.py @@ -19,7 +19,9 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, filter +from gnuradio import gr +from gnuradio import blocks +from gnuradio import filter from fm_emph import fm_deemph import math @@ -111,7 +113,7 @@ class wfm_rcv_fmdet(gr.hier_block2): # carrier is twice the picked off carrier so arrange to do # a commplex multiply - self.stereo_carrier_generator = gr.multiply_cc(); + self.stereo_carrier_generator = blocks.multiply_cc(); # Pick off the rds signal stereo_rds_filter_coeffs = \ @@ -128,8 +130,8 @@ class wfm_rcv_fmdet(gr.hier_block2): self.rds_signal_filter = \ filter.fir_filter_fcc(audio_decimation, stereo_rds_filter_coeffs) - self.rds_carrier_generator = gr.multiply_cc(); - self.rds_signal_generator = gr.multiply_cc(); + self.rds_carrier_generator = blocks.multiply_cc(); + self.rds_signal_generator = blocks.multiply_cc(); self_rds_signal_processor = gr.null_sink(gr.sizeof_gr_complex); loop_bw = 2*math.pi/100.0 @@ -146,14 +148,14 @@ class wfm_rcv_fmdet(gr.hier_block2): # set up mixer (multiplier) to get the L-R signal at # baseband - self.stereo_basebander = gr.multiply_cc(); + self.stereo_basebander = blocks.multiply_cc(); # pick off the real component of the basebanded L-R # signal. The imaginary SHOULD be zero self.LmR_real = gr.complex_to_real(); - self.Make_Left = gr.add_ff(); - self.Make_Right = gr.sub_ff(); + self.Make_Left = blocks.add_ff(); + self.Make_Right = blocks.sub_ff(); self.stereo_dsbsc_filter = \ filter.fir_filter_fcc(audio_decimation, diff --git a/gr-analog/python/wfm_rcv_pll.py b/gr-analog/python/wfm_rcv_pll.py index c26dfb4928..0c5c83db21 100644 --- a/gr-analog/python/wfm_rcv_pll.py +++ b/gr-analog/python/wfm_rcv_pll.py @@ -19,7 +19,9 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, filter +from gnuradio import gr +from gnuradio import blocks +from gnuradio import filter from fm_emph import fm_deemph import math @@ -103,7 +105,7 @@ class wfm_rcv_pll(gr.hier_block2): # carrier is twice the picked off carrier so arrange to do a commplex multiply - self.stereo_carrier_generator = gr.multiply_cc(); + self.stereo_carrier_generator = blocks.multiply_cc(); # Pick off the rds signal @@ -121,8 +123,8 @@ class wfm_rcv_pll(gr.hier_block2): self.rds_signal_filter = \ filter.fir_filter_fcc(audio_decimation, stereo_rds_filter_coeffs) - self.rds_carrier_generator = gr.multiply_cc(); - self.rds_signal_generator = gr.multiply_cc(); + self.rds_carrier_generator = blocks.multiply_cc(); + self.rds_signal_generator = blocks.multiply_cc(); self_rds_signal_processor = gr.null_sink(gr.sizeof_gr_complex); loop_bw = 2*math.pi/100.0 @@ -135,13 +137,13 @@ class wfm_rcv_pll(gr.hier_block2): # set up mixer (multiplier) to get the L-R signal at baseband - self.stereo_basebander = gr.multiply_cc(); + self.stereo_basebander = blocks.multiply_cc(); # pick off the real component of the basebanded L-R signal. The imaginary SHOULD be zero self.LmR_real = gr.complex_to_real(); - self.Make_Left = gr.add_ff(); - self.Make_Right = gr.sub_ff(); + self.Make_Left = blocks.add_ff(); + self.Make_Right = blocks.sub_ff(); self.stereo_dsbsc_filter = \ filter.fir_filter_fcc(audio_decimation, stereo_dsbsc_filter_coeffs) |