From eee064ca72cbc9779eaae2f20e18f74ff7925574 Mon Sep 17 00:00:00 2001
From: Tom <trondeau@vt.edu>
Date: Tue, 6 Oct 2009 10:24:38 -0700
Subject: Using PFB clock recovery for testing
---
.../src/python/gnuradio/blks2impl/dqpsk.py | 37 ++++++++++++++++------
1 file changed, 27 insertions(+), 10 deletions(-)
(limited to 'gnuradio-core/src/python/gnuradio/blks2impl/dqpsk.py')
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk.py b/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk.py
index 8c15d21734..34e6581bf7 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk.py
+++ b/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk.py
@@ -255,16 +255,32 @@ class dqpsk_demod(gr.hier_block2):
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.025
- fmax = 0.025
+ fmin = -0.25
+ fmax = 0.25
+
+ #self.receiver=gr.mpsk_receiver_cc(arity, pi/4.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:
+ ntaps = 32*ntaps
+ taps = gr.firdes.root_raised_cosine(
+ 32, 1.0, 0.25/32.0, self._excess_bw, ntaps)
+ self.time_recov = gr.pfb_clock_sync_ccf(self._mm_omega,
+ self._mm_gain_mu,
+ taps)
- self.receiver=gr.mpsk_receiver_cc(arity, pi/4.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)
-
# Perform Differential decoding on the constellation
self.diffdec = gr.diff_phasor_cc()
@@ -288,7 +304,8 @@ class dqpsk_demod(gr.hier_block2):
self._setup_logging()
# Connect & Initialize base class
- self.connect(self, self.pre_scaler, self.agc, self.rrc_filter, self.receiver,
+ self.connect(self, self.pre_scaler, self.agc, #self.rrc_filter, #self.receiver,
+ self.clock_recov, self.time_recov,
self.diffdec, self.slicer, self.symbol_mapper, self.unpack, self)
def samples_per_symbol(self):
--
cgit v1.2.3
From 3eeb2720664ec7cb67e60d4f8a01b933ddba0143 Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Mon, 12 Oct 2009 18:41:24 -0400
Subject: Reverting dqpsk to be mpsk_receiver based and not change its
behavior.
---
.../src/python/gnuradio/blks2impl/dqpsk.py | 31 +++++-----------------
1 file changed, 7 insertions(+), 24 deletions(-)
(limited to 'gnuradio-core/src/python/gnuradio/blks2impl/dqpsk.py')
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk.py b/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk.py
index 34e6581bf7..edd3024a67 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk.py
+++ b/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk.py
@@ -258,28 +258,12 @@ class dqpsk_demod(gr.hier_block2):
fmin = -0.25
fmax = 0.25
- #self.receiver=gr.mpsk_receiver_cc(arity, pi/4.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:
- ntaps = 32*ntaps
- taps = gr.firdes.root_raised_cosine(
- 32, 1.0, 0.25/32.0, self._excess_bw, ntaps)
- self.time_recov = gr.pfb_clock_sync_ccf(self._mm_omega,
- self._mm_gain_mu,
- taps)
+ self.receiver=gr.mpsk_receiver_cc(arity, pi/4.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)
# Perform Differential decoding on the constellation
self.diffdec = gr.diff_phasor_cc()
@@ -304,8 +288,7 @@ class dqpsk_demod(gr.hier_block2):
self._setup_logging()
# Connect & 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):
--
cgit v1.2.3