diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-06-30 16:49:31 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-06-30 16:49:31 +0000 |
| commit | 2f841d307ea0ea3986669722afd0d920fc79d700 (patch) | |
| tree | 034074f2d2ed055292f2d6648d2cbaa838663231 /gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py | |
| parent | 03a27276e566e1e641d115fce129d3351ea52d81 (diff) | |
Fixes ticket:372
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11316 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py')
| -rwxr-xr-x | gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py index 942fd070a0..0103982b8d 100755 --- a/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py +++ b/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py @@ -30,6 +30,18 @@ from usrpm import usrp_dbid import sys import math +def calc_dxc_freq(target_freq, baseband_freq, fs): + dxc_temp = (target_freq - baseband_freq) % fs + + if dxc_temp < fs/2.0: + dxc_freq = - dxc_temp + inverted = False + else: + dxc_freq = fs - dxc_temp + inverted = True + + return (dxc_freq, inverted) + def pick_subdevice(u): """ The user didn't specify a subdevice on the command line. @@ -123,7 +135,7 @@ class wfm_rx_block (gr.top_block): mid_freq = (f[0] + f[1]) / 2 # set front end PLL to middle frequency - ok, baseband_freq = self.subdev.set_freq(mid_freq) + tune_result = self.subdev.set_freq(mid_freq) for n in range(2): chan_filt = gr.fir_filter_ccf (chanfilt_decim, chan_filt_coeffs) @@ -132,8 +144,8 @@ class wfm_rx_block (gr.top_block): self.connect((di, n), chan_filt) self.connect(chan_filt, guts, volume_control) self.connect(volume_control, (audio_sink, n)) - dxc_freq, inverted = usrp.calc_dxc_freq(f[n], baseband_freq, - self.u.converter_rate()) + dxc_freq, inverted = calc_dxc_freq(f[n], tune_result.baseband_freq, + self.u.converter_rate()) self.u.set_rx_freq(n, dxc_freq) |