Merge branch 'maint'

author: Johnathan Corgan <johnathan@corganlabs.com> 2016-04-25 15:44:52 -0700
committer: Johnathan Corgan <johnathan@corganlabs.com> 2016-04-25 15:44:52 -0700
commit: ece754f1716b7378162b54b09b2a88e53e538d12 (patch)
tree: 73cfc61c344967bff5d964368785e635b9905ce2
parent: 873b86cb54d03b9d705a2cb3cc5c09877323ed80 (diff)
parent: 4aa94044e721f1a4fbff75f5bfb32c5adb5691ea (diff)
8 files changed, 7 insertions, 28 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-qtgui/include/gnuradio/qtgui/freq_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h
index 3aea2d1b84..f2fc571acb 100644
--- a/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h
@@ -90,7 +90,7 @@ namespace gr {
        * \param fftsize size of the FFT to compute and display. If using
        *        the PDU message port to plot samples, the length of
        *        each PDU must be a multiple of the FFT size.
-       * \param wintype type of window to apply (see gnuradio/filter/firdes.h)
+       * \param wintype type of window to apply (see gr::fft::window::win_type)
        * \param fc center frequency of signal (use for x-axis labels)
        * \param bw bandwidth of signal (used to set x-axis labels)
        * \param name title for the plot
diff --git a/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h
index eb68806c07..f13653731d 100644
--- a/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h
@@ -90,7 +90,7 @@ namespace gr {
        * \param fftsize size of the FFT to compute and display. If using
        *        the PDU message port to plot samples, the length of
        *        each PDU must be a multiple of the FFT size.
-       * \param wintype type of window to apply (see gnuradio/filter/firdes.h)
+       * \param wintype type of window to apply (see gr::fft::window::win_type)
        * \param fc center frequency of signal (use for x-axis labels)
        * \param bw bandwidth of signal (used to set x-axis labels)
        * \param name title for the plot
diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h
index 1e4073aa01..c0bdf1623b 100644
--- a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h
+++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h
@@ -95,7 +95,7 @@ namespace gr {
        * \param size size of the FFT to compute and display. If using
        *        the PDU message port to plot samples, the length of
        *        each PDU must be a multiple of the FFT size.
-       * \param wintype type of window to apply (see gnuradio/filter/firdes.h)
+       * \param wintype type of window to apply (see gr::fft::window::win_type)
        * \param fc center frequency of signal (use for x-axis labels)
        * \param bw bandwidth of signal (used to set x-axis labels)
        * \param name title for the plot
diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h
index 93c93bdd5e..d38cb2cae7 100644
--- a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h
+++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h
@@ -96,7 +96,7 @@ namespace gr {
        * \param size size of the FFT to compute and display. If using
        *        the PDU message port to plot samples, the length of
        *        each PDU must be a multiple of the FFT size.
-       * \param wintype type of window to apply (see gnuradio/filter/firdes.h)
+       * \param wintype type of window to apply (see gr::fft::window::win_type)
        * \param fc center frequency of signal (use for x-axis labels)
        * \param bw bandwidth of signal (used to set x-axis labels)
        * \param name title for the plot
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)
author	Johnathan Corgan <johnathan@corganlabs.com>	2016-04-25 15:44:52 -0700
committer	Johnathan Corgan <johnathan@corganlabs.com>	2016-04-25 15:44:52 -0700
commit	ece754f1716b7378162b54b09b2a88e53e538d12 (patch)
tree	73cfc61c344967bff5d964368785e635b9905ce2
parent	873b86cb54d03b9d705a2cb3cc5c09877323ed80 (diff)
parent	4aa94044e721f1a4fbff75f5bfb32c5adb5691ea (diff)