[Commit-gnuradio] r10862 - in gnuradio/trunk/grc/data/platforms/python: . blocks

[jblum]

Author: jblum
Date: 2009-04-16 20:58:41 -0600 (Thu, 16 Apr 2009)
New Revision: 10862

Added:
   gnuradio/trunk/grc/data/platforms/python/blocks/gr_channel_model.xml
Removed:
   gnuradio/trunk/grc/data/platforms/python/blocks/blks2_channel_model.xml
Modified:
   gnuradio/trunk/grc/data/platforms/python/block_tree.xml
   gnuradio/trunk/grc/data/platforms/python/blocks/Makefile.am
Log:
switched to new gr.channel_model

Modified: gnuradio/trunk/grc/data/platforms/python/block_tree.xml
===================================================================
--- gnuradio/trunk/grc/data/platforms/python/block_tree.xml     2009-04-16 
07:54:34 UTC (rev 10861)
+++ gnuradio/trunk/grc/data/platforms/python/block_tree.xml     2009-04-17 
02:58:41 UTC (rev 10862)
@@ -166,7 +166,7 @@
                <block>gr_freq_xlating_fir_filter_xxx</block>
                <block>gr_iir_filter_ffd</block>
                <block>gr_filter_delay_fc</block>
-               <block>blks2_channel_model</block>
+               <block>gr_channel_model</block>
                <!-- Other filters -->
                <block>gr_single_pole_iir_filter_xx</block>
                <block>gr_hilbert_fc</block>

Modified: gnuradio/trunk/grc/data/platforms/python/blocks/Makefile.am
===================================================================
--- gnuradio/trunk/grc/data/platforms/python/blocks/Makefile.am 2009-04-16 
07:54:34 UTC (rev 10861)
+++ gnuradio/trunk/grc/data/platforms/python/blocks/Makefile.am 2009-04-17 
02:58:41 UTC (rev 10862)
@@ -30,7 +30,6 @@
        band_reject_filter.xml \
        blks2_am_demod_cf.xml \
        blks2_analysis_filterbank.xml \
-       blks2_channel_model.xml \
        blks2_dxpsk_demod.xml \
        blks2_dxpsk_mod.xml \
        blks2_error_rate.xml \
@@ -65,6 +64,7 @@
        gr_and_xx.xml \
        gr_argmax_xx.xml \
        gr_binary_slicer_fb.xml \
+       gr_channel_model.xml \
        gr_char_to_float.xml \
        gr_chunks_to_symbols.xml \
        gr_clock_recovery_mm_xx.xml \

Copied: gnuradio/trunk/grc/data/platforms/python/blocks/gr_channel_model.xml 
(from rev 10861, 
gnuradio/trunk/grc/data/platforms/python/blocks/blks2_channel_model.xml)
===================================================================
--- gnuradio/trunk/grc/data/platforms/python/blocks/gr_channel_model.xml        
                        (rev 0)
+++ gnuradio/trunk/grc/data/platforms/python/blocks/gr_channel_model.xml        
2009-04-17 02:58:41 UTC (rev 10862)
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Channel Model
+###################################################
+ -->
+<block>
+       <name>Channel Model</name>
+       <key>gr_channel_model</key>
+       <import>from gnuradio import gr</import>
+       <import>from gnuradio.gr import firdes</import>
+       <make>gr.channel_model(
+       noise_voltage=$noise_voltage,
+       frequency_offset=$freq_offset,
+       epsilon=$epsilon,
+       taps=$taps,
+       noise_seed=$seed,
+)</make>
+       <callback>set_noise_voltage($noise_voltage)</callback>
+       <callback>set_frequency_offset($freq_offset)</callback>
+       <callback>set_taps($taps)</callback>
+       <callback>set_timing_offset($epsilon)</callback>
+       <param>
+               <name>Noise Voltage</name>
+               <key>noise_voltage</key>
+               <value>0.0</value>
+               <type>real</type>
+       </param>
+       <param>
+               <name>Frequency Offset</name>
+               <key>freq_offset</key>
+               <value>0.0</value>
+               <type>real</type>
+       </param>
+       <param>
+               <name>Epsilon</name>
+               <key>epsilon</key>
+               <value>1.0</value>
+               <type>real</type>
+       </param>
+       <param>
+               <name>Taps</name>
+               <key>taps</key>
+               <value>1.0 + 1.0j</value>
+               <type>complex_vector</type>
+       </param>
+       <param>
+               <name>Seed</name>
+               <key>seed</key>
+               <value>42</value>
+               <type>int</type>
+       </param>
+       <sink>
+               <name>in</name>
+               <type>complex</type>
+       </sink>
+       <source>
+               <name>out</name>
+               <type>complex</type>
+       </source>
+</block>


Property changes on: 
gnuradio/trunk/grc/data/platforms/python/blocks/gr_channel_model.xml
___________________________________________________________________
Added: svn:mergeinfo
   + 
/gnuradio/branches/developers/eb/t348/grc/data/platforms/python/blocks/blks2_channel_model.xml:10638-10648
/gnuradio/branches/developers/eb/t378/grc/data/platforms/python/blocks/blks2_channel_model.xml:10683-10688
/gnuradio/branches/developers/jblum/gui_guts/grc/data/platforms/python/blocks/blks2_channel_model.xml:10464-10658
/gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/blks2_channel_model.xml:10667-10677
/gnuradio/branches/developers/jcorgan/cpphier/grc/data/platforms/python/blocks/blks2_channel_model.xml:10818-10858
/gnuradio/branches/developers/jcorgan/fw-optimize/grc/data/platforms/python/blocks/blks2_channel_model.xml:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/grc/data/platforms/python/blocks/blks2_channel_model.xml:10713-10765
/gnuradio/branches/developers/michaelld/am_swig_4/grc/data/platforms/python/blocks/blks2_channel_model.xml:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/grc/data/platforms/python/blocks/blks2_channel_model.xml:10540-10546