diff options
| -rw-r--r-- | gr-digital/examples/ofdm/ofdm_loopback.grc | 637 | ||||
| -rw-r--r-- | gr-digital/examples/ofdm/tx_ofdm.grc | 473 |
2 files changed, 538 insertions, 572 deletions
diff --git a/gr-digital/examples/ofdm/ofdm_loopback.grc b/gr-digital/examples/ofdm/ofdm_loopback.grc index ad8e4a3ef7..a2c93145c4 100644 --- a/gr-digital/examples/ofdm/ofdm_loopback.grc +++ b/gr-digital/examples/ofdm/ofdm_loopback.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Tue Aug 27 15:09:37 2013</timestamp> + <timestamp>Sun Nov 3 19:13:00 2013</timestamp> <block> <key>options</key> <param> @@ -64,7 +64,7 @@ <key>variable</key> <param> <key>id</key> - <value>tx_signal</value> + <value>samp_rate</value> </param> <param> <key>_enabled</key> @@ -72,34 +72,11 @@ </param> <param> <key>value</key> - <value>[numpy.sin(2 * numpy.pi * 1.0/8 * x) for x in range(packet_len)]</value> + <value>100000</value> </param> <param> <key>_coordinate</key> - <value>(176, -1)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable</key> - <param> - <key>id</key> - <value>packet_len</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>value</key> - <value>8*2</value> - </param> - <param> - <key>_coordinate</key> - <value>(258, 64)</value> + <value>(493, 7)</value> </param> <param> <key>_rotation</key> @@ -122,7 +99,7 @@ </param> <param> <key>_coordinate</key> - <value>(464, 0)</value> + <value>(403, 8)</value> </param> <param> <key>_rotation</key> @@ -145,7 +122,7 @@ </param> <param> <key>_coordinate</key> - <value>(345, 0)</value> + <value>(283, 6)</value> </param> <param> <key>_rotation</key> @@ -153,22 +130,22 @@ </param> </block> <block> - <key>import</key> + <key>variable</key> <param> <key>id</key> - <value>import_0</value> + <value>packet_len</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>import</key> - <value>import numpy</value> + <key>value</key> + <value>50</value> </param> <param> <key>_coordinate</key> - <value>(536, -1)</value> + <value>(182, 6)</value> </param> <param> <key>_rotation</key> @@ -176,47 +153,32 @@ </param> </block> <block> - <key>import</key> + <key>blocks_vector_source_x</key> <param> <key>id</key> - <value>import_0_0</value> + <value>blocks_vector_source_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>import</key> - <value>from gnuradio.digital.utils import tagged_streams</value> - </param> - <param> - <key>_coordinate</key> - <value>(633, -1)</value> + <key>type</key> + <value>byte</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>vector</key> + <value>range(packet_len)</value> </param> - </block> - <block> - <key>blocks_vector_to_stream</key> <param> - <key>id</key> - <value>blocks_vector_to_stream_0</value> + <key>tags</key> + <value>()</value> </param> <param> - <key>_enabled</key> + <key>repeat</key> <value>True</value> </param> <param> - <key>type</key> - <value>byte</value> - </param> - <param> - <key>num_items</key> - <value>4</value> - </param> - <param> <key>vlen</key> <value>1</value> </param> @@ -230,7 +192,7 @@ </param> <param> <key>_coordinate</key> - <value>(261, 140)</value> + <value>(5, 124)</value> </param> <param> <key>_rotation</key> @@ -238,10 +200,10 @@ </param> </block> <block> - <key>blocks_tag_debug</key> + <key>wxgui_fftsink2</key> <param> <key>id</key> - <value>blocks_tag_debug_0</value> + <value>wxgui_fftsink2_0</value> </param> <param> <key>_enabled</key> @@ -249,82 +211,59 @@ </param> <param> <key>type</key> - <value>byte</value> - </param> - <param> - <key>name</key> - <value>Rx Packets</value> - </param> - <param> - <key>num_inputs</key> - <value>1</value> - </param> - <param> - <key>vlen</key> - <value>1</value> - </param> - <param> - <key>display</key> - <value>True</value> + <value>complex</value> </param> <param> - <key>affinity</key> - <value></value> + <key>title</key> + <value>Rx Spectrum</value> </param> <param> - <key>_coordinate</key> - <value>(345, 424)</value> + <key>samp_rate</key> + <value>100e3</value> </param> <param> - <key>_rotation</key> + <key>baseband_freq</key> <value>0</value> </param> - </block> - <block> - <key>wxgui_scopesink2</key> - <param> - <key>id</key> - <value>wxgui_scopesink2_0</value> - </param> <param> - <key>_enabled</key> - <value>True</value> + <key>y_per_div</key> + <value>10</value> </param> <param> - <key>type</key> - <value>float</value> + <key>y_divs</key> + <value>10</value> </param> <param> - <key>title</key> - <value>Scope Plot</value> + <key>ref_level</key> + <value>0</value> </param> <param> - <key>samp_rate</key> - <value>1.0</value> + <key>ref_scale</key> + <value>2.0</value> </param> <param> - <key>v_scale</key> - <value>0</value> + <key>fft_size</key> + <value>1024</value> </param> <param> - <key>v_offset</key> - <value>0</value> + <key>fft_rate</key> + <value>15</value> </param> <param> - <key>t_scale</key> - <value>0</value> + <key>peak_hold</key> + <value>False</value> </param> <param> - <key>ac_couple</key> + <key>average</key> <value>False</value> </param> <param> - <key>xy_mode</key> - <value>False</value> + <key>avg_alpha</key> + <value>0</value> </param> <param> - <key>num_inputs</key> - <value>1</value> + <key>win</key> + <value>None</value> </param> <param> <key>win_size</key> @@ -339,12 +278,8 @@ <value></value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> - </param> - <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>freqvar</key> + <value>None</value> </param> <param> <key>affinity</key> @@ -352,7 +287,7 @@ </param> <param> <key>_coordinate</key> - <value>(550, 323)</value> + <value>(51, 500)</value> </param> <param> <key>_rotation</key> @@ -360,10 +295,10 @@ </param> </block> <block> - <key>blocks_stream_to_vector</key> + <key>blocks_tag_debug</key> <param> <key>id</key> - <value>blocks_stream_to_vector_0</value> + <value>blocks_tag_debug_0</value> </param> <param> <key>_enabled</key> @@ -374,24 +309,28 @@ <value>byte</value> </param> <param> - <key>num_items</key> - <value>4</value> + <key>name</key> + <value>Rx Packets</value> + </param> + <param> + <key>num_inputs</key> + <value>1</value> </param> <param> <key>vlen</key> <value>1</value> </param> <param> - <key>affinity</key> - <value></value> + <key>display</key> + <value>True</value> </param> <param> - <key>minoutbuf</key> - <value>0</value> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(348, 347)</value> + <value>(325, 483)</value> </param> <param> <key>_rotation</key> @@ -399,54 +338,42 @@ </param> </block> <block> - <key>variable_slider</key> + <key>blocks_stream_to_tagged_stream</key> <param> <key>id</key> - <value>noise_voltage</value> + <value>blocks_stream_to_tagged_stream_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Noise Amplitude</value> - </param> - <param> - <key>value</key> - <value>0.01</value> - </param> - <param> - <key>min</key> - <value>0</value> + <key>type</key> + <value>byte</value> </param> <param> - <key>max</key> + <key>vlen</key> <value>1</value> </param> <param> - <key>num_steps</key> - <value>100</value> - </param> - <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>packet_len</key> + <value>packet_len</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>len_tag_key</key> + <value>len_tag_key</value> </param> <param> - <key>grid_pos</key> + <key>affinity</key> <value></value> </param> <param> - <key>notebook</key> - <value></value> + <key>minoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(707, 496)</value> + <value>(282, 132)</value> </param> <param> <key>_rotation</key> @@ -454,94 +381,101 @@ </param> </block> <block> - <key>wxgui_fftsink2</key> + <key>digital_ofdm_rx</key> <param> <key>id</key> - <value>wxgui_fftsink2_0</value> + <value>digital_ofdm_rx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>fft_len</key> + <value>fft_len</value> </param> <param> - <key>title</key> - <value>Rx Spectrum</value> + <key>cp_len</key> + <value>fft_len/4</value> </param> <param> - <key>samp_rate</key> - <value>100e3</value> + <key>packet_len_key</key> + <value>"rx_len"</value> </param> <param> - <key>baseband_freq</key> - <value>0</value> + <key>occupied_carriers</key> + <value>()</value> </param> <param> - <key>y_per_div</key> - <value>10</value> + <key>pilot_carriers</key> + <value>()</value> </param> <param> - <key>y_divs</key> - <value>10</value> + <key>pilot_symbols</key> + <value>()</value> </param> <param> - <key>ref_level</key> - <value>0</value> + <key>sync_word1</key> + <value>()</value> </param> <param> - <key>ref_scale</key> - <value>2.0</value> + <key>sync_word2</key> + <value>()</value> </param> <param> - <key>fft_size</key> - <value>1024</value> + <key>header_mod</key> + <value>"BPSK"</value> </param> <param> - <key>fft_rate</key> - <value>15</value> + <key>payload_mod</key> + <value>"QPSK"</value> </param> <param> - <key>peak_hold</key> + <key>scramble_bits</key> <value>False</value> </param> <param> - <key>average</key> + <key>log</key> <value>False</value> </param> <param> - <key>avg_alpha</key> - <value>0</value> + <key>affinity</key> + <value></value> </param> <param> - <key>win</key> - <value>None</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>win_size</key> - <value></value> + <key>_coordinate</key> + <value>(52, 374)</value> </param> <param> - <key>grid_pos</key> - <value></value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>blocks_uchar_to_float</key> <param> - <key>notebook</key> - <value></value> + <key>id</key> + <value>blocks_uchar_to_float_0</value> </param> <param> - <key>freqvar</key> - <value>None</value> + <key>_enabled</key> + <value>True</value> </param> <param> <key>affinity</key> <value></value> </param> <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(71, 441)</value> + <value>(326, 408)</value> </param> <param> <key>_rotation</key> @@ -549,167 +483,145 @@ </param> </block> <block> - <key>variable_slider</key> + <key>wxgui_scopesink2</key> <param> <key>id</key> - <value>freq_offset</value> + <value>wxgui_scopesink2_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Frequency Offset (Multiples of Sub-carrier spacing)</value> - </param> - <param> - <key>value</key> - <value>0</value> - </param> - <param> - <key>min</key> - <value>-3</value> + <key>type</key> + <value>float</value> </param> <param> - <key>max</key> - <value>3</value> + <key>title</key> + <value>Scope Plot</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>samp_rate</key> + <value>1.0</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>v_scale</key> + <value>0</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>v_offset</key> + <value>0</value> </param> <param> - <key>grid_pos</key> - <value></value> + <key>t_scale</key> + <value>0</value> </param> <param> - <key>notebook</key> - <value></value> + <key>ac_couple</key> + <value>False</value> </param> <param> - <key>_coordinate</key> - <value>(708, 321)</value> + <key>xy_mode</key> + <value>False</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>num_inputs</key> + <value>1</value> </param> - </block> - <block> - <key>blocks_tag_gate</key> <param> - <key>id</key> - <value>blocks_tag_gate_0</value> + <key>win_size</key> + <value></value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>grid_pos</key> + <value></value> </param> <param> - <key>type</key> - <value>complex</value> + <key>notebook</key> + <value></value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>trig_mode</key> + <value>wxgui.TRIG_MODE_AUTO</value> </param> <param> - <key>propagate_tags</key> - <value>False</value> + <key>y_axis_label</key> + <value>Counts</value> </param> <param> <key>affinity</key> <value></value> </param> <param> - <key>minoutbuf</key> - <value>0</value> - </param> - <param> <key>_coordinate</key> - <value>(523, 243)</value> + <value>(530, 382)</value> </param> <param> <key>_rotation</key> - <value>180</value> + <value>0</value> </param> </block> <block> - <key>blocks_throttle</key> + <key>digital_ofdm_tx</key> <param> <key>id</key> - <value>blocks_throttle_0</value> + <value>digital_ofdm_tx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> - </param> - <param> - <key>samples_per_second</key> - <value>100e3</value> + <key>fft_len</key> + <value>fft_len</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>cp_len</key> + <value>fft_len/4</value> </param> <param> - <key>affinity</key> - <value></value> + <key>packet_len_key</key> + <value>len_tag_key</value> </param> <param> - <key>minoutbuf</key> - <value>0</value> + <key>occupied_carriers</key> + <value>()</value> </param> <param> - <key>_coordinate</key> - <value>(267, 243)</value> + <key>pilot_carriers</key> + <value>()</value> </param> <param> - <key>_rotation</key> - <value>180</value> + <key>pilot_symbols</key> + <value>()</value> </param> - </block> - <block> - <key>blocks_vector_source_x</key> <param> - <key>id</key> - <value>blocks_vector_source_x_0</value> + <key>sync_word1</key> + <value>()</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>sync_word2</key> + <value>()</value> </param> <param> - <key>type</key> - <value>float</value> + <key>header_mod</key> + <value>"BPSK"</value> </param> <param> - <key>vector</key> - <value>tx_signal</value> + <key>payload_mod</key> + <value>"QPSK"</value> </param> <param> - <key>tags</key> - <value>tagged_streams.make_lengthtags((packet_len*gr.sizeof_float,), (0,), tagname=len_tag_key)</value> + <key>rolloff</key> + <value>0</value> </param> <param> - <key>repeat</key> - <value>True</value> + <key>scramble_bits</key> + <value>False</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>log</key> + <value>False</value> </param> <param> <key>affinity</key> @@ -721,7 +633,7 @@ </param> <param> <key>_coordinate</key> - <value>(3, 124)</value> + <value>(557, 94)</value> </param> <param> <key>_rotation</key> @@ -759,6 +671,10 @@ <value>0</value> </param> <param> + <key>block_tags</key> + <value>True</value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -768,82 +684,101 @@ </param> <param> <key>_coordinate</key> - <value>(764, 93)</value> + <value>(453, 244)</value> </param> <param> <key>_rotation</key> - <value>0</value> + <value>180</value> </param> </block> <block> - <key>digital_ofdm_rx</key> + <key>blocks_throttle</key> <param> <key>id</key> - <value>digital_ofdm_rx_0</value> + <value>blocks_throttle_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>fft_len</key> - <value>fft_len</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>cp_len</key> - <value>fft_len/4</value> + <key>samples_per_second</key> + <value>samp_rate</value> </param> <param> - <key>packet_len_key</key> - <value>"rx_len"</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>occupied_carriers</key> - <value>()</value> + <key>affinity</key> + <value></value> </param> <param> - <key>pilot_carriers</key> - <value>()</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>pilot_symbols</key> - <value>()</value> + <key>_coordinate</key> + <value>(177, 281)</value> </param> <param> - <key>sync_word1</key> - <value>()</value> + <key>_rotation</key> + <value>180</value> </param> + </block> + <block> + <key>variable_slider</key> <param> - <key>sync_word2</key> - <value>()</value> + <key>id</key> + <value>freq_offset</value> </param> <param> - <key>header_mod</key> - <value>"BPSK"</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>payload_mod</key> - <value>"QPSK"</value> + <key>label</key> + <value>Frequency Offset (Multiples of Sub-carrier spacing)</value> </param> <param> - <key>scramble_bits</key> - <value>False</value> + <key>value</key> + <value>0</value> </param> <param> - <key>log</key> - <value>False</value> + <key>min</key> + <value>-3</value> </param> <param> - <key>affinity</key> + <key>max</key> + <value>3</value> + </param> + <param> + <key>num_steps</key> + <value>100</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>minoutbuf</key> - <value>0</value> + <key>notebook</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(71, 315)</value> + <value>(466, 508)</value> </param> <param> <key>_rotation</key> @@ -851,78 +786,54 @@ </param> </block> <block> - <key>digital_ofdm_tx</key> + <key>variable_slider</key> <param> <key>id</key> - <value>digital_ofdm_tx_0</value> + <value>noise_voltage</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>fft_len</key> - <value>fft_len</value> - </param> - <param> - <key>cp_len</key> - <value>fft_len/4</value> - </param> - <param> - <key>packet_len_key</key> - <value>len_tag_key</value> - </param> - <param> - <key>occupied_carriers</key> - <value>()</value> - </param> - <param> - <key>pilot_carriers</key> - <value>()</value> - </param> - <param> - <key>pilot_symbols</key> - <value>()</value> - </param> - <param> - <key>sync_word1</key> - <value>()</value> + <key>label</key> + <value>Noise Amplitude</value> </param> <param> - <key>sync_word2</key> - <value>()</value> + <key>value</key> + <value>0.01</value> </param> <param> - <key>header_mod</key> - <value>"BPSK"</value> + <key>min</key> + <value>0</value> </param> <param> - <key>payload_mod</key> - <value>"QPSK"</value> + <key>max</key> + <value>1</value> </param> <param> - <key>rolloff</key> - <value>0</value> + <key>num_steps</key> + <value>100</value> </param> <param> - <key>scramble_bits</key> - <value>False</value> + <key>style</key> + <value>wx.SL_HORIZONTAL</value> </param> <param> - <key>log</key> - <value>False</value> + <key>converver</key> + <value>float_converter</value> </param> <param> - <key>affinity</key> + <key>grid_pos</key> <value></value> </param> <param> - <key>minoutbuf</key> - <value>0</value> + <key>notebook</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(488, 77)</value> + <value>(653, 505)</value> </param> <param> <key>_rotation</key> @@ -930,32 +841,32 @@ </param> </block> <connection> - <source_block_id>blocks_vector_source_x_0</source_block_id> - <sink_block_id>blocks_vector_to_stream_0</sink_block_id> + <source_block_id>digital_ofdm_tx_0</source_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>blocks_vector_to_stream_0</source_block_id> - <sink_block_id>digital_ofdm_tx_0</sink_block_id> + <source_block_id>blocks_throttle_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_ofdm_tx_0</source_block_id> - <sink_block_id>channels_channel_model_0</sink_block_id> + <source_block_id>blocks_throttle_0</source_block_id> + <sink_block_id>digital_ofdm_rx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>channels_channel_model_0</source_block_id> - <sink_block_id>blocks_tag_gate_0</sink_block_id> + <source_block_id>blocks_vector_source_x_0</source_block_id> + <sink_block_id>blocks_stream_to_tagged_stream_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_stream_to_vector_0</source_block_id> - <sink_block_id>wxgui_scopesink2_0</sink_block_id> + <source_block_id>blocks_stream_to_tagged_stream_0</source_block_id> + <sink_block_id>digital_ofdm_tx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> @@ -967,24 +878,18 @@ </connection> <connection> <source_block_id>digital_ofdm_rx_0</source_block_id> - <sink_block_id>blocks_stream_to_vector_0</sink_block_id> + <sink_block_id>blocks_uchar_to_float_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_throttle_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>blocks_throttle_0</source_block_id> - <sink_block_id>digital_ofdm_rx_0</sink_block_id> + <source_block_id>blocks_uchar_to_float_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>blocks_tag_gate_0</source_block_id> + <source_block_id>channels_channel_model_0</source_block_id> <sink_block_id>blocks_throttle_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> diff --git a/gr-digital/examples/ofdm/tx_ofdm.grc b/gr-digital/examples/ofdm/tx_ofdm.grc index c2995d919e..80d7f7f9e4 100644 --- a/gr-digital/examples/ofdm/tx_ofdm.grc +++ b/gr-digital/examples/ofdm/tx_ofdm.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sun Oct 27 16:23:43 2013</timestamp> + <timestamp>Sun Nov 3 18:45:28 2013</timestamp> <block> <key>options</key> <param> @@ -64,7 +64,7 @@ <key>variable</key> <param> <key>id</key> - <value>length_tag_key</value> + <value>sync_word1</value> </param> <param> <key>_enabled</key> @@ -72,11 +72,11 @@ </param> <param> <key>value</key> - <value>"packet_len"</value> + <value>[0., 0., 0., 0., 0., 0., 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., -1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., -1.41421356, 0., -1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 0., 0., 0., 0., 0.]</value> </param> <param> <key>_coordinate</key> - <value>(352, 0)</value> + <value>(352, 128)</value> </param> <param> <key>_rotation</key> @@ -87,7 +87,7 @@ <key>variable</key> <param> <key>id</key> - <value>samp_rate</value> + <value>sync_word2</value> </param> <param> <key>_enabled</key> @@ -95,11 +95,11 @@ </param> <param> <key>value</key> - <value>100000</value> + <value>[0, 0, 0, 0, 0, 0, -1, -1, -1, -1, 1, 1, -1, -1, -1, 1, -1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, 1, -1, -1, 1, -1, 0, 1, -1, 1, 1, 1, -1, 1, 1, 1, -1, 1, 1, 1, 1, -1, 1, -1, -1, -1, 1, -1, 1, -1, -1, -1, -1, 0, 0, 0, 0, 0] </value> </param> <param> <key>_coordinate</key> - <value>(255, 0)</value> + <value>(496, 128)</value> </param> <param> <key>_rotation</key> @@ -110,7 +110,7 @@ <key>variable</key> <param> <key>id</key> - <value>rolloff</value> + <value>pilot_symbols</value> </param> <param> <key>_enabled</key> @@ -118,11 +118,11 @@ </param> <param> <key>value</key> - <value>0</value> + <value>((1, 1, 1, -1,),)</value> </param> <param> <key>_coordinate</key> - <value>(898, -1)</value> + <value>(601, 64)</value> </param> <param> <key>_rotation</key> @@ -133,7 +133,7 @@ <key>variable</key> <param> <key>id</key> - <value>payload_mod</value> + <value>occupied_carriers</value> </param> <param> <key>_enabled</key> @@ -141,11 +141,11 @@ </param> <param> <key>value</key> - <value>digital.constellation_qpsk()</value> + <value>(range(-26, -21) + range(-20, -7) + range(-6, 0) + range(1, 7) + range(8, 21) + range(22, 27),)</value> </param> <param> <key>_coordinate</key> - <value>(734, 0)</value> + <value>(329, 64)</value> </param> <param> <key>_rotation</key> @@ -156,7 +156,7 @@ <key>variable</key> <param> <key>id</key> - <value>header_mod</value> + <value>pilot_carriers</value> </param> <param> <key>_enabled</key> @@ -164,11 +164,11 @@ </param> <param> <key>value</key> - <value>digital.constellation_bpsk()</value> + <value>((-21, -7, 7, 21,),)</value> </param> <param> <key>_coordinate</key> - <value>(567, 0)</value> + <value>(480, 64)</value> </param> <param> <key>_rotation</key> @@ -179,7 +179,7 @@ <key>variable</key> <param> <key>id</key> - <value>packet_len</value> + <value>header_formatter</value> </param> <param> <key>_enabled</key> @@ -187,11 +187,11 @@ </param> <param> <key>value</key> - <value>96</value> + <value>digital.packet_header_ofdm(occupied_carriers, 1, length_tag_key)</value> </param> <param> <key>_coordinate</key> - <value>(476, 0)</value> + <value>(708, 64)</value> </param> <param> <key>_rotation</key> @@ -225,7 +225,7 @@ <key>variable</key> <param> <key>id</key> - <value>header_formatter</value> + <value>packet_len</value> </param> <param> <key>_enabled</key> @@ -233,11 +233,11 @@ </param> <param> <key>value</key> - <value>digital.packet_header_ofdm(occupied_carriers, 1, length_tag_key)</value> + <value>96</value> </param> <param> <key>_coordinate</key> - <value>(708, 64)</value> + <value>(476, 0)</value> </param> <param> <key>_rotation</key> @@ -248,7 +248,7 @@ <key>variable</key> <param> <key>id</key> - <value>pilot_carriers</value> + <value>header_mod</value> </param> <param> <key>_enabled</key> @@ -256,11 +256,11 @@ </param> <param> <key>value</key> - <value>((-21, -7, 7, 21,),)</value> + <value>digital.constellation_bpsk()</value> </param> <param> <key>_coordinate</key> - <value>(480, 64)</value> + <value>(567, 0)</value> </param> <param> <key>_rotation</key> @@ -271,7 +271,7 @@ <key>variable</key> <param> <key>id</key> - <value>occupied_carriers</value> + <value>payload_mod</value> </param> <param> <key>_enabled</key> @@ -279,11 +279,11 @@ </param> <param> <key>value</key> - <value>(range(-26, -21) + range(-20, -7) + range(-6, 0) + range(1, 7) + range(8, 21) + range(22, 27),)</value> + <value>digital.constellation_qpsk()</value> </param> <param> <key>_coordinate</key> - <value>(329, 64)</value> + <value>(734, 0)</value> </param> <param> <key>_rotation</key> @@ -294,7 +294,7 @@ <key>variable</key> <param> <key>id</key> - <value>pilot_symbols</value> + <value>rolloff</value> </param> <param> <key>_enabled</key> @@ -302,11 +302,11 @@ </param> <param> <key>value</key> - <value>((1, 1, 1, -1,),)</value> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(601, 64)</value> + <value>(898, -1)</value> </param> <param> <key>_rotation</key> @@ -317,7 +317,7 @@ <key>variable</key> <param> <key>id</key> - <value>sync_word2</value> + <value>samp_rate</value> </param> <param> <key>_enabled</key> @@ -325,11 +325,11 @@ </param> <param> <key>value</key> - <value>[0, 0, 0, 0, 0, 0, -1, -1, -1, -1, 1, 1, -1, -1, -1, 1, -1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, 1, -1, -1, 1, -1, 0, 1, -1, 1, 1, 1, -1, 1, 1, 1, -1, 1, 1, 1, 1, -1, 1, -1, -1, -1, 1, -1, 1, -1, -1, -1, -1, 0, 0, 0, 0, 0] </value> + <value>100000</value> </param> <param> <key>_coordinate</key> - <value>(496, 128)</value> + <value>(255, 0)</value> </param> <param> <key>_rotation</key> @@ -340,7 +340,7 @@ <key>variable</key> <param> <key>id</key> - <value>sync_word1</value> + <value>length_tag_key</value> </param> <param> <key>_enabled</key> @@ -348,11 +348,11 @@ </param> <param> <key>value</key> - <value>[0., 0., 0., 0., 0., 0., 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., -1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., -1.41421356, 0., -1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 0., 0., 0., 0., 0.]</value> + <value>"packet_len"</value> </param> <param> <key>_coordinate</key> - <value>(352, 128)</value> + <value>(352, 0)</value> </param> <param> <key>_rotation</key> @@ -801,6 +801,10 @@ <value>1</value> </param> <param> + <key>tag_preserve_head_pos</key> + <value>0</value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1086,111 +1090,6 @@ </param> </block> <block> - <key>blocks_tag_debug</key> - <param> - <key>id</key> - <value>blocks_tag_debug_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>type</key> - <value>byte</value> - </param> - <param> - <key>name</key> - <value>Rx'd Packets</value> - </param> - <param> - <key>num_inputs</key> - <value>1</value> - </param> - <param> - <key>vlen</key> - <value>1</value> - </param> - <param> - <key>display</key> - <value>True</value> - </param> - <param> - <key>affinity</key> - <value></value> - </param> - <param> - <key>_coordinate</key> - <value>(437, 872)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>blocks_throttle</key> - <param> - <key>id</key> - <value>blocks_throttle_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <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>affinity</key> - <value></value> - </param> - <param> - <key>minoutbuf</key> - <value>0</value> - </param> - <param> - <key>_coordinate</key> - <value>(558, 747)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>virtual_source</key> - <param> - <key>id</key> - <value>virtual_source_1</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>stream_id</key> - <value>Tx Signal</value> - </param> - <param> - <key>_coordinate</key> - <value>(5, 879)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> <key>digital_crc32_bb</key> <param> <key>id</key> @@ -1277,74 +1176,22 @@ </param> </block> <block> - <key>digital_ofdm_rx</key> + <key>virtual_source</key> <param> <key>id</key> - <value>digital_ofdm_rx_0</value> + <value>virtual_source_1</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>fft_len</key> - <value>fft_len</value> - </param> - <param> - <key>cp_len</key> - <value>fft_len/4</value> - </param> - <param> - <key>packet_len_key</key> - <value>"length"</value> - </param> - <param> - <key>occupied_carriers</key> - <value>occupied_carriers</value> - </param> - <param> - <key>pilot_carriers</key> - <value>pilot_carriers</value> - </param> - <param> - <key>pilot_symbols</key> - <value>pilot_symbols</value> - </param> - <param> - <key>sync_word1</key> - <value>sync_word1</value> - </param> - <param> - <key>sync_word2</key> - <value>sync_word2</value> - </param> - <param> - <key>header_mod</key> - <value>"BPSK"</value> - </param> - <param> - <key>payload_mod</key> - <value>"QPSK"</value> - </param> - <param> - <key>scramble_bits</key> - <value>False</value> - </param> - <param> - <key>log</key> - <value>False</value> - </param> - <param> - <key>affinity</key> - <value></value> - </param> - <param> - <key>minoutbuf</key> - <value>0</value> + <key>stream_id</key> + <value>Tx Signal</value> </param> <param> <key>_coordinate</key> - <value>(193, 802)</value> + <value>(0, 894)</value> </param> <param> <key>_rotation</key> @@ -1367,7 +1214,7 @@ </param> <param> <key>_coordinate</key> - <value>(771, 698)</value> + <value>(990, 646)</value> </param> <param> <key>_rotation</key> @@ -1446,7 +1293,7 @@ </param> <param> <key>_coordinate</key> - <value>(773, 768)</value> + <value>(992, 716)</value> </param> <param> <key>_rotation</key> @@ -1541,7 +1388,215 @@ </param> <param> <key>_coordinate</key> - <value>(775, 862)</value> + <value>(994, 810)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>digital_ofdm_rx</key> + <param> + <key>id</key> + <value>digital_ofdm_rx_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>fft_len</key> + <value>fft_len</value> + </param> + <param> + <key>cp_len</key> + <value>fft_len/4</value> + </param> + <param> + <key>packet_len_key</key> + <value>"length"</value> + </param> + <param> + <key>occupied_carriers</key> + <value>occupied_carriers</value> + </param> + <param> + <key>pilot_carriers</key> + <value>pilot_carriers</value> + </param> + <param> + <key>pilot_symbols</key> + <value>pilot_symbols</value> + </param> + <param> + <key>sync_word1</key> + <value>sync_word1</value> + </param> + <param> + <key>sync_word2</key> + <value>sync_word2</value> + </param> + <param> + <key>header_mod</key> + <value>"BPSK"</value> + </param> + <param> + <key>payload_mod</key> + <value>"QPSK"</value> + </param> + <param> + <key>scramble_bits</key> + <value>False</value> + </param> + <param> + <key>log</key> + <value>False</value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(439, 823)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>channels_channel_model</key> + <param> + <key>id</key> + <value>channels_channel_model_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>noise_voltage</key> + <value>0.0</value> + </param> + <param> + <key>freq_offset</key> + <value>0.0</value> + </param> + <param> + <key>epsilon</key> + <value>1.0</value> + </param> + <param> + <key>taps</key> + <value>1.0 + 1.0j</value> + </param> + <param> + <key>seed</key> + <value>0</value> + </param> + <param> + <key>block_tags</key> + <value>True</value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(193, 858)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>blocks_tag_debug</key> + <param> + <key>id</key> + <value>blocks_tag_debug_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>byte</value> + </param> + <param> + <key>name</key> + <value>Rx'd Packets</value> + </param> + <param> + <key>num_inputs</key> + <value>1</value> + </param> + <param> + <key>vlen</key> + <value>1</value> + </param> + <param> + <key>display</key> + <value>True</value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(689, 889)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>blocks_throttle</key> + <param> + <key>id</key> + <value>blocks_throttle_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <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>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(559, 747)</value> </param> <param> <key>_rotation</key> @@ -1669,20 +1724,26 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>digital_ofdm_rx_0</source_block_id> - <sink_block_id>blocks_tag_debug_0</sink_block_id> + <source_block_id>blocks_throttle_0</source_block_id> + <sink_block_id>virtual_sink_1</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> <source_block_id>virtual_source_1</source_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>channels_channel_model_0</source_block_id> <sink_block_id>digital_ofdm_rx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_throttle_0</source_block_id> - <sink_block_id>virtual_sink_1</sink_block_id> + <source_block_id>digital_ofdm_rx_0</source_block_id> + <sink_block_id>blocks_tag_debug_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> |