Merged changeset r10817:10858 from jcorgan/cpphier into trunk. Adds standard place for C++ hierarchical blocks for gnuradio-core, and new gr.channel_model block from Tom Rondeau.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10859 221aa14e-8319-0410-a670-987f0aec2ac5

5 files changed, 283 insertions, 0 deletions

diff --git a/gnuradio-core/src/lib/hier/Makefile.am b/gnuradio-core/src/lib/hier/Makefile.am
new file mode 100644
index 000000000..b525d19b4
--- /dev/null
+++ b/gnuradio-core/src/lib/hier/Makefile.am
@@ -0,0 +1,37 @@
+#
+# Copyright 2009 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.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(WITH_INCLUDES)
+
+noinst_LTLIBRARIES = libhier.la
+
+libhier_la_SOURCES = \
+	gr_channel_model.cc
+
+grinclude_HEADERS = \
+	gr_channel_model.h
+
+swiginclude_HEADERS = \
+	hier.i \
+	gr_channel_model.i
diff --git a/gnuradio-core/src/lib/hier/gr_channel_model.cc b/gnuradio-core/src/lib/hier/gr_channel_model.cc
new file mode 100644
index 000000000..7bc47d5a6
--- /dev/null
+++ b/gnuradio-core/src/lib/hier/gr_channel_model.cc
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2009 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.
+ */
+
+#include <gr_channel_model.h>
+#include <gr_io_signature.h>
+#include <gr_sig_source_f.h>
+#include <iostream>
+
+// Shared pointer constructor
+gr_channel_model_sptr
+gr_make_channel_model(double noise_voltage,
+		      double frequency_offset,
+		      double epsilon,
+		      const std::vector<gr_complex> &taps,
+		      double noise_seed)
+{
+  return gnuradio::get_initial_sptr(new gr_channel_model(noise_voltage,
+							 frequency_offset,
+							 epsilon,
+							 taps,
+							 noise_seed));
+}
+
+// Hierarchical block constructor, with no inputs or outputs
+gr_channel_model::gr_channel_model(double noise_voltage,
+				   double frequency_offset,
+				   double epsilon,
+				   const std::vector<gr_complex> &taps,
+				   double noise_seed)
+  : gr_hier_block2("gr_channel_model",
+		   gr_make_io_signature(1, 1, sizeof(gr_complex)), 
+		   gr_make_io_signature(1, 1, sizeof(gr_complex)))
+{
+  d_taps = taps;
+  while(d_taps.size() < 2) {
+    d_taps.push_back(0);
+  }
+  
+  d_timing_offset = gr_make_fractional_interpolator_cc(0, epsilon);
+  
+  d_multipath = gr_make_fir_filter_ccc(1, d_taps);
+  
+  d_noise_adder = gr_make_add_cc();
+  d_noise = gr_make_noise_source_c(GR_GAUSSIAN, noise_voltage, noise_seed);
+  d_freq_offset = gr_make_sig_source_c(1, GR_SIN_WAVE, frequency_offset, 1.0, 0.0);
+  d_mixer_offset = gr_make_multiply_cc();
+  
+  connect(self(), 0, d_timing_offset, 0);
+  connect(d_timing_offset, 0, d_multipath, 0);
+  connect(d_multipath, 0, d_mixer_offset, 0);
+  connect(d_freq_offset, 0, d_mixer_offset, 1);
+  connect(d_mixer_offset, 0, d_noise_adder, 1);
+  connect(d_noise, 0, d_noise_adder, 0);
+  connect(d_noise_adder, 0, self(), 0);
+}
+
+void
+gr_channel_model::set_noise_voltage(double noise_voltage)
+{
+  d_noise->set_amplitude(noise_voltage);
+}
+   
+void
+gr_channel_model::set_frequency_offset(double frequency_offset)
+{
+  d_freq_offset->set_frequency(frequency_offset);
+}
+     
+void
+gr_channel_model::set_taps(const std::vector<gr_complex> &taps)
+{
+  d_taps = taps;
+  while(d_taps.size() < 2) {
+    d_taps.push_back(0);
+  }
+  d_multipath->set_taps(d_taps);
+}
+
+void
+gr_channel_model::set_timing_offset(double epsilon)
+{
+  d_timing_offset->set_interp_ratio(epsilon);
+}
diff --git a/gnuradio-core/src/lib/hier/gr_channel_model.h b/gnuradio-core/src/lib/hier/gr_channel_model.h
new file mode 100644
index 000000000..42f0ecc69
--- /dev/null
+++ b/gnuradio-core/src/lib/hier/gr_channel_model.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2009 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.
+ */
+
+#include <gr_top_block.h>
+#include <gr_fractional_interpolator_cc.h>
+#include <gr_sig_source_c.h>
+#include <gr_fir_filter_ccc.h>
+#include <gr_add_cc.h>
+#include <gr_noise_source_c.h>
+#include <gr_multiply_cc.h>
+
+class gr_channel_model;
+typedef boost::shared_ptr<gr_channel_model> gr_channel_model_sptr;
+
+
+gr_channel_model_sptr gr_make_channel_model(double noise_voltage=0.0,
+					    double frequency_offset=0.0,
+					    double epsilon=1.0,
+					    const std::vector<gr_complex> &taps=std::vector<gr_complex>(1, 1),
+					    double noise_seed=3021);
+
+class gr_channel_model : public gr_hier_block2
+{
+ private:
+  gr_channel_model(double noise_voltage,
+		   double frequency_offset,
+		   double epsilon,
+		   const std::vector<gr_complex> &taps,
+		   double noise_seed);
+
+  friend gr_channel_model_sptr gr_make_channel_model(double noise_voltage,
+						     double frequency_offset,
+						     double epsilon,
+						     const std::vector<gr_complex> &taps,
+						     double noise_seed);
+  
+  gr_fractional_interpolator_cc_sptr d_timing_offset;
+  gr_sig_source_c_sptr d_freq_offset;
+  gr_fir_filter_ccc_sptr d_multipath;
+  gr_add_cc_sptr d_noise_adder;
+  gr_noise_source_c_sptr d_noise;
+  gr_multiply_cc_sptr d_mixer_offset;
+  
+  std::vector<gr_complex> d_taps;
+  
+ public:
+  void set_noise_voltage(double noise_voltage);
+  void set_frequency_offset(double frequency_offset);
+  void set_taps(const std::vector<gr_complex> &taps);
+  void set_timing_offset(double epsilon);
+};
diff --git a/gnuradio-core/src/lib/hier/gr_channel_model.i b/gnuradio-core/src/lib/hier/gr_channel_model.i
new file mode 100644
index 000000000..ff9ab466d
--- /dev/null
+++ b/gnuradio-core/src/lib/hier/gr_channel_model.i
@@ -0,0 +1,45 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009 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.
+ */
+
+GR_SWIG_BLOCK_MAGIC(gr,channel_model)
+
+gr_channel_model_sptr gr_make_channel_model(double noise_voltage=0.0,
+					    double frequency_offset=0.0,
+					    double epsilon=1.0,
+					    const std::vector<gr_complex> &taps=std::vector<gr_complex>(1, 1),
+					    double noise_seed=3021);
+
+class gr_channel_model : public gr_hier_block2
+{
+ private:
+  gr_channel_model(double noise_voltage,
+		   double frequency_offset,
+		   double epsilon,
+		   const std::vector<gr_complex> &taps,
+		   double noise_seed);
+  
+ public:
+  void set_noise_voltage(double noise_voltage);
+  void set_frequency_offset(double frequency_offset);
+  void set_taps(const std::vector<gr_complex> &taps);
+  void set_timing_offset(double epsilon);
+};
diff --git a/gnuradio-core/src/lib/hier/hier.i b/gnuradio-core/src/lib/hier/hier.i
new file mode 100644
index 000000000..dbcc8e915
--- /dev/null
+++ b/gnuradio-core/src/lib/hier/hier.i
@@ -0,0 +1,31 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009 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.
+ */
+
+%{
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gr_channel_model.h>
+%}
+
+%include "gr_channel_model.i"