diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-04-25 15:52:44 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-04-25 15:52:44 -0700 |
| commit | 77679de8aca6a56f617f8a3f35af4a706369d88c (patch) | |
| tree | 0bc951092bf3f7f13217ed934c57a837de4a25e7 | |
| parent | 677995dba3ac2b3c87f65eb1c7d3b021cae37575 (diff) | |
| parent | ece754f1716b7378162b54b09b2a88e53e538d12 (diff) | |
Merge branch 'master' into next
| -rw-r--r-- | gnuradio-runtime/gr_log_default.conf | 21 | ||||
| -rw-r--r-- | gr-blocks/lib/udp_sink_impl.cc | 2 | ||||
| -rw-r--r-- | gr-blocks/lib/udp_source_impl.cc | 2 | ||||
| -rw-r--r-- | gr-uhd/grc/gen_uhd_usrp_blocks.py | 2 | ||||
| -rw-r--r-- | grc/core/FlowGraph.py | 2 | ||||
| -rw-r--r-- | grc/core/Platform.py | 2 | ||||
| -rw-r--r-- | grc/gui/Bars.py | 4 |
7 files changed, 8 insertions, 27 deletions
diff --git a/gnuradio-runtime/gr_log_default.conf b/gnuradio-runtime/gr_log_default.conf index f2c17a00f1..15b88212ce 100644 --- a/gnuradio-runtime/gr_log_default.conf +++ b/gnuradio-runtime/gr_log_default.conf @@ -1,24 +1,3 @@ -/* - * Copyright 2006,2010,2011 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * GNU Radio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - log4j.rootCategory=EMERG,A1 log4j.category.gr_log=DEBUG,A2 log4j.category.gr_log_debug=NOTSET,A3 diff --git a/gr-blocks/lib/udp_sink_impl.cc b/gr-blocks/lib/udp_sink_impl.cc index 6989fdb27c..b540a7da19 100644 --- a/gr-blocks/lib/udp_sink_impl.cc +++ b/gr-blocks/lib/udp_sink_impl.cc @@ -99,7 +99,7 @@ namespace gr { gr::thread::scoped_lock guard(d_mutex); // protect d_socket from work() // Send a few zero-length packets to signal receiver we are done - boost::array<char, 1> send_buf = {{ 0 }}; + boost::array<char, 0> send_buf; if(d_eof) { int i; for(i = 0; i < 3; i++) diff --git a/gr-blocks/lib/udp_source_impl.cc b/gr-blocks/lib/udp_source_impl.cc index b1977a8fce..e09ed43658 100644 --- a/gr-blocks/lib/udp_source_impl.cc +++ b/gr-blocks/lib/udp_source_impl.cc @@ -149,7 +149,7 @@ namespace gr { if(!error) { { boost::lock_guard<gr::thread::mutex> lock(d_udp_mutex); - if(d_eof && (bytes_transferred == 1) && (d_rxbuf[0] == 0x00)) { + if(d_eof && (bytes_transferred == 0)) { // If we are using EOF notification, test for it and don't // add anything to the output. d_residual = WORK_DONE; diff --git a/gr-uhd/grc/gen_uhd_usrp_blocks.py b/gr-uhd/grc/gen_uhd_usrp_blocks.py index 1d1f76cd95..fd2e77707e 100644 --- a/gr-uhd/grc/gen_uhd_usrp_blocks.py +++ b/gr-uhd/grc/gen_uhd_usrp_blocks.py @@ -61,12 +61,12 @@ self.\$(id).set_subdev_spec(\$sd_spec$(m), $m) \#end if ######################################################################## #end for +self.\$(id).set_samp_rate(\$samp_rate) \#if \$sync() == 'sync' self.\$(id).set_time_unknown_pps(uhd.time_spec()) \#elif \$sync() == 'pc_clock' self.\$(id).set_time_now(uhd.time_spec(time.time()), uhd.ALL_MBOARDS) \#end if -self.\$(id).set_samp_rate(\$samp_rate) #for $n in range($max_nchan) \#if \$nchan() > $n self.\$(id).set_center_freq(\$center_freq$(n), $n) diff --git a/grc/core/FlowGraph.py b/grc/core/FlowGraph.py index 313af3107a..2f33baf8d0 100644 --- a/grc/core/FlowGraph.py +++ b/grc/core/FlowGraph.py @@ -587,7 +587,7 @@ def _dummy_block_add_port(block, key, dir): """ This is so ugly... Add a port to a dummy-field block """ port_n = odict({'name': '?', 'key': key, 'type': ''}) port = block.get_parent().get_parent().Port(block=block, n=port_n, dir=dir) - if port.is_source(): + if port.is_source: block.get_sources().append(port) else: block.get_sinks().append(port) diff --git a/grc/core/Platform.py b/grc/core/Platform.py index 4c1e6f471a..5bcf79c4b2 100644 --- a/grc/core/Platform.py +++ b/grc/core/Platform.py @@ -113,6 +113,8 @@ class Platform(Element): flow_graph.validate() if not flow_graph.is_valid(): raise Exception('Flowgraph invalid') + if not flow_graph.get_option('generate_options').startswith('hb'): + raise Exception('Not a hier block') except Exception as e: Messages.send('>>> Load Error: {}: {}\n'.format(file_path, str(e))) return False diff --git a/grc/gui/Bars.py b/grc/gui/Bars.py index 259aa6ed8b..cb101111cd 100644 --- a/grc/gui/Bars.py +++ b/grc/gui/Bars.py @@ -189,7 +189,7 @@ class SubMenuCreator(object): item = Actions.FLOW_GRAPH_NEW.create_menu_item() item.set_label(name) else: - item = gtk.MenuItem(name) + item = gtk.MenuItem(name, use_underline=False) item.connect('activate', self.callback_adaptor, (action, key)) menu.append(item) menu.show_all() @@ -202,7 +202,7 @@ class SubMenuCreator(object): recent_files = Preferences.get_recent_files() if len(recent_files) > 0: for i, file_name in enumerate(recent_files): - item = gtk.MenuItem("%d. %s" % (i+1, file_name)) + item = gtk.MenuItem("%d. %s" % (i+1, file_name), use_underline=False) item.connect('activate', self.callback_adaptor, (action, file_name)) menu.append(item) |