diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-10-23 13:03:02 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-10-23 13:03:02 -0700 |
| commit | 065b0add8523e2f85afa0848391174889d1b61a9 (patch) | |
| tree | 12ab50584a03e491e27e22f8314a383b71f0eeb4 | |
| parent | 9806cdfc165652b6b6df2d719780261b903ac223 (diff) | |
| parent | 99b2e181449c3b4a3c35fb994315f0d120d9411a (diff) | |
Merge remote-tracking branch 'github/deprecate-blks2'
| -rw-r--r-- | gr-blocks/python/grc_gnuradio/blks2/error_rate.py | 3 | ||||
| -rw-r--r-- | gr-blocks/python/grc_gnuradio/blks2/selector.py | 5 | ||||
| -rw-r--r-- | gr-blocks/python/grc_gnuradio/blks2/tcp.py | 4 | ||||
| -rw-r--r-- | gr-digital/python/grc_gnuradio/blks2/packet.py | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/gr-blocks/python/grc_gnuradio/blks2/error_rate.py b/gr-blocks/python/grc_gnuradio/blks2/error_rate.py index 9bf387030a..df03f551b3 100644 --- a/gr-blocks/python/grc_gnuradio/blks2/error_rate.py +++ b/gr-blocks/python/grc_gnuradio/blks2/error_rate.py @@ -75,6 +75,9 @@ class error_rate(gr.hier_block2): gr.io_signature(2, 2, gr.sizeof_char), gr.io_signature(1, 1, gr.sizeof_float), ) + + print "Warning: the blks2.error_rate is deprecated." + assert type in ('BER', 'SER') self._max_samples = win_size self._bits_per_symbol = bits_per_symbol diff --git a/gr-blocks/python/grc_gnuradio/blks2/selector.py b/gr-blocks/python/grc_gnuradio/blks2/selector.py index 24e3844658..0a74309688 100644 --- a/gr-blocks/python/grc_gnuradio/blks2/selector.py +++ b/gr-blocks/python/grc_gnuradio/blks2/selector.py @@ -40,6 +40,9 @@ class selector(gr.hier_block2): gr.io_signature(num_inputs, num_inputs, item_size), gr.io_signature(num_outputs, num_outputs, item_size), ) + + print "Warning: the blks2.selector block is deprecated." + #terminator blocks for unused inputs and outputs self.input_terminators = [blocks.null_sink(item_size) for i in range(num_inputs)] self.output_terminators = [blocks.head(item_size, 0) for i in range(num_outputs)] @@ -130,6 +133,8 @@ class valve(selector): else: output_index = 0 selector.__init__(self, item_size, 1, 1, 0, output_index) + print "Warning: the blks2.valve block is deprecated." + def set_open(self, open): """ Callback to set open state. diff --git a/gr-blocks/python/grc_gnuradio/blks2/tcp.py b/gr-blocks/python/grc_gnuradio/blks2/tcp.py index aee90fad2c..6ae24d3a7b 100644 --- a/gr-blocks/python/grc_gnuradio/blks2/tcp.py +++ b/gr-blocks/python/grc_gnuradio/blks2/tcp.py @@ -58,6 +58,8 @@ class tcp_source(gr.hier_block2): fd = _get_sock_fd(addr, port, server) self.connect(blocks.file_descriptor_source(itemsize, fd), self) + print "Warning: the blks2.tcp_source block is deprecated." + class tcp_sink(gr.hier_block2): def __init__(self, itemsize, addr, port, server=False): #init hier block @@ -68,3 +70,5 @@ class tcp_sink(gr.hier_block2): ) fd = _get_sock_fd(addr, port, server) self.connect(self, blocks.file_descriptor_sink(itemsize, fd)) + + print "Warning: the blks2.tcp_sink block is deprecated." diff --git a/gr-digital/python/grc_gnuradio/blks2/packet.py b/gr-digital/python/grc_gnuradio/blks2/packet.py index ef79afde64..dc06544c19 100644 --- a/gr-digital/python/grc_gnuradio/blks2/packet.py +++ b/gr-digital/python/grc_gnuradio/blks2/packet.py @@ -107,6 +107,8 @@ class packet_encoder(gr.hier_block2): #connect self.connect(msg_source, self) + print "Warning: the blks2.packet_encoder block is deprecated." + def send_pkt(self, payload): """ Wrap the payload in a packet and push onto the message queue. @@ -184,6 +186,8 @@ class packet_decoder(gr.hier_block2): #start thread _packet_decoder_thread(msgq, callback) + print "Warning: the blks2.packet_decoder block is deprecated." + ################################################## ## Packet Mod for OFDM Mod and Packet Encoder ################################################## |