analog: added cpfsk to gr-analog.

7 files changed, 272 insertions, 1 deletions

diff --git a/gr-analog/include/analog/CMakeLists.txt b/gr-analog/include/analog/CMakeLists.txt
index 7e95d88cd..472f700d1 100644
--- a/gr-analog/include/analog/CMakeLists.txt
+++ b/gr-analog/include/analog/CMakeLists.txt
@@ -84,7 +84,7 @@ install(FILES
     agc_ff.h
     agc2_cc.h
     agc2_ff.h
-    ctcss_squelch_cc.h
+    cpfsk_bc.h
     ctcss_squelch_ff.h
     feedforward_agc_cc.h
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/analog
diff --git a/gr-analog/include/analog/cpfsk_bc.h b/gr-analog/include/analog/cpfsk_bc.h
new file mode 100644
index 000000000..904730e2b
--- /dev/null
+++ b/gr-analog/include/analog/cpfsk_bc.h
@@ -0,0 +1,59 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,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_CPFSK_BC_H
+#define INCLUDED_ANALOG_CPFSK_BC_H
+
+#include <analog/api.h>
+#include <gr_sync_interpolator.h>
+
+namespace gr {
+  namespace analog {
+    
+    /*!
+     * \brief Perform continuous phase 2-level frequency shift keying modulation
+     * on an input stream of unpacked bits.
+     * \ingroup modulation_blk
+     */
+    class ANALOG_API cpfsk_bc : virtual public gr_sync_interpolator
+    {
+    public:
+      // gr::analog::cpfsk_bc::sptr
+      typedef boost::shared_ptr<cpfsk_bc> sptr;
+            
+      /*!
+       * \brief Make a CPFSK block.
+       *
+       * \param k modulation index
+       * \param ampl output amplitude
+       * \param samples_per_sym	number of output samples per input bit
+       */
+      static sptr make(float k, float ampl, int samples_per_sym);
+
+      virtual void set_amplitude(float amplitude) = 0;
+      virtual float amplitude() = 0;
+      virtual float freq() = 0;
+      virtual float phase() = 0;
+    };
+
+  } /* namespace analog */
+} /* namespace gr */
+
+#endif /* INCLUDED_ANALOG_CPFSK_BC_H */
diff --git a/gr-analog/lib/CMakeLists.txt b/gr-analog/lib/CMakeLists.txt
index 468957d98..f7281477e 100644
--- a/gr-analog/lib/CMakeLists.txt
+++ b/gr-analog/lib/CMakeLists.txt
@@ -110,6 +110,7 @@ list(APPEND analog_sources
     agc_ff_impl.cc
     agc2_cc_impl.cc
     agc2_ff_impl.cc
+    cpfsk_bc_impl.cc
     ctcss_squelch_ff_impl.cc
     feedforward_agc_cc_impl.cc
 )
diff --git a/gr-analog/lib/cpfsk_bc_impl.cc b/gr-analog/lib/cpfsk_bc_impl.cc
new file mode 100644
index 000000000..1b7f25f6c
--- /dev/null
+++ b/gr-analog/lib/cpfsk_bc_impl.cc
@@ -0,0 +1,86 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "cpfsk_bc_impl.h"
+#include <gr_io_signature.h>
+#include <gr_expj.h>
+
+namespace gr {
+  namespace analog {
+    
+#define M_TWOPI (2*M_PI)
+
+    cpfsk_bc::sptr
+    cpfsk_bc::make(float k, float ampl, int samples_per_sym)
+    {
+      return gnuradio::get_initial_sptr
+	(new cpfsk_bc_impl(k, ampl, samples_per_sym));
+    }
+
+    cpfsk_bc_impl::cpfsk_bc_impl(float k, float ampl, int samples_per_sym)
+      : gr_sync_interpolator("cpfsk_bc",
+			     gr_make_io_signature(1, 1, sizeof(char)),
+			     gr_make_io_signature(1, 1, sizeof(gr_complex)),
+			     samples_per_sym)
+    {
+      d_samples_per_sym = samples_per_sym;
+      d_freq = k*M_PI/samples_per_sym;
+      d_ampl = ampl;
+      d_phase = 0.0;
+    }
+
+    cpfsk_bc_impl::~cpfsk_bc_impl()
+    {
+    }
+
+    int
+    cpfsk_bc_impl::work(int noutput_items,
+			gr_vector_const_void_star &input_items,
+			gr_vector_void_star &output_items)
+    {
+      const char *in = (const char*)input_items[0];
+      gr_complex *out = (gr_complex*)output_items[0];
+
+      for(int i = 0; i < noutput_items/d_samples_per_sym; i++) {
+	for(int j = 0; j < d_samples_per_sym; j++) {
+	  if(in[i] == 1)
+	    d_phase += d_freq;
+	  else
+	    d_phase -= d_freq;
+
+	  while(d_phase > M_TWOPI)
+	    d_phase -= M_TWOPI;
+	  while(d_phase < -M_TWOPI)
+	    d_phase += M_TWOPI;
+
+	  *out++ = gr_expj(d_phase)*d_ampl;
+	}
+      }
+
+      return noutput_items;
+    }
+
+  } /* namespace analog */
+} /* namespace gr */
+
diff --git a/gr-analog/lib/cpfsk_bc_impl.h b/gr-analog/lib/cpfsk_bc_impl.h
new file mode 100644
index 000000000..9f6ec2c7f
--- /dev/null
+++ b/gr-analog/lib/cpfsk_bc_impl.h
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,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_CPFSK_BC_IMPL_H
+#define INCLUDED_ANALOG_CPFSK_BC_IMPL_H
+
+#include <analog/cpfsk_bc.h>
+
+namespace gr {
+  namespace analog {
+    
+    class cpfsk_bc_impl : public cpfsk_bc
+    {
+    private:
+      int   d_samples_per_sym;	// Samples per symbol, square pulse
+      float d_freq;		// Modulation index*pi/samples_per_sym
+      float d_ampl;		// Output amplitude
+      float d_phase;		// Current phase
+
+    public:
+      cpfsk_bc_impl(float k, float ampl, int samples_per_sym);
+      ~cpfsk_bc_impl();
+
+      void set_amplitude(float amplitude) { d_ampl = amplitude; }
+      float amplitude() { return d_ampl; }
+      float freq() { return d_freq; }
+      float phase() { return d_phase; }
+
+      int work(int noutput_items,
+	       gr_vector_const_void_star &input_items,
+	       gr_vector_void_star &output_items);
+    };
+
+  } /* namespace analog */
+} /* namespace gr */
+
+#endif /* INCLUDED_ANALOG_CPFSK_BC_IMPL_H */
diff --git a/gr-analog/python/qa_cpfsk.py b/gr-analog/python/qa_cpfsk.py
new file mode 100644
index 000000000..decf94ea3
--- /dev/null
+++ b/gr-analog/python/qa_cpfsk.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python
+#
+# 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.
+#
+
+from gnuradio import gr, gr_unittest
+import analog_swig as analog
+import math
+
+class test_cpfsk_bc(gr_unittest.TestCase):
+
+    def setUp(self):
+        self.tb = gr.top_block()
+
+    def tearDown(self):
+        self.tb = None
+
+    def test_cpfsk_bc_001(self):
+        # Test set/gets
+        
+        op = analog.cpfsk_bc(2, 1, 2)
+
+        op.set_amplitude(2)
+        a = op.amplitude()
+        self.assertEqual(2, a)
+
+        freq = 2*math.pi/2.0
+        f = op.freq()
+        self.assertAlmostEqual(freq, f, 5)
+
+        p = op.phase()
+        self.assertEqual(0, p)
+
+    def test_cpfsk_bc_002(self):
+        src_data = 10*[0, 1]
+        expected_result = map(lambda x: complex(2*x-1,0), src_data)
+
+        src = gr.vector_source_b(src_data)
+        op = analog.cpfsk_bc(2, 1, 2)
+        dst = gr.vector_sink_c()
+
+        self.tb.connect(src, op)
+        self.tb.connect(op, dst)
+        self.tb.run()
+
+        result_data = dst.data()[0:len(expected_result)]
+        self.assertComplexTuplesAlmostEqual(expected_result, result_data, 4)
+
+if __name__ == '__main__':
+    gr_unittest.run(test_cpfsk_bc, "test_cpfsk_bc.xml")
+
diff --git a/gr-analog/swig/analog_swig.i b/gr-analog/swig/analog_swig.i
index 96e904fd6..8cc166dd2 100644
--- a/gr-analog/swig/analog_swig.i
+++ b/gr-analog/swig/analog_swig.i
@@ -32,6 +32,7 @@
 #include "analog/agc_ff.h"
 #include "analog/agc2_cc.h"
 #include "analog/agc2_ff.h"
+#include "analog/cpfsk_bc.h"
 #include "analog/ctcss_squelch_ff.h"
 #include "analog/feedforward_agc_cc.h"
 #include "analog/squelch_base_cc.h"
@@ -43,6 +44,7 @@
 %include "analog/agc_ff.h"
 %include "analog/agc2_cc.h"
 %include "analog/agc2_ff.h"
+%include "analog/cpfsk_bc.h"
 %include "analog/ctcss_squelch_ff.h"
 %include "analog/feedforward_agc_cc.h"
 %include "analog/squelch_base_cc.h"
@@ -52,5 +54,6 @@ GR_SWIG_BLOCK_MAGIC2(analog, agc_cc);
 GR_SWIG_BLOCK_MAGIC2(analog, agc_ff);
 GR_SWIG_BLOCK_MAGIC2(analog, agc2_cc);
 GR_SWIG_BLOCK_MAGIC2(analog, agc2_ff);
+GR_SWIG_BLOCK_MAGIC2(analog, cpfsk_bc);
 GR_SWIG_BLOCK_MAGIC2(analog, ctcss_squelch_ff);
 GR_SWIG_BLOCK_MAGIC2(analog, feedforward_agc_cc);