[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 05/07: trellis: minor fixups to trellis exa
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 05/07: trellis: minor fixups to trellis examples so prefix doesn't need to end with '/'. |
|
Date: |
Mon, 28 Jul 2014 18:42:38 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch master
in repository gnuradio.
commit 94be0b4b8ad5b303a901cc2da9e9fc7379102f05
Author: Tom Rondeau <address@hidden>
Date: Mon Jul 28 14:10:44 2014 -0400
trellis: minor fixups to trellis examples so prefix doesn't need to end
with '/'.
---
.../examples/grc/interference_cancellation.grc | 1865 +++++++++++++-------
gr-trellis/examples/grc/pccc.grc | 639 ++++---
gr-trellis/examples/grc/pccc1.grc | 576 +++---
gr-trellis/examples/grc/sccc.grc | 186 +-
gr-trellis/examples/grc/sccc1.grc | 190 +-
5 files changed, 2333 insertions(+), 1123 deletions(-)
diff --git a/gr-trellis/examples/grc/interference_cancellation.grc
b/gr-trellis/examples/grc/interference_cancellation.grc
index fa969f1..2ccc723 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>Wed Jul 23 09:31:45 2014</timestamp>
+ <timestamp>Mon Jul 28 14:00:18 2014</timestamp>
<block>
<key>options</key>
<param>
@@ -52,6 +52,10 @@
<value></value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(10, 10)</value>
</param>
@@ -64,7 +68,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>R</value>
+ <value>prefix</value>
</param>
<param>
<key>_enabled</key>
@@ -72,11 +76,15 @@
</param>
<param>
<key>value</key>
- <value>100e3</value>
+ <value>"@FSM_FILE_INSTALL_DIR@"</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(502, 10)</value>
+ <value>(660, 11)</value>
</param>
<param>
<key>_rotation</key>
@@ -98,8 +106,12 @@
<value>1000</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>_coordinate</key>
- <value>(765, 10)</value>
+ <value>(583, 10)</value>
</param>
<param>
<key>_rotation</key>
@@ -110,7 +122,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>noisevar</value>
+ <value>R</value>
</param>
<param>
<key>_enabled</key>
@@ -118,11 +130,15 @@
</param>
<param>
<key>value</key>
- <value>10**(-snr_db/10)</value>
+ <value>100e3</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(428, 10)</value>
+ <value>(502, 10)</value>
</param>
<param>
<key>_rotation</key>
@@ -133,7 +149,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>prefix</value>
+ <value>noisevar</value>
</param>
<param>
<key>_enabled</key>
@@ -141,11 +157,15 @@
</param>
<param>
<key>value</key>
- <value>"@FSM_FILE_INSTALL_DIR@"</value>
+ <value>10**(-snr_db/10)</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(578, 10)</value>
+ <value>(428, 10)</value>
</param>
<param>
<key>_rotation</key>
@@ -183,6 +203,10 @@
<value>True</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -234,6 +258,10 @@
<value>True</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -277,6 +305,10 @@
<value>2</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -320,6 +352,10 @@
<value>1</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -363,49 +399,10 @@
<value>2</value>
</param>
<param>
- <key>affinity</key>
+ <key>alias</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, 792)</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_1</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>
@@ -419,7 +416,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(785, 779)</value>
+ <value>(535, 792)</value>
</param>
<param>
<key>_rotation</key>
@@ -449,6 +446,10 @@
<value>2</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -492,49 +493,10 @@
<value>2</value>
</param>
<param>
- <key>affinity</key>
+ <key>alias</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>
@@ -548,7 +510,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(796, 1136)</value>
+ <value>(540, 1141)</value>
</param>
<param>
<key>_rotation</key>
@@ -578,6 +540,10 @@
<value>2</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -621,49 +587,10 @@
<value>2</value>
</param>
<param>
- <key>affinity</key>
+ <key>alias</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>(559, 1536)</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_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>
@@ -677,7 +604,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(771, 1530)</value>
+ <value>(559, 1536)</value>
</param>
<param>
<key>_rotation</key>
@@ -707,6 +634,10 @@
<value>1</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -754,6 +685,10 @@
<value>-42</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -801,6 +736,10 @@
<value>True</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -844,6 +783,10 @@
<value>1</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -895,6 +838,10 @@
<value>1</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -938,6 +885,10 @@
<value>1</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -989,6 +940,10 @@
<value>1</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -1036,8 +991,12 @@
<value>1</value>
</param>
<param>
- <key>_rotation</key>
- <value>0</value>
+ <key>num_ports</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
</param>
<param>
<key>affinity</key>
@@ -1083,6 +1042,10 @@
<value>1</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -1126,6 +1089,10 @@
<value>1</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -1177,6 +1144,10 @@
<value>1</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -1244,6 +1215,10 @@
<value></value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(177, 10)</value>
</param>
@@ -1299,6 +1274,10 @@
<value></value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(300, 10)</value>
</param>
@@ -1330,6 +1309,10 @@
<value>1</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -1373,6 +1356,10 @@
<value>1024</value>
</param>
<param>
+ <key>grid</key>
+ <value>False</value>
+ </param>
+ <param>
<key>autoscale</key>
<value>False</value>
</param>
@@ -1405,6 +1392,26 @@
<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>
@@ -1513,168 +1520,24 @@
<value>"red"</value>
</param>
<param>
- <key>size</key>
- <value>1024</value>
+ <key>style5</key>
+ <value>0</value>
</param>
<param>
- <key>autoscale</key>
- <value>False</value>
+ <key>marker5</key>
+ <value>0</value>
</param>
<param>
- <key>ymin</key>
- <value>-2</value>
+ <key>alpha5</key>
+ <value>1.0</value>
</param>
<param>
- <key>ymax</key>
- <value>2</value>
+ <key>label6</key>
+ <value></value>
</param>
<param>
- <key>xmin</key>
- <value>-2</value>
- </param>
- <param>
- <key>xmax</key>
- <value>2</value>
- </param>
- <param>
- <key>nconnections</key>
- <value>1</value>
- </param>
- <param>
- <key>update_time</key>
- <value>0.10</value>
- </param>
- <param>
- <key>gui_hint</key>
- <value></value>
- </param>
- <param>
- <key>label1</key>
- <value></value>
- </param>
- <param>
- <key>width1</key>
- <value>1</value>
- </param>
- <param>
- <key>color1</key>
- <value>"blue"</value>
- </param>
- <param>
- <key>style1</key>
- <value>0</value>
- </param>
- <param>
- <key>marker1</key>
- <value>0</value>
- </param>
- <param>
- <key>alpha1</key>
- <value>1.0</value>
- </param>
- <param>
- <key>label2</key>
- <value></value>
- </param>
- <param>
- <key>width2</key>
- <value>1</value>
- </param>
- <param>
- <key>color2</key>
- <value>"red"</value>
- </param>
- <param>
- <key>style2</key>
- <value>0</value>
- </param>
- <param>
- <key>marker2</key>
- <value>0</value>
- </param>
- <param>
- <key>alpha2</key>
- <value>1.0</value>
- </param>
- <param>
- <key>label3</key>
- <value></value>
- </param>
- <param>
- <key>width3</key>
- <value>1</value>
- </param>
- <param>
- <key>color3</key>
- <value>"red"</value>
- </param>
- <param>
- <key>style3</key>
- <value>0</value>
- </param>
- <param>
- <key>marker3</key>
- <value>0</value>
- </param>
- <param>
- <key>alpha3</key>
- <value>1.0</value>
- </param>
- <param>
- <key>label4</key>
- <value></value>
- </param>
- <param>
- <key>width4</key>
- <value>1</value>
- </param>
- <param>
- <key>color4</key>
- <value>"red"</value>
- </param>
- <param>
- <key>style4</key>
- <value>0</value>
- </param>
- <param>
- <key>marker4</key>
- <value>0</value>
- </param>
- <param>
- <key>alpha4</key>
- <value>1.0</value>
- </param>
- <param>
- <key>label5</key>
- <value></value>
- </param>
- <param>
- <key>width5</key>
- <value>1</value>
- </param>
- <param>
- <key>color5</key>
- <value>"red"</value>
- </param>
- <param>
- <key>style5</key>
- <value>0</value>
- </param>
- <param>
- <key>marker5</key>
- <value>0</value>
- </param>
- <param>
- <key>alpha5</key>
- <value>1.0</value>
- </param>
- <param>
- <key>label6</key>
- <value></value>
- </param>
- <param>
- <key>width6</key>
- <value>1</value>
+ <key>width6</key>
+ <value>1</value>
</param>
<param>
<key>color6</key>
@@ -1688,33 +1551,6 @@
<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>
@@ -1816,12 +1652,16 @@
<value>1.0</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(1537, 259)</value>
+ <value>(0, 0)</value>
</param>
<param>
<key>_rotation</key>
@@ -1847,6 +1687,10 @@
<value>1</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -1871,13 +1715,17 @@
<key>qtgui_number_sink</key>
<param>
<key>id</key>
- <value>qtgui_number_sink_0_0_0_0</value>
+ <value>qtgui_number_sink_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
+ <key>name</key>
+ <value>""</value>
+ </param>
+ <param>
<key>type</key>
<value>float</value>
</param>
@@ -1911,18 +1759,30 @@
</param>
<param>
<key>gui_hint</key>
- <value>1,0,1,1</value>
+ <value>0,0,1,1</value>
</param>
<param>
<key>label1</key>
- <value>BER 2 (raw)</value>
+ <value></value>
</param>
<param>
- <key>color3</key>
+ <key>unit1</key>
+ <value></value>
+ </param>
+ <param>
+ <key>color1</key>
<value>("black", "black")</value>
</param>
<param>
- <key>label4</key>
+ <key>factor1</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>label2</key>
+ <value></value>
+ </param>
+ <param>
+ <key>unit2</key>
<value></value>
</param>
<param>
@@ -1930,84 +1790,616 @@
<value>("black", "black")</value>
</param>
<param>
+ <key>factor2</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label3</key>
<value></value>
</param>
<param>
+ <key>unit3</key>
+ <value></value>
+ </param>
+ <param>
<key>color3</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor3</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label4</key>
<value></value>
</param>
<param>
+ <key>unit4</key>
+ <value></value>
+ </param>
+ <param>
<key>color4</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor4</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label5</key>
<value></value>
</param>
<param>
+ <key>unit5</key>
+ <value></value>
+ </param>
+ <param>
<key>color5</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor5</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label6</key>
<value></value>
</param>
<param>
+ <key>unit6</key>
+ <value></value>
+ </param>
+ <param>
<key>color6</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor6</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label7</key>
<value></value>
</param>
<param>
+ <key>unit7</key>
+ <value></value>
+ </param>
+ <param>
<key>color7</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor7</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label8</key>
<value></value>
</param>
<param>
+ <key>unit8</key>
+ <value></value>
+ </param>
+ <param>
<key>color8</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor8</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label9</key>
<value></value>
</param>
<param>
+ <key>unit9</key>
+ <value></value>
+ </param>
+ <param>
<key>color9</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor9</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label10</key>
<value></value>
</param>
<param>
+ <key>unit10</key>
+ <value></value>
+ </param>
+ <param>
<key>color10</key>
<value>("black", "black")</value>
</param>
<param>
- <key>affinity</key>
- <value></value>
+ <key>factor10</key>
+ <value>1</value>
</param>
<param>
- <key>minoutbuf</key>
- <value>0</value>
+ <key>alias</key>
+ <value></value>
</param>
<param>
- <key>maxoutbuf</key>
- <value>0</value>
+ <key>affinity</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(1266, 1535)</value>
+ <value>(1257, 471)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>trellis_encoder_xx</key>
+ <param>
+ <key>id</key>
+ <value>trellis_encoder_xx_1</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+"/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>
+ </param>
+ <param>
+ <key>minoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(336, 311)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>trellis_encoder_xx</key>
+ <param>
+ <key>id</key>
+ <value>trellis_encoder_xx_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+"/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>
+ </param>
+ <param>
+ <key>minoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(340, 187)</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_1</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+"/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>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>
+ </param>
+ <param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(79, 501)</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_2</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+"/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>
+ </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>(82, 766)</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</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+"/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>
+ </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>(83, 1111)</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+"/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>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>
+ </param>
+ <param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(75, 1495)</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_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>(771, 1530)</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_1</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>
+ <param>
+ <key>minoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(985, 1608)</value>
</param>
<param>
<key>_rotation</key>
@@ -2018,13 +2410,17 @@
<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>
<value>True</value>
</param>
<param>
+ <key>name</key>
+ <value>""</value>
+ </param>
+ <param>
<key>type</key>
<value>float</value>
</param>
@@ -2058,10 +2454,14 @@
</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 2 (raw)</value>
+ </param>
+ <param>
+ <key>unit1</key>
<value></value>
</param>
<param>
@@ -2069,84 +2469,301 @@
<value>("black", "black")</value>
</param>
<param>
+ <key>factor1</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label2</key>
<value></value>
</param>
<param>
+ <key>unit2</key>
+ <value></value>
+ </param>
+ <param>
<key>color2</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor2</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label3</key>
<value></value>
</param>
<param>
+ <key>unit3</key>
+ <value></value>
+ </param>
+ <param>
<key>color3</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor3</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label4</key>
<value></value>
</param>
<param>
+ <key>unit4</key>
+ <value></value>
+ </param>
+ <param>
<key>color4</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor4</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label5</key>
<value></value>
</param>
<param>
+ <key>unit5</key>
+ <value></value>
+ </param>
+ <param>
<key>color5</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor5</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label6</key>
<value></value>
</param>
<param>
+ <key>unit6</key>
+ <value></value>
+ </param>
+ <param>
<key>color6</key>
<value>("black", "black")</value>
</param>
<param>
- <key>label7</key>
- <value></value>
+ <key>factor6</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>label7</key>
+ <value></value>
+ </param>
+ <param>
+ <key>unit7</key>
+ <value></value>
+ </param>
+ <param>
+ <key>color7</key>
+ <value>("black", "black")</value>
+ </param>
+ <param>
+ <key>factor7</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>label8</key>
+ <value></value>
+ </param>
+ <param>
+ <key>unit8</key>
+ <value></value>
+ </param>
+ <param>
+ <key>color8</key>
+ <value>("black", "black")</value>
+ </param>
+ <param>
+ <key>factor8</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>label9</key>
+ <value></value>
+ </param>
+ <param>
+ <key>unit9</key>
+ <value></value>
+ </param>
+ <param>
+ <key>color9</key>
+ <value>("black", "black")</value>
+ </param>
+ <param>
+ <key>factor9</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>label10</key>
+ <value></value>
+ </param>
+ <param>
+ <key>unit10</key>
+ <value></value>
+ </param>
+ <param>
+ <key>color10</key>
+ <value>("black", "black")</value>
+ </param>
+ <param>
+ <key>factor10</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
+ <key>affinity</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(1272, 1551)</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_1</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>(785, 779)</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>
+ <param>
+ <key>minoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>maxoutbuf</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(1013, 735)</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>color7</key>
- <value>("black", "black")</value>
+ <key>type</key>
+ <value>short</value>
</param>
<param>
- <key>label8</key>
- <value></value>
+ <key>num_inputs</key>
+ <value>2</value>
</param>
<param>
- <key>color8</key>
- <value>("black", "black")</value>
+ <key>vlen</key>
+ <value>1</value>
</param>
<param>
- <key>label9</key>
+ <key>alias</key>
<value></value>
</param>
<param>
- <key>color9</key>
- <value>("black", "black")</value>
- </param>
- <param>
- <key>label10</key>
+ <key>affinity</key>
<value></value>
</param>
<param>
- <key>color10</key>
- <value>("black", "black")</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>(1257, 471)</value>
+ <value>(796, 1136)</value>
</param>
<param>
<key>_rotation</key>
@@ -2154,82 +2771,65 @@
</param>
</block>
<block>
- <key>qtgui_number_sink</key>
+ <key>blocks_short_to_float</key>
<param>
<key>id</key>
- <value>qtgui_number_sink_0_0</value>
+ <value>blocks_short_to_float_3</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>nconnections</key>
+ <key>vlen</key>
<value>1</value>
</param>
<param>
- <key>min</key>
- <value>-1</value>
- </param>
- <param>
- <key>max</key>
+ <key>scale</key>
<value>1</value>
</param>
<param>
- <key>update_time</key>
- <value>0.10</value>
+ <key>alias</key>
+ <value></value>
</param>
<param>
- <key>gui_hint</key>
- <value>0,1,1,1</value>
+ <key>affinity</key>
+ <value></value>
</param>
<param>
- <key>label1</key>
- <value>BER 2 (raw)</value>
+ <key>minoutbuf</key>
+ <value>0</value>
</param>
<param>
- <key>color1</key>
- <value>("black", "black")</value>
+ <key>maxoutbuf</key>
+ <value>0</value>
</param>
<param>
- <key>label2</key>
- <value></value>
+ <key>_coordinate</key>
+ <value>(1002, 1149)</value>
</param>
<param>
- <key>color2</key>
- <value>("black", "black")</value>
+ <key>_rotation</key>
+ <value>0</value>
</param>
+ </block>
+ <block>
+ <key>qtgui_number_sink</key>
<param>
- <key>label5</key>
- <value></value>
+ <key>id</key>
+ <value>qtgui_number_sink_0_0</value>
</param>
<param>
- <key>color3</key>
- <value>("black", "black")</value>
+ <key>_enabled</key>
+ <value>True</value>
</param>
<param>
- <key>label6</key>
- <value></value>
+ <key>name</key>
+ <value>""</value>
</param>
<param>
- <key>color4</key>
- <value>("black", "black")</value>
+ <key>type</key>
+ <value>float</value>
</param>
<param>
<key>autoscale</key>
@@ -2268,209 +2868,172 @@
<value>BER 2 (raw)</value>
</param>
<param>
- <key>color1</key>
- <value>("black", "black")</value>
- </param>
- <param>
- <key>label2</key>
+ <key>unit1</key>
<value></value>
</param>
<param>
- <key>color2</key>
+ <key>color1</key>
<value>("black", "black")</value>
</param>
<param>
- <key>label7</key>
- <value></value>
- </param>
- <param>
- <key>color7</key>
- <value>("black", "black")</value>
+ <key>factor1</key>
+ <value>1</value>
</param>
<param>
- <key>label8</key>
+ <key>label2</key>
<value></value>
</param>
<param>
- <key>color8</key>
- <value>("black", "black")</value>
- </param>
- <param>
- <key>label9</key>
+ <key>unit2</key>
<value></value>
</param>
<param>
- <key>color9</key>
+ <key>color2</key>
<value>("black", "black")</value>
</param>
<param>
- <key>label10</key>
- <value></value>
- </param>
- <param>
- <key>color10</key>
- <value>("black", "black")</value>
+ <key>factor2</key>
+ <value>1</value>
</param>
<param>
- <key>affinity</key>
+ <key>label3</key>
<value></value>
</param>
<param>
- <key>_coordinate</key>
- <value>(1271, 742)</value>
+ <key>unit3</key>
+ <value></value>
</param>
<param>
- <key>_rotation</key>
- <value>0</value>
+ <key>color3</key>
+ <value>("black", "black")</value>
</param>
- </block>
- <block>
- <key>trellis_encoder_xx</key>
<param>
- <key>id</key>
- <value>trellis_encoder_xx_0</value>
+ <key>factor3</key>
+ <value>1</value>
</param>
<param>
- <key>_enabled</key>
- <value>True</value>
+ <key>label4</key>
+ <value></value>
</param>
<param>
- <key>type</key>
- <value>ss</value>
+ <key>unit4</key>
+ <value></value>
</param>
<param>
- <key>fsm_args</key>
- <value>prefix+"awgn1o2_16.fsm"</value>
+ <key>color4</key>
+ <value>("black", "black")</value>
</param>
<param>
- <key>init_state</key>
- <value>0</value>
+ <key>factor4</key>
+ <value>1</value>
</param>
<param>
- <key>affinity</key>
+ <key>label5</key>
<value></value>
</param>
<param>
- <key>minoutbuf</key>
- <value>0</value>
- </param>
- <param>
- <key>maxoutbuf</key>
- <value>0</value>
+ <key>unit5</key>
+ <value></value>
</param>
<param>
- <key>_coordinate</key>
- <value>(340, 187)</value>
+ <key>color5</key>
+ <value>("black", "black")</value>
</param>
<param>
- <key>_rotation</key>
- <value>0</value>
+ <key>factor5</key>
+ <value>1</value>
</param>
- </block>
- <block>
- <key>trellis_encoder_xx</key>
<param>
- <key>id</key>
- <value>trellis_encoder_xx_1</value>
+ <key>label6</key>
+ <value></value>
</param>
<param>
- <key>_enabled</key>
- <value>True</value>
+ <key>unit6</key>
+ <value></value>
</param>
<param>
- <key>type</key>
- <value>ss</value>
+ <key>color6</key>
+ <value>("black", "black")</value>
</param>
<param>
- <key>fsm_args</key>
- <value>prefix+"awgn1o2_16.fsm"</value>
+ <key>factor6</key>
+ <value>1</value>
</param>
<param>
- <key>init_state</key>
- <value>0</value>
+ <key>label7</key>
+ <value></value>
</param>
<param>
- <key>affinity</key>
+ <key>unit7</key>
<value></value>
</param>
<param>
- <key>minoutbuf</key>
- <value>0</value>
+ <key>color7</key>
+ <value>("black", "black")</value>
</param>
<param>
- <key>maxoutbuf</key>
- <value>0</value>
+ <key>factor7</key>
+ <value>1</value>
</param>
<param>
- <key>_coordinate</key>
- <value>(336, 311)</value>
+ <key>label8</key>
+ <value></value>
</param>
<param>
- <key>_rotation</key>
- <value>0</value>
+ <key>unit8</key>
+ <value></value>
</param>
- </block>
- <block>
- <key>trellis_viterbi_combined_xx</key>
<param>
- <key>id</key>
- <value>trellis_viterbi_combined_xx_1</value>
+ <key>color8</key>
+ <value>("black", "black")</value>
</param>
<param>
- <key>_enabled</key>
- <value>True</value>
+ <key>factor8</key>
+ <value>1</value>
</param>
<param>
- <key>type</key>
- <value>c</value>
+ <key>label9</key>
+ <value></value>
</param>
<param>
- <key>out_type</key>
- <value>s</value>
+ <key>unit9</key>
+ <value></value>
</param>
<param>
- <key>fsm_args</key>
- <value>prefix+"awgn1o2_16.fsm"</value>
+ <key>color9</key>
+ <value>("black", "black")</value>
</param>
<param>
- <key>block_size</key>
- <value>1000</value>
+ <key>factor9</key>
+ <value>1</value>
</param>
<param>
- <key>init_state</key>
- <value>-1</value>
+ <key>label10</key>
+ <value></value>
</param>
<param>
- <key>final_state</key>
- <value>-1</value>
+ <key>unit10</key>
+ <value></value>
</param>
<param>
- <key>dim</key>
- <value>1</value>
+ <key>color10</key>
+ <value>("black", "black")</value>
</param>
<param>
- <key>table</key>
-
<value>alpha**0.5*1,alpha**0.5*1j,alpha**0.5*(-1j),alpha**0.5*(-1)</value>
+ <key>factor10</key>
+ <value>1</value>
</param>
<param>
- <key>metric_type</key>
- <value>digital.TRELLIS_EUCLIDEAN</value>
+ <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>(79, 501)</value>
+ <value>(1223, 1133)</value>
</param>
<param>
<key>_rotation</key>
@@ -2478,10 +3041,10 @@
</param>
</block>
<block>
- <key>trellis_viterbi_combined_xx</key>
+ <key>trellis_encoder_xx</key>
<param>
<key>id</key>
- <value>trellis_viterbi_combined_xx_2</value>
+ <value>trellis_encoder_xx_2_0</value>
</param>
<param>
<key>_enabled</key>
@@ -2489,39 +3052,19 @@
</param>
<param>
<key>type</key>
- <value>c</value>
- </param>
- <param>
- <key>out_type</key>
- <value>s</value>
+ <value>ss</value>
</param>
<param>
<key>fsm_args</key>
- <value>prefix+"awgn1o2_16.fsm"</value>
- </param>
- <param>
- <key>block_size</key>
- <value>1000</value>
+ <value>prefix+"/awgn1o2_16.fsm"</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>
+ <value>0</value>
</param>
<param>
- <key>metric_type</key>
- <value>digital.TRELLIS_EUCLIDEAN</value>
+ <key>alias</key>
+ <value></value>
</param>
<param>
<key>affinity</key>
@@ -2537,7 +3080,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(82, 766)</value>
+ <value>(103, 1366)</value>
</param>
<param>
<key>_rotation</key>
@@ -2560,13 +3103,17 @@
</param>
<param>
<key>fsm_args</key>
- <value>prefix+"awgn1o2_16.fsm"</value>
+ <value>prefix+"/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>
</param>
@@ -2588,176 +3135,226 @@
</param>
</block>
<block>
- <key>trellis_viterbi_combined_xx</key>
+ <key>qtgui_number_sink</key>
<param>
<key>id</key>
- <value>trellis_viterbi_combined_xx_0</value>
+ <value>qtgui_number_sink_0_0_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
+ <key>name</key>
+ <value>""</value>
+ </param>
+ <param>
<key>type</key>
- <value>c</value>
+ <value>float</value>
</param>
<param>
- <key>out_type</key>
- <value>s</value>
+ <key>autoscale</key>
+ <value>False</value>
</param>
<param>
- <key>fsm_args</key>
- <value>prefix+"awgn1o2_16.fsm"</value>
+ <key>avg</key>
+ <value>0.001</value>
</param>
<param>
- <key>block_size</key>
- <value>1000</value>
+ <key>graph_type</key>
+ <value>qtgui.NUM_GRAPH_HORIZ</value>
</param>
<param>
- <key>init_state</key>
- <value>-1</value>
+ <key>nconnections</key>
+ <value>1</value>
</param>
<param>
- <key>final_state</key>
+ <key>min</key>
<value>-1</value>
</param>
<param>
- <key>dim</key>
+ <key>max</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>
+ <key>update_time</key>
+ <value>0.10</value>
</param>
<param>
- <key>metric_type</key>
- <value>digital.TRELLIS_EUCLIDEAN</value>
+ <key>gui_hint</key>
+ <value>1,1,1,1</value>
</param>
<param>
- <key>affinity</key>
+ <key>label1</key>
<value></value>
</param>
<param>
- <key>minoutbuf</key>
- <value>0</value>
+ <key>unit1</key>
+ <value></value>
</param>
<param>
- <key>maxoutbuf</key>
- <value>0</value>
+ <key>color1</key>
+ <value>("black", "black")</value>
</param>
<param>
- <key>_coordinate</key>
- <value>(83, 1111)</value>
+ <key>factor1</key>
+ <value>1</value>
</param>
<param>
- <key>_rotation</key>
- <value>0</value>
+ <key>label2</key>
+ <value></value>
</param>
- </block>
- <block>
- <key>trellis_encoder_xx</key>
<param>
- <key>id</key>
- <value>trellis_encoder_xx_2_0</value>
+ <key>unit2</key>
+ <value></value>
</param>
<param>
- <key>_enabled</key>
- <value>True</value>
+ <key>color2</key>
+ <value>("black", "black")</value>
</param>
<param>
- <key>type</key>
- <value>ss</value>
+ <key>factor2</key>
+ <value>1</value>
</param>
<param>
- <key>fsm_args</key>
- <value>prefix+"awgn1o2_16.fsm"</value>
+ <key>label3</key>
+ <value></value>
</param>
<param>
- <key>init_state</key>
- <value>0</value>
+ <key>unit3</key>
+ <value></value>
</param>
<param>
- <key>affinity</key>
+ <key>color3</key>
+ <value>("black", "black")</value>
+ </param>
+ <param>
+ <key>factor3</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>label4</key>
<value></value>
</param>
<param>
- <key>minoutbuf</key>
- <value>0</value>
+ <key>unit4</key>
+ <value></value>
</param>
<param>
- <key>maxoutbuf</key>
- <value>0</value>
+ <key>color4</key>
+ <value>("black", "black")</value>
</param>
<param>
- <key>_coordinate</key>
- <value>(103, 1366)</value>
+ <key>factor4</key>
+ <value>1</value>
</param>
<param>
- <key>_rotation</key>
- <value>0</value>
+ <key>label5</key>
+ <value></value>
</param>
- </block>
- <block>
- <key>trellis_viterbi_combined_xx</key>
<param>
- <key>id</key>
- <value>trellis_viterbi_combined_xx_0_0</value>
+ <key>unit5</key>
+ <value></value>
</param>
<param>
- <key>_enabled</key>
- <value>True</value>
+ <key>color5</key>
+ <value>("black", "black")</value>
</param>
<param>
- <key>type</key>
- <value>c</value>
+ <key>factor5</key>
+ <value>1</value>
</param>
<param>
- <key>out_type</key>
- <value>s</value>
+ <key>label6</key>
+ <value></value>
</param>
<param>
- <key>fsm_args</key>
- <value>prefix+"awgn1o2_16.fsm"</value>
+ <key>unit6</key>
+ <value></value>
</param>
<param>
- <key>block_size</key>
- <value>1000</value>
+ <key>color6</key>
+ <value>("black", "black")</value>
</param>
<param>
- <key>init_state</key>
- <value>-1</value>
+ <key>factor6</key>
+ <value>1</value>
</param>
<param>
- <key>final_state</key>
- <value>-1</value>
+ <key>label7</key>
+ <value></value>
</param>
<param>
- <key>dim</key>
+ <key>unit7</key>
+ <value></value>
+ </param>
+ <param>
+ <key>color7</key>
+ <value>("black", "black")</value>
+ </param>
+ <param>
+ <key>factor7</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>
+ <key>label8</key>
+ <value></value>
</param>
<param>
- <key>metric_type</key>
- <value>digital.TRELLIS_EUCLIDEAN</value>
+ <key>unit8</key>
+ <value></value>
</param>
<param>
- <key>affinity</key>
+ <key>color8</key>
+ <value>("black", "black")</value>
+ </param>
+ <param>
+ <key>factor8</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>label9</key>
<value></value>
</param>
<param>
- <key>minoutbuf</key>
- <value>0</value>
+ <key>unit9</key>
+ <value></value>
</param>
<param>
- <key>maxoutbuf</key>
- <value>0</value>
+ <key>color9</key>
+ <value>("black", "black")</value>
+ </param>
+ <param>
+ <key>factor9</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>label10</key>
+ <value></value>
+ </param>
+ <param>
+ <key>unit10</key>
+ <value></value>
+ </param>
+ <param>
+ <key>color10</key>
+ <value>("black", "black")</value>
+ </param>
+ <param>
+ <key>factor10</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
+ <key>affinity</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(75, 1495)</value>
+ <value>(1266, 720)</value>
</param>
<param>
<key>_rotation</key>
@@ -2807,12 +3404,6 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>blocks_multiply_xx_2</source_block_id>
- <sink_block_id>blocks_short_to_float_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>trellis_encoder_xx_0</sink_block_id>
<source_key>0</source_key>
@@ -2885,12 +3476,6 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>blocks_multiply_xx_1</source_block_id>
- <sink_block_id>blocks_short_to_float_2</sink_block_id>
- <source_key>0</source_key>
- <sink_key>0</sink_key>
- </connection>
- <connection>
<source_block_id>trellis_viterbi_combined_xx_2</source_block_id>
<sink_block_id>blocks_sub_xx_3</sink_block_id>
<source_key>0</source_key>
@@ -2921,12 +3506,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>trellis_viterbi_combined_xx_0_0</source_block_id>
<sink_block_id>blocks_sub_xx_1_0</sink_block_id>
<source_key>0</source_key>
@@ -3047,20 +3626,38 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>blocks_short_to_float_2</source_block_id>
- <sink_block_id>qtgui_number_sink_0_0</sink_block_id>
+ <source_block_id>blocks_multiply_xx_2_0</source_block_id>
+ <sink_block_id>blocks_short_to_float_1</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>blocks_short_to_float_1</source_block_id>
+ <sink_block_id>qtgui_number_sink_0_0_0_0</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+ <connection>
+ <source_block_id>blocks_multiply_xx_1</source_block_id>
+ <sink_block_id>blocks_short_to_float_2</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+ <connection>
+ <source_block_id>blocks_short_to_float_2</source_block_id>
<sink_block_id>qtgui_number_sink_0_0_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_0_0_0</sink_block_id>
+ <source_block_id>blocks_multiply_xx_2</source_block_id>
+ <sink_block_id>blocks_short_to_float_3</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+ <connection>
+ <source_block_id>blocks_short_to_float_3</source_block_id>
+ <sink_block_id>qtgui_number_sink_0_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
diff --git a/gr-trellis/examples/grc/pccc.grc b/gr-trellis/examples/grc/pccc.grc
index e4f4dda..c642a71 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>Tue Jul 22 09:01:43 2014</timestamp>
+ <timestamp>Mon Jul 28 14:02:43 2014</timestamp>
<block>
<key>options</key>
<param>
@@ -52,6 +52,10 @@
<value></value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(10, 10)</value>
</param>
@@ -64,7 +68,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>block</value>
+ <value>prefix</value>
</param>
<param>
<key>_enabled</key>
@@ -72,11 +76,15 @@
</param>
<param>
<key>value</key>
- <value>1000</value>
+ <value>"@FSM_FILE_INSTALL_DIR@"</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(621, 10)</value>
+ <value>(520, 11)</value>
</param>
<param>
<key>_rotation</key>
@@ -87,7 +95,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>prefix</value>
+ <value>noisevar</value>
</param>
<param>
<key>_enabled</key>
@@ -95,11 +103,15 @@
</param>
<param>
<key>value</key>
- <value>"@FSM_FILE_INSTALL_DIR@"</value>
+ <value>10**(-snr_db/10)</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(434, 10)</value>
+ <value>(279, 10)</value>
</param>
<param>
<key>_rotation</key>
@@ -121,6 +133,10 @@
<value>100e3</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(358, 10)</value>
</param>
@@ -133,7 +149,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>noisevar</value>
+ <value>block</value>
</param>
<param>
<key>_enabled</key>
@@ -141,11 +157,15 @@
</param>
<param>
<key>value</key>
- <value>10**(-snr_db/10)</value>
+ <value>1000</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(279, 10)</value>
+ <value>(438, 10)</value>
</param>
<param>
<key>_rotation</key>
@@ -183,6 +203,10 @@
<value>True</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -210,8 +234,8 @@
<value>blocks_throttle_0</value>
</param>
<param>
- <key>affinity</key>
- <value></value>
+ <key>_enabled</key>
+ <value>True</value>
</param>
<param>
<key>type</key>
@@ -230,6 +254,10 @@
<value>True</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -251,30 +279,97 @@
</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>alias</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(177, 10)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>180</value>
+ </param>
+ </block>
+ <block>
+ <key>digital_chunks_to_symbols_xx</key>
+ <param>
+ <key>id</key>
+ <value>digital_chunks_to_symbols_xx_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>in_type</key>
+ <value>short</value>
+ </param>
+ <param>
+ <key>out_type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <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>dimension</key>
+ <value>2</value>
+ </param>
+ <param>
+ <key>num_ports</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
</param>
<param>
<key>affinity</key>
@@ -290,7 +385,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(559, 260)</value>
+ <value>(559, 180)</value>
</param>
<param>
<key>_rotation</key>
@@ -298,10 +393,10 @@
</param>
</block>
<block>
- <key>blocks_add_xx</key>
+ <key>trellis_pccc_encoder_xx</key>
<param>
<key>id</key>
- <value>blocks_add_xx_1</value>
+ <value>trellis_pccc_encoder_xx_0</value>
</param>
<param>
<key>_enabled</key>
@@ -309,15 +404,35 @@
</param>
<param>
<key>type</key>
- <value>float</value>
+ <value>ss</value>
</param>
<param>
- <key>num_inputs</key>
- <value>2</value>
+ <key>o_fsm_args</key>
+ <value>prefix + "/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 + "/awgn1o2_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>alias</key>
+ <value></value>
</param>
<param>
<key>affinity</key>
@@ -333,7 +448,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(816, 192)</value>
+ <value>(234, 154)</value>
</param>
<param>
<key>_rotation</key>
@@ -341,10 +456,10 @@
</param>
</block>
<block>
- <key>blocks_sub_xx</key>
+ <key>trellis_pccc_decoder_combined_xx</key>
<param>
<key>id</key>
- <value>blocks_sub_xx_0</value>
+ <value>trellis_pccc_decoder_combined_xx_0</value>
</param>
<param>
<key>_enabled</key>
@@ -352,17 +467,73 @@
</param>
<param>
<key>type</key>
- <value>short</value>
+ <value>c</value>
</param>
<param>
- <key>vlen</key>
- <value>1</value>
+ <key>out_type</key>
+ <value>s</value>
</param>
<param>
- <key>num_inputs</key>
+ <key>o_fsm_args</key>
+ <value>prefix + "/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 + "/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>
+ <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>dim</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,0</value>
+ </param>
+ <param>
+ <key>metric_type</key>
+ <value>digital.TRELLIS_EUCLIDEAN</value>
+ </param>
+ <param>
+ <key>siso_type</key>
+ <value>trellis.TRELLIS_MIN_SUM</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>
@@ -376,11 +547,11 @@
</param>
<param>
<key>_coordinate</key>
- <value>(234, 536)</value>
+ <value>(234, 299)</value>
</param>
<param>
<key>_rotation</key>
- <value>0</value>
+ <value>180</value>
</param>
</block>
<block>
@@ -406,6 +577,10 @@
<value>1</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -419,7 +594,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(409, 530)</value>
+ <value>(421, 574)</value>
</param>
<param>
<key>_rotation</key>
@@ -427,22 +602,30 @@
</param>
</block>
<block>
- <key>blocks_short_to_float</key>
+ <key>blocks_sub_xx</key>
<param>
<key>id</key>
- <value>blocks_short_to_float_1_0</value>
+ <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>scale</key>
- <value>1</value>
+ <key>num_inputs</key>
+ <value>2</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
</param>
<param>
<key>affinity</key>
@@ -458,7 +641,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(552, 548)</value>
+ <value>(246, 580)</value>
</param>
<param>
<key>_rotation</key>
@@ -466,141 +649,140 @@
</param>
</block>
<block>
- <key>qtgui_number_sink</key>
+ <key>blocks_short_to_float</key>
<param>
<key>id</key>
- <value>qtgui_number_sink_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>autoscale</key>
- <value>True</value>
+ <key>scale</key>
+ <value>1</value>
</param>
<param>
- <key>avg</key>
- <value>0.001</value>
+ <key>alias</key>
+ <value></value>
</param>
<param>
- <key>graph_type</key>
- <value>qtgui.NUM_GRAPH_HORIZ</value>
+ <key>affinity</key>
+ <value></value>
</param>
<param>
- <key>nconnections</key>
- <value>1</value>
+ <key>minoutbuf</key>
+ <value>0</value>
</param>
<param>
- <key>min</key>
+ <key>maxoutbuf</key>
<value>0</value>
</param>
- </block>
- <block>
- <key>digital_chunks_to_symbols_xx</key>
<param>
- <key>max</key>
- <value>1</value>
+ <key>_coordinate</key>
+ <value>(564, 592)</value>
</param>
<param>
- <key>update_time</key>
- <value>0.1</value>
+ <key>_rotation</key>
+ <value>0</value>
</param>
+ </block>
+ <block>
+ <key>analog_noise_source_x</key>
<param>
- <key>gui_hint</key>
- <value>1,0,1,1</value>
+ <key>id</key>
+ <value>analog_noise_source_x_0</value>
</param>
<param>
- <key>label1</key>
- <value>BER</value>
+ <key>_enabled</key>
+ <value>True</value>
</param>
<param>
- <key>color1</key>
- <value>("black", "black")</value>
+ <key>type</key>
+ <value>complex</value>
</param>
<param>
- <key>label2</key>
- <value></value>
+ <key>noise_type</key>
+ <value>analog.GR_GAUSSIAN</value>
</param>
<param>
- <key>color2</key>
- <value>("black", "black")</value>
+ <key>amp</key>
+ <value>noisevar</value>
</param>
<param>
- <key>label3</key>
- <value></value>
+ <key>seed</key>
+ <value>-42</value>
</param>
<param>
- <key>color3</key>
- <value>("black", "black")</value>
+ <key>alias</key>
+ <value></value>
</param>
<param>
- <key>label4</key>
+ <key>affinity</key>
<value></value>
</param>
<param>
- <key>color4</key>
- <value>("black", "black")</value>
+ <key>minoutbuf</key>
+ <value>0</value>
</param>
<param>
- <key>label5</key>
- <value></value>
+ <key>maxoutbuf</key>
+ <value>0</value>
</param>
<param>
- <key>color5</key>
- <value>("black", "black")</value>
+ <key>_coordinate</key>
+ <value>(520, 309)</value>
</param>
<param>
- <key>label6</key>
- <value></value>
+ <key>_rotation</key>
+ <value>0</value>
</param>
+ </block>
+ <block>
+ <key>blocks_add_xx</key>
<param>
- <key>color6</key>
- <value>("black", "black")</value>
+ <key>id</key>
+ <value>blocks_add_xx_1</value>
</param>
<param>
- <key>label7</key>
- <value></value>
+ <key>_enabled</key>
+ <value>True</value>
</param>
<param>
- <key>color7</key>
- <value>("black", "black")</value>
+ <key>type</key>
+ <value>complex</value>
</param>
<param>
- <key>label8</key>
- <value></value>
+ <key>num_inputs</key>
+ <value>2</value>
</param>
<param>
- <key>color8</key>
- <value>("black", "black")</value>
+ <key>vlen</key>
+ <value>1</value>
</param>
<param>
- <key>label9</key>
+ <key>alias</key>
<value></value>
</param>
<param>
- <key>color9</key>
- <value>("black", "black")</value>
- </param>
- <param>
- <key>label10</key>
+ <key>affinity</key>
<value></value>
</param>
<param>
- <key>color10</key>
- <value>("black", "black")</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>(795, 532)</value>
+ <value>(816, 192)</value>
</param>
<param>
<key>_rotation</key>
@@ -608,263 +790,230 @@
</param>
</block>
<block>
- <key>variable_qtgui_range</key>
+ <key>qtgui_number_sink</key>
<param>
<key>id</key>
- <value>snr_db</value>
+ <value>qtgui_number_sink_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>label</key>
- <value>SNR (dB)</value>
+ <key>name</key>
+ <value>""</value>
</param>
<param>
- <key>value</key>
- <value>5</value>
+ <key>type</key>
+ <value>float</value>
</param>
<param>
- <key>start</key>
- <value>-10</value>
+ <key>autoscale</key>
+ <value>True</value>
</param>
<param>
- <key>stop</key>
- <value>10</value>
+ <key>avg</key>
+ <value>0.001</value>
</param>
<param>
- <key>step</key>
- <value>0.01</value>
+ <key>graph_type</key>
+ <value>qtgui.NUM_GRAPH_HORIZ</value>
</param>
<param>
- <key>widget</key>
- <value>counter_slider</value>
+ <key>nconnections</key>
+ <value>1</value>
</param>
<param>
- <key>orient</key>
- <value>Qt.Horizontal</value>
+ <key>min</key>
+ <value>0</value>
</param>
<param>
- <key>min_len</key>
- <value>200</value>
+ <key>max</key>
+ <value>1</value>
</param>
<param>
- <key>gui_hint</key>
- <value></value>
+ <key>update_time</key>
+ <value>0.01</value>
</param>
<param>
- <key>_coordinate</key>
- <value>(177, 10)</value>
+ <key>gui_hint</key>
+ <value></value>
</param>
<param>
- <key>_rotation</key>
- <value>180</value>
+ <key>label1</key>
+ <value></value>
</param>
- </block>
- <block>
- <key>digital_chunks_to_symbols_xx</key>
<param>
- <key>id</key>
- <value>digital_chunks_to_symbols_xx_0</value>
+ <key>unit1</key>
+ <value></value>
</param>
<param>
- <key>average</key>
- <value>True</value>
+ <key>color1</key>
+ <value>("black", "black")</value>
</param>
<param>
- <key>in_type</key>
- <value>short</value>
+ <key>factor1</key>
+ <value>1</value>
</param>
<param>
- <key>show_gauge</key>
- <value>True</value>
+ <key>label2</key>
+ <value></value>
</param>
<param>
- <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>
+ <key>unit2</key>
+ <value></value>
</param>
<param>
- <key>dimension</key>
- <value>2</value>
+ <key>color2</key>
+ <value>("black", "black")</value>
</param>
<param>
- <key>num_ports</key>
+ <key>factor2</key>
<value>1</value>
</param>
<param>
- <key>affinity</key>
+ <key>label3</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>(559, 180)</value>
+ <key>unit3</key>
+ <value></value>
</param>
<param>
- <key>_rotation</key>
- <value>0</value>
+ <key>color3</key>
+ <value>("black", "black")</value>
</param>
- </block>
- <block>
- <key>trellis_pccc_encoder_xx</key>
<param>
- <key>id</key>
- <value>trellis_pccc_encoder_xx_0</value>
+ <key>factor3</key>
+ <value>1</value>
</param>
<param>
- <key>_enabled</key>
- <value>True</value>
+ <key>label4</key>
+ <value></value>
</param>
<param>
- <key>type</key>
- <value>ss</value>
+ <key>unit4</key>
+ <value></value>
</param>
<param>
- <key>o_fsm_args</key>
- <value>prefix + "awgn1o2_4.fsm"</value>
+ <key>color4</key>
+ <value>("black", "black")</value>
</param>
<param>
- <key>o_init_state</key>
- <value>0</value>
+ <key>factor4</key>
+ <value>1</value>
</param>
<param>
- <key>i_fsm_args</key>
- <value>prefix + "awgn1o2_4.fsm"</value>
+ <key>label5</key>
+ <value></value>
</param>
<param>
- <key>i_init_state</key>
- <value>0</value>
+ <key>unit5</key>
+ <value></value>
</param>
<param>
- <key>interleaver_args</key>
- <value>trellis.interleaver(block,666)</value>
+ <key>color5</key>
+ <value>("black", "black")</value>
</param>
<param>
- <key>bl</key>
- <value>block</value>
+ <key>factor5</key>
+ <value>1</value>
</param>
<param>
- <key>affinity</key>
+ <key>label6</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>(234, 154)</value>
+ <key>unit6</key>
+ <value></value>
</param>
<param>
- <key>_rotation</key>
- <value>0</value>
+ <key>color6</key>
+ <value>("black", "black")</value>
</param>
- </block>
- <block>
- <key>trellis_pccc_decoder_combined_xx</key>
<param>
- <key>id</key>
- <value>trellis_pccc_decoder_combined_xx_0</value>
+ <key>factor6</key>
+ <value>1</value>
</param>
<param>
- <key>_enabled</key>
- <value>True</value>
+ <key>label7</key>
+ <value></value>
</param>
<param>
- <key>type</key>
- <value>f</value>
+ <key>unit7</key>
+ <value></value>
</param>
<param>
- <key>out_type</key>
- <value>s</value>
+ <key>color7</key>
+ <value>("black", "black")</value>
</param>
<param>
- <key>o_fsm_args</key>
- <value>prefix + "awgn1o2_4.fsm"</value>
+ <key>factor7</key>
+ <value>1</value>
</param>
<param>
- <key>o_init_state</key>
- <value>0</value>
+ <key>label8</key>
+ <value></value>
</param>
<param>
- <key>o_final_state</key>
- <value>-1</value>
+ <key>unit8</key>
+ <value></value>
</param>
<param>
- <key>i_fsm_args</key>
- <value>prefix + "awgn1o2_4.fsm"</value>
+ <key>color8</key>
+ <value>("black", "black")</value>
</param>
<param>
- <key>i_init_state</key>
- <value>0</value>
+ <key>factor8</key>
+ <value>1</value>
</param>
<param>
- <key>i_final_state</key>
- <value>-1</value>
+ <key>label9</key>
+ <value></value>
</param>
<param>
- <key>interleaver</key>
- <value>trellis.interleaver(block,666)</value>
+ <key>unit9</key>
+ <value></value>
</param>
<param>
- <key>block_size</key>
- <value>block</value>
+ <key>color9</key>
+ <value>("black", "black")</value>
</param>
<param>
- <key>iterations</key>
- <value>10</value>
+ <key>factor9</key>
+ <value>1</value>
</param>
<param>
- <key>dim</key>
- <value>2</value>
+ <key>label10</key>
+ <value></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,0</value>
+ <key>unit10</key>
+ <value></value>
</param>
<param>
- <key>metric_type</key>
- <value>digital.TRELLIS_EUCLIDEAN</value>
+ <key>color10</key>
+ <value>("black", "black")</value>
</param>
<param>
- <key>siso_type</key>
- <value>trellis.TRELLIS_MIN_SUM</value>
+ <key>factor10</key>
+ <value>1</value>
</param>
<param>
- <key>scaling</key>
- <value>1.0</value>
+ <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>(235, 279)</value>
+ <value>(571, 477)</value>
</param>
<param>
<key>_rotation</key>
- <value>180</value>
+ <value>0</value>
</param>
</block>
<connection>
diff --git a/gr-trellis/examples/grc/pccc1.grc
b/gr-trellis/examples/grc/pccc1.grc
index c27c658..acb112d 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>Tue Jul 22 09:01:29 2014</timestamp>
+ <timestamp>Mon Jul 28 14:09:00 2014</timestamp>
<block>
<key>options</key>
<param>
@@ -52,6 +52,10 @@
<value></value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(10, 10)</value>
</param>
@@ -64,7 +68,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>block</value>
+ <value>prefix</value>
</param>
<param>
<key>_enabled</key>
@@ -72,11 +76,15 @@
</param>
<param>
<key>value</key>
- <value>1000</value>
+ <value>"@FSM_FILE_INSTALL_DIR@"</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(621, 10)</value>
+ <value>(513, 10)</value>
</param>
<param>
<key>_rotation</key>
@@ -87,7 +95,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>noisevar</value>
+ <value>block</value>
</param>
<param>
<key>_enabled</key>
@@ -95,11 +103,15 @@
</param>
<param>
<key>value</key>
- <value>10**(-snr_db/10)</value>
+ <value>1000</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(279, 10)</value>
+ <value>(441, 10)</value>
</param>
<param>
<key>_rotation</key>
@@ -110,7 +122,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>prefix</value>
+ <value>R</value>
</param>
<param>
<key>_enabled</key>
@@ -118,11 +130,15 @@
</param>
<param>
<key>value</key>
- <value>"@FSM_FILE_INSTALL_DIR@"</value>
+ <value>100e3</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(434, 10)</value>
+ <value>(358, 10)</value>
</param>
<param>
<key>_rotation</key>
@@ -133,7 +149,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>R</value>
+ <value>noisevar</value>
</param>
<param>
<key>_enabled</key>
@@ -141,11 +157,15 @@
</param>
<param>
<key>value</key>
- <value>100e3</value>
+ <value>10**(-snr_db/10)</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(358, 10)</value>
+ <value>(279, 10)</value>
</param>
<param>
<key>_rotation</key>
@@ -183,100 +203,10 @@
<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>(21, 170)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
- <block>
- <key>analog_noise_source_x</key>
- <param>
- <key>id</key>
- <value>analog_noise_source_x_0</value>
- </param>
- <param>
- <key>_enabled</key>
- <value>True</value>
- </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>
- </param>
- <param>
- <key>seed</key>
- <value>-42</value>
- </param>
- <param>
- <key>affinity</key>
+ <key>alias</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>(551, 244)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
- <block>
- <key>blocks_throttle</key>
- <param>
- <key>id</key>
- <value>blocks_throttle_0</value>
- </param>
- <param>
- <key>_enabled</key>
- <value>True</value>
- </param>
- <param>
- <key>type</key>
- <value>short</value>
- </param>
- <param>
- <key>samples_per_second</key>
- <value>R</value>
- </param>
- <param>
- <key>vlen</key>
- <value>1</value>
- </param>
- <param>
- <key>ignoretag</key>
- <value>True</value>
- </param>
- <param>
<key>affinity</key>
<value></value>
</param>
@@ -290,7 +220,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(553, 103)</value>
+ <value>(21, 170)</value>
</param>
<param>
<key>_rotation</key>
@@ -308,6 +238,10 @@
<value>True</value>
</param>
<param>
+ <key>name</key>
+ <value>""</value>
+ </param>
+ <param>
<key>type</key>
<value>float</value>
</param>
@@ -348,82 +282,166 @@
<value></value>
</param>
<param>
+ <key>unit1</key>
+ <value></value>
+ </param>
+ <param>
<key>color1</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor1</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label2</key>
<value></value>
</param>
<param>
+ <key>unit2</key>
+ <value></value>
+ </param>
+ <param>
<key>color2</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor2</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label3</key>
<value></value>
</param>
<param>
+ <key>unit3</key>
+ <value></value>
+ </param>
+ <param>
<key>color3</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor3</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label4</key>
<value></value>
</param>
<param>
+ <key>unit4</key>
+ <value></value>
+ </param>
+ <param>
<key>color4</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor4</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label5</key>
<value></value>
</param>
<param>
+ <key>unit5</key>
+ <value></value>
+ </param>
+ <param>
<key>color5</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor5</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label6</key>
<value></value>
</param>
<param>
+ <key>unit6</key>
+ <value></value>
+ </param>
+ <param>
<key>color6</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor6</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label7</key>
<value></value>
</param>
<param>
+ <key>unit7</key>
+ <value></value>
+ </param>
+ <param>
<key>color7</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor7</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label8</key>
<value></value>
</param>
<param>
+ <key>unit8</key>
+ <value></value>
+ </param>
+ <param>
<key>color8</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor8</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label9</key>
<value></value>
</param>
<param>
+ <key>unit9</key>
+ <value></value>
+ </param>
+ <param>
<key>color9</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor9</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label10</key>
<value></value>
</param>
<param>
+ <key>unit10</key>
+ <value></value>
+ </param>
+ <param>
<key>color10</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor10</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -455,6 +473,10 @@
<value>1</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -498,6 +520,10 @@
<value>1</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -541,6 +567,10 @@
<value>2</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -562,77 +592,105 @@
</param>
</block>
<block>
- <key>blocks_add_xx</key>
+ <key>variable_qtgui_range</key>
<param>
<key>id</key>
- <value>blocks_add_xx_1</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>num_inputs</key>
- <value>2</value>
+ <key>value</key>
+ <value>5</value>
</param>
<param>
- <key>vlen</key>
- <value>1</value>
+ <key>start</key>
+ <value>-10</value>
</param>
<param>
- <key>affinity</key>
- <value></value>
+ <key>stop</key>
+ <value>10</value>
</param>
<param>
- <key>minoutbuf</key>
- <value>0</value>
+ <key>step</key>
+ <value>0.01</value>
</param>
<param>
- <key>maxoutbuf</key>
- <value>0</value>
+ <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>alias</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(839, 190)</value>
+ <value>(177, 10)</value>
</param>
<param>
<key>_rotation</key>
- <value>0</value>
+ <value>180</value>
</param>
</block>
<block>
- <key>digital_chunks_to_symbols_xx</key>
+ <key>trellis_pccc_encoder_xx</key>
<param>
<key>id</key>
- <value>digital_chunks_to_symbols_xx_0</value>
+ <value>trellis_pccc_encoder_xx_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>in_type</key>
- <value>short</value>
+ <key>type</key>
+ <value>ss</value>
</param>
<param>
- <key>out_type</key>
- <value>float</value>
+ <key>o_fsm_args</key>
+ <value>prefix+"/awgn1o2_4.fsm"</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,0</value>
+ <key>o_init_state</key>
+ <value>0</value>
</param>
<param>
- <key>dimension</key>
- <value>2</value>
+ <key>i_fsm_args</key>
+ <value>prefix+"/awgn1o2_4.fsm"</value>
</param>
<param>
- <key>num_ports</key>
- <value>1</value>
+ <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>alias</key>
+ <value></value>
</param>
<param>
<key>affinity</key>
@@ -648,7 +706,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(552, 178)</value>
+ <value>(235, 154)</value>
</param>
<param>
<key>_rotation</key>
@@ -686,6 +744,10 @@
<value>digital.TRELLIS_EUCLIDEAN</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -699,7 +761,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(56, 370)</value>
+ <value>(89, 380)</value>
</param>
<param>
<key>_rotation</key>
@@ -707,97 +769,168 @@
</param>
</block>
<block>
- <key>variable_qtgui_range</key>
+ <key>trellis_pccc_decoder_x</key>
<param>
<key>id</key>
- <value>snr_db</value>
+ <value>trellis_pccc_decoder_x_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>label</key>
- <value>SNR (dB)</value>
+ <key>out_type</key>
+ <value>s</value>
</param>
<param>
- <key>value</key>
- <value>5</value>
+ <key>o_fsm_args</key>
+ <value>prefix+"/awgn1o2_4.fsm"</value>
</param>
<param>
- <key>start</key>
- <value>-10</value>
+ <key>o_init_state</key>
+ <value>0</value>
</param>
<param>
- <key>stop</key>
- <value>10</value>
+ <key>o_final_state</key>
+ <value>-1</value>
</param>
<param>
- <key>step</key>
- <value>0.01</value>
+ <key>i_fsm_args</key>
+ <value>prefix+"/awgn1o2_4.fsm"</value>
</param>
<param>
- <key>widget</key>
- <value>counter_slider</value>
+ <key>i_init_state</key>
+ <value>0</value>
</param>
<param>
- <key>orient</key>
- <value>Qt.Horizontal</value>
+ <key>i_final_state</key>
+ <value>-1</value>
</param>
<param>
- <key>min_len</key>
- <value>200</value>
+ <key>interleaver</key>
+ <value>trellis.interleaver(block,666)</value>
</param>
<param>
- <key>gui_hint</key>
+ <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>
+ </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>(177, 10)</value>
+ <value>(379, 332)</value>
</param>
<param>
<key>_rotation</key>
- <value>180</value>
+ <value>0</value>
</param>
</block>
<block>
- <key>trellis_pccc_encoder_xx</key>
+ <key>digital_chunks_to_symbols_xx</key>
<param>
<key>id</key>
- <value>trellis_pccc_encoder_xx_0</value>
+ <value>digital_chunks_to_symbols_xx_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>type</key>
- <value>ss</value>
+ <key>in_type</key>
+ <value>short</value>
</param>
<param>
- <key>o_fsm_args</key>
- <value>prefix+"awgn1o2_4.fsm"</value>
+ <key>out_type</key>
+ <value>float</value>
</param>
<param>
- <key>o_init_state</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>num_ports</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>i_fsm_args</key>
- <value>prefix+"awgn1o2_4.fsm"</value>
+ <key>maxoutbuf</key>
+ <value>0</value>
</param>
<param>
- <key>i_init_state</key>
+ <key>_coordinate</key>
+ <value>(552, 164)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
<value>0</value>
</param>
+ </block>
+ <block>
+ <key>blocks_throttle</key>
<param>
- <key>interleaver_args</key>
- <value>trellis.interleaver(block,666)</value>
+ <key>id</key>
+ <value>blocks_throttle_0</value>
</param>
<param>
- <key>bl</key>
- <value>block</value>
+ <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>ignoretag</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
</param>
<param>
<key>affinity</key>
@@ -813,7 +946,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(235, 154)</value>
+ <value>(553, 89)</value>
</param>
<param>
<key>_rotation</key>
@@ -821,58 +954,81 @@
</param>
</block>
<block>
- <key>trellis_pccc_decoder_x</key>
+ <key>analog_noise_source_x</key>
<param>
<key>id</key>
- <value>trellis_pccc_decoder_x_0</value>
+ <value>analog_noise_source_x_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>out_type</key>
- <value>s</value>
+ <key>type</key>
+ <value>float</value>
</param>
<param>
- <key>o_fsm_args</key>
- <value>prefix+"awgn1o2_4.fsm"</value>
+ <key>noise_type</key>
+ <value>analog.GR_GAUSSIAN</value>
</param>
<param>
- <key>o_init_state</key>
+ <key>amp</key>
+ <value>noisevar</value>
+ </param>
+ <param>
+ <key>seed</key>
+ <value>-42</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>o_final_state</key>
- <value>-1</value>
+ <key>maxoutbuf</key>
+ <value>0</value>
</param>
<param>
- <key>i_fsm_args</key>
- <value>prefix+"awgn1o2_4.fsm"</value>
+ <key>_coordinate</key>
+ <value>(551, 230)</value>
</param>
<param>
- <key>i_init_state</key>
+ <key>_rotation</key>
<value>0</value>
</param>
+ </block>
+ <block>
+ <key>blocks_add_xx</key>
<param>
- <key>i_final_state</key>
- <value>-1</value>
+ <key>id</key>
+ <value>blocks_add_xx_1</value>
</param>
<param>
- <key>interleaver</key>
- <value>trellis.interleaver(block,666)</value>
+ <key>_enabled</key>
+ <value>True</value>
</param>
<param>
- <key>block_size</key>
- <value>block</value>
+ <key>type</key>
+ <value>float</value>
</param>
<param>
- <key>iterations</key>
- <value>10</value>
+ <key>num_inputs</key>
+ <value>2</value>
</param>
<param>
- <key>siso_type</key>
- <value>trellis.TRELLIS_MIN_SUM</value>
+ <key>vlen</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
</param>
<param>
<key>affinity</key>
@@ -888,7 +1044,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(359, 322)</value>
+ <value>(839, 176)</value>
</param>
<param>
<key>_rotation</key>
@@ -932,44 +1088,44 @@
<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_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>digital_chunks_to_symbols_xx_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>0</sink_key>
+ <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>
+ <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_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_sub_xx_0</source_block_id>
- <sink_block_id>blocks_multiply_xx_2_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>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>
<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>
diff --git a/gr-trellis/examples/grc/sccc.grc b/gr-trellis/examples/grc/sccc.grc
index ace871a..9d51674 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>Tue Jul 22 09:01:11 2014</timestamp>
+ <timestamp>Mon Jul 28 14:09:50 2014</timestamp>
<block>
<key>options</key>
<param>
@@ -52,6 +52,10 @@
<value></value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(10, 10)</value>
</param>
@@ -64,7 +68,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>block</value>
+ <value>prefix</value>
</param>
<param>
<key>_enabled</key>
@@ -72,11 +76,15 @@
</param>
<param>
<key>value</key>
- <value>1000</value>
+ <value>"@FSM_FILE_INSTALL_DIR@"</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(622, 9)</value>
+ <value>(514, 10)</value>
</param>
<param>
<key>_rotation</key>
@@ -87,7 +95,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>prefix</value>
+ <value>block</value>
</param>
<param>
<key>_enabled</key>
@@ -95,11 +103,15 @@
</param>
<param>
<key>value</key>
- <value>"@FSM_FILE_INSTALL_DIR@"</value>
+ <value>1000</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(435, 9)</value>
+ <value>(441, 10)</value>
</param>
<param>
<key>_rotation</key>
@@ -110,7 +122,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>noisevar</value>
+ <value>R</value>
</param>
<param>
<key>_enabled</key>
@@ -118,11 +130,15 @@
</param>
<param>
<key>value</key>
- <value>10**(-snr_db/10)</value>
+ <value>100e3</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(279, 10)</value>
+ <value>(358, 10)</value>
</param>
<param>
<key>_rotation</key>
@@ -133,7 +149,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>R</value>
+ <value>noisevar</value>
</param>
<param>
<key>_enabled</key>
@@ -141,11 +157,15 @@
</param>
<param>
<key>value</key>
- <value>100e3</value>
+ <value>10**(-snr_db/10)</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(358, 10)</value>
+ <value>(279, 10)</value>
</param>
<param>
<key>_rotation</key>
@@ -183,6 +203,10 @@
<value>True</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -226,6 +250,10 @@
<value>1</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -273,6 +301,10 @@
<value>-42</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -320,6 +352,10 @@
<value>True</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -363,6 +399,10 @@
<value>2</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -406,6 +446,10 @@
<value>1</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -445,6 +489,10 @@
<value>1</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -496,6 +544,10 @@
<value>1</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -527,6 +579,10 @@
<value>True</value>
</param>
<param>
+ <key>name</key>
+ <value>""</value>
+ </param>
+ <param>
<key>type</key>
<value>float</value>
</param>
@@ -567,82 +623,166 @@
<value></value>
</param>
<param>
+ <key>unit1</key>
+ <value></value>
+ </param>
+ <param>
<key>color1</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor1</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label2</key>
<value></value>
</param>
<param>
+ <key>unit2</key>
+ <value></value>
+ </param>
+ <param>
<key>color2</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor2</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label3</key>
<value></value>
</param>
<param>
+ <key>unit3</key>
+ <value></value>
+ </param>
+ <param>
<key>color3</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor3</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label4</key>
<value></value>
</param>
<param>
+ <key>unit4</key>
+ <value></value>
+ </param>
+ <param>
<key>color4</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor4</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label5</key>
<value></value>
</param>
<param>
+ <key>unit5</key>
+ <value></value>
+ </param>
+ <param>
<key>color5</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor5</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label6</key>
<value></value>
</param>
<param>
+ <key>unit6</key>
+ <value></value>
+ </param>
+ <param>
<key>color6</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor6</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label7</key>
<value></value>
</param>
<param>
+ <key>unit7</key>
+ <value></value>
+ </param>
+ <param>
<key>color7</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor7</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label8</key>
<value></value>
</param>
<param>
+ <key>unit8</key>
+ <value></value>
+ </param>
+ <param>
<key>color8</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor8</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label9</key>
<value></value>
</param>
<param>
+ <key>unit9</key>
+ <value></value>
+ </param>
+ <param>
<key>color9</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor9</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label10</key>
<value></value>
</param>
<param>
+ <key>unit10</key>
+ <value></value>
+ </param>
+ <param>
<key>color10</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor10</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -702,6 +842,10 @@
<value></value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(177, 10)</value>
</param>
@@ -726,7 +870,7 @@
</param>
<param>
<key>o_fsm_args</key>
- <value>prefix+"awgn1o2_4.fsm"</value>
+ <value>prefix+"/awgn1o2_4.fsm"</value>
</param>
<param>
<key>o_init_state</key>
@@ -734,7 +878,7 @@
</param>
<param>
<key>i_fsm_args</key>
- <value>prefix+"awgn2o3_4.fsm"</value>
+ <value>prefix+"/awgn2o3_4.fsm"</value>
</param>
<param>
<key>i_init_state</key>
@@ -749,6 +893,10 @@
<value>block</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -789,7 +937,7 @@
</param>
<param>
<key>o_fsm_args</key>
- <value>prefix+"awgn1o2_4.fsm"</value>
+ <value>prefix+"/awgn1o2_4.fsm"</value>
</param>
<param>
<key>o_init_state</key>
@@ -801,7 +949,7 @@
</param>
<param>
<key>i_fsm_args</key>
- <value>prefix+"awgn2o3_4.fsm"</value>
+ <value>prefix+"/awgn2o3_4.fsm"</value>
</param>
<param>
<key>i_init_state</key>
@@ -844,6 +992,10 @@
<value>1.0</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
diff --git a/gr-trellis/examples/grc/sccc1.grc
b/gr-trellis/examples/grc/sccc1.grc
index f4a4673..71b3f76 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>Tue Jul 22 09:01:31 2014</timestamp>
+ <timestamp>Mon Jul 28 14:10:35 2014</timestamp>
<block>
<key>options</key>
<param>
@@ -52,6 +52,10 @@
<value></value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(10, 10)</value>
</param>
@@ -64,7 +68,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>block</value>
+ <value>prefix</value>
</param>
<param>
<key>_enabled</key>
@@ -72,11 +76,15 @@
</param>
<param>
<key>value</key>
- <value>1000</value>
+ <value>"@FSM_FILE_INSTALL_DIR@"</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(621, 10)</value>
+ <value>(513, 10)</value>
</param>
<param>
<key>_rotation</key>
@@ -87,7 +95,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>noisevar</value>
+ <value>block</value>
</param>
<param>
<key>_enabled</key>
@@ -95,11 +103,15 @@
</param>
<param>
<key>value</key>
- <value>10**(-snr_db/10)</value>
+ <value>1000</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(279, 10)</value>
+ <value>(441, 10)</value>
</param>
<param>
<key>_rotation</key>
@@ -110,7 +122,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>prefix</value>
+ <value>R</value>
</param>
<param>
<key>_enabled</key>
@@ -118,11 +130,15 @@
</param>
<param>
<key>value</key>
- <value>"@FSM_FILE_INSTALL_DIR@"</value>
+ <value>100e3</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(434, 10)</value>
+ <value>(358, 10)</value>
</param>
<param>
<key>_rotation</key>
@@ -133,7 +149,7 @@
<key>variable</key>
<param>
<key>id</key>
- <value>R</value>
+ <value>noisevar</value>
</param>
<param>
<key>_enabled</key>
@@ -141,11 +157,15 @@
</param>
<param>
<key>value</key>
- <value>100e3</value>
+ <value>10**(-snr_db/10)</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(358, 10)</value>
+ <value>(279, 10)</value>
</param>
<param>
<key>_rotation</key>
@@ -183,6 +203,10 @@
<value>True</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -230,6 +254,10 @@
<value>True</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -273,6 +301,10 @@
<value>1</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -316,6 +348,10 @@
<value>1</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -359,6 +395,10 @@
<value>2</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -398,6 +438,10 @@
<value>1</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -449,6 +493,10 @@
<value>digital.TRELLIS_EUCLIDEAN</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -500,6 +548,10 @@
<value>1</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -547,6 +599,10 @@
<value>-42</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -578,6 +634,10 @@
<value>True</value>
</param>
<param>
+ <key>name</key>
+ <value>""</value>
+ </param>
+ <param>
<key>type</key>
<value>float</value>
</param>
@@ -618,82 +678,166 @@
<value></value>
</param>
<param>
+ <key>unit1</key>
+ <value></value>
+ </param>
+ <param>
<key>color1</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor1</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label2</key>
<value></value>
</param>
<param>
+ <key>unit2</key>
+ <value></value>
+ </param>
+ <param>
<key>color2</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor2</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label3</key>
<value></value>
</param>
<param>
+ <key>unit3</key>
+ <value></value>
+ </param>
+ <param>
<key>color3</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor3</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label4</key>
<value></value>
</param>
<param>
+ <key>unit4</key>
+ <value></value>
+ </param>
+ <param>
<key>color4</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor4</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label5</key>
<value></value>
</param>
<param>
+ <key>unit5</key>
+ <value></value>
+ </param>
+ <param>
<key>color5</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor5</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label6</key>
<value></value>
</param>
<param>
+ <key>unit6</key>
+ <value></value>
+ </param>
+ <param>
<key>color6</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor6</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label7</key>
<value></value>
</param>
<param>
+ <key>unit7</key>
+ <value></value>
+ </param>
+ <param>
<key>color7</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor7</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label8</key>
<value></value>
</param>
<param>
+ <key>unit8</key>
+ <value></value>
+ </param>
+ <param>
<key>color8</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor8</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label9</key>
<value></value>
</param>
<param>
+ <key>unit9</key>
+ <value></value>
+ </param>
+ <param>
<key>color9</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor9</key>
+ <value>1</value>
+ </param>
+ <param>
<key>label10</key>
<value></value>
</param>
<param>
+ <key>unit10</key>
+ <value></value>
+ </param>
+ <param>
<key>color10</key>
<value>("black", "black")</value>
</param>
<param>
+ <key>factor10</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -753,6 +897,10 @@
<value></value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>_coordinate</key>
<value>(177, 10)</value>
</param>
@@ -777,7 +925,7 @@
</param>
<param>
<key>o_fsm_args</key>
- <value>prefix+"awgn1o2_4.fsm"</value>
+ <value>prefix+"/awgn1o2_4.fsm"</value>
</param>
<param>
<key>o_init_state</key>
@@ -785,7 +933,7 @@
</param>
<param>
<key>i_fsm_args</key>
- <value>prefix+"awgn2o3_4.fsm"</value>
+ <value>prefix+"/awgn2o3_4.fsm"</value>
</param>
<param>
<key>i_init_state</key>
@@ -800,6 +948,10 @@
<value>block</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
@@ -836,7 +988,7 @@
</param>
<param>
<key>o_fsm_args</key>
- <value>prefix+"awgn1o2_4.fsm"</value>
+ <value>prefix+"/awgn1o2_4.fsm"</value>
</param>
<param>
<key>o_init_state</key>
@@ -848,7 +1000,7 @@
</param>
<param>
<key>i_fsm_args</key>
- <value>prefix+"awgn2o3_4.fsm"</value>
+ <value>prefix+"/awgn2o3_4.fsm"</value>
</param>
<param>
<key>i_init_state</key>
@@ -875,6 +1027,10 @@
<value>trellis.TRELLIS_MIN_SUM</value>
</param>
<param>
+ <key>alias</key>
+ <value></value>
+ </param>
+ <param>
<key>affinity</key>
<value></value>
</param>
- [Commit-gnuradio] [gnuradio] branch master updated (67ab045 -> e876905), git, 2014/07/28
- [Commit-gnuradio] [gnuradio] 07/07: Merge branch 'maint', git, 2014/07/28
- [Commit-gnuradio] [gnuradio] 06/07: docs: added some cmake cli flags to better configure the build., git, 2014/07/28
- [Commit-gnuradio] [gnuradio] 01/07: cmake: cmake doesn't have a FIND command for STRING until 2.8.5, so we're just cehcking for that here before using it., git, 2014/07/28
- [Commit-gnuradio] [gnuradio] 04/07: volk: calling enable_languages here is buggy until 2.8.10. Version checking for that., git, 2014/07/28
- [Commit-gnuradio] [gnuradio] 02/07: trellis: updated examples., git, 2014/07/28
- [Commit-gnuradio] [gnuradio] 05/07: trellis: minor fixups to trellis examples so prefix doesn't need to end with '/'.,
git <=
- [Commit-gnuradio] [gnuradio] 03/07: trellis: working on issue to fix locations of fsm files in examples., git, 2014/07/28