diff options
author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2009-10-12 18:46:56 -0700 |
---|---|---|
committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2009-10-12 18:46:56 -0700 |
commit | 4df83569c130c1f4fe2aba3e1b5dd1419272f22f (patch) | |
tree | f64ccf30880228ab639ff06c971603e214b6303f /gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py | |
parent | 83ddffdaa968c5131228346b5f3f2ca123b759c7 (diff) | |
parent | 3eeb2720664ec7cb67e60d4f8a01b933ddba0143 (diff) |
Merge branch 'sync' of git@gnuradio.org:trondeau into master
This merge adds polyphase clock recovery, implements new PAM demodulators
that use it, and also moves GRC examples to gnuradio-examples component.
See merge commit diff for updated files post merge.
* 'sync' of git@gnuradio.org:trondeau: (54 commits)
Reverting dqpsk to be mpsk_receiver based and not change its behavior.
Fixing initialization of timing gains. Alpha should be < 1, and beta should be << 1.
This splits the rate into a fractional an integer value, which allows the loop to adjust the fractional rate while the integer rate keeps the increments moving properly. Allows the max rate deviation to be independent of the integer rate. Scaling of the differential taps also allows alpha and beta to operate independent of the rate when fractional samples per symbol are used. Slightly more tolerant to large signal values, but they still should be close to +/-1.
Fixing compiler warnings.
Adding dqpsk2 block to makefile for installation.
Adding DQPSK version that uses the PFB timing sync block (dqpsk2).
Minor fixes for logging.
Fixing import of UI file.
Temporary working dbpsk2 example until we match everything.
Working DBPSK implementation with new PFB clock recovery block. The feedforward AGC wasn't playing nicely, the frequency aquistion range was increased to swing half the sample rate in either direction, and the number of filter phases to use was increased to 32.
A bit of code cleanup.
Starting to rework QT app to control new PFB clock recovery alg.
Making old dbpsk work again to compare against new version.
Adding new DBPSK block with new PFB clock recovery alg.
Revert "More additions to PAM timing simulation."
More additions to PAM timing simulation.
Using 2-PAM by default.
Cleaning up GRC PAM timing example and adding ability to do M-ary PAM.
Cleaning up constructor.
Moving filter number decision to start work function.
...
Diffstat (limited to 'gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py')
-rw-r--r-- | gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py b/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py index 3147bfa2ab..860015c3f0 100644 --- a/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py +++ b/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py @@ -1,5 +1,5 @@ # -# Copyright 2005,2006,2007 Free Software Foundation, Inc. +# Copyright 2005,2006,2007,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -251,20 +251,20 @@ class dbpsk_demod(gr.hier_block2): # symbol clock recovery if not self._mm_gain_mu: self._mm_gain_mu = 0.1 - + self._mm_omega = self._samples_per_symbol self._mm_gain_omega = .25 * self._mm_gain_mu * self._mm_gain_mu self._costas_beta = 0.25 * self._costas_alpha * self._costas_alpha - fmin = -0.1 - fmax = 0.1 + fmin = -0.25 + fmax = 0.25 self.receiver=gr.mpsk_receiver_cc(arity, 0, - self._costas_alpha, self._costas_beta, - fmin, fmax, - self._mm_mu, self._mm_gain_mu, - self._mm_omega, self._mm_gain_omega, - self._mm_omega_relative_limit) - + self._costas_alpha, self._costas_beta, + fmin, fmax, + self._mm_mu, self._mm_gain_mu, + self._mm_omega, self._mm_gain_omega, + self._mm_omega_relative_limit) + # Do differential decoding based on phase change of symbols self.diffdec = gr.diff_phasor_cc() |