diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-01-15 15:00:24 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-01-15 15:00:24 -0500 |
| commit | 5be31c3d79015beeabdd98ebf1c0152ae6caac8c (patch) | |
| tree | e1d678b4b3dbb5b45c8ca43dfbd5d88451da66c4 /gr-digital/examples/demod/digital_freq_lock.grc | |
| parent | 0c0473d51e2c4a4275a88db562791561288e8c15 (diff) | |
| parent | e1e632469905f8c4b5f0d35c988744c77cf6a227 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-digital/examples/demod/ber_simulation.grc
gr-digital/examples/demod/digital_freq_lock.grc
gr-digital/examples/demod/pam_sync.grc
gr-digital/examples/demod/pam_timing.grc
Diffstat (limited to 'gr-digital/examples/demod/digital_freq_lock.grc')
| -rw-r--r-- | gr-digital/examples/demod/digital_freq_lock.grc | 551 |
1 files changed, 246 insertions, 305 deletions
diff --git a/gr-digital/examples/demod/digital_freq_lock.grc b/gr-digital/examples/demod/digital_freq_lock.grc index c08251b8bc..1844c8c779 100644 --- a/gr-digital/examples/demod/digital_freq_lock.grc +++ b/gr-digital/examples/demod/digital_freq_lock.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Mon Jul 16 21:25:18 2012</timestamp> + <timestamp>Mon Jan 14 10:49:20 2013</timestamp> <block> <key>options</key> <param> @@ -64,19 +64,35 @@ <key>random_source_x</key> <param> <key>id</key> - <value>sps</value> + <value>random_source_x</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>4</value> + <key>type</key> + <value>byte</value> + </param> + <param> + <key>min</key> + <value>0</value> + </param> + <param> + <key>max</key> + <value>256</value> + </param> + <param> + <key>num_samps</key> + <value>10000000</value> + </param> + <param> + <key>repeat</key> + <value>True</value> </param> <param> <key>_coordinate</key> - <value>(166, -2)</value> + <value>(-2, 111)</value> </param> <param> <key>_rotation</key> @@ -84,22 +100,30 @@ </param> </block> <block> - <key>variable</key> + <key>gr_throttle</key> <param> <key>id</key> - <value>rolloff</value> + <value>gr_throttle_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>0.35</value> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>samples_per_second</key> + <value>samp_rate</value> + </param> + <param> + <key>vlen</key> + <value>1</value> </param> <param> <key>_coordinate</key> - <value>(231, 0)</value> + <value>(456, 134)</value> </param> <param> <key>_rotation</key> @@ -110,7 +134,7 @@ <key>variable</key> <param> <key>id</key> - <value>samp_rate</value> + <value>sps</value> </param> <param> <key>_enabled</key> @@ -118,11 +142,11 @@ </param> <param> <key>value</key> - <value>32000</value> + <value>4</value> </param> <param> <key>_coordinate</key> - <value>(439, -1)</value> + <value>(166, -2)</value> </param> <param> <key>_rotation</key> @@ -130,54 +154,61 @@ </param> </block> <block> - <key>variable_slider</key> + <key>variable</key> <param> <key>id</key> - <value>noise_amp</value> + <value>rolloff</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Channel Noise</value> + <key>value</key> + <value>0.35</value> </param> <param> - <key>value</key> - <value>0</value> + <key>_coordinate</key> + <value>(231, 0)</value> </param> <param> - <key>min</key> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>digital_fll_band_edge_cc</key> <param> - <key>max</key> - <value>1.0</value> + <key>id</key> + <value>digital_fll_band_edge_cc_0</value> </param> <param> - <key>num_steps</key> - <value>1000</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>type</key> + <value>cc</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>samps_per_sym</key> + <value>sps</value> </param> <param> - <key>grid_pos</key> - <value></value> + <key>rolloff</key> + <value>rolloff</value> </param> <param> - <key>notebook</key> - <value></value> + <key>filter_size</key> + <value>44</value> + </param> + <param> + <key>w</key> + <value>freq_bw</value> </param> <param> <key>_coordinate</key> - <value>(553, 0)</value> + <value>(81, 248)</value> </param> <param> <key>_rotation</key> @@ -188,7 +219,7 @@ <key>variable_slider</key> <param> <key>id</key> - <value>freq_offset</value> + <value>freq_bw</value> </param> <param> <key>_enabled</key> @@ -196,7 +227,7 @@ </param> <param> <key>label</key> - <value>Frequency Offset</value> + <value>FLL Loop Bandwidth</value> </param> <param> <key>value</key> @@ -204,11 +235,11 @@ </param> <param> <key>min</key> - <value>-0.5</value> + <value>0</value> </param> <param> <key>max</key> - <value>0.5</value> + <value>0.1</value> </param> <param> <key>num_steps</key> @@ -232,7 +263,7 @@ </param> <param> <key>_coordinate</key> - <value>(673, -1)</value> + <value>(80, 382)</value> </param> <param> <key>_rotation</key> @@ -240,46 +271,22 @@ </param> </block> <block> - <key>digital_psk_mod</key> + <key>variable</key> <param> <key>id</key> - <value>digital_psk_mod_0</value> + <value>samp_rate</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>constellation_points</key> - <value>2</value> - </param> - <param> - <key>mod_code</key> - <value>"gray"</value> - </param> - <param> - <key>differential</key> - <value>False</value> - </param> - <param> - <key>samples_per_symbol</key> - <value>sps</value> - </param> - <param> - <key>excess_bw</key> - <value>0.35</value> - </param> - <param> - <key>verbose</key> - <value>False</value> - </param> - <param> - <key>log</key> - <value>False</value> + <key>value</key> + <value>32000</value> </param> <param> <key>_coordinate</key> - <value>(194, 104)</value> + <value>(439, -1)</value> </param> <param> <key>_rotation</key> @@ -287,74 +294,42 @@ </param> </block> <block> - <key>wxgui_fftsink2</key> + <key>variable_slider</key> <param> <key>id</key> - <value>wxgui_fftsink2_0_0</value> + <value>noise_amp</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> - </param> - <param> - <key>title</key> - <value>Frequency Corrected Signal</value> - </param> - <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>label</key> + <value>Channel Noise</value> </param> <param> - <key>baseband_freq</key> + <key>value</key> <value>0</value> </param> <param> - <key>y_per_div</key> - <value>10</value> - </param> - <param> - <key>y_divs</key> - <value>10</value> - </param> - <param> - <key>ref_level</key> - <value>10</value> - </param> - <param> - <key>ref_scale</key> - <value>2.0</value> - </param> - <param> - <key>fft_size</key> - <value>1024</value> - </param> - <param> - <key>fft_rate</key> - <value>30</value> - </param> - <param> - <key>peak_hold</key> - <value>False</value> + <key>min</key> + <value>0</value> </param> <param> - <key>average</key> - <value>False</value> + <key>max</key> + <value>1.0</value> </param> <param> - <key>avg_alpha</key> - <value>0</value> + <key>num_steps</key> + <value>1000</value> </param> <param> - <key>win</key> - <value>None</value> + <key>style</key> + <value>wx.SL_HORIZONTAL</value> </param> <param> - <key>win_size</key> - <value></value> + <key>converver</key> + <value>float_converter</value> </param> <param> <key>grid_pos</key> @@ -362,15 +337,11 @@ </param> <param> <key>notebook</key> - <value>notebook_0,0</value> - </param> - <param> - <key>freqvar</key> - <value>None</value> + <value></value> </param> <param> <key>_coordinate</key> - <value>(439, 423)</value> + <value>(553, 0)</value> </param> <param> <key>_rotation</key> @@ -378,38 +349,54 @@ </param> </block> <block> - <key>random_source_x</key> + <key>variable_slider</key> <param> <key>id</key> - <value>random_source_x</value> + <value>freq_offset</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>byte</value> + <key>label</key> + <value>Frequency Offset</value> </param> <param> - <key>min</key> + <key>value</key> <value>0</value> </param> <param> + <key>min</key> + <value>-0.5</value> + </param> + <param> <key>max</key> - <value>256</value> + <value>0.5</value> </param> <param> - <key>num_samps</key> - <value>10000000</value> + <key>num_steps</key> + <value>1000</value> </param> <param> - <key>repeat</key> - <value>True</value> + <key>style</key> + <value>wx.SL_HORIZONTAL</value> + </param> + <param> + <key>converver</key> + <value>float_converter</value> + </param> + <param> + <key>grid_pos</key> + <value></value> + </param> + <param> + <key>notebook</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(0, 112)</value> + <value>(673, -1)</value> </param> <param> <key>_rotation</key> @@ -417,30 +404,38 @@ </param> </block> <block> - <key>gr_throttle</key> + <key>channels_channel_model</key> <param> <key>id</key> - <value>gr_throttle_0</value> + <value>channels_channel_model_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>noise_voltage</key> + <value>noise_amp</value> </param> <param> - <key>samples_per_second</key> - <value>samp_rate</value> + <key>freq_offset</key> + <value>freq_offset</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>epsilon</key> + <value>1.0</value> + </param> + <param> + <key>taps</key> + <value>1.0</value> + </param> + <param> + <key>seed</key> + <value>42</value> </param> <param> <key>_coordinate</key> - <value>(489, 179)</value> + <value>(649, 104)</value> </param> <param> <key>_rotation</key> @@ -515,7 +510,7 @@ </param> <param> <key>_coordinate</key> - <value>(990, 0)</value> + <value>(875, 0)</value> </param> <param> <key>_rotation</key> @@ -606,7 +601,7 @@ </param> <param> <key>_coordinate</key> - <value>(990, 147)</value> + <value>(875, 108)</value> </param> <param> <key>_rotation</key> @@ -614,61 +609,54 @@ </param> </block> <block> - <key>channel_model</key> + <key>wxgui_scopesink2</key> <param> <key>id</key> - <value>channel_model_0</value> + <value>wxgui_scopesink2_0_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>noise_voltage</key> - <value>noise_amp</value> - </param> - <param> - <key>freq_offset</key> - <value>freq_offset</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>epsilon</key> - <value>1.0</value> + <key>title</key> + <value>Frequency Corrected Signal</value> </param> <param> - <key>taps</key> - <value>1.0</value> + <key>samp_rate</key> + <value>samp_rate</value> </param> <param> - <key>seed</key> + <key>v_scale</key> <value>0</value> </param> <param> - <key>_coordinate</key> - <value>(743, 147)</value> + <key>v_offset</key> + <value>0</value> </param> <param> - <key>_rotation</key> + <key>t_scale</key> <value>0</value> </param> - </block> - <block> - <key>notebook</key> <param> - <key>id</key> - <value>notebook_0</value> + <key>ac_couple</key> + <value>False</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>xy_mode</key> + <value>False</value> </param> <param> - <key>style</key> - <value>wx.NB_TOP</value> + <key>num_inputs</key> + <value>1</value> </param> <param> - <key>labels</key> - <value>['Freq', 'Time']</value> + <key>win_size</key> + <value></value> </param> <param> <key>grid_pos</key> @@ -676,11 +664,19 @@ </param> <param> <key>notebook</key> - <value></value> + <value>notebook_0,1</value> + </param> + <param> + <key>trig_mode</key> + <value>gr.gr_TRIG_MODE_AUTO</value> + </param> + <param> + <key>y_axis_label</key> + <value>Counts</value> </param> <param> <key>_coordinate</key> - <value>(76, 579)</value> + <value>(439, 289)</value> </param> <param> <key>_rotation</key> @@ -688,93 +684,90 @@ </param> </block> <block> - <key>variable_slider</key> + <key>wxgui_fftsink2</key> <param> <key>id</key> - <value>freq_bw</value> + <value>wxgui_fftsink2_0_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>FLL Loop Bandwidth</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>value</key> - <value>0</value> + <key>title</key> + <value>Frequency Corrected Signal</value> </param> <param> - <key>min</key> - <value>0</value> + <key>samp_rate</key> + <value>samp_rate</value> </param> <param> - <key>max</key> - <value>0.1</value> + <key>baseband_freq</key> + <value>0</value> </param> <param> - <key>num_steps</key> - <value>1000</value> + <key>y_per_div</key> + <value>10</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>y_divs</key> + <value>10</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>ref_level</key> + <value>10</value> </param> <param> - <key>grid_pos</key> - <value></value> + <key>ref_scale</key> + <value>2.0</value> </param> <param> - <key>notebook</key> - <value></value> + <key>fft_size</key> + <value>1024</value> </param> <param> - <key>_coordinate</key> - <value>(77, 449)</value> + <key>fft_rate</key> + <value>30</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>peak_hold</key> + <value>False</value> </param> - </block> - <block> - <key>digital_fll_band_edge_cc</key> <param> - <key>id</key> - <value>digital_fll_band_edge_cc_0</value> + <key>average</key> + <value>False</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>avg_alpha</key> + <value>0</value> </param> <param> - <key>type</key> - <value>cc</value> + <key>win</key> + <value>None</value> </param> <param> - <key>samps_per_sym</key> - <value>sps</value> + <key>win_size</key> + <value></value> </param> <param> - <key>rolloff</key> - <value>rolloff</value> + <key>grid_pos</key> + <value></value> </param> <param> - <key>filter_size</key> - <value>44</value> + <key>notebook</key> + <value>notebook_0,0</value> </param> <param> - <key>w</key> - <value>freq_bw</value> + <key>freqvar</key> + <value>None</value> </param> <param> <key>_coordinate</key> - <value>(78, 308)</value> + <value>(439, 423)</value> </param> <param> <key>_rotation</key> @@ -782,54 +775,22 @@ </param> </block> <block> - <key>wxgui_scopesink2</key> + <key>notebook</key> <param> <key>id</key> - <value>wxgui_scopesink2_0_0</value> + <value>notebook_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> - </param> - <param> - <key>title</key> - <value>Frequency Corrected Signal</value> - </param> - <param> - <key>samp_rate</key> - <value>samp_rate</value> - </param> - <param> - <key>v_scale</key> - <value>0</value> - </param> - <param> - <key>v_offset</key> - <value>0</value> - </param> - <param> - <key>t_scale</key> - <value>0</value> - </param> - <param> - <key>ac_couple</key> - <value>False</value> - </param> - <param> - <key>xy_mode</key> - <value>False</value> - </param> - <param> - <key>num_inputs</key> - <value>1</value> + <key>style</key> + <value>wx.NB_TOP</value> </param> <param> - <key>win_size</key> - <value></value> + <key>labels</key> + <value>['Freq', 'Time']</value> </param> <param> <key>grid_pos</key> @@ -837,19 +798,11 @@ </param> <param> <key>notebook</key> - <value>notebook_0,1</value> - </param> - <param> - <key>trig_mode</key> - <value>gr.gr_TRIG_MODE_AUTO</value> - </param> - <param> - <key>y_axis_label</key> - <value>Counts</value> + <value></value> </param> <param> <key>_coordinate</key> - <value>(439, 306)</value> + <value>(114, 521)</value> </param> <param> <key>_rotation</key> @@ -857,58 +810,46 @@ </param> </block> <block> - <key>options</key> + <key>digital_psk_mod</key> <param> <key>id</key> - <value>freq_lock</value> + <value>digital_psk_mod_0</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>1280, 1024</value> + <key>constellation_points</key> + <value>2</value> </param> <param> - <key>generate_options</key> - <value>wx_gui</value> + <key>mod_code</key> + <value>"gray"</value> </param> <param> - <key>category</key> - <value>Custom</value> + <key>differential</key> + <value>False</value> </param> <param> - <key>run_options</key> - <value>prompt</value> + <key>samples_per_symbol</key> + <value>sps</value> </param> <param> - <key>run</key> - <value>True</value> + <key>excess_bw</key> + <value>rolloff</value> </param> <param> - <key>max_nouts</key> - <value>0</value> + <key>verbose</key> + <value>False</value> </param> <param> - <key>realtime_scheduling</key> - <value></value> + <key>log</key> + <value>False</value> </param> <param> <key>_coordinate</key> - <value>(-1, 0)</value> + <value>(194, 104)</value> </param> <param> <key>_rotation</key> @@ -916,50 +857,50 @@ </param> </block> <connection> - <source_block_id>random_source_x</source_block_id> - <sink_block_id>digital_psk_mod_0</sink_block_id> + <source_block_id>channels_channel_model_0</source_block_id> + <sink_block_id>wxgui_scopesink2_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>digital_psk_mod_0</source_block_id> - <sink_block_id>gr_throttle_0</sink_block_id> + <source_block_id>channels_channel_model_0</source_block_id> + <sink_block_id>wxgui_fftsink2_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>digital_fll_band_edge_cc_0</source_block_id> - <sink_block_id>wxgui_scopesink2_0_0</sink_block_id> + <source_block_id>random_source_x</source_block_id> + <sink_block_id>digital_psk_mod_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>digital_fll_band_edge_cc_0</source_block_id> - <sink_block_id>wxgui_fftsink2_0_0</sink_block_id> + <source_block_id>digital_psk_mod_0</source_block_id> + <sink_block_id>gr_throttle_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> <source_block_id>gr_throttle_0</source_block_id> - <sink_block_id>channel_model_0</sink_block_id> + <sink_block_id>channels_channel_model_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>channel_model_0</source_block_id> - <sink_block_id>wxgui_scopesink2_0</sink_block_id> + <source_block_id>channels_channel_model_0</source_block_id> + <sink_block_id>digital_fll_band_edge_cc_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>channel_model_0</source_block_id> - <sink_block_id>wxgui_fftsink2_0</sink_block_id> + <source_block_id>digital_fll_band_edge_cc_0</source_block_id> + <sink_block_id>wxgui_scopesink2_0_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>channel_model_0</source_block_id> - <sink_block_id>digital_fll_band_edge_cc_0</sink_block_id> + <source_block_id>digital_fll_band_edge_cc_0</source_block_id> + <sink_block_id>wxgui_fftsink2_0_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> |