Revision e692e713 gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py

b/gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py
1 1
#!/usr/bin/env python
2
#
3
# Copyright 2005,2006,2007 Free Software Foundation, Inc.
4
# 
5
# This file is part of GNU Radio
6
# 
7
# GNU Radio is free software; you can redistribute it and/or modify
8
# it under the terms of the GNU General Public License as published by
9
# the Free Software Foundation; either version 3, or (at your option)
10
# any later version.
11
# 
12
# GNU Radio is distributed in the hope that it will be useful,
13
# but WITHOUT ANY WARRANTY; without even the implied warranty of
14
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
# GNU General Public License for more details.
16
# 
17
# You should have received a copy of the GNU General Public License
18
# along with GNU Radio; see the file COPYING.  If not, write to
19
# the Free Software Foundation, Inc., 51 Franklin Street,
20
# Boston, MA 02110-1301, USA.
21
# 
2 22

3 23
from gnuradio import gr, gru, eng_notation, optfir
4 24
from gnuradio import audio
5 25
from gnuradio import usrp
6
from gnuradio import blks
26
from gnuradio import blks2
7 27
from gnuradio.eng_option import eng_option
8 28
from optparse import OptionParser
9 29
from usrpm import usrp_dbid
......
23 43
                                usrp_dbid.BASIC_RX))
24 44

25 45

26
class wfm_rx_graph (gr.flow_graph):
46
class wfm_rx_block (gr.top_block):
27 47

28 48
    def __init__(self):
29
        gr.flow_graph.__init__(self)
49
        gr.top_block.__init__(self)
30 50

31 51
        parser=OptionParser(option_class=eng_option)
32 52
        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
......
78 98
        #print len(chan_filt_coeffs)
79 99
        chan_filt = gr.fir_filter_ccf (chanfilt_decim, chan_filt_coeffs)
80 100

81
        self.guts = blks.wfm_rcv (self, demod_rate, audio_decimation)
101
        self.guts = blks2.wfm_rcv (demod_rate, audio_decimation)
82 102

83 103
        self.volume_control = gr.multiply_const_ff(self.vol)
84 104

......
147 167

148 168
    
149 169
if __name__ == '__main__':
150
    fg = wfm_rx_graph()
170
    tb = wfm_rx_block()
151 171
    try:
152
        fg.run()
172
        tb.run()
153 173
    except KeyboardInterrupt:
154 174
        pass

Also available in: Unified diff