summaryrefslogtreecommitdiff
path: root/gr-uhd/examples/usrp_nbfm_rcv.py
diff options
context:
space:
mode:
authorTom Rondeau2011-10-19 09:52:26 -0700
committerTom Rondeau2011-10-19 09:52:26 -0700
commit792e9780cd48177a13416e5926b77f30526ae3ec (patch)
tree3c3794ba13f9db48183f2d04b3f2d422a4d6a0ce /gr-uhd/examples/usrp_nbfm_rcv.py
parent52b42b9e958be6908ab5279bbe4ecea8b2464ee8 (diff)
downloadgnuradio-792e9780cd48177a13416e5926b77f30526ae3ec.tar.gz
gnuradio-792e9780cd48177a13416e5926b77f30526ae3ec.tar.bz2
gnuradio-792e9780cd48177a13416e5926b77f30526ae3ec.zip
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 'gr-uhd/examples/usrp_nbfm_rcv.py')
-rwxr-xr-xgr-uhd/examples/usrp_nbfm_rcv.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/gr-uhd/examples/usrp_nbfm_rcv.py b/gr-uhd/examples/usrp_nbfm_rcv.py
index 2dc69423c..829381e7a 100755
--- a/gr-uhd/examples/usrp_nbfm_rcv.py
+++ b/gr-uhd/examples/usrp_nbfm_rcv.py
@@ -38,9 +38,8 @@ class my_top_block (stdgui2.std_top_block):
stdgui2.std_top_block.__init__ (self,frame,panel,vbox,argv)
parser=OptionParser(option_class=eng_option)
- parser.add_option("-a", "--address", type="string",
- default="addr=192.168.10.2",
- help="Address of UHD device, [default=%default]")
+ parser.add_option("-a", "--args", type="string", default="",
+ help="UHD device address args [default=%default]")
parser.add_option("-A", "--antenna", type="string", default=None,
help="select Rx Antenna where appropriate")
parser.add_option("-f", "--freq", type="eng_float", default=146.585e6,
@@ -68,7 +67,7 @@ class my_top_block (stdgui2.std_top_block):
self.freq = 0
self.freq_step = 25e3
- self.rxpath = receive_path(options.address, options.antenna,
+ self.rxpath = receive_path(options.args, options.antenna,
options.gain, options.audio_output)
self.connect(self.rxpath)
@@ -260,12 +259,12 @@ class my_top_block (stdgui2.std_top_block):
USE_SIMPLE_SQUELCH = False
class receive_path(gr.hier_block2):
- def __init__(self, address, antenna, gain, audio_output):
+ def __init__(self, args, antenna, gain, audio_output):
gr.hier_block2.__init__(self, "receive_path",
gr.io_signature(0, 0, 0), # Input signature
gr.io_signature(0, 0, 0)) # Output signature
- self.u = uhd.usrp_source(device_addr=address,
+ self.u = uhd.usrp_source(device_addr=args,
io_type=uhd.io_type.COMPLEX_FLOAT32,
num_channels=1)