blocks: removes blocks moved to gr-blocks from gnuradio-core.

Also fixes up some other missing moves.
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-uhd/examples/python
parent: fa781237f341a74a243a9fb930daee7e62c3a682 (diff)
15 files changed, 48 insertions, 35 deletions
diff --git a/gr-uhd/examples/python/fm_tx4.py b/gr-uhd/examples/python/fm_tx4.py
index ae3e1b94f3..e4cf3ded24 100755
--- a/gr-uhd/examples/python/fm_tx4.py
+++ b/gr-uhd/examples/python/fm_tx4.py
@@ -35,6 +35,7 @@ audio_to_file.py
 from gnuradio import gr, eng_notation
 from gnuradio import uhd
 from gnuradio import analog
+from gnuradio import blocks
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 import math
@@ -70,7 +71,7 @@ class pipeline(gr.hier_block2):
                                  lo_freq,            # frequency
                                  1.0,                # amplitude
                                  0)                  # DC Offset
-        mixer = gr.multiply_cc()
+        mixer = blocks.multiply_cc()
 
         self.connect(src, fmtx, (mixer, 0))
         self.connect(lo, (mixer, 1))
@@ -141,7 +142,7 @@ class fm_tx_block(stdgui2.std_top_block):
         self.set_gain(options.gain)
         self.set_freq(options.freq)
 
-        self.sum = gr.add_cc ()
+        self.sum = blocks.add_cc ()
 
         # Instantiate N NBFM channels
         step = 25e3
@@ -153,7 +154,7 @@ class fm_tx_block(stdgui2.std_top_block):
                          self.audio_rate, self.usrp_rate)
             self.connect(t, (self.sum, i))
 
-        self.gain = gr.multiply_const_cc (1.0 / options.nchannels)
+        self.gain = blocks.multiply_const_cc (1.0 / options.nchannels)
 
         # connect it all
         self.connect (self.sum, self.gain)
diff --git a/gr-uhd/examples/python/fm_tx_2_daughterboards.py b/gr-uhd/examples/python/fm_tx_2_daughterboards.py
index f896be6d04..b4958b8596 100755
--- a/gr-uhd/examples/python/fm_tx_2_daughterboards.py
+++ b/gr-uhd/examples/python/fm_tx_2_daughterboards.py
@@ -33,6 +33,7 @@ Side B is 350 + 440 Hz tones.
 from gnuradio import gr, uhd
 from gnuradio import filter
 from gnuradio import analog
+from gnuradio import blocks
 from gnuradio.eng_notation import num_to_str, str_to_num
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
@@ -78,7 +79,7 @@ class example_signal_1(gr.hier_block2):
                                    440,                # frequency
                                    1.0,                # amplitude
                                    0)                  # DC Offset
-        sum = gr.add_cc()
+        sum = blocks.add_cc()
         self.connect(src0, (sum, 0))
         self.connect(src1, (sum, 1))
         self.connect(sum, self)
@@ -154,7 +155,7 @@ class my_top_block(gr.top_block):
         sig0 = example_signal_0(self.usrp_rate)
         sig1 = example_signal_1(self.usrp_rate)
 
-        intl = gr.interleave(gr.sizeof_gr_complex)
+        intl = blocks.interleave(gr.sizeof_gr_complex)
         self.connect(sig0, (intl, 0))
         self.connect(sig1, (intl, 1))
 
diff --git a/gr-uhd/examples/python/usrp_am_mw_rcv.py b/gr-uhd/examples/python/usrp_am_mw_rcv.py
index a389e173f8..5cd9d3f7ec 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.agc = analog.agc_cc(0.1, 1, 1, 100000)
         self.am_demod = gr.complex_to_mag()
