analog: adding gr-analog component with.

19 files changed, 974 insertions, 1 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36c462e68..951a8f5e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2010-2011 Free Software Foundation, Inc.
+# Copyright 2010-2012 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -234,6 +234,7 @@ add_subdirectory(gr-filter)
 add_subdirectory(gr-atsc)
 add_subdirectory(gr-audio)
 add_subdirectory(gr-comedi)
+add_subdirectory(gr-analog)
 add_subdirectory(gr-digital)
 add_subdirectory(gr-noaa)
 add_subdirectory(gr-pager)
diff --git a/gr-analog/CMakeLists.txt b/gr-analog/CMakeLists.txt
new file mode 100644
index 000000000..4769ce7ac
--- /dev/null
+++ b/gr-analog/CMakeLists.txt
@@ -0,0 +1,114 @@
+# Copyright 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.
+
+########################################################################
+# Setup dependencies
+########################################################################
+include(GrBoost)
+
+########################################################################
+# Register component
+########################################################################
+include(GrComponent)
+GR_REGISTER_COMPONENT("gr-analog" ENABLE_GR_ANALOG
+    Boost_FOUND
+    ENABLE_VOLK
+    ENABLE_GR_CORE
+    ENABLE_GR_FFT
+    ENABLE_GR_FILTER
+)
+
+GR_SET_GLOBAL(GR_ANALOG_INCLUDE_DIRS
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${CMAKE_CURRENT_BINARY_DIR}/include
+)
+
+GR_SET_GLOBAL(GR_ANALOG_SWIG_INCLUDE_DIRS
+    ${CMAKE_CURRENT_SOURCE_DIR}/swig
+)
+
+SET(GR_PKG_ANALOG_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/analog)
+
+########################################################################
+# Begin conditional configuration
+########################################################################
+if(ENABLE_GR_ANALOG)
+
+########################################################################
+# Setup CPack components
+########################################################################
+include(GrPackage)
+CPACK_SET(CPACK_COMPONENT_GROUP_ANALOG_DESCRIPTION "GNU Radio Analog Blocks")
+
+CPACK_COMPONENT("analog_runtime"
+    GROUP        "Analog"
+    DISPLAY_NAME "Runtime"
+    DESCRIPTION  "Dynamic link libraries"
+    DEPENDS      "core_runtime"
+)
+
+CPACK_COMPONENT("analog_devel"
+    GROUP        "Analog"
+    DISPLAY_NAME "Development"
+    DESCRIPTION  "C++ headers, package config, import libraries"
+    DEPENDS      "core_devel"
+)
+
+CPACK_COMPONENT("analog_python"
+    GROUP        "Analog"
+    DISPLAY_NAME "Python"
+    DESCRIPTION  "Python modules for runtime"
+    DEPENDS      "core_python;analog_runtime"
+)
+
+CPACK_COMPONENT("analog_swig"
+    GROUP        "Analog"
+    DISPLAY_NAME "SWIG"
+    DESCRIPTION  "SWIG development .i files"
+    DEPENDS      "core_swig;analog_python;analog_devel"
+)
+
+########################################################################
+# Add subdirectories
+########################################################################
+add_subdirectory(include/analog)
+add_subdirectory(lib)
+add_subdirectory(doc)
+if(ENABLE_PYTHON)
+    add_subdirectory(swig)
+    add_subdirectory(python)
+    add_subdirectory(grc)
+    add_subdirectory(examples)
+endif(ENABLE_PYTHON)
+
+########################################################################
+# Create Pkg Config File
+########################################################################
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-analog.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-analog.pc
+@ONLY)
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-analog.pc
+    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+    COMPONENT "analog_devel"
+)
+
+endif(ENABLE_GR_ANALOG)
diff --git a/gr-analog/README b/gr-analog/README
new file mode 100644
index 000000000..8c29ffde5
--- /dev/null
+++ b/gr-analog/README
@@ -0,0 +1,4 @@
+This GNU Radio component for implementing analog modulators, demodulators, and other related blocks.
+
+
+FIXME: just fixme.
\ No newline at end of file
diff --git a/gr-analog/doc/CMakeLists.txt b/gr-analog/doc/CMakeLists.txt
new file mode 100644
index 000000000..5a02547db
--- /dev/null
+++ b/gr-analog/doc/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Copyright 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.
+
+install(
+    FILES README.analog
+    DESTINATION ${GR_PKG_DOC_DIR}
+)
diff --git a/gr-analog/doc/README.analog b/gr-analog/doc/README.analog
new file mode 100644
index 000000000..b2b763cc3
--- /dev/null
+++ b/gr-analog/doc/README.analog
@@ -0,0 +1,13 @@
+This is the gr-analog package. It contains all of the analog
+modulation blocks, utilities, and examples. To use the analog blocks,
+the Python namespaces is in gnuradio.analog, which would be normally
+imported as:
+
+    from gnuradio import analog
+
+See the Doxygen documentation for details about the blocks available
+in this package. A quick listing of the details can be found in Python
+after importing by using: 
+
+    help(analog)
+
diff --git a/gr-analog/doc/analog.dox b/gr-analog/doc/analog.dox
new file mode 100644
index 000000000..d3af364f7
--- /dev/null
+++ b/gr-analog/doc/analog.dox
@@ -0,0 +1,23 @@
+/*! \page page_analog Analog Modulation
+
+\section Introduction
+This is the gr-analog package. It contains all of the analog
+modulation blocks, utilities, and examples. To use the analog blocks,
+the Python namespaces is in gnuradio.analog, which would be normally
+imported as:
+
+\code
+    from gnuradio import analog
+\endcode
+
+See the Doxygen documentation for details about the blocks available
+in this package. The relevant blocks are listed in the \ref analog group.
+
+A quick listing of the details can be found in Python after importing
+by using:
+
+\code
+    help(analog)
+\endcode
+
+*/
diff --git a/gr-analog/examples/CMakeLists.txt b/gr-analog/examples/CMakeLists.txt
new file mode 100644
index 000000000..947600986
--- /dev/null
+++ b/gr-analog/examples/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Copyright 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.
+
+include(GrPython)
+
+# Base stuff
+GR_PYTHON_INSTALL(PROGRAMS
+    DESTINATION ${GR_PKG_ANALOG_EXAMPLES_DIR}
+    COMPONENT "analog_python"
+)
diff --git a/gr-analog/gnuradio-analog.pc.in b/gr-analog/gnuradio-analog.pc.in
new file mode 100644
index 000000000..675c7ee20
--- /dev/null
+++ b/gr-analog/gnuradio-analog.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: gnuradio-analog
+Description: GNU Radio blocks for analog communications
+Requires: gnuradio-core
+Version: @LIBVER@
+Libs: -L${libdir} -lgnuradio-analog
+Cflags: -I${includedir}
diff --git a/gr-analog/grc/CMakeLists.txt b/gr-analog/grc/CMakeLists.txt
new file mode 100644
index 000000000..908ef0ed3
--- /dev/null
+++ b/gr-analog/grc/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Copyright 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.
+
+file(GLOB xml_files "*.xml")
+install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "analog_python")
diff --git a/gr-analog/grc/analog_block_tree.xml b/gr-analog/grc/analog_block_tree.xml
new file mode 100644
index 000000000..a924e8cda
--- /dev/null
+++ b/gr-analog/grc/analog_block_tree.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+
+<!--
+ Copyright 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.
+-->
+
+<!--
+###################################################
+##Block Tree for GR Analog blocks.
+###################################################
+ -->
+<cat>
+	<name></name> <!-- Blank for Root Name -->
+</cat>
diff --git a/gr-analog/include/analog/CMakeLists.txt b/gr-analog/include/analog/CMakeLists.txt
new file mode 100644
index 000000000..0b5dd28e0
--- /dev/null
+++ b/gr-analog/include/analog/CMakeLists.txt
@@ -0,0 +1,83 @@
+# Copyright 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.
+
+########################################################################
+# generate helper scripts to expand templated files
+########################################################################
+include(GrPython)
+
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
+#!${PYTHON_EXECUTABLE}
+
+import sys, os, re
+sys.path.append('${GR_CORE_PYTHONPATH}')
+os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
+os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
+
+if __name__ == '__main__':
+    import build_utils
+    root, inp = sys.argv[1:3]
+    for sig in sys.argv[3:]:
+        name = re.sub ('X+', sig, root)
+        d = build_utils.standard_dict2(name, sig, 'analog')
+        build_utils.expand_template(d, inp)
+
+")
+
+macro(expand_h root)
+  #make a list of all the generated files
+  unset(expanded_files_h)
+  foreach(sig ${ARGN})
+    string(REGEX REPLACE "X+" ${sig} name ${root})
+    list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
+  endforeach(sig)
+  
+  #create a command to generate the files
+  add_custom_command(
+    OUTPUT ${expanded_files_h}
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${root}.h.t
+    COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
+    ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
+    ${root} ${root}.h.t ${ARGN}
+    )
+
+  #install rules for the generated h files
+  list(APPEND generated_includes ${expanded_files_h})
+endmacro(expand_h)
+
+########################################################################
+# Invoke macro to generate various sources
+#######################################################################
+#expand_h(block     bf bc sf sc if ic)
+
+add_custom_target(analog_generated_includes DEPENDS
+    ${generated_includes}
+)
+
+########################################################################
+# Install header files
+########################################################################
+install(FILES
+    ${analog_generated_includes}
+    api.h
+    cpm.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/analog
+    COMPONENT "analog_devel"
+)
+
diff --git a/gr-analog/include/analog/api.h b/gr-analog/include/analog/api.h
new file mode 100644
index 000000000..b7dee4693
--- /dev/null
+++ b/gr-analog/include/analog/api.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright 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.
+ */
+
+#ifndef INCLUDED_ANALOG_API_H
+#define INCLUDED_ANALOG_API_H
+
+#include <gruel/attributes.h>
+
+#ifdef gnuradio_analog_EXPORTS
+#  define ANALOG_API __GR_ATTR_EXPORT
+#else
+#  define ANALOG_API __GR_ATTR_IMPORT
+#endif
+
+#endif /* INCLUDED_ANALOG_API_H */
diff --git a/gr-analog/include/analog/cpm.h b/gr-analog/include/analog/cpm.h
new file mode 100644
index 000000000..d22e02321
--- /dev/null
+++ b/gr-analog/include/analog/cpm.h
@@ -0,0 +1,86 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2010,2012 Free Software Foundation, Inc.
+ *
+ * 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_ANALOG_CPM_H
+#define INCLUDED_ANALOG_CPM_H
+
+#include <analog/api.h>
+#include <vector>
+
+namespace gr {
+  namespace analog {
+
+    class ANALOG_API cpm
+    {
+    public:
+      enum cpm_type {
+	LRC,
+	LSRC,
+	LREC,
+	TFM,
+	GAUSSIAN,
+	GENERIC = 999
+      };
+      
+      /*! \brief Return the taps for an interpolating FIR filter (gr_interp_fir_filter_fff).
+       *
+       * These taps represent the phase response \f$g(k)\f$ for use in a CPM modulator,
+       * see also gr_cpmmod_bc.
+       *
+       * \param type The CPM type (Rectangular, Raised Cosine, Spectral Raised Cosine,
+       *             Tamed FM or Gaussian).
+       * \param samples_per_sym Samples per symbol.
+       * \param L The length of the phase response in symbols.
+       * \param beta For Spectral Raised Cosine, this is the rolloff factor. For Gaussian
+       *             phase responses, this the 3dB-time-bandwidth product. For all other
+       *             cases, it is ignored.
+       *
+       * Output: returns a vector of length \a K = \p samples_per_sym x \p L.
+       *         This can be used directly in an interpolating FIR filter such as
+       *         gr_interp_fir_filter_fff with interpolation factor \p samples_per_sym.
+       *
+       * All phase responses are normalised s.t. \f$ \sum_{k=0}^{K-1} g(k) = 1\f$; this will cause
+       * a maximum phase change of \f$ h \cdot \pi\f$ between two symbols, where \a h is the
+       * modulation index.
+       *
+       * The following phase responses can be generated:
+       * - LREC: Rectangular phase response.
+       * - LRC: Raised cosine phase response, looks like 1 - cos(x).
+       * - LSRC: Spectral raised cosine. This requires a rolloff factor beta.
+       *         The phase response is the Fourier transform of raised cosine
+       *         function.
+       * - TFM: Tamed frequency modulation. This scheme minimizes phase change for
+       *        rapidly varying input symbols.
+       * - GAUSSIAN: A Gaussian phase response. For a modulation index h = 1/2, this
+       *             results in GMSK.
+       *
+       * A short description of all these phase responses can be found in [1].
+       *
+       * [1]: Anderson, Aulin and Sundberg; Digital Phase Modulation
+       */
+      static std::vector<float>
+	phase_response(cpm_type type, unsigned samples_per_sym, unsigned L, double beta=0.3);
+    };
+  } // namespace analog
+} // namespace gr
+
+#endif /* INCLUDED_ANALOG_CPM_H */
+
diff --git a/gr-analog/lib/CMakeLists.txt b/gr-analog/lib/CMakeLists.txt
new file mode 100644
index 000000000..f18c84274
--- /dev/null
+++ b/gr-analog/lib/CMakeLists.txt
@@ -0,0 +1,119 @@
+# Copyright 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.
+
+########################################################################
+# Setup the include and linker paths
+########################################################################
+include_directories(
+    ${VOLK_INCLUDE_DIRS}
+    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GR_ANALOG_INCLUDE_DIRS}
+    ${GR_FFT_INCLUDE_DIRS}
+    ${GR_FILTER_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_BINARY_DIR}/../include
+)
+
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
+
+########################################################################
+# generate helper scripts to expand templated files
+########################################################################
+include(GrPython)
+
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
+#!${PYTHON_EXECUTABLE}
+
+import sys, os, re
+sys.path.append('${GR_CORE_PYTHONPATH}')
+os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
+os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
+
+if __name__ == '__main__':
+    import build_utils
+    root, inp = sys.argv[1:3]
+    for sig in sys.argv[3:]:
+        name = re.sub ('X+', sig, root)
+        d = build_utils.standard_impl_dict2(name, sig, 'analog')
+        build_utils.expand_template(d, inp)
+")
+
+macro(expand_cc root)
+  #make a list of all the generated files
+  unset(expanded_files_cc)
+  unset(expanded_files_h)
+  foreach(sig ${ARGN})
+    string(REGEX REPLACE "X+" ${sig} name ${root})
+    list(APPEND expanded_files_cc ${CMAKE_CURRENT_BINARY_DIR}/${name}.cc)
+    list(APPEND expanded_files_h  ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
+  endforeach(sig)
+  
+  #create a command to generate the source files
+  add_custom_command(
+    OUTPUT ${expanded_files_cc}
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${root}.cc.t
+    COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
+    ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
+    ${root} ${root}.cc.t ${ARGN}
+  )
+
+  #create a command to generate the header file
+  add_custom_command(
+    OUTPUT ${expanded_files_h}
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${root}.h.t
+    COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
+    ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
+    ${root} ${root}.h.t ${ARGN}
+  )
+  
+  #make source files depends on headers to force generation
+  set_source_files_properties(${expanded_files_cc}
+    PROPERTIES OBJECT_DEPENDS "${expanded_files_h}"
+  )
+  
+  #install rules for the generated cc files
+  list(APPEND generated_sources ${expanded_files_cc})  
+  list(APPEND generated_headers ${expanded_files_h})  
+endmacro(expand_cc)
+
+
+########################################################################
+# Invoke macro to generate various sources
+########################################################################
+#expand_cc(block     bf bc sf sc if ic)
+
+########################################################################
+# Setup library
+########################################################################
+list(APPEND analog_sources
+    ${generated_sources}
+    cpm.cc
+)
+
+list(APPEND analog_libs
+    volk
+    gnuradio-core
+    gnuradio-filter
+    ${Boost_LIBRARIES}
+)
+
+add_library(gnuradio-analog SHARED ${analog_sources})
+target_link_libraries(gnuradio-analog ${analog_libs})
+GR_LIBRARY_FOO(gnuradio-analog RUNTIME_COMPONENT "analog_runtime" DEVEL_COMPONENT "analog_devel")
+add_dependencies(gnuradio-analog analog_generated_includes analog_generated_swigs gnuradio-filter)
diff --git a/gr-analog/lib/cpm.cc b/gr-analog/lib/cpm.cc
new file mode 100644
index 000000000..618475cec
--- /dev/null
+++ b/gr-analog/lib/cpm.cc
@@ -0,0 +1,221 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2010,2012 Free Software Foundation, Inc.
+ *
+ * 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.
+ */
+
+// Calculate the taps for the CPM phase responses
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <cmath>
+#include <cfloat>
+#include <analog/cpm.h>
+
+//gives us erf on compilers without it
+#include <boost/math/special_functions/erf.hpp>
+namespace bm = boost::math;
+
+namespace gr {
+  namespace analog {
+
+#ifndef M_TWOPI
+#  define M_TWOPI (2*M_PI)
+#endif
+
+    //! Normalised sinc function, sinc(x)=sin(pi*x)/pi*x
+    inline double
+    sinc(double x)
+    {
+      if(x == 0) {
+	return 1.0;
+      }
+      return sin(M_PI * x) / (M_PI * x);
+    }
+
+
+    //! Taps for L-RC CPM (Raised cosine of length L symbols)
+    std::vector<float>
+    generate_cpm_lrc_taps(unsigned samples_per_sym, unsigned L)
+    {
+      std::vector<float> taps(samples_per_sym * L, 1.0/L/samples_per_sym);
+      for(unsigned i = 0; i < samples_per_sym * L; i++) {
+	taps[i] *= 1 - cos(M_TWOPI * i / L / samples_per_sym);
+      }
+
+      return taps;
+    }
+
+
+    /*! Taps for L-SRC CPM (Spectral raised cosine of length L symbols).
+     *
+     * L-SRC has a time-continuous phase response function of
+     *
+     * g(t) = 1/LT * sinc(2t/LT) * cos(beta * 2pi t / LT) / (1 - (4beta / LT * t)^2)
+     *
+     * which is the Fourier transform of a cos-rolloff function with rolloff
+     * beta, and looks like a sinc-function, multiplied with a rolloff term.
+     * We return the main lobe of the sinc, i.e., everything between the
+     * zero crossings.
+     * The time-discrete IR is thus
+     *
+     * g(k) = 1/Ls * sinc(2k/Ls) * cos(beta * pi k / Ls) / (1 - (4beta / Ls * k)^2)
+     * where k = 0...Ls-1
+     * and s = samples per symbol.
+     */
+    std::vector<float>
+    generate_cpm_lsrc_taps(unsigned samples_per_sym, unsigned L, double beta)
+    {
+      double Ls = (double) L * samples_per_sym;
+      std::vector<double> taps_d(L * samples_per_sym, 0.0);
+      std::vector<float> taps(L * samples_per_sym, 0.0);
+
+      double sum = 0;
+      for(unsigned i = 0; i < samples_per_sym * L; i++) {
+	double k =  i - Ls/2; // Causal to acausal
+
+	taps_d[i] = 1.0 / Ls * sinc(2.0 * k / Ls);
+
+	// For k = +/-Ls/4*beta, the rolloff term's cos-function becomes zero
+	// and the whole thing converges to PI/4 (to prove this, use de
+	// l'hopital's rule).
+	if(fabs(fabs(k) - Ls/4/beta) < 2*DBL_EPSILON) {
+	  taps_d[i] *= M_PI_4;
+	}
+	else {
+	  double tmp = 4.0 * beta * k / Ls;
+	  taps_d[i] *= cos(beta * M_TWOPI * k / Ls) / (1 - tmp * tmp);
+	}
+	sum += taps_d[i];
+      }
+
+      for(unsigned i = 0; i < samples_per_sym * L; i++) {
+	taps[i] = (float) taps_d[i] / sum;
+      }
+
+      return taps;
+    }
+
+    //! Taps for L-REC CPM (Rectangular pulse shape of length L symbols)
+    std::vector<float>
+    generate_cpm_lrec_taps(unsigned samples_per_sym, unsigned L)
+    {
+      return std::vector<float>(samples_per_sym * L, 1.0/L/samples_per_sym);
+    }
+
+    //! Helper function for TFM
+    double tfm_g0(double k, double sps)
+    {
+      if(fabs(k) < 2 * DBL_EPSILON) {
+	return 1.145393004159143; // 1 + pi^2/48 / sqrt(2)
+      }
+
+      const double pi2_24 = 0.411233516712057; // pi^2/24
+      double f = M_PI * k / sps;
+      return sinc(k/sps) - pi2_24 * (2 * sin(f) - 2*f*cos(f) - f*f*sin(f)) / (f*f*f);
+    }
+
+    //! Taps for TFM CPM (Tamed frequency modulation)
+    //
+    // See [2, Chapter 2.7.2].
+    //
+    // [2]: Anderson, Aulin and Sundberg; Digital Phase Modulation
+    std::vector<float>
+    generate_cpm_tfm_taps(unsigned sps, unsigned L)
+    {
+      unsigned causal_shift = sps * L / 2;
+      std::vector<double> taps_d(sps * L, 0.0);
+      std::vector<float> taps(sps * L, 0.0);
+
+      double sum = 0;
+      for(unsigned i = 0; i < sps * L; i++) {
+	double k = (double)(((int)i) - ((int)causal_shift)); // Causal to acausal
+
+	taps_d[i] = tfm_g0(k - sps, sps) +
+	  2 * tfm_g0(k,       sps) +
+	  tfm_g0(k + sps, sps);
+	sum += taps_d[i];
+      }
+
+      for(unsigned i = 0; i < sps * L; i++) {
+	taps[i] = (float) taps_d[i] / sum;
+      }
+
+      return taps;
+    }
+
+    //! Taps for Gaussian CPM. Phase response is truncated after \p L symbols.
+    //  \p bt sets the 3dB-time-bandwidth product.
+    //
+    // Note: for h = 0.5, this is the phase response for GMSK.
+    //
+    // This C99-compatible formula for the taps is taken straight
+    // from [1, Chapter 9.2.3].
+    // A version in Q-notation can be found in [2, Chapter 2.7.2].
+    //
+    // [1]: Karl-Dirk Kammeyer; Nachrichtenübertragung, 4th Edition.
+    // [2]: Anderson, Aulin and Sundberg; Digital Phase Modulation
+    //
+    std::vector<float>
+    generate_cpm_gaussian_taps(unsigned samples_per_sym, unsigned L, double bt)
+    {
+      double Ls = (double) L * samples_per_sym;
+      std::vector<double> taps_d(L * samples_per_sym, 0.0);
+      std::vector<float> taps(L * samples_per_sym, 0.0);
+
+      // alpha = sqrt(2/ln(2)) * pi * BT
+      double alpha = 5.336446256636997 * bt;
+      for(unsigned i = 0; i < samples_per_sym * L; i++) {
+	double k =  i - Ls/2; // Causal to acausal
+	taps_d[i] = (bm::erf(alpha * (k / samples_per_sym + 0.5)) -
+		     bm::erf(alpha * (k / samples_per_sym - 0.5)))
+	  * 0.5 / samples_per_sym;
+	taps[i] = (float) taps_d[i];
+      }
+
+      return taps;
+    }
+
+    std::vector<float>
+    cpm::phase_response(cpm_type type, unsigned samples_per_sym, unsigned L, double beta)
+    {
+      switch(type) {
+      case LRC:
+	return generate_cpm_lrc_taps(samples_per_sym, L);
+
+      case LSRC:
+	return generate_cpm_lsrc_taps(samples_per_sym, L, beta);
+
+      case LREC:
+	return generate_cpm_lrec_taps(samples_per_sym, L);
+
+      case TFM:
+	return generate_cpm_tfm_taps(samples_per_sym, L);
+
+      case GAUSSIAN:
+	return generate_cpm_gaussian_taps(samples_per_sym, L, beta);
+
+      default:
+	return generate_cpm_lrec_taps(samples_per_sym, 1);
+      }
+    }
+
+  } // namespace analog
+} // namespace gr
+
diff --git a/gr-analog/python/CMakeLists.txt b/gr-analog/python/CMakeLists.txt
new file mode 100644
index 000000000..08570eea3
--- /dev/null
+++ b/gr-analog/python/CMakeLists.txt
@@ -0,0 +1,51 @@
+# Copyright 212 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.
+
+########################################################################
+# Setup python install
+########################################################################
+include(GrPython)
+
+GR_PYTHON_INSTALL(
+    FILES
+    __init__.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/analog
+    COMPONENT "analog_python"
+)
+
+########################################################################
+# Handle the unit tests
+########################################################################
+if(ENABLE_TESTING)
+include(GrTest)
+file(GLOB py_qa_test_files "qa_*.py")
+foreach(py_qa_test_file ${py_qa_test_files})
+    get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
+    set(GR_TEST_PYTHON_DIRS
+        ${CMAKE_BINARY_DIR}/gnuradio-core/src/python
+        ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
+        ${CMAKE_BINARY_DIR}/gr-analog/python
+        ${CMAKE_BINARY_DIR}/gr-analog/swig
+        ${CMAKE_BINARY_DIR}/gr-filter/python
+        ${CMAKE_BINARY_DIR}/gr-filter/swig
+    )
+    set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-analog)
+    GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
+endforeach(py_qa_test_file)
+endif(ENABLE_TESTING)
diff --git a/gr-analog/python/__init__.py b/gr-analog/python/__init__.py
new file mode 100644
index 000000000..fc345028b
--- /dev/null
+++ b/gr-analog/python/__init__.py
@@ -0,0 +1,27 @@
+# Copyright 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.
+# 
+
+'''
+Blocks and utilities for analog modulation and demodulation.
+'''
+
+# The presence of this file turns this directory into a Python package
+
+from analog_swig import *
diff --git a/gr-analog/swig/CMakeLists.txt b/gr-analog/swig/CMakeLists.txt
new file mode 100644
index 000000000..e3fbbe73f
--- /dev/null
+++ b/gr-analog/swig/CMakeLists.txt
@@ -0,0 +1,51 @@
+# Copyright 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.
+
+########################################################################
+# Setup swig generation
+########################################################################
+include(GrPython)
+include(GrSwig)
+
+set(GR_SWIG_INCLUDE_DIRS
+    ${GR_ANALOG_INCLUDE_DIRS}
+    ${GR_FILTER_INCLUDE_DIRS}
+    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+)
+
+set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/analog_swig_doc.i)
+set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
+
+set(GR_SWIG_LIBRARIES gnuradio-analog gnuradio-filter)
+
+GR_SWIG_MAKE(analog_swig analog_swig.i)
+
+GR_SWIG_INSTALL(
+    TARGETS analog_swig
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/analog
+    COMPONENT "analog_python"
+)
+
+install(
+    FILES
+    analog_swig.i
+    ${CMAKE_CURRENT_BINARY_DIR}/analog_swig_doc.i
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+    COMPONENT "analog_swig"
+)
diff --git a/gr-analog/swig/analog_swig.i b/gr-analog/swig/analog_swig.i
new file mode 100644
index 000000000..0ce6854ca
--- /dev/null
+++ b/gr-analog/swig/analog_swig.i
@@ -0,0 +1,35 @@
+/*
+ * Copyright 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.
+ */
+
+#define ANALOG_API
+
+%include "gnuradio.i"
+
+//load generated python docstrings
+%include "analog_swig_doc.i"
+
+%{
+#include "analog/cpm.h"
+%}
+
+%include "analog/cpm.h"
+
+//GR_SWIG_BLOCK_MAGIC2();