Merge branch 'master' into next

Conflicts:
	grc/blocks/Makefile.am

8 files changed, 64 insertions, 0 deletions

diff --git a/gnuradio-core/src/lib/general/gr_char_to_float.h b/gnuradio-core/src/lib/general/gr_char_to_float.h
index 4ad8e59a8..1ab53a087 100644
--- a/gnuradio-core/src/lib/general/gr_char_to_float.h
+++ b/gnuradio-core/src/lib/general/gr_char_to_float.h
@@ -35,6 +35,9 @@ gr_make_char_to_float (size_t vlen=1, float scale=1);
 /*!
  * \brief Convert stream of chars to a stream of float
  * \ingroup converter_blk
+ *
+ * \param vlen vector length of data streams.
+ * \param scale a scalar divider to change the output signal scale.
  */
 
 class GR_CORE_API gr_char_to_float : public gr_sync_block
@@ -48,7 +51,14 @@ class GR_CORE_API gr_char_to_float : public gr_sync_block
   float d_scale;
 
  public:
+  /*!
+   * Get the scalar divider value.
+   */
   float scale() const;
+
+  /*!
+   * Set the scalar divider value.
+   */
   void set_scale(float scale);
 
   virtual int work (int noutput_items,
diff --git a/gnuradio-core/src/lib/general/gr_char_to_short.h b/gnuradio-core/src/lib/general/gr_char_to_short.h
index 58f9a62b0..e93c15b12 100644
--- a/gnuradio-core/src/lib/general/gr_char_to_short.h
+++ b/gnuradio-core/src/lib/general/gr_char_to_short.h
@@ -35,6 +35,8 @@ gr_make_char_to_short (size_t vlen=1);
 /*!
  * \brief Convert stream of chars to a stream of float
  * \ingroup converter_blk
+ *
+ * \param vlen vector length of data streams.
  */
 
 class GR_CORE_API gr_char_to_short : public gr_sync_block
diff --git a/gnuradio-core/src/lib/general/gr_float_to_char.h b/gnuradio-core/src/lib/general/gr_float_to_char.h
index c88645a18..00e83d465 100644
--- a/gnuradio-core/src/lib/general/gr_float_to_char.h
+++ b/gnuradio-core/src/lib/general/gr_float_to_char.h
@@ -35,6 +35,9 @@ gr_make_float_to_char (size_t vlen=1, float scale=1);
 /*!
  * \brief Convert stream of float to a stream of char
  * \ingroup converter_blk
+ *
+ * \param vlen vector length of data streams.
+ * \param scale a scalar multiplier to change the output signal scale.
  */
 
 class GR_CORE_API gr_float_to_char : public gr_sync_block
@@ -48,7 +51,14 @@ class GR_CORE_API gr_float_to_char : public gr_sync_block
   float d_scale;
 
  public:
+  /*!
+   * Get the scalar multiplier value.
+   */
   float scale() const;
+
+  /*!
+   * Set the scalar multiplier value.
+   */
   void set_scale(float scale);
 
   virtual int work (int noutput_items,
diff --git a/gnuradio-core/src/lib/general/gr_float_to_int.h b/gnuradio-core/src/lib/general/gr_float_to_int.h
index 0b42c0aab..ef1987a76 100644
--- a/gnuradio-core/src/lib/general/gr_float_to_int.h
+++ b/gnuradio-core/src/lib/general/gr_float_to_int.h
@@ -35,6 +35,9 @@ gr_make_float_to_int (size_t vlen=1, float scale=1);
 /*!
  * \brief Convert stream of float to a stream of short
  * \ingroup converter_blk
+ *
+ * \param vlen vector length of data streams.
+ * \param scale a scalar multiplier to change the output signal scale.
  */
 
 class GR_CORE_API gr_float_to_int : public gr_sync_block
@@ -48,7 +51,14 @@ class GR_CORE_API gr_float_to_int : public gr_sync_block
   float d_scale;
 
  public:
+  /*!
+   * Get the scalar multiplier value.
+   */
   float scale() const;
+
+  /*!
+   * Set the scalar multiplier value.
+   */
   void set_scale(float scale);
 
   virtual int work (int noutput_items,
diff --git a/gnuradio-core/src/lib/general/gr_float_to_short.h b/gnuradio-core/src/lib/general/gr_float_to_short.h
index 93e441f41..beb95486f 100644
--- a/gnuradio-core/src/lib/general/gr_float_to_short.h
+++ b/gnuradio-core/src/lib/general/gr_float_to_short.h
@@ -35,6 +35,9 @@ gr_make_float_to_short (size_t vlen=1, float scale=1);
 /*!
  * \brief Convert stream of float to a stream of short
  * \ingroup converter_blk
+ *
+ * \param vlen vector length of data streams.
+ * \param scale a scalar multiplier to change the output signal scale.
  */
 
 class GR_CORE_API gr_float_to_short : public gr_sync_block
@@ -47,7 +50,14 @@ class GR_CORE_API gr_float_to_short : public gr_sync_block
   float d_scale;
 
  public:
+  /*!
+   * Get the scalar multiplier value.
+   */
   float scale() const;
+
+  /*!
+   * Set the scalar multiplier value.
+   */
   void set_scale(float scale);
 
   virtual int work (int noutput_items,
diff --git a/gnuradio-core/src/lib/general/gr_int_to_float.h b/gnuradio-core/src/lib/general/gr_int_to_float.h
index af6488a50..7c55e3b3c 100644
--- a/gnuradio-core/src/lib/general/gr_int_to_float.h
+++ b/gnuradio-core/src/lib/general/gr_int_to_float.h
@@ -35,6 +35,9 @@ gr_make_int_to_float (size_t vlen=1, float scale=1);
 /*!
  * \brief Convert stream of int to a stream of float
  * \ingroup converter_blk
+ *
+ * \param vlen vector length of data streams.
+ * \param scale a scalar divider to change the output signal scale.
  */
 
 class GR_CORE_API gr_int_to_float : public gr_sync_block
@@ -48,7 +51,14 @@ class GR_CORE_API gr_int_to_float : public gr_sync_block
   float d_scale;  
 
  public:
+  /*!
+   * Get the scalar divider value.
+   */
   float scale() const;
+
+  /*!
+   * Set the scalar divider value.
+   */
   void set_scale(float scale);
 
   virtual int work (int noutput_items,
diff --git a/gnuradio-core/src/lib/general/gr_short_to_char.h b/gnuradio-core/src/lib/general/gr_short_to_char.h
index 9682d86ec..f6b3b41ca 100644
--- a/gnuradio-core/src/lib/general/gr_short_to_char.h
+++ b/gnuradio-core/src/lib/general/gr_short_to_char.h
@@ -35,6 +35,8 @@ gr_make_short_to_char (size_t vlen=1);
 /*!
  * \brief Convert stream of short to a stream of float
  * \ingroup converter_blk
+ *
+ * \param vlen vector length of data streams.
  */
 
 class GR_CORE_API gr_short_to_char : public gr_sync_block
diff --git a/gnuradio-core/src/lib/general/gr_short_to_float.h b/gnuradio-core/src/lib/general/gr_short_to_float.h
index efdc81ecd..e45d0b14b 100644
--- a/gnuradio-core/src/lib/general/gr_short_to_float.h
+++ b/gnuradio-core/src/lib/general/gr_short_to_float.h
@@ -35,6 +35,9 @@ gr_make_short_to_float (size_t vlen=1, float scale=1);
 /*!
  * \brief Convert stream of short to a stream of float
  * \ingroup converter_blk
+ *
+ * \param vlen vector length of data streams.
+ * \param scale a scalar divider to change the output signal scale.
  */
 
 class GR_CORE_API gr_short_to_float : public gr_sync_block
@@ -48,7 +51,14 @@ class GR_CORE_API gr_short_to_float : public gr_sync_block
   float d_scale;
   
  public:
+  /*!
+   * Get the scalar divider value.
+   */
   float scale() const;
+
+  /*!
+   * Set the scalar divider value.
+   */
   void set_scale(float scale);
   
   virtual int work (int noutput_items,