diff options
| author | Tom Rondeau | 2010-03-13 20:15:37 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2010-03-13 20:15:37 -0500 |
| commit | d7aa018010c828b2bedf0e3974c9d11d41088258 (patch) | |
| tree | 360fd7ea680279a8512f69f0aab2cbf31b4c6ebb /gnuradio-core/src/python | |
| parent | 52ae8be371d71f8c0817b2a88593ff6c378b9613 (diff) | |
| parent | 1ba78b5f4c6bc2468b6fb798f41837a8ab2be89b (diff) | |
| download | gnuradio-d7aa018010c828b2bedf0e3974c9d11d41088258.tar.gz gnuradio-d7aa018010c828b2bedf0e3974c9d11d41088258.tar.bz2 gnuradio-d7aa018010c828b2bedf0e3974c9d11d41088258.zip | |
Merge branch 'digital' of git@gnuradio.org:trondeau into digital
Conflicts:
gnuradio-examples/python/digital/benchmark_qt_rx2.py
Diffstat (limited to 'gnuradio-core/src/python')
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/blks2impl/dbpsk2.py | 14 | ||||
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/blks2impl/dqpsk2.py | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk2.py b/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk2.py index 1d1bfc298..135b38e1f 100644 --- a/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk2.py +++ b/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk2.py @@ -38,7 +38,7 @@ _def_gray_code = True _def_verbose = False _def_log = False -_def_freq_alpha = 4e-3 +_def_freq_alpha = 0.010 _def_costas_alpha = 0.1 _def_timing_alpha = 0.100 _def_timing_beta = 0.010 @@ -226,7 +226,7 @@ class dbpsk2_demod(gr.hier_block2): self._samples_per_symbol = samples_per_symbol self._excess_bw = excess_bw self._freq_alpha = freq_alpha - self._freq_beta = 0.25*self._freq_alpha**2 + self._freq_beta = 0.10*self._freq_alpha self._costas_alpha = costas_alpha self._timing_alpha = timing_alpha self._timing_beta = _def_timing_beta @@ -308,11 +308,11 @@ class dbpsk2_demod(gr.hier_block2): print "bits per symbol: %d" % self.bits_per_symbol() print "Gray code: %s" % self._gray_code print "RRC roll-off factor: %.2f" % self._excess_bw - print "FLL gain: %.2f" % self._freq_alpha - print "Costas Loop alpha: %.2f" % self._costas_alpha - print "Costas Loop beta: %.2f" % self._costas_beta - print "Timing alpha gain: %.2f" % self._timing_alpha - print "Timing beta gain: %.2f" % self._timing_beta + print "FLL gain: %.2e" % self._freq_alpha + print "Costas Loop alpha: %.2e" % self._costas_alpha + print "Costas Loop beta: %.2e" % self._costas_beta + print "Timing alpha gain: %.2e" % self._timing_alpha + print "Timing beta gain: %.2e" % self._timing_beta print "Timing max dev: %.2f" % self._timing_max_dev def _setup_logging(self): diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk2.py b/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk2.py index 81dccc2eb..f852a324c 100644 --- a/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk2.py +++ b/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk2.py @@ -38,7 +38,7 @@ _def_gray_code = True _def_verbose = False _def_log = False -_def_freq_alpha = 4e-3 +_def_freq_alpha = 0.010 _def_costas_alpha = 0.01 _def_timing_alpha = 0.100 _def_timing_beta = 0.010 |