diff options
| -rw-r--r-- | cmake/Modules/FindQwt.cmake | 4 | ||||
| -rw-r--r-- | docs/doxygen/other/group_defs.dox | 2 | ||||
| -rw-r--r-- | docs/sphinx/source/blocks/networking_tools_blk.rst | 4 | ||||
| -rw-r--r-- | gr-trellis/examples/python/README | 2 | ||||
| -rw-r--r-- | gr-uhd/lib/usrp_source_impl.cc | 10 | ||||
| -rw-r--r-- | gr-uhd/lib/usrp_source_impl.h | 5 | ||||
| -rw-r--r-- | grc/gui/MainWindow.py | 6 |
7 files changed, 19 insertions, 14 deletions
diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake index a94055876a..0e2c13571f 100644 --- a/cmake/Modules/FindQwt.cmake +++ b/cmake/Modules/FindQwt.cmake @@ -21,7 +21,7 @@ find_path(QWT_INCLUDE_DIRS ) find_library (QWT_LIBRARIES - NAMES qwt qwt6 qwt-qt4 + NAMES qwt6 qwt qwt-qt4 HINTS ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/lib64 @@ -56,4 +56,4 @@ if(QWT_FOUND) include ( FindPackageHandleStandardArgs ) find_package_handle_standard_args( Qwt DEFAULT_MSG QWT_LIBRARIES QWT_INCLUDE_DIRS ) MARK_AS_ADVANCED(QWT_LIBRARIES QWT_INCLUDE_DIRS) -endif(QWT_FOUND)
\ No newline at end of file +endif(QWT_FOUND) diff --git a/docs/doxygen/other/group_defs.dox b/docs/doxygen/other/group_defs.dox index 170465fa1c..428ac9a8f3 100644 --- a/docs/doxygen/other/group_defs.dox +++ b/docs/doxygen/other/group_defs.dox @@ -31,7 +31,7 @@ /*! \defgroup message_tools_blk Message Tools */ /*! \defgroup misc_blk Miscellaneous */ /*! \defgroup modulators_blk Modulators and Demodulators */ -/*! \defgroup networking_tools_blk Netwroking Tools */ +/*! \defgroup networking_tools_blk Networking Tools */ /*! \defgroup noaa_blk NOAA Blocks */ /*! \defgroup ofdm_blk OFDM Blocks */ /*! \defgroup packet_operators_blk Packet/Frame Operators */ diff --git a/docs/sphinx/source/blocks/networking_tools_blk.rst b/docs/sphinx/source/blocks/networking_tools_blk.rst index d733b5d3e5..e3e2450e2c 100644 --- a/docs/sphinx/source/blocks/networking_tools_blk.rst +++ b/docs/sphinx/source/blocks/networking_tools_blk.rst @@ -1,7 +1,7 @@ -gnuradio.blocks: Netwroking Tools +gnuradio.blocks: Networking Tools ================================= .. autoblock:: gnuradio.blocks.socket_pdu .. autoblock:: gnuradio.blocks.tuntap_pdu .. autoblock:: gnuradio.blocks.udp_sink -.. autoblock:: gnuradio.blocks.udp_source
\ No newline at end of file +.. autoblock:: gnuradio.blocks.udp_source diff --git a/gr-trellis/examples/python/README b/gr-trellis/examples/python/README index d51f231ac3..155b0a9416 100644 --- a/gr-trellis/examples/python/README +++ b/gr-trellis/examples/python/README @@ -1,6 +1,6 @@ Here we have several test programs for use with the gr-trellis implementation. Documentation can be found in -http://gnuradio.utah.edu/svn/gnuradio/trunk/gr-trellis/doc/gr-trellis.html +http://gnuradio.org/doc/doxygen/group__trellis__coding__blk.html fsm_utils.py contains several useful functions. diff --git a/gr-uhd/lib/usrp_source_impl.cc b/gr-uhd/lib/usrp_source_impl.cc index 318bdb627d..e57db13a0b 100644 --- a/gr-uhd/lib/usrp_source_impl.cc +++ b/gr-uhd/lib/usrp_source_impl.cc @@ -491,9 +491,12 @@ namespace gr { bool usrp_source_impl::start(void) { + boost::recursive_mutex::scoped_lock lock(d_mutex); #ifdef GR_UHD_USE_STREAM_API - _rx_stream = _dev->get_rx_stream(_stream_args); - _samps_per_packet = _rx_stream->get_max_num_samps(); + if(not _rx_stream){ + _rx_stream = _dev->get_rx_stream(_stream_args); + _samps_per_packet = _rx_stream->get_max_num_samps(); + } #endif //setup a stream command that starts streaming slightly in the future static const double reasonable_delay = 0.1; //order of magnitude over RTT @@ -537,8 +540,8 @@ namespace gr { bool usrp_source_impl::stop(void) { + boost::recursive_mutex::scoped_lock lock(d_mutex); this->issue_stream_cmd(::uhd::stream_cmd_t::STREAM_MODE_STOP_CONTINUOUS); - this->flush(); return true; @@ -603,6 +606,7 @@ namespace gr { gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { + boost::recursive_mutex::scoped_lock lock(d_mutex); #ifdef GR_UHD_USE_STREAM_API //In order to allow for low-latency: //We receive all available packets without timeout. diff --git a/gr-uhd/lib/usrp_source_impl.h b/gr-uhd/lib/usrp_source_impl.h index 58bb21551c..3cfa1aad35 100644 --- a/gr-uhd/lib/usrp_source_impl.h +++ b/gr-uhd/lib/usrp_source_impl.h @@ -22,6 +22,7 @@ #include <gnuradio/uhd/usrp_source.h> #include <uhd/convert.hpp> +#include <boost/thread/mutex.hpp> static const pmt::pmt_t TIME_KEY = pmt::string_to_symbol("rx_time"); static const pmt::pmt_t RATE_KEY = pmt::string_to_symbol("rx_rate"); @@ -121,7 +122,7 @@ namespace gr { int work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items); - + private: ::uhd::usrp::multi_usrp::sptr _dev; const ::uhd::stream_args_t _stream_args; @@ -142,6 +143,8 @@ namespace gr { //tag shadows double _samp_rate; double _center_freq; + + boost::recursive_mutex d_mutex; }; } /* namespace uhd */ diff --git a/grc/gui/MainWindow.py b/grc/gui/MainWindow.py index 5f2044aa64..12f3b203b0 100644 --- a/grc/gui/MainWindow.py +++ b/grc/gui/MainWindow.py @@ -100,7 +100,7 @@ class MainWindow(gtk.Window): #house the reports in a scrolled window self.reports_scrolled_window = gtk.ScrolledWindow() self.reports_scrolled_window.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) - self.reports_scrolled_window.add_with_viewport(self.text_display) + self.reports_scrolled_window.add(self.text_display) self.reports_scrolled_window.set_size_request(-1, DEFAULT_REPORTS_WINDOW_WIDTH) self.flow_graph_vpaned.pack2(self.reports_scrolled_window, False) #dont allow resize #load preferences and show the main window @@ -155,9 +155,7 @@ class MainWindow(gtk.Window): line: the new text """ self.text_display.insert(line) - vadj = self.reports_scrolled_window.get_vadjustment() - vadj.value = vadj.upper - vadj.page_size - vadj.changed() + self.text_display.scroll_mark_onscreen(self.text_display.get_buffer().get_insert()) ############################################################ # Pages: create and close |