summaryrefslogtreecommitdiff
path: root/gr-noaa/lib
diff options
context:
space:
mode:
Diffstat (limited to 'gr-noaa/lib')
-rw-r--r--gr-noaa/lib/CMakeLists.txt60
-rw-r--r--gr-noaa/lib/noaa_api.h33
-rw-r--r--gr-noaa/lib/noaa_hrpt.h39
-rw-r--r--gr-noaa/lib/noaa_hrpt_decoder.cc200
-rw-r--r--gr-noaa/lib/noaa_hrpt_decoder.h77
-rw-r--r--gr-noaa/lib/noaa_hrpt_deframer.cc126
-rw-r--r--gr-noaa/lib/noaa_hrpt_deframer.h58
-rw-r--r--gr-noaa/lib/noaa_hrpt_pll_cf.cc83
-rw-r--r--gr-noaa/lib/noaa_hrpt_pll_cf.h56
9 files changed, 0 insertions, 732 deletions
diff --git a/gr-noaa/lib/CMakeLists.txt b/gr-noaa/lib/CMakeLists.txt
deleted file mode 100644
index 3f369f8af..000000000
--- a/gr-noaa/lib/CMakeLists.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 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.
-
-########################################################################
-# Setup the include and linker paths
-########################################################################
-include_directories(
- ${GR_NOAA_INCLUDE_DIRS}
- ${GNURADIO_CORE_INCLUDE_DIRS}
- ${GRUEL_INCLUDE_DIRS}
- ${Boost_INCLUDE_DIRS}
-)
-
-link_directories(${Boost_LIBRARY_DIRS})
-
-########################################################################
-# Setup library
-########################################################################
-list(APPEND gr_noaa_sources
- noaa_hrpt_decoder.cc
- noaa_hrpt_deframer.cc
- noaa_hrpt_pll_cf.cc
-)
-
-list(APPEND noaa_libs
- gnuradio-core
- ${Boost_LIBRARIES}
-)
-
-add_library(gnuradio-noaa SHARED ${gr_noaa_sources})
-target_link_libraries(gnuradio-noaa ${noaa_libs})
-GR_LIBRARY_FOO(gnuradio-noaa RUNTIME_COMPONENT "noaa_runtime" DEVEL_COMPONENT "noaa_devel")
-
-########################################################################
-# Install header files
-########################################################################
-install(FILES
- noaa_api.h
- noaa_hrpt_decoder.h
- noaa_hrpt_deframer.h
- noaa_hrpt_pll_cf.h
- DESTINATION ${GR_INCLUDE_DIR}/gnuradio
- COMPONENT "noaa_devel"
-)
diff --git a/gr-noaa/lib/noaa_api.h b/gr-noaa/lib/noaa_api.h
deleted file mode 100644
index d3c3fbf2d..000000000
--- a/gr-noaa/lib/noaa_api.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 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_NOAA_API_H
-#define INCLUDED_NOAA_API_H
-
-#include <gruel/attributes.h>
-
-#ifdef gnuradio_noaa_EXPORTS
-# define NOAA_API __GR_ATTR_EXPORT
-#else
-# define NOAA_API __GR_ATTR_IMPORT
-#endif
-
-#endif /* INCLUDED_NOAA_API_H */
diff --git a/gr-noaa/lib/noaa_hrpt.h b/gr-noaa/lib/noaa_hrpt.h
deleted file mode 100644
index f0f0e53f4..000000000
--- a/gr-noaa/lib/noaa_hrpt.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009 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_NOAA_HRPT_H
-#define INCLUDED_NOAA_HRPT_H
-
-#define HRPT_SYNC1 0x0284
-#define HRPT_SYNC2 0x016F
-#define HRPT_SYNC3 0x035C
-#define HRPT_SYNC4 0x019D
-#define HRPT_SYNC5 0x020F
-#define HRPT_SYNC6 0x0095
-
-#define HRPT_MINOR_FRAME_SYNC 0x0A116FD719D83C95LL
-
-#define HRPT_SYNC_WORDS 6
-#define HRPT_MINOR_FRAME_WORDS 11090
-#define HRPT_BITS_PER_WORD 10
-
-#endif /* INCLUDED_NOAA_HRPT_H */
diff --git a/gr-noaa/lib/noaa_hrpt_decoder.cc b/gr-noaa/lib/noaa_hrpt_decoder.cc
deleted file mode 100644
index d6a063285..000000000
--- a/gr-noaa/lib/noaa_hrpt_decoder.cc
+++ /dev/null
@@ -1,200 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009 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 <noaa_hrpt_decoder.h>
-#include <noaa_hrpt.h>
-#include <gr_io_signature.h>
-#include <cstdio>
-
-static const char *hrpt_ids[] = {
- "000000",
- "NOAA11",
- "000002",
- "NOAA16",
- "000004",
- "000005",
- "000006",
- "NOAA15",
- "000008",
- "NOAA12",
- "000010",
- "NOAA17",
- "000012",
- "NOAA18",
- "000014",
- "NOAA19"
-};
-
-noaa_hrpt_decoder_sptr
-noaa_make_hrpt_decoder(bool verbose, bool output_files)
-{
- return gnuradio::get_initial_sptr(new noaa_hrpt_decoder(verbose, output_files));
-}
-
-noaa_hrpt_decoder::noaa_hrpt_decoder(bool verbose, bool output_files)
- : gr_sync_block("noaa_hrpt_decoder",
- gr_make_io_signature(1, 1, sizeof(short)),
- gr_make_io_signature(0, 0, 0)),
- d_verbose(verbose),
- d_output_files(output_files),
- d_word_num(0),
- d_frames_seen(0),
- d_current_mfnum(0),
- d_expected_mfnum(0),
- d_seq_errs(0),
- d_address(0),
- d_day_of_year(0),
- d_milliseconds(0),
- d_last_time(0)
-{
- // Start of capture processing here
-}
-
-int
-noaa_hrpt_decoder::work(int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items)
-{
- const unsigned short *in = (const unsigned short*)input_items[0];
-
- int i = 0;
- while (i < noutput_items) {
- d_current_word = in[i++] & 0x3FF;
- d_word_num++;
-
- // Per HRPT word processing here
-
- switch (d_word_num) {
- case 7:
- process_mfnum();
- process_address();
- break;
-
- case 9:
- process_day_of_year();
- break;
-
- case 10:
- process_milli1();
- break;
-
- case 11:
- process_milli2();
- break;
-
- case 12:
- process_milli3();
- break;
-
- default:
- break;
- }
-
- if (d_word_num == HRPT_MINOR_FRAME_WORDS) {
-
- // End of minor frame processing here
- d_frames_seen++;
- d_word_num = 0;
- fprintf(stderr, "\n");
- }
- }
-
- return i;
-}
-
-void
-noaa_hrpt_decoder::process_mfnum()
-{
- d_current_mfnum = (d_current_word & 0x180) >> 7;
-
- if (d_verbose)
- fprintf(stderr, "MF:");
-
- if (d_current_mfnum != d_expected_mfnum && d_frames_seen > 0) {
- d_seq_errs++;
-
- if (d_verbose)
- fprintf(stderr, "*");
- }
- else
- if (d_verbose)
- fprintf(stderr, " ");
-
- if (d_verbose)
- fprintf(stderr, "%i ", d_current_mfnum);
- d_expected_mfnum = (d_current_mfnum == 3) ? 1 : d_current_mfnum+1;
-}
-
-void
-noaa_hrpt_decoder::process_address()
-{
- d_address = ((d_current_word & 0x078) >> 3) & 0x000F;
-
- if (d_verbose)
- fprintf(stderr, "SA: %s ", hrpt_ids[d_address]);
-}
-
-void
-noaa_hrpt_decoder::process_day_of_year()
-{
- d_day_of_year = d_current_word >> 1;
-
- if (d_verbose)
- fprintf(stderr, "DOY: %3i ", d_day_of_year);
-}
-
-void
-noaa_hrpt_decoder::process_milli1()
-{
- d_milliseconds = (d_current_word & 0x7F) << 20;
-}
-
-void
-noaa_hrpt_decoder::process_milli2()
-{
- d_milliseconds |= (d_current_word << 10);
-}
-
-void
-noaa_hrpt_decoder::process_milli3()
-{
- d_milliseconds |= d_current_word;
- int delta = d_milliseconds - d_last_time;
- d_last_time = d_milliseconds;
-
- if (d_verbose)
- fprintf(stderr, "MS: %8i DT: %8i", d_milliseconds, delta);
-}
-
-noaa_hrpt_decoder::~noaa_hrpt_decoder()
-{
- // End of capture processing here
-
- if (d_verbose) {
- fprintf(stderr, "Frames seen: %10i\n", d_frames_seen);
- fprintf(stderr, "Sequence errors: %10i\n", d_seq_errs);
- }
-}
diff --git a/gr-noaa/lib/noaa_hrpt_decoder.h b/gr-noaa/lib/noaa_hrpt_decoder.h
deleted file mode 100644
index 3b3214b72..000000000
--- a/gr-noaa/lib/noaa_hrpt_decoder.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009 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_NOAA_HRPT_DECODER_H
-#define INCLUDED_NOAA_HRPT_DECODER_H
-
-#include <noaa_api.h>
-#include <gr_sync_block.h>
-
-class noaa_hrpt_decoder;
-typedef boost::shared_ptr<noaa_hrpt_decoder> noaa_hrpt_decoder_sptr;
-
-NOAA_API noaa_hrpt_decoder_sptr
-noaa_make_hrpt_decoder(bool verbose, bool output_files);
-
-class NOAA_API noaa_hrpt_decoder : public gr_sync_block
-{
- friend NOAA_API noaa_hrpt_decoder_sptr noaa_make_hrpt_decoder(bool verbose, bool output_files);
- noaa_hrpt_decoder(bool verbose, bool output_files);
-
- // Configuration
- bool d_verbose;
- bool d_output_files;
-
- // Frame-level state
- unsigned short d_current_word;
- unsigned int d_word_num;
- int d_frames_seen;
-
- // Minor frame number
- int d_current_mfnum;
- int d_expected_mfnum;
- int d_seq_errs;
-
- // Spacecraft address
- int d_address;
-
- // Minor frame timestamp
- int d_day_of_year;
- int d_milliseconds;
- int d_last_time;
-
- void process_mfnum();
- void process_address();
- void process_day_of_year();
- void process_milli1();
- void process_milli2();
- void process_milli3();
-
-public:
- ~noaa_hrpt_decoder();
-
- int work(int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items);
-};
-
-#endif /* INCLUDED_NOAA_HRPT_DECODER_H */
diff --git a/gr-noaa/lib/noaa_hrpt_deframer.cc b/gr-noaa/lib/noaa_hrpt_deframer.cc
deleted file mode 100644
index d668ccad3..000000000
--- a/gr-noaa/lib/noaa_hrpt_deframer.cc
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009 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 <noaa_hrpt_deframer.h>
-#include <gr_io_signature.h>
-#include <noaa_hrpt.h>
-#include <cstring>
-#include <cstdio>
-
-#define ST_IDLE 0
-#define ST_SYNCED 1
-
-noaa_hrpt_deframer_sptr
-noaa_make_hrpt_deframer()
-{
- return gnuradio::get_initial_sptr(new noaa_hrpt_deframer());
-}
-
-noaa_hrpt_deframer::noaa_hrpt_deframer()
- : gr_block("noaa_hrpt_deframer",
- gr_make_io_signature(1, 1, sizeof(char)),
- gr_make_io_signature(1, 1, sizeof(short)))
-{
- set_output_multiple(6); // room for writing full sync when received
- d_mid_bit = true;
- d_last_bit = 0;
- enter_idle();
-}
-
-void
-noaa_hrpt_deframer::enter_idle()
-{
- d_state = ST_IDLE;
-}
-
-void
-noaa_hrpt_deframer::enter_synced()
-{
- d_state = ST_SYNCED;
- d_bit_count = HRPT_BITS_PER_WORD;
- d_word_count = HRPT_MINOR_FRAME_WORDS-HRPT_SYNC_WORDS;
- d_word = 0;
-}
-
-int
-noaa_hrpt_deframer::general_work(int noutput_items,
- gr_vector_int &ninput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items)
-{
- int ninputs = ninput_items[0];
- const char *in = (const char *)input_items[0];
- unsigned short *out = (unsigned short *)output_items[0];
-
- int i = 0, j = 0;
- while (i < ninputs && j < noutput_items) {
- char bit = in[i++];
- char diff = bit^d_last_bit;
- d_last_bit = bit;
-
- // Wait for transition if not synced, otherwise, alternate bits
- if (d_mid_bit && (diff | (d_state == ST_SYNCED))) {
- switch (d_state) {
- case ST_IDLE:
- d_shifter = (d_shifter << 1) | bit; // MSB transmitted first
-
- if ((d_shifter & 0x0FFFFFFFFFFFFFFFLL) == HRPT_MINOR_FRAME_SYNC) {
- out[j++] = HRPT_SYNC1;
- out[j++] = HRPT_SYNC2;
- out[j++] = HRPT_SYNC3;
- out[j++] = HRPT_SYNC4;
- out[j++] = HRPT_SYNC5;
- out[j++] = HRPT_SYNC6;
- enter_synced();
- }
- break;
-
- case ST_SYNCED:
- d_word = (d_word << 1) | bit; // MSB transmitted first
- if (--d_bit_count == 0) {
- out[j++] = d_word;
- d_word = 0;
- d_bit_count = HRPT_BITS_PER_WORD;
- if (--d_word_count == 0) {
- enter_idle();
- }
- }
- break;
-
- default:
- throw std::runtime_error("noaa_hrpt_deframer: bad state\n");
- }
-
- d_mid_bit = false;
- }
- else {
- d_mid_bit = true;
- }
- }
-
- consume_each(i);
- return j;
-}
diff --git a/gr-noaa/lib/noaa_hrpt_deframer.h b/gr-noaa/lib/noaa_hrpt_deframer.h
deleted file mode 100644
index 475ad90f6..000000000
--- a/gr-noaa/lib/noaa_hrpt_deframer.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009 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_NOAA_HRPT_DEFRAMER_H
-#define INCLUDED_NOAA_HRPT_DEFRAMER_H
-
-#include <noaa_api.h>
-#include <gr_block.h>
-
-class noaa_hrpt_deframer;
-typedef boost::shared_ptr<noaa_hrpt_deframer> noaa_hrpt_deframer_sptr;
-
-NOAA_API noaa_hrpt_deframer_sptr
-noaa_make_hrpt_deframer();
-
-class NOAA_API noaa_hrpt_deframer : public gr_block
-{
- friend NOAA_API noaa_hrpt_deframer_sptr noaa_make_hrpt_deframer();
- noaa_hrpt_deframer();
-
- unsigned int d_state;
- bool d_mid_bit;
- unsigned char d_last_bit;
- unsigned int d_bit_count;
- unsigned int d_word_count;
- unsigned long long d_shifter; // 60 bit sync word
- unsigned short d_word; // 10 bit HRPT word
-
- void enter_idle();
- void enter_synced();
-
-public:
- int general_work(int noutput_items,
- gr_vector_int &ninput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items);
-};
-
-#endif /* INCLUDED_NOAA_HRPT_DEFRAMER_H */
diff --git a/gr-noaa/lib/noaa_hrpt_pll_cf.cc b/gr-noaa/lib/noaa_hrpt_pll_cf.cc
deleted file mode 100644
index ea948f04b..000000000
--- a/gr-noaa/lib/noaa_hrpt_pll_cf.cc
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009 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 <noaa_hrpt_pll_cf.h>
-#include <gr_io_signature.h>
-#include <gr_math.h>
-#include <gr_sincos.h>
-
-#define M_TWOPI (2*M_PI)
-
-noaa_hrpt_pll_cf_sptr
-noaa_make_hrpt_pll_cf(float alpha, float beta, float max_offset)
-{
- return gnuradio::get_initial_sptr(new noaa_hrpt_pll_cf(alpha, beta, max_offset));
-}
-
-noaa_hrpt_pll_cf::noaa_hrpt_pll_cf(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))),
- d_alpha(alpha), d_beta(beta), d_max_offset(max_offset),
- d_phase(0.0), d_freq(0.0)
-{
-}
-
-float
-phase_wrap(float phase)
-{
- while (phase < -M_PI)
- phase += M_TWOPI;
- while (phase > M_PI)
- phase -= M_TWOPI;
-
- return phase;
-}
-
-int
-noaa_hrpt_pll_cf::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];
- float *out = (float *) output_items[0];
-
- for (int i = 0; i < noutput_items; i++) {
-
- // Generate and mix out carrier
- float re, im;
- 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);
- d_phase = phase_wrap(d_phase + error*d_alpha + d_freq);
-
- }
-
- return noutput_items;
-}
diff --git a/gr-noaa/lib/noaa_hrpt_pll_cf.h b/gr-noaa/lib/noaa_hrpt_pll_cf.h
deleted file mode 100644
index 178dccfb3..000000000
--- a/gr-noaa/lib/noaa_hrpt_pll_cf.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009 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_NOAA_HRPT_PLL_CF_H
-#define INCLUDED_NOAA_HRPT_PLL_CF_H
-
-#include <noaa_api.h>
-#include <gr_sync_block.h>
-
-class noaa_hrpt_pll_cf;
-typedef boost::shared_ptr<noaa_hrpt_pll_cf> noaa_hrpt_pll_cf_sptr;
-
-NOAA_API noaa_hrpt_pll_cf_sptr
-noaa_make_hrpt_pll_cf(float alpha, float beta, float max_offset);
-
-class NOAA_API noaa_hrpt_pll_cf : public gr_sync_block
-{
- friend NOAA_API noaa_hrpt_pll_cf_sptr noaa_make_hrpt_pll_cf(float alpha, float beta, float max_offset);
- noaa_hrpt_pll_cf(float alpha, float beta, float max_offset);
-
- float d_alpha; // 1st order loop constant
- float d_beta; // 2nd order loop constant
- float d_max_offset; // Maximum frequency offset, radians/sample
- float d_phase; // Instantaneous carrier phase
- float d_freq; // Instantaneous carrier frequency, radians/sample
-
- public:
- virtual int work(int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items);
-
- void set_alpha(float alpha) { d_alpha = alpha; }
- void set_beta(float beta) { d_beta = beta; }
- void set_max_offset(float max_offset) { d_max_offset = max_offset; }
-};
-
-#endif /* INCLUDED_NOAA_HRPT_PLL_CF_H */