Merge branch 'maint'

author: Johnathan Corgan <johnathan@corganlabs.com> 2015-04-29 14:36:57 -0700
committer: Johnathan Corgan <johnathan@corganlabs.com> 2015-04-29 14:36:57 -0700
commit: 465d4e06ba7fa3a84a37a9fe5c0763e5fbd3895f (patch)
tree: c7ce75264ccd5543996d3c5c24ce9cf095c0de69
parent: 1425e4828ab61d0579d39e8e6b6f362cba1017d8 (diff)
parent: 9b9608e185755c298fcbd7fc05107740e387c330 (diff)
10 files changed, 37 insertions, 28 deletions
diff --git a/docs/doxygen/other/build_guide.dox b/docs/doxygen/other/build_guide.dox
index ebf47dc7e2..8fc3f911fb 100644
--- a/docs/doxygen/other/build_guide.dox
+++ b/docs/doxygen/other/build_guide.dox
@@ -1,4 +1,4 @@
-/*! \page build_guide Build Instructions and Information
+        /*! \page build_guide Build Instructions and Information
 
 \section dependencies Dependencies
 
@@ -24,11 +24,11 @@ installation tool (apt-get, pkg_install, YaST, yum, urpmi, etc.)
 first. Most recent systems have these packages available.
 
 \subsection dep_global Global Dependencies
-\li git                      http://code.google.com/p/msysgit
+\li git                      http://git-scm.com/downloads
 \li cmake       (>= 2.6.3)   http://www.cmake.org/cmake/resources/software.html
-\li boost       (>= 1.35)    http://www.boostpro.com/download
-\li cppunit     (>= 1.9.14)  http://gaiacrtn.free.fr/cppunit/index.html
-\li fftw3f      (>= 3.0.1)   http://www.fftw.org/install/windows.html
+\li boost       (>= 1.35)    http://www.boost.org/users/download/
+\li cppunit     (>= 1.9.14)  http://freedesktop.org/wiki/Software/cppunit/
+\li fftw3f      (>= 3.0.1)   http://www.fftw.org/download.html
 
 \subsection dep_python Python Wrappers
 \li python      (>= 2.5)     http://www.python.org/download/
@@ -176,7 +176,7 @@ If not specified, the "Release" mode is the default.
 
 Here are som other potentially helpful CMake flags. These are to help you specifically locate certain dependencies. While the CMake scripts themselves should generally find these for us, we can use these to help direct CMake to specific locations if we have installed a different version elsewhere on the system that CMake doesn't know about.
 
-\li QWT_LIBRARIES: shared library to use for Qwt (in the form <path>/libqwt.so).
+\li QWT_LIBRARIES: shared library to use for Qwt (in the form \<path\>/libqwt.so).
 \li QWT_INCLUDE_DIRS: path to Qwt include files (e.g., /usr/include/qwt).
 \li PYTHON_EXECUTABLE: Location of the 'python' binary you want to use (e.g., /usr/bin/python2.7).
 \li PYTHON_INCLUDE_PATH: path to Python include files (e.g., /usr/include/python2.7).
diff --git a/gr-blocks/include/gnuradio/blocks/tagged_stream_align.h b/gr-blocks/include/gnuradio/blocks/tagged_stream_align.h
index 979629317c..ae01198113 100644
--- a/gr-blocks/include/gnuradio/blocks/tagged_stream_align.h
+++ b/gr-blocks/include/gnuradio/blocks/tagged_stream_align.h
@@ -43,7 +43,8 @@ namespace gr {
       /*!
        * Make a tagged stream align
        *
-       * \param lengthtagname Length tag key
+       * \param itemsize The size (in bytes) of the item datatype.
+       * \param lengthtagname Name of the TSB's length tag key.
        */
       static sptr make(size_t itemsize, const std::string &lengthtagname);
     };
@@ -52,4 +53,3 @@ namespace gr {
 } // namespace gr
 
 #endif /* INCLUDED_TAGGED_STREAM_ALIGN_H */
