diff options
| author | Jan <kraemer.jn@googlemail.com> | 2014-07-21 10:38:41 +0200 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-28 11:54:29 -0400 |
| commit | e20ba633b19373ce908d71aa93966bd7241d5988 (patch) | |
| tree | 423f24b6e7d1568c59fc9eef9c29d06ce09e610e /gr-trellis/examples/grc/interference_cancellation.grc | |
| parent | 475b9e08be4506b1c9987d4fb96030580e20456f (diff) | |
trellis: working on issue to fix locations of fsm files in examples.
+ Workaround for the path problem with cmake to use templates for install
+ GRC blocks now check if FSM_Args are strings and if the file exists
+ Changed example generation with CMake
Diffstat (limited to 'gr-trellis/examples/grc/interference_cancellation.grc')
| -rw-r--r-- | gr-trellis/examples/grc/interference_cancellation.grc | 1344 |
1 files changed, 557 insertions, 787 deletions
diff --git a/gr-trellis/examples/grc/interference_cancellation.grc b/gr-trellis/examples/grc/interference_cancellation.grc index ef011c5205..fa969f1559 100644 --- a/gr-trellis/examples/grc/interference_cancellation.grc +++ b/gr-trellis/examples/grc/interference_cancellation.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sat Jul 12 17:33:47 2014</timestamp> + <timestamp>Wed Jul 23 09:31:45 2014</timestamp> <block> <key>options</key> <param> @@ -52,12 +52,8 @@ <value></value> </param> <param> - <key>alias</key> - <value></value> - </param> - <param> <key>_coordinate</key> - <value>(0, 0)</value> + <value>(10, 10)</value> </param> <param> <key>_rotation</key> @@ -68,7 +64,7 @@ <key>variable</key> <param> <key>id</key> - <value>prefix</value> + <value>R</value> </param> <param> <key>_enabled</key> @@ -76,15 +72,34 @@ </param> <param> <key>value</key> - <value>"~/src/gnuradio/"</value> + <value>100e3</value> </param> <param> - <key>alias</key> - <value></value> + <key>_coordinate</key> + <value>(502, 10)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <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>(871, 14)</value> + <value>(765, 10)</value> </param> <param> <key>_rotation</key> @@ -106,12 +121,8 @@ <value>10**(-snr_db/10)</value> </param> <param> - <key>alias</key> - <value></value> - </param> - <param> <key>_coordinate</key> - <value>(637, 13)</value> + <value>(428, 10)</value> </param> <param> <key>_rotation</key> @@ -122,7 +133,7 @@ <key>variable</key> <param> <key>id</key> - <value>R</value> + <value>prefix</value> </param> <param> <key>_enabled</key> @@ -130,15 +141,11 @@ </param> <param> <key>value</key> - <value>100e3</value> - </param> - <param> - <key>alias</key> - <value></value> + <value>"@FSM_FILE_INSTALL_DIR@"</value> </param> <param> <key>_coordinate</key> - <value>(748, 12)</value> + <value>(578, 10)</value> </param> <param> <key>_rotation</key> @@ -176,10 +183,6 @@ <value>True</value> </param> <param> - <key>alias</key> - <value></value> - </param> - <param> <key>affinity</key> <value></value> </param> @@ -231,10 +234,6 @@ <value>True</value> </param> <param> - <key>alias</key> - <value></value> - </param> - <param> <key>affinity</key> <value></value> </param> @@ -259,7 +258,7 @@ <key>blocks_sub_xx</key> <param> <key>id</key> - <value>blocks_sub_xx_3</value> + <value>blocks_sub_xx_0</value> </param> <param> <key>_enabled</key> @@ -278,10 +277,92 @@ <value>2</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>_coordinate</key> + <value>(536, 529)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>blocks_multiply_xx</key> + <param> + <key>id</key> + <value>blocks_multiply_xx_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>short</value> + </param> + <param> + <key>num_inputs</key> + <value>2</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>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(771, 525)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>blocks_sub_xx</key> + <param> + <key>id</key> + <value>blocks_sub_xx_3</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>short</value> + </param> + <param> + <key>vlen</key> + <value>1</value> + </param> + <param> + <key>num_inputs</key> + <value>2</value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -325,10 +406,6 @@ <value>1</value> </param> <param> - <key>alias</key> - <value></value> - </param> - <param> <key>affinity</key> <value></value> </param> @@ -372,10 +449,6 @@ <value>2</value> </param> <param> - <key>alias</key> - <value></value> - </param> - <param> <key>affinity</key> <value></value> </param> @@ -419,10 +492,49 @@ <value>2</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>_coordinate</key> + <value>(540, 1141)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>blocks_multiply_xx</key> + <param> + <key>id</key> + <value>blocks_multiply_xx_2</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>short</value> + </param> + <param> + <key>num_inputs</key> + <value>2</value> + </param> + <param> + <key>vlen</key> + <value>1</value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -436,7 +548,7 @@ </param> <param> <key>_coordinate</key> - <value>(540, 1141)</value> + <value>(796, 1136)</value> </param> <param> <key>_rotation</key> @@ -466,10 +578,6 @@ <value>2</value> </param> <param> - <key>alias</key> - <value></value> - </param> - <param> <key>affinity</key> <value></value> </param> @@ -513,10 +621,6 @@ <value>2</value> </param> <param> - <key>alias</key> - <value></value> - </param> - <param> <key>affinity</key> <value></value> </param> @@ -560,10 +664,6 @@ <value>1</value> </param> <param> - <key>alias</key> - <value></value> - </param> - <param> <key>affinity</key> <value></value> </param> @@ -607,10 +707,6 @@ <value>1</value> </param> <param> - <key>alias</key> - <value></value> - </param> - <param> <key>affinity</key> <value></value> </param> @@ -658,10 +754,6 @@ <value>-42</value> </param> <param> - <key>alias</key> - <value></value> - </param> - <param> <key>affinity</key> <value></value> </param> @@ -709,10 +801,6 @@ <value>True</value> </param> <param> - <key>alias</key> - <value></value> - </param> - <param> <key>affinity</key> <value></value> </param> @@ -756,10 +844,6 @@ <value>1</value> </param> <param> - <key>alias</key> - <value></value> - </param> - <param> <key>affinity</key> <value></value> </param> @@ -811,10 +895,6 @@ <value>1</value> </param> <param> - <key>alias</key> - <value></value> - </param> - <param> <key>affinity</key> <value></value> </param> @@ -858,10 +938,6 @@ <value>1</value> </param> <param> - <key>alias</key> - <value></value> - </param> - <param> <key>affinity</key> <value></value> </param> @@ -913,10 +989,6 @@ <value>1</value> </param> <param> - <key>alias</key> - <value></value> - </param> - <param> <key>affinity</key> <value></value> </param> @@ -964,12 +1036,8 @@ <value>1</value> </param> <param> - <key>num_ports</key> - <value>1</value> - </param> - <param> - <key>alias</key> - <value></value> + <key>_rotation</key> + <value>0</value> </param> <param> <key>affinity</key> @@ -1015,10 +1083,6 @@ <value>1</value> </param> <param> - <key>alias</key> - <value></value> - </param> - <param> <key>affinity</key> <value></value> </param> @@ -1062,10 +1126,6 @@ <value>1</value> </param> <param> - <key>alias</key> - <value></value> - </param> - <param> <key>affinity</key> <value></value> </param> @@ -1117,10 +1177,6 @@ <value>1</value> </param> <param> - <key>alias</key> - <value></value> - </param> - <param> <key>affinity</key> <value></value> </param> @@ -1142,152 +1198,120 @@ </param> </block> <block> - <key>trellis_viterbi_combined_xx</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>trellis_viterbi_combined_xx_1</value> + <value>alpha</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>c</value> - </param> - <param> - <key>out_type</key> - <value>s</value> - </param> - <param> - <key>fsm_args</key> - <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_16.fsm"</value> - </param> - <param> - <key>block_size</key> - <value>1000</value> + <key>label</key> + <value>P1/P</value> </param> <param> - <key>init_state</key> - <value>-1</value> + <key>value</key> + <value>0.6</value> </param> <param> - <key>final_state</key> - <value>-1</value> + <key>start</key> + <value>0</value> </param> <param> - <key>dim</key> + <key>stop</key> <value>1</value> </param> <param> - <key>table</key> - <value>alpha**0.5*1,alpha**0.5*1j,alpha**0.5*(-1j),alpha**0.5*(-1)</value> - </param> - <param> - <key>metric_type</key> - <value>digital.TRELLIS_EUCLIDEAN</value> + <key>step</key> + <value>0.01</value> </param> <param> - <key>alias</key> - <value></value> + <key>widget</key> + <value>counter_slider</value> </param> <param> - <key>affinity</key> - <value></value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>minoutbuf</key> - <value>0</value> + <key>min_len</key> + <value>200</value> </param> <param> - <key>maxoutbuf</key> - <value>0</value> + <key>gui_hint</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(80, 501)</value> + <value>(177, 10)</value> </param> <param> <key>_rotation</key> - <value>0</value> + <value>180</value> </param> </block> <block> - <key>trellis_viterbi_combined_xx</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>trellis_viterbi_combined_xx_2</value> + <value>snr_db</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>c</value> - </param> - <param> - <key>out_type</key> - <value>s</value> - </param> - <param> - <key>fsm_args</key> - <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_16.fsm"</value> + <key>label</key> + <value>P/sigma^2 (dB)</value> </param> <param> - <key>block_size</key> - <value>1000</value> + <key>value</key> + <value>16</value> </param> <param> - <key>init_state</key> - <value>-1</value> + <key>start</key> + <value>0</value> </param> <param> - <key>final_state</key> - <value>-1</value> + <key>stop</key> + <value>20</value> </param> <param> - <key>dim</key> - <value>1</value> + <key>step</key> + <value>0.01</value> </param> <param> - <key>table</key> - <value>(1-alpha)**0.5*1,(1-alpha)**0.5*1j,(1-alpha)**0.5*(-1j),(1-alpha)**0.5*(-1)</value> + <key>widget</key> + <value>counter_slider</value> </param> <param> - <key>metric_type</key> - <value>digital.TRELLIS_EUCLIDEAN</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>(82, 766)</value> + <value>(300, 10)</value> </param> <param> <key>_rotation</key> - <value>0</value> + <value>180</value> </param> </block> <block> - <key>trellis_encoder_xx</key> + <key>blocks_add_xx</key> <param> <key>id</key> - <value>trellis_encoder_xx_0</value> + <value>blocks_add_xx_1</value> </param> <param> <key>_enabled</key> @@ -1295,19 +1319,15 @@ </param> <param> <key>type</key> - <value>ss</value> - </param> - <param> - <key>fsm_args</key> - <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_16.fsm"</value> + <value>complex</value> </param> <param> - <key>init_state</key> - <value>0</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> @@ -1323,7 +1343,7 @@ </param> <param> <key>_coordinate</key> - <value>(340, 187)</value> + <value>(1400, 262)</value> </param> <param> <key>_rotation</key> @@ -1331,10 +1351,10 @@ </param> </block> <block> - <key>trellis_encoder_xx</key> + <key>qtgui_const_sink_x</key> <param> <key>id</key> - <value>trellis_encoder_xx_1</value> + <value>qtgui_const_sink_x_0</value> </param> <param> <key>_enabled</key> @@ -1342,341 +1362,155 @@ </param> <param> <key>type</key> - <value>ss</value> - </param> - <param> - <key>fsm_args</key> - <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_16.fsm"</value> - </param> - <param> - <key>init_state</key> - <value>0</value> - </param> - <param> - <key>alias</key> - <value></value> - </param> - <param> - <key>affinity</key> - <value></value> + <value>complex</value> </param> <param> - <key>minoutbuf</key> - <value>0</value> + <key>name</key> + <value>Constellation</value> </param> <param> - <key>maxoutbuf</key> - <value>0</value> + <key>size</key> + <value>1024</value> </param> <param> - <key>_coordinate</key> - <value>(336, 311)</value> + <key>autoscale</key> + <value>False</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>ymin</key> + <value>-2</value> </param> - </block> - <block> - <key>trellis_encoder_xx</key> <param> - <key>id</key> - <value>trellis_encoder_xx_2</value> + <key>ymax</key> + <value>2</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>xmin</key> + <value>-2</value> </param> <param> - <key>type</key> - <value>ss</value> + <key>xmax</key> + <value>2</value> </param> <param> - <key>fsm_args</key> - <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_16.fsm"</value> + <key>nconnections</key> + <value>1</value> </param> <param> - <key>init_state</key> - <value>0</value> + <key>update_time</key> + <value>0.10</value> </param> <param> - <key>alias</key> + <key>gui_hint</key> <value></value> </param> <param> - <key>affinity</key> + <key>label1</key> <value></value> </param> <param> - <key>minoutbuf</key> - <value>0</value> - </param> - <param> - <key>maxoutbuf</key> - <value>0</value> + <key>width1</key> + <value>1</value> </param> <param> - <key>_coordinate</key> - <value>(89, 1000)</value> + <key>color1</key> + <value>"blue"</value> </param> <param> - <key>_rotation</key> + <key>style1</key> <value>0</value> </param> - </block> - <block> - <key>trellis_encoder_xx</key> - <param> - <key>id</key> - <value>trellis_encoder_xx_2_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> <param> - <key>type</key> - <value>ss</value> - </param> - <param> - <key>fsm_args</key> - <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_16.fsm"</value> - </param> - <param> - <key>init_state</key> + <key>marker1</key> <value>0</value> </param> <param> - <key>alias</key> - <value></value> + <key>alpha1</key> + <value>1.0</value> </param> <param> - <key>affinity</key> + <key>label2</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>(103, 1366)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>trellis_viterbi_combined_xx</key> - <param> - <key>id</key> - <value>trellis_viterbi_combined_xx_0_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>type</key> - <value>c</value> - </param> - <param> - <key>out_type</key> - <value>s</value> - </param> - <param> - <key>fsm_args</key> - <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_16.fsm"</value> - </param> - <param> - <key>block_size</key> - <value>1000</value> - </param> - <param> - <key>init_state</key> - <value>-1</value> - </param> - <param> - <key>final_state</key> - <value>-1</value> - </param> - <param> - <key>dim</key> + <key>width2</key> <value>1</value> </param> <param> - <key>table</key> - <value>alpha**0.5*1,alpha**0.5*1j,alpha**0.5*(-1j),alpha**0.5*(-1)</value> - </param> - <param> - <key>metric_type</key> - <value>digital.TRELLIS_EUCLIDEAN</value> - </param> - <param> - <key>alias</key> - <value></value> - </param> - <param> - <key>affinity</key> - <value></value> - </param> - <param> - <key>minoutbuf</key> - <value>0</value> + <key>color2</key> + <value>"red"</value> </param> <param> - <key>maxoutbuf</key> + <key>style2</key> <value>0</value> </param> <param> - <key>_coordinate</key> - <value>(75, 1494)</value> - </param> - <param> - <key>_rotation</key> + <key>marker2</key> <value>0</value> </param> - </block> - <block> - <key>trellis_viterbi_combined_xx</key> - <param> - <key>id</key> - <value>trellis_viterbi_combined_xx_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>type</key> - <value>c</value> - </param> <param> - <key>out_type</key> - <value>s</value> - </param> - <param> - <key>fsm_args</key> - <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_16.fsm"</value> - </param> - <param> - <key>block_size</key> - <value>1000</value> - </param> - <param> - <key>init_state</key> - <value>-1</value> - </param> - <param> - <key>final_state</key> - <value>-1</value> - </param> - <param> - <key>dim</key> - <value>1</value> - </param> - <param> - <key>table</key> - <value>(1-alpha)**0.5*1,(1-alpha)**0.5*1j,(1-alpha)**0.5*(-1j),(1-alpha)**0.5*(-1)</value> - </param> - <param> - <key>metric_type</key> - <value>digital.TRELLIS_EUCLIDEAN</value> + <key>alpha2</key> + <value>1.0</value> </param> <param> - <key>alias</key> + <key>label3</key> <value></value> </param> <param> - <key>affinity</key> - <value></value> + <key>width3</key> + <value>1</value> </param> <param> - <key>minoutbuf</key> - <value>0</value> + <key>color3</key> + <value>"red"</value> </param> <param> - <key>maxoutbuf</key> + <key>style3</key> <value>0</value> </param> <param> - <key>_coordinate</key> - <value>(83, 1111)</value> - </param> - <param> - <key>_rotation</key> + <key>marker3</key> <value>0</value> </param> - </block> - <block> - <key>blocks_add_xx</key> - <param> - <key>id</key> - <value>blocks_add_xx_1</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>type</key> - <value>complex</value> - </param> - <param> - <key>num_inputs</key> - <value>2</value> - </param> <param> - <key>vlen</key> - <value>1</value> + <key>alpha3</key> + <value>1.0</value> </param> <param> - <key>alias</key> + <key>label4</key> <value></value> </param> <param> - <key>affinity</key> - <value></value> + <key>width4</key> + <value>1</value> </param> <param> - <key>minoutbuf</key> - <value>0</value> + <key>color4</key> + <value>"red"</value> </param> <param> - <key>maxoutbuf</key> + <key>style4</key> <value>0</value> </param> <param> - <key>_coordinate</key> - <value>(1400, 262)</value> - </param> - <param> - <key>_rotation</key> + <key>marker4</key> <value>0</value> </param> - </block> - <block> - <key>qtgui_const_sink_x</key> <param> - <key>id</key> - <value>qtgui_const_sink_x_0</value> + <key>alpha4</key> + <value>1.0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>label5</key> + <value></value> </param> <param> - <key>type</key> - <value>complex</value> + <key>width5</key> + <value>1</value> </param> <param> - <key>name</key> - <value>Constellation</value> + <key>color5</key> + <value>"red"</value> </param> <param> <key>size</key> @@ -1715,26 +1549,6 @@ <value></value> </param> <param> - <key>tr_mode</key> - <value>qtgui.TRIG_MODE_FREE</value> - </param> - <param> - <key>tr_slope</key> - <value>qtgui.TRIG_SLOPE_POS</value> - </param> - <param> - <key>tr_level</key> - <value>0.0</value> - </param> - <param> - <key>tr_chan</key> - <value>0</value> - </param> - <param> - <key>tr_tag</key> - <value>""</value> - </param> - <param> <key>label1</key> <value></value> </param> @@ -1874,6 +1688,33 @@ <key>marker6</key> <value>0</value> </param> + </block> + <block> + <key>qtgui_number_sink</key> + <param> + <key>id</key> + <value>qtgui_number_sink_0_0_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>float</value> + </param> + <param> + <key>autoscale</key> + <value>False</value> + </param> + <param> + <key>avg</key> + <value>0.001</value> + </param> + <param> + <key>graph_type</key> + <value>qtgui.NUM_GRAPH_HORIZ</value> + </param> <param> <key>alpha6</key> <value>1.0</value> @@ -1975,110 +1816,12 @@ <value>1.0</value> </param> <param> - <key>alias</key> - <value></value> - </param> - <param> - <key>affinity</key> - <value></value> - </param> - <param> - <key>_coordinate</key> - <value>(1523, 255)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>blocks_sub_xx</key> - <param> - <key>id</key> - <value>blocks_sub_xx_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>type</key> - <value>short</value> - </param> - <param> - <key>vlen</key> - <value>1</value> - </param> - <param> - <key>num_inputs</key> - <value>2</value> - </param> - <param> - <key>alias</key> - <value></value> - </param> - <param> - <key>affinity</key> - <value></value> - </param> - <param> - <key>minoutbuf</key> - <value>0</value> - </param> - <param> - <key>maxoutbuf</key> - <value>0</value> - </param> - <param> - <key>_coordinate</key> - <value>(554, 464)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>blocks_multiply_xx</key> - <param> - <key>id</key> - <value>blocks_multiply_xx_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>type</key> - <value>short</value> - </param> - <param> - <key>num_inputs</key> - <value>2</value> - </param> - <param> - <key>vlen</key> - <value>1</value> - </param> - <param> - <key>alias</key> - <value></value> - </param> - <param> <key>affinity</key> <value></value> </param> <param> - <key>minoutbuf</key> - <value>0</value> - </param> - <param> - <key>maxoutbuf</key> - <value>0</value> - </param> - <param> <key>_coordinate</key> - <value>(773, 473)</value> + <value>(1537, 259)</value> </param> <param> <key>_rotation</key> @@ -2104,53 +1847,6 @@ <value>1</value> </param> <param> - <key>alias</key> - <value></value> - </param> - <param> - <key>affinity</key> - <value></value> - </param> - <param> - <key>minoutbuf</key> - <value>0</value> - </param> - <param> - <key>maxoutbuf</key> - <value>0</value> - </param> - <param> - <key>_coordinate</key> - <value>(925, 486)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>blocks_short_to_float</key> - <param> - <key>id</key> - <value>blocks_short_to_float_2</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>alias</key> - <value></value> - </param> - <param> <key>affinity</key> <value></value> </param> @@ -2164,7 +1860,7 @@ </param> <param> <key>_coordinate</key> - <value>(1010, 769)</value> + <value>(1010, 1551)</value> </param> <param> <key>_rotation</key> @@ -2175,7 +1871,7 @@ <key>qtgui_number_sink</key> <param> <key>id</key> - <value>qtgui_number_sink_0</value> + <value>qtgui_number_sink_0_0_0_0</value> </param> <param> <key>_enabled</key> @@ -2215,18 +1911,18 @@ </param> <param> <key>gui_hint</key> - <value>0,0,1,1</value> + <value>1,0,1,1</value> </param> <param> <key>label1</key> - <value>BER 1 (raw)</value> + <value>BER 2 (raw)</value> </param> <param> - <key>color1</key> + <key>color3</key> <value>("black", "black")</value> </param> <param> - <key>label2</key> + <key>label4</key> <value></value> </param> <param> @@ -2298,16 +1994,20 @@ <value>("black", "black")</value> </param> <param> - <key>alias</key> + <key>affinity</key> <value></value> </param> <param> - <key>affinity</key> - <value></value> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(1153, 436)</value> + <value>(1266, 1535)</value> </param> <param> <key>_rotation</key> @@ -2318,7 +2018,7 @@ <key>qtgui_number_sink</key> <param> <key>id</key> - <value>qtgui_number_sink_0_0</value> + <value>qtgui_number_sink_0</value> </param> <param> <key>_enabled</key> @@ -2358,11 +2058,11 @@ </param> <param> <key>gui_hint</key> - <value>0,1,1,1</value> + <value>0,0,1,1</value> </param> <param> <key>label1</key> - <value>BER 2 (raw)</value> + <value></value> </param> <param> <key>color1</key> @@ -2441,16 +2141,12 @@ <value>("black", "black")</value> </param> <param> - <key>alias</key> - <value></value> - </param> - <param> <key>affinity</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(1260, 719)</value> + <value>(1257, 471)</value> </param> <param> <key>_rotation</key> @@ -2461,7 +2157,7 @@ <key>qtgui_number_sink</key> <param> <key>id</key> - <value>qtgui_number_sink_0_0_0</value> + <value>qtgui_number_sink_0_0</value> </param> <param> <key>_enabled</key> @@ -2501,11 +2197,11 @@ </param> <param> <key>gui_hint</key> - <value>1,1,1,1</value> + <value>0,1,1,1</value> </param> <param> <key>label1</key> - <value>BER 2 (after cancelling user 1)</value> + <value>BER 2 (raw)</value> </param> <param> <key>color1</key> @@ -2520,7 +2216,7 @@ <value>("black", "black")</value> </param> <param> - <key>label3</key> + <key>label5</key> <value></value> </param> <param> @@ -2528,7 +2224,7 @@ <value>("black", "black")</value> </param> <param> - <key>label4</key> + <key>label6</key> <value></value> </param> <param> @@ -2536,19 +2232,51 @@ <value>("black", "black")</value> </param> <param> - <key>label5</key> - <value></value> + <key>autoscale</key> + <value>False</value> </param> <param> - <key>color5</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>min</key> + <value>-1</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>0,1,1,1</value> + </param> + <param> + <key>label1</key> + <value>BER 2 (raw)</value> + </param> + <param> + <key>color1</key> <value>("black", "black")</value> </param> <param> - <key>label6</key> + <key>label2</key> <value></value> </param> <param> - <key>color6</key> + <key>color2</key> <value>("black", "black")</value> </param> <param> @@ -2584,16 +2312,12 @@ <value>("black", "black")</value> </param> <param> - <key>alias</key> - <value></value> - </param> - <param> <key>affinity</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(1221, 1116)</value> + <value>(1271, 742)</value> </param> <param> <key>_rotation</key> @@ -2601,26 +2325,26 @@ </param> </block> <block> - <key>blocks_short_to_float</key> + <key>trellis_encoder_xx</key> <param> <key>id</key> - <value>blocks_short_to_float_1</value> + <value>trellis_encoder_xx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>type</key> + <value>ss</value> </param> <param> - <key>scale</key> - <value>1</value> + <key>fsm_args</key> + <value>prefix+"awgn1o2_16.fsm"</value> </param> <param> - <key>alias</key> - <value></value> + <key>init_state</key> + <value>0</value> </param> <param> <key>affinity</key> @@ -2636,7 +2360,7 @@ </param> <param> <key>_coordinate</key> - <value>(1006, 1153)</value> + <value>(340, 187)</value> </param> <param> <key>_rotation</key> @@ -2644,10 +2368,10 @@ </param> </block> <block> - <key>blocks_multiply_xx</key> + <key>trellis_encoder_xx</key> <param> <key>id</key> - <value>blocks_multiply_xx_2</value> + <value>trellis_encoder_xx_1</value> </param> <param> <key>_enabled</key> @@ -2655,19 +2379,15 @@ </param> <param> <key>type</key> - <value>short</value> - </param> - <param> - <key>num_inputs</key> - <value>2</value> + <value>ss</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>fsm_args</key> + <value>prefix+"awgn1o2_16.fsm"</value> </param> <param> - <key>alias</key> - <value></value> + <key>init_state</key> + <value>0</value> </param> <param> <key>affinity</key> @@ -2683,7 +2403,7 @@ </param> <param> <key>_coordinate</key> - <value>(796, 1136)</value> + <value>(336, 311)</value> </param> <param> <key>_rotation</key> @@ -2691,26 +2411,50 @@ </param> </block> <block> - <key>blocks_short_to_float</key> + <key>trellis_viterbi_combined_xx</key> <param> <key>id</key> - <value>blocks_short_to_float_1_0</value> + <value>trellis_viterbi_combined_xx_1</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>type</key> + <value>c</value> </param> <param> - <key>scale</key> + <key>out_type</key> + <value>s</value> + </param> + <param> + <key>fsm_args</key> + <value>prefix+"awgn1o2_16.fsm"</value> + </param> + <param> + <key>block_size</key> + <value>1000</value> + </param> + <param> + <key>init_state</key> + <value>-1</value> + </param> + <param> + <key>final_state</key> + <value>-1</value> + </param> + <param> + <key>dim</key> <value>1</value> </param> <param> - <key>alias</key> - <value></value> + <key>table</key> + <value>alpha**0.5*1,alpha**0.5*1j,alpha**0.5*(-1j),alpha**0.5*(-1)</value> + </param> + <param> + <key>metric_type</key> + <value>digital.TRELLIS_EUCLIDEAN</value> </param> <param> <key>affinity</key> @@ -2726,7 +2470,7 @@ </param> <param> <key>_coordinate</key> - <value>(1008, 1549)</value> + <value>(79, 501)</value> </param> <param> <key>_rotation</key> @@ -2734,10 +2478,10 @@ </param> </block> <block> - <key>qtgui_number_sink</key> + <key>trellis_viterbi_combined_xx</key> <param> <key>id</key> - <value>qtgui_number_sink_0_0_0_0</value> + <value>trellis_viterbi_combined_xx_2</value> </param> <param> <key>_enabled</key> @@ -2745,131 +2489,165 @@ </param> <param> <key>type</key> - <value>float</value> + <value>c</value> </param> <param> - <key>autoscale</key> - <value>False</value> + <key>out_type</key> + <value>s</value> </param> <param> - <key>avg</key> - <value>0.001</value> + <key>fsm_args</key> + <value>prefix+"awgn1o2_16.fsm"</value> </param> <param> - <key>graph_type</key> - <value>qtgui.NUM_GRAPH_HORIZ</value> + <key>block_size</key> + <value>1000</value> </param> <param> - <key>nconnections</key> - <value>1</value> + <key>init_state</key> + <value>-1</value> </param> <param> - <key>min</key> + <key>final_state</key> <value>-1</value> </param> <param> - <key>max</key> + <key>dim</key> <value>1</value> </param> <param> - <key>update_time</key> - <value>0.10</value> + <key>table</key> + <value>(1-alpha)**0.5*1,(1-alpha)**0.5*1j,(1-alpha)**0.5*(-1j),(1-alpha)**0.5*(-1)</value> </param> <param> - <key>gui_hint</key> - <value>1,0,1,1</value> + <key>metric_type</key> + <value>digital.TRELLIS_EUCLIDEAN</value> </param> <param> - <key>label1</key> - <value>BER 1 (after cancelling user 2)</value> + <key>affinity</key> + <value></value> </param> <param> - <key>color1</key> - <value>("black", "black")</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>label2</key> - <value></value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> - <key>color2</key> - <value>("black", "black")</value> + <key>_coordinate</key> + <value>(82, 766)</value> </param> <param> - <key>label3</key> - <value></value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>trellis_encoder_xx</key> <param> - <key>color3</key> - <value>("black", "black")</value> + <key>id</key> + <value>trellis_encoder_xx_2</value> </param> <param> - <key>label4</key> - <value></value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>color4</key> - <value>("black", "black")</value> + <key>type</key> + <value>ss</value> </param> <param> - <key>label5</key> - <value></value> + <key>fsm_args</key> + <value>prefix+"awgn1o2_16.fsm"</value> </param> <param> - <key>color5</key> - <value>("black", "black")</value> + <key>init_state</key> + <value>0</value> </param> <param> - <key>label6</key> + <key>affinity</key> <value></value> </param> <param> - <key>color6</key> - <value>("black", "black")</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>label7</key> - <value></value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> - <key>color7</key> - <value>("black", "black")</value> + <key>_coordinate</key> + <value>(89, 1000)</value> </param> <param> - <key>label8</key> - <value></value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>trellis_viterbi_combined_xx</key> <param> - <key>color8</key> - <value>("black", "black")</value> + <key>id</key> + <value>trellis_viterbi_combined_xx_0</value> </param> <param> - <key>label9</key> - <value></value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>color9</key> - <value>("black", "black")</value> + <key>type</key> + <value>c</value> </param> <param> - <key>label10</key> - <value></value> + <key>out_type</key> + <value>s</value> </param> <param> - <key>color10</key> - <value>("black", "black")</value> + <key>fsm_args</key> + <value>prefix+"awgn1o2_16.fsm"</value> </param> <param> - <key>alias</key> - <value></value> + <key>block_size</key> + <value>1000</value> + </param> + <param> + <key>init_state</key> + <value>-1</value> + </param> + <param> + <key>final_state</key> + <value>-1</value> + </param> + <param> + <key>dim</key> + <value>1</value> + </param> + <param> + <key>table</key> + <value>(1-alpha)**0.5*1,(1-alpha)**0.5*1j,(1-alpha)**0.5*(-1j),(1-alpha)**0.5*(-1)</value> + </param> + <param> + <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>(1271, 1507)</value> + <value>(83, 1111)</value> </param> <param> <key>_rotation</key> @@ -2877,58 +2655,42 @@ </param> </block> <block> - <key>variable_qtgui_range</key> + <key>trellis_encoder_xx</key> <param> <key>id</key> - <value>alpha</value> + <value>trellis_encoder_xx_2_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>P2/P</value> + <key>type</key> + <value>ss</value> </param> <param> - <key>value</key> - <value>.6</value> + <key>fsm_args</key> + <value>prefix+"awgn1o2_16.fsm"</value> </param> <param> - <key>start</key> + <key>init_state</key> <value>0</value> </param> <param> - <key>stop</key> - <value>1</value> - </param> - <param> - <key>step</key> - <value>.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> + <key>affinity</key> + <value></value> </param> <param> - <key>gui_hint</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>(164, 0)</value> + <value>(103, 1366)</value> </param> <param> <key>_rotation</key> @@ -2936,58 +2698,66 @@ </param> </block> <block> - <key>variable_qtgui_range</key> + <key>trellis_viterbi_combined_xx</key> <param> <key>id</key> - <value>snr_db</value> + <value>trellis_viterbi_combined_xx_0_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>P/sigma^2 (dB)</value> + <key>type</key> + <value>c</value> </param> <param> - <key>value</key> - <value>16</value> + <key>out_type</key> + <value>s</value> </param> <param> - <key>start</key> - <value>0</value> + <key>fsm_args</key> + <value>prefix+"awgn1o2_16.fsm"</value> </param> <param> - <key>stop</key> - <value>20</value> + <key>block_size</key> + <value>1000</value> </param> <param> - <key>step</key> - <value>1</value> + <key>init_state</key> + <value>-1</value> </param> <param> - <key>widget</key> - <value>counter_slider</value> + <key>final_state</key> + <value>-1</value> </param> <param> - <key>orient</key> - <value>Qt.Horizontal</value> + <key>dim</key> + <value>1</value> </param> <param> - <key>min_len</key> - <value>200</value> + <key>table</key> + <value>alpha**0.5*1,alpha**0.5*1j,alpha**0.5*(-1j),alpha**0.5*(-1)</value> </param> <param> - <key>gui_hint</key> - <value></value> + <key>metric_type</key> + <value>digital.TRELLIS_EUCLIDEAN</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>_coordinate</key> - <value>(310, 0)</value> + <value>(75, 1495)</value> </param> <param> <key>_rotation</key> @@ -3049,6 +2819,12 @@ <sink_key>0</sink_key> </connection> <connection> + <source_block_id>blocks_add_xx_1</source_block_id> + <sink_block_id>trellis_viterbi_combined_xx_1</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>blocks_sub_xx_0</sink_block_id> <source_key>0</source_key> @@ -3079,6 +2855,12 @@ <sink_key>0</sink_key> </connection> <connection> + <source_block_id>blocks_sub_xx_1</source_block_id> + <sink_block_id>blocks_multiply_xx_2</sink_block_id> + <source_key>0</source_key> + <sink_key>1</sink_key> + </connection> + <connection> <source_block_id>blocks_sub_xx_2</source_block_id> <sink_block_id>trellis_viterbi_combined_xx_0</sink_block_id> <source_key>0</source_key> @@ -3248,12 +3030,6 @@ </connection> <connection> <source_block_id>blocks_add_xx_1</source_block_id> - <sink_block_id>trellis_viterbi_combined_xx_1</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>qtgui_const_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> @@ -3283,12 +3059,6 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_sub_xx_1</source_block_id> - <sink_block_id>blocks_multiply_xx_2</sink_block_id> - <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_0_0_0</sink_block_id> <source_key>0</source_key> |