diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-01-18 10:56:46 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-01-18 10:56:46 -0800 |
| commit | 5f936574b185bd489cda94e84bd423c20323ebca (patch) | |
| tree | 232787f82a1b6e02b3abe6b087c361b709b45b07 /gr-digital | |
| parent | 24b43217408ab6535d947c7c215f4d7538f0db91 (diff) | |
| parent | 530fc0be11e6dc560a32aeda26baf3c451090d30 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-digital/include/digital_constellation_receiver_cb.h
Diffstat (limited to 'gr-digital')
| -rwxr-xr-x | gr-digital/examples/narrowband/digital_bert_rx.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-digital/examples/narrowband/digital_bert_rx.py b/gr-digital/examples/narrowband/digital_bert_rx.py index c044b25858..cc66456e93 100755 --- a/gr-digital/examples/narrowband/digital_bert_rx.py +++ b/gr-digital/examples/narrowband/digital_bert_rx.py @@ -116,7 +116,7 @@ class rx_psk_block(gr.top_block): if(options.rx_freq is not None): symbol_rate = options.bitrate / self._demodulator.bits_per_symbol() - self._source = uhd_receiver(options.args, options.bitrate, + self._source = uhd_receiver(options.args, symbol_rate, options.samples_per_symbol, options.rx_freq, options.rx_gain, options.spec, |