[Commit-gnuradio] r8282 - in grc/trunk: . src/grc_gnuradio/blocks src/grc_gnuradio/blocks/error_correction src/grc_gnuradio/blocks/modulators src/grc_gnuradio/data

[jblum]

Author: jblum
Date: 2008-04-26 10:59:47 -0600 (Sat, 26 Apr 2008)
New Revision: 8282

Added:
   grc/trunk/src/grc_gnuradio/blocks/error_correction/
   grc/trunk/src/grc_gnuradio/blocks/error_correction/gr_decode_ccsds_27_fb.xml
   grc/trunk/src/grc_gnuradio/blocks/error_correction/gr_encode_ccsds_27_bb.xml
Removed:
   grc/trunk/src/grc_gnuradio/blocks/modulators/gr_decode_ccsds_27_fb.xml
   grc/trunk/src/grc_gnuradio/blocks/modulators/gr_encode_ccsds_27_bb.xml
Modified:
   grc/trunk/Makefile
   grc/trunk/setup.py
   grc/trunk/src/grc_gnuradio/data/block_tree.xml
Log:
error correction

Modified: grc/trunk/Makefile
===================================================================
--- grc/trunk/Makefile  2008-04-26 16:23:04 UTC (rev 8281)
+++ grc/trunk/Makefile  2008-04-26 16:59:47 UTC (rev 8282)
@@ -34,6 +34,9 @@
 
 install: build
        python setup.py install
+       
+uninstall:
+       rm -rf `python -c "import grc,os;print os.path.dirname(grc.__file__)"`*
 
 clean:
        if [ -d build ]; then rm -rf build; fi

Modified: grc/trunk/setup.py
===================================================================
--- grc/trunk/setup.py  2008-04-26 16:23:04 UTC (rev 8281)
+++ grc/trunk/setup.py  2008-04-26 16:59:47 UTC (rev 8282)
@@ -45,6 +45,7 @@
        'data/*.*',     
        'blocks/*.*',
        'blocks/conversions/*.xml',
+       'blocks/error_correction/*.xml',
        'blocks/filters/*.xml',
        'blocks/graphical_sinks/*.xml',
        'blocks/level_controls/*.xml',

Copied: 
grc/trunk/src/grc_gnuradio/blocks/error_correction/gr_decode_ccsds_27_fb.xml 
(from rev 8281, 
grc/trunk/src/grc_gnuradio/blocks/modulators/gr_decode_ccsds_27_fb.xml)
===================================================================
--- 
grc/trunk/src/grc_gnuradio/blocks/error_correction/gr_decode_ccsds_27_fb.xml    
                            (rev 0)
+++ 
grc/trunk/src/grc_gnuradio/blocks/error_correction/gr_decode_ccsds_27_fb.xml    
    2008-04-26 16:59:47 UTC (rev 8282)
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!-- 
+###################################################
+##Decode CCSDS 27
+###################################################
+ -->
+<block>
+       <name>Decode CCSDS 27</name>
+       <key>gr_decode_ccsds_27_fb</key>
+       <import>from gnuradio import gr</import>
+       <make>gr.decode_ccsds_27_fb()</make>
+       <sink>
+               <name>in</name>
+               <type>float</type>
+       </sink> 
+       <source>
+               <name>out</name>
+               <type>byte</type>
+       </source>
+</block>

Copied: 
grc/trunk/src/grc_gnuradio/blocks/error_correction/gr_encode_ccsds_27_bb.xml 
(from rev 8281, 
grc/trunk/src/grc_gnuradio/blocks/modulators/gr_encode_ccsds_27_bb.xml)
===================================================================
--- 
grc/trunk/src/grc_gnuradio/blocks/error_correction/gr_encode_ccsds_27_bb.xml    
                            (rev 0)
+++ 
grc/trunk/src/grc_gnuradio/blocks/error_correction/gr_encode_ccsds_27_bb.xml    
    2008-04-26 16:59:47 UTC (rev 8282)
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!-- 
+###################################################
+##Encode CCSDS 27
+###################################################
+ -->
+<block>
+       <name>Encode CCSDS 27</name>
+       <key>gr_encode_ccsds_27_bb</key>
+       <import>from gnuradio import gr</import>
+       <make>gr.encode_ccsds_27_bb()</make>
+       <sink>
+               <name>in</name>
+               <type>byte</type>
+       </sink> 
+       <source>
+               <name>out</name>
+               <type>byte</type>
+       </source>
+</block>

Deleted: grc/trunk/src/grc_gnuradio/blocks/modulators/gr_decode_ccsds_27_fb.xml

Deleted: grc/trunk/src/grc_gnuradio/blocks/modulators/gr_encode_ccsds_27_bb.xml

Modified: grc/trunk/src/grc_gnuradio/data/block_tree.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/data/block_tree.xml      2008-04-26 16:23:04 UTC 
(rev 8281)
+++ grc/trunk/src/grc_gnuradio/data/block_tree.xml      2008-04-26 16:59:47 UTC 
(rev 8282)
@@ -196,7 +196,9 @@
                
                <block>blks2_synthesis_filterbank</block>
                <block>blks2_analysis_filterbank</block>
-               
+       </cat>
+       <cat>
+               <name>Error Correction</name>           
                <block>gr_encode_ccsds_27_bb</block>
                <block>gr_decode_ccsds_27_fb</block>
        </cat>