diff options
| author | Sylvain Munaut <tnt@246tNt.com> | 2014-01-25 21:25:53 +0100 |
|---|---|---|
| committer | Sylvain Munaut <tnt@246tNt.com> | 2014-01-28 20:35:31 +0100 |
| commit | 34fecff87e1ec3d34f07b0894713faff2e392cb4 (patch) | |
| tree | 9156adc7a16a9b2da875a32facf1600cef995d19 | |
| parent | 6f3e96cf83f57a23b8d8cc109f56391ce29c6e7b (diff) | |
blocks: Add a new rotator_cc block to perform frequency shifting
It internally uses the rotator.h helper that was already present,
which in turn makes uses of VOLK rotator kernel
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
| -rw-r--r-- | gr-blocks/grc/blocks_block_tree.xml | 1 | ||||
| -rw-r--r-- | gr-blocks/grc/blocks_rotator_cc.xml | 27 | ||||
| -rw-r--r-- | gr-blocks/include/gnuradio/blocks/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-blocks/include/gnuradio/blocks/rotator_cc.h | 54 | ||||
| -rw-r--r-- | gr-blocks/lib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-blocks/lib/rotator_cc_impl.cc | 79 | ||||
| -rw-r--r-- | gr-blocks/lib/rotator_cc_impl.h | 56 | ||||
| -rw-r--r-- | gr-blocks/swig/blocks_swig5.i | 3 |
8 files changed, 222 insertions, 0 deletions
diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index e63128337d..bf0c55ff2e 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -98,6 +98,7 @@ <block>blocks_integrate_xx</block> <block>blocks_nlog10_ff</block> <block>blocks_rms_xx</block> + <block>blocks_rotator_cc</block> <block>blocks_transcendental</block> <block>blocks_argmax_xx</block> <block>blocks_max_xx</block> diff --git a/gr-blocks/grc/blocks_rotator_cc.xml b/gr-blocks/grc/blocks_rotator_cc.xml new file mode 100644 index 0000000000..aa011b80e0 --- /dev/null +++ b/gr-blocks/grc/blocks_rotator_cc.xml @@ -0,0 +1,27 @@ +<?xml version="1.0"?> +<!-- +################################################### +## Complex rotator +################################################### + --> +<block> + <name>Rotator</name> + <key>blocks_rotator_cc</key> + <import>from gnuradio import blocks</import> + <make>blocks.rotator_cc($phase_inc)</make> + <callback>set_phase_inc($phase_inc)</callback> + <param> + <name>Phase Increment</name> + <key>phase_inc</key> + <value>0.0</value> + <type>real</type> + </param> + <sink> + <name>in</name> + <type>complex</type> + </sink> + <source> + <name>out</name> + <type>complex</type> + </source> +</block> diff --git a/gr-blocks/include/gnuradio/blocks/CMakeLists.txt b/gr-blocks/include/gnuradio/blocks/CMakeLists.txt index 90a32f386b..6d39d98c54 100644 --- a/gr-blocks/include/gnuradio/blocks/CMakeLists.txt +++ b/gr-blocks/include/gnuradio/blocks/CMakeLists.txt @@ -177,6 +177,7 @@ install(FILES repeat.h rms_cf.h rms_ff.h + rotator_cc.h short_to_char.h short_to_float.h skiphead.h diff --git a/gr-blocks/include/gnuradio/blocks/rotator_cc.h b/gr-blocks/include/gnuradio/blocks/rotator_cc.h new file mode 100644 index 0000000000..0697eeb19b --- /dev/null +++ b/gr-blocks/include/gnuradio/blocks/rotator_cc.h @@ -0,0 +1,54 @@ +/* -*- c++ -*- */ +/* + * Copyright 2014 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_BLOCKS_ROTATOR_CC_H +#define INCLUDED_BLOCKS_ROTATOR_CC_H + +#include <gnuradio/blocks/api.h> +#include <gnuradio/sync_block.h> + +namespace gr { + namespace blocks { + + /*! + * \brief Complex rotator + * \ingroup math_operators_blk + */ + class BLOCKS_API rotator_cc : virtual public sync_block + { + public: + // gr::blocks::rotator_cc::sptr + typedef boost::shared_ptr<rotator_cc> sptr; + + /*! + * \brief Make an complex rotator block + * \param phase_inc rotational velocity + */ + static sptr make(double phase_inc = 0.0); + + virtual void set_phase_inc(double phase_inc) = 0; + }; + + } /* namespace blocks */ +} /* namespace gr */ + +#endif /* INCLUDED_BLOCKS_ROTATOR_CC_H */ diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index ab6c7e95be..6ca6c1744b 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -218,6 +218,7 @@ list(APPEND gr_blocks_sources repeat_impl.cc rms_cf_impl.cc rms_ff_impl.cc + rotator_cc_impl.cc short_to_char_impl.cc short_to_float_impl.cc skiphead_impl.cc diff --git a/gr-blocks/lib/rotator_cc_impl.cc b/gr-blocks/lib/rotator_cc_impl.cc new file mode 100644 index 0000000000..3760d09c2e --- /dev/null +++ b/gr-blocks/lib/rotator_cc_impl.cc @@ -0,0 +1,79 @@ +/* -*- c++ -*- */ +/* + * Copyright 2014 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 "rotator_cc_impl.h" +#include <gnuradio/io_signature.h> + +#include <cmath> + +namespace gr { + namespace blocks { + + rotator_cc::sptr + rotator_cc::make(double phase_inc) + { + return gnuradio::get_initial_sptr + (new rotator_cc_impl(phase_inc)); + } + + rotator_cc_impl::rotator_cc_impl(double phase_inc) + : sync_block("rotator_cc", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(1, 1, sizeof(gr_complex))) + { + set_phase_inc(phase_inc); + } + + rotator_cc_impl::~rotator_cc_impl() + { + } + + void + rotator_cc_impl::set_phase_inc(double phase_inc) + { + d_r.set_phase_incr( exp(gr_complex(0, phase_inc)) ); + } + + int + rotator_cc_impl::work(int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items) + { + const gr_complex *in = (const gr_complex *)input_items[0]; + gr_complex *out = (gr_complex *)output_items[0]; + +#if 0 + for (int i=0; i<noutput_items; i++) + out[i] = d_r.rotate(in[i]); +#else + d_r.rotateN(out, in, noutput_items); +#endif + + return noutput_items; + } + + } /* namespace blocks */ +} /* namespace gr */ diff --git a/gr-blocks/lib/rotator_cc_impl.h b/gr-blocks/lib/rotator_cc_impl.h new file mode 100644 index 0000000000..086b207703 --- /dev/null +++ b/gr-blocks/lib/rotator_cc_impl.h @@ -0,0 +1,56 @@ +/* -*- c++ -*- */ +/* + * Copyright 2014 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_BLOCKS_ROTATOR_CC_IMPL_H +#define INCLUDED_BLOCKS_ROTATOR_CC_IMPL_H + +#include <gnuradio/blocks/rotator_cc.h> +#include <gnuradio/blocks/rotator.h> + +namespace gr { + namespace blocks { + + /*! + * \brief Complex rotator + * \ingroup math_blk + */ + class rotator_cc_impl : public rotator_cc + { + private: + rotator d_r; + + public: + rotator_cc_impl(double phase_inc = 0.0); + ~rotator_cc_impl(); + + void set_phase_inc(double phase_inc); + + int work(int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items); + + }; + + } /* namespace blocks */ +} /* namespace gr */ + +#endif /* INCLUDED_BLOCKS_ROTATOR_CC_IMPL_H */ diff --git a/gr-blocks/swig/blocks_swig5.i b/gr-blocks/swig/blocks_swig5.i index deb3b5a045..0d68dc7819 100644 --- a/gr-blocks/swig/blocks_swig5.i +++ b/gr-blocks/swig/blocks_swig5.i @@ -37,6 +37,7 @@ #include "gnuradio/blocks/repeat.h" #include "gnuradio/blocks/rms_cf.h" #include "gnuradio/blocks/rms_ff.h" +#include "gnuradio/blocks/rotator_cc.h" #include "gnuradio/blocks/sample_and_hold_bb.h" #include "gnuradio/blocks/sample_and_hold_ss.h" #include "gnuradio/blocks/sample_and_hold_ii.h" @@ -77,6 +78,7 @@ %include "gnuradio/blocks/repeat.h" %include "gnuradio/blocks/rms_cf.h" %include "gnuradio/blocks/rms_ff.h" +%include "gnuradio/blocks/rotator_cc.h" %include "gnuradio/blocks/sample_and_hold_bb.h" %include "gnuradio/blocks/sample_and_hold_ss.h" %include "gnuradio/blocks/sample_and_hold_ii.h" @@ -116,6 +118,7 @@ GR_SWIG_BLOCK_MAGIC2(blocks, repack_bits_bb); GR_SWIG_BLOCK_MAGIC2(blocks, repeat); GR_SWIG_BLOCK_MAGIC2(blocks, rms_cf); GR_SWIG_BLOCK_MAGIC2(blocks, rms_ff); +GR_SWIG_BLOCK_MAGIC2(blocks, rotator_cc); GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_bb); GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_ss); GR_SWIG_BLOCK_MAGIC2(blocks, sample_and_hold_ii); |