5 files changed, 369 insertions, 0 deletions
diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt
index 67e56fa319..c575f4215e 100644
--- a/gr-blocks/lib/CMakeLists.txt
+++ b/gr-blocks/lib/CMakeLists.txt
@@ -99,12 +99,14 @@ expand_cc_h_impl(argmax_XX          fs is ss)
 expand_cc_h_impl(divide_XX          ss ii ff cc)
 expand_cc_h_impl(integrate_XX       ss ii ff cc)
 expand_cc_h_impl(max_XX             ff ii ss)
+expand_cc_h_impl(moving_average_XX  ss ii ff cc)
 expand_cc_h_impl(multiply_XX        ss ii)
 expand_cc_h_impl(multiply_const_XX  ss ii)
 expand_cc_h_impl(multiply_const_vXX ss ii ff cc)
 expand_cc_h_impl(mute_XX            ss ii ff cc)
 expand_cc_h_impl(not_XX             bb ss ii)
 expand_cc_h_impl(or_XX              bb ss ii)
+expand_cc_h_impl(peak_detector_XX   fb ib sb)
 expand_cc_h_impl(probe_signal_X     b s i f c)
 expand_cc_h_impl(probe_signal_vX    b s i f c)
 expand_cc_h_impl(sample_and_hold_XX bb ss ii ff)
