summaryrefslogtreecommitdiff
path: root/gr-noaa
diff options
context:
space:
mode:
authorBen Reynwar <ben@reynwar.net>2013-05-19 02:55:33 -0700
committerBen Reynwar <ben@reynwar.net>2013-05-19 02:55:33 -0700
commitbb01988e75d50d82cbb44c1a49c86c1d08f05665 (patch)
tree0528dac14476d37f2cde7374a8fcb3428f879c69 /gr-noaa
parente4f0319eced22c112f7e6a4cc45bc2036d285332 (diff)
parent0fa219774dcf9141ae91204f948c029b05673f3f (diff)
Merged in next_docs branch.
Diffstat (limited to 'gr-noaa')
-rw-r--r--gr-noaa/CMakeLists.txt2
-rw-r--r--gr-noaa/include/gnuradio/noaa/CMakeLists.txt (renamed from gr-noaa/include/noaa/CMakeLists.txt)0
-rw-r--r--gr-noaa/include/gnuradio/noaa/api.h (renamed from gr-noaa/include/noaa/api.h)2
-rw-r--r--gr-noaa/include/gnuradio/noaa/hrpt.h (renamed from gr-noaa/include/noaa/hrpt.h)0
-rw-r--r--gr-noaa/include/gnuradio/noaa/hrpt_decoder.h (renamed from gr-noaa/include/noaa/hrpt_decoder.h)6
-rw-r--r--gr-noaa/include/gnuradio/noaa/hrpt_deframer.h (renamed from gr-noaa/include/noaa/hrpt_deframer.h)6
-rw-r--r--gr-noaa/include/gnuradio/noaa/hrpt_pll_cf.h (renamed from gr-noaa/include/noaa/hrpt_pll_cf.h)6
-rw-r--r--gr-noaa/lib/hrpt_decoder_impl.cc10
-rw-r--r--gr-noaa/lib/hrpt_decoder_impl.h2
-rw-r--r--gr-noaa/lib/hrpt_deframer_impl.cc10
-rw-r--r--gr-noaa/lib/hrpt_deframer_impl.h2
-rw-r--r--gr-noaa/lib/hrpt_pll_cf_impl.cc18
-rw-r--r--gr-noaa/lib/hrpt_pll_cf_impl.h2
-rw-r--r--gr-noaa/swig/CMakeLists.txt2
-rw-r--r--gr-noaa/swig/noaa_swig.i12
15 files changed, 40 insertions, 40 deletions
diff --git a/gr-noaa/CMakeLists.txt b/gr-noaa/CMakeLists.txt
index 2688d88ded..d4fe53ecf1 100644
--- a/gr-noaa/CMakeLists.txt
+++ b/gr-noaa/CMakeLists.txt
@@ -85,7 +85,7 @@ CPACK_COMPONENT("noaa_swig"
########################################################################
# Add subdirectories
########################################################################
-add_subdirectory(include/noaa)
+add_subdirectory(include/gnuradio/noaa)
add_subdirectory(lib)
if(ENABLE_PYTHON)
add_subdirectory(swig)
diff --git a/gr-noaa/include/noaa/CMakeLists.txt b/gr-noaa/include/gnuradio/noaa/CMakeLists.txt
index a3a18d2c26..a3a18d2c26 100644
--- a/gr-noaa/include/noaa/CMakeLists.txt
+++ b/gr-noaa/include/gnuradio/noaa/CMakeLists.txt
diff --git a/gr-noaa/include/noaa/api.h b/gr-noaa/include/gnuradio/noaa/api.h
index 86bc8eb077..d30cbf4746 100644
--- a/gr-noaa/include/noaa/api.h
+++ b/gr-noaa/include/gnuradio/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.h b/gr-noaa/include/gnuradio/noaa/hrpt.h
index f0f0e53f4d..f0f0e53f4d 100644
--- a/gr-noaa/include/noaa/hrpt.h
+++ b/gr-noaa/include/gnuradio/noaa/hrpt.h
diff --git a/gr-noaa/include/noaa/hrpt_decoder.h b/gr-noaa/include/gnuradio/noaa/hrpt_decoder.h
index 0eab88375a..1a8882633e 100644
--- a/gr-noaa/include/noaa/hrpt_decoder.h
+++ b/gr-noaa/include/gnuradio/noaa/hrpt_decoder.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_NOAA_HRPT_DECODER_H
#define INCLUDED_NOAA_HRPT_DECODER_H
-#include <noaa/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/noaa/api.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/gnuradio/noaa/hrpt_deframer.h
index 4e319b9054..cafb2334e8 100644
--- a/gr-noaa/include/noaa/hrpt_deframer.h
+++ b/gr-noaa/include/gnuradio/noaa/hrpt_deframer.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_NOAA_HRPT_DEFRAMER_H
#define INCLUDED_NOAA_HRPT_DEFRAMER_H
-#include <noaa/api.h>
-#include <gr_block.h>
+#include <gnuradio/noaa/api.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/gnuradio/noaa/hrpt_pll_cf.h
index b9d746b90c..d66663da01 100644
--- a/gr-noaa/include/noaa/hrpt_pll_cf.h
+++ b/gr-noaa/include/gnuradio/noaa/hrpt_pll_cf.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_NOAA_HRPT_PLL_CF_H
#define INCLUDED_NOAA_HRPT_PLL_CF_H
-#include <noaa/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/noaa/api.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..dc7b8f0ec2 100644
--- a/gr-noaa/lib/hrpt_decoder_impl.cc
+++ b/gr-noaa/lib/hrpt_decoder_impl.cc
@@ -25,8 +25,8 @@
#endif
#include "hrpt_decoder_impl.h"
-#include <noaa/hrpt.h>
-#include <gr_io_signature.h>
+#include <gnuradio/noaa/hrpt.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_decoder_impl.h b/gr-noaa/lib/hrpt_decoder_impl.h
index e242c48e0c..9a43c98acd 100644
--- a/gr-noaa/lib/hrpt_decoder_impl.h
+++ b/gr-noaa/lib/hrpt_decoder_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_NOAA_HRPT_DECODER_IMPL_H
#define INCLUDED_NOAA_HRPT_DECODER_IMPL_H
-#include <noaa/hrpt_decoder.h>
+#include <gnuradio/noaa/hrpt_decoder.h>
namespace gr {
namespace noaa {
diff --git a/gr-noaa/lib/hrpt_deframer_impl.cc b/gr-noaa/lib/hrpt_deframer_impl.cc
index cd6d0800db..65bff09adb 100644
--- a/gr-noaa/lib/hrpt_deframer_impl.cc
+++ b/gr-noaa/lib/hrpt_deframer_impl.cc
@@ -25,8 +25,8 @@
#endif
#include "hrpt_deframer_impl.h"
-#include <gr_io_signature.h>
-#include <noaa/hrpt.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/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_deframer_impl.h b/gr-noaa/lib/hrpt_deframer_impl.h
index 9bad0b87bf..d654f9f606 100644
--- a/gr-noaa/lib/hrpt_deframer_impl.h
+++ b/gr-noaa/lib/hrpt_deframer_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_NOAA_HRPT_DEFRAMER_IMPL_H
#define INCLUDED_NOAA_HRPT_DEFRAMER_IMPL_H
-#include <noaa/hrpt_deframer.h>
+#include <gnuradio/noaa/hrpt_deframer.h>
namespace gr {
namespace noaa {
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);
}
diff --git a/gr-noaa/lib/hrpt_pll_cf_impl.h b/gr-noaa/lib/hrpt_pll_cf_impl.h
index cc0c36137e..40b0a21459 100644
--- a/gr-noaa/lib/hrpt_pll_cf_impl.h
+++ b/gr-noaa/lib/hrpt_pll_cf_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_NOAA_HRPT_PLL_CF_IMPL_H
#define INCLUDED_NOAA_HRPT_PLL_CF_IMPL_H
-#include <noaa/hrpt_pll_cf.h>
+#include <gnuradio/noaa/hrpt_pll_cf.h>
namespace gr {
namespace noaa {
diff --git a/gr-noaa/swig/CMakeLists.txt b/gr-noaa/swig/CMakeLists.txt
index 2bc7c3eb2e..3a6db36103 100644
--- a/gr-noaa/swig/CMakeLists.txt
+++ b/gr-noaa/swig/CMakeLists.txt
@@ -35,7 +35,7 @@ if(ENABLE_GR_CTRLPORT)
endif(ENABLE_GR_CTRLPORT)
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/noaa_swig_doc.i)
-set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/noaa)
+set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/noaa)
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
set(GR_SWIG_LIBRARIES gnuradio-noaa)
diff --git a/gr-noaa/swig/noaa_swig.i b/gr-noaa/swig/noaa_swig.i
index a7d3879369..9fcb83b963 100644
--- a/gr-noaa/swig/noaa_swig.i
+++ b/gr-noaa/swig/noaa_swig.i
@@ -28,14 +28,14 @@
%include "noaa_swig_doc.i"
%{
-#include "noaa/hrpt_decoder.h"
-#include "noaa/hrpt_deframer.h"
-#include "noaa/hrpt_pll_cf.h"
+#include "gnuradio/noaa/hrpt_decoder.h"
+#include "gnuradio/noaa/hrpt_deframer.h"
+#include "gnuradio/noaa/hrpt_pll_cf.h"
%}
-%include "noaa/hrpt_decoder.h"
-%include "noaa/hrpt_deframer.h"
-%include "noaa/hrpt_pll_cf.h"
+%include "gnuradio/noaa/hrpt_decoder.h"
+%include "gnuradio/noaa/hrpt_deframer.h"
+%include "gnuradio/noaa/hrpt_pll_cf.h"
GR_SWIG_BLOCK_MAGIC2(noaa, hrpt_decoder);
GR_SWIG_BLOCK_MAGIC2(noaa, hrpt_deframer);
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-13 18:04:41 +0000