1 files changed, 99 insertions, 90 deletions
diff --git a/gr-digital/python/qpsk.py b/gr-digital/python/qpsk.py
index be21fd76f1..859d981367 100644
--- a/gr-digital/python/qpsk.py
+++ b/gr-digital/python/qpsk.py
@@ -27,50 +27,59 @@ Demodulation is not included since the generic_mod_demod
 
 from gnuradio import gr
 from gnuradio.digital.generic_mod_demod import generic_mod, generic_demod
-import digital_swig
+from gnuradio.digital.generic_mod_demod import shared_mod_args, shared_demod_args
+from utils import mod_codes
+import digital_swig as digital
 import modulation_utils
 
-# Default number of points in constellation.
-_def_constellation_points = 4
-# Whether gray coding is used.
-_def_gray_coded = True
+# The default encoding (e.g. gray-code, set-partition)
+_def_mod_code = mod_codes.GRAY_CODE
 
 # /////////////////////////////////////////////////////////////////////////////
 #                           QPSK constellation
 # /////////////////////////////////////////////////////////////////////////////
 
-def qpsk_constellation(m=_def_constellation_points): 
-    if m != _def_constellation_points:
-        raise ValueError("QPSK can only have 4 constellation points.")
-    return digital_swig.constellation_qpsk()
+def qpsk_constellation(mod_code=_def_mod_code): 
+    """
+    Creates a QPSK constellation.
+    """
+    if mod_code != mod_codes.GRAY_CODE:
+        raise ValueError("This QPSK mod/demod works only for gray-coded constellations.")
+    return digital.constellation_qpsk()
 
 # /////////////////////////////////////////////////////////////////////////////
 #                           QPSK modulator
 # /////////////////////////////////////////////////////////////////////////////
 
 class qpsk_mod(generic_mod):
-
-    def __init__(self, constellation_points=_def_constellation_points,
-                 gray_coded=_def_gray_coded,
-                 *args, **kwargs):
-
-        """
-	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.
-
-        See generic_mod block for list of parameters.
-	"""
-
-        constellation_points = _def_constellation_points
-        constellation = digital_swig.constellation_qpsk()
-        if constellation_points != 4:
-            raise ValueError("QPSK can only have 4 constellation points.")
-        if not gray_coded:
-            raise ValueError("This QPSK mod/demod works only for gray-coded constellations.")
+    """
+    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.
+    
+    Args:
+        mod_code: Whether to use a gray_code (digital.mod_codes.GRAY_CODE) or not (digital.mod_codes.NO_CODE).
+        differential: Whether to use differential encoding (boolean).
+    """
+    # See generic_mod for additional arguments
+    __doc__ += shared_mod_args
+        
+    def __init__(self, mod_code=_def_mod_code, differential=False, *args, **kwargs):
+        pre_diff_code = True
+        if not differential:
+            constellation = digital.constellation_qpsk()
+            if mod_code != mod_codes.GRAY_CODE:
+                raise ValueError("This QPSK mod/demod works only for gray-coded constellations.")
+        else:
+            constellation = digital.constellation_dqpsk()
+            if mod_code not in set([mod_codes.GRAY_CODE, mod_codes.NO_CODE]):
+                raise ValueError("That mod_code is not supported for DQPSK mod/demod.")
+            if mod_code == mod_codes.NO_CODE:
+                pre_diff_code = False
+                
         super(qpsk_mod, self).__init__(constellation=constellation,
-                                       gray_coded=gray_coded, 
+                                       pre_diff_code=pre_diff_code,
                                        *args, **kwargs)
 
 
@@ -80,24 +89,35 @@ class qpsk_mod(generic_mod):
 # /////////////////////////////////////////////////////////////////////////////
 
 class qpsk_demod(generic_demod):
