diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-15 04:28:19 -0700 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-16 23:52:20 -0400 |
| commit | e3c6f4f9e2841084f0303f435eb252d7325313a1 (patch) | |
| tree | 5023ced2263a2e721a48280dc6288f7a68eab285 | |
| parent | 62802dff4e5f84ebc047af81fdd100f3b48507b5 (diff) | |
digital: fixed tagged_stream_mux xml and example GRC app
| -rw-r--r-- | gr-blocks/grc/blocks_tagged_stream_mux.xml (renamed from gr-digital/grc/digital_tagged_stream_mux.xml) | 8 | ||||
| -rw-r--r-- | gr-digital/examples/ofdm/tx_ofdm.grc | 20 |
2 files changed, 14 insertions, 14 deletions
diff --git a/gr-digital/grc/digital_tagged_stream_mux.xml b/gr-blocks/grc/blocks_tagged_stream_mux.xml index 38f9499315..40d98a3346 100644 --- a/gr-digital/grc/digital_tagged_stream_mux.xml +++ b/gr-blocks/grc/blocks_tagged_stream_mux.xml @@ -1,9 +1,9 @@ <block> <name>Tagged Stream Mux</name> - <key>digital_tagged_stream_mux</key> - <category>Digital</category> - <import>from gnuradio import digital</import> - <make>digital.tagged_stream_mux($type.size*$vlen, $ninputs, $lengthtagname)</make> + <key>blocks_tagged_stream_mux</key> + <category>Stream Operations</category> + <import>from gnuradio import blocks</import> + <make>blocks.tagged_stream_mux($type.size*$vlen, $lengthtagname)</make> <param> <name>IO Type</name> <key>type</key> diff --git a/gr-digital/examples/ofdm/tx_ofdm.grc b/gr-digital/examples/ofdm/tx_ofdm.grc index bcd1e033ad..62472ebbce 100644 --- a/gr-digital/examples/ofdm/tx_ofdm.grc +++ b/gr-digital/examples/ofdm/tx_ofdm.grc @@ -635,10 +635,10 @@ </param> </block> <block> - <key>digital_tagged_stream_mux</key> + <key>blocks_tagged_stream_mux</key> <param> <key>id</key> - <value>digital_tagged_stream_mux_0</value> + <value>blocks_tagged_stream_mux_0</value> </param> <param> <key>_enabled</key> @@ -748,10 +748,10 @@ </param> </block> <block> - <key>digital_tagged_stream_mux</key> + <key>blocks_tagged_stream_mux</key> <param> <key>id</key> - <value>digital_tagged_stream_mux_1</value> + <value>blocks_tagged_stream_mux_1</value> </param> <param> <key>_enabled</key> @@ -1063,20 +1063,20 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>digital_tagged_stream_mux_0</source_block_id> + <source_block_id>blocks_tagged_stream_mux_0</source_block_id> <sink_block_id>digital_ofdm_carrier_allocator_cvc_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> <source_block_id>digital_ofdm_carrier_allocator_cvc_0</source_block_id> - <sink_block_id>digital_tagged_stream_mux_1</sink_block_id> + <sink_block_id>blocks_tagged_stream_mux_1</sink_block_id> <source_key>0</source_key> <sink_key>1</sink_key> </connection> <connection> <source_block_id>sync_word_source</source_block_id> - <sink_block_id>digital_tagged_stream_mux_1</sink_block_id> + <sink_block_id>blocks_tagged_stream_mux_1</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> @@ -1094,13 +1094,13 @@ </connection> <connection> <source_block_id>digital_chunks_to_symbols_xx_0</source_block_id> - <sink_block_id>digital_tagged_stream_mux_0</sink_block_id> + <sink_block_id>blocks_tagged_stream_mux_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>digital_tagged_stream_mux_0</sink_block_id> + <sink_block_id>blocks_tagged_stream_mux_0</sink_block_id> <source_key>0</source_key> <sink_key>1</sink_key> </connection> @@ -1111,7 +1111,7 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>digital_tagged_stream_mux_1</source_block_id> + <source_block_id>blocks_tagged_stream_mux_1</source_block_id> <sink_block_id>fft_vxx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> |