added wrappers for the dxpsk2 blocks mod and demod

diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am
index e436cc7645e970708505ba4c8d8db2173a2f4580..9c91af54376c9ce6f85ba343682a089a4316178a 100644 (file)
--- a/grc/blocks/Makefile.am
+++ b/grc/blocks/Makefile.am
@@ -34,6 +34,8 @@ dist_ourdata_DATA = \
        blks2_cvsd_decode.xml \
        blks2_dxpsk_demod.xml \
        blks2_dxpsk_mod.xml \
+       blks2_dxpsk2_demod.xml \
+       blks2_dxpsk2_mod.xml \
        blks2_error_rate.xml \
        blks2_fm_deemph.xml \
        blks2_fm_demod_cf.xml \

diff --git a/grc/blocks/blks2_dxpsk_demod.xml b/grc/blocks/blks2_dxpsk_demod.xml
index 4c13b3415e73ec5f2beeb82bc3c7c7f3229c1dd6..1c96b6cec62ab7d0e554ff90b3ce9857ea395e5c 100644 (file)
--- a/grc/blocks/blks2_dxpsk_demod.xml
+++ b/grc/blocks/blks2_dxpsk_demod.xml
@@ -76,7 +76,7 @@
                <name>Gray Code</name>
                <key>gray_code</key>
                <value>True</value>
-               <type>enum</type>
+               <type>bool</type>
                <option>
                        <name>Yes</name>
                        <key>True</key>

diff --git a/grc/blocks/blks2_dxpsk_mod.xml b/grc/blocks/blks2_dxpsk_mod.xml
index 28fd742fa6b9400c238b5d1b58f99b24bce2de27..77505d8ad588f54b3e7def2f00dd43de9f3ae233 100644 (file)
--- a/grc/blocks/blks2_dxpsk_mod.xml
+++ b/grc/blocks/blks2_dxpsk_mod.xml
@@ -48,7 +48,7 @@
                <name>Gray Code</name>
                <key>gray_code</key>
                <value>True</value>
-               <type>enum</type>
+               <type>bool</type>
                <option>
                        <name>Yes</name>
                        <key>True</key>

diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index fc074cb69101e0577bf4e84b060a2ef008baf7dc..57703f6d69f4f01e78aa18f6d0169d885ea3863d 100644 (file)
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -225,6 +225,9 @@
                <block>blks2_dxpsk_mod</block>
                <block>blks2_dxpsk_demod</block>
 
+               <block>blks2_dxpsk2_mod</block>
+               <block>blks2_dxpsk2_demod</block>
+
                <block>blks2_gmsk_mod</block>
                <block>blks2_gmsk_demod</block>