1 files changed, 23 insertions, 7 deletions
diff --git a/gr-digital/python/qa_constellation.py b/gr-digital/python/qa_constellation.py
index b17d2a0fcb..e0b5b3888e 100755
--- a/gr-digital/python/qa_constellation.py
+++ b/gr-digital/python/qa_constellation.py
@@ -67,8 +67,24 @@ def threed_constell():
 tested_constellation_info = (
     (psk.psk_constellation,
      {'m': (2, 4, 8, 16, 32, 64),
-      'mod_code': tested_mod_codes, },
+      'mod_code': tested_mod_codes, 
+      'differential': (True,)},
      True, None),
+    (psk.psk_constellation,
+     {'m': (2, 4, 8, 16, 32, 64),
+      'mod_code': tested_mod_codes,
+      'differential': (False,)},
+     False, None),
+    (qam.qam_constellation,
+     {'constellation_points': (4, 16, 64),
+      'mod_code': tested_mod_codes, 
+      'differential': (True,)},
+     True, None),
+    (qam.qam_constellation,
+     {'constellation_points': (4, 16, 64),
+      'mod_code': tested_mod_codes, 
+      'differential': (False,)},
+     False, None),
     (digital_swig.constellation_bpsk, {}, True, None),
     (digital_swig.constellation_qpsk, {}, False, None),
     (digital_swig.constellation_dqpsk, {}, True, None),
@@ -167,13 +183,13 @@ class mod_demod(gr.hier_block2):
         # Apply any pre-differential coding
         # Gray-coding is done here if we're also using differential coding.
         if self.constellation.apply_pre_diff_code():
-            self.blocks.append(gr.map_bb(self.constellation.pre_diff_code()))
+            self.blocks.append(digital_swig.map_bb(self.constellation.pre_diff_code()))
         # Differential encoding.
         if self.differential:
-            self.blocks.append(gr.diff_encoder_bb(arity))
+            self.blocks.append(digital_swig.diff_encoder_bb(arity))
         # Convert to constellation symbols.
-        self.blocks.append(gr.chunks_to_symbols_bc(self.constellation.points(),
-                                                   self.constellation.dimensionality()))
+        self.blocks.append(digital_swig.chunks_to_symbols_bc(self.constellation.points(),
+                                                             self.constellation.dimensionality()))
         # CHANNEL
         # Channel just consists of a rotation to check differential coding.
         if rotation is not None:
@@ -184,10 +200,10 @@ class mod_demod(gr.hier_block2):
         self.blocks.append(digital_swig.constellation_decoder_cb(self.constellation.base()))
         # Differential decoding.
         if self.differential:
-            self.blocks.append(gr.diff_decoder_bb(arity))
+            self.blocks.append(digital_swig.diff_decoder_bb(arity))
         # Decode any pre-differential coding.
         if self.constellation.apply_pre_diff_code():
-            self.blocks.append(gr.map_bb(
+            self.blocks.append(digital_swig.map_bb(
                 mod_codes.invert_code(self.constellation.pre_diff_code())))
         # unpack the k bit vector into a stream of bits            
         self.blocks.append(gr.unpack_k_bits_bb(