From d38cfb4188d929b27132853e53f67d1b288067be Mon Sep 17 00:00:00 2001
From: jblum <jblum@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Fri, 17 Apr 2009 02:58:41 +0000
Subject: [PATCH] switched to new gr.channel_model

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10862 221aa14e-8319-0410-a670-987f0aec2ac5
---
 grc/data/platforms/python/block_tree.xml                 | 2 +-
 grc/data/platforms/python/blocks/Makefile.am             | 2 +-
 .../{blks2_channel_model.xml => gr_channel_model.xml}    | 9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename grc/data/platforms/python/blocks/{blks2_channel_model.xml => gr_channel_model.xml} (86%)

diff --git a/grc/data/platforms/python/block_tree.xml b/grc/data/platforms/python/block_tree.xml
index 4e6ff01c..80fcbe78 100644
--- 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 a97266fb..131b1d63 100644
--- 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/gr_channel_model.xml
similarity index 86%
rename from grc/data/platforms/python/blocks/blks2_channel_model.xml
rename to grc/data/platforms/python/blocks/gr_channel_model.xml
index 88805636..e23062df 100644
--- a/grc/data/platforms/python/blocks/blks2_channel_model.xml
+++ b/grc/data/platforms/python/blocks/gr_channel_model.xml
@@ -6,10 +6,10 @@
  -->
 <block>
 	<name>Channel Model</name>
-	<key>blks2_channel_model</key>
-	<import>from gnuradio import blks2</import>
+	<key>gr_channel_model</key>
+	<import>from gnuradio import gr</import>
 	<import>from gnuradio.gr import firdes</import>
-	<make>blks2.channel_model(
+	<make>gr.channel_model(
 	noise_voltage=$noise_voltage,
 	frequency_offset=$freq_offset,
 	epsilon=$epsilon,
@@ -19,6 +19,7 @@
 	<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>
@@ -40,7 +41,7 @@
 	<param>
 		<name>Taps</name>
 		<key>taps</key>
-		<value>1.0, 0.0</value>
+		<value>1.0 + 1.0j</value>
 		<type>complex_vector</type>
 	</param>
 	<param>
-- 
2.47.2