diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-02-27 18:35:38 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-02-27 18:35:38 -0500 |
| commit | 2f55d7dfc33e8d990e44c5bbb7c6d2fbdaddd563 (patch) | |
| tree | 87cc11b4b13a0f4960ac9106ecb487aa0e82fd4d /grc | |
| parent | 5a5338f584297f30e451e43dcb05f331cad51cd4 (diff) | |
| parent | 6e988b777c6788cc7d434b869173ebcdcc2ce5e3 (diff) | |
Merge branch 'next' of gnuradio.org:gnuradio into next
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/blocks/block_tree.xml | 6 | ||||
| -rw-r--r-- | grc/blocks/gr_pack_k_bits_bb.xml | 30 | ||||
| -rw-r--r-- | grc/blocks/gr_tuntap_pdu.xml | 34 | ||||
| -rw-r--r-- | grc/blocks/gr_unpack_k_bits_bb.xml | 25 |
4 files changed, 0 insertions, 95 deletions
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index a78184dff1..4567a65781 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -39,7 +39,6 @@ <block>gr_message_strobe</block> <block>gr_pdu_to_tagged_stream</block> <block>gr_tagged_stream_to_pdu</block> - <block>gr_tuntap_pdu</block> <block>gr_socket_pdu</block> <block>gr_random_pdu</block> </cat> @@ -69,11 +68,6 @@ <block>gr_burst_tagger</block> </cat> <cat> - <name>Misc Conversions</name> - <block>gr_unpack_k_bits_bb</block> - <block>gr_pack_k_bits_bb</block> - </cat> - <cat> <name>Synchronizers</name> <block>gr_mpsk_sync_cc</block> diff --git a/grc/blocks/gr_pack_k_bits_bb.xml b/grc/blocks/gr_pack_k_bits_bb.xml deleted file mode 100644 index 34e64a5d96..0000000000 --- a/grc/blocks/gr_pack_k_bits_bb.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##Pack K Bits -################################################### - --> -<block> - <name>Pack K Bits</name> - <key>gr_pack_k_bits_bb</key> - <import>from gnuradio import gr</import> - <make>gr.pack_k_bits_bb($k)</make> - <param> - <name>K</name> - <key>k</key> - <type>int</type> - </param> - <sink> - <name>in</name> - <type>byte</type> - </sink> - <source> - <name>out</name> - <type>byte</type> - </source> - - <doc> - Pack K unpacked bits (one bit per byte) into a single packed byte containing k bits and 8 - k zeros. - </doc> - -</block> diff --git a/grc/blocks/gr_tuntap_pdu.xml b/grc/blocks/gr_tuntap_pdu.xml deleted file mode 100644 index f169345afa..0000000000 --- a/grc/blocks/gr_tuntap_pdu.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -## Tuntap PDU Message source/sink -################################################### - --> -<block> - <name>TunTap PDU</name> - <key>gr_tuntap_pdu</key> - <import>from gnuradio import gr</import> - <make>gr.tuntap_pdu($ifn, $mtu)</make> - <param> - <name>Interface Name</name> - <key>ifn</key> - <value>tun0</value> - <type>string</type> - </param> - <param> - <name>MTU</name> - <key>mtu</key> - <value>10000</value> - <type>int</type> - </param> - <sink> - <name>pdus</name> - <type>message</type> - <optional>1</optional> - </sink> - <source> - <name>pdus</name> - <type>message</type> - <optional>1</optional> - </source> -</block> diff --git a/grc/blocks/gr_unpack_k_bits_bb.xml b/grc/blocks/gr_unpack_k_bits_bb.xml deleted file mode 100644 index 9917644ab5..0000000000 --- a/grc/blocks/gr_unpack_k_bits_bb.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##Unpack K Bits -################################################### - --> -<block> - <name>Unpack K Bits</name> - <key>gr_unpack_k_bits_bb</key> - <import>from gnuradio import gr</import> - <make>gr.unpack_k_bits_bb($k)</make> - <param> - <name>K</name> - <key>k</key> - <type>int</type> - </param> - <sink> - <name>in</name> - <type>byte</type> - </sink> - <source> - <name>out</name> - <type>byte</type> - </source> -</block> |