switched to new gr.channel_model

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

diff --git a/grc/data/platforms/python/block_tree.xml b/grc/data/platforms/python/block_tree.xml
index 4e6ff01c4c92beb7d619f9a9c1526e8b4c257c51..80fcbe78c3e251decf4324950a58a7e6562e8712 100644 (file)
--- a/grc/data/platforms/python/block_tree.xml
+++ b/grc/data/platforms/python/block_tree.xml
@@ -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>

diff --git a/grc/data/platforms/python/blocks/Makefile.am b/grc/data/platforms/python/blocks/Makefile.am
index a97266fba784ca8a0f5af1f105b0b2ccdf588791..131b1d630d76099a35ef546e3e538f945223f8ac 100644 (file)
--- a/grc/data/platforms/python/blocks/Makefile.am
+++ b/grc/data/platforms/python/blocks/Makefile.am
@@ -30,7 +30,6 @@ dist_ourdata_DATA = \
        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 @@ dist_ourdata_DATA = \
        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 \

diff --git a/grc/data/platforms/python/blocks/blks2_channel_model.xml b/grc/data/platforms/python/blocks/blks2_channel_model.xml
deleted file mode 100644 (file)
index 8880563..0000000
--- a/grc/data/platforms/python/blocks/blks2_channel_model.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Channel Model
-###################################################
- -->
-<block>
-       <name>Channel Model</name>
-       <key>blks2_channel_model</key>
-       <import>from gnuradio import blks2</import>
-       <import>from gnuradio.gr import firdes</import>
-       <make>blks2.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>
-       <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, 0.0</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>

diff --git a/grc/data/platforms/python/blocks/gr_channel_model.xml b/grc/data/platforms/python/blocks/gr_channel_model.xml
new file mode 100644 (file)
index 0000000..e23062d
--- /dev/null
+++ b/grc/data/platforms/python/blocks/gr_channel_model.xml
@@ -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>