diff options
author | Jan <kraemer.jn@googlemail.com> | 2014-07-17 14:57:06 +0200 |
---|---|---|
committer | Tom Rondeau <tom@trondeau.com> | 2014-07-28 11:51:12 -0400 |
commit | 475b9e08be4506b1c9987d4fb96030580e20456f (patch) | |
tree | d351fdd5f63cf6d0c64dfc620277cb61d3563291 /gr-trellis/examples/grc | |
parent | 7f847769126c3141aa1db0b24bb82f80b8524e87 (diff) |
trellis: updated examples.
+ Fixed paths to match GNURADIO-3.7.x conventions
+ Fixed errors with dimensionality
+ Changed to QT-widgets
Diffstat (limited to 'gr-trellis/examples/grc')
-rw-r--r-- | gr-trellis/examples/grc/pccc.grc | 556 | ||||
-rw-r--r-- | gr-trellis/examples/grc/pccc1.grc | 666 | ||||
-rw-r--r-- | gr-trellis/examples/grc/sccc.grc | 600 | ||||
-rw-r--r-- | gr-trellis/examples/grc/sccc1.grc | 694 |
4 files changed, 1361 insertions, 1155 deletions
diff --git a/gr-trellis/examples/grc/pccc.grc b/gr-trellis/examples/grc/pccc.grc index f95d8ae28b..0f8d76dd2e 100644 --- a/gr-trellis/examples/grc/pccc.grc +++ b/gr-trellis/examples/grc/pccc.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sat Jul 12 17:37:36 2014</timestamp> + <timestamp>Thu Jul 17 14:55:30 2014</timestamp> <block> <key>options</key> <param> @@ -13,7 +13,7 @@ </param> <param> <key>title</key> - <value>Serially Concatenated Convolutional Code</value> + <value>Parallel Concatenated Convolutional Code</value> </param> <param> <key>author</key> @@ -29,7 +29,7 @@ </param> <param> <key>generate_options</key> - <value>wx_gui</value> + <value>qt_gui</value> </param> <param> <key>category</key> @@ -68,7 +68,7 @@ <key>variable</key> <param> <key>id</key> - <value>prefix</value> + <value>GNURADIO_SRC_DIR</value> </param> <param> <key>_enabled</key> @@ -76,15 +76,11 @@ </param> <param> <key>value</key> - <value>"/home/mbant/src/gnuradio/"</value> - </param> - <param> - <key>alias</key> - <value></value> + <value>"/home/jank/src/gnuradio/"</value> </param> <param> <key>_coordinate</key> - <value>(590, 15)</value> + <value>(656, 10)</value> </param> <param> <key>_rotation</key> @@ -103,15 +99,11 @@ </param> <param> <key>value</key> - <value>100e3</value> - </param> - <param> - <key>alias</key> - <value></value> + <value>GNURADIO_SRC_DIR</value> </param> <param> <key>_coordinate</key> - <value>(482, 17)</value> + <value>(434, 10)</value> </param> <param> <key>_rotation</key> @@ -122,7 +114,7 @@ <key>variable</key> <param> <key>id</key> - <value>block</value> + <value>noisevar</value> </param> <param> <key>_enabled</key> @@ -130,7 +122,7 @@ </param> <param> <key>value</key> - <value>1000</value> + <value>10**(-snr_db/10)</value> </param> <param> <key>alias</key> @@ -138,7 +130,7 @@ </param> <param> <key>_coordinate</key> - <value>(764, 16)</value> + <value>(279, 10)</value> </param> <param> <key>_rotation</key> @@ -149,7 +141,7 @@ <key>variable</key> <param> <key>id</key> - <value>noisevar</value> + <value>R</value> </param> <param> <key>_enabled</key> @@ -157,15 +149,11 @@ </param> <param> <key>value</key> - <value>10**(-snr_db/10)</value> - </param> - <param> - <key>alias</key> - <value></value> + <value>100e3</value> </param> <param> <key>_coordinate</key> - <value>(389, 15)</value> + <value>(358, 10)</value> </param> <param> <key>_rotation</key> @@ -173,50 +161,18 @@ </param> </block> <block> - <key>variable_slider</key> + <key>variable</key> <param> <key>id</key> - <value>snr_db</value> + <value>block</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>SNR (dB)</value> - </param> - <param> <key>value</key> - <value>5</value> - </param> - <param> - <key>min</key> - <value>-10</value> - </param> - <param> - <key>max</key> - <value>10</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>notebook</key> - <value></value> + <value>1000</value> </param> <param> <key>alias</key> @@ -224,7 +180,7 @@ </param> <param> <key>_coordinate</key> - <value>(229, 13)</value> + <value>(593, 10)</value> </param> <param> <key>_rotation</key> @@ -232,10 +188,10 @@ </param> </block> <block> - <key>blocks_multiply_xx</key> + <key>analog_random_source_x</key> <param> <key>id</key> - <value>blocks_multiply_xx_2_0</value> + <value>analog_random_source_x_0</value> </param> <param> <key>_enabled</key> @@ -246,16 +202,20 @@ <value>short</value> </param> <param> - <key>num_inputs</key> + <key>min</key> + <value>0</value> + </param> + <param> + <key>max</key> <value>2</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>num_samps</key> + <value>1000</value> </param> <param> - <key>alias</key> - <value></value> + <key>repeat</key> + <value>True</value> </param> <param> <key>affinity</key> @@ -271,7 +231,7 @@ </param> <param> <key>_coordinate</key> - <value>(392, 591)</value> + <value>(21, 170)</value> </param> <param> <key>_rotation</key> @@ -279,26 +239,30 @@ </param> </block> <block> - <key>blocks_short_to_float</key> + <key>blocks_throttle</key> <param> <key>id</key> - <value>blocks_short_to_float_1_0</value> + <value>blocks_throttle_0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>affinity</key> + <value></value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>type</key> + <value>short</value> </param> <param> - <key>scale</key> + <key>samples_per_second</key> + <value>R</value> + </param> + <param> + <key>vlen</key> <value>1</value> </param> <param> - <key>alias</key> - <value></value> + <key>ignoretag</key> + <value>True</value> </param> <param> <key>affinity</key> @@ -314,7 +278,7 @@ </param> <param> <key>_coordinate</key> - <value>(535, 609)</value> + <value>(559, 104)</value> </param> <param> <key>_rotation</key> @@ -322,82 +286,46 @@ </param> </block> <block> - <key>wxgui_scopesink2</key> + <key>analog_noise_source_x</key> <param> <key>id</key> - <value>wxgui_scopesink2_0</value> + <value>analog_noise_source_x_0</value> </param> <param> <key>_enabled</key> - <value>False</value> - </param> - <param> - <key>type</key> - <value>float</value> - </param> - <param> - <key>title</key> - <value>Scope Plot</value> - </param> - <param> - <key>samp_rate</key> - <value>R</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> + <value>True</value> </param> <param> - <key>num_inputs</key> + <key>vlen</key> <value>1</value> </param> <param> - <key>win_size</key> - <value></value> - </param> - <param> - <key>grid_pos</key> - <value></value> + <key>noise_type</key> + <value>analog.GR_GAUSSIAN</value> </param> <param> - <key>notebook</key> - <value></value> + <key>amp</key> + <value>noisevar</value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>seed</key> + <value>-42</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>affinity</key> + <value></value> </param> <param> - <key>alias</key> - <value></value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>affinity</key> - <value></value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(952, 73)</value> + <value>(559, 260)</value> </param> <param> <key>_rotation</key> @@ -405,10 +333,10 @@ </param> </block> <block> - <key>analog_random_source_x</key> + <key>blocks_add_xx</key> <param> <key>id</key> - <value>analog_random_source_x_0</value> + <value>blocks_add_xx_1</value> </param> <param> <key>_enabled</key> @@ -416,27 +344,15 @@ </param> <param> <key>type</key> - <value>short</value> - </param> - <param> - <key>min</key> - <value>0</value> + <value>float</value> </param> <param> - <key>max</key> + <key>num_inputs</key> <value>2</value> </param> <param> - <key>num_samps</key> - <value>1000</value> - </param> - <param> - <key>repeat</key> - <value>True</value> - </param> - <param> - <key>alias</key> - <value></value> + <key>vlen</key> + <value>1</value> </param> <param> <key>affinity</key> @@ -452,7 +368,7 @@ </param> <param> <key>_coordinate</key> - <value>(21, 170)</value> + <value>(816, 192)</value> </param> <param> <key>_rotation</key> @@ -482,10 +398,6 @@ <value>2</value> </param> <param> - <key>alias</key> - <value></value> - </param> - <param> <key>affinity</key> <value></value> </param> @@ -499,7 +411,7 @@ </param> <param> <key>_coordinate</key> - <value>(217, 597)</value> + <value>(234, 536)</value> </param> <param> <key>_rotation</key> @@ -507,10 +419,10 @@ </param> </block> <block> - <key>analog_noise_source_x</key> + <key>blocks_multiply_xx</key> <param> <key>id</key> - <value>analog_noise_source_x_0</value> + <value>blocks_multiply_xx_2_0</value> </param> <param> <key>_enabled</key> @@ -518,23 +430,15 @@ </param> <param> <key>type</key> - <value>float</value> - </param> - <param> - <key>noise_type</key> - <value>analog.GR_GAUSSIAN</value> - </param> - <param> - <key>amp</key> - <value>noisevar</value> + <value>short</value> </param> <param> - <key>seed</key> - <value>-42</value> + <key>num_inputs</key> + <value>2</value> </param> <param> - <key>alias</key> - <value></value> + <key>vlen</key> + <value>1</value> </param> <param> <key>affinity</key> @@ -549,8 +453,16 @@ <value>0</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(584, 259)</value> + <value>(409, 530)</value> </param> <param> <key>_rotation</key> @@ -558,30 +470,34 @@ </param> </block> <block> - <key>blocks_throttle</key> + <key>blocks_short_to_float</key> <param> <key>id</key> - <value>blocks_throttle_0</value> + <value>blocks_short_to_float_1_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>short</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>samples_per_second</key> - <value>R</value> + <key>scale</key> + <value>1</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>affinity</key> + <value></value> </param> <param> - <key>ignoretag</key> - <value>True</value> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>alias</key> @@ -601,7 +517,7 @@ </param> <param> <key>_coordinate</key> - <value>(517, 103)</value> + <value>(552, 548)</value> </param> <param> <key>_rotation</key> @@ -609,40 +525,44 @@ </param> </block> <block> - <key>digital_chunks_to_symbols_xx</key> + <key>blocks_sub_xx</key> <param> <key>id</key> - <value>digital_chunks_to_symbols_xx_0</value> + <value>blocks_sub_xx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>in_type</key> + <key>type</key> <value>short</value> </param> <param> - <key>out_type</key> - <value>float</value> - </param> - <param> - <key>symbol_table</key> - <value>-7,0,-5,0,-3,0,-1,0,1,0,3,0,5,0,7,0,-7,0,-5,0,-3,0,-1,0,1,0,3,0,5,0,7</value> + <key>o_fsm_args</key> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_4.fsm"</value> </param> <param> - <key>dimension</key> + <key>num_inputs</key> <value>2</value> </param> <param> - <key>num_ports</key> - <value>1</value> + <key>i_fsm_args</key> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_4.fsm"</value> </param> <param> - <key>alias</key> + <key>affinity</key> <value></value> </param> <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -656,7 +576,7 @@ </param> <param> <key>_coordinate</key> - <value>(559, 180)</value> + <value>(234, 154)</value> </param> <param> <key>_rotation</key> @@ -664,10 +584,10 @@ </param> </block> <block> - <key>blocks_add_xx</key> + <key>qtgui_number_sink</key> <param> <key>id</key> - <value>blocks_add_xx_1</value> + <value>qtgui_number_sink_0</value> </param> <param> <key>_enabled</key> @@ -678,95 +598,127 @@ <value>float</value> </param> <param> - <key>num_inputs</key> - <value>2</value> + <key>autoscale</key> + <value>True</value> </param> <param> - <key>vlen</key> + <key>avg</key> + <value>0.001</value> + </param> + <param> + <key>graph_type</key> + <value>qtgui.NUM_GRAPH_HORIZ</value> + </param> + <param> + <key>nconnections</key> <value>1</value> </param> <param> - <key>alias</key> - <value></value> + <key>min</key> + <value>0</value> + </param> + </block> + <block> + <key>digital_chunks_to_symbols_xx</key> + <param> + <key>max</key> + <value>1</value> </param> <param> - <key>affinity</key> + <key>update_time</key> + <value>0.1</value> + </param> + <param> + <key>gui_hint</key> + <value>1,0,1,1</value> + </param> + <param> + <key>label1</key> + <value>BER</value> + </param> + <param> + <key>color1</key> + <value>("black", "black")</value> + </param> + <param> + <key>label2</key> <value></value> </param> <param> - <key>minoutbuf</key> - <value>0</value> + <key>color2</key> + <value>("black", "black")</value> </param> <param> - <key>maxoutbuf</key> - <value>0</value> + <key>label3</key> + <value></value> </param> <param> - <key>_coordinate</key> - <value>(951, 256)</value> + <key>color3</key> + <value>("black", "black")</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>label4</key> + <value></value> </param> - </block> - <block> - <key>trellis_pccc_encoder_xx</key> <param> - <key>id</key> - <value>trellis_pccc_encoder_xx_0</value> + <key>color4</key> + <value>("black", "black")</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>label5</key> + <value></value> </param> <param> - <key>type</key> - <value>ss</value> + <key>color5</key> + <value>("black", "black")</value> </param> <param> - <key>o_fsm_args</key> - <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_4.fsm"</value> + <key>label6</key> + <value></value> </param> <param> - <key>o_init_state</key> - <value>0</value> + <key>color6</key> + <value>("black", "black")</value> </param> <param> - <key>i_fsm_args</key> - <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_4.fsm"</value> + <key>label7</key> + <value></value> </param> <param> - <key>i_init_state</key> - <value>0</value> + <key>color7</key> + <value>("black", "black")</value> </param> <param> - <key>interleaver_args</key> - <value>trellis.interleaver(block,666)</value> + <key>label8</key> + <value></value> </param> <param> - <key>bl</key> - <value>block</value> + <key>color8</key> + <value>("black", "black")</value> </param> <param> - <key>alias</key> + <key>label9</key> <value></value> </param> <param> - <key>affinity</key> + <key>color9</key> + <value>("black", "black")</value> + </param> + <param> + <key>label10</key> <value></value> </param> <param> - <key>minoutbuf</key> - <value>0</value> + <key>color10</key> + <value>("black", "black")</value> </param> <param> - <key>maxoutbuf</key> - <value>0</value> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(236, 147)</value> + <value>(795, 532)</value> </param> <param> <key>_rotation</key> @@ -774,50 +726,58 @@ </param> </block> <block> - <key>wxgui_numbersink2</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>wxgui_numbersink2_3_0</value> + <value>snr_db</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>float</value> + <key>label</key> + <value>SNR (dB)</value> </param> <param> - <key>title</key> - <value>BER</value> + <key>value</key> + <value>5</value> </param> <param> - <key>units</key> - <value>BER</value> + <key>start</key> + <value>-10</value> </param> <param> - <key>samp_rate</key> - <value>R</value> + <key>stop</key> + <value>10</value> </param> <param> - <key>min_value</key> - <value>0</value> + <key>step</key> + <value>0.01</value> </param> <param> - <key>max_value</key> - <value>1.0</value> + <key>widget</key> + <value>counter_slider</value> </param> <param> - <key>factor</key> - <value>1.0</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>decimal_places</key> - <value>6</value> + <key>min_len</key> + <value>200</value> </param> <param> - <key>ref_level</key> - <value>0</value> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(177, 10)</value> + </param> + <param> + <key>_rotation</key> + <value>180</value> </param> <param> <key>number_rate</key> @@ -840,8 +800,8 @@ <value>True</value> </param> <param> - <key>win_size</key> - <value></value> + <key>symbol_table</key> + <value>-7,0, -5,0, -3,0, -1,0, 1,0, 3,0, 5,0, 7,0, 0,-7,0, -5,0, -3,0, -1,0, 1,0, 3,0, 5,0, 7,0</value> </param> <param> <key>grid_pos</key> @@ -860,6 +820,18 @@ <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>(719, 462)</value> </param> @@ -928,7 +900,7 @@ </param> <param> <key>table</key> - <value>-7,0, -5,0, -3,0, -1,0, 1,0, 3,0, 5,0, 7,0, 0,-7,0, -5,0, -3,0, -1,0, 1,0, 3,0, 5,0, 7</value> + <value>-7,0, -5,0, -3,0, -1,0, 1,0, 3,0, 5,0, 7,0, 0,-7,0, -5,0, -3,0, -1,0, 1,0, 3,0, 5,0, 7,0</value> </param> <param> <key>metric_type</key> @@ -943,10 +915,6 @@ <value>1.0</value> </param> <param> - <key>alias</key> - <value></value> - </param> - <param> <key>affinity</key> <value></value> </param> @@ -960,7 +928,7 @@ </param> <param> <key>_coordinate</key> - <value>(309, 307)</value> + <value>(235, 279)</value> </param> <param> <key>_rotation</key> @@ -969,55 +937,49 @@ </block> <connection> <source_block_id>analog_random_source_x_0</source_block_id> - <sink_block_id>blocks_sub_xx_0</sink_block_id> + <sink_block_id>trellis_pccc_encoder_xx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> <source_block_id>blocks_add_xx_1</source_block_id> - <sink_block_id>wxgui_scopesink2_0</sink_block_id> + <sink_block_id>trellis_pccc_decoder_combined_xx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_multiply_xx_2_0</source_block_id> - <sink_block_id>blocks_short_to_float_1_0</sink_block_id> + <source_block_id>analog_noise_source_x_0</source_block_id> + <sink_block_id>blocks_add_xx_1</sink_block_id> <source_key>0</source_key> - <sink_key>0</sink_key> + <sink_key>1</sink_key> </connection> <connection> - <source_block_id>blocks_short_to_float_1_0</source_block_id> - <sink_block_id>wxgui_numbersink2_3_0</sink_block_id> + <source_block_id>digital_chunks_to_symbols_xx_0</source_block_id> + <sink_block_id>blocks_add_xx_1</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_sub_xx_0</source_block_id> - <sink_block_id>blocks_multiply_xx_2_0</sink_block_id> + <source_block_id>blocks_throttle_0</source_block_id> + <sink_block_id>digital_chunks_to_symbols_xx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_sub_xx_0</source_block_id> - <sink_block_id>blocks_multiply_xx_2_0</sink_block_id> - <source_key>0</source_key> - <sink_key>1</sink_key> - </connection> - <connection> - <source_block_id>analog_random_source_x_0</source_block_id> - <sink_block_id>trellis_pccc_encoder_xx_0</sink_block_id> + <source_block_id>trellis_pccc_encoder_xx_0</source_block_id> + <sink_block_id>blocks_throttle_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>trellis_pccc_encoder_xx_0</source_block_id> - <sink_block_id>blocks_throttle_0</sink_block_id> + <source_block_id>analog_random_source_x_0</source_block_id> + <sink_block_id>blocks_sub_xx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_add_xx_1</source_block_id> - <sink_block_id>trellis_pccc_decoder_combined_xx_0</sink_block_id> + <source_block_id>blocks_short_to_float_1_0</source_block_id> + <sink_block_id>qtgui_number_sink_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> @@ -1028,20 +990,20 @@ <sink_key>1</sink_key> </connection> <connection> - <source_block_id>analog_noise_source_x_0</source_block_id> - <sink_block_id>blocks_add_xx_1</sink_block_id> + <source_block_id>blocks_sub_xx_0</source_block_id> + <sink_block_id>blocks_multiply_xx_2_0</sink_block_id> <source_key>0</source_key> <sink_key>1</sink_key> </connection> <connection> - <source_block_id>blocks_throttle_0</source_block_id> - <sink_block_id>digital_chunks_to_symbols_xx_0</sink_block_id> + <source_block_id>blocks_sub_xx_0</source_block_id> + <sink_block_id>blocks_multiply_xx_2_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>digital_chunks_to_symbols_xx_0</source_block_id> - <sink_block_id>blocks_add_xx_1</sink_block_id> + <source_block_id>blocks_multiply_xx_2_0</source_block_id> + <sink_block_id>blocks_short_to_float_1_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> diff --git a/gr-trellis/examples/grc/pccc1.grc b/gr-trellis/examples/grc/pccc1.grc index c6c6773904..8aaa28a1be 100644 --- a/gr-trellis/examples/grc/pccc1.grc +++ b/gr-trellis/examples/grc/pccc1.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sat Nov 10 15:36:08 2012</timestamp> + <timestamp>Thu Jul 17 14:55:59 2014</timestamp> <block> <key>options</key> <param> @@ -13,7 +13,7 @@ </param> <param> <key>title</key> - <value>Serially Concatenated Convolutional Code</value> + <value>Parallel Concatenated Convolutional Code</value> </param> <param> <key>author</key> @@ -29,7 +29,7 @@ </param> <param> <key>generate_options</key> - <value>wx_gui</value> + <value>qt_gui</value> </param> <param> <key>category</key> @@ -64,6 +64,29 @@ <key>variable</key> <param> <key>id</key> + <value>block</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>value</key> + <value>1000</value> + </param> + <param> + <key>_coordinate</key> + <value>(593, 10)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable</key> + <param> + <key>id</key> <value>noisevar</value> </param> <param> @@ -76,7 +99,7 @@ </param> <param> <key>_coordinate</key> - <value>(389, 15)</value> + <value>(279, 10)</value> </param> <param> <key>_rotation</key> @@ -95,11 +118,11 @@ </param> <param> <key>value</key> - <value>"/n/harrisville/x/anastas/gnuradio_trunk/"</value> + <value>GNURADIO_SRC_DIR</value> </param> <param> <key>_coordinate</key> - <value>(590, 15)</value> + <value>(434, 10)</value> </param> <param> <key>_rotation</key> @@ -110,7 +133,7 @@ <key>variable</key> <param> <key>id</key> - <value>block</value> + <value>GNURADIO_SRC_DIR</value> </param> <param> <key>_enabled</key> @@ -118,11 +141,11 @@ </param> <param> <key>value</key> - <value>1000</value> + <value>"/home/jank/src/gnuradio/"</value> </param> <param> <key>_coordinate</key> - <value>(764, 16)</value> + <value>(656, 10)</value> </param> <param> <key>_rotation</key> @@ -130,54 +153,73 @@ </param> </block> <block> - <key>variable_slider</key> + <key>variable</key> <param> <key>id</key> - <value>snr_db</value> + <value>R</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>SNR (dB)</value> + <key>value</key> + <value>100e3</value> </param> <param> - <key>value</key> - <value>5</value> + <key>_coordinate</key> + <value>(358, 10)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>analog_random_source_x</key> + <param> + <key>id</key> + <value>analog_random_source_x_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>short</value> </param> <param> <key>min</key> - <value>-10</value> + <value>0</value> </param> <param> <key>max</key> - <value>10</value> + <value>2</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>num_samps</key> + <value>1000</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>repeat</key> + <value>True</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>affinity</key> + <value></value> </param> <param> - <key>grid_pos</key> - <value></value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>notebook</key> - <value></value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(229, 13)</value> + <value>(21, 170)</value> </param> <param> <key>_rotation</key> @@ -185,10 +227,10 @@ </param> </block> <block> - <key>blocks_multiply_xx</key> + <key>analog_noise_source_x</key> <param> <key>id</key> - <value>blocks_multiply_xx_2_0</value> + <value>analog_noise_source_x_0</value> </param> <param> <key>_enabled</key> @@ -196,19 +238,35 @@ </param> <param> <key>type</key> - <value>short</value> + <value>float</value> </param> <param> - <key>num_inputs</key> - <value>2</value> + <key>noise_type</key> + <value>analog.GR_GAUSSIAN</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>amp</key> + <value>noisevar</value> + </param> + <param> + <key>seed</key> + <value>-42</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>(392, 591)</value> + <value>(551, 244)</value> </param> <param> <key>_rotation</key> @@ -216,26 +274,46 @@ </param> </block> <block> - <key>blocks_short_to_float</key> + <key>blocks_throttle</key> <param> <key>id</key> - <value>blocks_short_to_float_1_0</value> + <value>blocks_throttle_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> + <key>type</key> + <value>short</value> + </param> + <param> + <key>samples_per_second</key> + <value>R</value> + </param> + <param> <key>vlen</key> <value>1</value> </param> <param> - <key>scale</key> - <value>1</value> + <key>ignoretag</key> + <value>True</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>(535, 609)</value> + <value>(553, 103)</value> </param> <param> <key>_rotation</key> @@ -243,10 +321,10 @@ </param> </block> <block> - <key>wxgui_numbersink2</key> + <key>qtgui_number_sink</key> <param> <key>id</key> - <value>wxgui_numbersink2_3_0</value> + <value>qtgui_number_sink_0</value> </param> <param> <key>_enabled</key> @@ -257,147 +335,163 @@ <value>float</value> </param> <param> - <key>title</key> - <value>BER</value> + <key>autoscale</key> + <value>False</value> </param> <param> - <key>units</key> - <value>BER</value> + <key>avg</key> + <value>0.001</value> </param> <param> - <key>samp_rate</key> - <value>R</value> + <key>graph_type</key> + <value>qtgui.NUM_GRAPH_HORIZ</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> </param> <param> - <key>min_value</key> + <key>min</key> <value>0</value> </param> <param> - <key>max_value</key> - <value>1.0</value> + <key>max</key> + <value>1</value> </param> <param> - <key>factor</key> - <value>1.0</value> + <key>update_time</key> + <value>0.10</value> </param> <param> - <key>decimal_places</key> - <value>6</value> + <key>gui_hint</key> + <value>1,0,1,1</value> </param> <param> - <key>ref_level</key> - <value>0</value> + <key>label1</key> + <value></value> </param> <param> - <key>number_rate</key> - <value>15</value> + <key>color1</key> + <value>("black", "black")</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>label2</key> + <value></value> </param> <param> - <key>average</key> - <value>True</value> + <key>color2</key> + <value>("black", "black")</value> </param> <param> - <key>avg_alpha</key> - <value>0.001</value> + <key>label3</key> + <value></value> </param> <param> - <key>show_gauge</key> - <value>True</value> + <key>color3</key> + <value>("black", "black")</value> </param> <param> - <key>win_size</key> + <key>label4</key> <value></value> </param> <param> - <key>grid_pos</key> - <value>1,0,1,1</value> + <key>color4</key> + <value>("black", "black")</value> </param> <param> - <key>notebook</key> + <key>label5</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(713, 426)</value> + <key>color5</key> + <value>("black", "black")</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>label6</key> + <value></value> </param> - </block> - <block> - <key>wxgui_scopesink2</key> <param> - <key>id</key> - <value>wxgui_scopesink2_0</value> + <key>color6</key> + <value>("black", "black")</value> </param> <param> - <key>_enabled</key> - <value>False</value> + <key>label7</key> + <value></value> </param> <param> - <key>type</key> - <value>float</value> + <key>color7</key> + <value>("black", "black")</value> </param> <param> - <key>title</key> - <value>Scope Plot</value> + <key>label8</key> + <value></value> </param> <param> - <key>samp_rate</key> - <value>R</value> + <key>color8</key> + <value>("black", "black")</value> </param> <param> - <key>v_scale</key> - <value>0</value> + <key>label9</key> + <value></value> </param> <param> - <key>v_offset</key> - <value>0</value> + <key>color9</key> + <value>("black", "black")</value> </param> <param> - <key>t_scale</key> - <value>0</value> + <key>label10</key> + <value></value> </param> <param> - <key>ac_couple</key> - <value>False</value> + <key>color10</key> + <value>("black", "black")</value> </param> <param> - <key>xy_mode</key> - <value>False</value> + <key>affinity</key> + <value></value> </param> <param> - <key>num_inputs</key> - <value>1</value> + <key>_coordinate</key> + <value>(632, 509)</value> </param> <param> - <key>win_size</key> - <value></value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>blocks_short_to_float</key> <param> - <key>grid_pos</key> - <value></value> + <key>id</key> + <value>blocks_short_to_float_1_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>vlen</key> + <value>1</value> + </param> + <param> + <key>scale</key> + <value>1</value> </param> <param> - <key>notebook</key> + <key>affinity</key> <value></value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(952, 73)</value> + <value>(375, 525)</value> </param> <param> <key>_rotation</key> @@ -405,10 +499,10 @@ </param> </block> <block> - <key>analog_random_source_x</key> + <key>blocks_multiply_xx</key> <param> <key>id</key> - <value>analog_random_source_x_0</value> + <value>blocks_multiply_xx_2_0</value> </param> <param> <key>_enabled</key> @@ -419,24 +513,28 @@ <value>short</value> </param> <param> - <key>min</key> - <value>0</value> + <key>num_inputs</key> + <value>2</value> </param> <param> - <key>max</key> - <value>2</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>num_samps</key> - <value>1000</value> + <key>affinity</key> + <value></value> </param> <param> - <key>repeat</key> - <value>True</value> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(21, 170)</value> + <value>(232, 507)</value> </param> <param> <key>_rotation</key> @@ -466,8 +564,20 @@ <value>2</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>(217, 597)</value> + <value>(57, 513)</value> </param> <param> <key>_rotation</key> @@ -475,10 +585,10 @@ </param> </block> <block> - <key>trellis_pccc_encoder_xx</key> + <key>blocks_add_xx</key> <param> <key>id</key> - <value>trellis_pccc_encoder_xx_0</value> + <value>blocks_add_xx_1</value> </param> <param> <key>_enabled</key> @@ -486,35 +596,31 @@ </param> <param> <key>type</key> - <value>ss</value> + <value>float</value> </param> <param> - <key>o_fsm_args</key> - <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm"</value> + <key>num_inputs</key> + <value>2</value> </param> <param> - <key>o_init_state</key> - <value>0</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>i_fsm_args</key> - <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm"</value> + <key>affinity</key> + <value></value> </param> <param> - <key>i_init_state</key> + <key>minoutbuf</key> <value>0</value> </param> <param> - <key>interleaver_args</key> - <value>trellis.interleaver(block,666)</value> - </param> - <param> - <key>bl</key> - <value>block</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(236, 147)</value> + <value>(839, 190)</value> </param> <param> <key>_rotation</key> @@ -522,62 +628,58 @@ </param> </block> <block> - <key>trellis_pccc_decoder_x</key> + <key>trellis_pccc_encoder_xx</key> <param> <key>id</key> - <value>trellis_pccc_decoder_x_0</value> + <value>trellis_pccc_encoder_xx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>out_type</key> - <value>s</value> + <key>type</key> + <value>ss</value> </param> <param> <key>o_fsm_args</key> - <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm"</value> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_4.fsm"</value> </param> <param> <key>o_init_state</key> <value>0</value> </param> <param> - <key>o_final_state</key> - <value>-1</value> - </param> - <param> <key>i_fsm_args</key> - <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm"</value> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_4.fsm"</value> </param> <param> <key>i_init_state</key> <value>0</value> </param> <param> - <key>i_final_state</key> - <value>-1</value> - </param> - <param> - <key>interleaver</key> + <key>interleaver_args</key> <value>trellis.interleaver(block,666)</value> </param> <param> - <key>block_size</key> + <key>bl</key> <value>block</value> </param> <param> - <key>iterations</key> - <value>10</value> + <key>affinity</key> + <value></value> </param> <param> - <key>siso_type</key> - <value>trellis.TRELLIS_MIN_SUM</value> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(357, 304)</value> + <value>(235, 154)</value> </param> <param> <key>_rotation</key> @@ -585,38 +687,50 @@ </param> </block> <block> - <key>trellis_metrics_x</key> + <key>digital_chunks_to_symbols_xx</key> <param> <key>id</key> - <value>trellis_metrics_x_0</value> + <value>digital_chunks_to_symbols_xx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>f</value> + <key>in_type</key> + <value>short</value> </param> <param> - <key>card</key> - <value>16</value> + <key>out_type</key> + <value>float</value> </param> <param> - <key>dim</key> + <key>symbol_table</key> + <value>-7,0,-5,0,-3,0,-1,0,1,0,3,0,5,0,7,0,-7,0,-5,0,-3,0,-1,0,1,0,3,0,5,0,7,0</value> + </param> + <param> + <key>dimension</key> <value>2</value> </param> <param> - <key>table</key> - <value>-7,0, -5,0, -3,0, -1,0, 1,0, 3,0, 5,0, 7,0, 0,-7,0, -5,0, -3,0, -1,0, 1,0, 3,0, 5,0, 7</value> + <key>num_ports</key> + <value>1</value> </param> <param> - <key>metric_type</key> - <value>digital.TRELLIS_EUCLIDEAN</value> + <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>(58, 354)</value> + <value>(552, 178)</value> </param> <param> <key>_rotation</key> @@ -624,84 +738,74 @@ </param> </block> <block> - <key>variable</key> + <key>trellis_pccc_decoder_x</key> <param> <key>id</key> - <value>R</value> + <value>trellis_pccc_decoder_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>100e3</value> + <key>out_type</key> + <value>s</value> </param> <param> - <key>_coordinate</key> - <value>(482, 17)</value> + <key>o_fsm_args</key> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_4.fsm"</value> </param> <param> - <key>_rotation</key> + <key>o_init_state</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> + <key>o_final_state</key> + <value>-1</value> </param> <param> - <key>type</key> - <value>short</value> + <key>i_fsm_args</key> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_4.fsm"</value> </param> <param> - <key>samples_per_second</key> - <value>R</value> + <key>i_init_state</key> + <value>0</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>i_final_state</key> + <value>-1</value> </param> <param> - <key>_coordinate</key> - <value>(517, 103)</value> + <key>interleaver</key> + <value>trellis.interleaver(block,666)</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>block_size</key> + <value>block</value> </param> - </block> - <block> - <key>blocks_add_xx</key> <param> - <key>id</key> - <value>blocks_add_xx_1</value> + <key>iterations</key> + <value>10</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>siso_type</key> + <value>trellis.TRELLIS_MIN_SUM</value> </param> <param> - <key>type</key> - <value>float</value> + <key>affinity</key> + <value></value> </param> <param> - <key>num_inputs</key> - <value>2</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(951, 256)</value> + <value>(359, 322)</value> </param> <param> <key>_rotation</key> @@ -709,38 +813,50 @@ </param> </block> <block> - <key>digital_chunks_to_symbols_xx</key> + <key>trellis_metrics_x</key> <param> <key>id</key> - <value>digital_chunks_to_symbols_xx_0</value> + <value>trellis_metrics_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>in_type</key> - <value>short</value> + <key>type</key> + <value>f</value> </param> <param> - <key>out_type</key> - <value>float</value> + <key>card</key> + <value>16</value> </param> <param> - <key>symbol_table</key> - <value>-7,0,-5,0,-3,0,-1,0,1,0,3,0,5,0,7,0,-7,0,-5,0,-3,0,-1,0,1,0,3,0,5,0,7</value> + <key>dim</key> + <value>2</value> </param> <param> - <key>dimension</key> - <value>2</value> + <key>table</key> + <value>-7,0, -5,0, -3,0, -1,0, 1,0, 3,0, 5,0, 7,0, 0,-7,0, -5,0, -3,0, -1,0, 1,0, 3,0, 5,0, 7,0</value> </param> <param> - <key>num_ports</key> - <value>1</value> + <key>metric_type</key> + <value>digital.TRELLIS_EUCLIDEAN</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>(552, 178)</value> + <value>(56, 370)</value> </param> <param> <key>_rotation</key> @@ -748,38 +864,58 @@ </param> </block> <block> - <key>analog_noise_source_x</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>analog_noise_source_x_0</value> + <value>snr_db</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>float</value> + <key>label</key> + <value>SNR (dB)</value> </param> <param> - <key>noise_type</key> - <value>analog.GR_GAUSSIAN</value> + <key>value</key> + <value>5</value> </param> <param> - <key>amp</key> - <value>noisevar</value> + <key>start</key> + <value>-10</value> </param> <param> - <key>seed</key> - <value>-42</value> + <key>stop</key> + <value>10</value> + </param> + <param> + <key>step</key> + <value>0.01</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(622, 257)</value> + <value>(177, 10)</value> </param> <param> <key>_rotation</key> - <value>0</value> + <value>180</value> </param> </block> <connection> @@ -790,36 +926,6 @@ </connection> <connection> <source_block_id>blocks_add_xx_1</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_multiply_xx_2_0</source_block_id> - <sink_block_id>blocks_short_to_float_1_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>blocks_short_to_float_1_0</source_block_id> - <sink_block_id>wxgui_numbersink2_3_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>blocks_sub_xx_0</source_block_id> - <sink_block_id>blocks_multiply_xx_2_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>blocks_sub_xx_0</source_block_id> - <sink_block_id>blocks_multiply_xx_2_0</sink_block_id> - <source_key>0</source_key> - <sink_key>1</sink_key> - </connection> - <connection> - <source_block_id>blocks_add_xx_1</source_block_id> <sink_block_id>trellis_metrics_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> @@ -866,4 +972,28 @@ <source_key>0</source_key> <sink_key>1</sink_key> </connection> + <connection> + <source_block_id>blocks_short_to_float_1_0</source_block_id> + <sink_block_id>qtgui_number_sink_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>blocks_sub_xx_0</source_block_id> + <sink_block_id>blocks_multiply_xx_2_0</sink_block_id> + <source_key>0</source_key> + <sink_key>1</sink_key> + </connection> + <connection> + <source_block_id>blocks_sub_xx_0</source_block_id> + <sink_block_id>blocks_multiply_xx_2_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>blocks_multiply_xx_2_0</source_block_id> + <sink_block_id>blocks_short_to_float_1_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> </flow_graph> diff --git a/gr-trellis/examples/grc/sccc.grc b/gr-trellis/examples/grc/sccc.grc index 962f37a87c..44d8f263cb 100644 --- a/gr-trellis/examples/grc/sccc.grc +++ b/gr-trellis/examples/grc/sccc.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sat Jul 12 17:38:15 2014</timestamp> + <timestamp>Thu Jul 17 14:56:16 2014</timestamp> <block> <key>options</key> <param> @@ -29,7 +29,7 @@ </param> <param> <key>generate_options</key> - <value>wx_gui</value> + <value>qt_gui</value> </param> <param> <key>category</key> @@ -68,7 +68,7 @@ <key>variable</key> <param> <key>id</key> - <value>prefix</value> + <value>block</value> </param> <param> <key>_enabled</key> @@ -76,15 +76,11 @@ </param> <param> <key>value</key> - <value>"/home/mbant/src/gnuradio/"</value> - </param> - <param> - <key>alias</key> - <value></value> + <value>1000</value> </param> <param> <key>_coordinate</key> - <value>(572, 9)</value> + <value>(593, 10)</value> </param> <param> <key>_rotation</key> @@ -95,7 +91,7 @@ <key>variable</key> <param> <key>id</key> - <value>R</value> + <value>noisevar</value> </param> <param> <key>_enabled</key> @@ -103,15 +99,18 @@ </param> <param> <key>value</key> - <value>10e3</value> + <value>10**(-snr_db/10)</value> </param> <param> - <key>alias</key> - <value></value> + <key>_coordinate</key> + <value>(279, 10)</value> </param> + </block> + <block> + <key>variable</key> <param> - <key>_coordinate</key> - <value>(482, 17)</value> + <key>id</key> + <value>block</value> </param> <param> <key>_rotation</key> @@ -122,7 +121,7 @@ <key>variable</key> <param> <key>id</key> - <value>block</value> + <value>prefix</value> </param> <param> <key>_enabled</key> @@ -130,15 +129,11 @@ </param> <param> <key>value</key> - <value>1000</value> - </param> - <param> - <key>alias</key> - <value></value> + <value>GNURADIO_SRC_DIR</value> </param> <param> <key>_coordinate</key> - <value>(764, 16)</value> + <value>(434, 10)</value> </param> <param> <key>_rotation</key> @@ -149,7 +144,7 @@ <key>variable</key> <param> <key>id</key> - <value>noisevar</value> + <value>GNURADIO_SRC_DIR</value> </param> <param> <key>_enabled</key> @@ -157,15 +152,11 @@ </param> <param> <key>value</key> - <value>10**(-snr_db/10)</value> - </param> - <param> - <key>alias</key> - <value></value> + <value>"/home/jank/src/gnuradio/"</value> </param> <param> <key>_coordinate</key> - <value>(389, 15)</value> + <value>(656, 10)</value> </param> <param> <key>_rotation</key> @@ -176,27 +167,15 @@ <key>analog_random_source_x</key> <param> <key>id</key> - <value>analog_random_source_x_0</value> + <value>R</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>short</value> - </param> - <param> - <key>min</key> - <value>0</value> - </param> - <param> - <key>max</key> - <value>2</value> - </param> - <param> - <key>num_samps</key> - <value>1000</value> + <key>value</key> + <value>100e3</value> </param> <param> <key>repeat</key> @@ -220,7 +199,7 @@ </param> <param> <key>_coordinate</key> - <value>(21, 170)</value> + <value>(358, 10)</value> </param> <param> <key>_rotation</key> @@ -228,10 +207,10 @@ </param> </block> <block> - <key>blocks_sub_xx</key> + <key>analog_random_source_x</key> <param> <key>id</key> - <value>blocks_sub_xx_0</value> + <value>analog_random_source_x_0</value> </param> <param> <key>_enabled</key> @@ -242,16 +221,20 @@ <value>short</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>min</key> + <value>0</value> </param> <param> - <key>num_inputs</key> + <key>max</key> <value>2</value> </param> <param> - <key>alias</key> - <value></value> + <key>num_samps</key> + <value>1000</value> + </param> + <param> + <key>repeat</key> + <value>True</value> </param> <param> <key>affinity</key> @@ -267,7 +250,7 @@ </param> <param> <key>_coordinate</key> - <value>(445, 517)</value> + <value>(21, 170)</value> </param> <param> <key>_rotation</key> @@ -275,10 +258,10 @@ </param> </block> <block> - <key>blocks_multiply_xx</key> + <key>blocks_add_xx</key> <param> <key>id</key> - <value>blocks_multiply_xx_2_0</value> + <value>blocks_add_xx_1</value> </param> <param> <key>_enabled</key> @@ -286,7 +269,7 @@ </param> <param> <key>type</key> - <value>short</value> + <value>complex</value> </param> <param> <key>num_inputs</key> @@ -297,6 +280,18 @@ <value>1</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>alias</key> <value></value> </param> @@ -314,7 +309,7 @@ </param> <param> <key>_coordinate</key> - <value>(228.25, 798.39170361874085)</value> + <value>(951, 256)</value> </param> <param> <key>_rotation</key> @@ -322,26 +317,30 @@ </param> </block> <block> - <key>blocks_short_to_float</key> + <key>analog_noise_source_x</key> <param> <key>id</key> - <value>blocks_short_to_float_1_0</value> + <value>analog_noise_source_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>scale</key> - <value>1</value> + <key>noise_type</key> + <value>analog.GR_GAUSSIAN</value> </param> <param> - <key>alias</key> - <value></value> + <key>amp</key> + <value>noisevar</value> + </param> + <param> + <key>seed</key> + <value>-42</value> </param> <param> <key>affinity</key> @@ -357,7 +356,7 @@ </param> <param> <key>_coordinate</key> - <value>(416, 815)</value> + <value>(549, 250)</value> </param> <param> <key>_rotation</key> @@ -365,58 +364,46 @@ </param> </block> <block> - <key>variable_slider</key> + <key>blocks_throttle</key> <param> <key>id</key> - <value>snr_db</value> + <value>blocks_throttle_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>SNR (dB)</value> - </param> - <param> - <key>value</key> - <value>5</value> - </param> - <param> - <key>min</key> - <value>-10</value> - </param> - <param> - <key>max</key> - <value>10</value> + <key>type</key> + <value>short</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>samples_per_second</key> + <value>R</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>ignoretag</key> + <value>True</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>alias</key> - <value></value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(229, 13)</value> + <value>(551, 116)</value> </param> <param> <key>_rotation</key> @@ -424,82 +411,85 @@ </param> </block> <block> - <key>wxgui_scopesink2</key> + <key>blocks_sub_xx</key> <param> <key>id</key> - <value>wxgui_scopesink2_0</value> + <value>blocks_sub_xx_0</value> </param> <param> <key>_enabled</key> - <value>False</value> + <value>True</value> </param> <param> <key>type</key> - <value>complex</value> + <value>short</value> </param> <param> - <key>title</key> - <value>Scope Plot</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>samp_rate</key> - <value>R</value> + <key>num_inputs</key> + <value>2</value> </param> <param> - <key>v_scale</key> - <value>0</value> + <key>affinity</key> + <value></value> </param> <param> - <key>v_offset</key> + <key>minoutbuf</key> <value>0</value> </param> <param> - <key>t_scale</key> + <key>maxoutbuf</key> <value>0</value> </param> <param> - <key>ac_couple</key> - <value>False</value> + <key>_coordinate</key> + <value>(239, 548)</value> </param> <param> - <key>xy_mode</key> - <value>True</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>blocks_multiply_xx</key> <param> - <key>num_inputs</key> - <value>1</value> + <key>id</key> + <value>blocks_multiply_xx_2_0</value> </param> <param> - <key>win_size</key> - <value></value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>grid_pos</key> - <value></value> + <key>type</key> + <value>short</value> </param> <param> - <key>notebook</key> - <value></value> + <key>num_inputs</key> + <value>2</value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>affinity</key> + <value></value> </param> <param> - <key>alias</key> - <value></value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>affinity</key> - <value></value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(952, 73)</value> + <value>(418, 551)</value> </param> <param> <key>_rotation</key> @@ -507,82 +497,85 @@ </param> </block> <block> - <key>wxgui_numbersink2</key> + <key>blocks_short_to_float</key> <param> <key>id</key> - <value>wxgui_numbersink2_3_0</value> + <value>blocks_short_to_float_1_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>float</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>title</key> - <value>BER</value> + <key>scale</key> + <value>1</value> </param> <param> - <key>units</key> - <value>BER</value> + <key>affinity</key> + <value></value> </param> <param> - <key>samp_rate</key> - <value>R</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>min_value</key> + <key>maxoutbuf</key> <value>0</value> </param> <param> - <key>max_value</key> - <value>1.0</value> + <key>_coordinate</key> + <value>(605, 564)</value> </param> <param> - <key>factor</key> - <value>1.0</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>digital_chunks_to_symbols_xx</key> <param> - <key>decimal_places</key> - <value>6</value> + <key>id</key> + <value>digital_chunks_to_symbols_xx_0</value> </param> <param> - <key>ref_level</key> - <value>0</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>number_rate</key> - <value>15</value> + <key>in_type</key> + <value>short</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>out_type</key> + <value>complex</value> </param> <param> - <key>average</key> - <value>True</value> + <key>symbol_table</key> + <value>1,0,1j,0,-1j,0,-1,0,1,0,1j,0,-1j,0,-1,0</value> </param> <param> - <key>avg_alpha</key> - <value>0.001</value> + <key>dimension</key> + <value>2</value> </param> <param> - <key>show_gauge</key> - <value>True</value> + <key>num_ports</key> + <value>1</value> </param> <param> - <key>win_size</key> + <key>affinity</key> <value></value> </param> <param> - <key>grid_pos</key> - <value>1,0,1,1</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>notebook</key> - <value></value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>alias</key> @@ -594,7 +587,7 @@ </param> <param> <key>_coordinate</key> - <value>(688, 572)</value> + <value>(551, 181)</value> </param> <param> <key>_rotation</key> @@ -620,8 +613,8 @@ <value>R</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>o_fsm_args</key> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_4.fsm"</value> </param> <param> <key>ignoretag</key> @@ -632,8 +625,8 @@ <value></value> </param> <param> - <key>affinity</key> - <value></value> + <key>i_fsm_args</key> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn2o3_4.fsm"</value> </param> <param> <key>minoutbuf</key> @@ -671,8 +664,8 @@ <value>2</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>table</key> + <value>1,0,1j,0,-1j,0,-1,0,1,0,1j,0,-1j,0,-1,0</value> </param> <param> <key>alias</key> @@ -691,8 +684,20 @@ <value>0</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>(951, 256)</value> + <value>(241, 287)</value> </param> <param> <key>_rotation</key> @@ -700,105 +705,138 @@ </param> </block> <block> - <key>digital_chunks_to_symbols_xx</key> + <key>qtgui_number_sink</key> <param> <key>id</key> - <value>digital_chunks_to_symbols_xx_0</value> + <value>qtgui_number_sink_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>in_type</key> - <value>short</value> + <key>type</key> + <value>float</value> </param> <param> - <key>out_type</key> - <value>complex</value> + <key>autoscale</key> + <value>False</value> </param> <param> - <key>symbol_table</key> - <value>1,0,1j,0,-1j,0,-1,0,0,1,0,1j,0,-1j,0,01</value> + <key>avg</key> + <value>0.001</value> </param> <param> - <key>dimension</key> - <value>2</value> + <key>graph_type</key> + <value>qtgui.NUM_GRAPH_HORIZ</value> </param> <param> - <key>num_ports</key> + <key>nconnections</key> <value>1</value> </param> <param> - <key>alias</key> + <key>min</key> + <value>0</value> + </param> + <param> + <key>max</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>gui_hint</key> + <value>1,0,1,1</value> + </param> + <param> + <key>label1</key> <value></value> </param> <param> - <key>affinity</key> + <key>color1</key> + <value>("black", "black")</value> + </param> + <param> + <key>label2</key> <value></value> </param> <param> - <key>minoutbuf</key> - <value>0</value> + <key>color2</key> + <value>("black", "black")</value> </param> <param> - <key>maxoutbuf</key> - <value>0</value> + <key>label3</key> + <value></value> </param> <param> - <key>_coordinate</key> - <value>(551, 181)</value> + <key>color3</key> + <value>("black", "black")</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>label4</key> + <value></value> </param> - </block> - <block> - <key>analog_noise_source_x</key> <param> - <key>id</key> - <value>analog_noise_source_x_0</value> + <key>color4</key> + <value>("black", "black")</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>label5</key> + <value></value> </param> <param> - <key>type</key> - <value>complex</value> + <key>color5</key> + <value>("black", "black")</value> </param> <param> - <key>noise_type</key> - <value>analog.GR_GAUSSIAN</value> + <key>label6</key> + <value></value> </param> <param> - <key>amp</key> - <value>noisevar</value> + <key>color6</key> + <value>("black", "black")</value> </param> <param> - <key>seed</key> - <value>-42</value> + <key>label7</key> + <value></value> </param> <param> - <key>alias</key> + <key>color7</key> + <value>("black", "black")</value> + </param> + <param> + <key>label8</key> <value></value> </param> <param> - <key>affinity</key> + <key>color8</key> + <value>("black", "black")</value> + </param> + <param> + <key>label9</key> <value></value> </param> <param> - <key>minoutbuf</key> - <value>0</value> + <key>color9</key> + <value>("black", "black")</value> </param> <param> - <key>maxoutbuf</key> - <value>0</value> + <key>label10</key> + <value></value> + </param> + <param> + <key>color10</key> + <value>("black", "black")</value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(651, 270)</value> + <value>(788, 548)</value> </param> <param> <key>_rotation</key> @@ -806,10 +844,10 @@ </param> </block> <block> - <key>trellis_sccc_decoder_combined_xx</key> + <key>trellis_sccc_encoder_xx</key> <param> <key>id</key> - <value>trellis_sccc_decoder_combined_xx_0</value> + <value>trellis_sccc_encoder_xx_0</value> </param> <param> <key>_enabled</key> @@ -817,11 +855,7 @@ </param> <param> <key>type</key> - <value>c</value> - </param> - <param> - <key>out_type</key> - <value>s</value> + <value>ss</value> </param> <param> <key>o_fsm_args</key> @@ -832,58 +866,22 @@ <value>0</value> </param> <param> - <key>o_final_state</key> - <value>-1</value> - </param> - <param> <key>i_fsm_args</key> - <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_4.fsm"</value> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn2o3_4.fsm"</value> </param> <param> <key>i_init_state</key> <value>0</value> </param> <param> - <key>i_final_state</key> - <value>-1</value> - </param> - <param> - <key>interleaver</key> + <key>interleaver_args</key> <value>trellis.interleaver(block,666)</value> </param> <param> - <key>block_size</key> + <key>bl</key> <value>block</value> </param> <param> - <key>iterations</key> - <value>5</value> - </param> - <param> - <key>dim</key> - <value>2</value> - </param> - <param> - <key>table</key> - <value>1,0,1j,0,-1j,0,-1,0, 0,1,0,1j,0,-1j,0,-1</value> - </param> - <param> - <key>metric_type</key> - <value>digital.TRELLIS_EUCLIDEAN</value> - </param> - <param> - <key>siso_type</key> - <value>trellis.TRELLIS_SUM_PRODUCT</value> - </param> - <param> - <key>scaling</key> - <value>1.0</value> - </param> - <param> - <key>alias</key> - <value></value> - </param> - <param> <key>affinity</key> <value></value> </param> @@ -897,7 +895,7 @@ </param> <param> <key>_coordinate</key> - <value>(388, 263)</value> + <value>(242, 154)</value> </param> <param> <key>_rotation</key> @@ -905,66 +903,58 @@ </param> </block> <block> - <key>trellis_sccc_encoder_xx</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>trellis_sccc_encoder_xx_0</value> + <value>snr_db</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>ss</value> + <key>label</key> + <value>SNR (dB)</value> </param> <param> - <key>o_fsm_args</key> - <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_4.fsm"</value> + <key>value</key> + <value>5</value> </param> <param> - <key>o_init_state</key> - <value>0</value> + <key>start</key> + <value>-10</value> </param> <param> - <key>i_fsm_args</key> - <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_4.fsm"</value> + <key>stop</key> + <value>10</value> </param> <param> - <key>i_init_state</key> - <value>0</value> + <key>step</key> + <value>0.01</value> </param> <param> - <key>interleaver_args</key> - <value>trellis.interleaver(block,666)</value> + <key>widget</key> + <value>counter_slider</value> </param> <param> - <key>bl</key> - <value>block</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>alias</key> - <value></value> + <key>min_len</key> + <value>200</value> </param> <param> - <key>affinity</key> + <key>gui_hint</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>(207, 175)</value> + <value>(177, 10)</value> </param> <param> <key>_rotation</key> - <value>0</value> + <value>180</value> </param> </block> <connection> @@ -974,12 +964,6 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_add_xx_1</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>analog_random_source_x_0</source_block_id> <sink_block_id>trellis_sccc_encoder_xx_0</sink_block_id> <source_key>0</source_key> @@ -1004,20 +988,20 @@ <sink_key>1</sink_key> </connection> <connection> - <source_block_id>blocks_multiply_xx_2_0</source_block_id> - <sink_block_id>blocks_short_to_float_1_0</sink_block_id> + <source_block_id>blocks_throttle_0</source_block_id> + <sink_block_id>digital_chunks_to_symbols_xx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_short_to_float_1_0</source_block_id> - <sink_block_id>wxgui_numbersink2_3_0</sink_block_id> + <source_block_id>analog_noise_source_x_0</source_block_id> + <sink_block_id>blocks_add_xx_1</sink_block_id> <source_key>0</source_key> - <sink_key>0</sink_key> + <sink_key>1</sink_key> </connection> <connection> - <source_block_id>blocks_sub_xx_0</source_block_id> - <sink_block_id>blocks_multiply_xx_2_0</sink_block_id> + <source_block_id>digital_chunks_to_symbols_xx_0</source_block_id> + <sink_block_id>blocks_add_xx_1</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> @@ -1028,20 +1012,20 @@ <sink_key>1</sink_key> </connection> <connection> - <source_block_id>blocks_throttle_0</source_block_id> - <sink_block_id>digital_chunks_to_symbols_xx_0</sink_block_id> + <source_block_id>blocks_sub_xx_0</source_block_id> + <sink_block_id>blocks_multiply_xx_2_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>analog_noise_source_x_0</source_block_id> - <sink_block_id>blocks_add_xx_1</sink_block_id> + <source_block_id>blocks_multiply_xx_2_0</source_block_id> + <sink_block_id>blocks_short_to_float_1_0</sink_block_id> <source_key>0</source_key> - <sink_key>1</sink_key> + <sink_key>0</sink_key> </connection> <connection> - <source_block_id>digital_chunks_to_symbols_xx_0</source_block_id> - <sink_block_id>blocks_add_xx_1</sink_block_id> + <source_block_id>blocks_short_to_float_1_0</source_block_id> + <sink_block_id>qtgui_number_sink_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> diff --git a/gr-trellis/examples/grc/sccc1.grc b/gr-trellis/examples/grc/sccc1.grc index 4fdf81c811..2dbf581bc4 100644 --- a/gr-trellis/examples/grc/sccc1.grc +++ b/gr-trellis/examples/grc/sccc1.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sat Nov 10 15:41:10 2012</timestamp> + <timestamp>Thu Jul 17 14:56:39 2014</timestamp> <block> <key>options</key> <param> @@ -29,7 +29,7 @@ </param> <param> <key>generate_options</key> - <value>wx_gui</value> + <value>qt_gui</value> </param> <param> <key>category</key> @@ -64,7 +64,7 @@ <key>variable</key> <param> <key>id</key> - <value>noisevar</value> + <value>block</value> </param> <param> <key>_enabled</key> @@ -72,11 +72,11 @@ </param> <param> <key>value</key> - <value>10**(-snr_db/10)</value> + <value>1000</value> </param> <param> <key>_coordinate</key> - <value>(389, 15)</value> + <value>(593, 10)</value> </param> <param> <key>_rotation</key> @@ -84,38 +84,22 @@ </param> </block> <block> - <key>analog_random_source_x</key> + <key>variable</key> <param> <key>id</key> - <value>analog_random_source_x_0</value> + <value>noisevar</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>short</value> - </param> - <param> - <key>min</key> - <value>0</value> - </param> - <param> - <key>max</key> - <value>2</value> - </param> - <param> - <key>num_samps</key> - <value>1000</value> - </param> - <param> - <key>repeat</key> - <value>True</value> + <key>value</key> + <value>10**(-snr_db/10)</value> </param> <param> <key>_coordinate</key> - <value>(21, 170)</value> + <value>(279, 10)</value> </param> <param> <key>_rotation</key> @@ -134,11 +118,11 @@ </param> <param> <key>value</key> - <value>"/n/harrisville/x/anastas/gnuradio_trunk/"</value> + <value>GNURADIO_SRC_DIR</value> </param> <param> <key>_coordinate</key> - <value>(590, 15)</value> + <value>(434, 10)</value> </param> <param> <key>_rotation</key> @@ -149,7 +133,7 @@ <key>variable</key> <param> <key>id</key> - <value>block</value> + <value>GNURADIO_SRC_DIR</value> </param> <param> <key>_enabled</key> @@ -157,11 +141,11 @@ </param> <param> <key>value</key> - <value>1000</value> + <value>"/home/jank/src/gnuradio/"</value> </param> <param> <key>_coordinate</key> - <value>(764, 16)</value> + <value>(656, 10)</value> </param> <param> <key>_rotation</key> @@ -169,54 +153,22 @@ </param> </block> <block> - <key>variable_slider</key> + <key>variable</key> <param> <key>id</key> - <value>snr_db</value> + <value>R</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>SNR (dB)</value> - </param> - <param> <key>value</key> - <value>5</value> - </param> - <param> - <key>min</key> - <value>-10</value> - </param> - <param> - <key>max</key> - <value>10</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>notebook</key> - <value></value> + <value>100e3</value> </param> <param> <key>_coordinate</key> - <value>(229, 13)</value> + <value>(358, 10)</value> </param> <param> <key>_rotation</key> @@ -224,69 +176,50 @@ </param> </block> <block> - <key>variable</key> + <key>analog_random_source_x</key> <param> <key>id</key> - <value>R</value> + <value>analog_random_source_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>10e3</value> - </param> - <param> - <key>_coordinate</key> - <value>(482, 17)</value> + <key>type</key> + <value>short</value> </param> <param> - <key>_rotation</key> + <key>min</key> <value>0</value> </param> - </block> - <block> - <key>trellis_sccc_encoder_xx</key> <param> - <key>id</key> - <value>trellis_sccc_encoder_xx_0</value> + <key>max</key> + <value>2</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>num_samps</key> + <value>1000</value> </param> <param> - <key>type</key> - <value>ss</value> + <key>repeat</key> + <value>True</value> </param> <param> - <key>o_fsm_args</key> - <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm"</value> + <key>affinity</key> + <value></value> </param> <param> - <key>o_init_state</key> + <key>minoutbuf</key> <value>0</value> </param> <param> - <key>i_fsm_args</key> - <value>prefix+"gr-trellis/src/examples/fsm_files/awgn2o3_4.fsm"</value> - </param> - <param> - <key>i_init_state</key> + <key>maxoutbuf</key> <value>0</value> </param> <param> - <key>interleaver_args</key> - <value>trellis.interleaver(block,666)</value> - </param> - <param> - <key>bl</key> - <value>block</value> - </param> - <param> <key>_coordinate</key> - <value>(242, 154)</value> + <value>(21, 170)</value> </param> <param> <key>_rotation</key> @@ -294,62 +227,46 @@ </param> </block> <block> - <key>trellis_sccc_decoder_x</key> + <key>blocks_throttle</key> <param> <key>id</key> - <value>trellis_sccc_decoder_x_0</value> + <value>blocks_throttle_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>out_type</key> - <value>s</value> + <key>type</key> + <value>short</value> </param> <param> - <key>o_fsm_args</key> - <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm"</value> + <key>samples_per_second</key> + <value>R</value> </param> <param> - <key>o_init_state</key> - <value>0</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>o_final_state</key> - <value>-1</value> + <key>ignoretag</key> + <value>True</value> </param> <param> - <key>i_fsm_args</key> - <value>prefix+"gr-trellis/src/examples/fsm_files/awgn2o3_4.fsm"</value> + <key>affinity</key> + <value></value> </param> <param> - <key>i_init_state</key> + <key>minoutbuf</key> <value>0</value> </param> <param> - <key>i_final_state</key> - <value>-1</value> - </param> - <param> - <key>interleaver</key> - <value>trellis.interleaver(block,666)</value> - </param> - <param> - <key>block_size</key> - <value>block</value> - </param> - <param> - <key>iterations</key> - <value>10</value> - </param> - <param> - <key>siso_type</key> - <value>trellis.TRELLIS_MIN_SUM</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(333, 305)</value> + <value>(607, 110)</value> </param> <param> <key>_rotation</key> @@ -357,10 +274,10 @@ </param> </block> <block> - <key>blocks_sub_xx</key> + <key>blocks_add_xx</key> <param> <key>id</key> - <value>blocks_sub_xx_0</value> + <value>blocks_add_xx_1</value> </param> <param> <key>_enabled</key> @@ -368,19 +285,31 @@ </param> <param> <key>type</key> - <value>short</value> + <value>float</value> + </param> + <param> + <key>num_inputs</key> + <value>2</value> </param> <param> <key>vlen</key> <value>1</value> </param> <param> - <key>num_inputs</key> - <value>2</value> + <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>(217, 597)</value> + <value>(932, 187)</value> </param> <param> <key>_rotation</key> @@ -410,35 +339,20 @@ <value>1</value> </param> <param> - <key>_coordinate</key> - <value>(392, 591)</value> + <key>affinity</key> + <value></value> </param> <param> - <key>_rotation</key> + <key>minoutbuf</key> <value>0</value> </param> - </block> - <block> - <key>blocks_short_to_float</key> - <param> - <key>id</key> - <value>blocks_short_to_float_1_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> <param> - <key>vlen</key> - <value>1</value> - </param> - <param> - <key>scale</key> - <value>1</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(535, 609)</value> + <value>(233, 480)</value> </param> <param> <key>_rotation</key> @@ -446,10 +360,10 @@ </param> </block> <block> - <key>wxgui_numbersink2</key> + <key>blocks_sub_xx</key> <param> <key>id</key> - <value>wxgui_numbersink2_3_0</value> + <value>blocks_sub_xx_0</value> </param> <param> <key>_enabled</key> @@ -457,75 +371,70 @@ </param> <param> <key>type</key> - <value>float</value> + <value>short</value> </param> <param> - <key>title</key> - <value>BER</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>units</key> - <value>BER</value> + <key>num_inputs</key> + <value>2</value> </param> <param> - <key>samp_rate</key> - <value>R</value> + <key>affinity</key> + <value></value> </param> <param> - <key>min_value</key> + <key>minoutbuf</key> <value>0</value> </param> <param> - <key>max_value</key> - <value>1.0</value> - </param> - <param> - <key>factor</key> - <value>1.0</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> - <key>decimal_places</key> - <value>6</value> + <key>_coordinate</key> + <value>(58, 486)</value> </param> <param> - <key>ref_level</key> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>blocks_short_to_float</key> <param> - <key>number_rate</key> - <value>15</value> - </param> - <param> - <key>peak_hold</key> - <value>False</value> + <key>id</key> + <value>blocks_short_to_float_1_0</value> </param> <param> - <key>average</key> + <key>_enabled</key> <value>True</value> </param> <param> - <key>avg_alpha</key> - <value>0.001</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>show_gauge</key> - <value>True</value> + <key>scale</key> + <value>1</value> </param> <param> - <key>win_size</key> + <key>affinity</key> <value></value> </param> <param> - <key>grid_pos</key> - <value>1,0,1,1</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>notebook</key> - <value></value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(713, 426)</value> + <value>(376, 498)</value> </param> <param> <key>_rotation</key> @@ -563,8 +472,20 @@ <value>digital.TRELLIS_EUCLIDEAN</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>(58, 354)</value> + <value>(63, 328)</value> </param> <param> <key>_rotation</key> @@ -572,74 +493,74 @@ </param> </block> <block> - <key>wxgui_scopesink2</key> + <key>trellis_sccc_decoder_x</key> <param> <key>id</key> - <value>wxgui_scopesink2_0</value> + <value>trellis_sccc_decoder_x_0</value> </param> <param> <key>_enabled</key> - <value>False</value> + <value>True</value> </param> <param> - <key>type</key> - <value>float</value> + <key>out_type</key> + <value>s</value> </param> <param> - <key>title</key> - <value>Scope Plot</value> + <key>o_fsm_args</key> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_4.fsm"</value> </param> <param> - <key>samp_rate</key> - <value>R</value> + <key>o_init_state</key> + <value>0</value> </param> <param> - <key>v_scale</key> - <value>0</value> + <key>o_final_state</key> + <value>-1</value> </param> <param> - <key>v_offset</key> - <value>0</value> + <key>i_fsm_args</key> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn2o3_4.fsm"</value> </param> <param> - <key>t_scale</key> + <key>i_init_state</key> <value>0</value> </param> <param> - <key>ac_couple</key> - <value>False</value> + <key>i_final_state</key> + <value>-1</value> </param> <param> - <key>xy_mode</key> - <value>False</value> + <key>interleaver</key> + <value>trellis.interleaver(block,666)</value> </param> <param> - <key>num_inputs</key> - <value>1</value> + <key>block_size</key> + <value>block</value> </param> <param> - <key>win_size</key> - <value></value> + <key>iterations</key> + <value>10</value> </param> <param> - <key>grid_pos</key> - <value></value> + <key>siso_type</key> + <value>trellis.TRELLIS_MIN_SUM</value> </param> <param> - <key>notebook</key> + <key>affinity</key> <value></value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(952, 73)</value> + <value>(292, 280)</value> </param> <param> <key>_rotation</key> @@ -647,10 +568,10 @@ </param> </block> <block> - <key>blocks_throttle</key> + <key>trellis_sccc_encoder_xx</key> <param> <key>id</key> - <value>blocks_throttle_0</value> + <value>trellis_sccc_encoder_xx_0</value> </param> <param> <key>_enabled</key> @@ -658,19 +579,47 @@ </param> <param> <key>type</key> - <value>short</value> + <value>ss</value> </param> <param> - <key>samples_per_second</key> - <value>R</value> + <key>o_fsm_args</key> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_4.fsm"</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>o_init_state</key> + <value>0</value> + </param> + <param> + <key>i_fsm_args</key> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn2o3_4.fsm"</value> + </param> + <param> + <key>i_init_state</key> + <value>0</value> + </param> + <param> + <key>interleaver_args</key> + <value>trellis.interleaver(block,666)</value> + </param> + <param> + <key>bl</key> + <value>block</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>(517, 103)</value> + <value>(294, 154)</value> </param> <param> <key>_rotation</key> @@ -708,6 +657,18 @@ <value>1</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>(607, 175)</value> </param> @@ -717,10 +678,10 @@ </param> </block> <block> - <key>blocks_add_xx</key> + <key>analog_noise_source_x</key> <param> <key>id</key> - <value>blocks_add_xx_1</value> + <value>analog_noise_source_x_0</value> </param> <param> <key>_enabled</key> @@ -731,16 +692,32 @@ <value>float</value> </param> <param> - <key>num_inputs</key> - <value>2</value> + <key>noise_type</key> + <value>analog.GR_GAUSSIAN</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>amp</key> + <value>noisevar</value> + </param> + <param> + <key>seed</key> + <value>-42</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>(951, 256)</value> + <value>(606, 242)</value> </param> <param> <key>_rotation</key> @@ -748,10 +725,10 @@ </param> </block> <block> - <key>analog_noise_source_x</key> + <key>qtgui_number_sink</key> <param> <key>id</key> - <value>analog_noise_source_x_0</value> + <value>qtgui_number_sink_0</value> </param> <param> <key>_enabled</key> @@ -762,26 +739,185 @@ <value>float</value> </param> <param> - <key>noise_type</key> - <value>analog.GR_GAUSSIAN</value> + <key>autoscale</key> + <value>False</value> </param> <param> - <key>amp</key> - <value>noisevar</value> + <key>avg</key> + <value>0.001</value> </param> <param> - <key>seed</key> - <value>-42</value> + <key>graph_type</key> + <value>qtgui.NUM_GRAPH_HORIZ</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>min</key> + <value>0</value> + </param> + <param> + <key>max</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>gui_hint</key> + <value>1,0,1,1</value> + </param> + <param> + <key>label1</key> + <value></value> + </param> + <param> + <key>color1</key> + <value>("black", "black")</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>color2</key> + <value>("black", "black")</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>color3</key> + <value>("black", "black")</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>color4</key> + <value>("black", "black")</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>color5</key> + <value>("black", "black")</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>color6</key> + <value>("black", "black")</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>color7</key> + <value>("black", "black")</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>color8</key> + <value>("black", "black")</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>color9</key> + <value>("black", "black")</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>color10</key> + <value>("black", "black")</value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(632, 254)</value> + <value>(609, 482)</value> </param> <param> <key>_rotation</key> <value>0</value> </param> </block> + <block> + <key>variable_qtgui_range</key> + <param> + <key>id</key> + <value>snr_db</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>SNR (dB)</value> + </param> + <param> + <key>value</key> + <value>5</value> + </param> + <param> + <key>start</key> + <value>-10</value> + </param> + <param> + <key>stop</key> + <value>10</value> + </param> + <param> + <key>step</key> + <value>0.01</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(177, 10)</value> + </param> + <param> + <key>_rotation</key> + <value>180</value> + </param> + </block> <connection> <source_block_id>analog_random_source_x_0</source_block_id> <sink_block_id>blocks_sub_xx_0</sink_block_id> @@ -789,12 +925,6 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_add_xx_1</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>analog_random_source_x_0</source_block_id> <sink_block_id>trellis_sccc_encoder_xx_0</sink_block_id> <source_key>0</source_key> @@ -807,30 +937,6 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_multiply_xx_2_0</source_block_id> - <sink_block_id>blocks_short_to_float_1_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>blocks_short_to_float_1_0</source_block_id> - <sink_block_id>wxgui_numbersink2_3_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>blocks_sub_xx_0</source_block_id> - <sink_block_id>blocks_multiply_xx_2_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>blocks_sub_xx_0</source_block_id> - <sink_block_id>blocks_multiply_xx_2_0</sink_block_id> - <source_key>0</source_key> - <sink_key>1</sink_key> - </connection> - <connection> <source_block_id>blocks_add_xx_1</source_block_id> <sink_block_id>trellis_metrics_x_0</sink_block_id> <source_key>0</source_key> @@ -866,4 +972,28 @@ <source_key>0</source_key> <sink_key>1</sink_key> </connection> + <connection> + <source_block_id>blocks_sub_xx_0</source_block_id> + <sink_block_id>blocks_multiply_xx_2_0</sink_block_id> + <source_key>0</source_key> + <sink_key>1</sink_key> + </connection> + <connection> + <source_block_id>blocks_sub_xx_0</source_block_id> + <sink_block_id>blocks_multiply_xx_2_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>blocks_multiply_xx_2_0</source_block_id> + <sink_block_id>blocks_short_to_float_1_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>blocks_short_to_float_1_0</source_block_id> + <sink_block_id>qtgui_number_sink_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> </flow_graph> |