diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-04-17 13:43:52 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-04-29 14:52:56 -0400 |
| commit | f3e2e07201c50033bf6c9d0c6a6f068557b4f17f (patch) | |
| tree | 140b3c2d20a951ffd4abd564c3378ee2e2f9fc7c /gr-noaa/lib/hrpt_pll_cf_impl.cc | |
| parent | 35303ae975a5b1bdecc2492bc96e2b8e89b62a3d (diff) | |
runtime: converting runtime core to gr namespace, gnuradio include dir.
Diffstat (limited to 'gr-noaa/lib/hrpt_pll_cf_impl.cc')
| -rw-r--r-- | gr-noaa/lib/hrpt_pll_cf_impl.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gr-noaa/lib/hrpt_pll_cf_impl.cc b/gr-noaa/lib/hrpt_pll_cf_impl.cc index 17114ef302..fc0d32408d 100644 --- a/gr-noaa/lib/hrpt_pll_cf_impl.cc +++ b/gr-noaa/lib/hrpt_pll_cf_impl.cc @@ -25,9 +25,9 @@ #endif #include "hrpt_pll_cf_impl.h" -#include <gr_io_signature.h> -#include <gr_math.h> -#include <gr_sincos.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/math.h> +#include <gnuradio/sincos.h> namespace gr { namespace noaa { @@ -53,9 +53,9 @@ namespace gr { } hrpt_pll_cf_impl::hrpt_pll_cf_impl(float alpha, float beta, float max_offset) - : gr_sync_block("noaa_hrpt_pll_cf", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(1, 1, sizeof(float))), + : sync_block("noaa_hrpt_pll_cf", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(1, 1, sizeof(float))), d_alpha(alpha), d_beta(beta), d_max_offset(max_offset), d_phase(0.0), d_freq(0.0) { @@ -77,12 +77,12 @@ namespace gr { // Generate and mix out carrier float re, im; - gr_sincosf(d_phase, &im, &re); + gr::sincosf(d_phase, &im, &re); out[i] = (in[i]*gr_complex(re, -im)).imag(); // Adjust PLL phase/frequency - float error = phase_wrap(gr_fast_atan2f(in[i].imag(), in[i].real()) - d_phase); - d_freq = gr_branchless_clip(d_freq + error*d_beta, d_max_offset); + float error = phase_wrap(gr::fast_atan2f(in[i].imag(), in[i].real()) - d_phase); + d_freq = gr::branchless_clip(d_freq + error*d_beta, d_max_offset); d_phase = phase_wrap(d_phase + error*d_alpha + d_freq); } |