diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-01-12 12:21:17 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-01-12 12:21:17 -0800 |
| commit | e70db91c1621ff3673323a6514fd646575b11e43 (patch) | |
| tree | 59b5379e884e1f2ac103aec9adcc39ab70366861 /gnuradio-runtime | |
| parent | 8d80d0adacc98b02392428ab5284d8417df9c776 (diff) | |
| parent | 6225e5d4d1edd67c896c6c43bdc584a078480a8d (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-runtime')
| -rw-r--r-- | gnuradio-runtime/lib/hier_block2_detail.cc | 22 | ||||
| -rw-r--r-- | gnuradio-runtime/python/pmt/pmt_to_python.py | 2 | ||||
| -rw-r--r-- | gnuradio-runtime/swig/tags.i | 1 |
3 files changed, 11 insertions, 14 deletions
diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc b/gnuradio-runtime/lib/hier_block2_detail.cc index e6d867b269..e23ca2bd3d 100644 --- a/gnuradio-runtime/lib/hier_block2_detail.cc +++ b/gnuradio-runtime/lib/hier_block2_detail.cc @@ -594,12 +594,6 @@ namespace gr { basic_block_sptr b; b = p->src().block(); - if(ctrlport_on) { - if(!b->is_rpc_set()) { - b->setup_rpc(); - b->rpc_set(); - } - } if(set_all_min_buff){ //sets the min buff for every block within hier_block2 if(min_buff != 0){ @@ -656,12 +650,6 @@ namespace gr { } b = p->dst().block(); - if(ctrlport_on) { - if(!b->is_rpc_set()) { - b->setup_rpc(); - b->rpc_set(); - } - } if(set_all_min_buff){ //sets the min buff for every block within hier_block2 if(min_buff != 0){ @@ -797,8 +785,16 @@ namespace gr { // First add the list of singleton blocks std::vector<basic_block_sptr>::const_iterator b; // Because flatten_aux is const - for(b = d_blocks.begin(); b != d_blocks.end(); b++) + for(b = d_blocks.begin(); b != d_blocks.end(); b++) { tmp.push_back(*b); + // for every block, attempt to setup RPC + if(ctrlport_on) { + if(!(*b)->is_rpc_set()) { + (*b)->setup_rpc(); + (*b)->rpc_set(); + } + } + } // Now add the list of connected input blocks std::stringstream msg; diff --git a/gnuradio-runtime/python/pmt/pmt_to_python.py b/gnuradio-runtime/python/pmt/pmt_to_python.py index e08b7265de..f9000ec279 100644 --- a/gnuradio-runtime/python/pmt/pmt_to_python.py +++ b/gnuradio-runtime/python/pmt/pmt_to_python.py @@ -130,6 +130,6 @@ def pmt_to_python(p): def python_to_pmt(p): for python_type, pmt_check, to_python, from_python in type_mappings: if python_type is None: - if p == None: return from_python(p) + if p is None: return from_python(p) elif isinstance(p, python_type): return from_python(p) raise ValueError("can't convert %s type to pmt (%s)"%(type(p),p)) diff --git a/gnuradio-runtime/swig/tags.i b/gnuradio-runtime/swig/tags.i index 2615264738..c86e7f7244 100644 --- a/gnuradio-runtime/swig/tags.i +++ b/gnuradio-runtime/swig/tags.i @@ -25,6 +25,7 @@ %import <pmt_swig.i> //for pmt support +%ignore gr::tag_t::operator=; %include <gnuradio/tags.h> //gives support for a vector of tags (get tags in range) |