-
diff --git a/gr-digital/lib/mpsk_snr_est.cc b/gr-digital/lib/mpsk_snr_est.cc
index 4e7825b894..098e465b2b 100644
--- a/gr-digital/lib/mpsk_snr_est.cc
+++ b/gr-digital/lib/mpsk_snr_est.cc
@@ -131,6 +131,7 @@ namespace gr {
     {
       d_y1 = 0;
       d_y2 = 0;
+      d_y3 = 0;
       d_counter = 1;
     }
 
diff --git a/gr-digital/lib/ofdm_chanest_vcvc_impl.cc b/gr-digital/lib/ofdm_chanest_vcvc_impl.cc
index 8d2c17ca8b..f27107f2db 100644
--- a/gr-digital/lib/ofdm_chanest_vcvc_impl.cc
+++ b/gr-digital/lib/ofdm_chanest_vcvc_impl.cc
@@ -63,6 +63,8 @@ namespace gr {
       d_corr_v(sync_symbol2),
       d_known_symbol_diffs(0, 0),
       d_new_symbol_diffs(0, 0),
+      d_first_active_carrier(0),
+      d_last_active_carrier(sync_symbol2.size()-1),
       d_interpolate(false)
     {
       // Set index of first and last active carrier
diff --git a/gr-digital/lib/pn_correlator_cc_impl.cc b/gr-digital/lib/pn_correlator_cc_impl.cc
index 649b73be14..fa86de8cfe 100644
--- a/gr-digital/lib/pn_correlator_cc_impl.cc
+++ b/gr-digital/lib/pn_correlator_cc_impl.cc
@@ -43,7 +43,8 @@ namespace gr {
       : sync_decimator("pn_correlator_cc",
 			  io_signature::make(1, 1, sizeof(gr_complex)),
 			  io_signature::make(1, 1, sizeof(gr_complex)),
-			  (unsigned int)((1ULL << degree)-1)) // PN code length
+			  (unsigned int)((1ULL << degree)-1)), // PN code length
+      d_pn(0.0f)
     {
       d_len = (unsigned int)((1ULL << degree)-1);
       if(mask == 0)
diff --git a/gr-digital/lib/simple_correlator_impl.cc b/gr-digital/lib/simple_correlator_impl.cc
index 6524e906a4..0e0b05a9a1 100644
--- a/gr-digital/lib/simple_correlator_impl.cc
+++ b/gr-digital/lib/simple_correlator_impl.cc
@@ -51,6 +51,7 @@ namespace gr {
                  io_signature::make(1, 1, sizeof(unsigned char))),
         d_payload_bytesize(payload_bytesize),
         d_state(ST_LOOKING), d_osi(0),
+        d_transition_osi(0), d_center_osi(0),
         d_bblen((payload_bytesize + GRSF_PAYLOAD_OVERHEAD) * GRSF_BITS_PER_BYTE),
         d_bitbuf(new unsigned char[d_bblen]),
         d_pktbuf(new unsigned char[d_bblen/GRSF_BITS_PER_BYTE]),
diff --git a/gr-fec/include/gnuradio/fec/awgn_bp.h b/gr-fec/include/gnuradio/fec/awgn_bp.h
index f420d76394..62fe7e26a4 100644
--- a/gr-fec/include/gnuradio/fec/awgn_bp.h
+++ b/gr-fec/include/gnuradio/fec/awgn_bp.h
@@ -119,13 +119,14 @@ class FEC_API awgn_bp
     int get_max_iterations();
 
     /*!
-      \brief Decodes the given vector rx_word by message passing.
-
-      \param *niterations is the number of message passing iterations
-      done to decode this codeword
+     * \brief Decodes the given vector rx_word by message passing.
+     *
+     * \param rx_word The received samples for decoding.
+     * \param niterations The number of message passing iterations
+     *        done to decode this codeword.
     */
     std::vector<char> decode (std::vector<float> rx_word,
-            int *niterations);
+                              int *niterations);
   private:
     //! The number of check nodes in the tanner-graph
     int M;
diff --git a/gr-fec/include/gnuradio/fec/gf2mat.h b/gr-fec/include/gnuradio/fec/gf2mat.h
index 963b20830d..51aa310518 100644
--- a/gr-fec/include/gnuradio/fec/gf2mat.h
+++ b/gr-fec/include/gnuradio/fec/gf2mat.h
@@ -54,7 +54,7 @@ class GF2Mat
     int get_M();
 
     //! Returns the variable N
-    int get_N(); 
+    int get_N();
 
     //! Set the element at (i, j) coordinate to val
     void set_element(int i, int j, char val);
@@ -93,17 +93,18 @@ class GF2Mat
     std::vector<std::vector<char> > get_H();
 
     /*!
-      \brief Obtains an equivalent representation of H for encoding
-
-      For encoding a G matrix in the form [I P] is obtained from the
-      parity matrix H, by (a) Column permutations, (b) Row additions
-      and (c) Row permutations. Details of encoding is given in
-      section A.1 of the reference given below.
-       - "Modern Coding Theory", T Richardson and R Urbanke.
-
-      \param p is the column permutation during this operation
-      \
-    */
+     * \brief Obtains an equivalent representation of H for encoding
+     *
+     * For encoding a G matrix in the form [I P] obtained from the
+     * parity matrix H, by (a) Column permutations, (b) Row additions
+     * and (c) Row permutations. Details of encoding is given in
+     * section A.1 of the reference:
+     *
+     *  - "Modern Coding Theory", T Richardson and R Urbanke.
+     *
+     * \param p The column permutation during this operation.
+     * \param rank The rank of the matrix.
+     */
     GF2Mat get_G(std::vector<int> & p, int & rank);
 
 };
diff --git a/gr-uhd/examples/c++/tags_demo.cc b/gr-uhd/examples/c++/tags_demo.cc
index 787e3d2e4b..42cbb46874 100644
--- a/gr-uhd/examples/c++/tags_demo.cc
+++ b/gr-uhd/examples/c++/tags_demo.cc
@@ -24,6 +24,7 @@
 #include <gnuradio/uhd/usrp_sink.h>
 #include <tag_source_demo.h>
 #include <tag_sink_demo.h>
+#include <uhd/utils/safe_main.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/thread/thread.hpp> //sleep
 #include <boost/program_options.hpp>
@@ -41,7 +42,7 @@ void sig_int_handler(int){stop_signal_called = true;}
 /***********************************************************************
  * Main w/ program options
  **********************************************************************/
-int main(int argc, char *argv[]){
+int UHD_SAFE_MAIN(int argc, char *argv[]){
 
     std::string device_addr, length_tag;
     double center_freq, samp_rate, burst_dur, idle_dur;
diff --git a/grc/base/Block.py b/grc/base/Block.py
index cadff12c0a..afe326bbf4 100644
--- a/grc/base/Block.py
+++ b/grc/base/Block.py
@@ -141,8 +141,9 @@ class Block(Element):
                                      and (self._key != "virtual_sink") \
                                      and (self._key != "pad_source") \
                                      and (self._key != "pad_sink"))
+        is_variable = self._key.startswith('variable')
 
-        if is_not_virtual_or_pad:
+        if is_not_virtual_or_pad and not is_variable:
             self.get_params().append(self.get_parent().get_parent().Param(
                 block=self,
                 n=odict({'name': 'Block Alias',
author	Johnathan Corgan <johnathan@corganlabs.com>	2015-04-29 14:36:57 -0700
committer	Johnathan Corgan <johnathan@corganlabs.com>	2015-04-29 14:36:57 -0700
commit	465d4e06ba7fa3a84a37a9fe5c0763e5fbd3895f (patch)
tree	c7ce75264ccd5543996d3c5c24ce9cf095c0de69
parent	1425e4828ab61d0579d39e8e6b6f362cba1017d8 (diff)
parent	9b9608e185755c298fcbd7fc05107740e387c330 (diff)