diff options
| -rw-r--r-- | gr-blocks/examples/ctrlport/comparing_resamplers.grc | 180 | ||||
| -rwxr-xr-x | gr-digital/python/qa_constellation_receiver.py | 2 |
2 files changed, 91 insertions, 91 deletions
diff --git a/gr-blocks/examples/ctrlport/comparing_resamplers.grc b/gr-blocks/examples/ctrlport/comparing_resamplers.grc index 7b90a2066c..eea9ab6ccd 100644 --- a/gr-blocks/examples/ctrlport/comparing_resamplers.grc +++ b/gr-blocks/examples/ctrlport/comparing_resamplers.grc @@ -1,6 +1,65 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Fri Mar 15 11:01:13 2013</timestamp> + <timestamp>Thu May 23 22:25:13 2013</timestamp> + <block> + <key>options</key> + <param> + <key>id</key> + <value>comparing_resamplers</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>title</key> + <value></value> + </param> + <param> + <key>author</key> + <value></value> + </param> + <param> + <key>description</key> + <value></value> + </param> + <param> + <key>window_size</key> + <value>570,390</value> + </param> + <param> + <key>generate_options</key> + <value>no_gui</value> + </param> + <param> + <key>category</key> + <value>Custom</value> + </param> + <param> + <key>run_options</key> + <value>prompt</value> + </param> + <param> + <key>run</key> + <value>True</value> + </param> + <param> + <key>max_nouts</key> + <value>0</value> + </param> + <param> + <key>realtime_scheduling</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(10, 10)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> <block> <key>blocks_throttle</key> <param> @@ -126,68 +185,6 @@ </param> </block> <block> - <key>blocks_ctrlport_probe2_c</key> - <param> - <key>id</key> - <value>probe_frac_interp</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>name</key> - <value>fractional_interp</value> - </param> - <param> - <key>desc</key> - <value>Fractional Interpolator</value> - </param> - <param> - <key>len</key> - <value>1024</value> - </param> - <param> - <key>_coordinate</key> - <value>(10, 204)</value> - </param> - <param> - <key>_rotation</key> - <value>180</value> - </param> - </block> - <block> - <key>fractional_interpolator_xx</key> - <param> - <key>id</key> - <value>fractional_interpolator_xx_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>type</key> - <value>complex</value> - </param> - <param> - <key>phase_shift</key> - <value>0</value> - </param> - <param> - <key>interp_ratio</key> - <value>1.0/resamp_rate</value> - </param> - <param> - <key>_coordinate</key> - <value>(354, 212)</value> - </param> - <param> - <key>_rotation</key> - <value>180</value> - </param> - </block> - <block> <key>variable</key> <param> <key>id</key> @@ -293,62 +290,65 @@ </param> </block> <block> - <key>options</key> + <key>fractional_resampler_xx</key> <param> <key>id</key> - <value>comparing_resamplers</value> + <value>fractional_resampler_xx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>title</key> - <value></value> + <key>type</key> + <value>complex</value> </param> <param> - <key>author</key> - <value></value> + <key>phase_shift</key> + <value>0</value> </param> <param> - <key>description</key> - <value></value> + <key>resamp_ratio</key> + <value>resamp_rate</value> </param> <param> - <key>window_size</key> - <value>570,390</value> + <key>_coordinate</key> + <value>(354, 212)</value> </param> <param> - <key>generate_options</key> - <value>no_gui</value> + <key>_rotation</key> + <value>180</value> </param> + </block> + <block> + <key>blocks_ctrlport_probe2_c</key> <param> - <key>category</key> - <value>Custom</value> + <key>id</key> + <value>probe_frac_resamp</value> </param> <param> - <key>run_options</key> - <value>prompt</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>run</key> - <value>True</value> + <key>name</key> + <value>fractional_resamp</value> </param> <param> - <key>max_nouts</key> - <value>0</value> + <key>desc</key> + <value>Fractional Resampler</value> </param> <param> - <key>realtime_scheduling</key> - <value></value> + <key>len</key> + <value>1024</value> </param> <param> <key>_coordinate</key> - <value>(10, 10)</value> + <value>(10, 204)</value> </param> <param> <key>_rotation</key> - <value>0</value> + <value>180</value> </param> </block> <connection> @@ -371,7 +371,7 @@ </connection> <connection> <source_block_id>channels_channel_model_0</source_block_id> - <sink_block_id>fractional_interpolator_xx_0</sink_block_id> + <sink_block_id>fractional_resampler_xx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> @@ -382,8 +382,8 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>fractional_interpolator_xx_0</source_block_id> - <sink_block_id>probe_frac_interp</sink_block_id> + <source_block_id>fractional_resampler_xx_0</source_block_id> + <sink_block_id>probe_frac_resamp</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> diff --git a/gr-digital/python/qa_constellation_receiver.py b/gr-digital/python/qa_constellation_receiver.py index 73a78d0f8e..b37953b990 100755 --- a/gr-digital/python/qa_constellation_receiver.py +++ b/gr-digital/python/qa_constellation_receiver.py @@ -62,7 +62,7 @@ class channel_model(gr.hier_block2): gr.io_signature(1, 1, gr.sizeof_gr_complex)) - timing_offset = filter.fractional_interpolator_cc(0, timing) + timing_offset = filter.fractional_resampler_cc(0, timing) noise_adder = blocks.add_cc() noise = analog.noise_source_c(analog.GR_GAUSSIAN, noise_voltage, 0) |