Merge branch 'master' into next

Conflicts: gr-blocks/grc/blocks_block_tree.xml
author: Tom Rondeau <trondeau@vt.edu> 2013-03-06 11:47:54 -0500
committer: Tom Rondeau <trondeau@vt.edu> 2013-03-06 11:47:54 -0500
commit: a08afb0b0166cab961982f174a5cf672393b5198 (patch)
tree: 6969d4fb69fe2e55775cc6a2e59ea31063d84102 /gr-blocks/include
parent: 2e9de83a929192a65b827b964bd4452c20ef8756 (diff)
parent: 9cfd03bd98693e62c6898f18d90d5d08f4d5c102 (diff)
8 files changed, 527 insertions, 0 deletions
diff --git a/gr-blocks/include/blocks/CMakeLists.txt b/gr-blocks/include/blocks/CMakeLists.txt
index ce493e64de..0da7a0e569 100644
--- a/gr-blocks/include/blocks/CMakeLists.txt
+++ b/gr-blocks/include/blocks/CMakeLists.txt
@@ -73,12 +73,14 @@ expand_h(argmax_XX          fs is ss)
 expand_h(divide_XX          ss ii ff cc)
 expand_h(integrate_XX       ss ii ff cc)
 expand_h(max_XX             ff ii ss)
+expand_h(moving_average_XX  ss ii ff cc)
 expand_h(multiply_XX        ss ii)
 expand_h(multiply_const_XX  ss ii)
 expand_h(multiply_const_vXX ss ii ff cc)
 expand_h(mute_XX            ss ii ff cc)
 expand_h(not_XX             bb ss ii)
 expand_h(or_XX              bb ss ii)
+expand_h(peak_detector_XX   fb ib sb)
 expand_h(probe_signal_X     b s i f c)
 expand_h(probe_signal_vX    b s i f c)
 expand_h(sample_and_hold_XX bb ss ii ff)
