Block Modifications:

 digital.mpsk_receiver_cc: Set reasonable default parameter values for GRC definition
 digital.ofdm_insert_preamble: Expose enter_preamble() as public, to allow external state changes
                               Cleanup of incorrect forecast behavior
                               Make the flag port optional, incase external preamble triggers are preferred to in-band
 gr_vector_source: added set_data( data ) and rewind() public methods
 gr_head: added set_length(int) method to modify head length

New Blocks Added:
 gr_keep_m_in_n: Allows periodic extraction of M items instead of 1 (in keep_1_in_n)
 gr_pack_k_bits: Complementary block fo gr_unpack_k_bits
 gr_vector_insert_x: Complement to the gr_head block, inserts a vector into a stream then becomes a pass through

6 files changed, 202 insertions, 1 deletions

diff --git a/gnuradio-core/src/lib/gengen/CMakeLists.txt b/gnuradio-core/src/lib/gengen/CMakeLists.txt
index d13776990..22ac1bc58 100644
--- a/gnuradio-core/src/lib/gengen/CMakeLists.txt
+++ b/gnuradio-core/src/lib/gengen/CMakeLists.txt
@@ -82,6 +82,7 @@ endmacro(expand_h_cc_i)
 # Invoke macro to generate various sources
 ########################################################################
 expand_h_cc_i(gr_vector_source_X   b s i f c)
+expand_h_cc_i(gr_vector_insert_X   b)
 expand_h_cc_i(gr_vector_sink_X     b s i f c)
 expand_h_cc_i(gr_noise_source_X      s i f c)
 expand_h_cc_i(gr_sig_source_X        s i f c)
