diff options
| -rw-r--r-- | gnuradio-core/src/lib/general/general.i | 4 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/general/qa_gr_cpm.cc | 6 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/hier/Makefile.am | 3 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/hier/gr_cpmmod_bc.cc | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/hier/gr_cpmmod_bc.h | 18 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/hier/gr_cpmmod_bc.i | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/hier/gr_gmskmod_bc.cc | 41 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/hier/gr_gmskmod_bc.h | 65 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/hier/gr_gmskmod_bc.i | 36 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/hier/hier.i | 2 | ||||
| -rwxr-xr-x | gnuradio-core/src/python/gnuradio/gr/qa_cpm.py | 85 | ||||
| -rw-r--r-- | grc/blocks/gr_cpmmod_bc.xml | 69 | ||||
| -rw-r--r-- | grc/blocks/gr_gmskmod_bc.xml | 38 |
13 files changed, 356 insertions, 15 deletions
diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 68cafce2e..8c7f31c62 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc. + * Copyright 2004,2005,2006,2007,2008,2009,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -141,6 +141,7 @@ #include <gr_copy.h> #include <gr_fll_band_edge_cc.h> #include <gr_additive_scrambler_bb.h> +#include <gr_cpm.h> %} %include "gr_nop.i" @@ -262,3 +263,4 @@ %include "gr_copy.i" %include "gr_fll_band_edge_cc.i" %include "gr_additive_scrambler_bb.i" +%include "gr_cpm.i" diff --git a/gnuradio-core/src/lib/general/qa_gr_cpm.cc b/gnuradio-core/src/lib/general/qa_gr_cpm.cc index fe76feadd..ae391c48c 100644 --- a/gnuradio-core/src/lib/general/qa_gr_cpm.cc +++ b/gnuradio-core/src/lib/general/qa_gr_cpm.cc @@ -24,10 +24,6 @@ #include <gr_cpm.h> #include <cppunit/TestAssert.h> -#include <iostream> -using std::cout; -using std::endl; - const double DELTA = 1e-5; const int L = 5; const int samples_per_sym = 4; @@ -118,9 +114,7 @@ qa_gr_cpm::t4 () std::vector<float> taps(gr_cpm::phase_response(gr_cpm::TFM, samples_per_sym, L)); float sum = 0; - cout << "TFM" << endl; for (int i = 0; i < L * samples_per_sym; i++) { - cout << "i=" << i << " " << taps[i] << "?=" << taps_tfm[i] << endl; CPPUNIT_ASSERT_DOUBLES_EQUAL(taps[i], taps_tfm[i], DELTA); sum += taps[i]; } diff --git a/gnuradio-core/src/lib/hier/Makefile.am b/gnuradio-core/src/lib/hier/Makefile.am index a4b634139..d46fb8fd9 100644 --- a/gnuradio-core/src/lib/hier/Makefile.am +++ b/gnuradio-core/src/lib/hier/Makefile.am @@ -28,10 +28,12 @@ noinst_LTLIBRARIES = libhier.la libhier_la_SOURCES = \ gr_channel_model.cc \ + gr_gmskmod_bc.cc \ gr_cpmmod_bc.cc grinclude_HEADERS = \ gr_channel_model.h \ + gr_gmskmod_bc.h \ gr_cpmmod_bc.h @@ -39,6 +41,7 @@ if PYTHON swiginclude_HEADERS = \ hier.i \ gr_channel_model.i \ + gr_gmskmod_bc.i \ gr_cpmmod_bc.i endif diff --git a/gnuradio-core/src/lib/hier/gr_cpmmod_bc.cc b/gnuradio-core/src/lib/hier/gr_cpmmod_bc.cc index a145aaeec..d14deee34 100644 --- a/gnuradio-core/src/lib/hier/gr_cpmmod_bc.cc +++ b/gnuradio-core/src/lib/hier/gr_cpmmod_bc.cc @@ -38,7 +38,7 @@ gr_cpmmod_bc::gr_cpmmod_bc(gr_cpm::cpm_type type, float h, unsigned samples_per_ unsigned L, double beta) : gr_hier_block2("gr_cpmmod_bc", gr_make_io_signature(1, 1, sizeof(char)), - gr_make_io_signature2(1, 2, sizeof(gr_complex), sizeof(float))), + gr_make_io_signature2(1, 1, sizeof(gr_complex), sizeof(float))), d_taps(gr_cpm::phase_response(type, samples_per_sym, L, beta)), d_char_to_float(gr_make_char_to_float()), d_pulse_shaper(gr_make_interp_fir_filter_fff(samples_per_sym, d_taps)), diff --git a/gnuradio-core/src/lib/hier/gr_cpmmod_bc.h b/gnuradio-core/src/lib/hier/gr_cpmmod_bc.h index 77512d8d3..f32d0fdca 100644 --- a/gnuradio-core/src/lib/hier/gr_cpmmod_bc.h +++ b/gnuradio-core/src/lib/hier/gr_cpmmod_bc.h @@ -20,7 +20,10 @@ * Boston, MA 02110-1301, USA. */ -#include <gr_top_block.h> +#ifndef INCLUDED_GR_CPMMOD_BC_H +#define INCLUDED_GR_CPMMOD_BC_H + +#include <gr_hier_block2.h> #include <gr_char_to_float.h> #include <gr_interp_fir_filter_fff.h> #include <gr_frequency_modulator_fc.h> @@ -34,6 +37,7 @@ typedef boost::shared_ptr<gr_cpmmod_bc> gr_cpmmod_bc_sptr; gr_cpmmod_bc_sptr gr_make_cpmmod_bc(int type, float h, unsigned samples_per_sym, unsigned L, double beta=0.3); + /*! * \brief Generic CPM modulator * @@ -48,7 +52,7 @@ gr_make_cpmmod_bc(int type, float h, unsigned samples_per_sym, unsigned L, doubl * Keying variants. * * \p samples_per_sym: Samples per symbol. * * \p L: The length of the phase duration in symbols. For L=1, this yields full- - * response CPM symbols, for L > 1, it yields partial-response. + * response CPM symbols, for L > 1, partial-response. * * \p beta: For LSRC, this is the rolloff factor. For Gaussian pulses, this is the 3 dB * time-bandwidth product. * @@ -57,25 +61,27 @@ gr_make_cpmmod_bc(int type, float h, unsigned samples_per_sym, unsigned L, doubl * * Setting h = 0.5, type = GAUSSIAN and beta = 0.3 yields GMSK as used in GSM. * * The input of this block are symbols from an M-ary alphabet - * \pm1, \pm3, ..., \pm(M-1). Usually, M = 2 and therefore, the - * valid inputs are \pm1. + * +/-1, +/-3, ..., +/-(M-1). Usually, M = 2 and therefore, the + * valid inputs are +/-1. * The modulator will silently accept any other inputs, though. * The output is the phase-modulated signal. */ class gr_cpmmod_bc : public gr_hier_block2 { friend gr_cpmmod_bc_sptr gr_make_cpmmod_bc(int type, float h, unsigned samples_per_sym, unsigned L, double beta); - gr_cpmmod_bc(gr_cpm::cpm_type type, float h, unsigned samples_per_sym, unsigned L, double beta); std::vector<float> d_taps; - gr_char_to_float_sptr d_char_to_float; gr_interp_fir_filter_fff_sptr d_pulse_shaper; gr_frequency_modulator_fc_sptr d_fm; + protected: + gr_cpmmod_bc(gr_cpm::cpm_type type, float h, unsigned samples_per_sym, unsigned L, double beta); public: //! Return the phase response FIR taps std::vector<float> get_taps() { return d_taps; }; }; +#endif /* INCLUDED_GR_CPMMOD_BC_H */ + diff --git a/gnuradio-core/src/lib/hier/gr_cpmmod_bc.i b/gnuradio-core/src/lib/hier/gr_cpmmod_bc.i index a474aa4d9..55116cda7 100644 --- a/gnuradio-core/src/lib/hier/gr_cpmmod_bc.i +++ b/gnuradio-core/src/lib/hier/gr_cpmmod_bc.i @@ -23,7 +23,7 @@ GR_SWIG_BLOCK_MAGIC(gr, cpmmod_bc) gr_cpmmod_bc_sptr -gr_make_cpmmod_bc(int type, float h, unsigned samples_per_sym, unsigned L, double beta); +gr_make_cpmmod_bc(int type, float h, unsigned samples_per_sym, unsigned L, double beta=0.3); class gr_cpmmod_bc : public gr_hier_block2 { diff --git a/gnuradio-core/src/lib/hier/gr_gmskmod_bc.cc b/gnuradio-core/src/lib/hier/gr_gmskmod_bc.cc new file mode 100644 index 000000000..9324edc96 --- /dev/null +++ b/gnuradio-core/src/lib/hier/gr_gmskmod_bc.cc @@ -0,0 +1,41 @@ +/* -*- c++ -*- */ +/* + * Copyright 2010 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 <gr_gmskmod_bc.h> +#include <gr_io_signature.h> + + +// Shared pointer constructor +gr_gmskmod_bc_sptr +gr_make_gmskmod_bc(unsigned samples_per_sym, unsigned L, double bt) +{ + return gnuradio::get_initial_sptr(new gr_gmskmod_bc(samples_per_sym, L, bt)); +} + + +gr_gmskmod_bc::gr_gmskmod_bc(unsigned samples_per_sym, unsigned L, double bt) + : gr_cpmmod_bc(gr_cpm::GAUSSIAN, 0.5, samples_per_sym, L, bt) +{ +} + diff --git a/gnuradio-core/src/lib/hier/gr_gmskmod_bc.h b/gnuradio-core/src/lib/hier/gr_gmskmod_bc.h new file mode 100644 index 000000000..bfe0513e1 --- /dev/null +++ b/gnuradio-core/src/lib/hier/gr_gmskmod_bc.h @@ -0,0 +1,65 @@ +/* -*- c++ -*- */ +/* + * Copyright 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. + */ + +#ifndef INCLUDED_GR_GMSKMOD_BC_H +#define INCLUDED_GR_GMSKMOD_BC_H + +#include <gr_cpmmod_bc.h> + +class gr_gmskmod_bc; +typedef boost::shared_ptr<gr_gmskmod_bc> gr_gmskmod_bc_sptr; + + +gr_gmskmod_bc_sptr +gr_make_gmskmod_bc(unsigned samples_per_sym=2, unsigned L=4, double bt=0.3); + + +/*! + * \brief GMSK modulator + * + * \ingroup modulation_blk + * + * Parameters: + * * \p samples_per_sym: Samples per symbol. + * * \p L: The length of the phase duration in symbols. The Gaussian pulse is truncated + * after L symbols. + * * \p bt: For LSRC, this is the rolloff factor. For Gaussian pulses, this is the 3 dB + * time-bandwidth product. + * + * Examples: + * * Setting h = 0.5, L = 1, type = LREC yields MSK. + * * Setting h = 0.5, type = GAUSSIAN and beta = 0.3 yields GMSK as used in GSM. + * + * The input of this block are symbols from an M-ary alphabet + * +/-1, +/-3, ..., +/-(M-1). Usually, M = 2 and therefore, the + * valid inputs are +/-1. + * The modulator will silently accept any other inputs, though. + * The output is the phase-modulated signal. + */ +class gr_gmskmod_bc : public gr_cpmmod_bc +{ + friend gr_gmskmod_bc_sptr gr_make_gmskmod_bc(unsigned samples_per_sym, unsigned L, double bt); + gr_gmskmod_bc(unsigned samples_per_sym, unsigned L, double bt); +}; + +#endif /* INCLUDED_GR_GMSKMOD_BC_H */ + diff --git a/gnuradio-core/src/lib/hier/gr_gmskmod_bc.i b/gnuradio-core/src/lib/hier/gr_gmskmod_bc.i new file mode 100644 index 000000000..7fb16839b --- /dev/null +++ b/gnuradio-core/src/lib/hier/gr_gmskmod_bc.i @@ -0,0 +1,36 @@ +/* -*- c++ -*- */ +/* + * Copyright 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. + */ + +GR_SWIG_BLOCK_MAGIC(gr, gmskmod_bc) + +gr_gmskmod_bc_sptr +gr_make_gmskmod_bc(unsigned samples_per_sym=2, unsigned L=4, double bt=0.3); + +class gr_gmskmod_bc : public gr_hier_block2 +{ + private: + gr_cpmmod_bc(int type, float h, unsigned samples_per_sym, unsigned L, double beta); + + public: + std::vector<float> get_taps(); +}; + diff --git a/gnuradio-core/src/lib/hier/hier.i b/gnuradio-core/src/lib/hier/hier.i index 6ac2903fa..b8915e15b 100644 --- a/gnuradio-core/src/lib/hier/hier.i +++ b/gnuradio-core/src/lib/hier/hier.i @@ -27,8 +27,10 @@ #include <gr_channel_model.h> #include <gr_cpmmod_bc.h> +#include <gr_gmskmod_bc.h> %} %include "gr_channel_model.i" %include "gr_cpmmod_bc.i" +%include "gr_gmskmod_bc.i" diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_cpm.py b/gnuradio-core/src/python/gnuradio/gr/qa_cpm.py new file mode 100755 index 000000000..9cc22c257 --- /dev/null +++ b/gnuradio-core/src/python/gnuradio/gr/qa_cpm.py @@ -0,0 +1,85 @@ +#!/usr/bin/env python +# +# Copyright 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. +# + +from gnuradio import gr, gr_unittest +import numpy + +class test_cpm(gr_unittest.TestCase): + + def setUp (self): + self.tb = gr.top_block () + + def tearDown (self): + self.tb = None + + def do_check_phase_shift(self, type, name): + sps = 2 + L = 5 + in_bits = (1,) * 20 + src = gr.vector_source_b(in_bits, False) + cpm = gr.cpmmod_bc(type, 0.5, sps, L) + arg = gr.complex_to_arg() + sink = gr.vector_sink_f() + + self.tb.connect(src, cpm, arg, sink) + self.tb.run() + + symbol_phases = numpy.array(sink.data()[sps*L-1::sps]) + phase_diff = numpy.mod(numpy.subtract(symbol_phases[1:], symbol_phases[:-1]), + (2*numpy.pi,) * (len(symbol_phases)-1)) + self.assertFloatTuplesAlmostEqual(tuple(phase_diff), (0.5 * numpy.pi,) * len(phase_diff), 5, + msg="Phase shift was not correct for CPM method " + name) + + def test_001_lrec(self): + self.do_check_phase_shift(gr.cpm.LRC, 'LREC') + + def test_001_lrc(self): + self.do_check_phase_shift(gr.cpm.LRC, 'LRC') + + def test_001_lsrc(self): + self.do_check_phase_shift(gr.cpm.LSRC, 'LSRC') + + def test_001_ltfm(self): + self.do_check_phase_shift(gr.cpm.TFM, 'TFM') + + def test_001_lgmsk(self): + sps = 2 + L = 5 + in_bits = (1,) * 20 + src = gr.vector_source_b(in_bits, False) + gmsk = gr.gmskmod_bc(sps, L) + arg = gr.complex_to_arg() + sink = gr.vector_sink_f() + + self.tb.connect(src, gmsk, arg, sink) + self.tb.run() + + symbol_phases = numpy.array(sink.data()[sps*L-1::sps]) + phase_diff = numpy.mod(numpy.subtract(symbol_phases[1:], symbol_phases[:-1]), + (2*numpy.pi,) * (len(symbol_phases)-1)) + self.assertFloatTuplesAlmostEqual(tuple(phase_diff), (0.5 * numpy.pi,) * len(phase_diff), 5, + msg="Phase shift was not correct for GMSK") + + +if __name__ == '__main__': + gr_unittest.run(test_cpm, "test_cpm.xml") + diff --git a/grc/blocks/gr_cpmmod_bc.xml b/grc/blocks/gr_cpmmod_bc.xml new file mode 100644 index 000000000..7ebb7e179 --- /dev/null +++ b/grc/blocks/gr_cpmmod_bc.xml @@ -0,0 +1,69 @@ +<?xml version="1.0"?> +<!-- +################################################### +## Continuous Phase Modulation +################################################### + --> +<block> + <name>Continuous Phase Modulation</name> + <key>gr_cpmmod_bc</key> + <import>from gnuradio import gr</import> + <make>gr.cpmmod_bc($type, $mod_index, $samples_per_symbol, $L, $beta)</make> + <param> + <name>CPM Type</name> + <key>type</key> + <type>enum</type> + <option> + <name>L-REC (Rectangular phase response)</name> + <key>gr.cpm.LREC</key> + </option> + <option> + <name>L-RC (Raised Cosine)</name> + <key>gr.cpm.LRC</key> + </option> + <option> + <name>L-SRC (Spectral raised cosine)</name> + <key>gr.cpm.LSRC</key> + </option> + <option> + <name>TFM (Tamed frequency modulation)</name> + <key>gr.cpm.TFM</key> + </option> + <option> + <name>Gaussian</name> + <key>gr.cpm.GAUSSIAN</key> + </option> + </param> + <param> + <name>Modulation Index</name> + <key>mod_index</key> + <type>real</type> + <value>0.5</value> + </param> + <param> + <name>Samples/Symbol</name> + <key>samples_per_symbol</key> + <value>4</value> + <type>int</type> + </param> + <param> + <name>Pulse Duration (Symbols)</name> + <key>L</key> + <value>5</value> + <type>int</type> + </param> + <param> + <name>Phase Response Parameter (BT or Beta)</name> + <key>beta</key> + <type>real</type> + <value>0.3</value> + </param> + <sink> + <name>in</name> + <type>byte</type> + </sink> + <source> + <name>out</name> + <type>complex</type> + </source> +</block> diff --git a/grc/blocks/gr_gmskmod_bc.xml b/grc/blocks/gr_gmskmod_bc.xml new file mode 100644 index 000000000..00195a12f --- /dev/null +++ b/grc/blocks/gr_gmskmod_bc.xml @@ -0,0 +1,38 @@ +<?xml version="1.0"?> +<!-- +################################################### +## GMSK +################################################### + --> +<block> + <name>GMSK</name> + <key>gr_gmskmod_bc</key> + <import>from gnuradio import gr</import> + <make>gr.gmskmod_bc($samples_per_symbol, $L, $bt)</make> + <param> + <name>Samples/Symbol</name> + <key>samples_per_symbol</key> + <value>4</value> + <type>int</type> + </param> + <param> + <name>Pulse Duration (Symbols)</name> + <key>L</key> + <value>5</value> + <type>int</type> + </param> + <param> + <name>3 dB Time-Bandwith Product</name> + <key>bt</key> + <type>real</type> + <value>0.3</value> + </param> + <sink> + <name>in</name> + <type>byte</type> + </sink> + <source> + <name>out</name> + <type>complex</type> + </source> +</block> |