diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-10-31 20:01:16 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-10-31 20:01:16 -0400 |
| commit | 66fd82ac5f87b55bb007b95ba9c7bfffe333b134 (patch) | |
| tree | ab9c9ec3e7a14270a3f47e5f5c05e9f1499070a9 /gr-uhd/examples/python | |
| parent | 59f9e558daeb3d148a26fbb56fedc8f1dac1a5bb (diff) | |
analog: removed all AGC blocks from gnuradio-core.
Also replaces calls to gr.agc with analog.agc.
Diffstat (limited to 'gr-uhd/examples/python')
| -rwxr-xr-x | gr-uhd/examples/python/usrp_am_mw_rcv.py | 3 | ||||
| -rwxr-xr-x | gr-uhd/examples/python/usrp_tv_rcv.py | 3 | ||||
| -rwxr-xr-x | gr-uhd/examples/python/usrp_tv_rcv_nogui.py | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/gr-uhd/examples/python/usrp_am_mw_rcv.py b/gr-uhd/examples/python/usrp_am_mw_rcv.py index 40a7fee68d..6965ef5af9 100755 --- a/gr-uhd/examples/python/usrp_am_mw_rcv.py +++ b/gr-uhd/examples/python/usrp_am_mw_rcv.py @@ -21,6 +21,7 @@ # from gnuradio import gr, eng_notation, optfir +from gnuradio import analog from gnuradio import audio from gnuradio import uhd from gnuradio import blks2 @@ -113,7 +114,7 @@ class wfm_rx_block (stdgui2.std_top_block): else: self.chan_filt = gr.fir_filter_ccf (chanfilt_decim, chan_filt_coeffs) - self.agc = gr.agc_cc(0.1, 1, 1, 100000) + 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) diff --git a/gr-uhd/examples/python/usrp_tv_rcv.py b/gr-uhd/examples/python/usrp_tv_rcv.py index b42cf57992..794fec4e1f 100755 --- a/gr-uhd/examples/python/usrp_tv_rcv.py +++ b/gr-uhd/examples/python/usrp_tv_rcv.py @@ -47,6 +47,7 @@ except: print "FYI: gr-video-sdl is not installed" print "realtime SDL video output window will not be available" from gnuradio import uhd +from gnuradio import analog from gnuradio.eng_option import eng_option from gnuradio.wxgui import slider, powermate from gnuradio.wxgui import stdgui2, fftsink2, form @@ -194,7 +195,7 @@ class tv_rx_block (stdgui2.std_top_block): file_sink=gr.file_sink(gr.sizeof_char, options.out_filename) self.dst =file_sink - self.agc=gr.agc_cc(1e-7,1.0,1.0) #1e-7 + 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) diff --git a/gr-uhd/examples/python/usrp_tv_rcv_nogui.py b/gr-uhd/examples/python/usrp_tv_rcv_nogui.py index cfb36222cb..54275bb037 100755 --- a/gr-uhd/examples/python/usrp_tv_rcv_nogui.py +++ b/gr-uhd/examples/python/usrp_tv_rcv_nogui.py @@ -35,6 +35,7 @@ development but not yet in cvs. """ from gnuradio import gr, eng_notation +from gnuradio import analog from gnuradio import audio from gnuradio import uhd from gnuradio.eng_option import eng_option @@ -158,7 +159,7 @@ class my_top_block(gr.top_block): raise SystemExit, 1 - self.agc = gr.agc_cc(1e-7,1.0,1.0) #1e-7 + 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)) |