diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-10-19 09:52:26 -0700 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-10-19 09:52:26 -0700 |
| commit | 792e9780cd48177a13416e5926b77f30526ae3ec (patch) | |
| tree | 3c3794ba13f9db48183f2d04b3f2d422a4d6a0ce /gnuradio-core/src/python/gnuradio/blks2impl | |
| parent | 52b42b9e958be6908ab5279bbe4ecea8b2464ee8 (diff) | |
uhd: updating examples to use args and better default for all UHD examples; also fixed the wfm_rcv blocks to use new PLL constructor.
Diffstat (limited to 'gnuradio-core/src/python/gnuradio/blks2impl')
| -rwxr-xr-x | gnuradio-core/src/python/gnuradio/blks2impl/wfm_rcv_fmdet.py | 5 | ||||
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/blks2impl/wfm_rcv_pll.py | 11 |
2 files changed, 6 insertions, 10 deletions
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/wfm_rcv_fmdet.py b/gnuradio-core/src/python/gnuradio/blks2impl/wfm_rcv_fmdet.py index 3a93a11d64..14eaa1606a 100755 --- a/gnuradio-core/src/python/gnuradio/blks2impl/wfm_rcv_fmdet.py +++ b/gnuradio-core/src/python/gnuradio/blks2impl/wfm_rcv_fmdet.py @@ -123,11 +123,10 @@ class wfm_rcv_fmdet(gr.hier_block2): self.rds_signal_generator = gr.multiply_cc(); self_rds_signal_processor = gr.null_sink(gr.sizeof_gr_complex); - alpha = 5 * 0.25 * math.pi / (audio_rate) - beta = alpha * alpha / 4.0 + loop_bw = 2*math.pi/100.0 max_freq = -2.0*math.pi*18990/audio_rate; min_freq = -2.0*math.pi*19010/audio_rate; - self.stereo_carrier_pll_recovery = gr.pll_refout_cc(alpha,beta, + self.stereo_carrier_pll_recovery = gr.pll_refout_cc(loop_bw, max_freq, min_freq); diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/wfm_rcv_pll.py b/gnuradio-core/src/python/gnuradio/blks2impl/wfm_rcv_pll.py index dd0fae6e74..a2c1b36514 100644 --- a/gnuradio-core/src/python/gnuradio/blks2impl/wfm_rcv_pll.py +++ b/gnuradio-core/src/python/gnuradio/blks2impl/wfm_rcv_pll.py @@ -47,11 +47,9 @@ class wfm_rcv_pll(gr.hier_block2): # if they need to. E.g., to plot its output. # # input: complex; output: float - alpha = 0.25*bandwidth * math.pi / demod_rate - beta = alpha * alpha / 4.0 + loop_bw = 2*math.pi/100.0 max_freq = 2.0*math.pi*90e3/demod_rate - - self.fm_demod = gr.pll_freqdet_cf (alpha,beta,max_freq,-max_freq) + self.fm_demod = gr.pll_freqdet_cf (loop_bw, max_freq,-max_freq) # input: float; output: float self.deemph_Left = fm_deemph (audio_rate) @@ -125,12 +123,11 @@ class wfm_rcv_pll(gr.hier_block2): - alpha = 5 * 0.25 * math.pi / (audio_rate) - beta = alpha * alpha / 4.0 + loop_bw = 2*math.pi/100.0 max_freq = -2.0*math.pi*18990/audio_rate; min_freq = -2.0*math.pi*19010/audio_rate; - self.stereo_carrier_pll_recovery = gr.pll_refout_cc(alpha,beta,max_freq,min_freq); + self.stereo_carrier_pll_recovery = gr.pll_refout_cc(loop_bw, max_freq, min_freq); #self.stereo_carrier_pll_recovery.squelch_enable(False) #pll_refout does not have squelch yet, so disabled for now |