diff options
| author | jblum | 2009-04-17 02:58:41 +0000 |
|---|---|---|
| committer | jblum | 2009-04-17 02:58:41 +0000 |
| commit | d38cfb4188d929b27132853e53f67d1b288067be (patch) | |
| tree | 8f9bf6aaab26bc46fd4ad1b079cf52fe069bb9e3 /grc/data/platforms/python | |
| parent | 6556095628428156c790b1bd9be67dc3e4c0a797 (diff) | |
| download | gnuradio-d38cfb4188d929b27132853e53f67d1b288067be.tar.gz gnuradio-d38cfb4188d929b27132853e53f67d1b288067be.tar.bz2 gnuradio-d38cfb4188d929b27132853e53f67d1b288067be.zip | |
switched to new gr.channel_model
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10862 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'grc/data/platforms/python')
| -rw-r--r-- | grc/data/platforms/python/block_tree.xml | 2 | ||||
| -rw-r--r-- | grc/data/platforms/python/blocks/Makefile.am | 2 | ||||
| -rw-r--r-- | grc/data/platforms/python/blocks/gr_channel_model.xml (renamed from grc/data/platforms/python/blocks/blks2_channel_model.xml) | 9 |
3 files changed, 7 insertions, 6 deletions
diff --git a/grc/data/platforms/python/block_tree.xml b/grc/data/platforms/python/block_tree.xml index 4e6ff01c4..80fcbe78c 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 a97266fba..131b1d630 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 index 88805636c..e23062dff 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> |