blocks: added blocks_add_const_xx

9 files changed, 281 insertions, 8 deletions

diff --git a/gr-blocks/grc/blocks_add_const_xx.xml b/gr-blocks/grc/blocks_add_const_xx.xml
new file mode 100644
index 000000000..dc8ec1819
--- /dev/null
+++ b/gr-blocks/grc/blocks_add_const_xx.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Add Const Block:
+##	all types, 1 output, 1 input & const
+###################################################
+ -->
+<block>
+	<name>Add Const</name>
+	<key>gr_add_const_vxx</key>
+	<import>from gnuradio import blocks</import>
+	<make>blocks.add_const_v$(type.fcn)($const)</make>
+	<callback>set_k($const)</callback>
+	<param>
+		<name>IO Type</name>
+		<key>type</key>
+		<type>enum</type>
+		<option>
+			<name>Complex</name>
+			<key>complex</key>
+			<opt>const_type:complex_vector</opt>
+			<opt>fcn:cc</opt>
+		</option>
+		<option>
+			<name>Float</name>
+			<key>float</key>
+			<opt>const_type:real_vector</opt>
+			<opt>fcn:ff</opt>
+		</option>
+		<option>
+			<name>Int</name>
+			<key>int</key>
+			<opt>const_type:int_vector</opt>
+			<opt>fcn:ii</opt>
+		</option>
+		<option>
+			<name>Short</name>
+			<key>short</key>
+			<opt>const_type:int_vector</opt>
+			<opt>fcn:ss</opt>
+		</option>
+	</param>
+	<param>
+		<name>Constant</name>
+		<key>const</key>
+		<value>0</value>
+		<type>$type.const_type</type>
+	</param>
+	<param>
+		<name>Vec Length</name>
+		<key>vlen</key>
+		<value>1</value>
+		<type>int</type>
+	</param>
+	<check>len($const) == $vlen</check>
+	<check>$vlen &gt; 0</check>
+	<sink>
+		<name>in</name>
+		<type>$type</type>
+		<vlen>$vlen</vlen>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>$type</type>
+		<vlen>$vlen</vlen>
+	</source>
+</block>
diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml
index 37ed367c6..b4834d06f 100644
--- a/gr-blocks/grc/blocks_block_tree.xml
+++ b/gr-blocks/grc/blocks_block_tree.xml
@@ -31,5 +31,6 @@
 	<cat>
 		<name>Math Operations</name>
 		<block>blocks_add_xx</block>
+		<block>blocks_add_const_xx</block>
 	</cat>
 </cat>
diff --git a/gr-blocks/include/blocks/CMakeLists.txt b/gr-blocks/include/blocks/CMakeLists.txt
index f11db5fc0..68002588b 100644
--- a/gr-blocks/include/blocks/CMakeLists.txt
+++ b/gr-blocks/include/blocks/CMakeLists.txt
@@ -64,7 +64,8 @@ endmacro(expand_h)
 ########################################################################
 # Invoke macro to generate various sources
 ########################################################################
-expand_h(add_XX  ss ii cc)
+expand_h(add_XX       ss ii cc)
+expand_h(add_const_XX ss ii ff cc)
 
 add_custom_target(blocks_generated_includes DEPENDS
     ${generated_includes}
diff --git a/gr-blocks/include/blocks/add_const_XX.h.t b/gr-blocks/include/blocks/add_const_XX.h.t
new file mode 100644
index 000000000..ab7952033
--- /dev/null
+++ b/gr-blocks/include/blocks/add_const_XX.h.t
@@ -0,0 +1,65 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2012 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 = input + constant
+     * \ingroup math_blk
+     */
+    class BLOCKS_API @NAME@ : virtual public gr_sync_block
+    {
+    public:
+      
+      // gr::blocks::@NAME@::sptr
+      typedef boost::shared_ptr<@NAME@> sptr;
+      
+      /*!
+       * \brief Create an instance of @NAME@
+       * \param k additive constant
+       */
+      static sptr make(@O_TYPE@ k);
+      
+      /*!
+       * \brief Return additive constant
+       */
+      virtual @O_TYPE@ k() const = 0;
+
+      /*!
+       * \brief Set additive constant
+       */
+      virtual void set_k(@O_TYPE@ k) = 0;
+    };
+
+  }
+}
+
+#endif /* @GUARD_NAME */
diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt
index f5ed77f3b..334d18830 100644
--- a/gr-blocks/lib/CMakeLists.txt
+++ b/gr-blocks/lib/CMakeLists.txt
@@ -41,8 +41,8 @@ if __name__ == '__main__':
 
 macro(expand_cc_h_impl root)
   #make a list of all the generated files
-  unset(expanded_files_cc)
-  unset(expanded_files_h)
+  unset(expanded_files_cc_impl)
+  unset(expanded_files_h_impl)
   foreach(sig ${ARGN})
     string(REGEX REPLACE "X+" ${sig} name ${root})
     list(APPEND expanded_files_cc_impl ${CMAKE_CURRENT_BINARY_DIR}/${name}_impl.cc)
@@ -85,7 +85,8 @@ endmacro(expand_cc_h_impl)
 ########################################################################
 # Invoke macro to generate various sources
 ########################################################################
