summaryrefslogtreecommitdiff
path: root/gr-noaa
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2013-04-17 13:43:52 -0400
committerTom Rondeau <trondeau@vt.edu>2013-04-29 14:52:56 -0400
commitf3e2e07201c50033bf6c9d0c6a6f068557b4f17f (patch)
tree140b3c2d20a951ffd4abd564c3378ee2e2f9fc7c /gr-noaa
parent35303ae975a5b1bdecc2492bc96e2b8e89b62a3d (diff)
runtime: converting runtime core to gr namespace, gnuradio include dir.
Diffstat (limited to 'gr-noaa')
-rw-r--r--gr-noaa/include/noaa/api.h2
-rw-r--r--gr-noaa/include/noaa/hrpt_decoder.h4
-rw-r--r--gr-noaa/include/noaa/hrpt_deframer.h4
-rw-r--r--gr-noaa/include/noaa/hrpt_pll_cf.h4
-rw-r--r--gr-noaa/lib/hrpt_decoder_impl.cc8
-rw-r--r--gr-noaa/lib/hrpt_deframer_impl.cc8
-rw-r--r--gr-noaa/lib/hrpt_pll_cf_impl.cc18
7 files changed, 24 insertions, 24 deletions
diff --git a/gr-noaa/include/noaa/api.h b/gr-noaa/include/noaa/api.h
index 86bc8eb077..d30cbf4746 100644
--- a/gr-noaa/include/noaa/api.h
+++ b/gr-noaa/include/noaa/api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_NOAA_API_H
#define INCLUDED_NOAA_API_H
-#include <attributes.h>
+#include <gnuradio/attributes.h>
#ifdef gnuradio_noaa_EXPORTS
# define NOAA_API __GR_ATTR_EXPORT
diff --git a/gr-noaa/include/noaa/hrpt_decoder.h b/gr-noaa/include/noaa/hrpt_decoder.h
index 0eab88375a..cdb9e4640f 100644
--- a/gr-noaa/include/noaa/hrpt_decoder.h
+++ b/gr-noaa/include/noaa/hrpt_decoder.h
@@ -24,7 +24,7 @@
#define INCLUDED_NOAA_HRPT_DECODER_H
#include <noaa/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace noaa {
@@ -33,7 +33,7 @@ namespace gr {
* \brief NOAA HRPT Decoder
* \ingroup noaa_blk
*/
- class NOAA_API hrpt_decoder : virtual public gr_sync_block
+ class NOAA_API hrpt_decoder : virtual public sync_block
{
public:
// gr::noaa::hrpt_decoder::sptr
diff --git a/gr-noaa/include/noaa/hrpt_deframer.h b/gr-noaa/include/noaa/hrpt_deframer.h
index 4e319b9054..a8032a7879 100644
--- a/gr-noaa/include/noaa/hrpt_deframer.h
+++ b/gr-noaa/include/noaa/hrpt_deframer.h
@@ -24,7 +24,7 @@
#define INCLUDED_NOAA_HRPT_DEFRAMER_H
#include <noaa/api.h>
-#include <gr_block.h>
+#include <gnuradio/block.h>
namespace gr {
namespace noaa {
@@ -33,7 +33,7 @@ namespace gr {
* \brief NOAA HRPT Deframer
* \ingroup noaa_blk
*/
- class NOAA_API hrpt_deframer : virtual public gr_block
+ class NOAA_API hrpt_deframer : virtual public block
{
public:
// gr::noaa::hrpt_deframer::sptr
diff --git a/gr-noaa/include/noaa/hrpt_pll_cf.h b/gr-noaa/include/noaa/hrpt_pll_cf.h
index b9d746b90c..469f426673 100644
--- a/gr-noaa/include/noaa/hrpt_pll_cf.h
+++ b/gr-noaa/include/noaa/hrpt_pll_cf.h
@@ -24,7 +24,7 @@
#define INCLUDED_NOAA_HRPT_PLL_CF_H
#include <noaa/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/sync_block.h>
namespace gr {
namespace noaa {
@@ -33,7 +33,7 @@ namespace gr {
* \brief NOAA HRPT PLL
* \ingroup noaa_blk
*/
- class NOAA_API hrpt_pll_cf : virtual public gr_sync_block
+ class NOAA_API hrpt_pll_cf : virtual public sync_block
{
public:
// gr::noaa::hrpt_pll_cf::sptr
diff --git a/gr-noaa/lib/hrpt_decoder_impl.cc b/gr-noaa/lib/hrpt_decoder_impl.cc
index 76155ac547..2f84d464f4 100644
--- a/gr-noaa/lib/hrpt_decoder_impl.cc
+++ b/gr-noaa/lib/hrpt_decoder_impl.cc
@@ -26,7 +26,7 @@
#include "hrpt_decoder_impl.h"
#include <noaa/hrpt.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <cstdio>
namespace gr {
@@ -59,9 +59,9 @@ namespace gr {
}
hrpt_decoder_impl::hrpt_decoder_impl(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)),
+ : sync_block("noaa_hrpt_decoder",
+ io_signature::make(1, 1, sizeof(short)),
+ io_signature::make(0, 0, 0)),
d_verbose(verbose),
d_output_files(output_files),
d_word_num(0),
diff --git a/gr-noaa/lib/hrpt_deframer_impl.cc b/gr-noaa/lib/hrpt_deframer_impl.cc
index cd6d0800db..e412a18b9b 100644
--- a/gr-noaa/lib/hrpt_deframer_impl.cc
+++ b/gr-noaa/lib/hrpt_deframer_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "hrpt_deframer_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <noaa/hrpt.h>
#include <cstring>
#include <cstdio>
@@ -44,9 +44,9 @@ namespace gr {
}
hrpt_deframer_impl::hrpt_deframer_impl()
- : gr_block("noaa_hrpt_deframer",
- gr_make_io_signature(1, 1, sizeof(char)),
- gr_make_io_signature(1, 1, sizeof(short)))
+ : block("noaa_hrpt_deframer",
+ io_signature::make(1, 1, sizeof(char)),
+ io_signature::make(1, 1, sizeof(short)))
{
set_output_multiple(6); // room for writing full sync when received
d_mid_bit = true;
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);
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-13 18:04:39 +0000