[Commit-gnuradio] [gnuradio] 01/06: gr-digital: add more constellation types to grc constellation block

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit d10c1d0b23c5e5b097b424449432cb42a20b4b6d
Author: Andrej Rode <address@hidden>
Date:   Mon Mar 14 18:41:44 2016 +0100

    gr-digital: add more constellation types to grc constellation block
---
 gr-digital/grc/digital_constellation.xml | 51 ++++++++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 3 deletions(-)

diff --git a/gr-digital/grc/digital_constellation.xml 
b/gr-digital/grc/digital_constellation.xml
index 5254e4d..ef5364d 100644
--- a/gr-digital/grc/digital_constellation.xml
+++ b/gr-digital/grc/digital_constellation.xml
@@ -9,7 +9,13 @@
   <key>variable_constellation</key>
   <category>Modulators</category>
   <import>from gnuradio import digital</import>
-  <var_make>self.$(id) = $(id) = digital.constellation_calcdist($const_points, 
$sym_map, $rot_sym, $dims).base()
+  <var_make>
+#if str($type) == "calcdist"
+self.$(id) = $(id) = digital.constellation_calcdist($const_points, $sym_map, 
$rot_sym, $dims).base()
+#else
+self.$(id) = $(id) = digital.constellation_$(type)().base()
+#end if
+
 #if str($soft_dec_lut).lower() == '"auto"' or str($soft_dec_lut).lower() == 
"'auto'"
 self.$(id).gen_soft_dec_lut($precision)
 #else if str($soft_dec_lut) != 'None'
@@ -17,16 +23,53 @@ self.$(id).set_soft_dec_lut($soft_dec_lut, $precision)
 #end if
 </var_make>
 
-  <var_value>digital.constellation_calcdist($const_points, $sym_map, $rot_sym, 
$dims)</var_value>
+<var_value>
+#if str($type) == "calcdist"
+digital.constellation_calcdist($const_points, $sym_map, $rot_sym, $dims)
+#else
+digital.constellation_$(type)()
+#end if
+</var_value>
 
   <make></make>
   <!--<callback></callback>-->
 
   <param>
+         <name>Constellation Type</name>
+         <key>type</key>
+         <type>enum</type>
+         <option>
+                 <name>Variable Constellation</name>
+                 <key>calcdist</key>
+         </option>
+         <option>
+                 <name>BPSK</name>
+                 <key>bpsk</key>
+         </option>
+         <option>
+                 <name>QPSK</name>
+                 <key>qpsk</key>
+         </option>
+         <option>
+                 <name>DQPSK</name>
+                 <key>dqpsk</key>
+         </option>
+         <option>
+                 <name>8PSK</name>
+                 <key>8psk</key>
+         </option>
+         <option>
+                 <name>16QAM</name>
+                 <key>16qam</key>
+         </option>
+
+  </param>
+  <param>
     <name>Symbol Map</name>
     <key>sym_map</key>
     <value>[0, 1, 3, 2]</value>
     <type>int_vector</type>
+    <hide> #if str($type) == "calcdist" then  'none' else 'all' #</hide>
   </param>
 
   <param>
@@ -34,6 +77,7 @@ self.$(id).set_soft_dec_lut($soft_dec_lut, $precision)
     <key>const_points</key>
     <value>[-1-1j, -1+1j, 1+1j, 1-1j]</value>
     <type>complex_vector</type>
+    <hide> #if str($type) == "calcdist" then  'none' else 'all' #</hide>
   </param>
 
   <param>
@@ -41,6 +85,7 @@ self.$(id).set_soft_dec_lut($soft_dec_lut, $precision)
     <key>rot_sym</key>
     <value>4</value>
     <type>int</type>
+    <hide> #if str($type) == "calcdist" then  'none' else 'all' #</hide>
   </param>
 
   <param>
@@ -48,8 +93,8 @@ self.$(id).set_soft_dec_lut($soft_dec_lut, $precision)
     <key>dims</key>
     <value>1</value>
     <type>int</type>
+    <hide> #if str($type) == "calcdist" then  'none' else 'all' #</hide>
   </param>
-
   <param>
     <name>Soft Decisions Precision</name>
     <key>precision</key>