From cf2c954ba4fc54909515f8550fd55741c9603a11 Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Wed, 6 Mar 2013 15:14:19 -0500
Subject: core: removed all complex_to_<type> blocks from core; using
gr-blocks.
---
gr-uhd/examples/python/usrp_am_mw_rcv.py | 2 +-
gr-uhd/examples/python/usrp_spectrum_sense.py | 2 +-
gr-uhd/examples/python/usrp_tv_rcv.py | 4 ++--
gr-uhd/examples/python/usrp_tv_rcv_nogui.py | 2 +-
4 files changed, 5 insertions(+), 5 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 6e9c3fed67..eebbd7c041 100755
--- a/gr-uhd/examples/python/usrp_am_mw_rcv.py
+++ b/gr-uhd/examples/python/usrp_am_mw_rcv.py
@@ -116,7 +116,7 @@ class wfm_rx_block (stdgui2.std_top_block):
self.chan_filt = filter.fir_filter_ccf(chanfilt_decim, chan_filt_coeffs)
self.agc = analog.agc_cc(0.1, 1, 1, 100000)
- self.am_demod = gr.complex_to_mag()
+ self.am_demod = blocks.complex_to_mag()
self.volume_control = blocks.multiply_const_ff(self.vol)
audio_filt_coeffs = filter.firdes.low_pass_2(1, # gain
diff --git a/gr-uhd/examples/python/usrp_spectrum_sense.py b/gr-uhd/examples/python/usrp_spectrum_sense.py
index 8456d8bdf2..077365a916 100755
--- a/gr-uhd/examples/python/usrp_spectrum_sense.py
+++ b/gr-uhd/examples/python/usrp_spectrum_sense.py
@@ -162,7 +162,7 @@ class my_top_block(gr.top_block):
for tap in mywindow:
power += tap*tap
- c2mag = gr.complex_to_mag_squared(self.fft_size)
+ c2mag = blocks.complex_to_mag_squared(self.fft_size)
# FIXME the log10 primitive is dog slow
log = blocks.nlog10_ff(10, self.fft_size,
diff --git a/gr-uhd/examples/python/usrp_tv_rcv.py b/gr-uhd/examples/python/usrp_tv_rcv.py
index cd54fad3ae..3e612f6a02 100755
--- a/gr-uhd/examples/python/usrp_tv_rcv.py
+++ b/gr-uhd/examples/python/usrp_tv_rcv.py
@@ -197,7 +197,7 @@ class tv_rx_block (stdgui2.std_top_block):
self.dst =file_sink
self.agc = analog.agc_cc(1e-7,1.0,1.0) #1e-7
- self.am_demod = gr.complex_to_mag ()
+ self.am_demod = blocks.complex_to_mag ()
self.set_blacklevel = blocks.add_const_ff(0.0)
self.invert_and_scale = blocks.multiply_const_ff (0.0) #-self.contrast *128.0*255.0/(200.0)
@@ -225,7 +225,7 @@ class tv_rx_block (stdgui2.std_top_block):
elif process_type=='do_nullsink':
#self.connect (self.src, self.am_demod,self.invert_and_scale,f2uc,video_sink)
- c2r=gr.complex_to_real()
+ c2r=blocks.complex_to_real()
nullsink=gr.null_sink(gr.sizeof_float)
self.connect (self.src, c2r,nullsink) #video_sink)
elif process_type=='do_tv_sync_corr':
diff --git a/gr-uhd/examples/python/usrp_tv_rcv_nogui.py b/gr-uhd/examples/python/usrp_tv_rcv_nogui.py
index dfa6ceec1f..5eef4a00f6 100755
--- a/gr-uhd/examples/python/usrp_tv_rcv_nogui.py
+++ b/gr-uhd/examples/python/usrp_tv_rcv_nogui.py
@@ -161,7 +161,7 @@ class my_top_block(gr.top_block):
self.agc = analog.agc_cc(1e-7,1.0,1.0) #1e-7
- self.am_demod = gr.complex_to_mag ()
+ self.am_demod = blocks.complex_to_mag ()
self.set_blacklevel = blocks.add_const_ff(options.brightness +255.0)
self.invert_and_scale = blocks.multiply_const_ff(-options.contrast *128.0*255.0/(200.0))
self.f2uc = blocks.float_to_uchar()
--
cgit v1.2.3