[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r9395 - in gnuradio/trunk/grc: data/grc_gnuradio data/
|
From: |
jblum |
|
Subject: |
[Commit-gnuradio] r9395 - in gnuradio/trunk/grc: data/grc_gnuradio data/grc_gnuradio/blocks src/grc_gnuradio/utils |
|
Date: |
Sat, 23 Aug 2008 23:26:05 -0600 (MDT) |
Author: jblum
Date: 2008-08-23 23:26:04 -0600 (Sat, 23 Aug 2008)
New Revision: 9395
Added:
gnuradio/trunk/grc/data/grc_gnuradio/blocks/gr_cpfsk_bc.xml
Modified:
gnuradio/trunk/grc/data/grc_gnuradio/block_tree.xml
gnuradio/trunk/grc/data/grc_gnuradio/blocks/Makefile.am
gnuradio/trunk/grc/data/grc_gnuradio/blocks/blks2_dxpsk_demod.xml
gnuradio/trunk/grc/data/grc_gnuradio/blocks/blks2_dxpsk_mod.xml
gnuradio/trunk/grc/data/grc_gnuradio/blocks/blks2_gmsk_demod.xml
gnuradio/trunk/grc/data/grc_gnuradio/blocks/blks2_gmsk_mod.xml
gnuradio/trunk/grc/data/grc_gnuradio/blocks/blks2_qamx_demod.xml
gnuradio/trunk/grc/data/grc_gnuradio/blocks/blks2_qamx_mod.xml
gnuradio/trunk/grc/data/grc_gnuradio/blocks/options.xml
gnuradio/trunk/grc/src/grc_gnuradio/utils/extract_docs.py
Log:
added cpfsk, make samps/sym integer, included xml tail in doc extraction
Modified: gnuradio/trunk/grc/data/grc_gnuradio/block_tree.xml
===================================================================
--- gnuradio/trunk/grc/data/grc_gnuradio/block_tree.xml 2008-08-24 03:02:12 UTC
(rev 9394)
+++ gnuradio/trunk/grc/data/grc_gnuradio/block_tree.xml 2008-08-24 05:26:04 UTC
(rev 9395)
@@ -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>
Modified: gnuradio/trunk/grc/data/grc_gnuradio/blocks/Makefile.am
===================================================================
--- gnuradio/trunk/grc/data/grc_gnuradio/blocks/Makefile.am 2008-08-24
03:02:12 UTC (rev 9394)
+++ gnuradio/trunk/grc/data/grc_gnuradio/blocks/Makefile.am 2008-08-24
05:26:04 UTC (rev 9395)
@@ -77,6 +77,7 @@
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 \
Modified: gnuradio/trunk/grc/data/grc_gnuradio/blocks/blks2_dxpsk_demod.xml
===================================================================
--- gnuradio/trunk/grc/data/grc_gnuradio/blocks/blks2_dxpsk_demod.xml
2008-08-24 03:02:12 UTC (rev 9394)
+++ gnuradio/trunk/grc/data/grc_gnuradio/blocks/blks2_dxpsk_demod.xml
2008-08-24 05:26:04 UTC (rev 9395)
@@ -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>
Modified: gnuradio/trunk/grc/data/grc_gnuradio/blocks/blks2_dxpsk_mod.xml
===================================================================
--- gnuradio/trunk/grc/data/grc_gnuradio/blocks/blks2_dxpsk_mod.xml
2008-08-24 03:02:12 UTC (rev 9394)
+++ gnuradio/trunk/grc/data/grc_gnuradio/blocks/blks2_dxpsk_mod.xml
2008-08-24 05:26:04 UTC (rev 9395)
@@ -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>
Modified: gnuradio/trunk/grc/data/grc_gnuradio/blocks/blks2_gmsk_demod.xml
===================================================================
--- gnuradio/trunk/grc/data/grc_gnuradio/blocks/blks2_gmsk_demod.xml
2008-08-24 03:02:12 UTC (rev 9394)
+++ gnuradio/trunk/grc/data/grc_gnuradio/blocks/blks2_gmsk_demod.xml
2008-08-24 05:26:04 UTC (rev 9395)
@@ -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>
Modified: gnuradio/trunk/grc/data/grc_gnuradio/blocks/blks2_gmsk_mod.xml
===================================================================
--- gnuradio/trunk/grc/data/grc_gnuradio/blocks/blks2_gmsk_mod.xml
2008-08-24 03:02:12 UTC (rev 9394)
+++ gnuradio/trunk/grc/data/grc_gnuradio/blocks/blks2_gmsk_mod.xml
2008-08-24 05:26:04 UTC (rev 9395)
@@ -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>
Modified: gnuradio/trunk/grc/data/grc_gnuradio/blocks/blks2_qamx_demod.xml
===================================================================
--- gnuradio/trunk/grc/data/grc_gnuradio/blocks/blks2_qamx_demod.xml
2008-08-24 03:02:12 UTC (rev 9394)
+++ gnuradio/trunk/grc/data/grc_gnuradio/blocks/blks2_qamx_demod.xml
2008-08-24 05:26:04 UTC (rev 9395)
@@ -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>
Modified: gnuradio/trunk/grc/data/grc_gnuradio/blocks/blks2_qamx_mod.xml
===================================================================
--- gnuradio/trunk/grc/data/grc_gnuradio/blocks/blks2_qamx_mod.xml
2008-08-24 03:02:12 UTC (rev 9394)
+++ gnuradio/trunk/grc/data/grc_gnuradio/blocks/blks2_qamx_mod.xml
2008-08-24 05:26:04 UTC (rev 9395)
@@ -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>
Added: gnuradio/trunk/grc/data/grc_gnuradio/blocks/gr_cpfsk_bc.xml
===================================================================
--- gnuradio/trunk/grc/data/grc_gnuradio/blocks/gr_cpfsk_bc.xml
(rev 0)
+++ gnuradio/trunk/grc/data/grc_gnuradio/blocks/gr_cpfsk_bc.xml 2008-08-24
05:26:04 UTC (rev 9395)
@@ -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>
Modified: gnuradio/trunk/grc/data/grc_gnuradio/blocks/options.xml
===================================================================
--- gnuradio/trunk/grc/data/grc_gnuradio/blocks/options.xml 2008-08-24
03:02:12 UTC (rev 9394)
+++ gnuradio/trunk/grc/data/grc_gnuradio/blocks/options.xml 2008-08-24
05:26:04 UTC (rev 9395)
@@ -48,14 +48,17 @@
<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 @@
<key>category</key>
<value>Custom</value>
<type>string</type>
+ <hide>$generate_options.hide_category</hide>
</param>
<check>len($window_size) == 2</check>
<check>300 <= $(window_size)[0] <= 2048</check>
Modified: gnuradio/trunk/grc/src/grc_gnuradio/utils/extract_docs.py
===================================================================
--- gnuradio/trunk/grc/src/grc_gnuradio/utils/extract_docs.py 2008-08-24
03:02:12 UTC (rev 9394)
+++ gnuradio/trunk/grc/src/grc_gnuradio/utils/extract_docs.py 2008-08-24
05:26:04 UTC (rev 9395)
@@ -29,15 +29,18 @@
DOXYGEN_BRIEFDESC_BLKS2_XPATH =
'/doxygen/compounddef/address@hidden"public-func"]/memberdef/briefdescription'
DOXYGEN_DETAILDESC_BLKS2_XPATH =
'/doxygen/compounddef/address@hidden"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):
"""!
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r9395 - in gnuradio/trunk/grc: data/grc_gnuradio data/grc_gnuradio/blocks src/grc_gnuradio/utils,
jblum <=