9 files changed, 527 insertions, 0 deletions
diff --git a/gr-blocks/include/blocks/CMakeLists.txt b/gr-blocks/include/blocks/CMakeLists.txt
index 045ebc0c28..48e399d065 100644
--- a/gr-blocks/include/blocks/CMakeLists.txt
+++ b/gr-blocks/include/blocks/CMakeLists.txt
@@ -125,7 +125,10 @@ install(FILES
     multiply_const_cc.h
     multiply_const_ff.h
     nlog10_ff.h
+    pack_k_bits_bb.h
     patterned_interleaver.h
+    peak_detector2_fb.h
+    regenerate_bb.h
     repeat.h
     rms_cf.h
     rms_ff.h
@@ -136,8 +139,13 @@ install(FILES
     stream_to_vector.h
     streams_to_stream.h
     streams_to_vector.h
+    stretch_ff.h
+    threshold_ff.h
+    throttle.h
+    transcendental.h
     tuntap_pdu.h
     uchar_to_float.h
+    unpack_k_bits_bb.h
     vector_to_stream.h
     vector_to_streams.h
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/blocks
diff --git a/gr-blocks/include/blocks/pack_k_bits_bb.h b/gr-blocks/include/blocks/pack_k_bits_bb.h
new file mode 100644
index 0000000000..5bf71c9c3e
--- /dev/null
+++ b/gr-blocks/include/blocks/pack_k_bits_bb.h
@@ -0,0 +1,53 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012-2013 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.
+ */
+
+#ifndef INCLUDED_GR_PACK_K_BITS_BB_H
+#define	INCLUDED_GR_PACK_K_BITS_BB_H
+
+#include <blocks/api.h>
+#include <gr_sync_decimator.h>
+
+namespace gr {
+  namespace blocks {
+
+    /*!
+     * \brief Converts a stream of bytes with 1 bit in the LSB to a
+     * byte with k relevent bits.
+     * \ingroup converter_blk
+     */
+    class BLOCKS_API pack_k_bits_bb : virtual public gr_sync_decimator
+    {
+    public:
+      // gr::blocks::pack_k_bits_bb::sptr
+      typedef boost::shared_ptr<pack_k_bits_bb> sptr;
+      
+      /*!
+       * \brief Make a pack_k_bits block.
+       * \param k number of bits to be packed.
+       */
+      static sptr make(unsigned k);
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_PACK_K_BITS_BB_H */
diff --git a/gr-blocks/include/blocks/peak_detector2_fb.h b/gr-blocks/include/blocks/peak_detector2_fb.h
new file mode 100644
index 0000000000..71afc3287b
--- /dev/null
+++ b/gr-blocks/include/blocks/peak_detector2_fb.h
@@ -0,0 +1,91 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007,2013 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.
+ */
+
+#ifndef INCLUDED_GR_PEAK_DETECTOR2_FB_H
+#define INCLUDED_GR_PEAK_DETECTOR2_FB_H
+
+#include <blocks/api.h>
+#include <gr_sync_block.h>
+
+namespace gr {
+  namespace blocks {
+
+    /*!
+     * \brief Detect the peak of a signal
+     * \ingroup level_blk
+     *
+     * If a peak is detected, this block outputs a 1, or it outputs
+     * 0's. A separate debug output may be connected, to view the
+     * internal EWMA described below.
+     *
+     * \param threshold_factor_rise The threshold factor determins
+     *        when a peak is present. An EWMA average of the signal is
+     *        calculated and when the value of the signal goes over
+     *        threshold_factor_rise*average, we call the peak.
+     * \param look_ahead The look-ahead value is used when the
+     *        threshold is found to locate the peak within this range.
+     * \param alpha The gain value of a single-pole moving average filter.
+     */
+    class BLOCKS_API peak_detector2_fb : virtual public gr_sync_block
+    {
+    public:
+      // gr::blocks::peak_detector2_fb::sptr
+      typedef boost::shared_ptr<peak_detector2_fb> sptr;
+
+      static sptr make(float threshold_factor_rise=7,
+                       int look_ahead=1000, float alpha=0.001);
+
+      /*! \brief Set the threshold factor value for the rise time
+       *  \param thr new threshold factor
+       */
+      virtual void set_threshold_factor_rise(float thr) = 0;
+
+      /*! \brief Set the look-ahead factor
+       *  \param look new look-ahead factor
+       */
+      virtual void set_look_ahead(int look) = 0;
+
+      /*! \brief Set the running average alpha
+       *  \param alpha new alpha for running average
+       */
+      virtual void set_alpha(int alpha) = 0;
+
+      /*! \brief Get the threshold factor value for the rise time
+       *  \return threshold factor
+       */
+      virtual float threshold_factor_rise() = 0;
+
+      /*! \brief Get the look-ahead factor value
+       *  \return look-ahead factor
+       */
+      virtual int look_ahead() = 0;
+
+      /*! \brief Get the alpha value of the running average
+       *  \return alpha
+       */
+      virtual float alpha() = 0;
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_PEAK_DETECTOR2_FB_H */
diff --git a/gr-blocks/include/blocks/regenerate_bb.h b/gr-blocks/include/blocks/regenerate_bb.h
new file mode 100644
index 0000000000..3063e70a7f
--- /dev/null
+++ b/gr-blocks/include/blocks/regenerate_bb.h
@@ -0,0 +1,80 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007,2013 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.
+ */
+
+#ifndef INCLUDED_GR_REGENERATE_BB_H
+#define INCLUDED_GR_REGENERATE_BB_H
+
+#include <blocks/api.h>
+#include <gr_sync_block.h>
+
+namespace gr {
+  namespace blocks {
+
+    /*!
+     * \brief Detect the peak of a signal and repeat every period samples
+     * \ingroup level_blk
+     *
+     * If a peak is detected, this block outputs a 1 repeated every
+     * period samples until reset by detection of another 1 on the
+     * input or stopped after max_regen regenerations have occurred.
+     *
+     * Note that if max_regen=(-1)/ULONG_MAX then the regeneration
+     * will run forever.
+     */
+    class BLOCKS_API regenerate_bb : virtual public gr_sync_block
+    {
+    public:
+      // gr::blocks::regenerate_bb::sptr
+      typedef boost::shared_ptr<regenerate_bb> sptr;
+
+      /*!
+       * \brief Make a regenerate block
+       * \param period The number of samples between regenerations
+       * \param max_regen The maximum number of regenerations to
+       * perform; if set to ULONG_MAX, it will regenerate
+       * continuously.
+       */
+      static sptr make(int period, unsigned int max_regen=500);
+
+      /*! \brief Reset the maximum regeneration count; this will reset
+          the current regen.
+       */
+      virtual void set_max_regen(unsigned int regen) = 0;
+
+      /*! \brief Reset the period of regenerations; this will reset
+          the current regen.
+      */
+      virtual void set_period(int period) = 0;
+
+      /*! \brief return the maximum regeneration count.
+       */
+      virtual unsigned int max_regen() const = 0;
+
+      /*! \brief return the regeneration period.
+       */
+      virtual int period() const = 0;
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_REGENERATE_BB_H */
diff --git a/gr-blocks/include/blocks/stretch_ff.h b/gr-blocks/include/blocks/stretch_ff.h
new file mode 100644
index 0000000000..5f98452a41
--- /dev/null
+++ b/gr-blocks/include/blocks/stretch_ff.h
@@ -0,0 +1,59 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,2013 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.
+ */
+
+#ifndef INCLUDED_GR_STRETCH_FF_H
+#define INCLUDED_GR_STRETCH_FF_H
+
+#include <blocks/api.h>
+#include <gr_sync_block.h>
+
+namespace gr {
+  namespace blocks {
+    
+    /*!
+     * \brief adjust y-range of an input vector by mapping to range
+     * (max-of-input, stipulated-min). Primarily for spectral
+     * signature matching by normalizing spectrum dynamic ranges.
+     * \ingroup misc_blk
+     */
+    class BLOCKS_API stretch_ff : virtual public gr_sync_block
+    {
+    public:
+      // gr::blocks::stretch_ff::sptr
+      typedef boost::shared_ptr<stretch_ff> sptr;
+      
+      /*!
+       * \brief Make a stretch block.
+       * \param lo Set low value for range.
+       * \param vlen vector length of input stream.
+     */
+      static sptr make(float lo, size_t vlen=1);
+
+      virtual float lo() const = 0;
+      virtual void set_lo(float lo) = 0;
+      virtual size_t vlen() const = 0;
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_STRETCH_FF_H */
diff --git a/gr-blocks/include/blocks/threshold_ff.h b/gr-blocks/include/blocks/threshold_ff.h
new file mode 100644
index 0000000000..900e5c5bdb
--- /dev/null
+++ b/gr-blocks/include/blocks/threshold_ff.h
@@ -0,0 +1,66 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2013 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.
+ */
+
+#ifndef INCLUDED_GR_THRESHOLD_FF_H
+#define INCLUDED_GR_THRESHOLD_FF_H
+
+#include <blocks/api.h>
+#include <gr_sync_block.h>
+
+namespace gr {
+  namespace blocks {
+
+    /*!
+     * \brief Output a 1 or zero based on a threshold value.
+     * \ingroup misc_blk
+     *
+     * Test the incoming signal against a threshold. If the signal
+     * excedes the \p hi value, it will output a 1 until the signal
+     * falls below the \p lo value.
+     */
+    class BLOCKS_API threshold_ff : virtual public gr_sync_block
+    {
+    public:
+      // gr::blocks::threshold_ff::sptr
+      typedef boost::shared_ptr<threshold_ff> sptr;
+
+      /* \brief Create a threadshold block.
+       * \param lo Threshold input signal needs to drop below to
+       *           change state to 0.
+       * \param hi Threshold input signal needs to rise above to
+       *           change state to 1.
+       * \param initial_state Initial state of the block (0 or 1).
+       */
+      static sptr make(float lo, float hi, float initial_state=0);
+
+      virtual float lo () const = 0;
+      virtual void set_lo (float lo) = 0;
+      virtual float hi () const = 0;
+      virtual void set_hi (float hi) = 0;
+      virtual float last_state () const = 0;
+      virtual void set_last_state (float last_state) = 0;
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_THRESHOLD_FF_H */
diff --git a/gr-blocks/include/blocks/throttle.h b/gr-blocks/include/blocks/throttle.h
new file mode 100644
index 0000000000..20d8037e10
--- /dev/null
+++ b/gr-blocks/include/blocks/throttle.h
@@ -0,0 +1,62 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005-2011,2013 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.
+ */
+
+#ifndef INCLUDED_GR_THROTTLE_H
+#define INCLUDED_GR_THROTTLE_H
+
+#include <blocks/api.h>
+#include <gr_sync_block.h>
+
+namespace gr {
+  namespace blocks {
+
+    /*!
+     * \brief throttle flow of samples such that the average rate does
+     * not exceed samples_per_sec.
+     * \ingroup misc_blk
+     *
+     * input: one stream of itemsize; output: one stream of itemsize
+     *
+     * N.B. this should only be used in GUI apps where there is no
+     * other rate limiting block. It is not intended nor effective at
+     * precisely controlling the rate of samples. That should be
+     * controlled by a source or sink tied to sample clock. E.g., a
+     * USRP or audio card.
+     */
+    class BLOCKS_API throttle : virtual public gr_sync_block
+    {
+    public:
+      typedef boost::shared_ptr<throttle> sptr;
+
+      static sptr make(size_t itemsize, double samples_per_sec);
+
+      //! Sets the sample rate in samples per second.
+      virtual void set_sample_rate(double rate) = 0;
+
+      //! Get the sample rate in samples per second.
+      virtual double sample_rate() const = 0;
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_THROTTLE_H */
diff --git a/gr-blocks/include/blocks/transcendental.h b/gr-blocks/include/blocks/transcendental.h
new file mode 100644
index 0000000000..f8a0d5d805
--- /dev/null
+++ b/gr-blocks/include/blocks/transcendental.h
@@ -0,0 +1,56 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2011,2013 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.
+ */
+
+#ifndef INCLUDED_GR_TRANSCENDENTAL_H
+#define INCLUDED_GR_TRANSCENDENTAL_H
+
+#include <blocks/api.h>
+#include <gr_sync_block.h>
+#include <string>
+
+namespace gr {
+  namespace blocks {
+
+    /*!
+     * \brief A block that performs various transcendental math operations.
+     *
+     * Possible function names can be found in the cmath library. IO
+     * may be either complex or real, double or single precision.
+     *
+     * Possible type strings: float, double, complex_float, complex_double
+     *
+     * output[i] = trans_fcn(input[i])
+     */
+    class BLOCKS_API transcendental : virtual public gr_sync_block
+    {
+    public:
+      // gr::blocks::transcendental::sptr
+      typedef boost::shared_ptr<transcendental> sptr;
+
+      static sptr make(const std::string &name,
+                       const std::string &type="float");
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_TRANSCENDENTAL_H */
diff --git a/gr-blocks/include/blocks/unpack_k_bits_bb.h b/gr-blocks/include/blocks/unpack_k_bits_bb.h
new file mode 100644
index 0000000000..b716ded1d3
--- /dev/null
+++ b/gr-blocks/include/blocks/unpack_k_bits_bb.h
@@ -0,0 +1,52 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2013 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.
+ */
+
+#ifndef INCLUDED_GR_UNPACK_K_BITS_BB_H
+#define	INCLUDED_GR_UNPACK_K_BITS_BB_H
+
+#include <blocks/api.h>
+#include <gr_sync_interpolator.h>
+
+namespace gr {
+  namespace blocks {
+    
+    /*!
+     * \brief Converts a byte with k relevent bits to k output bytes with 1 bit in the LSB.
+     * \ingroup converter_blk
+     */
+    class BLOCKS_API unpack_k_bits_bb : virtual public gr_sync_interpolator
+    {
+    public:
+      // gr::blocks::unpack_k_bits_bb::sptr
+      typedef boost::shared_ptr<unpack_k_bits_bb> sptr;
+      
+      /*!
+       * \brief Make an unpack_k_bits block.
+       * \param k number of bits to unpack.
+       */
+      static sptr make(unsigned k);
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_UNPACK_K_BITS_BB_H */