@@ -125,6 +127,11 @@ install(FILES
     interleaved_short_to_complex.h
     keep_m_in_n.h
     keep_one_in_n.h
+    message_debug.h
+    message_sink.h
+    message_source.h
+    message_strobe.h
+    message_burst_source.h
     multiply_cc.h
     multiply_ff.h
     multiply_conjugate_cc.h
diff --git a/gr-blocks/include/blocks/message_burst_source.h b/gr-blocks/include/blocks/message_burst_source.h
new file mode 100644
index 0000000000..864d43452f
--- /dev/null
+++ b/gr-blocks/include/blocks/message_burst_source.h
@@ -0,0 +1,52 @@
+/* -*- 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_MESSAGE_BURST_SOURCE_H
+#define INCLUDED_GR_MESSAGE_BURST_SOURCE_H
+
+#include <blocks/api.h>
+#include <gr_sync_block.h>
+#include <gr_msg_queue.h>
+
+namespace gr {
+  namespace blocks {
+
+    /*!
+     * \brief Turn received messages into a stream and tag them for UHD to send.
+     * \ingroup source_blk
+     */
+    class BLOCKS_API message_burst_source : virtual public gr_sync_block
+    {
+    public:
+      // gr::blocks::message_source::sptr
+      typedef boost::shared_ptr<message_burst_source> sptr;
+
+      static sptr make(size_t itemsize, int msgq_limit);
+      static sptr make(size_t itemsize, gr_msg_queue_sptr msgq);
+
+      virtual gr_msg_queue_sptr msgq() const = 0;
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_MESSAGE_BURST_SOURCE_H */
diff --git a/gr-blocks/include/blocks/message_debug.h b/gr-blocks/include/blocks/message_debug.h
new file mode 100644
index 0000000000..f0212331c2
--- /dev/null
+++ b/gr-blocks/include/blocks/message_debug.h
@@ -0,0 +1,85 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,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_MESSAGE_DEBUG_H
+#define INCLUDED_GR_MESSAGE_DEBUG_H
+
+#include <blocks/api.h>
+#include <gr_block.h>
+
+namespace gr {
+  namespace blocks {
+
+    /*!
+     * \brief Debug block for the message passing system.
+     * \ingroup sink_blk
+     *
+     * The message debug block is used to capture and print or store
+     * messages as they are received. Any block that generates a
+     * message may connect that message port to one or more of the
+     * three message input ports of this debug block. The message
+     * ports are:
+     *
+     * \li print: prints the message directly to standard out.
+     * \li store: stores the message in an internal vector. May be
+     *            access using the get_message function.
+     * \li print_pdu: specifically designed to handle formatted PDUs
+     *                (see pdu.h).
+     */
+    class BLOCKS_API message_debug : virtual public gr_block
+    {
+    public:
+      // gr::blocks::message_debug::sptr
+      typedef boost::shared_ptr<message_debug> sptr;
+
+      /*! 
+       * \brief Build the message debug block. It takes no parameters
+       * and has three message ports: print, store, and
+       * print_pdu.
+       */
+      static sptr make();
+
+      /*! 
+       * \brief Reports the number of messages received by this block.
+       */
+      virtual int num_messages() = 0;
+
+      /*!
+       * \brief Get a message (as a PMT) from the message vector at index \p i.
+       *
+       * Messages passed to the 'store' port will be stored in a
+       * vector. This function retrieves those messages by index. They
+       * are index in order of when they were received (all messages
+       * are just pushed onto the back of a vector). This is mostly
+       * useful in debugging message passing graphs and in QA code.
+       *
+       * \param i The index in the vector for the message to retrieve.
+       *
+       * \return a message at index \p i as a pmt_t.
+       */
+      virtual pmt::pmt_t get_message(int i) = 0;
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_MESSAGE_DEBUG_H */
diff --git a/gr-blocks/include/blocks/message_sink.h b/gr-blocks/include/blocks/message_sink.h
new file mode 100644
index 0000000000..5d14836dd4
--- /dev/null
+++ b/gr-blocks/include/blocks/message_sink.h
@@ -0,0 +1,49 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,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_MESSAGE_SINK_H
+#define INCLUDED_GR_MESSAGE_SINK_H
+
+#include <blocks/api.h>
+#include <gr_sync_block.h>
+#include <gr_msg_queue.h>
+
+namespace gr {
+  namespace blocks {
+
+    /*!
+     * \brief Gather received items into messages and insert into msgq
+     * \ingroup sink_blk
+     */
+    class BLOCKS_API message_sink : virtual public gr_sync_block
+    {
+    public:
+      // gr::blocks::message_sink::sptr
+      typedef boost::shared_ptr<message_sink> sptr;
+
+      static sptr make (size_t itemsize, gr_msg_queue_sptr msgq, bool dont_block);
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_MESSAGE_SINK_H */
diff --git a/gr-blocks/include/blocks/message_source.h b/gr-blocks/include/blocks/message_source.h
new file mode 100644
index 0000000000..5b55191880
--- /dev/null
+++ b/gr-blocks/include/blocks/message_source.h
@@ -0,0 +1,52 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,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_MESSAGE_SOURCE_H
+#define INCLUDED_GR_MESSAGE_SOURCE_H
+
+#include <blocks/api.h>
+#include <gr_sync_block.h>
+#include <gr_msg_queue.h>
+
+namespace gr {
+  namespace blocks {
+
+    /*!
+     * \brief Turn received messages into a stream
+     * \ingroup source_blk
+     */
+    class BLOCKS_API message_source : virtual public gr_sync_block
+    {
+    public:
+      // gr::blocks::message_source::sptr
+      typedef boost::shared_ptr<message_source> sptr;
+
+      static sptr make(size_t itemsize, int msgq_limit=0);
+      static sptr make(size_t itemsize, gr_msg_queue_sptr msgq);
+
+      virtual gr_msg_queue_sptr msgq() const = 0;
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_MESSAGE_SOURCE_H */
diff --git a/gr-blocks/include/blocks/message_strobe.h b/gr-blocks/include/blocks/message_strobe.h
new file mode 100644
index 0000000000..6b427d539c
--- /dev/null
+++ b/gr-blocks/include/blocks/message_strobe.h
@@ -0,0 +1,81 @@
+/* -*- 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_MESSAGE_STROBE_H
+#define INCLUDED_GR_MESSAGE_STROBE_H
+
+#include <blocks/api.h>
+#include <gr_block.h>
+
+namespace gr {
+  namespace blocks {
+
+    /*!
+     * \brief Send message at defined interval
+     * \ingroup msg_blk
+     *
+     * Takes a PMT message and sends it out every \p period_ms
+     * milliseconds. Useful for testing/debugging the message system.
+     */
+    class BLOCKS_API message_strobe : virtual public gr_block
+    {
+    public:
+      // gr::blocks::message_strobe::sptr
+      typedef boost::shared_ptr<message_strobe> sptr;
+
+      /*!
+       * Make a message stobe block to send message \p msg every \p
+       * period_ms milliseconds.
+       *
+       * \param msg The message to send as a PMT.
+       * \param period_ms the time period in milliseconds in which to
+       *                  send \p msg.
+       */
+      static sptr make(pmt::pmt_t msg, float period_ms);
+
+      /*!
+       * Reset the message being sent.
+       * \param msg The message to send as a PMT.
+       */
+      virtual void set_msg(pmt::pmt_t msg) = 0;
+
+      /*!
+       * Get the value of the message being sent.
+       */
+      virtual pmt::pmt_t msg() const = 0;
+
+      /*!
+       * Reset the sending interval.
+       * \param period_ms the time period in milliseconds.
+       */
+      virtual void set_period(float period_ms) = 0;
+
+      /*!
+       * Get the time interval of the strobe.
+       */
+      virtual float period() const = 0;
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_MESSAGE_STROBE_H */
diff --git a/gr-blocks/include/blocks/moving_average_XX.h.t b/gr-blocks/include/blocks/moving_average_XX.h.t
new file mode 100644
index 0000000000..6b7883fdd4
--- /dev/null
+++ b/gr-blocks/include/blocks/moving_average_XX.h.t
@@ -0,0 +1,84 @@
+/* -*- 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.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#include <blocks/api.h>
+#include <gr_sync_block.h>
+
+namespace gr {
+  namespace blocks {
+
+    /*!
+     * \brief output is the moving sum of the last N samples, scaled by the scale factor
+     * \ingroup filter_blk
+     */
+    class BLOCKS_API @NAME@ : virtual public gr_sync_block
+    {
+    public: 
+      // gr::blocks::@NAME@::sptr
+      typedef boost::shared_ptr<@NAME@> sptr;
+
+      /*!
+       * Create a moving average block.
+       *
+       * \param length Number of samples to use in the average.
+       * \param scale scale factor for the result.
+       * \param max_iter limits how long we go without flushing the accumulator
+       *        This is necessary to avoid numerical instability for float and complex.
+       */
+      static sptr make(int length, @O_TYPE@ scale,
+                       int max_iter = 4096);
+
+      /*!
+       * Get the length used in the avaraging calculation.
+       */
+      virtual int length() const = 0;
+
+      /*!
+       * Get the scale factor being used.
+       */
+      virtual @O_TYPE@ scale() const = 0;
+
+      /*!
+       * Set both the length and the scale factor together.
+       */
+      virtual void set_length_and_scale(int length, @O_TYPE@ scale) = 0;
+
+      /*!
+       * Set the length.
+       */
+      virtual void set_length(int length) = 0;
+
+      /*!
+       * Set the scale factor.
+       */
+      virtual void set_scale(@O_TYPE@ scale) = 0;
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME@ */
diff --git a/gr-blocks/include/blocks/peak_detector_XX.h.t b/gr-blocks/include/blocks/peak_detector_XX.h.t
new file mode 100644
index 0000000000..1c8ba0652f
--- /dev/null
+++ b/gr-blocks/include/blocks/peak_detector_XX.h.t
@@ -0,0 +1,117 @@
+/* -*- 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.
+ */
+
+// @WARNING@
+
+#ifndef @GUARD_NAME@
+#define @GUARD_NAME@
+
+#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.
+     */
+    class GR_CORE_API @NAME@ : virtual public gr_sync_block
+    {
+    public:
+      // gr::blocks::@NAME@::sptr
+      typedef boost::shared_ptr<@NAME@> sptr;
+
+      /*!
+       * Make a peak detector block.
+       *
+       * \param threshold_factor_rise The threshold factor determins
+       *        when a peak has started. An average of the signal is
+       *        calculated and when the value of the signal goes over
+       *        threshold_factor_rise*average, we start looking for a
+       *        peak.
+       * \param threshold_factor_fall The threshold factor determins
+       *        when a peak has ended. An average of the signal is
+       *        calculated and when the value of the signal goes
+       *        bellow threshold_factor_fall*average, we stop looking
+       *        for a peak.
+       * \param look_ahead The look-ahead value is used when the
+       *        threshold is found to look if there another peak
+       *        within this step range. If there is a larger value,
+       *        we set that as the peak and look ahead again. This is
+       *        continued until the highest point is found with This
+       *        look-ahead range.
+       * \param alpha The gain value of a moving average filter
+       */
+      static sptr make(float threshold_factor_rise = 0.25,
+                       float threshold_factor_fall = 0.40,
+                       int look_ahead = 10,
+                       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 threshold factor value for the fall time
+       *  \param thr new threshold factor
+       */
+      virtual void set_threshold_factor_fall(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 threshold factor value for the fall time
+       *  \return threshold factor
+       */
+      virtual float threshold_factor_fall() = 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 /* @GUARD_NAME@ */
author	Tom Rondeau <trondeau@vt.edu>	2013-03-06 11:47:54 -0500
committer	Tom Rondeau <trondeau@vt.edu>	2013-03-06 11:47:54 -0500
commit	a08afb0b0166cab961982f174a5cf672393b5198 (patch)
tree	6969d4fb69fe2e55775cc6a2e59ea31063d84102 /gr-blocks/include
parent	2e9de83a929192a65b827b964bd4452c20ef8756 (diff)
parent	9cfd03bd98693e62c6898f18d90d5d08f4d5c102 (diff)