added cpfsk, make samps/sym integer, included xml tail in doc extraction

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9395 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/grc/data/grc_gnuradio/block_tree.xml b/grc/data/grc_gnuradio/block_tree.xml
index 4e5070d3689b193dca3684ed5136835c54500dd6..7ac9e519919d92bf273de4b1b81f26e24c1a649e 100644 (file)
--- a/grc/data/grc_gnuradio/block_tree.xml
+++ b/grc/data/grc_gnuradio/block_tree.xml
@@ -180,6 +180,7 @@
                <block>gr_frequency_modulator_fc</block>
                <block>gr_phase_modulator_fc</block>
                <block>gr_quadrature_demod_cf</block>
+               <block>gr_cpfsk_bc</block>
 
                <block>gr_diff_phasor_cc</block>
                <block>gr_constellation_decoder_cb</block>

diff --git a/grc/data/grc_gnuradio/blocks/Makefile.am b/grc/data/grc_gnuradio/blocks/Makefile.am
index 4e6aae828be2f4028e2d18db851db306cb8a96e8..9906a313f4fa1368619516fd06e8fcfb901bc040 100644 (file)
--- a/grc/data/grc_gnuradio/blocks/Makefile.am
+++ b/grc/data/grc_gnuradio/blocks/Makefile.am
@@ -77,6 +77,7 @@ EXTRA_DIST = \
        gr_constellation_decoder_cb.xml \
        gr_correlate_access_code_bb.xml \
        gr_costas_loop_cc.xml \
+       gr_cpfsk_bc.xml \
        gr_dd_mpsk_sync_cc.xml \
        gr_decode_ccsds_27_fb.xml \
        gr_deinterleave.xml \

diff --git a/grc/data/grc_gnuradio/blocks/blks2_dxpsk_demod.xml b/grc/data/grc_gnuradio/blocks/blks2_dxpsk_demod.xml
index 6a8cb9c3b460915ded6267f534b35207ca0dcd31..20c7bd7f77ba5c98e81d02404a4d80b83a458044 100644 (file)
--- a/grc/data/grc_gnuradio/blocks/blks2_dxpsk_demod.xml
+++ b/grc/data/grc_gnuradio/blocks/blks2_dxpsk_demod.xml
@@ -38,7 +38,7 @@
                <name>Samples/Symbol</name>
                <key>samples_per_symbol</key>
                <value>2</value>
-               <type>real</type>
+               <type>int</type>
        </param>
        <param>
                <name>Excess BW</name>

diff --git a/grc/data/grc_gnuradio/blocks/blks2_dxpsk_mod.xml b/grc/data/grc_gnuradio/blocks/blks2_dxpsk_mod.xml
index ebbee404dc5c49d235b8e947eae732a4536bf20c..e165fe9b7935635e0484f09c8d15069234dafdcc 100644 (file)
--- a/grc/data/grc_gnuradio/blocks/blks2_dxpsk_mod.xml
+++ b/grc/data/grc_gnuradio/blocks/blks2_dxpsk_mod.xml
@@ -34,7 +34,7 @@
                <name>Samples/Symbol</name>
                <key>samples_per_symbol</key>
                <value>2</value>
-               <type>real</type>
+               <type>int</type>
        </param>
        <param>
                <name>Excess BW</name>

diff --git a/grc/data/grc_gnuradio/blocks/blks2_gmsk_demod.xml b/grc/data/grc_gnuradio/blocks/blks2_gmsk_demod.xml
index 318c4b4b2c18f417733236d6a5bc653491b9a45c..c810398151aacdceea9c749ed5bcd6976842172d 100644 (file)
--- a/grc/data/grc_gnuradio/blocks/blks2_gmsk_demod.xml
+++ b/grc/data/grc_gnuradio/blocks/blks2_gmsk_demod.xml
@@ -19,7 +19,7 @@
                <name>Samples/Symbol</name>
                <key>samples_per_symbol</key>
                <value>2</value>
-               <type>real</type>
+               <type>int</type>
        </param>
        <param>
                <name>Gain Mu</name>

diff --git a/grc/data/grc_gnuradio/blocks/blks2_gmsk_mod.xml b/grc/data/grc_gnuradio/blocks/blks2_gmsk_mod.xml
index 1633dc8ef0032f52e1ab67655a2f5e882146b0af..ab57357eb10c630f449ac9e84b7663bb47bc997a 100644 (file)
--- a/grc/data/grc_gnuradio/blocks/blks2_gmsk_mod.xml
+++ b/grc/data/grc_gnuradio/blocks/blks2_gmsk_mod.xml
@@ -16,7 +16,7 @@
                <name>Samples/Symbol</name>
                <key>samples_per_symbol</key>
                <value>2</value>
-               <type>real</type>
+               <type>int</type>
        </param>
        <param>
                <name>BT</name>

diff --git a/grc/data/grc_gnuradio/blocks/blks2_qamx_demod.xml b/grc/data/grc_gnuradio/blocks/blks2_qamx_demod.xml
index 0d311bbe1a8056033da8ec70eb823928d9e5fba4..93dbe4bb0a257d622ae1e28e053aa1faba0664e9 100644 (file)
--- a/grc/data/grc_gnuradio/blocks/blks2_qamx_demod.xml
+++ b/grc/data/grc_gnuradio/blocks/blks2_qamx_demod.xml
@@ -42,7 +42,7 @@
                <name>Samples/Symbol</name>
                <key>samples_per_symbol</key>
                <value>2</value>
