summaryrefslogtreecommitdiff
path: root/gr-analog/lib
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2013-03-10 16:35:53 -0400
committerTom Rondeau <trondeau@vt.edu>2013-03-10 16:35:53 -0400
commit1bc6349e4714c5c4856b3abb95dc5f6b15c44281 (patch)
treeb8d2235a2ad78b4238f469efa4f660fb2b7b7233 /gr-analog/lib
parentc6cd7e06279546629a7fd221324d50844f6fdc69 (diff)
blocks: removing gri_control_loop; using gr::blocks::control_loop now.
Diffstat (limited to 'gr-analog/lib')
-rw-r--r--gr-analog/lib/pll_carriertracking_cc_impl.cc36
-rw-r--r--gr-analog/lib/pll_carriertracking_cc_impl.h4
-rw-r--r--gr-analog/lib/pll_freqdet_cf_impl.cc34
-rw-r--r--gr-analog/lib/pll_freqdet_cf_impl.h4
-rw-r--r--gr-analog/lib/pll_refout_cc_impl.cc36
-rw-r--r--gr-analog/lib/pll_refout_cc_impl.h4
6 files changed, 59 insertions, 59 deletions
diff --git a/gr-analog/lib/pll_carriertracking_cc_impl.cc b/gr-analog/lib/pll_carriertracking_cc_impl.cc
index c53e0f4332..9213a5e681 100644
--- a/gr-analog/lib/pll_carriertracking_cc_impl.cc
+++ b/gr-analog/lib/pll_carriertracking_cc_impl.cc
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2006,2010-2012 Free Software Foundation, Inc.
+ * Copyright 2006,2010-2013 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -50,7 +50,7 @@ namespace gr {
: 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),
+ blocks::control_loop(loop_bw, max_freq, min_freq),
d_locksig(0), d_lock_threshold(0), d_squelch_enable(false)
{
}
@@ -130,98 +130,98 @@ namespace gr {
void
pll_carriertracking_cc_impl::set_loop_bandwidth(float bw)
{
- gri_control_loop::set_loop_bandwidth(bw);
+ blocks::control_loop::set_loop_bandwidth(bw);
}
void
pll_carriertracking_cc_impl::set_damping_factor(float df)
{
- gri_control_loop::set_damping_factor(df);
+ blocks::control_loop::set_damping_factor(df);
}
void
pll_carriertracking_cc_impl::set_alpha(float alpha)
{
- gri_control_loop::set_alpha(alpha);
+ blocks::control_loop::set_alpha(alpha);
}
void
pll_carriertracking_cc_impl::set_beta(float beta)
{
- gri_control_loop::set_beta(beta);
+ blocks::control_loop::set_beta(beta);
}
void
pll_carriertracking_cc_impl::set_frequency(float freq)
{
- gri_control_loop::set_frequency(freq);
+ blocks::control_loop::set_frequency(freq);
}
void
pll_carriertracking_cc_impl::set_phase(float phase)
{
- gri_control_loop::set_phase(phase);
+ blocks::control_loop::set_phase(phase);
}
void
pll_carriertracking_cc_impl::set_min_freq(float freq)
{
- gri_control_loop::set_min_freq(freq);
+ blocks::control_loop::set_min_freq(freq);
}
void
pll_carriertracking_cc_impl::set_max_freq(float freq)
{
- gri_control_loop::set_max_freq(freq);
+ blocks::control_loop::set_max_freq(freq);
}
float
pll_carriertracking_cc_impl::get_loop_bandwidth() const
{
- return gri_control_loop::get_loop_bandwidth();
+ return blocks::control_loop::get_loop_bandwidth();
}
float
pll_carriertracking_cc_impl::get_damping_factor() const
{
- return gri_control_loop::get_damping_factor();
+ return blocks::control_loop::get_damping_factor();
}
float
pll_carriertracking_cc_impl::get_alpha() const
{
- return gri_control_loop::get_alpha();
+ return blocks::control_loop::get_alpha();
}
float
pll_carriertracking_cc_impl::get_beta() const
{
- return gri_control_loop::get_beta();
+ return blocks::control_loop::get_beta();
}
float
pll_carriertracking_cc_impl::get_frequency() const
{
- return gri_control_loop::get_frequency();
+ return blocks::control_loop::get_frequency();
}
float
pll_carriertracking_cc_impl::get_phase() const
{
- return gri_control_loop::get_phase();
+ return blocks::control_loop::get_phase();
}
float
pll_carriertracking_cc_impl::get_min_freq() const
{
- return gri_control_loop::get_min_freq();
+ return blocks::control_loop::get_min_freq();
}
float
pll_carriertracking_cc_impl::get_max_freq() const
{
- return gri_control_loop::get_max_freq();
+ return blocks::control_loop::get_max_freq();
}
} /* namespace analog */
diff --git a/gr-analog/lib/pll_carriertracking_cc_impl.h b/gr-analog/lib/pll_carriertracking_cc_impl.h
index d67223db82..54de4442d1 100644
--- a/gr-analog/lib/pll_carriertracking_cc_impl.h
+++ b/gr-analog/lib/pll_carriertracking_cc_impl.h
@@ -24,13 +24,13 @@
#define INCLUDED_ANALOG_PLL_CARRIERTRACKING_CC_IMPL_H
#include <analog/pll_carriertracking_cc.h>
-#include <gri_control_loop.h>
+#include <blocks/control_loop.h>
namespace gr {
namespace analog {
class pll_carriertracking_cc_impl
- : public pll_carriertracking_cc, public gri_control_loop
+ : public pll_carriertracking_cc, public blocks::control_loop
{
private:
float d_locksig,d_lock_threshold;
diff --git a/gr-analog/lib/pll_freqdet_cf_impl.cc b/gr-analog/lib/pll_freqdet_cf_impl.cc
index 27e8d02aa4..9e55d9bedb 100644
--- a/gr-analog/lib/pll_freqdet_cf_impl.cc
+++ b/gr-analog/lib/pll_freqdet_cf_impl.cc
@@ -47,7 +47,7 @@ namespace gr {
: 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)
+ blocks::control_loop(loop_bw, max_freq, min_freq)
{
}
@@ -100,98 +100,98 @@ namespace gr {
void
pll_freqdet_cf_impl::set_loop_bandwidth(float bw)
{
- gri_control_loop::set_loop_bandwidth(bw);
+ blocks::control_loop::set_loop_bandwidth(bw);
}
void
pll_freqdet_cf_impl::set_damping_factor(float df)
{
- gri_control_loop::set_damping_factor(df);
+ blocks::control_loop::set_damping_factor(df);
}
void
pll_freqdet_cf_impl::set_alpha(float alpha)
{
- gri_control_loop::set_alpha(alpha);
+ blocks::control_loop::set_alpha(alpha);
}
void
pll_freqdet_cf_impl::set_beta(float beta)
{
- gri_control_loop::set_beta(beta);
+ blocks::control_loop::set_beta(beta);
}
void
pll_freqdet_cf_impl::set_frequency(float freq)
{
- gri_control_loop::set_frequency(freq);
+ blocks::control_loop::set_frequency(freq);
}
void
pll_freqdet_cf_impl::set_phase(float phase)
{
- gri_control_loop::set_phase(phase);
+ blocks::control_loop::set_phase(phase);
}
void
pll_freqdet_cf_impl::set_min_freq(float freq)
{
- gri_control_loop::set_min_freq(freq);
+ blocks::control_loop::set_min_freq(freq);
}
void
pll_freqdet_cf_impl::set_max_freq(float freq)
{
- gri_control_loop::set_max_freq(freq);
+ blocks::control_loop::set_max_freq(freq);
}
float
pll_freqdet_cf_impl::get_loop_bandwidth() const
{
- return gri_control_loop::get_loop_bandwidth();
+ return blocks::control_loop::get_loop_bandwidth();
}
float
pll_freqdet_cf_impl::get_damping_factor() const
{
- return gri_control_loop::get_damping_factor();
+ return blocks::control_loop::get_damping_factor();
}
float
pll_freqdet_cf_impl::get_alpha() const
{
- return gri_control_loop::get_alpha();
+ return blocks::control_loop::get_alpha();
}
float
pll_freqdet_cf_impl::get_beta() const
{
- return gri_control_loop::get_beta();
+ return blocks::control_loop::get_beta();
}
float
pll_freqdet_cf_impl::get_frequency() const
{
- return gri_control_loop::get_frequency();
+ return blocks::control_loop::get_frequency();
}
float
pll_freqdet_cf_impl::get_phase() const
{
- return gri_control_loop::get_phase();
+ return blocks::control_loop::get_phase();
}
float
pll_freqdet_cf_impl::get_min_freq() const
{
- return gri_control_loop::get_min_freq();
+ return blocks::control_loop::get_min_freq();
}
float
pll_freqdet_cf_impl::get_max_freq() const
{
- return gri_control_loop::get_max_freq();
+ return blocks::control_loop::get_max_freq();
}
} /* namespace analog */
diff --git a/gr-analog/lib/pll_freqdet_cf_impl.h b/gr-analog/lib/pll_freqdet_cf_impl.h
index 7acf53ebbf..10bcdc2157 100644
--- a/gr-analog/lib/pll_freqdet_cf_impl.h
+++ b/gr-analog/lib/pll_freqdet_cf_impl.h
@@ -24,13 +24,13 @@
#define INCLUDED_ANALOG_PLL_FREQDET_CF_IMPL_H
#include <analog/pll_freqdet_cf.h>
-#include <gri_control_loop.h>
+#include <blocks/control_loop.h>
namespace gr {
namespace analog {
class pll_freqdet_cf_impl :
- public pll_freqdet_cf, public gri_control_loop
+ public pll_freqdet_cf, public blocks::control_loop
{
private:
float phase_detector(gr_complex sample,float ref_phase);
diff --git a/gr-analog/lib/pll_refout_cc_impl.cc b/gr-analog/lib/pll_refout_cc_impl.cc
index b94e3660a3..3f0ccc7df5 100644
--- a/gr-analog/lib/pll_refout_cc_impl.cc
+++ b/gr-analog/lib/pll_refout_cc_impl.cc
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004,2010-2012 Free Software Foundation, Inc.
+ * Copyright 2004,2010-2013 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -48,7 +48,7 @@ namespace gr {
: 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)
+ blocks::control_loop(loop_bw, max_freq, min_freq)
{
}
@@ -103,98 +103,98 @@ namespace gr {
void
pll_refout_cc_impl::set_loop_bandwidth(float bw)
{
- gri_control_loop::set_loop_bandwidth(bw);
+ blocks::control_loop::set_loop_bandwidth(bw);
}
void
pll_refout_cc_impl::set_damping_factor(float df)
{
- gri_control_loop::set_damping_factor(df);
+ blocks::control_loop::set_damping_factor(df);
}
void
pll_refout_cc_impl::set_alpha(float alpha)
{
- gri_control_loop::set_alpha(alpha);
+ blocks::control_loop::set_alpha(alpha);
}
void
pll_refout_cc_impl::set_beta(float beta)
{
- gri_control_loop::set_beta(beta);
+ blocks::control_loop::set_beta(beta);
}
void
pll_refout_cc_impl::set_frequency(float freq)
{
- gri_control_loop::set_frequency(freq);
+ blocks::control_loop::set_frequency(freq);
}
void
pll_refout_cc_impl::set_phase(float phase)
{
- gri_control_loop::set_phase(phase);
+ blocks::control_loop::set_phase(phase);
}
void
pll_refout_cc_impl::set_min_freq(float freq)
{
- gri_control_loop::set_min_freq(freq);
+ blocks::control_loop::set_min_freq(freq);
}
void
pll_refout_cc_impl::set_max_freq(float freq)
{
- gri_control_loop::set_max_freq(freq);
+ blocks::control_loop::set_max_freq(freq);
}
float
pll_refout_cc_impl::get_loop_bandwidth() const
{
- return gri_control_loop::get_loop_bandwidth();
+ return blocks::control_loop::get_loop_bandwidth();
}
float
pll_refout_cc_impl::get_damping_factor() const
{
- return gri_control_loop::get_damping_factor();
+ return blocks::control_loop::get_damping_factor();
}
float
pll_refout_cc_impl::get_alpha() const
{
- return gri_control_loop::get_alpha();
+ return blocks::control_loop::get_alpha();
}
float
pll_refout_cc_impl::get_beta() const
{
- return gri_control_loop::get_beta();
+ return blocks::control_loop::get_beta();
}
float
pll_refout_cc_impl::get_frequency() const
{
- return gri_control_loop::get_frequency();
+ return blocks::control_loop::get_frequency();
}
float
pll_refout_cc_impl::get_phase() const
{
- return gri_control_loop::get_phase();
+ return blocks::control_loop::get_phase();
}
float
pll_refout_cc_impl::get_min_freq() const
{
- return gri_control_loop::get_min_freq();
+ return blocks::control_loop::get_min_freq();
}
float
pll_refout_cc_impl::get_max_freq() const
{
- return gri_control_loop::get_max_freq();
+ return blocks::control_loop::get_max_freq();
}
} /* namespace analog */
diff --git a/gr-analog/lib/pll_refout_cc_impl.h b/gr-analog/lib/pll_refout_cc_impl.h
index 9e8ae286b1..f8572f9b64 100644
--- a/gr-analog/lib/pll_refout_cc_impl.h
+++ b/gr-analog/lib/pll_refout_cc_impl.h
@@ -24,13 +24,13 @@
#define INCLUDED_ANALOG_PLL_REFOUT_CC_IMPL_H
#include <analog/pll_refout_cc.h>
-#include <gri_control_loop.h>
+#include <blocks/control_loop.h>
namespace gr {
namespace analog {
class pll_refout_cc_impl
- : public pll_refout_cc, public gri_control_loop
+ : public pll_refout_cc, public blocks::control_loop
{
private:
float mod_2pi (float in);
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-18 00:09:09 +0000