summaryrefslogtreecommitdiff
path: root/gr-blocks/grc
diff options
context:
space:
mode:
authorJacob Gilbert <jacob.gilbert@protonmail.com>2021-03-14 10:29:08 -0700
committermormj <34754695+mormj@users.noreply.github.com>2021-03-18 16:35:41 -0400
commit4a3fe8539ce0f0830db150d7c8b920d9c0828c0c (patch)
treee41709e4e7a4ac1a843895c55cf81490929418fc /gr-blocks/grc
parenta8a9913136a64da903f190493bdc117b5349625e (diff)
gr-blocks: remove pdu blocks
The following have been moved to the new gr::pdu module or to gr::network and are no longer needed in gr::blocks: - pdu (noblock) - pdu_filter block - pdu_remove block - pdu_set block - pdu_to_tagged_stream block - random_pdu block - socket_pdu block - stream_pdu_base (noblock) - tagged_stream_to_pdu block - tcp_connection (noblock) - tuntap_pdu block The digital and FEC modules had a large number of references to the PDU blocks that were moved from gr-blocks to gr-pdu, this updates these changes in example flowgraphs and a few python files. The usage-manual update will be propagated to the wiki so that future exports will remain up to date. Signed-off-by: Jacob Gilbert <jacob.gilbert@protonmail.com>
Diffstat (limited to 'gr-blocks/grc')
-rw-r--r--gr-blocks/grc/blocks.tree.yml10
-rw-r--r--gr-blocks/grc/blocks_pdu_filter.block.yml41
-rw-r--r--gr-blocks/grc/blocks_pdu_remove.block.yml29
-rw-r--r--gr-blocks/grc/blocks_pdu_set.block.yml34
-rw-r--r--gr-blocks/grc/blocks_pdu_to_tagged_stream.block.yml37
-rw-r--r--gr-blocks/grc/blocks_random_pdu.block.yml39
-rw-r--r--gr-blocks/grc/blocks_socket_pdu.block.yml56
-rw-r--r--gr-blocks/grc/blocks_tagged_stream_to_pdu.block.yml36
-rw-r--r--gr-blocks/grc/blocks_tuntap_pdu.block.yml43
9 files changed, 0 insertions, 325 deletions
diff --git a/gr-blocks/grc/blocks.tree.yml b/gr-blocks/grc/blocks.tree.yml
index c6a67cf39f..6e36974084 100644
--- a/gr-blocks/grc/blocks.tree.yml
+++ b/gr-blocks/grc/blocks.tree.yml
@@ -24,7 +24,6 @@
- blocks_vector_sink_x
- blocks_tag_debug
- blocks_message_debug
- - blocks_random_pdu
- blocks_message_strobe
- blocks_message_strobe_random
- blocks_tags_strobe
@@ -87,13 +86,7 @@
- blocks_message_strobe
- blocks_message_strobe_random
- blocks_message_debug
- - blocks_pdu_filter
- - blocks_pdu_remove
- - blocks_pdu_set
- - blocks_pdu_to_tagged_stream
- blocks_tagged_stream_multiply_length
- - blocks_tagged_stream_to_pdu
- - blocks_random_pdu
- blocks_var_to_msg
- blocks_msgpair_to_var
- blocks_msg_meta_to_pair
@@ -114,9 +107,6 @@
- Modulators:
- blocks_vco_f
- blocks_vco_c
-- Networking Tools:
- - blocks_tuntap_pdu
- - blocks_socket_pdu
- Peak Detectors:
- blocks_burst_tagger
- blocks_peak_detector_xb
diff --git a/gr-blocks/grc/blocks_pdu_filter.block.yml b/gr-blocks/grc/blocks_pdu_filter.block.yml
deleted file mode 100644
index e2138c5118..0000000000
--- a/gr-blocks/grc/blocks_pdu_filter.block.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-id: blocks_pdu_filter
-label: PDU Filter
-flags: [ python ]
-
-parameters:
-- id: k
- label: Key
- dtype: raw
- default: pmt.intern("key")
-- id: v
- label: Value
- dtype: raw
- default: pmt.intern("value")
-- id: invert
- label: Invert Filter
- dtype: bool
- default: 'False'
- options: ['False', 'True']
- option_labels: ['No', 'Yes']
-
-inputs:
-- domain: message
- id: pdus
- optional: true
-
-outputs:
-- domain: message
- id: pdus
- optional: true
-
-templates:
- imports: |-
- from gnuradio import blocks
- import pmt
- make: blocks.pdu_filter(${k}, ${v}, ${invert})
- callbacks:
- - set_key(${k})
- - set_val(${v})
- - set_inversion(${invert})
-
-file_format: 1
diff --git a/gr-blocks/grc/blocks_pdu_remove.block.yml b/gr-blocks/grc/blocks_pdu_remove.block.yml
deleted file mode 100644
index 225d57005e..0000000000
--- a/gr-blocks/grc/blocks_pdu_remove.block.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-id: blocks_pdu_remove
-label: PDU Remove
-flags: [ python ]
-
-parameters:
-- id: k
- label: Key
- dtype: raw
- default: pmt.intern("key")
-
-inputs:
-- domain: message
- id: pdus
- optional: true
-
-outputs:
-- domain: message
- id: pdus
- optional: true
-
-templates:
- imports: |-
- from gnuradio import blocks
- import pmt
- make: blocks.pdu_remove(${k})
- callbacks:
- - set_key(${k})
-
-file_format: 1
diff --git a/gr-blocks/grc/blocks_pdu_set.block.yml b/gr-blocks/grc/blocks_pdu_set.block.yml
deleted file mode 100644
index 7d90be3dad..0000000000
--- a/gr-blocks/grc/blocks_pdu_set.block.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-id: blocks_pdu_set
-label: PDU Set
-flags: [ python ]
-
-parameters:
-- id: k
- label: Key
- dtype: raw
- default: pmt.intern("key")
-- id: v
- label: Value
- dtype: raw
- default: pmt.intern("value")
-
-inputs:
-- domain: message
- id: pdus
- optional: true
-
-outputs:
-- domain: message
- id: pdus
- optional: true
-
-templates:
- imports: |-
- from gnuradio import blocks
- import pmt
- make: blocks.pdu_set(${k}, ${v})
- callbacks:
- - set_key(${k})
- - set_val(${v})
-
-file_format: 1
diff --git a/gr-blocks/grc/blocks_pdu_to_tagged_stream.block.yml b/gr-blocks/grc/blocks_pdu_to_tagged_stream.block.yml
deleted file mode 100644
index ae7271f767..0000000000
--- a/gr-blocks/grc/blocks_pdu_to_tagged_stream.block.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-id: blocks_pdu_to_tagged_stream
-label: PDU to Tagged Stream
-flags: [ python, cpp ]
-
-parameters:
-- id: type
- label: Item Type
- dtype: enum
- options: [byte, complex, float]
- option_attributes:
- tv: [blocks.byte_t, blocks.complex_t, blocks.float_t]
- hide: part
-- id: tag
- label: Length tag name
- dtype: string
- default: packet_len
-
-inputs:
-- domain: message
- id: pdus
-
-outputs:
-- domain: stream
- dtype: ${ type }
-
-templates:
- imports: from gnuradio import blocks
- make: blocks.pdu_to_tagged_stream(${type.tv}, ${tag})
-
-cpp_templates:
- includes: ['#include <gnuradio/blocks/pdu_to_tagged_stream.h>']
- declarations: 'blocks::pdu_to_tagged_stream::sptr ${id};'
- make: 'this->${id} = blocks::pdu_to_tagged_stream::make(${type.tv}, ${tag});'
- translations:
- blocks.: 'blocks::'
-
-file_format: 1
diff --git a/gr-blocks/grc/blocks_random_pdu.block.yml b/gr-blocks/grc/blocks_random_pdu.block.yml
deleted file mode 100644
index 540c144192..0000000000
--- a/gr-blocks/grc/blocks_random_pdu.block.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-id: blocks_random_pdu
-label: Random PDU Generator
-flags: [ python ]
-
-parameters:
-- id: minsize
- label: Min Bytes
- dtype: int
- default: '50'
-- id: maxsize
- label: Max Bytes
- dtype: int
- default: '2000'
-- id: mask
- label: Byte Mask
- dtype: int
- default: '0xFF'
-- id: length_modulo
- label: Length Modulo
- dtype: int
- default: '2'
-
-inputs:
-- domain: message
- id: generate
- optional: true
-
-outputs:
-- domain: message
- id: pdus
- optional: true
-
-templates:
- imports: |-
- from gnuradio import blocks
- import pmt
- make: blocks.random_pdu(${minsize}, ${maxsize}, ${mask}, ${length_modulo})
-
-file_format: 1
diff --git a/gr-blocks/grc/blocks_socket_pdu.block.yml b/gr-blocks/grc/blocks_socket_pdu.block.yml
deleted file mode 100644
index 74108accb5..0000000000
--- a/gr-blocks/grc/blocks_socket_pdu.block.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-id: blocks_socket_pdu
-label: Socket PDU
-flags: [ python, cpp ]
-
-parameters:
-- id: type
- label: Type
- dtype: enum
- default: TCP_SERVER
- options: ["TCP_SERVER", "TCP_CLIENT", "UDP_SERVER", "UDP_CLIENT"]
- option_labels: [TCP Server, TCP Client, UDP Server, UDP Client]
-- id: host
- label: Host
- dtype: string
-- id: port
- label: Port
- dtype: string
- default: '52001'
-- id: mtu
- label: MTU
- dtype: int
- default: '10000'
-- id: tcp_no_delay
- label: TCP No Delay
- dtype: enum
- default: 'False'
- options: ['True', 'False']
- option_labels: [Enabled, Disabled]
- hide: ${ (( 'part' if (str(tcp_no_delay) == 'False') else 'none') if ((type == 'TCP_CLIENT') or (type == 'TCP_SERVER')) else 'all') }
-
-inputs:
-- domain: message
- id: pdus
- optional: true
-
-outputs:
-- domain: message
- id: pdus
- optional: true
-
-templates:
- imports: from gnuradio import blocks
- make: blocks.socket_pdu(${repr(type)}, ${host}, ${port}, ${mtu}, ${tcp_no_delay})
-
-cpp_templates:
- includes: ['#include <gnuradio/blocks/socket_pdu.h>']
- declarations: 'blocks::socket_pdu::sptr ${id};'
- make: 'this->${id} = blocks::socket_pdu::make("${type}", ${host}, ${port}, ${mtu}, ${tcp_no_delay});'
- translations:
- 'True': 'true'
- 'False': 'false'
-
-documentation: |-
- For server modes, leave Host blank to bind to all interfaces (equivalent to 0.0.0.0).
-
-file_format: 1
diff --git a/gr-blocks/grc/blocks_tagged_stream_to_pdu.block.yml b/gr-blocks/grc/blocks_tagged_stream_to_pdu.block.yml
deleted file mode 100644
index 54fafdeec1..0000000000
--- a/gr-blocks/grc/blocks_tagged_stream_to_pdu.block.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-id: blocks_tagged_stream_to_pdu
-label: Tagged Stream to PDU
-flags: [ python ]
-
-parameters:
-- id: type
- label: Item Type
- dtype: enum
- options: [byte, complex, float]
- option_attributes:
- tv: [blocks.byte_t, blocks.complex_t, blocks.float_t]
- hide: part
-- id: tag
- label: Length tag name
- dtype: string
- default: packet_len
-
-inputs:
-- domain: stream
- dtype: ${ type }
-
-outputs:
-- domain: message
- id: pdus
- optional: true
-
-templates:
- imports: from gnuradio import blocks
- make: blocks.tagged_stream_to_pdu(${type.tv}, ${tag})
-
-cpp_templates:
- includes: ['#include <gnuradio/blocks/tagged_stream_to_pdu.h>']
- declarations: 'blocks::tagged_stream_to_pdu::sptr ${id};'
- make: 'this->${id} = blocks::tagged_stream_to_pdu::make(${type.tv}, ${tag});'
-
-file_format: 1
diff --git a/gr-blocks/grc/blocks_tuntap_pdu.block.yml b/gr-blocks/grc/blocks_tuntap_pdu.block.yml
deleted file mode 100644
index 2ab124eb02..0000000000
--- a/gr-blocks/grc/blocks_tuntap_pdu.block.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-id: blocks_tuntap_pdu
-label: TUNTAP PDU
-flags: [ python, cpp ]
-
-parameters:
-- id: ifn
- label: Interface Name
- dtype: string
- default: tap0
-- id: mtu
- label: MTU
- dtype: int
- default: '10000'
-- id: istunflag
- label: Flag
- dtype: enum
- default: 'False'
- options: ['True', 'False']
- option_labels: [TUN(IP Packet), TAP(Ethernet Frame)]
-
-inputs:
-- domain: message
- id: pdus
- optional: true
-
-outputs:
-- domain: message
- id: pdus
- optional: true
-
-templates:
- imports: from gnuradio import blocks
- make: blocks.tuntap_pdu(${ifn}, ${mtu}, ${istunflag})
-
-cpp_templates:
- includes: ['#include <gnuradio/blocks/tuntap_pdu.h>']
- declarations: 'blocks::tuntap_pdu::sptr ${id};'
- make: 'this->${id} = blocks::tuntap_pdu::make(${ifn}, ${mtu}, ${istunflag});'
- translations:
- 'True': 'true'
- 'False': 'false'
-
-file_format: 1
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-22 03:22:41 +0000