-
-    def __init__(self, constellation_points=_def_constellation_points,
+    """
+    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.
+    
+    Args:
+        mod_code: Whether to use a gray_code (digital.mod_codes.GRAY_CODE) or not (digital.mod_codes.NO_CODE).
+        differential: Whether to use differential encoding (boolean).
+    """
+    # See generic_mod for additional arguments
+    __doc__ += shared_demod_args
+
+    def __init__(self, mod_code=_def_mod_code, differential=False,
                  *args, **kwargs):
+        pre_diff_code = True
+        if not differential:
+            constellation = digital.constellation_qpsk()
+            if mod_code != mod_codes.GRAY_CODE:
+                raise ValueError("This QPSK mod/demod works only for gray-coded constellations.")
+        else:
+            constellation = digital.constellation_dqpsk()
+            if mod_code not in set([mod_codes.GRAY_CODE, mod_codes.NO_CODE]):
+                raise ValueError("That mod_code is not supported for DQPSK mod/demod.")
+            if mod_code == mod_codes.NO_CODE:
+                pre_diff_code = False
 
-        """
-	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.
-
-        See generic_demod block for list of parameters.
-        """
-
-        constellation_points = _def_constellation_points
-        constellation = digital_swig.constellation_qpsk()
-        if constellation_points != 4:
-            raise ValueError('Number of constellation points must be 4 for QPSK.')
         super(qpsk_demod, self).__init__(constellation=constellation,
+                                         pre_diff_code=pre_diff_code,
                                          *args, **kwargs)
 
 
@@ -106,36 +126,30 @@ class qpsk_demod(generic_demod):
 #                           DQPSK constellation
 # /////////////////////////////////////////////////////////////////////////////
 
-def dqpsk_constellation(m=_def_constellation_points):
-    if m != _def_constellation_points:
-        raise ValueError("DQPSK can only have 4 constellation points.")
-    return digital_swig.constellation_dqpsk()
+def dqpsk_constellation(mod_code=_def_mod_code):
+    if mod_code != mod_codes.GRAY_CODE:
+        raise ValueError("The DQPSK constellation is only generated for gray_coding.  But it can be used for non-grayed coded modulation if one doesn't use the pre-differential code.")
+    return digital.constellation_dqpsk()
 
 # /////////////////////////////////////////////////////////////////////////////
 #                           DQPSK modulator
 # /////////////////////////////////////////////////////////////////////////////
 
-class dqpsk_mod(generic_mod):
-
-    def __init__(self, constellation_points=_def_constellation_points,
-                 gray_coded=_def_gray_coded,
-                 differential=True, *args, **kwargs):
-        """
-	Hierarchical block for RRC-filtered DQPSK modulation.
-
-	The input is a byte stream (unsigned char) and the
-	output is the complex modulated signal at baseband.
-
-        See generic_mod block for list of parameters.
-	"""
-
-        constellation_points = _def_constellation_points
-        constellation = digital_swig.constellation_dqpsk()
-        if constellation_points != 4:
-            raise ValueError('Number of constellation points must be 4 for DQPSK.')
-        super(dqpsk_mod, self).__init__(constellation=constellation,
-                                        gray_coded=gray_coded,
-                                        differential=True,
+class dqpsk_mod(qpsk_mod):
+    """
+    Hierarchical block for RRC-filtered DQPSK modulation.
+    
+    The input is a byte stream (unsigned char) and the
+    output is the complex modulated signal at baseband.
+
+    Args:
+        mod_code: Whether to use a gray_code (digital.mod_codes.GRAY_CODE) or not (digital.mod_codes.NO_CODE).
+    """
+    # See generic_mod for additional arguments
+    __doc__ += shared_mod_args
+
+    def __init__(self, mod_code=_def_mod_code, *args, **kwargs):
+        super(dqpsk_mod, self).__init__(mod_code,
                                         *args, **kwargs)
 
 # /////////////////////////////////////////////////////////////////////////////
@@ -143,25 +157,21 @@ class dqpsk_mod(generic_mod):
 #
 # /////////////////////////////////////////////////////////////////////////////
 
-class dqpsk_demod(generic_demod):
-
-    def __init__(self, constellation_points=_def_constellation_points,
-                 differential=True, *args, **kwargs):
-
-        """
-	Hierarchical block for RRC-filtered DQPSK modulation.
-
-	The input is a byte stream (unsigned char) and the
-	output is the complex modulated signal at baseband.
-
-        See generic_demod block for list of parameters.
-        """
-        constellation_points = _def_constellation_points
-        constellation = digital_swig.constellation_dqpsk()
-        if constellation_points != 4:
-            raise ValueError('Number of constellation points must be 4 for DQPSK.')
-        super(dqpsk_demod, self).__init__(constellation=constellation,
-                                          differential=True,
+class dqpsk_demod(qpsk_demod):
+    """
+    Hierarchical block for RRC-filtered DQPSK modulation.
+    
+    The input is a byte stream (unsigned char) and the
+    output is the complex modulated signal at baseband.
+
+    Args:
+        mod_code: Whether to use a gray_code (digital.mod_codes.GRAY_CODE) or not (digital.mod_codes.NO_CODE).
+    """
+    # See generic_mod for additional arguments
+    __doc__ += shared_demod_args
+
+    def __init__(self, mod_code=_def_mod_code, *args, **kwargs):
+        super(dqpsk_demod, self).__init__(mod_code,
                                           *args, **kwargs)
 
 #
@@ -173,4 +183,3 @@ modulation_utils.add_type_1_constellation('qpsk', qpsk_constellation)
 modulation_utils.add_type_1_mod('dqpsk', dqpsk_mod)
 modulation_utils.add_type_1_demod('dqpsk', dqpsk_demod)
 modulation_utils.add_type_1_constellation('dqpsk', dqpsk_constellation)
-