-expand_cc_h_impl(add_XX  ss ii cc)
+expand_cc_h_impl(add_XX       ss ii cc)
+expand_cc_h_impl(add_const_XX ss ii ff cc)
 
 ########################################################################
 # Setup the include and linker paths
diff --git a/gr-blocks/lib/add_const_XX_impl.cc.t b/gr-blocks/lib/add_const_XX_impl.cc.t
new file mode 100644
index 000000000..7fa883f4b
--- /dev/null
+++ b/gr-blocks/lib/add_const_XX_impl.cc.t
@@ -0,0 +1,77 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2009,2010,2012 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(@O_TYPE@ k)
+    {
+      return gnuradio::get_initial_sptr(new @NAME_IMPL@(k));
+    }
+
+    @NAME_IMPL@::@NAME_IMPL@(@O_TYPE@ k)
+      : gr_sync_block ("@NAME@",
+		       gr_make_io_signature (1, 1, sizeof (@I_TYPE@)),
+		       gr_make_io_signature (1, 1, sizeof (@O_TYPE@))),
+      d_k(k)
+    {
+    }
+
+    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];
+      @O_TYPE@ *optr = (@O_TYPE@ *) output_items[0];
+      
+      int size = noutput_items;
+      
+      while (size >= 8){
+	*optr++ = *iptr++ + d_k;
+	*optr++ = *iptr++ + d_k;
+	*optr++ = *iptr++ + d_k;
+	*optr++ = *iptr++ + d_k;
+	*optr++ = *iptr++ + d_k;
+	*optr++ = *iptr++ + d_k;
+	*optr++ = *iptr++ + d_k;
+	*optr++ = *iptr++ + d_k;
+	size -= 8;
+      }
+
+      while (size-- > 0)
+	*optr++ = *iptr++ + d_k;
+      
+      return noutput_items;
+    }
+
+  } /* namespace blocks */
+} /* namespace gr */
diff --git a/gr-blocks/lib/add_const_XX_impl.h.t b/gr-blocks/lib/add_const_XX_impl.h.t
new file mode 100644
index 000000000..1b21480c1
--- /dev/null
+++ b/gr-blocks/lib/add_const_XX_impl.h.t
@@ -0,0 +1,50 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2009,2012 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 BLOCKS_API @NAME_IMPL@ : public @NAME@
+    {
+      @O_TYPE@ d_k;
+
+    public:
+      @NAME_IMPL@(@O_TYPE@ k);
+
+      @O_TYPE@ k() const { return d_k; }
+      void set_k(@O_TYPE@ k) { d_k = k; }
+
+      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/python/qa_add_and_friends.py b/gr-blocks/python/qa_add_and_friends.py
index 7d008202b..f38c135f2 100755
--- a/gr-blocks/python/qa_add_and_friends.py
+++ b/gr-blocks/python/qa_add_and_friends.py
@@ -99,19 +99,18 @@ class test_add_and_friends(gr_unittest.TestCase):
         op = blocks_swig.add_cc()
         self.help_cc((src1_data, src2_data), expected_result, op)
 
-    """
     def test_add_const_ii(self):
         src_data = (1, 2, 3, 4, 5)
         expected_result = (6, 7, 8, 9, 10)
-        op = gr.add_const_ii(5)
+        op = blocks_swig.add_const_ii(5)
         self.help_ii((src_data,), expected_result, op)
 
     def test_add_const_cc(self):
         src_data = (1, 2, 3, 4, 5)
         expected_result = (1+5j, 2+5j, 3+5j, 4+5j, 5+5j)
-        op = gr.add_const_cc(5j)
+        op = blocks_swig.add_const_cc(5j)
         self.help_cc((src_data,), expected_result, op)
-
+    """
     def test_mult_const_ii(self):
         src_data = (-1, 0, 1, 2, 3)
         expected_result = (-5, 0, 5, 10, 15)
diff --git a/gr-blocks/swig/blocks_swig.i b/gr-blocks/swig/blocks_swig.i
index 3ca8583f1..7be0396f4 100644
--- a/gr-blocks/swig/blocks_swig.i
+++ b/gr-blocks/swig/blocks_swig.i
@@ -32,14 +32,26 @@
 #include "blocks/add_ss.h"
 #include "blocks/add_ii.h"
 #include "blocks/add_cc.h"
+#include "blocks/add_const_ff.h"
+#include "blocks/add_const_ss.h"
+#include "blocks/add_const_ii.h"
+#include "blocks/add_const_cc.h"
 %}
 
 %include "blocks/add_ff.h"
 %include "blocks/add_ss.h"
 %include "blocks/add_ii.h"
 %include "blocks/add_cc.h"
+%include "blocks/add_const_ff.h"
+%include "blocks/add_const_ss.h"
+%include "blocks/add_const_ii.h"
+%include "blocks/add_const_cc.h"
 
 GR_SWIG_BLOCK_MAGIC2(blocks, add_ff);
 GR_SWIG_BLOCK_MAGIC2(blocks, add_ss);
 GR_SWIG_BLOCK_MAGIC2(blocks, add_ii);
 GR_SWIG_BLOCK_MAGIC2(blocks, add_cc);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ff);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ss);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_const_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, add_const_cc);