diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-01-02 13:01:53 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-01-02 13:01:53 -0500 |
| commit | 1114f81d59abd87cbb0c10d88ab243935ba9e35f (patch) | |
| tree | d1bfd000c2292af12e5aa96d764ee85c29d9f746 /gnuradio-core/src/python | |
| parent | 69f57364c5b8fc575b6a956468025da37d32b1a6 (diff) | |
| parent | aa4245a69bf6954bf45c51aa7ffec9d049e09edc (diff) | |
Merge branch 'pmt_rename' into next
Conflicts:
gnuradio-core/src/lib/io/gr_pdu.cc
gruel/src/lib/pmt/pmt.cc
gruel/src/lib/pmt/qa_pmt_prims.cc
gruel/src/lib/pmt/unv_template.cc.t
gruel/src/swig/pmt_swig.i
Diffstat (limited to 'gnuradio-core/src/python')
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/gr/qa_block_gateway.py | 10 | ||||
| -rwxr-xr-x | gnuradio-core/src/python/gnuradio/gr/qa_pdu.py | 30 |
2 files changed, 20 insertions, 20 deletions
diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_block_gateway.py b/gnuradio-core/src/python/gnuradio/gr/qa_block_gateway.py index 374d87c5ca..2c8cba5439 100644 --- a/gnuradio-core/src/python/gnuradio/gr/qa_block_gateway.py +++ b/gnuradio-core/src/python/gnuradio/gr/qa_block_gateway.py @@ -112,8 +112,8 @@ class tag_source(gr.sync_block): #make a new tag on the middle element every time work is called count = self.nitems_written(0) + num_output_items/2 - key = pmt.pmt_string_to_symbol("example_key") - value = pmt.pmt_string_to_symbol("example_value") + key = pmt.string_to_symbol("example_key") + value = pmt.string_to_symbol("example_value") self.add_item_tag(0, count, key, value) return num_output_items @@ -138,9 +138,9 @@ class tag_sink(gr.sync_block): tags = self.get_tags_in_range(0, nread, nread+num_input_items) for tag in tags: #print tag.offset - #print pmt.pmt_symbol_to_string(tag.key) - #print pmt.pmt_symbol_to_string(tag.value) - self.key = pmt.pmt_symbol_to_string(tag.key) + #print pmt.symbol_to_string(tag.key) + #print pmt.symbol_to_string(tag.value) + self.key = pmt.symbol_to_string(tag.key) return num_input_items diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_pdu.py b/gnuradio-core/src/python/gnuradio/gr/qa_pdu.py index 572d8b1861..59f927fa19 100755 --- a/gnuradio-core/src/python/gnuradio/gr/qa_pdu.py +++ b/gnuradio-core/src/python/gnuradio/gr/qa_pdu.py @@ -46,23 +46,23 @@ class test_pdu(gr_unittest.TestCase): # Test that the right number of ports exist. pi = dbg.message_ports_in() po = dbg.message_ports_out() - self.assertEqual(pmt.pmt_length(pi), 2) - self.assertEqual(pmt.pmt_length(po), 0) + self.assertEqual(pmt.length(pi), 2) + self.assertEqual(pmt.length(po), 0) pi = snk3.message_ports_in() po = snk3.message_ports_out() - self.assertEqual(pmt.pmt_length(pi), 0) - self.assertEqual(pmt.pmt_length(po), 1) + self.assertEqual(pmt.length(pi), 0) + self.assertEqual(pmt.length(po), 1) #print "Message Debug input ports: " - #pmt.pmt_print(pi) + #pmt.print(pi) #print "Message Debug output ports: " - #pmt.pmt_print(po) + #pmt.print(po) #print "Stream to PDU input ports: " - #pmt.pmt_print(pi) + #pmt.print(pi) #print "Stream to PDU output ports: " - #pmt.pmt_print(po) + #pmt.print(po) time.sleep(0.1) self.tb.connect(src, snk) @@ -73,12 +73,12 @@ class test_pdu(gr_unittest.TestCase): self.tb.start() # make our reference and message pmts - port = pmt.pmt_intern("pdus") - msg = pmt.pmt_cons( pmt.PMT_NIL, pmt.pmt_make_u8vector(16, 0xFF) ) + port = pmt.intern("pdus") + msg = pmt.cons( pmt.PMT_NIL, pmt.make_u8vector(16, 0xFF) ) #print "printing port & msg" - #pmt.pmt_print(port) - #pmt.pmt_print(msg) + #print(port) + #print(msg) # post the message src.to_basic_block()._post( port, msg ) @@ -94,13 +94,13 @@ class test_pdu(gr_unittest.TestCase): # Get the vector of data from the message sink # Convert the message PMT as a pair into its vector result_msg = dbg.get_message(0) - msg_vec = pmt.pmt_cdr(result_msg) - pmt.pmt_print(msg_vec) + msg_vec = pmt.cdr(result_msg) + print(msg_vec) # Convert the PMT vector into a Python list msg_data = [] for i in xrange(16): - msg_data.append(pmt.pmt_u8vector_ref(msg_vec, i)) + msg_data.append(pmt.u8vector_ref(msg_vec, i)) actual_data = 16*[0xFF,] self.assertEqual(actual_data, list(result_data)) |