diff --git a/gr-blocks/lib/moving_average_XX_impl.cc.t b/gr-blocks/lib/moving_average_XX_impl.cc.t
new file mode 100644
index 0000000000..566deff116
--- /dev/null
+++ b/gr-blocks/lib/moving_average_XX_impl.cc.t
@@ -0,0 +1,114 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,2010,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@
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "@NAME_IMPL@.h"
+#include <gr_io_signature.h>
+
+namespace gr {
+  namespace blocks {
+
+    @NAME@::sptr
+    @NAME@::make(int length, @O_TYPE@ scale, int max_iter)
+    {
+      return gnuradio::get_initial_sptr
+        (new @NAME_IMPL@(length, scale, max_iter));
+    }
+
+    @NAME_IMPL@::@NAME_IMPL@(int length, @O_TYPE@ scale, int max_iter)
+    : gr_sync_block("@NAME@",
+                    gr_make_io_signature(1, 1, sizeof(@I_TYPE@)),
+                    gr_make_io_signature(1, 1, sizeof(@O_TYPE@))),
+      d_length(length),
+      d_scale(scale),
+      d_max_iter(max_iter),
+      d_new_length(length),
+      d_new_scale(scale),
+      d_updated(false)
+    {
+      set_history(length);
+    }
+
+    @NAME_IMPL@::~@NAME_IMPL@()
+    {
+    }
+
+    void
+    @NAME_IMPL@::set_length_and_scale(int length, @O_TYPE@ scale)
+    {
+      d_new_length = length;
+      d_new_scale = scale;
+      d_updated = true;
+    }
+
+    void
+    @NAME_IMPL@::set_length(int length)
+    {
+      d_new_length = length;
+      d_updated = true;
+    }
+
+    void
+    @NAME_IMPL@::set_scale(@O_TYPE@ scale)
+    {
+      d_new_scale = scale;
+      d_updated = true;
+    }
+
+    int
+    @NAME_IMPL@::work(int noutput_items,
+                      gr_vector_const_void_star &input_items,
+                      gr_vector_void_star &output_items)
+    {
+      if(d_updated) {
+        d_length = d_new_length;
+        d_scale = d_new_scale;
+        set_history(d_length);
+        d_updated = false;
+        return 0; // history requirements might have changed
+      }
+
+      const @I_TYPE@ *in = (const @I_TYPE@ *)input_items[0];
+      @O_TYPE@ *out = (@O_TYPE@ *)output_items[0];
+
+      @I_TYPE@ sum = 0;
+      int num_iter = (noutput_items>d_max_iter) ? d_max_iter : noutput_items;
+      for(int i = 0; i < d_length-1; i++) {
+        sum += in[i];
+      }
+
+      for(int i = 0; i < num_iter; i++) {
+        sum += in[i+d_length-1];
+        out[i] = sum * d_scale;
+        sum -= in[i];
+      }
+
+      return num_iter;
+    }
+
+  } /* namespace blocks */
+} /* namespace gr */
diff --git a/gr-blocks/lib/moving_average_XX_impl.h.t b/gr-blocks/lib/moving_average_XX_impl.h.t
new file mode 100644
index 0000000000..7234cbe139
--- /dev/null
+++ b/gr-blocks/lib/moving_average_XX_impl.h.t
@@ -0,0 +1,65 @@
+/* -*- 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_IMPL@
+#define @GUARD_NAME_IMPL@
+
+#include <blocks/@NAME@.h>
+
+namespace gr {
+  namespace blocks {
+
+    class @NAME_IMPL@ : public @NAME@
+    {
+    private:
+      int d_length;
+      @O_TYPE@ d_scale;
+      int d_max_iter;
+
+      int d_new_length;
+      @O_TYPE@ d_new_scale;
+      bool d_updated;
+
+    public:
+      @NAME_IMPL@(int length, @O_TYPE@ scale,
+                  int max_iter = 4096);
+      ~@NAME_IMPL@();
+
+      int length() const { return d_new_length; }
+      @O_TYPE@ scale() const { return d_new_scale; }
+
+      void set_length_and_scale(int length, @O_TYPE@ scale);
+      void set_length(int length);
+      void set_scale(@O_TYPE@ scale);
+
+      int work(int noutput_items,
+               gr_vector_const_void_star &input_items,
+               gr_vector_void_star &output_items);
+
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME_IMPL@ */
diff --git a/gr-blocks/lib/peak_detector_XX_impl.cc.t b/gr-blocks/lib/peak_detector_XX_impl.cc.t
new file mode 100644
index 0000000000..27518962f5
--- /dev/null
+++ b/gr-blocks/lib/peak_detector_XX_impl.cc.t
@@ -0,0 +1,122 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007,2010,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@
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "@NAME_IMPL@.h"
+#include <gr_io_signature.h>
+#include <string.h>
+
+namespace gr {
+  namespace blocks {
+
+    @NAME@::sptr
+    @NAME@::make(float threshold_factor_rise,
+                 float threshold_factor_fall,
+                 int look_ahead, float alpha)
+    {
+      return gnuradio::get_initial_sptr
+        (new @NAME_IMPL@(threshold_factor_rise,
+                         threshold_factor_fall,
+                         look_ahead, alpha));
+    }
+
+    @NAME_IMPL@::@NAME_IMPL@(float threshold_factor_rise,
+                             float threshold_factor_fall,
+                             int look_ahead, float alpha)
+    : gr_sync_block("@BASE_NAME@",
+                    gr_make_io_signature(1, 1, sizeof(@I_TYPE@)),
+                    gr_make_io_signature(1, 1, sizeof(char))),
+      d_threshold_factor_rise(threshold_factor_rise),
+      d_threshold_factor_fall(threshold_factor_fall),
+      d_look_ahead(look_ahead), d_avg_alpha(alpha), d_avg(0), d_found(0)
+    {
+    }
+
+    @NAME_IMPL@::~@NAME_IMPL@()
+    {
+    }
+
+    int
+    @NAME_IMPL@::work(int noutput_items,
+                      gr_vector_const_void_star &input_items,
+                      gr_vector_void_star &output_items)
+    {
+      @I_TYPE@ *iptr = (@I_TYPE@*)input_items[0];
+      char *optr = (char*)output_items[0];
+
+      memset(optr, 0, noutput_items*sizeof(char));
+
+      @I_TYPE@ peak_val = -(@I_TYPE@)INFINITY;
+      int peak_ind = 0;
+      unsigned char state = 0;
+      int i = 0;
+
+      //printf("noutput_items %d\n",noutput_items);
+      while(i < noutput_items) {
+        if(state == 0) {  // below threshold
+          if(iptr[i] > d_avg*d_threshold_factor_rise) {
+            state = 1;
+          }
+          else {
+            d_avg = (d_avg_alpha)*iptr[i] + (1-d_avg_alpha)*d_avg;
+            i++;
+          }
+        }
+        else if(state == 1) {  // above threshold, have not found peak
+          //printf("Entered State 1: %f  i: %d  noutput_items: %d\n", iptr[i], i, noutput_items);
+          if(iptr[i] > peak_val) {
+            peak_val = iptr[i];
+            peak_ind = i;
+            d_avg = (d_avg_alpha)*iptr[i] + (1-d_avg_alpha)*d_avg;
+            i++;
+          }
+          else if(iptr[i] > d_avg*d_threshold_factor_fall) {
+            d_avg = (d_avg_alpha)*iptr[i] + (1-d_avg_alpha)*d_avg;
+            i++;
+          }
+          else {
+            optr[peak_ind] = 1;
+            state = 0;
+            peak_val = -(@I_TYPE@)INFINITY;
+            //printf("Leaving  State 1: Peak: %f  Peak Ind: %d   i: %d  noutput_items: %d\n",
+            //peak_val, peak_ind, i, noutput_items);
+          }
+        }
+      }
+
+      if(state == 0) {
+        //printf("Leave in State 0, produced %d\n",noutput_items);
+        return noutput_items;
+      }
+      else {   // only return up to passing the threshold
+        //printf("Leave in State 1, only produced %d of %d\n",peak_ind,noutput_items);
+        return peak_ind+1;
+      }
+    }
+
+  } /* namespace blocks */
+} /* namespace gr */
diff --git a/gr-blocks/lib/peak_detector_XX_impl.h.t b/gr-blocks/lib/peak_detector_XX_impl.h.t
new file mode 100644
index 0000000000..ef52f0f744
--- /dev/null
+++ b/gr-blocks/lib/peak_detector_XX_impl.h.t
@@ -0,0 +1,66 @@
+/* -*- 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_IMPL@
+#define @GUARD_NAME_IMPL@
+
+#include <blocks/@NAME@.h>
+
+namespace gr {
+  namespace blocks {
+
+    class @NAME_IMPL@ : public @NAME@
+    {
+    private:
+      float d_threshold_factor_rise;
+      float d_threshold_factor_fall;
+      int d_look_ahead;
+      float d_avg_alpha;
+      float d_avg;
+      unsigned char d_found;
+
+    public:
+      @NAME_IMPL@(float threshold_factor_rise,
+                  float threshold_factor_fall,
+                  int look_ahead, float alpha);
+      ~@NAME_IMPL@();
+
+      void set_threshold_factor_rise(float thr) { d_threshold_factor_rise = thr; }
+      void set_threshold_factor_fall(float thr) { d_threshold_factor_fall = thr; }
+      void set_look_ahead(int look) { d_look_ahead = look; }
+      void set_alpha(int alpha) { d_avg_alpha = alpha; }
+      float threshold_factor_rise() { return d_threshold_factor_rise; }
+      float threshold_factor_fall() { return d_threshold_factor_fall; }
+      int look_ahead() { return d_look_ahead; }
+      float alpha() { return d_avg_alpha; }
+
+      int work(int noutput_items,
+               gr_vector_const_void_star &input_items,
+               gr_vector_void_star &output_items);
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* @GUARD_NAME_IMPL@ */