[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r3594 - in gnuradio/branches/developers/trondeau/digit
|
From: |
trondeau |
|
Subject: |
[Commit-gnuradio] r3594 - in gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src: lib/general python/gnuradio/blksimpl python/gnuradio/gr |
|
Date: |
Wed, 20 Sep 2006 22:44:48 -0600 (MDT) |
Author: trondeau
Date: 2006-09-20 22:44:48 -0600 (Wed, 20 Sep 2006)
New Revision: 3594
Added:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_cc.cc
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_cc.h
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_cc.i
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_ff.cc
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_ff.h
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_ff.i
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_cc.h
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_cc.i
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_ff.h
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_ff.i
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_ff.h
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_ff.i
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/gr/qa_agc.py
Removed:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc.h
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc.i
Modified:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/Makefile.am
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/general.i
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.cc
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.h
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.i
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_ff.cc
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_ff.h
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_ff.i
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.h
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.i
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py
Log:
new agc codes; agc with attack and decay rates for both complex and floating
point; qa code to test four agcs (probably need tweaking)
Modified:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/Makefile.am
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/Makefile.am
2006-09-21 01:03:42 UTC (rev 3593)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/Makefile.am
2006-09-21 04:44:48 UTC (rev 3594)
@@ -93,8 +93,10 @@
libgeneral_la_SOURCES = \
$(GENERATED_CC) \
+ gr_agc_ff.cc \
gr_agc_cc.cc \
- gr_agc_ff.cc \
+ gr_agc2_ff.cc \
+ gr_agc2_cc.cc \
gr_align_on_samplenumbers_ss.cc \
gr_binary_slicer_fb.cc \
gr_bytes_to_syms.cc \
@@ -213,6 +215,8 @@
$(GENERATED_H) \
gr_agc_cc.h \
gr_agc_ff.h \
+ gr_agc2_cc.h \
+ gr_agc2_ff.h \
gr_align_on_samplenumbers_ss.h \
gr_binary_slicer_fb.h \
gr_bytes_to_syms.h \
@@ -315,8 +319,10 @@
gr_vector_to_stream.h \
gr_vector_to_streams.h \
gri_add_const_ss.h \
- gri_agc.h \
+ gri_agc_ff.h \
gri_agc_cc.h \
+ gri_agc2_ff.h \
+ gri_agc2_cc.h \
gri_char_to_float.h \
gri_debugger_hook.h \
gri_fft.h \
@@ -346,8 +352,10 @@
$(GENERATED_I) \
general.i \
general_generated.i \
+ gr_agc_ff.i \
gr_agc_cc.i \
- gr_agc_ff.i \
+ gr_agc2_ff.i \
+ gr_agc2_cc.i \
gr_align_on_samplenumbers_ss.i \
gr_binary_slicer_fb.i \
gr_bytes_to_syms.i \
@@ -432,8 +440,10 @@
gr_vco_f.i \
gr_vector_to_stream.i \
gr_vector_to_streams.i \
- gri_agc.i \
+ gri_agc_ff.i \
gri_agc_cc.i \
+ gri_agc2_ff.i \
+ gri_agc2_cc.i \
gr_unpack_k_bits_bb.i
Modified:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/general.i
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/general.i
2006-09-21 01:03:42 UTC (rev 3593)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/general.i
2006-09-21 04:44:48 UTC (rev 3594)
@@ -64,6 +64,8 @@
#include <gr_simple_squelch_cc.h>
#include <gr_agc_ff.h>
#include <gr_agc_cc.h>
+#include <gr_agc2_ff.h>
+#include <gr_agc2_cc.h>
#include <gr_rms_cf.h>
#include <gr_rms_ff.h>
#include <gr_nlog10_ff.h>
@@ -154,6 +156,8 @@
%include "gr_simple_squelch_cc.i"
%include "gr_agc_ff.i"
%include "gr_agc_cc.i"
+%include "gr_agc2_ff.i"
+%include "gr_agc2_cc.i"
%include "gr_rms_cf.i"
%include "gr_rms_ff.i"
%include "gr_nlog10_ff.i"
Copied:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_cc.cc
(from rev 3592,
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.cc)
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_cc.cc
(rev 0)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_cc.cc
2006-09-21 04:44:48 UTC (rev 3594)
@@ -0,0 +1,56 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006 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 2, 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_agc2_cc.h>
+#include <gr_io_signature.h>
+#include <gri_agc2_cc.h>
+
+gr_agc2_cc_sptr
+gr_make_agc2_cc (float decay_rate, float attack_rate, float reference,
+ float gain, float max_gain)
+{
+ return gr_agc2_cc_sptr (new gr_agc2_cc (decay_rate, attack_rate, reference,
gain, max_gain));
+}
+
+gr_agc2_cc::gr_agc2_cc (float decay_rate, float attack_rate, float reference,
+ float gain, float max_gain)
+ : gr_sync_block ("gr_agc2_cc",
+ gr_make_io_signature (1, 1, sizeof (gr_complex)),
+ gr_make_io_signature (1, 1, sizeof (gr_complex))),
+ gri_agc2_cc (decay_rate, attack_rate, reference, gain, max_gain)
+{
+}
+
+int
+gr_agc2_cc::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];
+ scaleN (out, in, noutput_items);
+ return noutput_items;
+}
Copied:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_cc.h
(from rev 3592,
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.h)
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_cc.h
(rev 0)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_cc.h
2006-09-21 04:44:48 UTC (rev 3594)
@@ -0,0 +1,54 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006 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 2, 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_AGC2_CC_H
+#define INCLUDED_GR_AGC2_CC_H
+
+#include <gr_sync_block.h>
+#include <gri_agc2_cc.h>
+
+class gr_agc2_cc;
+typedef boost::shared_ptr<gr_agc2_cc> gr_agc2_cc_sptr;
+
+gr_agc2_cc_sptr
+gr_make_agc2_cc (float decay_rate = 1e-1, float attack_rate = 1e-2, float
reference = 1.0,
+ float gain = 1.0, float max_gain = 1000.0);
+/*!
+ * \brief high performance Automatic Gain Control class
+ *
+ * For Power the absolute value of the complex number is used.
+ */
+
+class gr_agc2_cc : public gr_sync_block, public gri_agc2_cc
+{
+ friend gr_agc2_cc_sptr gr_make_agc2_cc (float decay_rate, float attack_rate,
float reference,
+ float gain, float max_gain);
+ gr_agc2_cc (float decay_rate, float attack_rate, float reference,
+ float gain, float max_gain);
+
+ public:
+ virtual int work (int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+};
+
+#endif /* INCLUDED_GR_AGC2_CC_H */
Copied:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_cc.i
(from rev 3592,
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.i)
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_cc.i
(rev 0)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_cc.i
2006-09-21 04:44:48 UTC (rev 3594)
@@ -0,0 +1,35 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006 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 2, 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,agc2_cc)
+
+%include <gri_agc2_cc.i>
+
+gr_agc2_cc_sptr
+gr_make_agc2_cc (float decay_rate = 1e-1, float attack_rate = 1e-2, float
reference = 1.0,
+ float gain = 1.0, float max_gain = 1000.0);
+
+class gr_agc2_cc : public gr_sync_block , public gri_agc2_cc
+{
+ gr_agc2_cc (float decay_rate, float attack_rate, float reference,
+ float gain, float max_gain);
+};
Copied:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_ff.cc
(from rev 3576,
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_ff.cc)
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_ff.cc
(rev 0)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_ff.cc
2006-09-21 04:44:48 UTC (rev 3594)
@@ -0,0 +1,57 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2006 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 2, 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_agc2_ff.h>
+#include <gr_io_signature.h>
+#include <gri_agc2_ff.h>
+
+gr_agc2_ff_sptr
+gr_make_agc2_ff (float decay_rate, float attack_rate, float reference,
+ float gain, float max_gain)
+{
+ return gr_agc2_ff_sptr (new gr_agc2_ff (decay_rate, attack_rate, reference,
+ gain, max_gain));
+}
+
+gr_agc2_ff::gr_agc2_ff (float decay_rate, float attack_rate, float reference,
+ float gain, float max_gain)
+ : gr_sync_block ("gr_agc2_ff",
+ gr_make_io_signature (1, 1, sizeof (float)),
+ gr_make_io_signature (1, 1, sizeof (float)))
+ , gri_agc2_ff (decay_rate, attack_rate, reference, gain, max_gain)
+{
+}
+
+int
+gr_agc2_ff::work (int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+{
+ const float *in = (const float *) input_items[0];
+ float *out = (float *) output_items[0];
+ scaleN (out, in, noutput_items);
+ return noutput_items;
+}
Copied:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_ff.h
(from rev 3576,
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_ff.h)
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_ff.h
(rev 0)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_ff.h
2006-09-21 04:44:48 UTC (rev 3594)
@@ -0,0 +1,52 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2006 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 2, 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_AGC2_FF_H
+#define INCLUDED_GR_AGC2_FF_H
+
+#include <gr_sync_block.h>
+#include <gri_agc2_ff.h>
+class gr_agc2_ff;
+typedef boost::shared_ptr<gr_agc2_ff> gr_agc2_ff_sptr;
+
+gr_agc2_ff_sptr
+gr_make_agc2_ff (float decay_rate = 1e-1, float attack_rate = 1e-2, float
reference = 1.0,
+ float gain = 1.0, float max_gain = 0.0);
+/*!
+ * \brief high performance Automatic Gain Control class
+ *
+ * Power is approximated by absolute value
+ */
+
+class gr_agc2_ff : public gr_sync_block, public gri_agc2_ff
+{
+ friend gr_agc2_ff_sptr gr_make_agc2_ff (float decay_rate, float attack_rate,
+ float reference, float gain, float
max_gain);
+ gr_agc2_ff (float decay_rate, float attack_rage, float reference, float
gain, float max_gain);
+
+ public:
+ virtual int work (int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+};
+
+#endif /* INCLUDED_GR_FLOAT_AGC2_FF_H */
Copied:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_ff.i
(from rev 3576,
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_ff.i)
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_ff.i
(rev 0)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_ff.i
2006-09-21 04:44:48 UTC (rev 3594)
@@ -0,0 +1,34 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2006 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 2, 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,agc2_ff)
+
+%include <gri_agc2_ff.i>
+
+gr_agc2_ff_sptr
+gr_make_agc2_ff (float decay_rate = 1e-1, float attack_rate = 1e-2, float
reference = 1.0,
+ float gain = 1.0, float max_gain = 0.0);
+
+class gr_agc2_ff : public gr_sync_block , public gri_agc2_ff
+{
+ gr_agc2_ff (float decay_rate, float attack_rate, float reference, float
gain, float max_gain);
+};
Modified:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.cc
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.cc
2006-09-21 01:03:42 UTC (rev 3593)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.cc
2006-09-21 04:44:48 UTC (rev 3594)
@@ -29,18 +29,18 @@
#include <gri_agc_cc.h>
gr_agc_cc_sptr
-gr_make_agc_cc (float rate1, float rate2, float reference,
+gr_make_agc_cc (float rate, float reference,
float gain, float max_gain)
{
- return gr_agc_cc_sptr (new gr_agc_cc (rate1, rate2, reference, gain,
max_gain));
+ return gr_agc_cc_sptr (new gr_agc_cc (rate, reference, gain, max_gain));
}
-gr_agc_cc::gr_agc_cc (float rate1, float rate2, float reference,
+gr_agc_cc::gr_agc_cc (float rate, float reference,
float gain, float max_gain)
: gr_sync_block ("gr_agc_cc",
gr_make_io_signature (1, 1, sizeof (gr_complex)),
gr_make_io_signature (1, 1, sizeof (gr_complex))),
- gri_agc_cc (rate1, rate2, reference, gain, max_gain)
+ gri_agc_cc (rate, reference, gain, max_gain)
{
}
Modified:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.h
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.h
2006-09-21 01:03:42 UTC (rev 3593)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.h
2006-09-21 04:44:48 UTC (rev 3594)
@@ -29,7 +29,7 @@
typedef boost::shared_ptr<gr_agc_cc> gr_agc_cc_sptr;
gr_agc_cc_sptr
-gr_make_agc_cc (float rate1 = 1e-1, float rate2 = 1e-2, float reference = 1.0,
+gr_make_agc_cc (float rate = 1e-4, float reference = 1.0,
float gain = 1.0, float max_gain = 1000.0);
/*!
* \brief high performance Automatic Gain Control class
@@ -39,9 +39,9 @@
class gr_agc_cc : public gr_sync_block, public gri_agc_cc
{
- friend gr_agc_cc_sptr gr_make_agc_cc (float rate1, float rate2, float
reference,
+ friend gr_agc_cc_sptr gr_make_agc_cc (float rate, float reference,
float gain, float max_gain);
- gr_agc_cc (float rate1, float rate2, float reference,
+ gr_agc_cc (float rate, float reference,
float gain, float max_gain);
public:
Modified:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.i
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.i
2006-09-21 01:03:42 UTC (rev 3593)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.i
2006-09-21 04:44:48 UTC (rev 3594)
@@ -25,11 +25,11 @@
%include <gri_agc_cc.i>
gr_agc_cc_sptr
-gr_make_agc_cc (float rate1 = 1e-1, float rate2 = 1e-2, float reference = 1.0,
+gr_make_agc_cc (float rate = 1e-4, float reference = 1.0,
float gain = 1.0, float max_gain = 1000.0);
class gr_agc_cc : public gr_sync_block , public gri_agc_cc
{
- gr_agc_cc (float rate1, float rate2, float reference,
+ gr_agc_cc (float rate, float reference,
float gain, float max_gain);
};
Modified:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_ff.cc
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_ff.cc
2006-09-21 01:03:42 UTC (rev 3593)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_ff.cc
2006-09-21 04:44:48 UTC (rev 3594)
@@ -26,7 +26,7 @@
#include <gr_agc_ff.h>
#include <gr_io_signature.h>
-#include <gri_agc.h>
+#include <gri_agc_ff.h>
gr_agc_ff_sptr
gr_make_agc_ff (float rate, float reference, float gain, float max_gain)
@@ -38,7 +38,7 @@
: gr_sync_block ("gr_agc_ff",
gr_make_io_signature (1, 1, sizeof (float)),
gr_make_io_signature (1, 1, sizeof (float)))
- , gri_agc (rate, reference, gain, max_gain)
+ , gri_agc_ff (rate, reference, gain, max_gain)
{
}
Modified:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_ff.h
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_ff.h
2006-09-21 01:03:42 UTC (rev 3593)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_ff.h
2006-09-21 04:44:48 UTC (rev 3594)
@@ -24,21 +24,24 @@
#define INCLUDED_GR_AGC_FF_H
#include <gr_sync_block.h>
-#include <gri_agc.h>
+#include <gri_agc_ff.h>
class gr_agc_ff;
typedef boost::shared_ptr<gr_agc_ff> gr_agc_ff_sptr;
gr_agc_ff_sptr
-gr_make_agc_ff (float rate = 1e-4, float reference = 1.0, float gain = 1.0,
float max_gain = 0.0);
+gr_make_agc_ff (float rate = 1e-4, float reference = 1.0,
+ float gain = 1.0, float max_gain = 0.0);
+
/*!
* \brief high performance Automatic Gain Control class
*
* Power is approximated by absolute value
*/
-class gr_agc_ff : public gr_sync_block, public gri_agc
+class gr_agc_ff : public gr_sync_block, public gri_agc_ff
{
- friend gr_agc_ff_sptr gr_make_agc_ff (float rate, float reference, float
gain, float max_gain);
+ friend gr_agc_ff_sptr gr_make_agc_ff (float rate, float reference,
+ float gain, float max_gain);
gr_agc_ff (float rate, float reference, float gain, float max_gain);
public:
Modified:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_ff.i
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_ff.i
2006-09-21 01:03:42 UTC (rev 3593)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_ff.i
2006-09-21 04:44:48 UTC (rev 3594)
@@ -22,12 +22,13 @@
GR_SWIG_BLOCK_MAGIC(gr,agc_ff)
-%include <gri_agc.i>
+%include <gri_agc_ff.i>
gr_agc_ff_sptr
-gr_make_agc_ff (float rate = 1e-4, float reference = 1.0, float gain = 1.0,
float max_gain = 0.0);
+gr_make_agc_ff (float rate = 1e-4, float reference = 1.0,
+ float gain = 1.0, float max_gain = 0.0);
-class gr_agc_ff : public gr_sync_block , public gri_agc
+class gr_agc_ff : public gr_sync_block , public gri_agc_ff
{
gr_agc_ff (float rate, float reference, float gain, float max_gain);
};
Deleted:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc.h
Deleted:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc.i
Copied:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_cc.h
(from rev 3592,
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.h)
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_cc.h
(rev 0)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_cc.h
2006-09-21 04:44:48 UTC (rev 3594)
@@ -0,0 +1,91 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006 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 2, 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 _GRI_AGC2_CC_H_
+#define _GRI_AGC2_CC_H_
+
+#include <math.h>
+
+/*!
+ * \brief high performance Automatic Gain Control class
+ *
+ * For Power the absolute value of the complex number is used.
+ */
+
+class gri_agc2_cc {
+
+ public:
+ gri_agc2_cc (float decay_rate = 1e-1, float attack_rate = 1e-2, float
reference = 1.0,
+ float gain = 1.0, float max_gain = 1000.0)
+ : _decay_rate(decay_rate), _attack_rate(attack_rate),
_reference(reference),
+ _gain(gain), _max_gain(max_gain) {};
+
+ float decay_rate () const { return _decay_rate; }
+ float attack_rate () const { return _attack_rate; }
+ float reference () const { return _reference; }
+ float gain () const { return _gain; }
+ float max_gain() const { return _max_gain; }
+
+ void set_decay_rate (float rate) { _decay_rate = rate; }
+ void set_attack_rate (float rate) { _attack_rate = rate; }
+ void set_reference (float reference) { _reference = reference; }
+ void set_gain (float gain) { _gain = gain; }
+ void set_max_gain(float max_gain) { _max_gain = max_gain; }
+
+ gr_complex scale (gr_complex input){
+ gr_complex output = input * _gain;
+
+ float tmp = -_reference + sqrt(output.real()*output.real() +
+ output.imag()*output.imag());
+ float rate = _decay_rate;
+ if((tmp) > _gain)
+ rate = _attack_rate;
+ _gain -= tmp*rate;
+
+#if 0
+ fprintf(stdout, "rate = %f\ttmp = %f\t gain = %f\n", rate, tmp, _gain);
+#endif
+
+ // Not sure about this; will blow up if _gain < 0 (happens when rates are
too high),
+ // but is this the solution?
+ if (_gain < 0.0)
+ _gain = 10e-5;
+
+ if (_max_gain > 0.0 && _gain > _max_gain)
+ _gain = _max_gain;
+ return output;
+ }
+
+ void scaleN (gr_complex output[], const gr_complex input[], unsigned n){
+ for (unsigned i = 0; i < n; i++)
+ output[i] = scale (input[i]);
+ }
+
+ protected:
+ float _decay_rate; // decay rate for slow changing signals
+ float _attack_rate; // attack rate for fast changing signals
+ float _reference; // reference value
+ float _gain; // current gain
+ float _max_gain; // max allowable gain
+};
+
+#endif /* _GRI_AGC2_CC_H_ */
Copied:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_cc.i
(from rev 3592,
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.i)
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_cc.i
(rev 0)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_cc.i
2006-09-21 04:44:48 UTC (rev 3594)
@@ -0,0 +1,42 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006 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 2, 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 <math.h>
+
+/*!
+ * \brief high performance Automatic Gain Control class with attack and decay
rates
+ *
+ * For Power the absolute value of the complex number is used.
+ */
+
+
+class gri_agc2_cc {
+
+ public:
+ gri_agc2_cc (float decay_rate = 1e-2, float attack_rate = 1e-2, float
reference = 1.0,
+ float gain = 1.0, float max_gain = 1000.0);
+ float decay_rate ();
+ float attack_rate ();
+ float reference ();
+ float gain ();
+ float max_gain ();
+ };
Copied:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_ff.h
(from rev 3576,
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc.h)
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_ff.h
(rev 0)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_ff.h
2006-09-21 04:44:48 UTC (rev 3594)
@@ -0,0 +1,89 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2002,2006 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 2, 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 _GRI_AGC2_FF_H_
+#define _GRI_AGC2_FF_H_
+
+#include <math.h>
+
+/*!
+ * \brief high performance Automatic Gain Control class with attack and decay
rate
+ *
+ * Power is approximated by absolute value
+ */
+
+class gri_agc2_ff {
+
+ public:
+ gri_agc2_ff (float decay_rate = 1e-4, float attack_rate = 1e-2, float
reference = 1.0,
+ float gain = 1.0, float max_gain = 0.0)
+ : _decay_rate(decay_rate), _attack_rate(attack_rate),
_reference(reference),
+ _gain(gain), _max_gain(max_gain) {};
+
+ float decay_rate () const { return _decay_rate; }
+ float attack_rate () const { return _attack_rate; }
+ float reference () const { return _reference; }
+ float gain () const { return _gain; }
+ float max_gain () const { return _max_gain; }
+
+ void set_decay_rate (float rate) { _decay_rate = rate; }
+ void set_attack_rate (float rate) { _attack_rate = rate; }
+ void set_reference (float reference) { _reference = reference; }
+ void set_gain (float gain) { _gain = gain; }
+ void set_max_gain (float max_gain) { _max_gain = max_gain; }
+
+ float scale (float input){
+ float output = input * _gain;
+
+ float tmp = (fabsf(output)) - _reference;
+ float rate = _decay_rate;
+ if(fabsf(tmp) > _gain)
+ rate = _attack_rate;
+ _gain -= tmp*rate;
+
+#if 0
+ fprintf(stdout, "rate = %f\ttmp = %f\t gain = %f\n", rate, tmp, _gain);
+#endif
+
+ // Not sure about this
+ if (_gain < 0.0)
+ _gain = 10e-5;
+
+ if (_max_gain > 0.0 && _gain > _max_gain)
+ _gain = _max_gain;
+ return output;
+ }
+
+ void scaleN (float output[], const float input[], unsigned n){
+ for (unsigned i = 0; i < n; i++)
+ output[i] = scale (input[i]);
+ }
+
+ protected:
+ float _decay_rate; // decay rate for slow changing signals
+ float _attack_rate; // attack_rate for fast changing signals
+ float _reference; // reference value
+ float _gain; // current gain
+ float _max_gain; // maximum gain
+};
+
+#endif /* _GRI_AGC2_FF_H_ */
Copied:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_ff.i
(from rev 3576,
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc.i)
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_ff.i
(rev 0)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_ff.i
2006-09-21 04:44:48 UTC (rev 3594)
@@ -0,0 +1,37 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2006 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 2, 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 <math.h>
+
+/*!
+ * \brief high performance Automatic Gain Control class
+ *
+ * Power is approximated by absolute value
+ */
+
+
+class gri_agc2_ff {
+
+ public:
+ gri_agc2_ff (float decay_rate = 1e-1, float attack_rate = 1e-2,
+ float reference = 1.0, float gain = 1.0, float max_gain = 0.0);
+ };
Modified:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.h
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.h
2006-09-21 01:03:42 UTC (rev 3593)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.h
2006-09-21 04:44:48 UTC (rev 3594)
@@ -34,19 +34,17 @@
class gri_agc_cc {
public:
- gri_agc_cc (float rate1 = 1e-1, float rate2 = 1e-2, float reference = 1.0,
+ gri_agc_cc (float rate = 1e-4, float reference = 1.0,
float gain = 1.0, float max_gain = 1000.0)
- : _rate1(rate1), _rate2(rate2), _reference(reference),
+ : _rate(rate), _reference(reference),
_gain(gain), _max_gain(max_gain) {};
- float rate1 () const { return _rate1; }
- float rate2 () const { return _rate2; }
+ float rate () const { return _rate; }
float reference () const { return _reference; }
float gain () const { return _gain; }
float max_gain() const { return _max_gain; }
- void set_rate1 (float rate) { _rate1 = rate; }
- void set_rate2 (float rate) { _rate2 = rate; }
+ void set_rate (float rate) { _rate = rate; }
void set_reference (float reference) { _reference = reference; }
void set_gain (float gain) { _gain = gain; }
void set_max_gain(float max_gain) { _max_gain = max_gain; }
@@ -54,13 +52,8 @@
gr_complex scale (gr_complex input){
gr_complex output = input * _gain;
- float tmp = (_reference - sqrt(output.real()*output.real() +
- output.imag()*output.imag()));
- float rate = _rate1;
- if(tmp > _gain)
- rate = _rate2;
- _gain += tmp*rate;
-
+ _gain += _rate * (_reference - sqrt(output.real()*output.real() +
+ output.imag()*output.imag()));
if (_max_gain > 0.0 && _gain > _max_gain)
_gain = _max_gain;
return output;
@@ -72,8 +65,7 @@
}
protected:
- float _rate1; // adjustment rate
- float _rate2; // decay rate
+ float _rate; // adjustment rate
float _reference; // reference value
float _gain; // current gain
float _max_gain; // max allowable gain
Modified:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.i
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.i
2006-09-21 01:03:42 UTC (rev 3593)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.i
2006-09-21 04:44:48 UTC (rev 3594)
@@ -32,10 +32,9 @@
class gri_agc_cc {
public:
- gri_agc_cc (float rate1 = 1e-2, float rate2 = 1e-2, float reference = 1.0,
+ gri_agc_cc (float rate = 1e-4, float reference = 1.0,
float gain = 1.0, float max_gain = 1000.0);
- float rate1 ();
- float rate2 ();
+ float rate ();
float reference ();
float gain ();
float max_gain ();
Copied:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_ff.h
(from rev 3576,
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc.h)
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_ff.h
(rev 0)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_ff.h
2006-09-21 04:44:48 UTC (rev 3594)
@@ -0,0 +1,71 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2002,2006 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 2, 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 _GRI_AGC_FF_H_
+#define _GRI_AGC_FF_H_
+
+#include <math.h>
+
+/*!
+ * \brief high performance Automatic Gain Control class
+ *
+ * Power is approximated by absolute value
+ */
+
+class gri_agc_ff {
+
+ public:
+ gri_agc_ff (float rate = 1e-4, float reference = 1.0,
+ float gain = 1.0, float max_gain = 0.0)
+ : _rate(rate), _reference(reference), _gain(gain), _max_gain(max_gain) {};
+
+ float rate () const { return _rate; }
+ float reference () const { return _reference; }
+ float gain () const { return _gain; }
+ float max_gain () const { return _max_gain; }
+
+ void set_rate (float rate) { _rate = rate; }
+ void set_reference (float reference) { _reference = reference; }
+ void set_gain (float gain) { _gain = gain; }
+ void set_max_gain (float max_gain) { _max_gain = max_gain; }
+
+ float scale (float input){
+ float output = input * _gain;
+ _gain += (_reference - fabsf (output)) * _rate;
+ if (_max_gain > 0.0 && _gain > _max_gain)
+ _gain = _max_gain;
+ return output;
+ }
+
+ void scaleN (float output[], const float input[], unsigned n){
+ for (unsigned i = 0; i < n; i++)
+ output[i] = scale (input[i]);
+ }
+
+ protected:
+ float _rate; // adjustment rate
+ float _reference; // reference value
+ float _gain; // current gain
+ float _max_gain; // maximum gain
+};
+
+#endif /* _GRI_AGC_FF_H_ */
Copied:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_ff.i
(from rev 3576,
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc.i)
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_ff.i
(rev 0)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_ff.i
2006-09-21 04:44:48 UTC (rev 3594)
@@ -0,0 +1,37 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2006 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 2, 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 <math.h>
+
+/*!
+ * \brief high performance Automatic Gain Control class
+ *
+ * Power is approximated by absolute value
+ */
+
+
+class gri_agc_ff {
+
+ public:
+ gri_agc_ff (float rate = 1e-4, float reference = 1.0,
+ float gain = 1.0, float max_gain = 0.0);
+ };
Modified:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
2006-09-21 01:03:42 UTC (rev 3593)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
2006-09-21 04:44:48 UTC (rev 3594)
@@ -208,13 +208,13 @@
# Automatic gain control
scale = (1.0/16384.0)
self.pre_scaler = gr.multiply_const_cc(scale) # scale the signal
from full-range to +-1
- self.agc = gr.agc_cc(0.1, 0.01, 1, 1, 1000)
+ self.agc = gr.agc2_cc(1e-1, 1e-3, 1, 1, 1000)
# Costas loop (carrier tracking)
# FIXME: need to decide how to handle this more generally; do we pull
it from higher layer?
costas_order = 2
beta = .25 * self._costas_alpha * self._costas_alpha
- self.costas_loop = gr.costas_loop_cc(self._costas_alpha, beta, 0.05,
-0.05, costas_order)
+ self.costas_loop = gr.costas_loop_cc(self._costas_alpha, beta, 0.005,
-0.005, costas_order)
# RRC data filter
ntaps = 11 * self._samples_per_symbol
Modified:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
2006-09-21 01:03:42 UTC (rev 3593)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
2006-09-21 04:44:48 UTC (rev 3594)
@@ -205,8 +205,8 @@
# Automatic gain control
scale = (1.0/16384.0)
self.pre_scaler = gr.multiply_const_cc(scale) # scale the signal
from full-range to +-1
- self.agc = gr.agc_cc(0.1, 0.01, 1, 1, 1000)
-
+ self.agc = gr.agc2_cc(1e-1, 1e-3, 1, 1, 1000)
+
# Costas loop (carrier tracking)
# FIXME: need to decide how to handle this more generally; do we pull
it from higher layer?
costas_order = 4
Modified:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py
2006-09-21 01:03:42 UTC (rev 3593)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py
2006-09-21 04:44:48 UTC (rev 3594)
@@ -197,7 +197,7 @@
# Automatic gain control
scale = (1.0/16384.0)
self.pre_scaler = gr.multiply_const_cc(scale) # scale the signal
from full-range to +-1
- self.agc = gr.agc_cc(0.1, 0.01, 1, 1, 1000)
+ self.agc = gr.agc2_cc(1e-1, 1e-3, 1, 1, 1000)
# Demodulate FM
sensitivity = (pi / 2) / samples_per_symbol
Added:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/gr/qa_agc.py
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/gr/qa_agc.py
(rev 0)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/gr/qa_agc.py
2006-09-21 04:44:48 UTC (rev 3594)
@@ -0,0 +1,340 @@
+#!/usr/bin/env python
+#
+# Copyright 2004 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 2, 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 math
+
+test_output = False
+
+class test_sig_source (gr_unittest.TestCase):
+
+ def setUp (self):
+ self.fg = gr.flow_graph ()
+
+ def tearDown (self):
+ self.fg = None
+
+
+ def test_001(self):
+ ''' Test the complex AGC loop (single rate input) '''
+ fg = self.fg
+
+ expected_result = (
+ (100.000244140625+7.2191943445432116e-07j),
+ (72.892257690429688+52.959323883056641j),
+ (25.089065551757812+77.216217041015625j),
+ (-22.611061096191406+69.589706420898438j),
+ (-53.357715606689453+38.766635894775391j),
+ (-59.458671569824219+3.4792964243024471e-07j),
+ (-43.373462677001953-31.512666702270508j),
+ (-14.94139289855957-45.984889984130859j),
+ (13.478158950805664-41.48150634765625j),
+ (31.838506698608398-23.132022857666016j),
+ (35.519271850585938-3.1176801940091536e-07j),
+ (25.942903518676758+18.848621368408203j),
+ (8.9492912292480469+27.5430908203125j),
+ (-8.0852642059326172+24.883890151977539j),
+ (-19.131628036499023+13.899936676025391j),
+ (-21.383295059204102+3.1281737733479531e-07j),
+ (-15.650330543518066-11.370632171630859j),
+ (-5.4110145568847656-16.65339469909668j),
+ (4.9008159637451172-15.083160400390625j),
+ (11.628337860107422-8.4484796524047852j),
+ (13.036135673522949-2.288476110834381e-07j),
+ (9.5726661682128906+6.954948902130127j),
+ (3.3216962814331055+10.223132133483887j),
+ (-3.0204284191131592+9.2959251403808594j),
+ (-7.1977195739746094+5.2294478416442871j),
+ (-8.1072216033935547+1.8976157889483147e-07j),
+ (-5.9838657379150391-4.3475332260131836j),
+ (-2.0879747867584229-6.4261269569396973j),
+ (1.9100792407989502-5.8786196708679199j),
+ (4.5814824104309082-3.3286411762237549j),
+ (5.1967458724975586-1.3684227440080576e-07j),
+ (3.8647139072418213+2.8078789710998535j),
+ (1.3594740629196167+4.1840314865112305j),
+ (-1.2544282674789429+3.8607344627380371j),
+ (-3.0366206169128418+2.2062335014343262j),
+ (-3.4781389236450195+1.1194014604143376e-07j),
+ (-2.6133756637573242-1.8987287282943726j),
+ (-0.9293016791343689-2.8600969314575195j),
+ (0.86727333068847656-2.6691930294036865j),
+ (2.1243946552276611-1.5434627532958984j),
+ (2.4633183479309082-8.6486437567145913e-08j),
+ (1.8744727373123169+1.3618841171264648j),
+ (0.67528903484344482+2.0783262252807617j),
+ (-0.63866174221038818+1.965599536895752j),
+ (-1.5857341289520264+1.152103066444397j),
+ (-1.8640764951705933+7.6355092915036948e-08j),
+ (-1.4381576776504517-1.0448826551437378j),
+ (-0.52529704570770264-1.6166983842849731j),
+ (0.50366902351379395-1.5501341819763184j),
+ (1.26766037940979-0.92100900411605835j))
+
+ sampling_freq = 100
+ src1 = gr.sig_source_c (sampling_freq, gr.GR_SIN_WAVE,
+ sampling_freq * 0.10, 100.0)
+ dst1 = gr.vector_sink_c ()
+ head = gr.head (gr.sizeof_gr_complex, int (5*sampling_freq * 0.10))
+
+ agc = gr.agc_cc(1e-3, 1, 1, 1000)
+
+ fg.connect (src1, head)
+ fg.connect (head, agc)
+ fg.connect (agc, dst1)
+
+ if test_output == True:
+ fg.connect (agc, gr.file_sink(gr.sizeof_gr_complex,
"test_agc_cc.dat"))
+
+ fg.run ()
+ dst_data = dst1.data ()
+ self.assertComplexTuplesAlmostEqual (expected_result, dst_data, 5)
+
+ def test_002(self):
+ ''' Test the floating point AGC loop (single rate input) '''
+ fg = self.fg
+
+ expected_result = (
+ 7.2191943445432116e-07,
+ 58.837181091308594,
+ 89.700050354003906,
+ 81.264183044433594,
+ 45.506141662597656,
+ 4.269894304798072e-07,
+ -42.948936462402344,
+ -65.50335693359375,
+ -59.368724822998047,
+ -33.261005401611328,
+ -4.683740257860336e-07,
+ 31.423542022705078,
+ 47.950984954833984,
+ 43.485683441162109,
+ 24.378345489501953,
+ 5.7254135299444897e-07,
+ -23.062990188598633,
+ -35.218441009521484,
+ -31.964075088500977,
+ -17.934831619262695,
+ -5.0591745548445033e-07,
+ 16.998210906982422,
+ 25.982204437255859,
+ 23.606258392333984,
+ 13.260685920715332,
+ 4.9936483037527069e-07,
+ -12.59880542755127,
+ -19.28221321105957,
+ -17.54347038269043,
+ -9.8700437545776367,
+ -4.188150626305287e-07,
+ 9.4074573516845703,
+ 14.422011375427246,
+ 13.145503044128418,
+ 7.41046142578125,
+ 3.8512698097292741e-07,
+ -7.0924453735351562,
+ -10.896408081054688,
+ -9.9552040100097656,
+ -5.6262712478637695,
+ -3.1982864356905338e-07,
+ 5.4131259918212891,
+ 8.3389215469360352,
+ 7.6409502029418945,
+ 4.3320145606994629,
+ 2.882407841298118e-07,
+ -4.194943904876709,
+ -6.4837145805358887,
+ -5.9621825218200684,
+ -3.3931560516357422)
+
+ sampling_freq = 100
+ src1 = gr.sig_source_f (sampling_freq, gr.GR_SIN_WAVE,
+ sampling_freq * 0.10, 100.0)
+ dst1 = gr.vector_sink_f ()
+ head = gr.head (gr.sizeof_float, int (5*sampling_freq * 0.10))
+
+ agc = gr.agc_ff(1e-3, 1, 1, 1000)
+
+ fg.connect (src1, head)
+ fg.connect (head, agc)
+ fg.connect (agc, dst1)
+
+ if test_output == True:
+ fg.connect (agc, gr.file_sink(gr.sizeof_float, "test_agc_ff.dat"))
+
+ fg.run ()
+ dst_data = dst1.data ()
+ self.assertFloatTuplesAlmostEqual (expected_result, dst_data, 5)
+
+ def test_003(self):
+ ''' Test the complex AGC loop (attack and decay rate inputs) '''
+ fg = self.fg
+
+ expected_result = \
+ ((100.000244140625+7.2191943445432116e-07j),
+ (0.80881959199905396+0.58764183521270752j),
+ (0.30894950032234192+0.95084899663925171j),
+ (-0.30895623564720154+0.95086973905563354j),
+ (-0.80887287855148315+0.58768033981323242j),
+ (-0.99984413385391235+5.850709250410091e-09j),
+ (-0.80889981985092163-0.58770018815994263j),
+ (-0.30897706747055054-0.95093393325805664j),
+ (0.30898112058639526-0.95094609260559082j),
+ (0.80893135070800781-0.58772283792495728j),
+ (0.99990922212600708-8.7766354184282136e-09j),
+ (0.80894720554351807+0.58773452043533325j),
+ (0.30899339914321899+0.95098406076431274j),
+ (-0.30899572372436523+0.95099133253097534j),
+ (-0.80896598100662231+0.58774799108505249j),
+ (-0.99994778633117676+1.4628290578855285e-08j),
+ (-0.80897533893585205-0.58775502443313599j),
+ (-0.30900305509567261-0.95101380348205566j),
+ (0.30900448560714722-0.95101797580718994j),
+ (0.80898630619049072-0.58776277303695679j),
+ (0.99997037649154663-1.7554345532744264e-08j),
+ (0.80899184942245483+0.58776694536209106j),
+ (0.30900871753692627+0.95103120803833008j),
+ (-0.30900952219963074+0.95103377103805542j),
+ (-0.8089984655380249+0.58777159452438354j),
+ (-0.99998390674591064+2.3406109050938539e-08j),
+ (-0.809001624584198-0.58777409791946411j),
+ (-0.30901208519935608-0.95104163885116577j),
+ (0.30901262164115906-0.95104306936264038j),
+ (0.80900543928146362-0.587776780128479j),
+ (0.99999171495437622-2.6332081404234486e-08j),
+ (0.80900734663009644+0.58777821063995361j),
+ (0.30901408195495605+0.95104765892028809j),
+ (-0.30901429057121277+0.95104855298995972j),
+ (-0.80900967121124268+0.58777981996536255j),
+ (-0.99999648332595825+3.2183805842578295e-08j),
+ (-0.80901080369949341-0.58778077363967896j),
+ (-0.30901527404785156-0.95105135440826416j),
+ (0.30901545286178589-0.95105189085006714j),
+ (0.80901217460632324-0.58778166770935059j),
+ (0.99999916553497314-3.5109700036173308e-08j),
+ (0.809012770652771+0.58778214454650879j),
+ (0.30901595950126648+0.9510534405708313j),
+ (-0.30901598930358887+0.95105385780334473j),
+ (-0.80901366472244263+0.58778274059295654j),
+ (-1.0000008344650269+4.0961388947380328e-08j),
+ (-0.8090139627456665-0.58778303861618042j),
+ (-0.30901634693145752-0.95105475187301636j),
+ (0.30901640653610229-0.95105493068695068j),
+ (0.80901449918746948-0.5877833366394043j))
+
+ sampling_freq = 100
+ src1 = gr.sig_source_c (sampling_freq, gr.GR_SIN_WAVE,
+ sampling_freq * 0.10, 100)
+ dst1 = gr.vector_sink_c ()
+ head = gr.head (gr.sizeof_gr_complex, int (5*sampling_freq * 0.10))
+
+ agc = gr.agc2_cc(1e-3, 1e-2, 1, 1, 1000)
+
+ fg.connect (src1, head)
+ fg.connect (head, agc)
+ fg.connect (agc, dst1)
+
+ if test_output == True:
+ fg.connect (agc, gr.file_sink(gr.sizeof_gr_complex,
"test_agc2_cc.dat"))
+
+ fg.run ()
+ dst_data = dst1.data ()
+ print dst_data
+ self.assertComplexTuplesAlmostEqual (expected_result, dst_data, 5)
+
+ def test_004(self):
+ ''' Test the floating point AGC loop (attack and decay rate inputs) '''
+ fg = self.fg
+
+ expected_result = \
+ (7.2191943445432116e-07,
+ 58.837181091308594,
+ 40.194305419921875,
+ 2.9183335304260254,
+ 0.67606079578399658,
+ 8.6260438791896377e-09,
+ -1.4542514085769653,
+ -1.9210131168365479,
+ -1.0450780391693115,
+ -0.61939650774002075,
+ -1.2590258613442984e-08,
+ 1.4308931827545166,
+ 1.9054338932037354,
+ 1.0443156957626343,
+ 0.61937344074249268,
+ 2.0983527804219193e-08,
+ -1.4308838844299316,
+ -1.9054274559020996,
+ -1.0443152189254761,
+ -0.61937344074249268,
+ -2.5180233009791664e-08,
+ 1.4308837652206421,
+ 1.9054274559020996,
+ 1.0443154573440552,
+ 0.61937344074249268,
+ 3.3573645197293445e-08,
+ -1.4308838844299316,
+ -1.9054274559020996,
+ -1.0443152189254761,
+ -0.61937350034713745,
+ -3.7770352179222755e-08,
+ 1.4308837652206421,
+ 1.9054274559020996,
+ 1.0443154573440552,
+ 0.61937350034713745,
+ 4.6163762590367696e-08,
+ -1.4308838844299316,
+ -1.9054274559020996,
+ -1.0443153381347656,
+ -0.61937344074249268,
+ -5.0360466019583328e-08,
+ 1.4308837652206421,
+ 1.9054274559020996,
+ 1.0443155765533447,
+ 0.61937344074249268,
+ 5.8753879983441948e-08,
+ -1.4308837652206421,
+ -1.9054274559020996,
+ -1.0443153381347656,
+ -0.61937344074249268)
+
+ sampling_freq = 100
+ src1 = gr.sig_source_f (sampling_freq, gr.GR_SIN_WAVE,
+ sampling_freq * 0.10, 100)
+ dst1 = gr.vector_sink_f ()
+ head = gr.head (gr.sizeof_float, int (5*sampling_freq * 0.10))
+
+ agc = gr.agc2_ff(1e-3, 1e-2, 1, 1, 1000)
+
+ fg.connect (src1, head)
+ fg.connect (head, agc)
+ fg.connect (agc, dst1)
+
+ if test_output == True:
+ fg.connect (agc, gr.file_sink(gr.sizeof_float, "test_agc2_ff.dat"))
+
+ fg.run ()
+ dst_data = dst1.data ()
+ self.assertFloatTuplesAlmostEqual (expected_result, dst_data, 5)
+
+
+if __name__ == '__main__':
+ gr_unittest.main ()
Property changes on:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/gr/qa_agc.py
___________________________________________________________________
Name: svn:executable
+ *
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r3594 - in gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src: lib/general python/gnuradio/blksimpl python/gnuradio/gr,
trondeau <=