diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-18 11:40:46 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-18 11:42:40 -0400 |
| commit | 26efdd6c2e70d06c5b5d01bddfe2c30ca4206a2e (patch) | |
| tree | 2c9c10776594864ba51d4fc3cd722dc6ef9723d2 /gr-analog/lib | |
| parent | 929a26c3542c3c12d5eafc1fb4d3eb9da4cca0bd (diff) | |
analog, digital: fixed control_loop-derived blocks to inherit control_loop functions through SWIG.
Diffstat (limited to 'gr-analog/lib')
| -rw-r--r-- | gr-analog/lib/pll_carriertracking_cc_impl.h | 4 | ||||
| -rw-r--r-- | gr-analog/lib/pll_freqdet_cf_impl.h | 4 | ||||
| -rw-r--r-- | gr-analog/lib/pll_refout_cc_impl.h | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/gr-analog/lib/pll_carriertracking_cc_impl.h b/gr-analog/lib/pll_carriertracking_cc_impl.h index 54de4442d1..c809736709 100644 --- a/gr-analog/lib/pll_carriertracking_cc_impl.h +++ b/gr-analog/lib/pll_carriertracking_cc_impl.h @@ -24,13 +24,11 @@ #define INCLUDED_ANALOG_PLL_CARRIERTRACKING_CC_IMPL_H #include <analog/pll_carriertracking_cc.h> -#include <blocks/control_loop.h> namespace gr { namespace analog { - class pll_carriertracking_cc_impl - : public pll_carriertracking_cc, public blocks::control_loop + class pll_carriertracking_cc_impl : public pll_carriertracking_cc { private: float d_locksig,d_lock_threshold; diff --git a/gr-analog/lib/pll_freqdet_cf_impl.h b/gr-analog/lib/pll_freqdet_cf_impl.h index 10bcdc2157..3170d819b6 100644 --- a/gr-analog/lib/pll_freqdet_cf_impl.h +++ b/gr-analog/lib/pll_freqdet_cf_impl.h @@ -24,13 +24,11 @@ #define INCLUDED_ANALOG_PLL_FREQDET_CF_IMPL_H #include <analog/pll_freqdet_cf.h> -#include <blocks/control_loop.h> namespace gr { namespace analog { - class pll_freqdet_cf_impl : - public pll_freqdet_cf, public blocks::control_loop + class pll_freqdet_cf_impl : public pll_freqdet_cf { private: float phase_detector(gr_complex sample,float ref_phase); diff --git a/gr-analog/lib/pll_refout_cc_impl.h b/gr-analog/lib/pll_refout_cc_impl.h index f8572f9b64..1734b6e138 100644 --- a/gr-analog/lib/pll_refout_cc_impl.h +++ b/gr-analog/lib/pll_refout_cc_impl.h @@ -24,13 +24,11 @@ #define INCLUDED_ANALOG_PLL_REFOUT_CC_IMPL_H #include <analog/pll_refout_cc.h> -#include <blocks/control_loop.h> namespace gr { namespace analog { - class pll_refout_cc_impl - : public pll_refout_cc, public blocks::control_loop + class pll_refout_cc_impl : public pll_refout_cc { private: float mod_2pi (float in); |