From 5f74a621537593a30afe329dcb6e6ac4057e3a41 Mon Sep 17 00:00:00 2001 From: stevie Date: Mon, 7 Feb 2011 07:32:33 +0000 Subject: [PATCH] Add 'self' to 'options' on call to open_usrp(). NB: bug when freq not set on cmd line. git-svn-id: http://op25.osmocom.org/svn/trunk@268 65a5c917-d112-43f1-993d-58c26a4786be --- python/usrp_p25_rx_gl.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/python/usrp_p25_rx_gl.py b/python/usrp_p25_rx_gl.py index dbea584..48409b6 100755 --- a/python/usrp_p25_rx_gl.py +++ b/python/usrp_p25_rx_gl.py @@ -110,7 +110,6 @@ class p25_rx_block (stdgui2.std_top_block): parser = OptionParser(option_class=eng_option) parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=(0, 0), help="select USRP Rx side A or B") parser.add_option("-d", "--decim", type="int", default=256, help="source decimation factor") -# parser.add_option("-f", "--frequency", type="eng_float", default=434.075e6, help="USRP center frequency", metavar="Hz") parser.add_option("-f", "--frequency", type="eng_float", default=None, help="USRP center frequency", metavar="Hz") parser.add_option("-g", "--gain", type="eng_float", default=None, help="set USRP gain in dB (default is midpoint)") parser.add_option("-i", "--input", default=None, help="input file name") @@ -131,7 +130,7 @@ class p25_rx_block (stdgui2.std_top_block): if options.input: self.open_file(options.input) elif options.frequency: - self.open_usrp(self.options.rx_subdev_spec, self.options.decim, self.options.gain, self.options.frequency, not options.transient) + self.open_usrp(self.options.rx_subdev_spec, self.options.decim, self.options.gain, self.options.frequency, not self.options.transient) else: self._set_state("STOPPED") @@ -457,7 +456,7 @@ class p25_rx_block (stdgui2.std_top_block): self.stop() self.wait() # ToDo: get open_usrp() arguments from wizard - self.open_usrp(self.options.rx_subdev_spec, self.options.decim, self.options.gain, self.options.frequency, not options.transient) + self.open_usrp(self.options.rx_subdev_spec, self.options.decim, self.options.gain, self.options.frequency, not self.options.transient) self.start() # Open an existing capture