diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-05-23 11:21:31 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-05-23 11:21:31 -0400 |
| commit | dc578ff0900cf0bfc4ebcc8585f85672b63735cd (patch) | |
| tree | d404fe9a5f9ba417cac9349933da893020100270 /gr-analog/lib | |
| parent | 54b2f154d508f1e9f9d321609ddb8ccc764f0ae6 (diff) | |
| parent | 51b5ef97705781ca2f8a50547a2664936e6ecb40 (diff) | |
Merge remote-tracking branch 'osh/next' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
gnuradio-runtime/lib/gr_block_detail.cc
gnuradio-runtime/lib/gr_realtime.cc
gr-analog/swig/analog_swig.i
Diffstat (limited to 'gr-analog/lib')
| -rw-r--r-- | gr-analog/lib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-analog/lib/agc3_cc_impl.cc | 94 | ||||
| -rw-r--r-- | gr-analog/lib/agc3_cc_impl.h | 63 |
3 files changed, 158 insertions, 0 deletions
diff --git a/gr-analog/lib/CMakeLists.txt b/gr-analog/lib/CMakeLists.txt index ce10422487..473003a3bf 100644 --- a/gr-analog/lib/CMakeLists.txt +++ b/gr-analog/lib/CMakeLists.txt @@ -120,6 +120,7 @@ list(APPEND analog_sources agc_ff_impl.cc agc2_cc_impl.cc agc2_ff_impl.cc + agc3_cc_impl.cc cpfsk_bc_impl.cc ctcss_squelch_ff_impl.cc dpll_bb_impl.cc diff --git a/gr-analog/lib/agc3_cc_impl.cc b/gr-analog/lib/agc3_cc_impl.cc new file mode 100644 index 0000000000..26dd91e518 --- /dev/null +++ b/gr-analog/lib/agc3_cc_impl.cc @@ -0,0 +1,94 @@ +/* -*- c++ -*- */ +/* + * Copyright 2006,2010,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. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "agc3_cc_impl.h" +#include <gr_io_signature.h> +#include <volk/volk.h> + +namespace gr { + namespace analog { + + agc3_cc::sptr + agc3_cc::make(float attack_rate, float decay_rate, float reference) + { + return gnuradio::get_initial_sptr (new agc3_cc_impl(attack_rate, decay_rate, reference)); + } + + agc3_cc_impl::agc3_cc_impl(float attack_rate, float decay_rate, float reference) + : gr_sync_block("agc3_cc", + gr_make_io_signature(1, 1, sizeof(gr_complex)), + gr_make_io_signature(1, 1, sizeof(gr_complex))), + d_attack(attack_rate), d_decay(decay_rate), + d_reference(reference), d_gain(1.0), + d_reset(true) + { + set_alignment(volk_get_alignment()); + } + + agc3_cc_impl::~agc3_cc_impl() + { + } + + int + agc3_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]; + // Compute magnitude of each sample +#ifdef __GNUC__ + float mags[noutput_items] __attribute__ ((aligned (16))); +#else + float mags[noutput_items]; +#endif + volk_32fc_magnitude_32f(mags, &in[0], noutput_items); + // Compute a linear average on reset (no expected) + if(__builtin_expect (d_reset, false)){ + float mag; + for(int i=0; i<noutput_items; i++){ + mag += mags[i]; + } + d_gain = d_reference * (noutput_items/mag); + // scale output values + for(int i=0; i<noutput_items; i++){ + out[i] = in[i] * d_gain; + } + d_reset = false; + } else { + // Otherwise perform a normal iir update + for(int i=0; i<noutput_items; i++){ + float newlevel = mags[i]; // abs(in[i]); + float rate = (newlevel > d_reference/d_gain)?d_attack:d_decay; + d_gain = (d_gain*(1-rate)) + (d_reference/newlevel)*rate; + out[i] = in[i] * d_gain; + } + } + return noutput_items; + } + + } /* namespace analog */ +} /* namespace gr */ diff --git a/gr-analog/lib/agc3_cc_impl.h b/gr-analog/lib/agc3_cc_impl.h new file mode 100644 index 0000000000..0913243fd6 --- /dev/null +++ b/gr-analog/lib/agc3_cc_impl.h @@ -0,0 +1,63 @@ +/* -*- c++ -*- */ +/* + * Copyright 2006,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_AGC3_IMPL_CC_H +#define INCLUDED_ANALOG_AGC3_IMPL_CC_H + +#include <analog/agc3_cc.h> + +namespace gr { + namespace analog { + + class agc3_cc_impl : public agc3_cc + { + public: + agc3_cc_impl(float attack_rate = 1e-1, float decay_rate = 1e-2, + float reference = 1.0); + ~agc3_cc_impl(); + + float attack_rate() const { return d_attack; } + float decay_rate() const { return d_decay; } + float reference() const { return d_reference; } + float gain() const { return d_gain; } + + void set_attack_rate(float rate) { d_attack = rate; } + void set_decay_rate(float rate) { d_decay = rate; } + void set_reference(float reference) { d_reference = reference; } + void set_gain(float gain) { d_gain = gain; } + + int work(int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items); + + private: + float d_attack; + float d_decay; + float d_reference; + float d_gain; + bool d_reset; + }; + + } /* namespace analog */ +} /* namespace gr */ + +#endif /* INCLUDED_ANALOG_AGC3_CC_IMPL_H */ |