diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2010-03-13 20:15:37 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2010-03-13 20:15:37 -0500 |
| commit | d7aa018010c828b2bedf0e3974c9d11d41088258 (patch) | |
| tree | 360fd7ea680279a8512f69f0aab2cbf31b4c6ebb /gnuradio-examples/python/digital/benchmark_qt_rx2.py | |
| parent | 52ae8be371d71f8c0817b2a88593ff6c378b9613 (diff) | |
| parent | 1ba78b5f4c6bc2468b6fb798f41837a8ab2be89b (diff) | |
Merge branch 'digital' of git@gnuradio.org:trondeau into digital
Conflicts:
gnuradio-examples/python/digital/benchmark_qt_rx2.py
Diffstat (limited to 'gnuradio-examples/python/digital/benchmark_qt_rx2.py')
| -rwxr-xr-x | gnuradio-examples/python/digital/benchmark_qt_rx2.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnuradio-examples/python/digital/benchmark_qt_rx2.py b/gnuradio-examples/python/digital/benchmark_qt_rx2.py index 3285d8e4a0..4de15e4800 100755 --- a/gnuradio-examples/python/digital/benchmark_qt_rx2.py +++ b/gnuradio-examples/python/digital/benchmark_qt_rx2.py @@ -268,7 +268,7 @@ class my_top_block(gr.top_block): (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, + options.samples_per_symbol, options.decim, \ adc_rate, self.u.get_decim_rates()) self.u.set_decim(self._decim) |