-        self.volume_control = gr.multiply_const_ff(self.vol)
+        self.volume_control = blocks.multiply_const_ff(self.vol)
 
         audio_filt_coeffs = filter.firdes.low_pass_2(1,          # gain
                                                      demod_rate, # sampling rate
diff --git a/gr-uhd/examples/python/usrp_nbfm_ptt.py b/gr-uhd/examples/python/usrp_nbfm_ptt.py
index d377e3a0a2..471a4e8090 100755
--- a/gr-uhd/examples/python/usrp_nbfm_ptt.py
+++ b/gr-uhd/examples/python/usrp_nbfm_ptt.py
@@ -27,6 +27,7 @@ from optparse import OptionParser
 
 from gnuradio import gr, audio, uhd
 from gnuradio import analog
+from gnuradio import blocks
 from gnuradio.eng_option import eng_option
 from gnuradio.wxgui import stdgui2, fftsink2, scopesink2, slider, form
 
@@ -301,7 +302,7 @@ class transmit_path(gr.hier_block2):
         self.normal_gain = 32000
 
         self.audio = audio.source(int(self.audio_rate), audio_input)
-        self.audio_amp = gr.multiply_const_ff(self.audio_gain)
+        self.audio_amp = blocks.multiply_const_ff(self.audio_gain)
 
         lpf = gr.firdes.low_pass (1,                  # gain
                                   self.audio_rate,    # sampling rate
@@ -319,11 +320,11 @@ class transmit_path(gr.hier_block2):
         self.audio_filt = gr.fir_filter_fff(1,audio_taps)
 
         self.pl = analog.ctcss_gen_f(self.audio_rate,123.0)
-        self.add_pl = gr.add_ff()
+        self.add_pl = blocks.add_ff()
         self.connect(self.pl,(self.add_pl,1))
 
         self.fmtx = analog.nbfm_tx(self.audio_rate, self.if_rate)
-        self.amp = gr.multiply_const_cc (self.normal_gain)
+        self.amp = blocks.multiply_const_cc (self.normal_gain)
 
         rrate = dev_rate / self.if_rate
         self.resamp = filter.pfb.arb_resampler_ccf(rrate)
@@ -405,7 +406,7 @@ class receive_path(gr.hier_block2):
         self.squelch = analog.standard_squelch(self.audio_rate)
 
         # audio gain / mute block
-        self._audio_gain = gr.multiply_const_ff(1.0)
+        self._audio_gain = blocks.multiply_const_ff(1.0)
 
         # sound card as final sink
         audio_sink = audio.sink(int(self.audio_rate), audio_output)
diff --git a/gr-uhd/examples/python/usrp_nbfm_rcv.py b/gr-uhd/examples/python/usrp_nbfm_rcv.py
index 1a06e7d06d..0652556cd1 100755
--- a/gr-uhd/examples/python/usrp_nbfm_rcv.py
+++ b/gr-uhd/examples/python/usrp_nbfm_rcv.py
@@ -21,6 +21,7 @@
 #
 
 from gnuradio import gr, audio, uhd
+from gnuradio import blocks
 from gnuradio import filter
 from gnuradio import analog
 from gnuradio.eng_option import eng_option
@@ -304,7 +305,7 @@ class receive_path(gr.hier_block2):
         self.fmrx = analog.nbfm_rx(self.audio_rate, self.quad_rate)
 
         # audio gain / mute block
-        self._audio_gain = gr.multiply_const_ff(1.0)
+        self._audio_gain = blocks.multiply_const_ff(1.0)
 
         # sound card as final sink
         audio_sink = audio.sink (int(self.audio_rate), audio_output)
diff --git a/gr-uhd/examples/python/usrp_spectrum_sense.py b/gr-uhd/examples/python/usrp_spectrum_sense.py
index ce60241deb..62349da941 100755
--- a/gr-uhd/examples/python/usrp_spectrum_sense.py
+++ b/gr-uhd/examples/python/usrp_spectrum_sense.py
@@ -21,6 +21,7 @@
 #
 
 from gnuradio import gr, eng_notation, window
+from gnuradio import blocks
 from gnuradio import audio
 from gnuradio import uhd
 from gnuradio.eng_option import eng_option
@@ -151,7 +152,7 @@ class my_top_block(gr.top_block):
         self.u.set_samp_rate(usrp_rate)
         dev_rate = self.u.get_samp_rate()
 
-	s2v = gr.stream_to_vector(gr.sizeof_gr_complex, self.fft_size)
+	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)
@@ -162,8 +163,8 @@ class my_top_block(gr.top_block):
         c2mag = gr.complex_to_mag_squared(self.fft_size)
 
         # FIXME the log10 primitive is dog slow
-        log = gr.nlog10_ff(10, self.fft_size,
-                           -20*math.log10(self.fft_size)-10*math.log10(power/self.fft_size))
+        log = blocks.nlog10_ff(10, self.fft_size,
+                               -20*math.log10(self.fft_size)-10*math.log10(power/self.fft_size))
 
         # Set the freq_step to 75% of the actual data throughput.
         # This allows us to discard the bins on both ends of the spectrum.
diff --git a/gr-uhd/examples/python/usrp_tv_rcv.py b/gr-uhd/examples/python/usrp_tv_rcv.py
index 0d0ddf531f..cd54fad3ae 100755
--- a/gr-uhd/examples/python/usrp_tv_rcv.py
+++ b/gr-uhd/examples/python/usrp_tv_rcv.py
@@ -48,6 +48,7 @@ except:
   print "realtime SDL video output window will not be available"
 from gnuradio import uhd
 from gnuradio import analog
+from gnuradio import blocks
 from gnuradio.eng_option import eng_option
 from gnuradio.wxgui import slider, powermate
 from gnuradio.wxgui import stdgui2, fftsink2, form
@@ -124,7 +125,7 @@ class tv_rx_block (stdgui2.std_top_block):
         if not ((filename is None) or (filename=="usrp")):
           # file is data source
           self.filesource = gr.file_source(gr.sizeof_short,filename,options.repeat)
-          self.istoc = gr.interleaved_short_to_complex()
+          self.istoc = blocks.interleaved_short_to_complex()
           self.connect(self.filesource,self.istoc)
           self.src=self.istoc
 
@@ -154,7 +155,7 @@ class tv_rx_block (stdgui2.std_top_block):
 
         self.gain = options.gain
 
-        f2uc=gr.float_to_uchar()
+        f2uc = blocks.float_to_uchar()
 
         # sdl window as final sink
         if not (options.pal or options.ntsc):
@@ -197,8 +198,8 @@ class tv_rx_block (stdgui2.std_top_block):
 
         self.agc = analog.agc_cc(1e-7,1.0,1.0) #1e-7
         self.am_demod = gr.complex_to_mag ()
-        self.set_blacklevel=gr.add_const_ff(0.0)
-        self.invert_and_scale = gr.multiply_const_ff (0.0) #-self.contrast *128.0*255.0/(200.0)
+        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)
 
         # now wire it all together
         #sample_rate=options.width*options.height*options.framerate
