[Commit-gnuradio] r4209 - gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2

[trondeau]

Author: trondeau
Date: 2007-01-01 12:58:54 -0700 (Mon, 01 Jan 2007)
New Revision: 4209

Added:
   
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/d8psk.py
Modified:
   
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/Makefile.am
   
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/dbpsk.py
   
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/dqpsk.py
   
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/gmsk.py
Log:
updated PSK code using new receiver structure

Modified: 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/Makefile.am
  2007-01-01 19:43:26 UTC (rev 4208)
+++ 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/Makefile.am
  2007-01-01 19:58:54 UTC (rev 4209)
@@ -30,9 +30,15 @@
        __init__.py             \
        dbpsk.py                \
        dqpsk.py                \
+       d8psk.py                \
        gmsk.py                 \
        pkt.py                  \
-       psk.py
+       psk.py                  \
+       qam.py                  \
+       qam8.py                 \
+       qam16.py                \
+       qam64.py                \
+       qam256.py
 
 noinst_PYTHON =                
 

Added: 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/d8psk.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/d8psk.py
                             (rev 0)
+++ 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/d8psk.py
     2007-01-01 19:58:54 UTC (rev 4209)
@@ -0,0 +1,406 @@
+#
+# Copyright 2005,2006 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
+# See gnuradio-examples/python/digital for examples
+
+"""
+differential 8PSK modulation and demodulation.
+"""
+
+from gnuradio import gr, gru, modulation_utils
+from math import pi, sqrt
+import psk
+import cmath
+import Numeric
+from pprint import pprint
+
+# default values (used in __init__ and add_options)
+_def_samples_per_symbol = 3
+_def_excess_bw = 0.35
+_def_gray_code = True
+_def_verbose = False
+_def_log = False
+
+_def_costas_alpha = 0.01
+_def_gain_mu = 0.05
+_def_mu = 0.5
+_def_omega_relative_limit = 0.005
+
+
+# /////////////////////////////////////////////////////////////////////////////
+#                           DQPSK modulator
+# /////////////////////////////////////////////////////////////////////////////
+
+class d8psk_mod(gr.hier_block2):
+
+    def __init__(self,
+                 samples_per_symbol=_def_samples_per_symbol,
+                 excess_bw=_def_excess_bw,
+                 gray_code=_def_gray_code,
+                 verbose=_def_verbose,
+                 log=_def_log):
+        """
+       Hierarchical block for RRC-filtered QPSK modulation.
+
+       The input is a byte stream (unsigned char) and the
+       output is the complex modulated signal at baseband.
+
+       @param samples_per_symbol: samples per symbol >= 2
+       @type samples_per_symbol: integer
+       @param excess_bw: Root-raised cosine filter excess bandwidth
+       @type excess_bw: float
+        @param gray_code: Tell modulator to Gray code the bits
+        @type gray_code: bool
+        @param verbose: Print information about modulator?
+        @type verbose: bool
+        @param debug: Print modualtion data to files?
+        @type debug: bool
+       """
+
+        gr.hier_block2.__init__(self, "d8psk_mod",
+                                gr.io_signature(1,1,gr.sizeof_char),       # 
Input signature
+                                gr.io_signature(1,1,gr.sizeof_gr_complex)) # 
Output signature
+
+        self._samples_per_symbol = samples_per_symbol
+        self._excess_bw = excess_bw
+        self._gray_code = gray_code
+
+        if not isinstance(samples_per_symbol, int) or samples_per_symbol < 2:
+            raise TypeError, ("sbp must be an integer >= 2, is %d" % 
samples_per_symbol)
+
+       ntaps = 11 * samples_per_symbol
+ 
+        arity = pow(2,self.bits_per_symbol())
+
+        # turn bytes into k-bit vectors
+        self.bytes2chunks = \
+          gr.packed_to_unpacked_bb(self.bits_per_symbol(), gr.GR_MSB_FIRST)
+
+        if self._gray_code:
+            self.symbol_mapper = gr.map_bb(psk.binary_to_gray[arity])
+        else:
+            self.symbol_mapper = gr.map_bb(psk.binary_to_ungray[arity])
+            
+        self.diffenc = gr.diff_encoder_bb(arity)
+
+        rot = 1
+        rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
+        self.chunks2symbols = gr.chunks_to_symbols_bc(rotated_const)
+
+        # pulse shaping filter
+       self.rrc_taps = gr.firdes.root_raised_cosine(
+           self._samples_per_symbol, # gain  (sps since we're interpolating by 
sps)
+            self._samples_per_symbol, # sampling rate
+            1.0,                     # symbol rate
+            self._excess_bw,          # excess bandwidth (roll-off factor)
+            ntaps)
+
+       self.rrc_filter = gr.interp_fir_filter_ccf(self._samples_per_symbol, 
self.rrc_taps)
+
+        # Define components from objects
+        self.define_component("bytes2chunks", self.bytes2chunks)
+        self.define_component("symbol_mapper", self.symbol_mapper)
+#        self.define_component("diffenc", self.diffenc)
+        self.define_component("chunks2symbols", self.chunks2symbols)
+        self.define_component("rrc_filter", self.rrc_filter)
+
+       # Connect components
+        self.connect("self", 0, "bytes2chunks", 0)
+        self.connect("bytes2chunks", 0, "symbol_mapper", 0)
+#        self.connect("symbol_mapper", 0, "diffenc", 0)
+#        self.connect("diffenc", 0, "chunks2symbols", 0)
+        self.connect("symbol_mapper", 0, "chunks2symbols", 0)
+        self.connect("chunks2symbols", 0, "rrc_filter", 0)
+        self.connect("rrc_filter", 0, "self", 0)
+
+        if verbose:
+            self._print_verbage()
+        
+        if log:
+            self._setup_logging()
+            
+
+    def samples_per_symbol(self):
+        return self._samples_per_symbol
+
+    def bits_per_symbol(self=None):   # staticmethod that's also callable on 
an instance
+        return 3
+    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static 
method.  RTFM
+
+    def _print_verbage(self):
+        print "\nModulator:"
+        print "bits per symbol = %d" % self.bits_per_symbol()
+        print "Gray code = %s" % self._gray_code
+        print "RS roll-off factor = %f" % self._excess_bw
+
+    def _setup_logging(self):
+        print "Modulation logging turned on."
+        self.define_component("bytes2chunks_dat", gr.file_sink(gr.sizeof_char, 
"tx_bytes2chunks.dat"))
+        self.define_component("symbol_mapper_dat", 
gr.file_sink(gr.sizeof_char, "tx_symbol_mapper.dat"))
+#        self.define_component("diffenc_dat", gr.file_sink(gr.sizeof_char, 
"tx_diffenc.dat"))
+        self.define_component("chunks2symbols_dat", 
gr.file_sink(gr.sizeof_gr_complex, "tx_chunks2symbols.dat"))
+        self.define_component("rrc_filter_dat", 
gr.file_sink(gr.sizeof_gr_complex, "tx_rrc_filter.dat"))
+
+        self.connect("bytes2chunks", 0, "bytes2chunks_dat", 0)
+        self.connect("symbol_mapper", 0, "symbol_mapper_dat", 0)
+#        self.connect("diffenc", 0, "diffenc_dat", 0)
+        self.connect("chunks2symbols", 0, "chunks2symbols_dat", 0)
+        self.connect("rrc_filter", 0, "rrc_filter_dat", 0)
+
+    def add_options(parser):
+        """
+        Adds 8PSK modulation-specific options to the standard parser
+        """
+        parser.add_option("", "--excess-bw", type="float", 
default=_def_excess_bw,
+                          help="set RRC excess bandwith factor 
[default=%default] (PSK)")
+        parser.add_option("", "--no-gray-code", dest="gray_code",
+                          action="store_false", default=_def_gray_code,
+                          help="disable gray coding on modulated bits (PSK)")
+    add_options=staticmethod(add_options)
+
+
+    def extract_kwargs_from_options(options):
+        """
+        Given command line options, create dictionary suitable for passing to 
__init__
+        """
+        return modulation_utils.extract_kwargs_from_options(d8psk_mod.__init__,
+                                                            ('self', 'fg'), 
options)
+    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
+
+
+# /////////////////////////////////////////////////////////////////////////////
+#                           D8PSK demodulator
+#
+# Differentially coherent detection of differentially encoded 8psk
+# /////////////////////////////////////////////////////////////////////////////
+
+WITH_SYNC = False
+class d8psk_demod(gr.hier_block2):
+
+    def __init__(self,
+                 samples_per_symbol=_def_samples_per_symbol,
+                 excess_bw=_def_excess_bw,
+                 costas_alpha=_def_costas_alpha,
+                 gain_mu=_def_gain_mu,
+                 mu=_def_mu,
+                 omega_relative_limit=_def_omega_relative_limit,
+                 gray_code=_def_gray_code,
+                 verbose=_def_verbose,
+                 log=_def_log):
+        """
+       Hierarchical block for RRC-filtered DQPSK demodulation
+
+       The input is the complex modulated signal at baseband.
+       The output is a stream of bits packed 1 bit per byte (LSB)
+
+       @param samples_per_symbol: samples per symbol >= 2
+       @type samples_per_symbol: float
+       @param excess_bw: Root-raised cosine filter excess bandwidth
+       @type excess_bw: float
+        @param costas_alpha: loop filter gain
+        @type costas_alphas: float
+        @param gain_mu: for M&M block
+        @type gain_mu: float
+        @param mu: for M&M block
+        @type mu: float
+        @param omega_relative_limit: for M&M block
+        @type omega_relative_limit: float
+        @param gray_code: Tell modulator to Gray code the bits
+        @type gray_code: bool
+        @param verbose: Print information about modulator?
+        @type verbose: bool
+        @param debug: Print modualtion data to files?
+        @type debug: bool
+       """
+
+        gr.hier_block2.__init__(self, "d8psk_demod",
+                                gr.io_signature(1,1,gr.sizeof_gr_complex), # 
Input signature
+                                gr.io_signature(1,1,gr.sizeof_char))       # 
Output signature
+
+        self._samples_per_symbol = samples_per_symbol
+        self._excess_bw = excess_bw
+        self._costas_alpha = costas_alpha
+        self._mm_gain_mu = gain_mu
+        self._mm_mu = mu
+        self._mm_omega_relative_limit = omega_relative_limit
+        self._gray_code = gray_code
+
+        if samples_per_symbol < 2:
+            raise TypeError, "sbp must be >= 2, is %d" % samples_per_symbol
+
+        arity = pow(2,self.bits_per_symbol())
+ 
+        # Automatic gain control
+        scale = (1.0/16384.0)
+        self.pre_scaler = gr.multiply_const_cc(scale)   # scale the signal 
from full-range to +-1
+        #self.agc = gr.agc2_cc(0.6e-1, 1e-3, 1, 1, 100)
+        self.agc = gr.feedforward_agc_cc(16, 1.0)
+
+        # RRC data filter
+        ntaps = 11 * samples_per_symbol
+        self.rrc_taps = gr.firdes.root_raised_cosine(
+            1.0,                      # gain
+            self._samples_per_symbol, # sampling rate
+            1.0,                      # symbol rate
+            self._excess_bw,          # excess bandwidth (roll-off factor)
+            ntaps)
+        self.rrc_filter=gr.interp_fir_filter_ccf(1, self.rrc_taps)        
+
+        # symbol clock recovery
+        self._mm_omega = self._samples_per_symbol
+        self._mm_gain_omega = .25 * self._gain_mu * self._gain_mu
+        self._costas_beta  = 0.25 * self._costas_alpha * self._costas_alpha
+        fmin = -0.05
+        fmax = 0.05
+
+        self.receier=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.diffdec = gr.diff_decoder_bb(arity)
+
+        # find closest constellation point
+        rot = 1
+        rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
+        self.slicer = gr.constellation_decoder_cb(rotated_const, range(arity))
+
+        if self._gray_code:
+            self.symbol_mapper = gr.map_bb(psk.gray_to_binary[arity])
+        else:
+            self.symbol_mapper = gr.map_bb(psk.ungray_to_binary[arity])
+
+        
+        # unpack the k bit vector into a stream of bits
+        self.unpack = gr.unpack_k_bits_bb(self.bits_per_symbol())
+
+ 
+        # Define components
+        self.define_component("pre_scaler", self.pre_scaler)
+        self.define_component("agc", self.agc)
+        self.define_component("rrc_filter", self.rrc_filter)
+        self.define_component("receier", self.receier)
+        self.define_component("slicer", self.slicer)
+        #self.define_component("diffdec", self.diffdec)
+        self.define_component("symbol_mapper", self.symbol_mapper)
+        self.define_component("unpack", self.unpack)
+
+        # Connect and Initialize base class
+        self.connect("self", 0, "pre_scaler", 0)
+        self.connect("pre_scaler", 0, "agc", 0)
+        self.connect("agc", 0, "rrc_filter", 0)
+        self.connect("rrc_filter", 0, "receier", 0)
+        self.connect("receier", 0, "slicer", 0)
+        #self.connect("slicer", 0, "diffdec", 0)
+        #self.connect("diffdec", 0, "symbol_mapper", 0)
+        self.connect("slicer", 0, "symbol_mapper", 0)
+        self.connect("symbol_mapper", 0, "unpack", 0)
+        self.connect("unpack", 0, "self", 0)
+
+        if verbose:
+            self._print_verbage()
+        
+        if log:
+            self._setup_logging()
+
+
+    def samples_per_symbol(self):
+        return self._samples_per_symbol
+
+    def bits_per_symbol(self=None):   # staticmethod that's also callable on 
an instance
+        return 3
+    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static 
method.  RTFM
+
+    def _print_verbage(self):
+        print "\nDemodulator:"
+        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 "Costas Loop alpha:   %.5f" % self._costas_alpha
+        print "Costas Loop beta:    %.5f" % self._costas_beta
+        print "M&M mu:              %.5f" % self._mm_mu
+        print "M&M mu gain:         %.5f" % self._mm_gain_mu
+        print "M&M omega:           %.5f" % self._mm_omega
+        print "M&M omega gain:      %.5f" % self._mm_omega_gain
+        print "M&M omega limit:     %.5f" % self._omega_relative_limit
+        
+
+    def _setup_logging(self):
+        print "Demodulation logging turned on."
+        self.define_component("prescaler_dat",
+                              gr.file_sink(gr.sizeof_gr_complex, 
"rx_prescaler.dat"))
+        self.define_component("agc_dat",
+                              gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat"))
+        self.define_component("rrc_filter_dat",
+                              gr.file_sink(gr.sizeof_gr_complex, 
"rx_rrc_filter.dat"))
+        self.define_component("receier_dat",
+                              gr.file_sink(gr.sizeof_gr_complex, 
"rx_receier.dat"))
+        self.define_component("slicer_dat",
+                              gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
+#        self.define_component("diffdec_dat",
+#                              gr.file_sink(gr.sizeof_char, "rx_diffdec.dat"))
+        self.define_component("symbol_mapper_dat",
+                              gr.file_sink(gr.sizeof_char, 
"rx_symbol_mapper.dat"))
+        self.define_component("unpack_dat",
+                              gr.file_sink(gr.sizeof_char, "rx_unpack.dat"))
+
+        self.connect("pre_scaler", 0, "prescaler_dat", 0)
+        self.connect("agc", 0, "agc_dat", 0)
+        self.connect("rrc_filter", 0, "rrc_filter_dat", 0)
+        self.connect("receier", 0, "receier_dat", 0)
+        self.connect("slicer", 0, "slicer_dat", 0)
+#        self.connect("diffdec", 0, "diffdec_dat", 0)
+        self.connect("symbol_mapper", 0, "symbol_mapper_dat", 0)
+        self.connect("unpack", 0, "unpack_dat", 0)
+
+    def add_options(parser):
+        """
+        Adds modulation-specific options to the standard parser
+        """
+        parser.add_option("", "--excess-bw", type="float", 
default=_def_excess_bw,
+                          help="set RRC excess bandwith factor 
[default=%default] (PSK)")
+        parser.add_option("", "--no-gray-code", dest="gray_code",
+                          action="store_false", default=_def_gray_code,
+                          help="disable gray coding on modulated bits (PSK)")
+        parser.add_option("", "--costas-alpha", type="float", default=None,
+                          help="set Costas loop alpha value [default=%default] 
(PSK)")
+        parser.add_option("", "--gain-mu", type="float", default=_def_gain_mu,
+                          help="set M&M symbol sync loop gain mu value 
[default=%default] (PSK)")
+        parser.add_option("", "--mu", type="float", default=_def_mu,
+                          help="set M&M symbol sync loop mu value 
[default=%default] (PSK)")
+    add_options=staticmethod(add_options)
+
+    def extract_kwargs_from_options(options):
+        """
+        Given command line options, create dictionary suitable for passing to 
__init__
+        """
+        return modulation_utils.extract_kwargs_from_options(
+            d8psk_demod.__init__, ('self', 'fg'), options)
+    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
+
+
+#
+# Add these to the mod/demod registry
+#
+modulation_utils.add_type_1_mod('d8psk', d8psk_mod)
+modulation_utils.add_type_1_demod('d8psk', d8psk_demod)

Modified: 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/dbpsk.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/dbpsk.py
     2007-01-01 19:43:26 UTC (rev 4208)
+++ 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/dbpsk.py
     2007-01-01 19:58:54 UTC (rev 4209)
@@ -39,9 +39,9 @@
 _def_verbose = False
 _def_log = False
 
-_def_costas_alpha = None
-_def_gain_mu = 0.03
-_def_mu = 0.05
+_def_costas_alpha = 0.01
+_def_gain_mu = 0.05
+_def_mu = 0.5
 _def_omega_relative_limit = 0.005
 
 
@@ -162,6 +162,7 @@
 
 
     def _print_verbage(self):
+        print "\nModulator:"
         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
@@ -225,7 +226,7 @@
         @type debug: bool
        """
 
-        gr.hier_block2.__init__(self, "dbpsk_mod",
+        gr.hier_block2.__init__(self, "dbpsk_demod",
                                 gr.io_signature(1,1,gr.sizeof_gr_complex), # 
Input signature
                                 gr.io_signature(1,1,gr.sizeof_char))       # 
Output signature
 
@@ -233,9 +234,9 @@
         self._samples_per_symbol = samples_per_symbol
         self._excess_bw = excess_bw
         self._costas_alpha = costas_alpha
-        self._gain_mu = gain_mu
-        self._mu = mu
-        self._omega_relative_limit = omega_relative_limit
+        self._mm_gain_mu = gain_mu
+        self._mm_mu = mu
+        self._mm_omega_relative_limit = omega_relative_limit
         self._gray_code = gray_code
         
         if samples_per_symbol < 2:
@@ -250,38 +251,43 @@
         self.agc = gr.feedforward_agc_cc(16, 1.0)
 
         
-        # Costas loop (carrier tracking)
-        # The Costas loop is not needed for BPSK, though it can help. Turn the 
Costas loop on
-        # by setting an alpha value not None.
-        if self._costas_alpha is not None:
-            costas_order = 2
-            beta = .25 * self._costas_alpha * self._costas_alpha
-            self.costas_loop = gr.costas_loop_cc(self._costas_alpha, beta, 
0.002, -0.002, costas_order)
-            self.define_component("costas_loop", self.costas_loop)
-
         # RRC data filter
-        ntaps = 11 * self._samples_per_symbol
+        ntaps = 11 * samples_per_symbol
         self.rrc_taps = gr.firdes.root_raised_cosine(
-            1.0,                      # gain 
+            1.0,                      # gain
             self._samples_per_symbol, # sampling rate
             1.0,                      # symbol rate
             self._excess_bw,          # excess bandwidth (roll-off factor)
             ntaps)
+        self.rrc_filter=gr.interp_fir_filter_ccf(1, self.rrc_taps)        
 
-        self.rrc_filter=gr.fir_filter_ccf(1, self.rrc_taps)
-
         # symbol clock recovery
+        # Parameters for the symbol synchronization (using M&M loop)
+        self._mu = 0.50
+        self._gain_mu = 0.1
         omega = self._samples_per_symbol
         gain_omega = .25 * self._gain_mu * self._gain_mu
-        self.clock_recovery=gr.clock_recovery_mm_cc(omega, gain_omega,
-                                                    self._mu, self._gain_mu,
-                                                    self._omega_relative_limit)
+        self._omega_relative_limit = 0.005
 
+        # Parameters for the carrier frequency and phase synchronization
+        self._mm_omega = self._samples_per_symbol
+        self._mm_gain_omega = .25 * self._gain_mu * self._gain_mu
+        self._costas_beta  = 0.25 * self._costas_alpha * self._costas_alpha
+        fmin = -0.05
+        fmax = 0.05
+        
+        self.receier=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)
         # find closest constellation point
         rot = 1
         rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
         #print "rotated_const =", rotated_const
 
+        # Using differential decoding
         self.diffdec = gr.diff_phasor_cc()
         #self.diffdec = gr.diff_decoder_bb(arity)
 
@@ -299,30 +305,23 @@
         self.define_component("pre_scaler", self.pre_scaler)
         self.define_component("agc", self.agc)
         self.define_component("rrc_filter", self.rrc_filter)
-        self.define_component("clock_recovery", self.clock_recovery)
-        self.define_component("diffdec", self.diffdec)
+        self.define_component("receier", self.receier)
         self.define_component("slicer", self.slicer)
+        self.define_component("diffdec", self.diffdec)
         self.define_component("symbol_mapper", self.symbol_mapper)
         self.define_component("unpack", self.unpack)
 
         # Connect and Initialize base class
         self.connect("self", 0, "pre_scaler", 0)
         self.connect("pre_scaler", 0, "agc", 0)
-
-        if self._costas_alpha is not None:   # With Costas Loop
-            self.connect("agc", 0, "costas_loop", 0)
-            self.connect("costas_loop", 0, "rrc_filter", 0)
-            
-        else: # Without Costas Loop
-            self.connect("agc", 0, "rrc_filter", 0)
-            
-        self.connect("rrc_filter", 0, "clock_recovery", 0)
-        self.connect("clock_recovery", 0, "diffdec", 0)
+        self.connect("agc", 0, "rrc_filter", 0)
+        self.connect("rrc_filter", 0, "receier", 0)
+        self.connect("receier", 0, "diffdec", 0)
         self.connect("diffdec", 0, "slicer", 0)
         self.connect("slicer", 0, "symbol_mapper", 0)
         self.connect("symbol_mapper", 0, "unpack", 0)
         self.connect("unpack", 0, "self", 0)
-
+        
         if verbose:
             self._print_verbage()
 
@@ -337,16 +336,17 @@
     bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static 
method.  RTFM
 
     def _print_verbage(self):
-        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
-        if self._costas_alpha is not None:
-            print "Costas Loop alpha = %.5f"     % self._costas_alpha
-        else:
-            print "Costas Loop is turned off"
-        print "M&M symbol sync gain = %.5f"  % self._gain_mu
-        print "M&M symbol sync mu = %.5f"    % self._mu
-        print "M&M omega relative limit = %.5f" % self._omega_relative_limit
+        print "\nDemodulator:"
+        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 "Costas Loop alpha:   %.5f" % self._costas_alpha
+        print "Costas Loop beta:    %.5f" % self._costas_beta
+        print "M&M mu:              %.5f" % self._mm_mu
+        print "M&M mu gain:         %.5f" % self._mm_gain_mu
+        print "M&M omega:           %.5f" % self._mm_omega
+        print "M&M omega gain:      %.5f" % self._mm_omega_gain
+        print "M&M omega limit:     %.5f" % self._omega_relative_limit        
 
     def _setup_logging(self):
         print "Demodulation logging turned on."
@@ -356,10 +356,8 @@
                               gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat"))
         self.define_component("rrc_filter_dat",
                               gr.file_sink(gr.sizeof_gr_complex, 
"rx_rrc_filter.dat"))
-        self.define_component("clock_recovery_dat",
-                              gr.file_sink(gr.sizeof_gr_complex, 
"rx_clock_recovery.dat"))
-        self.define_component("clock_recovery_error_dat",
-                              gr.file_sink(gr.sizeof_gr_complex, 
"rx_clock_recovery_error.dat"))
+        self.define_component("receier_dat",
+                              gr.file_sink(gr.sizeof_gr_complex, 
"rx_receier.dat"))
         self.define_component("diffdec_dat",
                               gr.file_sink(gr.sizeof_gr_complex, 
"rx_diffdec.dat"))
         self.define_component("slicer_dat",
@@ -371,22 +369,13 @@
 
         self.connect("pre_scaler", 0, "prescaler_dat", 0)
         self.connect("agc", 0, "agc_dat", 0)
-        if self._costas_alpha is not None:
-            self.define_component("costas_loop_dat",
-                                  gr.file_sink(gr.sizeof_gr_complex, 
"costas_loop.dat"))
-            self.define_component("costas_loop_error_dat",
-                                  gr.file_sink(gr.sizeof_gr_complex, 
"costas_loop_error.dat"))
-
-            self.connect("costas_loop", 0, "costas_loop_dat", 0)
-            self.connect("costas_loop", 1, "costas_loop_error_dat", 0)
-
         self.connect("rrc_filter", 0, "rrc_filter_dat", 0)
-        self.connect("clock_recovery", 0, "clock_recovery_dat", 0)
-        self.connect("clock_recovery", 1, "clock_recovery_error_dat", 0)
+        self.connect("receier", 0, "receier_dat", 0)
         self.connect("diffdec", 0, "diffdec_dat", 0)
         self.connect("slicer", 0, "slicer_dat", 0)
         self.connect("symbol_mapper", 0, "symbol_mapper_dat", 0)
         self.connect("unpack", 0, "unpack_dat", 0)
+
         
     def add_options(parser):
         """

Modified: 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/dqpsk.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/dqpsk.py
     2007-01-01 19:43:26 UTC (rev 4208)
+++ 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/dqpsk.py
     2007-01-01 19:58:54 UTC (rev 4209)
@@ -39,9 +39,9 @@
 _def_verbose = False
 _def_log = False
 
-_def_costas_alpha = None
-_def_gain_mu = 0.01
-_def_mu = 0.00
+_def_costas_alpha = 0.01
+_def_gain_mu = 0.05
+_def_mu = 0.5
 _def_omega_relative_limit = 0.005
 
 
@@ -143,6 +143,7 @@
     bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static 
method.  RTFM
 
     def _print_verbage(self):
+        print "\nModulator:"
         print "bits per symbol = %d" % self.bits_per_symbol()
         print "Gray code = %s" % self._gray_code
         print "RRS roll-off factor = %f" % self._excess_bw
@@ -226,16 +227,16 @@
         @type debug: bool
        """
 
-        gr.hier_block2.__init__(self, "dqpsk_mod",
+        gr.hier_block2.__init__(self, "dqpsk_demod",
                                 gr.io_signature(1,1,gr.sizeof_gr_complex), # 
Input signature
                                 gr.io_signature(1,1,gr.sizeof_char))       # 
Output signature
 
         self._samples_per_symbol = samples_per_symbol
         self._excess_bw = excess_bw
         self._costas_alpha = costas_alpha
-        self._gain_mu = gain_mu
-        self._mu = mu
-        self._omega_relative_limit = omega_relative_limit
+        self._mm_gain_mu = gain_mu
+        self._mm_mu = mu
+        self._mm_omega_relative_limit = omega_relative_limit
         self._gray_code = gray_code
 
         if samples_per_symbol < 2:
@@ -248,35 +249,30 @@
         self.pre_scaler = gr.multiply_const_cc(scale)   # scale the signal 
from full-range to +-1
         self.agc = gr.feedforward_agc_cc(16, 1.0)
        
-        # Costas loop (carrier tracking)
-        if self._costas_alpha is None:   # If no alpha value was specified by 
the user
-            alpha_dir = {2:0.075, 3:0.09, 4:0.09, 5:0.095, 6:0.10, 7:0.105}
-            self._costas_alpha = alpha_dir[self._samples_per_symbol]
-        
-        costas_order = 4        
-        # The value of beta is now set to be underdamped; this value can have 
a huge impact on the
-        # performance of QPSK. Set to 0.25 for critically damped or higher for 
underdamped responses.
-        beta = .35 * self._costas_alpha * self._costas_alpha
-        self.costas_loop = gr.costas_loop_cc(self._costas_alpha, beta, 0.02, 
-0.02, costas_order)
-
         # RRC data filter
         ntaps = 11 * samples_per_symbol
         self.rrc_taps = gr.firdes.root_raised_cosine(
-            self._samples_per_symbol, # gain
+            1.0,                      # gain
             self._samples_per_symbol, # sampling rate
             1.0,                      # symbol rate
             self._excess_bw,          # excess bandwidth (roll-off factor)
             ntaps)
+        self.rrc_filter=gr.interp_fir_filter_ccf(1, self.rrc_taps)        
 
-        self.rrc_filter=gr.fir_filter_ccf(1, self.rrc_taps)
-
         # symbol clock recovery
-        omega = self._samples_per_symbol
-        gain_omega = .25 * self._gain_mu * self._gain_mu
-        self.clock_recovery=gr.clock_recovery_mm_cc(omega, gain_omega,
-                                                    self._mu, self._gain_mu,
-                                                    self._omega_relative_limit)
-
+        self._mm_omega = self._samples_per_symbol
+        self._mm_gain_omega = .25 * self._gain_mu * self._gain_mu
+        self._costas_beta  = 0.25 * self._costas_alpha * self._costas_alpha
+        fmin = -0.05
+        fmax = 0.05
+        
+        self.receier=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.diffdec = gr.diff_decoder_bb(arity)
 
         # find closest constellation point
@@ -297,7 +293,6 @@
         # Define components
         self.define_component("pre_scaler", self.pre_scaler)
         self.define_component("agc", self.agc)
-        self.define_component("costas_loop", self.costas_loop)
         self.define_component("rrc_filter", self.rrc_filter)
         self.define_component("clock_recovery", self.clock_recovery)
         self.define_component("slicer", self.slicer)
@@ -308,8 +303,7 @@
         # Connect and Initialize base class
         self.connect("self", 0, "pre_scaler", 0)
         self.connect("pre_scaler", 0, "agc", 0)
-        self.connect("agc", 0, "costas_loop", 0)
-        self.connect("costas_loop", 0, "rrc_filter", 0)            
+        self.connect("agc", 0, "rrc_filter", 0)
         self.connect("rrc_filter", 0, "clock_recovery", 0)
         self.connect("clock_recovery", 0, "slicer", 0)
         self.connect("slicer", 0, "diffdec", 0)
@@ -331,14 +325,17 @@
     bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static 
method.  RTFM
 
     def _print_verbage(self):
-        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 "Costas Loop alpha = %.5f"     % self._costas_alpha
-        print "M&M symbol sync gain = %.5f"  % self._gain_mu
-        print "M&M symbol sync mu = %.5f"    % self._mu
-        print "M&M omega relative limit = %.5f" % self._omega_relative_limit
-        
+        print "\nDemodulator:"
+        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 "Costas Loop alpha:   %.5f" % self._costas_alpha
+        print "Costas Loop beta:    %.5f" % self._costas_beta
+        print "M&M mu:              %.5f" % self._mm_mu
+        print "M&M mu gain:         %.5f" % self._mm_gain_mu
+        print "M&M omega:           %.5f" % self._mm_omega
+        print "M&M omega gain:      %.5f" % self._mm_omega_gain
+        print "M&M omega limit:     %.5f" % self._omega_relative_limit        
 
     def _setup_logging(self):
         print "Demodulation logging turned on."
@@ -346,16 +343,10 @@
                               gr.file_sink(gr.sizeof_gr_complex, 
"rx_prescaler.dat"))
         self.define_component("agc_dat",
                               gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat"))
-        self.define_component("costas_loop_dat",
-                              gr.file_sink(gr.sizeof_gr_complex, 
"costas_loop.dat"))
-        self.define_component("costas_loop_error_dat",
-                              gr.file_sink(gr.sizeof_gr_complex, 
"costas_loop_error.dat"))
         self.define_component("rrc_filter_dat",
                               gr.file_sink(gr.sizeof_gr_complex, 
"rx_rrc_filter.dat"))
-        self.define_component("clock_recovery_dat",
-                              gr.file_sink(gr.sizeof_gr_complex, 
"rx_clock_recovery.dat"))
-        self.define_component("clock_recovery_error_dat",
-                              gr.file_sink(gr.sizeof_gr_complex, 
"rx_clock_recovery_error.dat"))
+        self.define_component("receier_dat",
+                              gr.file_sink(gr.sizeof_gr_complex, 
"rx_receier.dat"))
         self.define_component("slicer_dat",
                               gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
         self.define_component("diffdec_dat",
@@ -367,11 +358,8 @@
 
         self.connect("pre_scaler", 0, "prescaler_dat", 0)
         self.connect("agc", 0, "agc_dat", 0)
-        self.connect("costas_loop", 0, "costas_loop_dat", 0)
-        self.connect("costas_loop", 1, "costas_loop_error_dat", 0)
         self.connect("rrc_filter", 0, "rrc_filter_dat", 0)
-        self.connect("clock_recovery", 0, "clock_recovery_dat", 0)
-        self.connect("clock_recovery", 1, "clock_recovery_error_dat", 0)
+        self.connect("receier", 0, "receier_dat", 0)
         self.connect("slicer", 0, "slicer_dat", 0)
         self.connect("diffdec", 0, "diffdec_dat", 0)
         self.connect("symbol_mapper", 0, "symbol_mapper_dat", 0)

Modified: 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/gmsk.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/gmsk.py
      2007-01-01 19:43:26 UTC (rev 4208)
+++ 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/gmsk.py
      2007-01-01 19:58:54 UTC (rev 4209)
@@ -202,7 +202,7 @@
         @param float
        """
 
-        gr.hier_block2.__init__(self, "gmsk_mod",
+        gr.hier_block2.__init__(self, "gmsk_demod",
                                 gr.io_signature(1,1,gr.sizeof_gr_complex), # 
Input signature
                                 gr.io_signature(1,1,gr.sizeof_char))       # 
Output signature