diff --git a/gnuradio-core/src/lib/gengen/gr_vector_insert_X.cc.t b/gnuradio-core/src/lib/gengen/gr_vector_insert_X.cc.t
new file mode 100644
index 000000000..15e19edb0
--- /dev/null
+++ b/gnuradio-core/src/lib/gengen/gr_vector_insert_X.cc.t
@@ -0,0 +1,100 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2008,2010 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@.h>
+#include <algorithm>
+#include <gr_io_signature.h>
+#include <stdexcept>
+
+#include <stdio.h>
+
+@NAME@::@NAME@ (const std::vector<@TYPE@> &data, int periodicity, int offset)
+  : gr_block ("@BASE_NAME@",
+	       gr_make_io_signature (1, 1, sizeof (@TYPE@)),
+	       gr_make_io_signature (1, 1, sizeof (@TYPE@))),
+    d_data (data),
+    d_offset (offset),
+    d_periodicity (periodicity)
+{
+    //printf("INITIAL: periodicity = %d, offset = %d\n", periodicity, offset);
+    // some sanity checks
+    assert(offset < periodicity);
+    assert(offset >= 0);
+    assert(periodicity > data.size());
+}
+
+int
+@NAME@::general_work (int noutput_items,
+		    gr_vector_int &ninput_items,
+		    gr_vector_const_void_star &input_items,
+		    gr_vector_void_star &output_items)
+{
+  @TYPE@ *out = (@TYPE@ *) output_items[0];
+  const @TYPE@ *in = (const @TYPE@ *) input_items[0];
+
+  int ii(0), oo(0);
+
+  while( (oo < noutput_items) && (ii < ninput_items[0]) ){
+
+    //printf("oo = %d, ii = %d, d_offset = %d, noutput_items = %d, ninput_items[0] = %d", oo, ii, d_offset, noutput_items, ninput_items[0]);
+    //printf(", d_periodicity = %d\n", d_periodicity);
+    
+    if( d_offset >= ((int)d_data.size()) ){ // if we are in the copy region
+        int max_copy = std::min( std::min( noutput_items - oo, ninput_items[0] - ii ), d_periodicity - d_offset );
+        //printf("copy %d from input\n", max_copy);
+        memcpy( &out[oo], &in[ii], sizeof(@TYPE@)*max_copy );
+        //printf(" * memcpy returned.\n");
+        ii += max_copy;
+        oo += max_copy;
+        d_offset = (d_offset + max_copy)%d_periodicity;
+
+    } else { // if we are in the insertion region
+        int max_copy = std::min( noutput_items - oo, ((int)d_data.size()) - d_offset );
+        //printf("copy %d from d_data[%d] to out[%d]\n", max_copy, d_offset, oo);
+        memcpy( &out[oo], &d_data[d_offset], sizeof(@TYPE@)*max_copy );
+        //printf(" * memcpy returned.\n");
+        oo += max_copy;   
+        d_offset = (d_offset + max_copy)%d_periodicity;
+        //printf(" ## (inelse) oo = %d, d_offset = %d\n", oo, d_offset);
+        }
+    
+      //printf(" # exit else, on to next loop.\n");
+    }
+    //printf(" # got out of loop\n");
+
+    //printf("consume = %d, produce = %d\n", ii, oo);
+    consume_each(ii);
+    return oo;
+
+}
+
+@NAME@_sptr
+gr_make_@BASE_NAME@ (const std::vector<@TYPE@> &data, int periodicity, int offset)
+{
+  return gnuradio::get_initial_sptr(new @NAME@ (data, periodicity, offset));
+}
+
diff --git a/gnuradio-core/src/lib/gengen/gr_vector_insert_X.h.t b/gnuradio-core/src/lib/gengen/gr_vector_insert_X.h.t
new file mode 100644
index 000000000..76c6b7a5d
--- /dev/null
+++ b/gnuradio-core/src/lib/gengen/gr_vector_insert_X.h.t
@@ -0,0 +1,61 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2008 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 <gr_core_api.h>
+#include <gr_block.h>
+
+class GR_CORE_API @NAME@;
+typedef boost::shared_ptr<@NAME@> @NAME@_sptr;
+
+/*!
+ * \brief source of @TYPE@'s that gets its data from a vector
+ * \ingroup source_blk
+ */
+
+class @NAME@ : public gr_block {
+  friend GR_CORE_API @NAME@_sptr 
+  gr_make_@BASE_NAME@ (const std::vector<@TYPE@> &data, int periodicity, int offset);
+
+  std::vector<@TYPE@>	d_data;
+  int		d_offset;
+  int       d_periodicity;
+
+  @NAME@ (const std::vector<@TYPE@> &data, int periodicity, int offset);
+
+ public:
+  void rewind() {d_offset=0;}
+  virtual int general_work (int noutput_items,
+            gr_vector_int &ninput_items,
+		    gr_vector_const_void_star &input_items,
+		    gr_vector_void_star &output_items);
+  void set_data(const std::vector<@TYPE@> &data){ d_data = data; rewind(); }
+};
+
+GR_CORE_API @NAME@_sptr
+gr_make_@BASE_NAME@ (const std::vector<@TYPE@> &data, int periodicity, int offset=0);
+
+#endif
diff --git a/gnuradio-core/src/lib/gengen/gr_vector_insert_X.i.t b/gnuradio-core/src/lib/gengen/gr_vector_insert_X.i.t
new file mode 100644
index 000000000..ce951b334
--- /dev/null
+++ b/gnuradio-core/src/lib/gengen/gr_vector_insert_X.i.t
@@ -0,0 +1,37 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2008 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@
+
+GR_SWIG_BLOCK_MAGIC(gr,@BASE_NAME@);
+
+@NAME@_sptr
+gr_make_@BASE_NAME@ (const std::vector<@TYPE@> &data, int periodicity, int offset = 0)
+  throw(std::invalid_argument);
+
+class @NAME@ : public gr_block {
+ public:
+  void rewind();
+  void set_data(const std::vector<@TYPE@> &data);
+ private:
+  @NAME@ (const std::vector<@TYPE@> &data, int periodicity, int offset = 0);
+};
diff --git a/gnuradio-core/src/lib/gengen/gr_vector_source_X.h.t b/gnuradio-core/src/lib/gengen/gr_vector_source_X.h.t
index fe0a77f81..89f07721d 100644
--- a/gnuradio-core/src/lib/gengen/gr_vector_source_X.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_vector_source_X.h.t
@@ -52,6 +52,7 @@ class @NAME@ : public gr_sync_block {
   virtual int work (int noutput_items,
 		    gr_vector_const_void_star &input_items,
 		    gr_vector_void_star &output_items);
+  void set_data(const std::vector<@TYPE@> &data){ d_data = data; rewind(); }
 };
 
 GR_CORE_API @NAME@_sptr
diff --git a/gnuradio-core/src/lib/gengen/gr_vector_source_X.i.t b/gnuradio-core/src/lib/gengen/gr_vector_source_X.i.t
index 6c20539ac..c821e12ff 100644
--- a/gnuradio-core/src/lib/gengen/gr_vector_source_X.i.t
+++ b/gnuradio-core/src/lib/gengen/gr_vector_source_X.i.t
@@ -30,7 +30,8 @@ gr_make_@BASE_NAME@ (const std::vector<@TYPE@> &data, bool repeat = false, int v
 
 class @NAME@ : public gr_sync_block {
  public:
-  void rewind() {d_offset=0;}
+  void rewind();
+  void set_data(const std::vector<@TYPE@> &data);
  private:
   @NAME@ (const std::vector<@TYPE@> &data, int vlen);
 };