diff options
| author | Tom Rondeau | 2010-02-26 09:58:39 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2010-02-26 09:58:39 -0500 |
| commit | 93c51f5c02311f89dc6eb47923b34b13038c805c (patch) | |
| tree | aad00385d28afa323ed55f0711bcaa172f243925 /gnuradio-examples | |
| parent | 85aad96915db5f53897f91257794c85eb67f39d4 (diff) | |
| download | gnuradio-93c51f5c02311f89dc6eb47923b34b13038c805c.tar.gz gnuradio-93c51f5c02311f89dc6eb47923b34b13038c805c.tar.bz2 gnuradio-93c51f5c02311f89dc6eb47923b34b13038c805c.zip | |
Fixes pick_bitrate2 for use on receiver side.
Diffstat (limited to 'gnuradio-examples')
| -rw-r--r-- | gnuradio-examples/python/digital/receive_path.py | 2 | ||||
| -rw-r--r-- | gnuradio-examples/python/digital/usrp_receive_path.py | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/gnuradio-examples/python/digital/receive_path.py b/gnuradio-examples/python/digital/receive_path.py index 7aeeedab0..7df945ed0 100644 --- a/gnuradio-examples/python/digital/receive_path.py +++ b/gnuradio-examples/python/digital/receive_path.py @@ -119,7 +119,7 @@ class receive_path(gr.hier_block2): normal.add_option("-r", "--bitrate", type="eng_float", default=100e3, help="specify bitrate [default=%default].") normal.add_option("-v", "--verbose", action="store_true", default=False) - expert.add_option("-S", "--samples-per-symbol", type="int", default=2, + expert.add_option("-S", "--samples-per-symbol", type="int", default=None, help="set samples/symbol [default=%default]") expert.add_option("", "--log", action="store_true", default=False, help="Log all parts of flow graph to files (CAUTION: lots of data)") diff --git a/gnuradio-examples/python/digital/usrp_receive_path.py b/gnuradio-examples/python/digital/usrp_receive_path.py index c7b70fb2d..de017651e 100644 --- a/gnuradio-examples/python/digital/usrp_receive_path.py +++ b/gnuradio-examples/python/digital/usrp_receive_path.py @@ -76,13 +76,16 @@ class usrp_receive_path(gr.hier_block2): self.u = usrp_options.create_usrp_source(options) adc_rate = self.u.adc_rate() self.rs_rate = options.bitrate - if options.verbose: - print 'USRP Source:', self.u (self._bitrate, self._samples_per_symbol, self._decim) = \ pick_rx_bitrate(options.bitrate, self._demod_class.bits_per_symbol(), \ + options.samples_per_symbol, options.decim, adc_rate, self.u.get_decim_rates()) + if options.verbose: + print 'USRP Source:', self.u + print 'Decimation: ', self._decim + options.samples_per_symbol = self._samples_per_symbol options.decim = self._decim |