analog: removing PLL blocks. Also moved blks2impl files that used PLLs to gr-analog.

This probably impacts a lot of examples; once we've removed all files in gnuradio-core, we'll need to retest.
author: Tom Rondeau <trondeau@vt.edu> 2012-11-01 10:50:10 -0400
committer: Tom Rondeau <trondeau@vt.edu> 2012-11-01 10:50:10 -0400
commit: 1b83549181135e79ad00b9bae0d11ab27efa4148 (patch)
tree: 6b036dd9d26423528f49bad563c199a25a33f646 /gnuradio-core/src/lib/general
parent: bbe599e4606b728c9610a17285b1e50f9e9d4dcb (diff)
14 files changed, 0 insertions, 798 deletions
diff --git a/gnuradio-core/src/lib/general/CMakeLists.txt b/gnuradio-core/src/lib/general/CMakeLists.txt
index 0e210c12a1..42c32b54c4 100644
--- a/gnuradio-core/src/lib/general/CMakeLists.txt
+++ b/gnuradio-core/src/lib/general/CMakeLists.txt
@@ -180,7 +180,6 @@ set(gr_core_general_triple_threats
     gr_cpm
     gr_ctcss_squelch_ff
     gr_decode_ccsds_27_fb
-    gr_dpll_bb
     gr_deinterleave
     gr_delay
     gr_encode_ccsds_27_bb
@@ -216,9 +215,6 @@ set(gr_core_general_triple_threats
     gr_pa_2x2_phase_combiner
     gr_peak_detector2_fb
     gr_phase_modulator_fc
-    gr_pll_carriertracking_cc
-    gr_pll_freqdet_cf
-    gr_pll_refout_cc
     gr_prefs
     gr_probe_avg_mag_sqrd_c
     gr_probe_avg_mag_sqrd_cf
diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i
index 1007b7f1a8..a8799e5c01 100644
--- a/gnuradio-core/src/lib/general/general.i
+++ b/gnuradio-core/src/lib/general/general.i
@@ -76,11 +76,7 @@
 #include <gr_conjugate_cc.h>
 #include <gr_vco_f.h>
 #include <gr_threshold_ff.h>
-#include <gr_dpll_bb.h>
 #include <gr_fmdet_cf.h>
-#include <gr_pll_freqdet_cf.h>
-#include <gr_pll_refout_cc.h>
-#include <gr_pll_carriertracking_cc.h>
 #include <gr_probe_avg_mag_sqrd_c.h>
 #include <gr_probe_avg_mag_sqrd_cf.h>
 #include <gr_probe_avg_mag_sqrd_f.h>
@@ -176,11 +172,7 @@
 %include "gr_conjugate_cc.i"
 %include "gr_vco_f.i"
 %include "gr_threshold_ff.i"
-%include "gr_dpll_bb.i"
 %include "gr_fmdet_cf.i"
-%include "gr_pll_freqdet_cf.i"
-%include "gr_pll_refout_cc.i"
-%include "gr_pll_carriertracking_cc.i"
 %include "gr_probe_avg_mag_sqrd_c.i"
 %include "gr_probe_avg_mag_sqrd_cf.i"
 %include "gr_probe_avg_mag_sqrd_f.i"
diff --git a/gnuradio-core/src/lib/general/gr_dpll_bb.cc b/gnuradio-core/src/lib/general/gr_dpll_bb.cc
deleted file mode 100644
index 1d5a0d4fda..0000000000
--- a/gnuradio-core/src/lib/general/gr_dpll_bb.cc
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2009,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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_dpll_bb.h>
-#include <gr_io_signature.h>
-#include <cstdio>
-
-gr_dpll_bb_sptr
-gr_make_dpll_bb (float period, float gain)
-{
-  return gnuradio::get_initial_sptr(new gr_dpll_bb (period, gain));
-}
-
-gr_dpll_bb::gr_dpll_bb (float period, float gain)
-  : gr_sync_block ("dpll_bb",
-		   gr_make_io_signature (1, 1, sizeof (char)),
-		   gr_make_io_signature (1, 1, sizeof (char))),
-    d_restart(0),d_pulse_phase(0)
-{
-  d_pulse_frequency = 1.0/period;
-  d_gain = gain;
-  d_decision_threshold = 1.0 - 0.5*d_pulse_frequency;
-#if 1
-  fprintf(stderr,"frequency = %f period = %f gain = %f threshold = %f\n",
-	  d_pulse_frequency,
-	  period,
-	  d_gain,
-	  d_decision_threshold);
-#endif
-}
-
-int
-gr_dpll_bb::work (int noutput_items,
-	      gr_vector_const_void_star &input_items,
-	      gr_vector_void_star &output_items)
-{
-  const char *iptr = (const char *) input_items[0];
-  char *optr = (char *) output_items[0];
-
-  for (int i = 0; i < noutput_items; i++){
-    optr[i]= 0;
-    if(iptr[i] == 1) {
-      if (d_restart == 0) {
-	d_pulse_phase = 1;
-      } else {
-	if (d_pulse_phase > 0.5) d_pulse_phase += d_gain*(1.0-d_pulse_phase);
-	else d_pulse_phase -= d_gain*d_pulse_phase;
-      }
-      d_restart = 3;
-    }
-    if (d_pulse_phase > d_decision_threshold) {
-      d_pulse_phase -= 1.0;
-      if (d_restart > 0) {
-	d_restart -= 1;
-	optr[i] = 1;
-      }
-    }
-    d_pulse_phase += d_pulse_frequency;
-  }
-  return noutput_items;
-}
diff --git a/gnuradio-core/src/lib/general/gr_dpll_bb.h b/gnuradio-core/src/lib/general/gr_dpll_bb.h
deleted file mode 100644
index a7df974fb4..0000000000
--- a/gnuradio-core/src/lib/general/gr_dpll_bb.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 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_DPLL_BB_H
-#define INCLUDED_GR_DPLL_BB_H
-
-#include <gr_core_api.h>
-#include <gr_sync_block.h>
-
-class gr_dpll_bb;
-typedef boost::shared_ptr<gr_dpll_bb> gr_dpll_bb_sptr;
-
-GR_CORE_API gr_dpll_bb_sptr gr_make_dpll_bb (float period, float gain);
-
-/*!
- * \brief Detect the peak of a signal
- * \ingroup level_blk
- *
- * If a peak is detected, this block outputs a 1,
- * or it outputs 0's.
- */
-class GR_CORE_API gr_dpll_bb : public gr_sync_block
-{
-  friend GR_CORE_API gr_dpll_bb_sptr gr_make_dpll_bb (float period, float gain);
-
-  gr_dpll_bb (float period, float gain);
-
- private:
-  unsigned char d_restart;
-  float d_pulse_phase, d_pulse_frequency,d_gain,d_decision_threshold;
-
- public:
-
-  int work (int noutput_items,
-	    gr_vector_const_void_star &input_items,
-	    gr_vector_void_star &output_items);
-};
-
-#endif
diff --git a/gnuradio-core/src/lib/general/gr_dpll_bb.i b/gnuradio-core/src/lib/general/gr_dpll_bb.i
deleted file mode 100644
index f31a873743..0000000000
--- a/gnuradio-core/src/lib/general/gr_dpll_bb.i
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 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,dpll_bb)
-
-  gr_dpll_bb_sptr gr_make_dpll_bb (float period, float gain);
-
-class gr_dpll_bb : public gr_sync_block
-{
- private:
-  gr_dpll_bb (float period, float gain);
-};
diff --git a/gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.cc b/gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.cc
deleted file mode 100644
index b7b1291a3d..0000000000
--- a/gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.cc
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2010,2011 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 <gr_pll_carriertracking_cc.h>
-#include <gr_io_signature.h>
-#include <gr_sincos.h>
-#include <math.h>
-#include <gr_math.h>
-
-#ifndef M_TWOPI
-#define M_TWOPI (2.0f*M_PI)
-#endif
-
-gr_pll_carriertracking_cc_sptr
-gr_make_pll_carriertracking_cc (float loop_bw, float max_freq, float min_freq)
-{
-  return gnuradio::get_initial_sptr(new gr_pll_carriertracking_cc (loop_bw, max_freq, min_freq));
-}
-
-gr_pll_carriertracking_cc::gr_pll_carriertracking_cc (float loop_bw,
-						      float max_freq,
-						      float min_freq)
-  : gr_sync_block ("pll_carriertracking_cc",
-		   gr_make_io_signature (1, 1, sizeof (gr_complex)),
-		   gr_make_io_signature (1, 1, sizeof (gr_complex))),
-    gri_control_loop(loop_bw, max_freq, min_freq),
-    d_locksig(0), d_lock_threshold(0), d_squelch_enable(false)
-{
-}
-
-float
-gr_pll_carriertracking_cc::mod_2pi (float in)
-{
-  if(in>M_PI)
-    return in-M_TWOPI;
-  else if(in<-M_PI)
-    return in+M_TWOPI;
-  else
-    return in;
-}
-
-float
-gr_pll_carriertracking_cc::phase_detector(gr_complex sample,float ref_phase)
-{
-  float sample_phase;
-  //  sample_phase = atan2(sample.imag(),sample.real());
-  sample_phase = gr_fast_atan2f(sample.imag(),sample.real());
-  return mod_2pi(sample_phase-ref_phase);
-}
-
-bool
-gr_pll_carriertracking_cc::lock_detector(void)
-{
-    return (fabsf(d_locksig) > d_lock_threshold);
-}
-
-bool
-gr_pll_carriertracking_cc::squelch_enable(bool set_squelch)
-{
-    return d_squelch_enable = set_squelch;
-}
-
-float
-gr_pll_carriertracking_cc::set_lock_threshold(float threshold)
-{
-    return d_lock_threshold = threshold;
-}
-
-int
-gr_pll_carriertracking_cc::work (int noutput_items,
-				 gr_vector_const_void_star &input_items,
-				 gr_vector_void_star &output_items)
-{
-  const gr_complex *iptr = (gr_complex *) input_items[0];
-  gr_complex *optr = (gr_complex *) output_items[0];
-
-  float error;
-  float t_imag, t_real;
-
-  for (int i = 0; i < noutput_items; i++){
-    gr_sincosf(d_phase, &t_imag, &t_real);
-    optr[i] = iptr[i] * gr_complex(t_real, -t_imag);
-
-    error = phase_detector(iptr[i],d_phase);
-
-    advance_loop(error);
-    phase_wrap();
-    frequency_limit();
-
-    d_locksig = d_locksig * (1.0 - d_alpha) + \
-      d_alpha*(iptr[i].real() * t_real + iptr[i].imag() * t_imag);
-
-    if ((d_squelch_enable) && !lock_detector())
-      optr[i] = 0;
-  }
-  return noutput_items;
-}
diff --git a/gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.h b/gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.h
deleted file mode 100644
index b3bc5ddd0c..0000000000
--- a/gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2006,2011 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_PLL_CARRIERTRACKING_CC_H
-#define INCLUDED_GR_PLL_CARRIERTRACKING_CC_H
-
-#include <gr_core_api.h>
-#include <gr_sync_block.h>
-#include <gri_control_loop.h>
-
-class gr_pll_carriertracking_cc;
-typedef boost::shared_ptr<gr_pll_carriertracking_cc> gr_pll_carriertracking_cc_sptr;
-
-GR_CORE_API gr_pll_carriertracking_cc_sptr gr_make_pll_carriertracking_cc (float loop_bw,
-							       float max_freq,
-							       float min_freq);
-/*!
- * \brief Implements a PLL which locks to the input frequency and outputs the
- * input signal mixed with that carrier.
- * \ingroup sync_blk
- *
- * input: stream of complex; output: stream of complex
- *
- * This PLL locks onto a [possibly noisy] reference carrier on
- * the input and outputs that signal, downconverted to DC
- *
- * All settings max_freq and min_freq are in terms of radians per sample,
- * NOT HERTZ.  The loop bandwidth determins the lock range and should be set
- * around pi/200 -- 2pi/100.
- * \sa gr_pll_freqdet_cf, gr_pll_carriertracking_cc
- */
-
-class GR_CORE_API gr_pll_carriertracking_cc : public gr_sync_block, public gri_control_loop
-{
-  friend GR_CORE_API gr_pll_carriertracking_cc_sptr gr_make_pll_carriertracking_cc (float loop_bw,
-									float max_freq,
-									float min_freq);
-
-  float d_locksig,d_lock_threshold;
-  bool d_squelch_enable;
-  gr_pll_carriertracking_cc (float loop_bw, float max_freq, float min_freq);
-
-  int work (int noutput_items,
-	    gr_vector_const_void_star &input_items,
-	    gr_vector_void_star &output_items);
-private:
-  float mod_2pi (float in);
-  float phase_detector(gr_complex sample,float ref_phase);
-public:
-  bool lock_detector(void);
-  bool  squelch_enable(bool);
-  float set_lock_threshold(float);
-};
-
-#endif
diff --git a/gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.i b/gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.i
deleted file mode 100644
index a20adf7e20..0000000000
--- a/gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.i
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2011 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,pll_carriertracking_cc);
-
-gr_pll_carriertracking_cc_sptr
-gr_make_pll_carriertracking_cc (float loop_bw,
-				float max_freq,
-				float min_freq);
-
-class gr_pll_carriertracking_cc : public gr_sync_block, public gri_control_loop
-{
- private:
-  gr_pll_carriertracking_cc (float loop_bw, float max_freq, float min_freq);
- public:
-  bool lock_detector(void);
-  bool  squelch_enable(bool);
-  float set_lock_threshold(float);
-
-};
diff --git a/gnuradio-core/src/lib/general/gr_pll_freqdet_cf.cc b/gnuradio-core/src/lib/general/gr_pll_freqdet_cf.cc
deleted file mode 100644
index f80f4ed07a..0000000000
--- a/gnuradio-core/src/lib/general/gr_pll_freqdet_cf.cc
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2010,2011 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 <gr_pll_freqdet_cf.h>
-#include <gr_io_signature.h>
-#include <math.h>
-#include <gr_math.h>
-
-#ifndef M_TWOPI
-#define M_TWOPI (2.0f*M_PI)
-#endif
-
-gr_pll_freqdet_cf_sptr
-gr_make_pll_freqdet_cf (float loop_bw, float max_freq, float min_freq)
-{
-  return gnuradio::get_initial_sptr(new gr_pll_freqdet_cf (loop_bw, max_freq, min_freq));
-}
-
-gr_pll_freqdet_cf::gr_pll_freqdet_cf (float loop_bw, float max_freq, float min_freq)
-  : gr_sync_block ("pll_freqdet_cf",
-		   gr_make_io_signature (1, 1, sizeof (gr_complex)),
-		   gr_make_io_signature (1, 1, sizeof (float))),
-    gri_control_loop(loop_bw, max_freq, min_freq)
-{
-}
-
-float
-gr_pll_freqdet_cf::mod_2pi (float in)
-{
-  if(in>M_PI)
-    return in-M_TWOPI;
-  else if(in<-M_PI)
-    return in+M_TWOPI;
-  else
-    return in;
-}
-
-float
-gr_pll_freqdet_cf::phase_detector(gr_complex sample,float ref_phase)
-{
-  float sample_phase;
-  sample_phase = gr_fast_atan2f(sample.imag(),sample.real());
-  return mod_2pi(sample_phase-ref_phase);
-}
-
-int
-gr_pll_freqdet_cf::work (int noutput_items,
-			 gr_vector_const_void_star &input_items,
-			 gr_vector_void_star &output_items)
-{
-  const gr_complex *iptr = (gr_complex *) input_items[0];
-  float *optr = (float *) output_items[0];
-
-  float error;
-  int	size = noutput_items;
-
-  while (size-- > 0) {
-    *optr++ = d_freq;
-
-    error = phase_detector(*iptr++,d_phase);
-
-    advance_loop(error);
-    phase_wrap();
-    frequency_limit();
-  }
-  return noutput_items;
-}
diff --git a/gnuradio-core/src/lib/general/gr_pll_freqdet_cf.h b/gnuradio-core/src/lib/general/gr_pll_freqdet_cf.h
deleted file mode 100644
index 3dfc8d7093..0000000000
--- a/gnuradio-core/src/lib/general/gr_pll_freqdet_cf.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2011 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_PLL_FREQDET_CF_H
-#define INCLUDED_GR_PLL_FREQDET_CF_H
-
-#include <gr_core_api.h>
-#include <gr_sync_block.h>
-#include <gri_control_loop.h>
-
-class gr_pll_freqdet_cf;
-typedef boost::shared_ptr<gr_pll_freqdet_cf> gr_pll_freqdet_cf_sptr;
-
-GR_CORE_API gr_pll_freqdet_cf_sptr gr_make_pll_freqdet_cf (float loop_bw,
-					       float max_freq,
-					       float min_freq);
-/*!
- * \brief Implements a PLL which locks to the input frequency and outputs
- * an estimate of that frequency.  Useful for FM Demod.
- * \ingroup sync_blk
- *
- * input: stream of complex; output: stream of floats
- *
- * This PLL locks onto a [possibly noisy] reference carrier on
- * the input and outputs an estimate of that frequency in radians per sample.
- * All settings max_freq and min_freq are in terms of radians per sample,
- * NOT HERTZ.  The loop bandwidth determins the lock range and should be set
- * around pi/200 -- 2pi/100.
- * \sa gr_pll_refout_cc, gr_pll_carriertracking_cc
- */
-
-class GR_CORE_API gr_pll_freqdet_cf : public gr_sync_block, public gri_control_loop
-{
-  friend GR_CORE_API gr_pll_freqdet_cf_sptr gr_make_pll_freqdet_cf (float loop_bw,
-							float max_freq,
-							float min_freq);
-
-  float mod_2pi (float in);
-  gr_pll_freqdet_cf (float loop_bw, float max_freq, float min_freq);
-
-  int work (int noutput_items,
-	    gr_vector_const_void_star &input_items,
-	    gr_vector_void_star &output_items);
-private:
-  float phase_detector(gr_complex sample,float ref_phase);
-};
-
-#endif
diff --git a/gnuradio-core/src/lib/general/gr_pll_freqdet_cf.i b/gnuradio-core/src/lib/general/gr_pll_freqdet_cf.i
deleted file mode 100644
index 87e515adb8..0000000000
--- a/gnuradio-core/src/lib/general/gr_pll_freqdet_cf.i
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2011 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,pll_freqdet_cf)
-
-  gr_pll_freqdet_cf_sptr gr_make_pll_freqdet_cf (float loop_bw,
-						 float max_freq,
-						 float min_freq);
-
-class gr_pll_freqdet_cf : public gr_sync_block, public gri_control_loop
-{
- private:
-  gr_pll_freqdet_cf (float loop_bw, float max_freq, float min_freq);
-};
diff --git a/gnuradio-core/src/lib/general/gr_pll_refout_cc.cc b/gnuradio-core/src/lib/general/gr_pll_refout_cc.cc
deleted file mode 100644
index 9f95c3f64e..0000000000
--- a/gnuradio-core/src/lib/general/gr_pll_refout_cc.cc
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2010,2011 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 <gr_pll_refout_cc.h>
-#include <gr_io_signature.h>
-#include <gr_sincos.h>
-#include <math.h>
-#include <gr_math.h>
-
-#ifndef M_TWOPI
-#define M_TWOPI (2.0f*M_PI)
-#endif
-
-gr_pll_refout_cc_sptr
-gr_make_pll_refout_cc (float loop_bw, float max_freq, float min_freq)
-{
-  return gnuradio::get_initial_sptr(new gr_pll_refout_cc (loop_bw, max_freq, min_freq));
-}
-
-gr_pll_refout_cc::gr_pll_refout_cc (float loop_bw, float max_freq, float min_freq)
-  : gr_sync_block ("pll_refout_cc",
-		   gr_make_io_signature (1, 1, sizeof (gr_complex)),
-		   gr_make_io_signature (1, 1, sizeof (gr_complex))),
-    gri_control_loop(loop_bw, max_freq, min_freq)
-{
-}
-
-float
-gr_pll_refout_cc::mod_2pi (float in)
-{
-  if(in>M_PI)
-    return in-M_TWOPI;
-  else if(in<-M_PI)
-    return in+M_TWOPI;
-  else
-    return in;
-}
-
-float
-gr_pll_refout_cc::phase_detector(gr_complex sample,float ref_phase)
-{
-  float sample_phase;
-  sample_phase = gr_fast_atan2f(sample.imag(),sample.real());
-  return mod_2pi(sample_phase-ref_phase);
-}
-
-int
-gr_pll_refout_cc::work (int noutput_items,
-		   gr_vector_const_void_star &input_items,
-		   gr_vector_void_star &output_items)
-{
-  const gr_complex *iptr = (gr_complex *) input_items[0];
-  gr_complex *optr = (gr_complex *) output_items[0];
-
-  float error;
-  float t_imag, t_real;
-  int	size = noutput_items;
-
-  while (size-- > 0) {
-    gr_sincosf(d_phase,&t_imag,&t_real);
-    *optr++ = gr_complex(t_real,t_imag);
-
-    error = phase_detector(*iptr++,d_phase);
-
-    advance_loop(error);
-    phase_wrap();
-    frequency_limit();
-  }
-  return noutput_items;
-}
diff --git a/gnuradio-core/src/lib/general/gr_pll_refout_cc.h b/gnuradio-core/src/lib/general/gr_pll_refout_cc.h
deleted file mode 100644
index ef5cd31e27..0000000000
--- a/gnuradio-core/src/lib/general/gr_pll_refout_cc.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2011 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_PLL_REFOUT_CC_H
-#define INCLUDED_GR_PLL_REFOUT_CC_H
-
-#include <gr_core_api.h>
-#include <gr_sync_block.h>
-#include <gri_control_loop.h>
-
-class gr_pll_refout_cc;
-typedef boost::shared_ptr<gr_pll_refout_cc> gr_pll_refout_cc_sptr;
-
-GR_CORE_API gr_pll_refout_cc_sptr gr_make_pll_refout_cc (float loop_bw,
-					     float max_freq, float min_freq);
-/*!
- * \brief Implements a PLL which locks to the input frequency and outputs a carrier
- * \ingroup sync_blk
- *
- * input: stream of complex; output: stream of complex
- *
- * This PLL locks onto a [possibly noisy] reference carrier on
- * the input and outputs a clean version which is phase and frequency
- * aligned to it.
- *
- * All settings max_freq and min_freq are in terms of radians per sample,
- * NOT HERTZ.  The loop bandwidth determins the lock range and should be set
- * around pi/200 -- 2pi/100.
- * \sa gr_pll_freqdet_cf, gr_pll_carriertracking_cc
- */
-class GR_CORE_API gr_pll_refout_cc : public gr_sync_block, public gri_control_loop
-{
-  friend GR_CORE_API gr_pll_refout_cc_sptr gr_make_pll_refout_cc (float loop_bw,
-						      float max_freq, float min_freq);
-
-  gr_pll_refout_cc (float loop_bw, float max_freq, float min_freq);
-
-  int work (int noutput_items,
-	    gr_vector_const_void_star &input_items,
-	    gr_vector_void_star &output_items);
-private:
-  float mod_2pi (float in);
-  float phase_detector(gr_complex sample, float ref_phase);
-};
-
-#endif
diff --git a/gnuradio-core/src/lib/general/gr_pll_refout_cc.i b/gnuradio-core/src/lib/general/gr_pll_refout_cc.i
deleted file mode 100644
index 630c0444fa..0000000000
--- a/gnuradio-core/src/lib/general/gr_pll_refout_cc.i
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2011 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,pll_refout_cc)
-
-gr_pll_refout_cc_sptr gr_make_pll_refout_cc (float loop_bw,
-					     float max_freq, float min_freq);
-
-class gr_pll_refout_cc : public gr_sync_block, public gri_control_loop
-{
- private:
-  gr_pll_refout_cc (float loop_bw, float max_freq, float min_freq);
-};
author	Tom Rondeau <trondeau@vt.edu>	2012-11-01 10:50:10 -0400
committer	Tom Rondeau <trondeau@vt.edu>	2012-11-01 10:50:10 -0400
commit	1b83549181135e79ad00b9bae0d11ab27efa4148 (patch)
tree	6b036dd9d26423528f49bad563c199a25a33f646 /gnuradio-core/src/lib/general
parent	bbe599e4606b728c9610a17285b1e50f9e9d4dcb (diff)