diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-10-05 16:09:55 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-10-05 16:36:29 -0700 |
| commit | 3c63f7334d6de70d655aa97fcccbfb950645f4d4 (patch) | |
| tree | ac06cdb228d00e02fcab9a47852bfc57b5957d0c /gnuradio-runtime/lib/hier_block2_detail.cc | |
| parent | 8fe518ce740ae728f658c1854a7ffa074e800e9d (diff) | |
| parent | a0adcd3347c7ffd6ef3c42ce7705a23978774d3b (diff) | |
Merge branch 'master' into next
Conflicts:
gr-digital/examples/CMakeLists.txt
gr-uhd/lib/usrp_source_impl.cc
gr-uhd/lib/usrp_source_impl.h
Diffstat (limited to 'gnuradio-runtime/lib/hier_block2_detail.cc')
| -rw-r--r-- | gnuradio-runtime/lib/hier_block2_detail.cc | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc b/gnuradio-runtime/lib/hier_block2_detail.cc index e23ca2bd3d..dbf519b6ef 100644 --- a/gnuradio-runtime/lib/hier_block2_detail.cc +++ b/gnuradio-runtime/lib/hier_block2_detail.cc @@ -787,13 +787,6 @@ namespace gr { std::vector<basic_block_sptr>::const_iterator b; // Because flatten_aux is const 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 @@ -901,6 +894,16 @@ namespace gr { std::cout << "flatten_aux finished in top_block" << std::endl; sfg->dump(); } + + // if ctrlport is enabled, call setup RPC for all blocks in the flowgraph + if(ctrlport_on) { + for(b = blocks.begin(); b != blocks.end(); b++) { + if(!(*b)->is_rpc_set()) { + (*b)->setup_rpc(); + (*b)->rpc_set(); + } + } + } } void |