diff options
| author | Tom | 2009-10-09 18:21:36 -0700 |
|---|---|---|
| committer | Tom | 2009-10-09 18:21:36 -0700 |
| commit | 19e2cc4b27664a1e4fe64167b3846f3eba79db46 (patch) | |
| tree | cde4df73b7457633addbbff34817ba34a6889a05 | |
| parent | 016fccfd58c68ad52fd845419f57e03370851b1f (diff) | |
| download | gnuradio-19e2cc4b27664a1e4fe64167b3846f3eba79db46.tar.gz gnuradio-19e2cc4b27664a1e4fe64167b3846f3eba79db46.tar.bz2 gnuradio-19e2cc4b27664a1e4fe64167b3846f3eba79db46.zip | |
Making old dbpsk work again to compare against new version.
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am | 1 | ||||
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py | 36 |
3 files changed, 10 insertions, 29 deletions
diff --git a/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc b/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc index 89ea4a232..1efa82703 100644 --- a/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc +++ b/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc @@ -35,7 +35,7 @@ #define M_TWOPI (2*M_PI) #define VERBOSE_MM 0 // Used for debugging symbol timing loop -#define VERBOSE_COSTAS 1 // Used for debugging phase and frequency tracking +#define VERBOSE_COSTAS 0 // Used for debugging phase and frequency tracking // Public constructor diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am b/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am index f0825b151..17ce1fff9 100644 --- a/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am +++ b/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am @@ -31,6 +31,7 @@ grblkspython_PYTHON = \ am_demod.py \ channel_model.py \ dbpsk.py \ + dbpsk2.py \ dqpsk.py \ d8psk.py \ filterbank.py \ diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py b/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py index ac2e9323f..47a13a787 100644 --- a/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py +++ b/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py @@ -251,37 +251,19 @@ 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.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.clock_recov = gr.costas_loop_cc(self._costas_alpha, - self._costas_beta, - fmax, fmin, arity) - if 0: - self.time_recov = gr.clock_recovery_mm_cc(self._mm_omega, - self._mm_gain_omega, - self._mm_mu, - self._mm_gain_mu, - self._mm_omega_relative_limit) - else: - nfilts = 8 - ntaps = nfilts*ntaps - taps = gr.firdes.root_raised_cosine( - nfilts, 1.0, 0.25/nfilts, self._excess_bw, ntaps) - self.time_recov = gr.pfb_clock_sync_ccf(self._mm_omega, - self._mm_gain_mu, - taps, nfilts) + 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) # Do differential decoding based on phase change of symbols self.diffdec = gr.diff_phasor_cc() @@ -306,9 +288,7 @@ class dbpsk_demod(gr.hier_block2): self._setup_logging() # Connect and Initialize base class - self.connect(self, self.pre_scaler, self.agc, #self.rrc_filter, self.receiver, - #self.clock_recov, - self.time_recov, + self.connect(self, self.pre_scaler, self.agc, self.rrc_filter, self.receiver, self.diffdec, self.slicer, self.symbol_mapper, self.unpack, self) def samples_per_symbol(self): |