diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-15 04:28:19 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-15 04:28:19 -0700 |
| commit | 27990ca9e236931e39a830e48f0a1efe13ec085f (patch) | |
| tree | 07902ad17974eabc645e44ff68ce9cffed147786 /gr-digital | |
| parent | c2ef28e50696170f0347118d9a13fe38f3255fae (diff) | |
digital: fixed tagged_stream_mux xml and example GRC app
Diffstat (limited to 'gr-digital')
| -rw-r--r-- | gr-digital/examples/ofdm/tx_ofdm.grc | 20 | ||||
| -rw-r--r-- | gr-digital/grc/digital_tagged_stream_mux.xml | 65 |
2 files changed, 10 insertions, 75 deletions
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> diff --git a/gr-digital/grc/digital_tagged_stream_mux.xml b/gr-digital/grc/digital_tagged_stream_mux.xml deleted file mode 100644 index 38f9499315..0000000000 --- a/gr-digital/grc/digital_tagged_stream_mux.xml +++ /dev/null @@ -1,65 +0,0 @@ -<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> - <param> - <name>IO Type</name> - <key>type</key> - <type>enum</type> - <option> - <name>Complex</name> - <key>complex</key> - <opt>size:gr.sizeof_gr_complex</opt> - </option> - <option> - <name>Float</name> - <key>float</key> - <opt>size:gr.sizeof_float</opt> - </option> - <option> - <name>Int</name> - <key>int</key> - <opt>size:gr.sizeof_int</opt> - </option> - <option> - <name>Short</name> - <key>short</key> - <opt>size:gr.sizeof_short</opt> - </option> - <option> - <name>Byte</name> - <key>byte</key> - <opt>size:gr.sizeof_char</opt> - </option> - </param> - <param> - <name>Number of inputs</name> - <key>ninputs</key> - <type>int</type> - </param> - <param> - <name>Length tag names</name> - <key>lengthtagname</key> - <type>string</type> - </param> - <param> - <name>Vector Length</name> - <key>vlen</key> - <value>1</value> - <type>int</type> - </param> - <sink> - <name>in</name> - <type>$type</type> - <vlen>$vlen</vlen> - <nports>$ninputs</nports> - </sink> - <source> - <name>out</name> - <type>$type</type> - <vlen>$vlen</vlen> - </source> -</block> - |