Making old dbpsk work again to compare against new version.

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 89ea4a232c1f0bb2d91a52708f5c6ef7dd23515a..1efa827035da7848338c24a982a46db2dcd61987 100644 (file)
--- 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 f0825b15135fb7cfe19c508578c9466ec2c106c4..17ce1fff9432eaab615f06ee7d64fb1fe2bd65f1 100644 (file)
--- 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 ac2e9323fb2177f53dd7b7ac0e2d89d632ff2a01..47a13a787a2ce0c36599146d88d4f772e8043a40 100644 (file)
--- 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):