summaryrefslogtreecommitdiff
path: root/gr-trellis
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2012-12-27 13:50:09 -0500
committerTom Rondeau <trondeau@vt.edu>2012-12-27 13:50:09 -0500
commitc805168975a30af962fbd0a25c091d7b2113394e (patch)
treea47f006ba0d91b481ca8dfcd71348ff9d9f2613e /gr-trellis
parentcb18c1c206145707b9d5c62cada32ff43f99ca3f (diff)
grc: updating GRC exmaples for new component changes.
Diffstat (limited to 'gr-trellis')
-rw-r--r--gr-trellis/src/examples/grc/interference_cancellation.grc200
-rw-r--r--gr-trellis/src/examples/grc/pccc.grc44
-rw-r--r--gr-trellis/src/examples/grc/pccc1.grc42
-rw-r--r--gr-trellis/src/examples/grc/sccc.grc42
-rw-r--r--gr-trellis/src/examples/grc/sccc1.grc42
-rwxr-xr-xgr-trellis/src/examples/python/test_cpm.py40
6 files changed, 205 insertions, 205 deletions
diff --git a/gr-trellis/src/examples/grc/interference_cancellation.grc b/gr-trellis/src/examples/grc/interference_cancellation.grc
index 129ee87905..891426660a 100644
--- a/gr-trellis/src/examples/grc/interference_cancellation.grc
+++ b/gr-trellis/src/examples/grc/interference_cancellation.grc
@@ -272,10 +272,10 @@
</param>
</block>
<block>
- <key>gr_sub_xx</key>
+ <key>blocks_sub_xx</key>
<param>
<key>id</key>
- <value>gr_sub_xx_0</value>
+ <value>blocks_sub_xx_0</value>
</param>
<param>
<key>_enabled</key>
@@ -303,10 +303,10 @@
</param>
</block>
<block>
- <key>gr_multiply_xx</key>
+ <key>blocks_multiply_xx</key>
<param>
<key>id</key>
- <value>gr_multiply_xx_0</value>
+ <value>blocks_multiply_xx_0</value>
</param>
<param>
<key>_enabled</key>
@@ -334,10 +334,10 @@
</param>
</block>
<block>
- <key>gr_short_to_float</key>
+ <key>blocks_short_to_float</key>
<param>
<key>id</key>
- <value>gr_short_to_float_0</value>
+ <value>blocks_short_to_float_0</value>
</param>
<param>
<key>_enabled</key>
@@ -361,10 +361,10 @@
</param>
</block>
<block>
- <key>gr_sub_xx</key>
+ <key>blocks_sub_xx</key>
<param>
<key>id</key>
- <value>gr_sub_xx_3</value>
+ <value>blocks_sub_xx_3</value>
</param>
<param>
<key>_enabled</key>
@@ -392,10 +392,10 @@
</param>
</block>
<block>
- <key>gr_multiply_xx</key>
+ <key>blocks_multiply_xx</key>
<param>
<key>id</key>
- <value>gr_multiply_xx_1</value>
+ <value>blocks_multiply_xx_1</value>
</param>
<param>
<key>_enabled</key>
@@ -423,10 +423,10 @@
</param>
</block>
<block>
- <key>gr_short_to_float</key>
+ <key>blocks_short_to_float</key>
<param>
<key>id</key>
- <value>gr_short_to_float_2</value>
+ <value>blocks_short_to_float_2</value>
</param>
<param>
<key>_enabled</key>
@@ -450,10 +450,10 @@
</param>
</block>
<block>
- <key>gr_sub_xx</key>
+ <key>blocks_sub_xx</key>
<param>
<key>id</key>
- <value>gr_sub_xx_2</value>
+ <value>blocks_sub_xx_2</value>
</param>
<param>
<key>_enabled</key>
@@ -481,10 +481,10 @@
</param>
</block>
<block>
- <key>gr_sub_xx</key>
+ <key>blocks_sub_xx</key>
<param>
<key>id</key>
- <value>gr_sub_xx_1</value>
+ <value>blocks_sub_xx_1</value>
</param>
<param>
<key>_enabled</key>
@@ -512,10 +512,10 @@
</param>
</block>
<block>
- <key>gr_multiply_xx</key>
+ <key>blocks_multiply_xx</key>
<param>
<key>id</key>
- <value>gr_multiply_xx_2</value>
+ <value>blocks_multiply_xx_2</value>
</param>
<param>
<key>_enabled</key>
@@ -543,10 +543,10 @@
</param>
</block>
<block>
- <key>gr_short_to_float</key>
+ <key>blocks_short_to_float</key>
<param>
<key>id</key>
- <value>gr_short_to_float_1</value>
+ <value>blocks_short_to_float_1</value>
</param>
<param>
<key>_enabled</key>
@@ -570,10 +570,10 @@
</param>
</block>
<block>
- <key>gr_sub_xx</key>
+ <key>blocks_sub_xx</key>
<param>
<key>id</key>
- <value>gr_sub_xx_2_0</value>
+ <value>blocks_sub_xx_2_0</value>
</param>
<param>
<key>_enabled</key>
@@ -601,10 +601,10 @@
</param>
</block>
<block>
- <key>gr_sub_xx</key>
+ <key>blocks_sub_xx</key>
<param>
<key>id</key>
- <value>gr_sub_xx_1_0</value>
+ <value>blocks_sub_xx_1_0</value>
</param>
<param>
<key>_enabled</key>
@@ -632,10 +632,10 @@
</param>
</block>
<block>
- <key>gr_multiply_xx</key>
+ <key>blocks_multiply_xx</key>
<param>
<key>id</key>
- <value>gr_multiply_xx_2_0</value>
+ <value>blocks_multiply_xx_2_0</value>
</param>
<param>
<key>_enabled</key>
@@ -663,10 +663,10 @@
</param>
</block>
<block>
- <key>gr_short_to_float</key>
+ <key>blocks_short_to_float</key>
<param>
<key>id</key>
- <value>gr_short_to_float_1_0</value>
+ <value>blocks_short_to_float_1_0</value>
</param>
<param>
<key>_enabled</key>
@@ -1410,10 +1410,10 @@
</param>
</block>
<block>
- <key>gr_add_xx</key>
+ <key>blocks_add_xx</key>
<param>
<key>id</key>
- <value>gr_add_xx_1</value>
+ <value>blocks_add_xx_1</value>
</param>
<param>
<key>_enabled</key>
@@ -1441,10 +1441,10 @@
</param>
</block>
<block>
- <key>gr_add_xx</key>
+ <key>blocks_add_xx</key>
<param>
<key>id</key>
- <value>gr_add_xx_0</value>
+ <value>blocks_add_xx_0</value>
</param>
<param>
<key>_enabled</key>
@@ -1538,10 +1538,10 @@
</param>
</block>
<block>
- <key>gr_multiply_const_vxx</key>
+ <key>blocks_multiply_const_vxx</key>
<param>
<key>id</key>
- <value>gr_multiply_const_vxx_0</value>
+ <value>blocks_multiply_const_vxx_0</value>
</param>
<param>
<key>_enabled</key>
@@ -1608,10 +1608,10 @@
</param>
</block>
<block>
- <key>gr_multiply_const_vxx</key>
+ <key>blocks_multiply_const_vxx</key>
<param>
<key>id</key>
- <value>gr_multiply_const_vxx_1</value>
+ <value>blocks_multiply_const_vxx_1</value>
</param>
<param>
<key>_enabled</key>
@@ -1748,10 +1748,10 @@
</param>
</block>
<block>
- <key>gr_multiply_const_vxx</key>
+ <key>blocks_multiply_const_vxx</key>
<param>
<key>id</key>
- <value>gr_multiply_const_vxx_2</value>
+ <value>blocks_multiply_const_vxx_2</value>
</param>
<param>
<key>_enabled</key>
@@ -1810,10 +1810,10 @@
</param>
</block>
<block>
- <key>gr_multiply_const_vxx</key>
+ <key>blocks_multiply_const_vxx</key>
<param>
<key>id</key>
- <value>gr_multiply_const_vxx_2_0</value>
+ <value>blocks_multiply_const_vxx_2_0</value>
</param>
<param>
<key>_enabled</key>
@@ -1917,50 +1917,50 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_multiply_const_vxx_0</source_block_id>
- <sink_block_id>gr_add_xx_0</sink_block_id>
+ <source_block_id>blocks_multiply_const_vxx_0</source_block_id>
+ <sink_block_id>blocks_add_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_xx_0</source_block_id>
- <sink_block_id>gr_add_xx_1</sink_block_id>
+ <source_block_id>blocks_add_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>gr_multiply_const_vxx_1</source_block_id>
- <sink_block_id>gr_add_xx_0</sink_block_id>
+ <source_block_id>blocks_multiply_const_vxx_1</source_block_id>
+ <sink_block_id>blocks_add_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
- <source_block_id>gr_sub_xx_0</source_block_id>
- <sink_block_id>gr_multiply_xx_0</sink_block_id>
+ <source_block_id>blocks_sub_xx_0</source_block_id>
+ <sink_block_id>blocks_multiply_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_sub_xx_0</source_block_id>
- <sink_block_id>gr_multiply_xx_0</sink_block_id>
+ <source_block_id>blocks_sub_xx_0</source_block_id>
+ <sink_block_id>blocks_multiply_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
- <source_block_id>gr_multiply_xx_0</source_block_id>
- <sink_block_id>gr_short_to_float_0</sink_block_id>
+ <source_block_id>blocks_multiply_xx_0</source_block_id>
+ <sink_block_id>blocks_short_to_float_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_short_to_float_0</source_block_id>
+ <source_block_id>blocks_short_to_float_0</source_block_id>
<sink_block_id>wxgui_numbersink2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_multiply_xx_2</source_block_id>
- <sink_block_id>gr_short_to_float_1</sink_block_id>
+ <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>
@@ -1971,62 +1971,62 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_xx_1</source_block_id>
+ <source_block_id>blocks_add_xx_1</source_block_id>
<sink_block_id>trellis_viterbi_combined_xx_1</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>random_source_x_0</source_block_id>
- <sink_block_id>gr_sub_xx_0</sink_block_id>
+ <sink_block_id>blocks_sub_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>trellis_viterbi_combined_xx_1</source_block_id>
- <sink_block_id>gr_sub_xx_0</sink_block_id>
+ <sink_block_id>blocks_sub_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
<source_block_id>trellis_viterbi_combined_xx_0</source_block_id>
- <sink_block_id>gr_sub_xx_1</sink_block_id>
+ <sink_block_id>blocks_sub_xx_1</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
<source_block_id>random_source_x_1</source_block_id>
- <sink_block_id>gr_sub_xx_1</sink_block_id>
+ <sink_block_id>blocks_sub_xx_1</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_sub_xx_1</source_block_id>
- <sink_block_id>gr_multiply_xx_2</sink_block_id>
+ <source_block_id>blocks_sub_xx_1</source_block_id>
+ <sink_block_id>blocks_multiply_xx_2</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_sub_xx_1</source_block_id>
- <sink_block_id>gr_multiply_xx_2</sink_block_id>
+ <source_block_id>blocks_sub_xx_1</source_block_id>
+ <sink_block_id>blocks_multiply_xx_2</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
- <source_block_id>gr_sub_xx_2</source_block_id>
+ <source_block_id>blocks_sub_xx_2</source_block_id>
<sink_block_id>trellis_viterbi_combined_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_xx_1</source_block_id>
- <sink_block_id>gr_sub_xx_2</sink_block_id>
+ <source_block_id>blocks_add_xx_1</source_block_id>
+ <sink_block_id>blocks_sub_xx_2</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_multiply_const_vxx_2</source_block_id>
- <sink_block_id>gr_sub_xx_2</sink_block_id>
+ <source_block_id>blocks_multiply_const_vxx_2</source_block_id>
+ <sink_block_id>blocks_sub_xx_2</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
@@ -2037,49 +2037,49 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_multiply_xx_1</source_block_id>
- <sink_block_id>gr_short_to_float_2</sink_block_id>
+ <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>gr_short_to_float_2</source_block_id>
+ <source_block_id>blocks_short_to_float_2</source_block_id>
<sink_block_id>wxgui_numbersink2_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>gr_sub_xx_3</sink_block_id>
+ <sink_block_id>blocks_sub_xx_3</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
- <source_block_id>gr_sub_xx_3</source_block_id>
- <sink_block_id>gr_multiply_xx_1</sink_block_id>
+ <source_block_id>blocks_sub_xx_3</source_block_id>
+ <sink_block_id>blocks_multiply_xx_1</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_sub_xx_3</source_block_id>
- <sink_block_id>gr_multiply_xx_1</sink_block_id>
+ <source_block_id>blocks_sub_xx_3</source_block_id>
+ <sink_block_id>blocks_multiply_xx_1</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_xx_1</source_block_id>
+ <source_block_id>blocks_add_xx_1</source_block_id>
<sink_block_id>trellis_viterbi_combined_xx_2</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>random_source_x_1</source_block_id>
- <sink_block_id>gr_sub_xx_3</sink_block_id>
+ <sink_block_id>blocks_sub_xx_3</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_short_to_float_1</source_block_id>
+ <source_block_id>blocks_short_to_float_1</source_block_id>
<sink_block_id>wxgui_numbersink2_3</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
@@ -2091,61 +2091,61 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_multiply_xx_2_0</source_block_id>
- <sink_block_id>gr_short_to_float_1_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>trellis_viterbi_combined_xx_0_0</source_block_id>
- <sink_block_id>gr_sub_xx_1_0</sink_block_id>
+ <sink_block_id>blocks_sub_xx_1_0</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
- <source_block_id>gr_sub_xx_1_0</source_block_id>
- <sink_block_id>gr_multiply_xx_2_0</sink_block_id>
+ <source_block_id>blocks_sub_xx_1_0</source_block_id>
+ <sink_block_id>blocks_multiply_xx_2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_sub_xx_1_0</source_block_id>
- <sink_block_id>gr_multiply_xx_2_0</sink_block_id>
+ <source_block_id>blocks_sub_xx_1_0</source_block_id>
+ <sink_block_id>blocks_multiply_xx_2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
- <source_block_id>gr_sub_xx_2_0</source_block_id>
+ <source_block_id>blocks_sub_xx_2_0</source_block_id>
<sink_block_id>trellis_viterbi_combined_xx_0_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_short_to_float_1_0</source_block_id>
+ <source_block_id>blocks_short_to_float_1_0</source_block_id>
<sink_block_id>wxgui_numbersink2_3_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_xx_1</source_block_id>
- <sink_block_id>gr_sub_xx_2_0</sink_block_id>
+ <source_block_id>blocks_add_xx_1</source_block_id>
+ <sink_block_id>blocks_sub_xx_2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>random_source_x_0</source_block_id>
- <sink_block_id>gr_sub_xx_1_0</sink_block_id>
+ <sink_block_id>blocks_sub_xx_1_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_multiply_const_vxx_2_0</source_block_id>
- <sink_block_id>gr_sub_xx_2_0</sink_block_id>
+ <source_block_id>blocks_multiply_const_vxx_2_0</source_block_id>
+ <sink_block_id>blocks_sub_xx_2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_xx_1</source_block_id>
+ <source_block_id>blocks_add_xx_1</source_block_id>
<sink_block_id>wxgui_scopesink2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
@@ -2158,7 +2158,7 @@
</connection>
<connection>
<source_block_id>analog_noise_source_x_0</source_block_id>
- <sink_block_id>gr_add_xx_1</sink_block_id>
+ <sink_block_id>blocks_add_xx_1</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
@@ -2170,13 +2170,13 @@
</connection>
<connection>
<source_block_id>digital_chunks_to_symbols_xx_0</source_block_id>
- <sink_block_id>gr_multiply_const_vxx_0</sink_block_id>
+ <sink_block_id>blocks_multiply_const_vxx_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_0</source_block_id>
- <sink_block_id>gr_multiply_const_vxx_1</sink_block_id>
+ <sink_block_id>blocks_multiply_const_vxx_1</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
@@ -2194,7 +2194,7 @@
</connection>
<connection>
<source_block_id>digital_chunks_to_symbols_xx_0_0_0</source_block_id>
- <sink_block_id>gr_multiply_const_vxx_2</sink_block_id>
+ <sink_block_id>blocks_multiply_const_vxx_2</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
@@ -2206,7 +2206,7 @@
</connection>
<connection>
<source_block_id>digital_chunks_to_symbols_xx_0_0_1</source_block_id>
- <sink_block_id>gr_multiply_const_vxx_2_0</sink_block_id>
+ <sink_block_id>blocks_multiply_const_vxx_2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
diff --git a/gr-trellis/src/examples/grc/pccc.grc b/gr-trellis/src/examples/grc/pccc.grc
index 06fa9cd69f..a9f65cf856 100644
--- a/gr-trellis/src/examples/grc/pccc.grc
+++ b/gr-trellis/src/examples/grc/pccc.grc
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='ASCII'?>
<flow_graph>
- <timestamp>Sat Nov 10 15:37:00 2012</timestamp>
+ <timestamp>Thu Dec 27 13:49:53 2012</timestamp>
<block>
<key>options</key>
<param>
@@ -185,10 +185,10 @@
</param>
</block>
<block>
- <key>gr_multiply_xx</key>
+ <key>blocks_multiply_xx</key>
<param>
<key>id</key>
- <value>gr_multiply_xx_2_0</value>
+ <value>blocks_multiply_xx_2_0</value>
</param>
<param>
<key>_enabled</key>
@@ -216,10 +216,10 @@
</param>
</block>
<block>
- <key>gr_short_to_float</key>
+ <key>blocks_short_to_float</key>
<param>
<key>id</key>
- <value>gr_short_to_float_1_0</value>
+ <value>blocks_short_to_float_1_0</value>
</param>
<param>
<key>_enabled</key>
@@ -597,10 +597,10 @@
</param>
</block>
<block>
- <key>gr_sub_xx</key>
+ <key>blocks_sub_xx</key>
<param>
<key>id</key>
- <value>gr_sub_xx_0</value>
+ <value>blocks_sub_xx_0</value>
</param>
<param>
<key>_enabled</key>
@@ -733,10 +733,10 @@
</param>
</block>
<block>
- <key>gr_add_xx</key>
+ <key>blocks_add_xx</key>
<param>
<key>id</key>
- <value>gr_add_xx_1</value>
+ <value>blocks_add_xx_1</value>
</param>
<param>
<key>_enabled</key>
@@ -765,37 +765,37 @@
</block>
<connection>
<source_block_id>random_source_x_0</source_block_id>
- <sink_block_id>gr_sub_xx_0</sink_block_id>
+ <sink_block_id>blocks_sub_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_xx_1</source_block_id>
+ <source_block_id>blocks_add_xx_1</source_block_id>
<sink_block_id>wxgui_scopesink2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_multiply_xx_2_0</source_block_id>
- <sink_block_id>gr_short_to_float_1_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>gr_short_to_float_1_0</source_block_id>
+ <source_block_id>blocks_short_to_float_1_0</source_block_id>
<sink_block_id>wxgui_numbersink2_3_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_sub_xx_0</source_block_id>
- <sink_block_id>gr_multiply_xx_2_0</sink_block_id>
+ <source_block_id>blocks_sub_xx_0</source_block_id>
+ <sink_block_id>blocks_multiply_xx_2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_sub_xx_0</source_block_id>
- <sink_block_id>gr_multiply_xx_2_0</sink_block_id>
+ <source_block_id>blocks_sub_xx_0</source_block_id>
+ <sink_block_id>blocks_multiply_xx_2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
@@ -812,20 +812,20 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_xx_1</source_block_id>
+ <source_block_id>blocks_add_xx_1</source_block_id>
<sink_block_id>trellis_pccc_decoder_combined_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>trellis_pccc_decoder_combined_xx_0</source_block_id>
- <sink_block_id>gr_sub_xx_0</sink_block_id>
+ <sink_block_id>blocks_sub_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
<source_block_id>analog_noise_source_x_0</source_block_id>
- <sink_block_id>gr_add_xx_1</sink_block_id>
+ <sink_block_id>blocks_add_xx_1</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
@@ -837,7 +837,7 @@
</connection>
<connection>
<source_block_id>digital_chunks_to_symbols_xx_0</source_block_id>
- <sink_block_id>gr_add_xx_1</sink_block_id>
+ <sink_block_id>blocks_add_xx_1</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
diff --git a/gr-trellis/src/examples/grc/pccc1.grc b/gr-trellis/src/examples/grc/pccc1.grc
index c111ebd3ec..1bc0e189d0 100644
--- a/gr-trellis/src/examples/grc/pccc1.grc
+++ b/gr-trellis/src/examples/grc/pccc1.grc
@@ -185,10 +185,10 @@
</param>
</block>
<block>
- <key>gr_multiply_xx</key>
+ <key>blocks_multiply_xx</key>
<param>
<key>id</key>
- <value>gr_multiply_xx_2_0</value>
+ <value>blocks_multiply_xx_2_0</value>
</param>
<param>
<key>_enabled</key>
@@ -216,10 +216,10 @@
</param>
</block>
<block>
- <key>gr_short_to_float</key>
+ <key>blocks_short_to_float</key>
<param>
<key>id</key>
- <value>gr_short_to_float_1_0</value>
+ <value>blocks_short_to_float_1_0</value>
</param>
<param>
<key>_enabled</key>
@@ -444,10 +444,10 @@
</param>
</block>
<block>
- <key>gr_sub_xx</key>
+ <key>blocks_sub_xx</key>
<param>
<key>id</key>
- <value>gr_sub_xx_0</value>
+ <value>blocks_sub_xx_0</value>
</param>
<param>
<key>_enabled</key>
@@ -678,10 +678,10 @@
</param>
</block>
<block>
- <key>gr_add_xx</key>
+ <key>blocks_add_xx</key>
<param>
<key>id</key>
- <value>gr_add_xx_1</value>
+ <value>blocks_add_xx_1</value>
</param>
<param>
<key>_enabled</key>
@@ -784,42 +784,42 @@
</block>
<connection>
<source_block_id>random_source_x_0</source_block_id>
- <sink_block_id>gr_sub_xx_0</sink_block_id>
+ <sink_block_id>blocks_sub_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_xx_1</source_block_id>
+ <source_block_id>blocks_add_xx_1</source_block_id>
<sink_block_id>wxgui_scopesink2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_multiply_xx_2_0</source_block_id>
- <sink_block_id>gr_short_to_float_1_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>gr_short_to_float_1_0</source_block_id>
+ <source_block_id>blocks_short_to_float_1_0</source_block_id>
<sink_block_id>wxgui_numbersink2_3_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_sub_xx_0</source_block_id>
- <sink_block_id>gr_multiply_xx_2_0</sink_block_id>
+ <source_block_id>blocks_sub_xx_0</source_block_id>
+ <sink_block_id>blocks_multiply_xx_2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_sub_xx_0</source_block_id>
- <sink_block_id>gr_multiply_xx_2_0</sink_block_id>
+ <source_block_id>blocks_sub_xx_0</source_block_id>
+ <sink_block_id>blocks_multiply_xx_2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_xx_1</source_block_id>
+ <source_block_id>blocks_add_xx_1</source_block_id>
<sink_block_id>trellis_metrics_x_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
@@ -844,7 +844,7 @@
</connection>
<connection>
<source_block_id>trellis_pccc_decoder_x_0</source_block_id>
- <sink_block_id>gr_sub_xx_0</sink_block_id>
+ <sink_block_id>blocks_sub_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
@@ -856,13 +856,13 @@
</connection>
<connection>
<source_block_id>digital_chunks_to_symbols_xx_0</source_block_id>
- <sink_block_id>gr_add_xx_1</sink_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>analog_noise_source_x_0</source_block_id>
- <sink_block_id>gr_add_xx_1</sink_block_id>
+ <sink_block_id>blocks_add_xx_1</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
diff --git a/gr-trellis/src/examples/grc/sccc.grc b/gr-trellis/src/examples/grc/sccc.grc
index 36657f5441..abfbeb8b81 100644
--- a/gr-trellis/src/examples/grc/sccc.grc
+++ b/gr-trellis/src/examples/grc/sccc.grc
@@ -169,10 +169,10 @@
</param>
</block>
<block>
- <key>gr_sub_xx</key>
+ <key>blocks_sub_xx</key>
<param>
<key>id</key>
- <value>gr_sub_xx_0</value>
+ <value>blocks_sub_xx_0</value>
</param>
<param>
<key>_enabled</key>
@@ -200,10 +200,10 @@
</param>
</block>
<block>
- <key>gr_multiply_xx</key>
+ <key>blocks_multiply_xx</key>
<param>
<key>id</key>
- <value>gr_multiply_xx_2_0</value>
+ <value>blocks_multiply_xx_2_0</value>
</param>
<param>
<key>_enabled</key>
@@ -231,10 +231,10 @@
</param>
</block>
<block>
- <key>gr_short_to_float</key>
+ <key>blocks_short_to_float</key>
<param>
<key>id</key>
- <value>gr_short_to_float_1_0</value>
+ <value>blocks_short_to_float_1_0</value>
</param>
<param>
<key>_enabled</key>
@@ -659,10 +659,10 @@
</param>
</block>
<block>
- <key>gr_add_xx</key>
+ <key>blocks_add_xx</key>
<param>
<key>id</key>
- <value>gr_add_xx_1</value>
+ <value>blocks_add_xx_1</value>
</param>
<param>
<key>_enabled</key>
@@ -765,12 +765,12 @@
</block>
<connection>
<source_block_id>random_source_x_0</source_block_id>
- <sink_block_id>gr_sub_xx_0</sink_block_id>
+ <sink_block_id>blocks_sub_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_xx_1</source_block_id>
+ <source_block_id>blocks_add_xx_1</source_block_id>
<sink_block_id>wxgui_scopesink2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
@@ -788,38 +788,38 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_xx_1</source_block_id>
+ <source_block_id>blocks_add_xx_1</source_block_id>
<sink_block_id>trellis_sccc_decoder_combined_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>trellis_sccc_decoder_combined_xx_0</source_block_id>
- <sink_block_id>gr_sub_xx_0</sink_block_id>
+ <sink_block_id>blocks_sub_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
- <source_block_id>gr_multiply_xx_2_0</source_block_id>
- <sink_block_id>gr_short_to_float_1_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>gr_short_to_float_1_0</source_block_id>
+ <source_block_id>blocks_short_to_float_1_0</source_block_id>
<sink_block_id>wxgui_numbersink2_3_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_sub_xx_0</source_block_id>
- <sink_block_id>gr_multiply_xx_2_0</sink_block_id>
+ <source_block_id>blocks_sub_xx_0</source_block_id>
+ <sink_block_id>blocks_multiply_xx_2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_sub_xx_0</source_block_id>
- <sink_block_id>gr_multiply_xx_2_0</sink_block_id>
+ <source_block_id>blocks_sub_xx_0</source_block_id>
+ <sink_block_id>blocks_multiply_xx_2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
@@ -831,13 +831,13 @@
</connection>
<connection>
<source_block_id>analog_noise_source_x_0</source_block_id>
- <sink_block_id>gr_add_xx_1</sink_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>digital_chunks_to_symbols_xx_0</source_block_id>
- <sink_block_id>gr_add_xx_1</sink_block_id>
+ <sink_block_id>blocks_add_xx_1</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
diff --git a/gr-trellis/src/examples/grc/sccc1.grc b/gr-trellis/src/examples/grc/sccc1.grc
index 17626e3dce..906ca25389 100644
--- a/gr-trellis/src/examples/grc/sccc1.grc
+++ b/gr-trellis/src/examples/grc/sccc1.grc
@@ -357,10 +357,10 @@
</param>
</block>
<block>
- <key>gr_sub_xx</key>
+ <key>blocks_sub_xx</key>
<param>
<key>id</key>
- <value>gr_sub_xx_0</value>
+ <value>blocks_sub_xx_0</value>
</param>
<param>
<key>_enabled</key>
@@ -388,10 +388,10 @@
</param>
</block>
<block>
- <key>gr_multiply_xx</key>
+ <key>blocks_multiply_xx</key>
<param>
<key>id</key>
- <value>gr_multiply_xx_2_0</value>
+ <value>blocks_multiply_xx_2_0</value>
</param>
<param>
<key>_enabled</key>
@@ -419,10 +419,10 @@
</param>
</block>
<block>
- <key>gr_short_to_float</key>
+ <key>blocks_short_to_float</key>
<param>
<key>id</key>
- <value>gr_short_to_float_1_0</value>
+ <value>blocks_short_to_float_1_0</value>
</param>
<param>
<key>_enabled</key>
@@ -717,10 +717,10 @@
</param>
</block>
<block>
- <key>gr_add_xx</key>
+ <key>blocks_add_xx</key>
<param>
<key>id</key>
- <value>gr_add_xx_1</value>
+ <value>blocks_add_xx_1</value>
</param>
<param>
<key>_enabled</key>
@@ -784,12 +784,12 @@
</block>
<connection>
<source_block_id>random_source_x_0</source_block_id>
- <sink_block_id>gr_sub_xx_0</sink_block_id>
+ <sink_block_id>blocks_sub_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_xx_1</source_block_id>
+ <source_block_id>blocks_add_xx_1</source_block_id>
<sink_block_id>wxgui_scopesink2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
@@ -807,31 +807,31 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_multiply_xx_2_0</source_block_id>
- <sink_block_id>gr_short_to_float_1_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>gr_short_to_float_1_0</source_block_id>
+ <source_block_id>blocks_short_to_float_1_0</source_block_id>
<sink_block_id>wxgui_numbersink2_3_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_sub_xx_0</source_block_id>
- <sink_block_id>gr_multiply_xx_2_0</sink_block_id>
+ <source_block_id>blocks_sub_xx_0</source_block_id>
+ <sink_block_id>blocks_multiply_xx_2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_sub_xx_0</source_block_id>
- <sink_block_id>gr_multiply_xx_2_0</sink_block_id>
+ <source_block_id>blocks_sub_xx_0</source_block_id>
+ <sink_block_id>blocks_multiply_xx_2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_xx_1</source_block_id>
+ <source_block_id>blocks_add_xx_1</source_block_id>
<sink_block_id>trellis_metrics_x_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
@@ -844,7 +844,7 @@
</connection>
<connection>
<source_block_id>trellis_sccc_decoder_x_0</source_block_id>
- <sink_block_id>gr_sub_xx_0</sink_block_id>
+ <sink_block_id>blocks_sub_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
@@ -856,13 +856,13 @@
</connection>
<connection>
<source_block_id>digital_chunks_to_symbols_xx_0</source_block_id>
- <sink_block_id>gr_add_xx_1</sink_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>analog_noise_source_x_0</source_block_id>
- <sink_block_id>gr_add_xx_1</sink_block_id>
+ <sink_block_id>blocks_add_xx_1</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
diff --git a/gr-trellis/src/examples/python/test_cpm.py b/gr-trellis/src/examples/python/test_cpm.py
index 8448da2b4f..8d1e2024c1 100755
--- a/gr-trellis/src/examples/python/test_cpm.py
+++ b/gr-trellis/src/examples/python/test_cpm.py
@@ -95,18 +95,18 @@ def run_test(seed,blocksize):
##################################################
random_source_x_0 = gr.vector_source_b(data.tolist(), False)
digital_chunks_to_symbols_xx_0 = digital.chunks_to_symbols_bf((-1, 1), 1)
- gr_interp_fir_filter_xxx_0 = filter.interp_fir_filter_fff(Q, p)
- gr_frequency_modulator_fc_0 = analog.frequency_modulator_fc(2*math.pi*h*(1.0/Q))
+ filter_interp_fir_filter_xxx_0 = filter.interp_fir_filter_fff(Q, p)
+ analog_frequency_modulator_fc_0 = analog.frequency_modulator_fc(2*math.pi*h*(1.0/Q))
- gr_add_vxx_0 = blocks.add_vcc(1)
- gr_noise_source_x_0 = analog.noise_source_c(analog.GR_GAUSSIAN, (N0/2.0)**0.5, -long(seed))
+ blocks_add_vxx_0 = blocks.add_vcc(1)
+ analog_noise_source_x_0 = analog.noise_source_c(analog.GR_GAUSSIAN, (N0/2.0)**0.5, -long(seed))
- gr_multiply_vxx_0 = blocks.multiply_vcc(1)
- gr_sig_source_x_0 = analog.sig_source_c(Q, analog.GR_COS_WAVE, -f0T, 1, 0)
+ blokcs_multiply_vxx_0 = blocks.multiply_vcc(1)
+ analog_sig_source_x_0 = analog.sig_source_c(Q, analog.GR_COS_WAVE, -f0T, 1, 0)
# only works for N=2, do it manually for N>2...
- gr_fir_filter_xxx_0_0 = filter.fir_filter_ccc(Q, MF[0].conjugate())
- gr_fir_filter_xxx_0_0_0 = filter.fir_filter_ccc(Q, MF[1].conjugate())
- gr_streams_to_stream_0 = blocks.streams_to_stream(gr.sizeof_gr_complex*1, int(N))
+ filter_fir_filter_xxx_0_0 = filter.fir_filter_ccc(Q, MF[0].conjugate())
+ filter_fir_filter_xxx_0_0_0 = filter.fir_filter_ccc(Q, MF[1].conjugate())
+ blocks_streams_to_stream_0 = blocks.streams_to_stream(gr.sizeof_gr_complex*1, int(N))
gr_skiphead_0 = gr.skiphead(gr.sizeof_gr_complex*1, int(N*(1+0)))
viterbi = trellis.viterbi_combined_cb(f, head+blocksize+tail, 0, -1, int(N),
constellation, digital.TRELLIS_EUCLIDEAN)
@@ -117,17 +117,17 @@ def run_test(seed,blocksize):
# Connections
##################################################
tb.connect((random_source_x_0, 0), (digital_chunks_to_symbols_xx_0, 0))
- tb.connect((digital_chunks_to_symbols_xx_0, 0), (gr_interp_fir_filter_xxx_0, 0))
- tb.connect((gr_interp_fir_filter_xxx_0, 0), (gr_frequency_modulator_fc_0, 0))
- tb.connect((gr_frequency_modulator_fc_0, 0), (gr_add_vxx_0, 0))
- tb.connect((gr_noise_source_x_0, 0), (gr_add_vxx_0, 1))
- tb.connect((gr_add_vxx_0, 0), (gr_multiply_vxx_0, 0))
- tb.connect((gr_sig_source_x_0, 0), (gr_multiply_vxx_0, 1))
- tb.connect((gr_multiply_vxx_0, 0), (gr_fir_filter_xxx_0_0, 0))
- tb.connect((gr_multiply_vxx_0, 0), (gr_fir_filter_xxx_0_0_0, 0))
- tb.connect((gr_fir_filter_xxx_0_0, 0), (gr_streams_to_stream_0, 0))
- tb.connect((gr_fir_filter_xxx_0_0_0, 0), (gr_streams_to_stream_0, 1))
- tb.connect((gr_streams_to_stream_0, 0), (gr_skiphead_0, 0))
+ tb.connect((digital_chunks_to_symbols_xx_0, 0), (filter_interp_fir_filter_xxx_0, 0))
+ tb.connect((filter_interp_fir_filter_xxx_0, 0), (analog_frequency_modulator_fc_0, 0))
+ tb.connect((analog_frequency_modulator_fc_0, 0), (blocks_add_vxx_0, 0))
+ tb.connect((analog_noise_source_x_0, 0), (blocks_add_vxx_0, 1))
+ tb.connect((blocks_add_vxx_0, 0), (blocks_multiply_vxx_0, 0))
+ tb.connect((analog_sig_source_x_0, 0), (blocks_multiply_vxx_0, 1))
+ tb.connect((blocks_multiply_vxx_0, 0), (filter_fir_filter_xxx_0_0, 0))
+ tb.connect((blocks_multiply_vxx_0, 0), (filter_fir_filter_xxx_0_0_0, 0))
+ tb.connect((filter_fir_filter_xxx_0_0, 0), (blocks_streams_to_stream_0, 0))
+ tb.connect((filter_fir_filter_xxx_0_0_0, 0), (blocks_streams_to_stream_0, 1))
+ tb.connect((blocks_streams_to_stream_0, 0), (gr_skiphead_0, 0))
tb.connect((gr_skiphead_0, 0), (viterbi, 0))
tb.connect((viterbi, 0), (gr_vector_sink_x_0, 0))