-               <type>real</type>
+               <type>int</type>
        </param>
        <param>
                <name>Excess BW</name>

diff --git a/grc/data/grc_gnuradio/blocks/blks2_qamx_mod.xml b/grc/data/grc_gnuradio/blocks/blks2_qamx_mod.xml
index 5ab0e2180c7ad0a801c183fb82f774101d3ac012..25a9fb24058111879d8cf231886d76f879c4502a 100644 (file)
--- a/grc/data/grc_gnuradio/blocks/blks2_qamx_mod.xml
+++ b/grc/data/grc_gnuradio/blocks/blks2_qamx_mod.xml
@@ -38,7 +38,7 @@
                <name>Samples/Symbol</name>
                <key>samples_per_symbol</key>
                <value>2</value>
-               <type>real</type>
+               <type>int</type>
        </param>
        <param>
                <name>Excess BW</name>

diff --git a/grc/data/grc_gnuradio/blocks/gr_cpfsk_bc.xml b/grc/data/grc_gnuradio/blocks/gr_cpfsk_bc.xml
new file mode 100644 (file)
index 0000000..12450b0
--- /dev/null
+++ b/grc/data/grc_gnuradio/blocks/gr_cpfsk_bc.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##CPFSK
+###################################################
+ -->
+<block>
+       <name>CPFSK</name>
+       <key>gr_cpfsk_bc</key>
+       <import>from gnuradio import gr</import>
+       <make>cpfsk_bc($k, $amplitude, $samples_per_symbol)</make>
+       <callback>set_amplitude($amplitude)</callback>
+       <param>
+               <name>K</name>
+               <key>k</key>
+               <type>real</type>
+       </param>
+       <param>
+               <name>Amplitude</name>
+               <key>amplitude</key>
+               <type>real</type>
+       </param>
+       <param>
+               <name>Samples/Symbol</name>
+               <key>samples_per_symbol</key>
+               <value>2</value>
+               <type>int</type>
+       </param>
+       <sink>
+               <name>in</name>
+               <type>byte</type>
+       </sink>
+       <source>
+               <name>out</name>
+               <type>complex</type>
+       </source>
+</block>

diff --git a/grc/data/grc_gnuradio/blocks/options.xml b/grc/data/grc_gnuradio/blocks/options.xml
index 541028d5c8294cbc4d5f6d4f0d80852192cb7313..8e8f0689177ad83c63d45c84e4957a169f26952c 100644 (file)
--- a/grc/data/grc_gnuradio/blocks/options.xml
+++ b/grc/data/grc_gnuradio/blocks/options.xml
@@ -48,14 +48,17 @@ import wx
                <option>
                        <name>WX GUI</name>
                        <key>wx_gui</key>
+                       <opt>hide_category:all</opt>
                </option>
                <option>
                        <name>No GUI</name>
                        <key>no_gui</key>
+                       <opt>hide_category:all</opt>
                </option>
                <option>
                        <name>Hier Block</name>
                        <key>hb</key>
+                       <opt>hide_category:</opt>
                </option>
        </param>
        <param>
@@ -63,6 +66,7 @@ import wx
                <key>category</key>
                <value>Custom</value>
                <type>string</type>
+               <hide>$generate_options.hide_category</hide>
        </param>
        <check>len($window_size) == 2</check>
        <check>300 &lt;= $(window_size)[0] &lt;= 2048</check>

diff --git a/grc/src/grc_gnuradio/utils/extract_docs.py b/grc/src/grc_gnuradio/utils/extract_docs.py
index 13fe77a56caef66e2625350b4345a5f3ef720f42..c9c872ef5a2ed7adc1dc5baca1bc70f55611e2a6 100644 (file)
--- a/grc/src/grc_gnuradio/utils/extract_docs.py
+++ b/grc/src/grc_gnuradio/utils/extract_docs.py
@@ -29,15 +29,18 @@ DOXYGEN_DETAILDESC_GR_XPATH = '/doxygen/compounddef/detaileddescription'
 DOXYGEN_BRIEFDESC_BLKS2_XPATH = '/doxygen/compounddef/sectiondef[@kind="public-func"]/memberdef/briefdescription'
 DOXYGEN_DETAILDESC_BLKS2_XPATH = '/doxygen/compounddef/sectiondef[@kind="public-func"]/memberdef/detaileddescription'
 
-def extract_txt(xml):
+def extract_txt(xml, parent_text=None):
        """!
        Recursivly pull the text out of an xml tree.
        @param xml the xml tree
+       @param parent_text the text of the parent element
        @return a string
        """
        text = xml.text or ''
-       if not len(xml): return text
-       return ''.join([text] + map(extract_txt, xml))
+       tail = parent_text and xml.tail or ''
+       return text + ''.join(
+               map(lambda x: extract_txt(x, text), xml)
+       ) + tail
 
 def is_match(key, file):
        """!