diff options
Diffstat (limited to 'grc/grc_gnuradio')
| -rw-r--r-- | grc/grc_gnuradio/blks2/error_rate.py | 8 | ||||
| -rw-r--r-- | grc/grc_gnuradio/blks2/packet.py | 9 |
2 files changed, 9 insertions, 8 deletions
diff --git a/grc/grc_gnuradio/blks2/error_rate.py b/grc/grc_gnuradio/blks2/error_rate.py index 7f53f7af65..7970f29bae 100644 --- a/grc/grc_gnuradio/blks2/error_rate.py +++ b/grc/grc_gnuradio/blks2/error_rate.py @@ -79,10 +79,10 @@ class error_rate(gr.hier_block2): self._max_samples = win_size self._bits_per_symbol = bits_per_symbol #setup message queue - msg_source = gr.message_source(gr.sizeof_float, 1) + msg_source = blocks.message_source(gr.sizeof_float, 1) self._msgq_source = msg_source.msgq() msgq_sink = gr.msg_queue(2) - msg_sink = gr.message_sink(gr.sizeof_char, msgq_sink, False) #False -> blocking + msg_sink = blocks.message_sink(gr.sizeof_char, msgq_sink, False) #False -> blocking inter = blocks.interleave(gr.sizeof_char) #start thread self._num_errs = 0 @@ -113,7 +113,7 @@ class error_rate(gr.hier_block2): #write sample arr[i] = float(self._num_errs)/float(self._num_samps*self._bits_per_symbol) #write message - msg = gr.message_from_string(arr.tostring(), 0, gr.sizeof_float, num) + msg = blocks.message_from_string(arr.tostring(), 0, gr.sizeof_float, num) self._msgq_source.insert_tail(msg) def _handler_ser(self, samples): @@ -136,5 +136,5 @@ class error_rate(gr.hier_block2): #write sample arr[i] = float(self._num_errs)/float(self._num_samps) #write message - msg = gr.message_from_string(arr.tostring(), 0, gr.sizeof_float, num) + msg = blocks.message_from_string(arr.tostring(), 0, gr.sizeof_float, num) self._msgq_source.insert_tail(msg) diff --git a/grc/grc_gnuradio/blks2/packet.py b/grc/grc_gnuradio/blks2/packet.py index cceb4da650..eeadfb4a60 100644 --- a/grc/grc_gnuradio/blks2/packet.py +++ b/grc/grc_gnuradio/blks2/packet.py @@ -19,6 +19,7 @@ # from gnuradio import gr, digital +from gnuradio import blocks from gnuradio.digital import packet_utils import gnuradio.gr.gr_threading as _threading @@ -89,7 +90,7 @@ class packet_encoder(gr.hier_block2): self._access_code = access_code self._pad_for_usrp = pad_for_usrp #create blocks - msg_source = gr.message_source(gr.sizeof_char, DEFAULT_MSGQ_LIMIT) + msg_source = blocks.message_source(gr.sizeof_char, DEFAULT_MSGQ_LIMIT) self._msgq_out = msg_source.msgq() #initialize hier2 gr.hier_block2.__init__( @@ -199,7 +200,7 @@ class packet_mod_base(gr.hier_block2): ) #create blocks msgq = gr.msg_queue(DEFAULT_MSGQ_LIMIT) - msg_sink = gr.message_sink(self._item_size_in, msgq, False) #False -> blocking + msg_sink = blocks.message_sink(self._item_size_in, msgq, False) #False -> blocking #connect self.connect(self, msg_sink) self.connect(packet_source, self) @@ -229,7 +230,7 @@ class packet_demod_base(gr.hier_block2): gr.io_signature(1, 1, self._item_size_out) # Output signature ) #create blocks - msg_source = gr.message_source(self._item_size_out, DEFAULT_MSGQ_LIMIT) + msg_source = blocks.message_source(self._item_size_out, DEFAULT_MSGQ_LIMIT) self._msgq_out = msg_source.msgq() #connect self.connect(self, packet_sink) @@ -238,7 +239,7 @@ class packet_demod_base(gr.hier_block2): self.connect(packet_sink, gr.null_sink(packet_sink._hb.output_signature().sizeof_stream_item(0))) def recv_pkt(self, ok, payload): - msg = gr.message_from_string(payload, 0, self._item_size_out, len(payload)/self._item_size_out) + msg = blocks.message_from_string(payload, 0, self._item_size_out, len(payload)/self._item_size_out) if ok: self._msgq_out.insert_tail(msg) class packet_demod_b(packet_demod_base): _item_size_out = gr.sizeof_char |