diff options
author | piotr <Piotr Krysik pkrysik@elka.pw.edu.pl> | 2014-08-06 20:13:50 +0200 |
---|---|---|
committer | piotr <Piotr Krysik pkrysik@elka.pw.edu.pl> | 2014-08-06 20:13:50 +0200 |
commit | 2c2f77f6d1838a8be4943cfc6829ceba7e4f2a74 (patch) | |
tree | 57036010d4176a910b3b70f31e69091a02202088 | |
parent | 4a4704606a68a0a6cbf22a0d02f52ec1b8a98aa4 (diff) |
Changes in examples resulting from change of the clock offset corrector input
-rw-r--r-- | examples/receiver_file.grc | 278 | ||||
-rw-r--r-- | examples/receiver_rtlsdr.grc | 544 | ||||
-rw-r--r-- | examples/receiver_usrp.grc | 306 |
3 files changed, 564 insertions, 564 deletions
diff --git a/examples/receiver_file.grc b/examples/receiver_file.grc index 800e662..4561b49 100644 --- a/examples/receiver_file.grc +++ b/examples/receiver_file.grc @@ -1,11 +1,11 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Wed Aug 6 15:17:45 2014</timestamp> + <timestamp>Wed Aug 6 20:09:35 2014</timestamp> <block> <key>options</key> <param> <key>id</key> - <value>gsm_receiver_test</value> + <value>gsm_receiver_file</value> </param> <param> <key>_enabled</key> @@ -65,26 +65,18 @@ </param> </block> <block> - <key>gsm_receiver_hier</key> + <key>gsm_get_bcch_or_ccch_bursts</key> <param> <key>id</key> - <value>gsm_receiver_hier_0</value> + <value>gsm_get_bcch_or_ccch_bursts_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>input_rate</key> - <value>samp_rate</value> - </param> - <param> - <key>osr</key> - <value>4</value> - </param> - <param> - <key>arfcn</key> - <value>0</value> + <key>d_fn51_start</key> + <value>2</value> </param> <param> <key>alias</key> @@ -104,7 +96,7 @@ </param> <param> <key>_coordinate</key> - <value>(606, 180)</value> + <value>(809, 179)</value> </param> <param> <key>_rotation</key> @@ -112,20 +104,16 @@ </param> </block> <block> - <key>gsm_get_bcch_or_ccch_bursts</key> + <key>gsm_control_channels_decoder</key> <param> <key>id</key> - <value>gsm_get_bcch_or_ccch_bursts_0</value> + <value>gsm_control_channels_decoder_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>d_fn51_start</key> - <value>2</value> - </param> - <param> <key>alias</key> <value></value> </param> @@ -143,7 +131,7 @@ </param> <param> <key>_coordinate</key> - <value>(809, 179)</value> + <value>(1054, 183)</value> </param> <param> <key>_rotation</key> @@ -151,10 +139,10 @@ </param> </block> <block> - <key>gsm_control_channels_decoder</key> + <key>gsm_message_printer</key> <param> <key>id</key> - <value>gsm_control_channels_decoder_0</value> + <value>gsm_message_printer_0</value> </param> <param> <key>_enabled</key> @@ -169,16 +157,8 @@ <value></value> </param> <param> - <key>minoutbuf</key> - <value>0</value> - </param> - <param> - <key>maxoutbuf</key> - <value>0</value> - </param> - <param> <key>_coordinate</key> - <value>(1054, 183)</value> + <value>(945, 254)</value> </param> <param> <key>_rotation</key> @@ -186,26 +166,38 @@ </param> </block> <block> - <key>gsm_message_printer</key> + <key>parameter</key> <param> <key>id</key> - <value>gsm_message_printer_0</value> + <value>input_file_name</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>alias</key> - <value></value> + <key>label</key> + <value>input_file_name</value> </param> <param> - <key>affinity</key> + <key>value</key> + <value>input.cfile</value> + </param> + <param> + <key>type</key> + <value>string</value> + </param> + <param> + <key>short_id</key> + <value>i</value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(945, 254)</value> + <value>(189, 13)</value> </param> <param> <key>_rotation</key> @@ -213,46 +205,77 @@ </param> </block> <block> - <key>clk_offset_corrector</key> + <key>parameter</key> <param> <key>id</key> - <value>clk_offset_corrector_0</value> + <value>fc</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>ppm</key> - <value>0</value> + <key>label</key> + <value>fc</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>value</key> + <value>937e6</value> </param> <param> - <key>fc</key> - <value>936.6e6</value> + <key>type</key> + <value>eng_float</value> + </param> + <param> + <key>short_id</key> + <value>f</value> </param> <param> <key>alias</key> <value></value> </param> <param> - <key>affinity</key> - <value></value> + <key>_coordinate</key> + <value>(311, 10)</value> </param> <param> - <key>minoutbuf</key> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>parameter</key> <param> - <key>maxoutbuf</key> - <value>0</value> + <key>id</key> + <value>samp_rate</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>samp_rate</value> + </param> + <param> + <key>value</key> + <value>1625000.0/6.0*4.0</value> + </param> + <param> + <key>type</key> + <value>eng_float</value> + </param> + <param> + <key>short_id</key> + <value>s</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(374, 180)</value> + <value>(656, 8)</value> </param> <param> <key>_rotation</key> @@ -260,30 +283,26 @@ </param> </block> <block> - <key>blocks_file_source</key> + <key>gsm_receiver_hier</key> <param> <key>id</key> - <value>blocks_file_source_0</value> + <value>gsm_receiver_hier_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>file</key> - <value>input_file_name</value> - </param> - <param> - <key>type</key> - <value>complex</value> + <key>input_rate</key> + <value>samp_rate</value> </param> <param> - <key>repeat</key> - <value>False</value> + <key>osr</key> + <value>4</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>arfcn</key> + <value>0</value> </param> <param> <key>alias</key> @@ -303,7 +322,7 @@ </param> <param> <key>_coordinate</key> - <value>(118, 171)</value> + <value>(606, 180)</value> </param> <param> <key>_rotation</key> @@ -311,38 +330,50 @@ </param> </block> <block> - <key>parameter</key> + <key>blocks_file_source</key> <param> <key>id</key> - <value>input_file_name</value> + <value>blocks_file_source_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> + <key>file</key> <value>input_file_name</value> </param> <param> - <key>value</key> - <value>input.cfile</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>type</key> - <value>string</value> + <key>repeat</key> + <value>False</value> </param> <param> - <key>short_id</key> - <value>i</value> + <key>vlen</key> + <value>1</value> </param> <param> <key>alias</key> <value></value> </param> <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(189, 13)</value> + <value>(118, 171)</value> </param> <param> <key>_rotation</key> @@ -385,7 +416,7 @@ </param> <param> <key>_coordinate</key> - <value>(447, 43)</value> + <value>(488, 77)</value> </param> <param> <key>_rotation</key> @@ -393,77 +424,46 @@ </param> </block> <block> - <key>parameter</key> + <key>clock_offset_corrector</key> <param> <key>id</key> - <value>samp_rate</value> + <value>clock_offset_corrector_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>samp_rate</value> + <key>ppm</key> + <value>0</value> </param> <param> - <key>value</key> + <key>samp_rate</key> <value>1625000.0/6.0*4.0</value> </param> <param> - <key>type</key> - <value>eng_float</value> - </param> - <param> - <key>short_id</key> - <value>s</value> + <key>fc</key> + <value>936.6e6</value> </param> <param> <key>alias</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(656, 8)</value> + <key>affinity</key> + <value></value> </param> <param> - <key>_rotation</key> + <key>minoutbuf</key> <value>0</value> </param> - </block> - <block> - <key>parameter</key> - <param> - <key>id</key> - <value>fc</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>label</key> - <value>fc</value> - </param> - <param> - <key>value</key> - <value>937e6</value> - </param> - <param> - <key>type</key> - <value>eng_float</value> - </param> - <param> - <key>short_id</key> - <value>f</value> - </param> <param> - <key>alias</key> - <value></value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(311, 10)</value> + <value>(380, 180)</value> </param> <param> <key>_rotation</key> @@ -471,24 +471,6 @@ </param> </block> <connection> - <source_block_id>gsm_clock_offset_control_0</source_block_id> - <sink_block_id>clk_offset_corrector_0</sink_block_id> - <source_key>ppm</source_key> - <sink_key>ppm_msg</sink_key> - </connection> - <connection> - <source_block_id>clk_offset_corrector_0</source_block_id> - <sink_block_id>gsm_receiver_hier_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>blocks_file_source_0</source_block_id> - <sink_block_id>clk_offset_corrector_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> <source_block_id>gsm_receiver_hier_0</source_block_id> <sink_block_id>gsm_clock_offset_control_0</sink_block_id> <source_key>measurements</source_key> @@ -512,4 +494,22 @@ <source_key>bursts</source_key> <sink_key>bursts</sink_key> </connection> + <connection> + <source_block_id>clock_offset_corrector_0</source_block_id> + <sink_block_id>gsm_receiver_hier_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>blocks_file_source_0</source_block_id> + <sink_block_id>clock_offset_corrector_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>gsm_clock_offset_control_0</source_block_id> + <sink_block_id>clock_offset_corrector_0</sink_block_id> + <source_key>ppm</source_key> + <sink_key>ppm</sink_key> + </connection> </flow_graph> diff --git a/examples/receiver_rtlsdr.grc b/examples/receiver_rtlsdr.grc index 3c1cb5f..5a34ac4 100644 --- a/examples/receiver_rtlsdr.grc +++ b/examples/receiver_rtlsdr.grc @@ -1,11 +1,11 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Wed Aug 6 15:56:33 2014</timestamp> + <timestamp>Wed Aug 6 19:55:56 2014</timestamp> <block> <key>options</key> <param> <key>id</key> - <value>rtl</value> + <value>receiver_rtlsdr</value> </param> <param> <key>_enabled</key> @@ -92,65 +92,58 @@ </param> </block> <block> - <key>gsm_get_bcch_or_ccch_bursts</key> + <key>variable_slider</key> <param> <key>id</key> - <value>gsm_get_bcch_or_ccch_bursts_0</value> + <value>ppm</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>d_fn51_start</key> - <value>2</value> - </param> - <param> - <key>alias</key> + <key>label</key> <value></value> </param> <param> - <key>affinity</key> - <value></value> + <key>value</key> + <value>0</value> </param> <param> - <key>minoutbuf</key> - <value>0</value> + <key>min</key> + <value>-50</value> </param> <param> - <key>maxoutbuf</key> - <value>0</value> + <key>max</key> + <value>50</value> </param> <param> - <key>_coordinate</key> - <value>(793, 304)</value> + <key>num_steps</key> + <value>100</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>style</key> + <value>wx.SL_HORIZONTAL</value> </param> - </block> - <block> - <key>gsm_message_printer</key> <param> - <key>id</key> - <value>gsm_message_printer_0</value> + <key>converver</key> + <value>float_converter</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>grid_pos</key> + <value></value> </param> <param> - <key>alias</key> + <key>notebook</key> <value></value> </param> <param> - <key>affinity</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(1072, 371)</value> + <value>(462, 28)</value> </param> <param> <key>_rotation</key> @@ -161,7 +154,7 @@ <key>variable_slider</key> <param> <key>id</key> - <value>ppm</value> + <value>fc</value> </param> <param> <key>_enabled</key> @@ -173,19 +166,19 @@ </param> <param> <key>value</key> - <value>0</value> + <value>940e6</value> </param> <param> <key>min</key> - <value>-50</value> + <value>800e6</value> </param> <param> <key>max</key> - <value>50</value> + <value>1000e6</value> </param> <param> <key>num_steps</key> - <value>100</value> + <value>1000</value> </param> <param> <key>style</key> @@ -209,7 +202,7 @@ </param> <param> <key>_coordinate</key> - <value>(462, 28)</value> + <value>(333, 29)</value> </param> <param> <key>_rotation</key> @@ -220,7 +213,7 @@ <key>variable_slider</key> <param> <key>id</key> - <value>fc</value> + <value>g</value> </param> <param> <key>_enabled</key> @@ -232,19 +225,19 @@ </param> <param> <key>value</key> - <value>940e6</value> + <value>43</value> </param> <param> <key>min</key> - <value>800e6</value> + <value>0</value> </param> <param> <key>max</key> - <value>1000e6</value> + <value>100</value> </param> <param> <key>num_steps</key> - <value>1000</value> + <value>100</value> </param> <param> <key>style</key> @@ -268,7 +261,7 @@ </param> <param> <key>_coordinate</key> - <value>(333, 29)</value> + <value>(217, 29)</value> </param> <param> <key>_rotation</key> @@ -276,58 +269,65 @@ </param> </block> <block> - <key>variable_slider</key> + <key>gsm_get_bcch_or_ccch_bursts</key> <param> <key>id</key> - <value>g</value> + <value>gsm_get_bcch_or_ccch_bursts_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> + <key>d_fn51_start</key> + <value>2</value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> - <key>value</key> - <value>43</value> + <key>affinity</key> + <value></value> </param> <param> - <key>min</key> + <key>minoutbuf</key> <value>0</value> </param> <param> - <key>max</key> - <value>100</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>_coordinate</key> + <value>(669, 359)</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>gsm_message_printer</key> <param> - <key>converver</key> - <value>float_converter</value> + <key>id</key> + <value>gsm_message_printer_0</value> </param> <param> - <key>grid_pos</key> - <value></value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> - <key>alias</key> + <key>affinity</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(217, 29)</value> + <value>(1165, 362)</value> </param> <param> <key>_rotation</key> @@ -362,7 +362,153 @@ </param> <param> <key>_coordinate</key> - <value>(821, 371)</value> + <value>(929, 363)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>gsm_receiver_hier</key> + <param> + <key>id</key> + <value>gsm_receiver_hier_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>input_rate</key> + <value>samp_rate</value> + </param> + <param> + <key>osr</key> + <value>4</value> + </param> + <param> + <key>arfcn</key> + <value>0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(468, 360)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>wxgui_fftsink2</key> + <param> + <key>id</key> + <value>wxgui_fftsink2_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>title</key> + <value>FFT Plot</value> + </param> + <param> + <key>samp_rate</key> + <value>samp_rate</value> + </param> + <param> + <key>baseband_freq</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>0</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>15</value> + </param> + <param> + <key>peak_hold</key> + <value>False</value> + </param> + <param> + <key>average</key> + <value>False</value> + </param> + <param> + <key>avg_alpha</key> + <value>0</value> + </param> + <param> + <key>win</key> + <value>None</value> + </param> + <param> + <key>win_size</key> + <value></value> + </param> + <param> + <key>grid_pos</key> + <value></value> + </param> + <param> + <key>notebook</key> + <value></value> + </param> + <param> + <key>freqvar</key> + <value>None</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(465, 441)</value> </param> <param> <key>_rotation</key> @@ -405,7 +551,54 @@ </param> <param> <key>_coordinate</key> - <value>(488, 171)</value> + <value>(185, 220)</value> + </param> + <param> + <key>_rotation</key> + <value>270</value> + </param> + </block> + <block> + <key>clock_offset_corrector</key> + <param> + <key>id</key> + <value>clock_offset_corrector_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>ppm</key> + <value>0</value> + </param> + <param> + <key>samp_rate</key> + <value>1625000.0/6.0*4.0</value> + </param> + <param> + <key>fc</key> + <value>936.6e6</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(263, 360)</value> </param> <param> <key>_rotation</key> @@ -656,200 +849,7 @@ </param> <param> <key>_coordinate</key> - <value>(112, 233)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>wxgui_fftsink2</key> - <param> - <key>id</key> - <value>wxgui_fftsink2_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>type</key> - <value>complex</value> - </param> - <param> - <key>title</key> - <value>FFT Plot</value> - </param> - <param> - <key>samp_rate</key> - <value>samp_rate</value> - </param> - <param> - <key>baseband_freq</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>0</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>15</value> - </param> - <param> - <key>peak_hold</key> - <value>False</value> - </param> - <param> - <key>average</key> - <value>False</value> - </param> - <param> - <key>avg_alpha</key> - <value>0</value> - </param> - <param> - <key>win</key> - <value>None</value> - </param> - <param> - <key>win_size</key> - <value></value> - </param> - <param> - <key>grid_pos</key> - <value></value> - </param> - <param> - <key>notebook</key> - <value></value> - </param> - <param> - <key>freqvar</key> - <value>None</value> - </param> - <param> - <key>alias</key> - <value></value> - </param> - <param> - <key>affinity</key> - <value></value> - </param> - <param> - <key>_coordinate</key> - <value>(582, 387)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>gsm_receiver_hier</key> - <param> - <key>id</key> - <value>gsm_receiver_hier_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>input_rate</key> - <value>samp_rate</value> - </param> - <param> - <key>osr</key> - <value>4</value> - </param> - <param> - <key>arfcn</key> - <value>0</value> - </param> - <param> - <key>alias</key> - <value></value> - </param> - <param> - <key>affinity</key> - <value></value> - </param> - <param> - <key>minoutbuf</key> - <value>0</value> - </param> - <param> - <key>maxoutbuf</key> - <value>0</value> - </param> - <param> - <key>_coordinate</key> - <value>(585, 306)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>clock_offset_corrector</key> - <param> - <key>id</key> - <value>clock_offset_corrector_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>ppm</key> - <value>0</value> - </param> - <param> - <key>samp_rate</key> - <value>1625000.0/6.0*4.0</value> - </param> - <param> - <key>fc</key> - <value>936.6e6</value> - </param> - <param> - <key>alias</key> - <value></value> - </param> - <param> - <key>affinity</key> - <value></value> - </param> - <param> - <key>minoutbuf</key> - <value>0</value> - </param> - <param> - <key>maxoutbuf</key> - <value>0</value> - </param> - <param> - <key>_coordinate</key> - <value>(340, 306)</value> + <value>(15, 287)</value> </param> <param> <key>_rotation</key> @@ -857,12 +857,6 @@ </param> </block> <connection> - <source_block_id>gsm_receiver_hier_0</source_block_id> - <sink_block_id>gsm_get_bcch_or_ccch_bursts_0</sink_block_id> - <source_key>bursts</source_key> - <sink_key>bursts</sink_key> - </connection> - <connection> <source_block_id>gsm_get_bcch_or_ccch_bursts_0</source_block_id> <sink_block_id>gsm_control_channels_decoder_0</sink_block_id> <source_key>bursts</source_key> @@ -881,16 +875,16 @@ <sink_key>measurements</sink_key> </connection> <connection> - <source_block_id>rtlsdr_source_0</source_block_id> - <sink_block_id>clock_offset_corrector_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> + <source_block_id>gsm_receiver_hier_0</source_block_id> + <sink_block_id>gsm_get_bcch_or_ccch_bursts_0</sink_block_id> + <source_key>bursts</source_key> + <sink_key>bursts</sink_key> </connection> <connection> - <source_block_id>gsm_clock_offset_control_0</source_block_id> - <sink_block_id>clock_offset_corrector_0</sink_block_id> - <source_key>ppm</source_key> - <sink_key>ppm_msg</sink_key> + <source_block_id>clock_offset_corrector_0</source_block_id> + <sink_block_id>gsm_receiver_hier_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> </connection> <connection> <source_block_id>clock_offset_corrector_0</source_block_id> @@ -899,9 +893,15 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>clock_offset_corrector_0</source_block_id> - <sink_block_id>gsm_receiver_hier_0</sink_block_id> + <source_block_id>rtlsdr_source_0</source_block_id> + <sink_block_id>clock_offset_corrector_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> + <connection> + <source_block_id>gsm_clock_offset_control_0</source_block_id> + <sink_block_id>clock_offset_corrector_0</sink_block_id> + <source_key>ppm</source_key> + <sink_key>ppm</sink_key> + </connection> </flow_graph> diff --git a/examples/receiver_usrp.grc b/examples/receiver_usrp.grc index 60e9581..a7a8dcf 100644 --- a/examples/receiver_usrp.grc +++ b/examples/receiver_usrp.grc @@ -1,11 +1,11 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Wed Aug 6 15:18:46 2014</timestamp> + <timestamp>Wed Aug 6 19:56:07 2014</timestamp> <block> <key>options</key> <param> <key>id</key> - <value>gsm_receiver_usrp_test</value> + <value>gsm_receiver_usrp</value> </param> <param> <key>_enabled</key> @@ -190,6 +190,65 @@ </param> </block> <block> + <key>variable_slider</key> + <param> + <key>id</key> + <value>fc</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value></value> + </param> + <param> + <key>value</key> + <value>937e6</value> + </param> + <param> + <key>min</key> + <value>900e6</value> + </param> + <param> + <key>max</key> + <value>1000e6</value> + </param> + <param> + <key>num_steps</key> + <value>500</value> + </param> + <param> + <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>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(236, 0)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> <key>uhd_usrp_source</key> <param> <key>id</key> @@ -869,7 +928,7 @@ </param> <param> <key>_coordinate</key> - <value>(109, 236)</value> + <value>(22, 253)</value> </param> <param> <key>_rotation</key> @@ -877,46 +936,98 @@ </param> </block> <block> - <key>gsm_receiver_hier</key> + <key>wxgui_fftsink2</key> <param> <key>id</key> - <value>gsm_receiver_hier_0</value> + <value>wxgui_fftsink2_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>input_rate</key> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>title</key> + <value>FFT Plot</value> + </param> + <param> + <key>samp_rate</key> <value>samp_rate</value> </param> <param> - <key>osr</key> - <value>4</value> + <key>baseband_freq</key> + <value>fc</value> </param> <param> - <key>arfcn</key> + <key>y_per_div</key> + <value>10</value> + </param> + <param> + <key>y_divs</key> + <value>10</value> + </param> + <param> + <key>ref_level</key> <value>0</value> </param> <param> - <key>alias</key> + <key>ref_scale</key> + <value>2.0</value> + </param> + <param> + <key>fft_size</key> + <value>1024</value> + </param> + <param> + <key>fft_rate</key> + <value>15</value> + </param> + <param> + <key>peak_hold</key> + <value>False</value> + </param> + <param> + <key>average</key> + <value>False</value> + </param> + <param> + <key>avg_alpha</key> + <value>0</value> + </param> + <param> + <key>win</key> + <value>None</value> + </param> + <param> + <key>win_size</key> <value></value> </param> <param> - <key>affinity</key> + <key>grid_pos</key> + <value>1,1,1,1</value> + </param> + <param> + <key>notebook</key> <value></value> </param> <param> - <key>minoutbuf</key> - <value>0</value> + <key>freqvar</key> + <value>None</value> </param> <param> - <key>maxoutbuf</key> - <value>0</value> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(455, 252)</value> + <value>(284, 367)</value> </param> <param> <key>_rotation</key> @@ -955,7 +1066,7 @@ </param> <param> <key>_coordinate</key> - <value>(681, 268)</value> + <value>(452, 268)</value> </param> <param> <key>_rotation</key> @@ -990,7 +1101,7 @@ </param> <param> <key>_coordinate</key> - <value>(946, 272)</value> + <value>(694, 272)</value> </param> <param> <key>_rotation</key> @@ -998,14 +1109,14 @@ </param> </block> <block> - <key>gsm_bursts_printer</key> + <key>gsm_message_printer</key> <param> <key>id</key> - <value>gsm_bursts_printer_1</value> + <value>gsm_message_printer_0</value> </param> <param> <key>_enabled</key> - <value>False</value> + <value>True</value> </param> <param> <key>alias</key> @@ -1017,7 +1128,7 @@ </param> <param> <key>_coordinate</key> - <value>(717, 162)</value> + <value>(905, 272)</value> </param> <param> <key>_rotation</key> @@ -1025,88 +1136,28 @@ </param> </block> <block> - <key>wxgui_fftsink2</key> + <key>gsm_receiver_hier</key> <param> <key>id</key> - <value>wxgui_fftsink2_0</value> + <value>gsm_receiver_hier_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> - </param> - <param> - <key>title</key> - <value>FFT Plot</value> - </param> - <param> - <key>samp_rate</key> + <key>input_rate</key> <value>samp_rate</value> </param> <param> - <key>baseband_freq</key> - <value>fc</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>0</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>15</value> - </param> - <param> - <key>peak_hold</key> - <value>False</value> - </param> - <param> - <key>average</key> - <value>False</value> + <key>osr</key> + <value>4</value> </param> <param> - <key>avg_alpha</key> + <key>arfcn</key> <value>0</value> </param> <param> - <key>win</key> - <value>None</value> - </param> - <param> - <key>win_size</key> - <value></value> - </param> - <param> - <key>grid_pos</key> - <value>1,1,1,1</value> - </param> - <param> - <key>notebook</key> - <value></value> - </param> - <param> - <key>freqvar</key> - <value>None</value> - </param> - <param> <key>alias</key> <value></value> </param> @@ -1115,67 +1166,16 @@ <value></value> </param> <param> - <key>_coordinate</key> - <value>(453, 342)</value> - </param> - <param> - <key>_rotation</key> + <key>minoutbuf</key> <value>0</value> </param> - </block> - <block> - <key>variable_slider</key> - <param> - <key>id</key> - <value>fc</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>label</key> - <value></value> - </param> - <param> - <key>value</key> - <value>937e6</value> - </param> - <param> - <key>min</key> - <value>900e6</value> - </param> - <param> - <key>max</key> - <value>1000e6</value> - </param> - <param> - <key>num_steps</key> - <value>500</value> - </param> - <param> - <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>alias</key> - <value></value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(236, 0)</value> + <value>(266, 269)</value> </param> <param> <key>_rotation</key> @@ -1184,31 +1184,31 @@ </block> <connection> <source_block_id>uhd_usrp_source_0</source_block_id> - <sink_block_id>gsm_receiver_hier_0</sink_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>uhd_usrp_source_0</source_block_id> - <sink_block_id>wxgui_fftsink2_0</sink_block_id> + <sink_block_id>gsm_receiver_hier_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>gsm_receiver_hier_0</source_block_id> - <sink_block_id>gsm_bursts_printer_1</sink_block_id> + <source_block_id>gsm_get_bcch_or_ccch_bursts_0</source_block_id> + <sink_block_id>gsm_control_channels_decoder_0</sink_block_id> <source_key>bursts</source_key> <sink_key>bursts</sink_key> </connection> <connection> - <source_block_id>gsm_receiver_hier_0</source_block_id> - <sink_block_id>gsm_get_bcch_or_ccch_bursts_0</sink_block_id> - <source_key>bursts</source_key> - <sink_key>bursts</sink_key> + <source_block_id>gsm_control_channels_decoder_0</source_block_id> + <sink_block_id>gsm_message_printer_0</sink_block_id> + <source_key>msgs</source_key> + <sink_key>msgs</sink_key> </connection> <connection> - <source_block_id>gsm_get_bcch_or_ccch_bursts_0</source_block_id> - <sink_block_id>gsm_control_channels_decoder_0</sink_block_id> + <source_block_id>gsm_receiver_hier_0</source_block_id> + <sink_block_id>gsm_get_bcch_or_ccch_bursts_0</sink_block_id> <source_key>bursts</source_key> <sink_key>bursts</sink_key> </connection> |