diff options
Diffstat (limited to 'gr-uhd')
| -rwxr-xr-x | gr-uhd/apps/hf_explorer/hfx.py | 6 | ||||
| -rw-r--r-- | gr-uhd/apps/hf_radio/ssbdemod.py | 4 | ||||
| -rwxr-xr-x | gr-uhd/examples/python/usrp_am_mw_rcv.py | 2 | ||||
| -rwxr-xr-x | gr-uhd/examples/python/usrp_spectrum_sense.py | 2 | ||||
| -rwxr-xr-x | gr-uhd/examples/python/usrp_tv_rcv.py | 4 | ||||
| -rwxr-xr-x | gr-uhd/examples/python/usrp_tv_rcv_nogui.py | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/gr-uhd/apps/hf_explorer/hfx.py b/gr-uhd/apps/hf_explorer/hfx.py index 15962f9e4d..9e00805134 100755 --- a/gr-uhd/apps/hf_explorer/hfx.py +++ b/gr-uhd/apps/hf_explorer/hfx.py @@ -305,7 +305,7 @@ class MyFrame(wx.Frame): sample_rate=self.af_sample_rate, average=True, size=(640,240)) - c2f = gr.complex_to_float() + c2f = blocks.complex_to_float() # AM branch self.sel_am = blocks.multiply_const_cc(0) @@ -318,8 +318,8 @@ class MyFrame(wx.Frame): am_det = blocks.multiply_cc() # these are for converting +7.5kHz to -7.5kHz # for some reason blocks.conjugate_cc() adds noise ?? - c2f2 = gr.complex_to_float() - c2f3 = gr.complex_to_float() + c2f2 = blocks.complex_to_float() + c2f3 = blocks.complex_to_float() f2c = blocks.float_to_complex() phaser1 = blocks.multiply_const_ff(1) phaser2 = blocks.multiply_const_ff(-1) diff --git a/gr-uhd/apps/hf_radio/ssbdemod.py b/gr-uhd/apps/hf_radio/ssbdemod.py index a77fb6cfcb..4e3d57ac30 100644 --- a/gr-uhd/apps/hf_radio/ssbdemod.py +++ b/gr-uhd/apps/hf_radio/ssbdemod.py @@ -60,7 +60,7 @@ class ssb_demod( gr.hier_block2 ): 0, self.if_rate ) - self.split = gr.complex_to_float() + self.split = blocks.complex_to_float() self.lpf = gr.fir_filter_fff( 1, self.audio_taps ) @@ -69,7 +69,7 @@ class ssb_demod( gr.hier_block2 ): self.am_sel = blocks.multiply_const_ff( 0 ) self.sb_sel = blocks.multiply_const_ff( 1 ) self.mixer = blocks.add_ff() - self.am_det = gr.complex_to_mag() + self.am_det = blocks.complex_to_mag() self.connect(self, self.xlate) self.connect(self.xlate, self.split) 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() |