@@ -238,7 +239,7 @@ class tv_rx_block (stdgui2.std_top_block):
           #Note: this block is not yet in cvs
           tv_corr=gr.tv_correlator_ff(frame_size,nframes, search_window,
                                       video_alpha, corr_alpha,debug)
-          shift=gr.add_const_ff(-0.7)
+          shift = blocks.add_const_ff(-0.7)
 
           self.connect (self.src, self.agc, self.am_demod, tv_corr,
                         self.invert_and_scale, self.set_blacklevel,
diff --git a/gr-uhd/examples/python/usrp_tv_rcv_nogui.py b/gr-uhd/examples/python/usrp_tv_rcv_nogui.py
index 54275bb037..dfa6ceec1f 100755
--- a/gr-uhd/examples/python/usrp_tv_rcv_nogui.py
+++ b/gr-uhd/examples/python/usrp_tv_rcv_nogui.py
@@ -36,6 +36,7 @@ development but not yet in cvs.
 
 from gnuradio import gr, eng_notation
 from gnuradio import analog
+from gnuradio import blocks
 from gnuradio import audio
 from gnuradio import uhd
 from gnuradio.eng_option import eng_option
@@ -122,7 +123,7 @@ class my_top_block(gr.top_block):
           self.filesource = gr.file_source(gr.sizeof_short,
                                            options.in_filename,
                                            options.repeat)
-          self.istoc = gr.interleaved_short_to_complex()
+          self.istoc = blocks.interleaved_short_to_complex()
           self.connect(self.filesource,self.istoc)
           self.src=self.istoc
         else:
@@ -161,9 +162,9 @@ 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.set_blacklevel = gr.add_const_ff(options.brightness +255.0)
-        self.invert_and_scale = gr.multiply_const_ff (-options.contrast *128.0*255.0/(200.0))
-        self.f2uc = gr.float_to_uchar()
+        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()
 
         # sdl window as final sink
         if not (options.pal or options.ntsc):
@@ -181,8 +182,7 @@ class my_top_block(gr.top_block):
 
         if filename=="sdl":
           #Here comes the tv screen, you have to build and install
-          #gr-video-sdl for this (subproject of gnuradio, only in cvs
-          #for now)
+          #gr-video-sdl for this (subproject of gnuradio)
           try:
             video_sink = video_sdl.sink_uc(frames_per_sec, width, height, 0,
                                            show_width,height)
diff --git a/gr-uhd/examples/python/usrp_wfm_rcv.py b/gr-uhd/examples/python/usrp_wfm_rcv.py
index 824af8975c..351f2c7be4 100755
--- a/gr-uhd/examples/python/usrp_wfm_rcv.py
+++ b/gr-uhd/examples/python/usrp_wfm_rcv.py
@@ -21,6 +21,7 @@
 #
 
 from gnuradio import gr, optfir, audio, uhd
+from gnuradio import blocks
 from gnuradio import filter
 from gnuradio import analog
 from gnuradio.eng_option import eng_option
@@ -101,7 +102,7 @@ class wfm_rx_block (stdgui2.std_top_block):
 
         self.guts = analog.wfm_rcv(demod_rate, audio_decim)
 
-        self.volume_control = gr.multiply_const_ff(self.vol)
+        self.volume_control = blocks.multiply_const_ff(self.vol)
 
         # sound card as final sink
         self.audio_sink = audio.sink(int (audio_rate),
diff --git a/gr-uhd/examples/python/usrp_wfm_rcv2_nogui.py b/gr-uhd/examples/python/usrp_wfm_rcv2_nogui.py
index e76c78e017..42cea79e73 100755
--- a/gr-uhd/examples/python/usrp_wfm_rcv2_nogui.py
+++ b/gr-uhd/examples/python/usrp_wfm_rcv2_nogui.py
@@ -21,6 +21,7 @@
 #
 
 from gnuradio import gr, audio, uhd
+from gnuradio import blocks
 from gnuradio import filter
 from gnuradio import analog
 from gnuradio.eng_option import eng_option
@@ -115,7 +116,7 @@ class wfm_rx_block (gr.top_block):
         for n in range(2):
            chan_filt = filter.pfb.arb_resampler_ccf(rrate, chan_coeffs, nfilts)
            guts = analog.wfm_rcv(demod_rate, audio_decim)
-           volume_control = gr.multiply_const_ff(self.vol)
+           volume_control = blocks.multiply_const_ff(self.vol)
 
            #self.connect((self.di, n), chan_filt)
            self.connect((self.u, n), chan_filt)
diff --git a/gr-uhd/examples/python/usrp_wfm_rcv_fmdet.py b/gr-uhd/examples/python/usrp_wfm_rcv_fmdet.py
index 97bd2b2d32..e03b86025f 100755
--- a/gr-uhd/examples/python/usrp_wfm_rcv_fmdet.py
+++ b/gr-uhd/examples/python/usrp_wfm_rcv_fmdet.py
@@ -20,7 +20,8 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, audio, uhd
+from gnuradio import gr, audio, uhdf
+from gnuradio import blocks
 from gnuradio import filter
 from gnuradio import analog
 from gnuradio.eng_option import eng_option
@@ -107,8 +108,8 @@ class wfm_rx_block (stdgui2.std_top_block):
         self.lchan_filt = filter.pfb.arb_resampler_fff(chan_rate)
 
         # FIXME rework {add,multiply}_const_* to handle multiple streams
-        self.volume_control_l = gr.multiply_const_ff(self.vol)
-        self.volume_control_r = gr.multiply_const_ff(self.vol)
+        self.volume_control_l = blocks.multiply_const_ff(self.vol)
+        self.volume_control_r = blocks.multiply_const_ff(self.vol)
 
         # sound card as final sink
         self.audio_sink = audio.sink(int (audio_rate),
diff --git a/gr-uhd/examples/python/usrp_wfm_rcv_nogui.py b/gr-uhd/examples/python/usrp_wfm_rcv_nogui.py
index f2271fb6db..2116eb96b6 100755
--- a/gr-uhd/examples/python/usrp_wfm_rcv_nogui.py
+++ b/gr-uhd/examples/python/usrp_wfm_rcv_nogui.py
@@ -21,6 +21,7 @@
 #
 
 from gnuradio import gr, optfir, audio, uhd
+from gnuradio import blocks
 from gnuradio import filter
 from gnuradio import analog
 from gnuradio import eng_notation
@@ -95,7 +96,7 @@ class wfm_rx_block (gr.top_block):
 
         self.guts = analog.wfm_rcv(demod_rate, audio_decim)
 
-        self.volume_control = gr.multiply_const_ff(1)
+        self.volume_control = blocks.multiply_const_ff(1)
 
         # sound card as final sink
         self.audio_sink = audio.sink(int(audio_rate),
diff --git a/gr-uhd/examples/python/usrp_wfm_rcv_pll.py b/gr-uhd/examples/python/usrp_wfm_rcv_pll.py
index 8cd3d5ab13..5d3045589c 100755
--- a/gr-uhd/examples/python/usrp_wfm_rcv_pll.py
+++ b/gr-uhd/examples/python/usrp_wfm_rcv_pll.py
@@ -21,6 +21,7 @@
 #
 
 from gnuradio import gr, audio, uhd
+from gnuradio import blocks
 from gnuradio import filter
 from gnuradio import analog
 from gnuradio import eng_notation
@@ -108,8 +109,8 @@ class wfm_rx_block (stdgui2.std_top_block):
         self.lchan_filt = filter.pfb.arb_resampler_fff(chan_rate)
 
         # FIXME rework {add,multiply}_const_* to handle multiple streams
-        self.volume_control_l = gr.multiply_const_ff(self.vol)
-        self.volume_control_r = gr.multiply_const_ff(self.vol)
+        self.volume_control_l = blocks.multiply_const_ff(self.vol)
+        self.volume_control_r = blocks.multiply_const_ff(self.vol)
 
         # sound card as final sink
         self.audio_sink = audio.sink (int (audio_rate),
diff --git a/gr-uhd/examples/python/usrp_wfm_rcv_sca.py b/gr-uhd/examples/python/usrp_wfm_rcv_sca.py
index 68ff27ff30..6d38efa3da 100755
--- a/gr-uhd/examples/python/usrp_wfm_rcv_sca.py
+++ b/gr-uhd/examples/python/usrp_wfm_rcv_sca.py
@@ -51,6 +51,7 @@ OFDM.
 
 
 from gnuradio import gr, audio, uhd
+from gnuradio import blocks
 from gnuradio import filter
 from gnuradio import analog
 from gnuradio.eng_option import eng_option
@@ -180,7 +181,7 @@ class wfm_rx_sca_block (stdgui2.std_top_block):
 	# Create deemphasis block that is applied after SCA demodulation
         self.deemph = analog.fm_deemph(audio_rate, sca_tau)
 
-        self.volume_control = gr.multiply_const_ff(self.vol)
+        self.volume_control = blocks.multiply_const_ff(self.vol)
 
         # sound card as final sink
         self.audio_sink = audio.sink(int (audio_rate),
diff --git a/gr-uhd/examples/python/usrp_wxapt_rcv.py b/gr-uhd/examples/python/usrp_wxapt_rcv.py
index ef774e2a07..446e4bf2c8 100755
--- a/gr-uhd/examples/python/usrp_wxapt_rcv.py
+++ b/gr-uhd/examples/python/usrp_wxapt_rcv.py
@@ -21,6 +21,7 @@
 #
 
 from gnuradio import gr, audio, uhd
+from gnuradio import blocks
 from gnuradio import filter
 from gnuradio import analog
 from gnuradio.eng_option import eng_option
@@ -100,7 +101,7 @@ class wxapt_rx_block (stdgui2.std_top_block):
 
         self.guts = analog.wfm_rcv(demod_rate, audio_decim)
 
-        self.volume_control = gr.multiply_const_ff(self.vol)
+        self.volume_control = blocks.multiply_const_ff(self.vol)
 
         # sound card as final sink
         self.audio_sink = audio.sink(int (audio_rate), options.audio_output)
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-uhd/examples/python
parent	fa781237f341a74a243a9fb930daee7e62c3a682 (diff)