diff options
Diffstat (limited to 'gr-analog')
95 files changed, 360 insertions, 356 deletions
diff --git a/gr-analog/CMakeLists.txt b/gr-analog/CMakeLists.txt index d9a4b79f28..44b0c739d2 100644 --- a/gr-analog/CMakeLists.txt +++ b/gr-analog/CMakeLists.txt @@ -87,7 +87,7 @@ CPACK_COMPONENT("analog_swig" ######################################################################## # Add subdirectories ######################################################################## -add_subdirectory(include/analog) +add_subdirectory(include/gnuradio/analog) add_subdirectory(lib) add_subdirectory(doc) if(ENABLE_PYTHON) diff --git a/gr-analog/include/analog/CMakeLists.txt b/gr-analog/include/gnuradio/analog/CMakeLists.txt index 0343abcd85..0343abcd85 100644 --- a/gr-analog/include/analog/CMakeLists.txt +++ b/gr-analog/include/gnuradio/analog/CMakeLists.txt diff --git a/gr-analog/include/analog/agc.h b/gr-analog/include/gnuradio/analog/agc.h index ae3af7091d..ca6125082f 100644 --- a/gr-analog/include/analog/agc.h +++ b/gr-analog/include/gnuradio/analog/agc.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_AGC_H #define INCLUDED_ANALOG_AGC_H -#include <analog/api.h> -#include <gr_complex.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/gr_complex.h> #include <math.h> namespace gr { diff --git a/gr-analog/include/analog/agc2.h b/gr-analog/include/gnuradio/analog/agc2.h index 1e1f695fe9..225adc4410 100644 --- a/gr-analog/include/analog/agc2.h +++ b/gr-analog/include/gnuradio/analog/agc2.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_AGC2_H #define INCLUDED_ANALOG_AGC2_H -#include <analog/api.h> -#include <gr_complex.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/gr_complex.h> #include <math.h> namespace gr { diff --git a/gr-analog/include/analog/agc2_cc.h b/gr-analog/include/gnuradio/analog/agc2_cc.h index 82efe914d8..76a5263183 100644 --- a/gr-analog/include/analog/agc2_cc.h +++ b/gr-analog/include/gnuradio/analog/agc2_cc.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_ANALOG_AGC2_CC_H #define INCLUDED_ANALOG_AGC2_CC_H -#include <analog/api.h> -#include <analog/agc2.h> -#include <gr_sync_block.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/analog/agc2.h> +#include <gnuradio/sync_block.h> namespace gr { namespace analog { @@ -38,7 +38,7 @@ namespace gr { * \details * For Power the absolute value of the complex number is used. */ - class ANALOG_API agc2_cc : virtual public gr_sync_block + class ANALOG_API agc2_cc : virtual public sync_block { public: // gr::analog::agc2_cc::sptr diff --git a/gr-analog/include/analog/agc2_ff.h b/gr-analog/include/gnuradio/analog/agc2_ff.h index dd2507e33d..740d795e1d 100644 --- a/gr-analog/include/analog/agc2_ff.h +++ b/gr-analog/include/gnuradio/analog/agc2_ff.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_ANALOG_AGC2_FF_H #define INCLUDED_ANALOG_AGC2_FF_H -#include <analog/api.h> -#include <analog/agc2.h> -#include <gr_sync_block.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/analog/agc2.h> +#include <gnuradio/sync_block.h> namespace gr { namespace analog { @@ -38,7 +38,7 @@ namespace gr { * \details * Power is approximated by absolute value */ - class ANALOG_API agc2_ff : virtual public gr_sync_block + class ANALOG_API agc2_ff : virtual public sync_block { public: // gr::analog::agc2_ff::sptr diff --git a/gr-analog/include/analog/agc_cc.h b/gr-analog/include/gnuradio/analog/agc_cc.h index 0c2e831b0c..8319995960 100644 --- a/gr-analog/include/analog/agc_cc.h +++ b/gr-analog/include/gnuradio/analog/agc_cc.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_ANALOG_AGC_CC_H #define INCLUDED_ANALOG_AGC_CC_H -#include <analog/api.h> -#include <analog/agc.h> -#include <gr_sync_block.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/analog/agc.h> +#include <gnuradio/sync_block.h> namespace gr { namespace analog { @@ -37,7 +37,7 @@ namespace gr { * \details * For Power the absolute value of the complex number is used. */ - class ANALOG_API agc_cc : virtual public gr_sync_block + class ANALOG_API agc_cc : virtual public sync_block { public: // gr::analog::agc_cc::sptr diff --git a/gr-analog/include/analog/agc_ff.h b/gr-analog/include/gnuradio/analog/agc_ff.h index ffcafaa642..d55072889b 100644 --- a/gr-analog/include/analog/agc_ff.h +++ b/gr-analog/include/gnuradio/analog/agc_ff.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_ANALOG_AGC_FF_H #define INCLUDED_ANALOG_AGC_FF_H -#include <analog/api.h> -#include <analog/agc.h> -#include <gr_sync_block.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/analog/agc.h> +#include <gnuradio/sync_block.h> namespace gr { namespace analog { @@ -37,7 +37,7 @@ namespace gr { * \details * Power is approximated by absolute value */ - class ANALOG_API agc_ff : virtual public gr_sync_block + class ANALOG_API agc_ff : virtual public sync_block { public: // gr::analog::agc_ff::sptr diff --git a/gr-analog/include/analog/api.h b/gr-analog/include/gnuradio/analog/api.h index 2459ace614..01107345e6 100644 --- a/gr-analog/include/analog/api.h +++ b/gr-analog/include/gnuradio/analog/api.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_ANALOG_API_H #define INCLUDED_ANALOG_API_H -#include <attributes.h> +#include <gnuradio/attributes.h> #ifdef gnuradio_analog_EXPORTS # define ANALOG_API __GR_ATTR_EXPORT diff --git a/gr-analog/include/analog/cpfsk_bc.h b/gr-analog/include/gnuradio/analog/cpfsk_bc.h index 8150e0d08f..580c387d45 100644 --- a/gr-analog/include/analog/cpfsk_bc.h +++ b/gr-analog/include/gnuradio/analog/cpfsk_bc.h @@ -21,8 +21,8 @@ #ifndef INCLUDED_ANALOG_CPFSK_BC_H #define INCLUDED_ANALOG_CPFSK_BC_H -#include <analog/api.h> -#include <gr_sync_interpolator.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/sync_interpolator.h> namespace gr { namespace analog { @@ -32,7 +32,7 @@ namespace gr { * on an input stream of unpacked bits. * \ingroup modulators_blk */ - class ANALOG_API cpfsk_bc : virtual public gr_sync_interpolator + class ANALOG_API cpfsk_bc : virtual public sync_interpolator { public: // gr::analog::cpfsk_bc::sptr diff --git a/gr-analog/include/analog/cpm.h b/gr-analog/include/gnuradio/analog/cpm.h index 43dd0b3729..040f20514a 100644 --- a/gr-analog/include/analog/cpm.h +++ b/gr-analog/include/gnuradio/analog/cpm.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_ANALOG_CPM_H #define INCLUDED_ANALOG_CPM_H -#include <analog/api.h> +#include <gnuradio/analog/api.h> #include <vector> namespace gr { diff --git a/gr-analog/include/analog/ctcss_squelch_ff.h b/gr-analog/include/gnuradio/analog/ctcss_squelch_ff.h index f8c551d291..f9ecc88a03 100644 --- a/gr-analog/include/analog/ctcss_squelch_ff.h +++ b/gr-analog/include/gnuradio/analog/ctcss_squelch_ff.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_ANALOG_CTCSS_SQUELCH_FF_H #define INCLUDED_ANALOG_CTCSS_SQUELCH_FF_H -#include <analog/api.h> -#include <analog/squelch_base_ff.h> -#include <gr_block.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/analog/squelch_base_ff.h> +#include <gnuradio/block.h> namespace gr { namespace analog { @@ -35,7 +35,7 @@ namespace gr { * \ingroup level_controllers_blk */ class ANALOG_API ctcss_squelch_ff : - public squelch_base_ff, virtual public gr_block + public squelch_base_ff, virtual public block { protected: virtual void update_state(const float &in) = 0; diff --git a/gr-analog/include/analog/dpll_bb.h b/gr-analog/include/gnuradio/analog/dpll_bb.h index f25e860b2c..4f9a6c0dd9 100644 --- a/gr-analog/include/analog/dpll_bb.h +++ b/gr-analog/include/gnuradio/analog/dpll_bb.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_DPLL_BB_H #define INCLUDED_ANALOG_DPLL_BB_H -#include <analog/api.h> -#include <gr_sync_block.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace analog { @@ -37,7 +37,7 @@ namespace gr { * If a peak is detected, this block outputs a 1, * or it outputs 0's. */ - class ANALOG_API dpll_bb : virtual public gr_sync_block + class ANALOG_API dpll_bb : virtual public sync_block { public: // gr::analog::dpll_bb::sptr diff --git a/gr-analog/include/analog/fastnoise_source_X.h.t b/gr-analog/include/gnuradio/analog/fastnoise_source_X.h.t index e1c606692c..c5331fc084 100644 --- a/gr-analog/include/analog/fastnoise_source_X.h.t +++ b/gr-analog/include/gnuradio/analog/fastnoise_source_X.h.t @@ -25,9 +25,9 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <analog/api.h> -#include <analog/noise_type.h> -#include <gr_sync_block.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/analog/noise_type.h> +#include <gnuradio/sync_block.h> namespace gr { namespace analog { @@ -40,14 +40,14 @@ namespace gr { * Generate random values from different distributions. * Currently, only Gaussian and uniform are enabled. */ - class ANALOG_API @BASE_NAME@ : virtual public gr_sync_block + class ANALOG_API @BASE_NAME@ : virtual public sync_block { public: // gr::analog::@BASE_NAME@::sptr typedef boost::shared_ptr<@BASE_NAME@> sptr; /*! \brief Make a fast noise source - * \param type the random distribution to use (see analog/noise_type.h) + * \param type the random distribution to use (see gnuradio/analog/noise_type.h) * \param ampl a scaling factor for the output * \param seed seed for random generators. Note that for uniform and * \param samples Number of samples to pre-generate diff --git a/gr-analog/include/analog/feedforward_agc_cc.h b/gr-analog/include/gnuradio/analog/feedforward_agc_cc.h index 0a688ccdde..5d4abfeedb 100644 --- a/gr-analog/include/analog/feedforward_agc_cc.h +++ b/gr-analog/include/gnuradio/analog/feedforward_agc_cc.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_FEEDFORWARD_AGC_CC_H #define INCLUDED_ANALOG_FEEDFORWARD_AGC_CC_H -#include <analog/api.h> -#include <gr_sync_block.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace analog { @@ -34,7 +34,7 @@ namespace gr { * absolute value over nsamples * \ingroup level_controllers_blk */ - class ANALOG_API feedforward_agc_cc : virtual public gr_sync_block + class ANALOG_API feedforward_agc_cc : virtual public sync_block { public: // gr::analog::feedforward_agc_cc::sptr diff --git a/gr-analog/include/analog/fmdet_cf.h b/gr-analog/include/gnuradio/analog/fmdet_cf.h index bd26e39226..571795bbd8 100644 --- a/gr-analog/include/analog/fmdet_cf.h +++ b/gr-analog/include/gnuradio/analog/fmdet_cf.h @@ -23,14 +23,15 @@ #ifndef INCLUDED_ANALOG_FMDET_CF_H #define INCLUDED_ANALOG_FMDET_CF_H -#include <analog/api.h> -#include <gr_sync_block.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace analog { /*! * \brief Implements an IQ slope detector + * \ingroup modulators_blk * * \details * input: stream of complex; output: stream of floats @@ -38,7 +39,7 @@ namespace gr { * This implements a limiting slope detector. The limiter is in * the normalization by the magnitude of the sample */ - class ANALOG_API fmdet_cf : virtual public gr_sync_block + class ANALOG_API fmdet_cf : virtual public sync_block { public: // gr::analog::fmdet_cf::sptr diff --git a/gr-analog/include/analog/frequency_modulator_fc.h b/gr-analog/include/gnuradio/analog/frequency_modulator_fc.h index a0d4404729..d6e2b277fe 100644 --- a/gr-analog/include/analog/frequency_modulator_fc.h +++ b/gr-analog/include/gnuradio/analog/frequency_modulator_fc.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_FREQUENCY_MODULATOR_FC_H #define INCLUDED_ANALOG_FREQUENCY_MODULATOR_FC_H -#include <analog/api.h> -#include <gr_sync_block.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace analog { @@ -36,7 +36,7 @@ namespace gr { * \details * float input; complex baseband output */ - class ANALOG_API frequency_modulator_fc : virtual public gr_sync_block + class ANALOG_API frequency_modulator_fc : virtual public sync_block { public: // gr::analog::frequency_modulator_fc::sptr diff --git a/gr-analog/include/analog/noise_source_X.h.t b/gr-analog/include/gnuradio/analog/noise_source_X.h.t index 1a9630dfdf..b7b0906c06 100644 --- a/gr-analog/include/analog/noise_source_X.h.t +++ b/gr-analog/include/gnuradio/analog/noise_source_X.h.t @@ -25,10 +25,9 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <analog/api.h> -#include <analog/noise_type.h> -#include <gr_sync_block.h> -#include <gr_random.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/analog/noise_type.h> +#include <gnuradio/sync_block.h> namespace gr { namespace analog { @@ -41,14 +40,14 @@ namespace gr { * Generate random values from different distributions. * Currently, only Gaussian and uniform are enabled. */ - class ANALOG_API @BASE_NAME@ : virtual public gr_sync_block + class ANALOG_API @BASE_NAME@ : virtual public sync_block { public: // gr::analog::@BASE_NAME@::sptr typedef boost::shared_ptr<@BASE_NAME@> sptr; /*! Build a noise source - * \param type the random distribution to use (see analog/noise_type.h) + * \param type the random distribution to use (see gnuradio/analog/noise_type.h) * \param ampl a scaling factor for the output * \param seed seed for random generators. Note that for uniform and * Gaussian distributions, this should be a negative number. diff --git a/gr-analog/include/analog/noise_type.h b/gr-analog/include/gnuradio/analog/noise_type.h index c3a2146b7e..c3a2146b7e 100644 --- a/gr-analog/include/analog/noise_type.h +++ b/gr-analog/include/gnuradio/analog/noise_type.h diff --git a/gr-analog/include/analog/phase_modulator_fc.h b/gr-analog/include/gnuradio/analog/phase_modulator_fc.h index 2ec7c1a3c4..56c39ce3ea 100644 --- a/gr-analog/include/analog/phase_modulator_fc.h +++ b/gr-analog/include/gnuradio/analog/phase_modulator_fc.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_PHASE_MODULATOR_FC_H #define INCLUDED_ANALOG_PHASE_MODULATOR_FC_H -#include <analog/api.h> -#include <gr_sync_block.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace analog { @@ -39,7 +39,7 @@ namespace gr { * Input stream 0: floats * Ouput stream 0: complex */ - class ANALOG_API phase_modulator_fc : virtual public gr_sync_block + class ANALOG_API phase_modulator_fc : virtual public sync_block { public: // gr::analog::phase_modulator_fc::sptr diff --git a/gr-analog/include/analog/pll_carriertracking_cc.h b/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h index 520a2f57da..35da29c8af 100644 --- a/gr-analog/include/analog/pll_carriertracking_cc.h +++ b/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_ANALOG_PLL_CARRIERTRACKING_CC_H #define INCLUDED_ANALOG_PLL_CARRIERTRACKING_CC_H -#include <analog/api.h> -#include <blocks/control_loop.h> -#include <gr_sync_block.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/blocks/control_loop.h> +#include <gnuradio/sync_block.h> namespace gr { namespace analog { @@ -48,7 +48,7 @@ namespace gr { * pll_freqdet_cf, pll_carriertracking_cc */ class ANALOG_API pll_carriertracking_cc - : virtual public gr_sync_block, + : virtual public sync_block, virtual public blocks::control_loop { public: diff --git a/gr-analog/include/analog/pll_freqdet_cf.h b/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h index b33fb909ba..1ea7eb97ec 100644 --- a/gr-analog/include/analog/pll_freqdet_cf.h +++ b/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_ANALOG_PLL_FREQDET_CF_H #define INCLUDED_ANALOG_PLL_FREQDET_CF_H -#include <analog/api.h> -#include <blocks/control_loop.h> -#include <gr_sync_block.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/blocks/control_loop.h> +#include <gnuradio/sync_block.h> namespace gr { namespace analog { @@ -47,7 +47,7 @@ namespace gr { * \sa pll_refout_cc, pll_carriertracking_cc */ class ANALOG_API pll_freqdet_cf - : virtual public gr_sync_block, + : virtual public sync_block, virtual public blocks::control_loop { public: diff --git a/gr-analog/include/analog/pll_refout_cc.h b/gr-analog/include/gnuradio/analog/pll_refout_cc.h index 9c713749c7..29a2f43198 100644 --- a/gr-analog/include/analog/pll_refout_cc.h +++ b/gr-analog/include/gnuradio/analog/pll_refout_cc.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_ANALOG_PLL_REFOUT_CC_H #define INCLUDED_ANALOG_PLL_REFOUT_CC_H -#include <analog/api.h> -#include <blocks/control_loop.h> -#include <gr_sync_block.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/blocks/control_loop.h> +#include <gnuradio/sync_block.h> namespace gr { namespace analog { @@ -48,7 +48,7 @@ namespace gr { * pll_freqdet_cf, pll_carriertracking_cc */ class ANALOG_API pll_refout_cc - : virtual public gr_sync_block, + : virtual public sync_block, virtual public blocks::control_loop { public: diff --git a/gr-analog/include/analog/probe_avg_mag_sqrd_c.h b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_c.h index 2fed4fff0b..fe67f3ad59 100644 --- a/gr-analog/include/analog/probe_avg_mag_sqrd_c.h +++ b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_c.h @@ -22,8 +22,8 @@ #ifndef INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_C_H #define INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_C_H -#include <analog/api.h> -#include <gr_sync_block.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace analog { @@ -40,7 +40,7 @@ namespace gr { * threshold can be retrieved with the level and unmuted * accessors. */ - class ANALOG_API probe_avg_mag_sqrd_c : virtual public gr_sync_block + class ANALOG_API probe_avg_mag_sqrd_c : virtual public sync_block { public: // gr::analog::probe_avg_mag_sqrd_c::sptr diff --git a/gr-analog/include/analog/probe_avg_mag_sqrd_cf.h b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_cf.h index 303670adee..d491321e68 100644 --- a/gr-analog/include/analog/probe_avg_mag_sqrd_cf.h +++ b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_cf.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_CF_H #define INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_CF_H -#include <analog/api.h> -#include <gr_sync_block.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace analog { @@ -42,7 +42,7 @@ namespace gr { * threshold can be retrieved with the level and unmuted * accessors. */ - class ANALOG_API probe_avg_mag_sqrd_cf : virtual public gr_sync_block + class ANALOG_API probe_avg_mag_sqrd_cf : virtual public sync_block { public: // gr::analog::probe_avg_mag_sqrd_cf::sptr diff --git a/gr-analog/include/analog/probe_avg_mag_sqrd_f.h b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_f.h index 2300f8bca1..960480b962 100644 --- a/gr-analog/include/analog/probe_avg_mag_sqrd_f.h +++ b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_f.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_F_H #define INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_F_H -#include <analog/api.h> -#include <gr_sync_block.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace analog { @@ -41,7 +41,7 @@ namespace gr { * threshold can be retrieved with the level and unmuted * accessors. */ - class ANALOG_API probe_avg_mag_sqrd_f : virtual public gr_sync_block + class ANALOG_API probe_avg_mag_sqrd_f : virtual public sync_block { public: // gr::analog::probe_avg_mag_sqrd_f::sptr diff --git a/gr-analog/include/analog/pwr_squelch_cc.h b/gr-analog/include/gnuradio/analog/pwr_squelch_cc.h index 73b89f0db6..766f76d385 100644 --- a/gr-analog/include/analog/pwr_squelch_cc.h +++ b/gr-analog/include/gnuradio/analog/pwr_squelch_cc.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_PWR_SQUELCH_CC_H #define INCLUDED_ANALOG_PWR_SQUELCH_CC_H -#include <analog/api.h> -#include <analog/squelch_base_cc.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/analog/squelch_base_cc.h> #include <cmath> namespace gr { @@ -35,7 +35,7 @@ namespace gr { * \ingroup level_controllers_blk */ class ANALOG_API pwr_squelch_cc : - public squelch_base_cc, virtual public gr_block + public squelch_base_cc, virtual public block { protected: virtual void update_state(const gr_complex &in) = 0; diff --git a/gr-analog/include/analog/pwr_squelch_ff.h b/gr-analog/include/gnuradio/analog/pwr_squelch_ff.h index 5490827390..abff53d5e0 100644 --- a/gr-analog/include/analog/pwr_squelch_ff.h +++ b/gr-analog/include/gnuradio/analog/pwr_squelch_ff.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_PWR_SQUELCH_FF_H #define INCLUDED_ANALOG_PWR_SQUELCH_FF_H -#include <analog/api.h> -#include <analog/squelch_base_ff.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/analog/squelch_base_ff.h> #include <cmath> namespace gr { @@ -35,7 +35,7 @@ namespace gr { * \ingroup level_controllers_blk */ class ANALOG_API pwr_squelch_ff : - public squelch_base_ff, virtual public gr_block + public squelch_base_ff, virtual public block { protected: virtual void update_state(const float &in) = 0; diff --git a/gr-analog/include/analog/quadrature_demod_cf.h b/gr-analog/include/gnuradio/analog/quadrature_demod_cf.h index c7682649b8..888cb4a20b 100644 --- a/gr-analog/include/analog/quadrature_demod_cf.h +++ b/gr-analog/include/gnuradio/analog/quadrature_demod_cf.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_QUADRATURE_DEMOD_CF_H #define INCLUDED_ANALOG_QUADRATURE_DEMOD_CF_H -#include <analog/api.h> -#include <gr_sync_block.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace analog { @@ -37,7 +37,7 @@ namespace gr { * This can be used to demod FM, FSK, GMSK, etc. * The input is complex baseband. */ - class ANALOG_API quadrature_demod_cf : virtual public gr_sync_block + class ANALOG_API quadrature_demod_cf : virtual public sync_block { public: // gr::analog::quadrature_demod_cf::sptr diff --git a/gr-analog/include/analog/rail_ff.h b/gr-analog/include/gnuradio/analog/rail_ff.h index 2018017935..29856bbcbc 100644 --- a/gr-analog/include/analog/rail_ff.h +++ b/gr-analog/include/gnuradio/analog/rail_ff.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_RAIL_FF_H #define INCLUDED_ANALOG_RAIL_FF_H -#include <analog/api.h> -#include <gr_sync_block.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace analog { @@ -33,7 +33,7 @@ namespace gr { * \brief clips input values to min, max * \ingroup level_controllers_blk */ - class ANALOG_API rail_ff : virtual public gr_sync_block + class ANALOG_API rail_ff : virtual public sync_block { public: // gr::analog::rail_ff::sptr diff --git a/gr-analog/include/analog/sig_source_X.h.t b/gr-analog/include/gnuradio/analog/sig_source_X.h.t index 752fe4cd29..81c42926cf 100644 --- a/gr-analog/include/analog/sig_source_X.h.t +++ b/gr-analog/include/gnuradio/analog/sig_source_X.h.t @@ -25,9 +25,9 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <analog/api.h> -#include <analog/sig_source_waveform.h> -#include <gr_sync_block.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/analog/sig_source_waveform.h> +#include <gnuradio/sync_block.h> namespace gr { namespace analog { @@ -36,7 +36,7 @@ namespace gr { * \brief signal generator with @TYPE@ output. * \ingroup waveform_generators_blk */ - class ANALOG_API @BASE_NAME@ : virtual public gr_sync_block + class ANALOG_API @BASE_NAME@ : virtual public sync_block { public: // gr::analog::@BASE_NAME@::sptr diff --git a/gr-analog/include/analog/sig_source_waveform.h b/gr-analog/include/gnuradio/analog/sig_source_waveform.h index e3efeb1fbb..e3efeb1fbb 100644 --- a/gr-analog/include/analog/sig_source_waveform.h +++ b/gr-analog/include/gnuradio/analog/sig_source_waveform.h diff --git a/gr-analog/include/analog/simple_squelch_cc.h b/gr-analog/include/gnuradio/analog/simple_squelch_cc.h index bf949e3d2e..de6252b288 100644 --- a/gr-analog/include/analog/simple_squelch_cc.h +++ b/gr-analog/include/gnuradio/analog/simple_squelch_cc.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_SIMPLE_SQUELCH_CC_H #define INCLUDED_ANALOG_SIMPLE_SQUELCH_CC_H -#include <analog/api.h> -#include <gr_sync_block.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace analog { @@ -33,7 +33,7 @@ namespace gr { * \brief simple squelch block based on average signal power and threshold in dB. * \ingroup level_controllers_blk */ - class ANALOG_API simple_squelch_cc : virtual public gr_sync_block + class ANALOG_API simple_squelch_cc : virtual public sync_block { public: // gr::analog::simple_squelch_cc::sptr diff --git a/gr-analog/include/analog/squelch_base_cc.h b/gr-analog/include/gnuradio/analog/squelch_base_cc.h index 11476e7e88..63f84cb374 100644 --- a/gr-analog/include/analog/squelch_base_cc.h +++ b/gr-analog/include/gnuradio/analog/squelch_base_cc.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_SQUELCH_BASE_CC_H #define INCLUDED_ANALOG_SQUELCH_BASE_CC_H -#include <analog/api.h> -#include <gr_block.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/block.h> namespace gr { namespace analog { @@ -33,7 +33,7 @@ namespace gr { * \brief basic squelch block; to be subclassed for other squelches. * \ingroup level_blk */ - class ANALOG_API squelch_base_cc : virtual public gr_block + class ANALOG_API squelch_base_cc : virtual public block { protected: virtual void update_state(const gr_complex &sample) = 0; diff --git a/gr-analog/include/analog/squelch_base_ff.h b/gr-analog/include/gnuradio/analog/squelch_base_ff.h index 2ce1f1a65a..f68262f015 100644 --- a/gr-analog/include/analog/squelch_base_ff.h +++ b/gr-analog/include/gnuradio/analog/squelch_base_ff.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_SQUELCH_BASE_FF_H #define INCLUDED_ANALOG_SQUELCH_BASE_FF_H -#include <analog/api.h> -#include <gr_block.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/block.h> namespace gr { namespace analog { @@ -33,7 +33,7 @@ namespace gr { * \brief basic squelch block; to be subclassed for other squelches. * \ingroup level_blk */ - class ANALOG_API squelch_base_ff : virtual public gr_block + class ANALOG_API squelch_base_ff : virtual public block { protected: virtual void update_state(const float &sample) = 0; diff --git a/gr-analog/lib/CMakeLists.txt b/gr-analog/lib/CMakeLists.txt index 5719eac7a5..ce10422487 100644 --- a/gr-analog/lib/CMakeLists.txt +++ b/gr-analog/lib/CMakeLists.txt @@ -158,6 +158,7 @@ ENDIF(MSVC) list(APPEND analog_libs volk gnuradio-runtime + gnuradio-blocks gnuradio-filter ${Boost_LIBRARIES} ) diff --git a/gr-analog/lib/agc2_cc_impl.cc b/gr-analog/lib/agc2_cc_impl.cc index 2ef18e5ab8..fbca18777b 100644 --- a/gr-analog/lib/agc2_cc_impl.cc +++ b/gr-analog/lib/agc2_cc_impl.cc @@ -25,7 +25,7 @@ #endif #include "agc2_cc_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace analog { @@ -43,9 +43,9 @@ namespace gr { agc2_cc_impl::agc2_cc_impl(float attack_rate, float decay_rate, float reference, float gain, float max_gain) - : gr_sync_block("agc2_cc", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(1, 1, sizeof(gr_complex))), + : sync_block("agc2_cc", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(1, 1, sizeof(gr_complex))), kernel::agc2_cc(attack_rate, decay_rate, reference, gain, max_gain) { diff --git a/gr-analog/lib/agc2_cc_impl.h b/gr-analog/lib/agc2_cc_impl.h index 98afc668a0..9220501323 100644 --- a/gr-analog/lib/agc2_cc_impl.h +++ b/gr-analog/lib/agc2_cc_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_AGC2_IMPL_CC_H #define INCLUDED_ANALOG_AGC2_IMPL_CC_H -#include <analog/agc2_cc.h> +#include <gnuradio/analog/agc2_cc.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/agc2_ff_impl.cc b/gr-analog/lib/agc2_ff_impl.cc index e0cdd6c44b..93a404c6df 100644 --- a/gr-analog/lib/agc2_ff_impl.cc +++ b/gr-analog/lib/agc2_ff_impl.cc @@ -25,7 +25,7 @@ #endif #include "agc2_ff_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace analog { @@ -48,9 +48,9 @@ namespace gr { agc2_ff_impl::agc2_ff_impl(float attack_rate, float decay_rate, float reference, float gain, float max_gain) - : gr_sync_block("agc2_ff", - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature(1, 1, sizeof(float))) + : sync_block("agc2_ff", + io_signature::make(1, 1, sizeof(float)), + io_signature::make(1, 1, sizeof(float))) , kernel::agc2_ff(attack_rate, decay_rate, reference, gain, max_gain) { diff --git a/gr-analog/lib/agc2_ff_impl.h b/gr-analog/lib/agc2_ff_impl.h index df33c8e446..8c068c4e34 100644 --- a/gr-analog/lib/agc2_ff_impl.h +++ b/gr-analog/lib/agc2_ff_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_AGC2_FF_IMPL_H #define INCLUDED_ANALOG_AGC2_FF_IMPL_H -#include <analog/agc2_ff.h> +#include <gnuradio/analog/agc2_ff.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/agc_cc_impl.cc b/gr-analog/lib/agc_cc_impl.cc index 81e1f67f8d..04d70d5421 100644 --- a/gr-analog/lib/agc_cc_impl.cc +++ b/gr-analog/lib/agc_cc_impl.cc @@ -25,7 +25,7 @@ #endif #include "agc_cc_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace analog { @@ -40,9 +40,9 @@ namespace gr { agc_cc_impl::agc_cc_impl(float rate, float reference, float gain, float max_gain) - : gr_sync_block("agc_cc", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(1, 1, sizeof(gr_complex))), + : sync_block("agc_cc", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(1, 1, sizeof(gr_complex))), kernel::agc_cc(rate, reference, gain, max_gain) { } diff --git a/gr-analog/lib/agc_cc_impl.h b/gr-analog/lib/agc_cc_impl.h index 822f46ef27..fda154d021 100644 --- a/gr-analog/lib/agc_cc_impl.h +++ b/gr-analog/lib/agc_cc_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_AGC_CC_IMPL_H #define INCLUDED_ANALOG_AGC_CC_IMPL_H -#include <analog/agc_cc.h> +#include <gnuradio/analog/agc_cc.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/agc_ff_impl.cc b/gr-analog/lib/agc_ff_impl.cc index a80b90c12d..1c29934361 100644 --- a/gr-analog/lib/agc_ff_impl.cc +++ b/gr-analog/lib/agc_ff_impl.cc @@ -25,7 +25,7 @@ #endif #include "agc_ff_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace analog { @@ -38,9 +38,9 @@ namespace gr { } agc_ff_impl::agc_ff_impl(float rate, float reference, float gain, float max_gain) - : gr_sync_block("agc_ff", - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature(1, 1, sizeof(float))), + : sync_block("agc_ff", + io_signature::make(1, 1, sizeof(float)), + io_signature::make(1, 1, sizeof(float))), kernel::agc_ff(rate, reference, gain, max_gain) { } diff --git a/gr-analog/lib/agc_ff_impl.h b/gr-analog/lib/agc_ff_impl.h index e309cca1be..c67739b73e 100644 --- a/gr-analog/lib/agc_ff_impl.h +++ b/gr-analog/lib/agc_ff_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_AGC_FF_IMPL_H #define INCLUDED_ANALOG_AGC_FF_IMPL_H -#include <analog/agc_ff.h> +#include <gnuradio/analog/agc_ff.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/cpfsk_bc_impl.cc b/gr-analog/lib/cpfsk_bc_impl.cc index 1b7f25f6cf..d529936608 100644 --- a/gr-analog/lib/cpfsk_bc_impl.cc +++ b/gr-analog/lib/cpfsk_bc_impl.cc @@ -23,8 +23,8 @@ #endif #include "cpfsk_bc_impl.h" -#include <gr_io_signature.h> -#include <gr_expj.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/expj.h> namespace gr { namespace analog { @@ -39,9 +39,9 @@ namespace gr { } cpfsk_bc_impl::cpfsk_bc_impl(float k, float ampl, int samples_per_sym) - : gr_sync_interpolator("cpfsk_bc", - gr_make_io_signature(1, 1, sizeof(char)), - gr_make_io_signature(1, 1, sizeof(gr_complex)), + : sync_interpolator("cpfsk_bc", + io_signature::make(1, 1, sizeof(char)), + io_signature::make(1, 1, sizeof(gr_complex)), samples_per_sym) { d_samples_per_sym = samples_per_sym; diff --git a/gr-analog/lib/cpfsk_bc_impl.h b/gr-analog/lib/cpfsk_bc_impl.h index 9f6ec2c7fe..c3ae0dc864 100644 --- a/gr-analog/lib/cpfsk_bc_impl.h +++ b/gr-analog/lib/cpfsk_bc_impl.h @@ -21,7 +21,7 @@ #ifndef INCLUDED_ANALOG_CPFSK_BC_IMPL_H #define INCLUDED_ANALOG_CPFSK_BC_IMPL_H -#include <analog/cpfsk_bc.h> +#include <gnuradio/analog/cpfsk_bc.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/cpm.cc b/gr-analog/lib/cpm.cc index 618475cec7..b61ee28816 100644 --- a/gr-analog/lib/cpm.cc +++ b/gr-analog/lib/cpm.cc @@ -26,7 +26,7 @@ #include <cmath> #include <cfloat> -#include <analog/cpm.h> +#include <gnuradio/analog/cpm.h> //gives us erf on compilers without it #include <boost/math/special_functions/erf.hpp> diff --git a/gr-analog/lib/ctcss_squelch_ff_impl.cc b/gr-analog/lib/ctcss_squelch_ff_impl.cc index 60cd94fdb5..9a6f301ba0 100644 --- a/gr-analog/lib/ctcss_squelch_ff_impl.cc +++ b/gr-analog/lib/ctcss_squelch_ff_impl.cc @@ -57,9 +57,9 @@ namespace gr { ctcss_squelch_ff_impl::ctcss_squelch_ff_impl(int rate, float freq, float level, int len, int ramp, bool gate) - : gr_block("ctcss_squelch_ff", - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature(1, 1, sizeof(float))), + : block("ctcss_squelch_ff", + io_signature::make(1, 1, sizeof(float)), + io_signature::make(1, 1, sizeof(float))), squelch_base_ff_impl("ctcss_squelch_ff", ramp, gate) { d_freq = freq; diff --git a/gr-analog/lib/ctcss_squelch_ff_impl.h b/gr-analog/lib/ctcss_squelch_ff_impl.h index 0827fbafe3..8954b213e2 100644 --- a/gr-analog/lib/ctcss_squelch_ff_impl.h +++ b/gr-analog/lib/ctcss_squelch_ff_impl.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_ANALOG_CTCSS_SQUELCH_FF_IMPL_H #define INCLUDED_ANALOG_CTCSS_SQUELCH_FF_IMPL_H -#include <analog/ctcss_squelch_ff.h> #include "squelch_base_ff_impl.h" -#include <fft/goertzel.h> +#include <gnuradio/analog/ctcss_squelch_ff.h> +#include <gnuradio/fft/goertzel.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/dpll_bb_impl.cc b/gr-analog/lib/dpll_bb_impl.cc index a199b66b4e..4ed0ce6925 100644 --- a/gr-analog/lib/dpll_bb_impl.cc +++ b/gr-analog/lib/dpll_bb_impl.cc @@ -25,7 +25,7 @@ #endif #include "dpll_bb_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <cstdio> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } dpll_bb_impl::dpll_bb_impl(float period, float gain) - : gr_sync_block("dpll_bb", - gr_make_io_signature(1, 1, sizeof(char)), - gr_make_io_signature(1, 1, sizeof(char))), + : sync_block("dpll_bb", + io_signature::make(1, 1, sizeof(char)), + io_signature::make(1, 1, sizeof(char))), d_restart(0), d_pulse_phase(0) { d_pulse_frequency = 1.0/period; diff --git a/gr-analog/lib/dpll_bb_impl.h b/gr-analog/lib/dpll_bb_impl.h index a1d8b77097..4caa498d70 100644 --- a/gr-analog/lib/dpll_bb_impl.h +++ b/gr-analog/lib/dpll_bb_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_DPLL_BB_IMPL_H #define INCLUDED_ANALOG_DPLL_BB_IMPL_H -#include <analog/dpll_bb.h> +#include <gnuradio/analog/dpll_bb.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/fastnoise_source_X_impl.cc.t b/gr-analog/lib/fastnoise_source_X_impl.cc.t index 706ddbbf84..e6c7f13f34 100644 --- a/gr-analog/lib/fastnoise_source_X_impl.cc.t +++ b/gr-analog/lib/fastnoise_source_X_impl.cc.t @@ -27,7 +27,7 @@ #endif #include "@IMPL_NAME@.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdexcept> namespace gr { @@ -41,9 +41,9 @@ namespace gr { } @IMPL_NAME@::@IMPL_NAME@(noise_type_t type, float ampl, long seed, long samples) - : gr_sync_block("@BASE_NAME@", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(1, 1, sizeof(@TYPE@))), + : sync_block("@BASE_NAME@", + io_signature::make(0, 0, 0), + io_signature::make(1, 1, sizeof(@TYPE@))), d_type(type), d_ampl(ampl), d_rng(seed) diff --git a/gr-analog/lib/fastnoise_source_X_impl.h.t b/gr-analog/lib/fastnoise_source_X_impl.h.t index 3c5dc106a2..ed342ec176 100644 --- a/gr-analog/lib/fastnoise_source_X_impl.h.t +++ b/gr-analog/lib/fastnoise_source_X_impl.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <analog/@BASE_NAME@.h> -#include <gr_random.h> +#include <gnuradio/analog/@BASE_NAME@.h> +#include <gnuradio/random.h> namespace gr { namespace analog { @@ -36,7 +36,7 @@ namespace gr { private: noise_type_t d_type; float d_ampl; - gr_random d_rng; + gr::random d_rng; std::vector<@TYPE@> d_samples; public: diff --git a/gr-analog/lib/feedforward_agc_cc_impl.cc b/gr-analog/lib/feedforward_agc_cc_impl.cc index 4796fdfc5b..94894d9bf1 100644 --- a/gr-analog/lib/feedforward_agc_cc_impl.cc +++ b/gr-analog/lib/feedforward_agc_cc_impl.cc @@ -25,7 +25,7 @@ #endif #include "feedforward_agc_cc_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdexcept> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } feedforward_agc_cc_impl::feedforward_agc_cc_impl(int nsamples, float reference) - : gr_sync_block("feedforward_agc_cc", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(1, 1, sizeof(gr_complex))), + : sync_block("feedforward_agc_cc", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(1, 1, sizeof(gr_complex))), d_nsamples(nsamples), d_reference(reference) { if(nsamples < 1) diff --git a/gr-analog/lib/feedforward_agc_cc_impl.h b/gr-analog/lib/feedforward_agc_cc_impl.h index 60c7acadaf..ebbfceb278 100644 --- a/gr-analog/lib/feedforward_agc_cc_impl.h +++ b/gr-analog/lib/feedforward_agc_cc_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_FEEDFORWARD_AGC_CC_IMPL_H #define INCLUDED_ANALOG_FEEDFORWARD_AGC_CC_IMPL_H -#include <analog/feedforward_agc_cc.h> +#include <gnuradio/analog/feedforward_agc_cc.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/fmdet_cf_impl.cc b/gr-analog/lib/fmdet_cf_impl.cc index c92ea28896..2c48ff07e2 100644 --- a/gr-analog/lib/fmdet_cf_impl.cc +++ b/gr-analog/lib/fmdet_cf_impl.cc @@ -25,8 +25,8 @@ #endif #include "fmdet_cf_impl.h" -#include <gr_io_signature.h> -#include <gr_math.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/math.h> namespace gr { namespace analog { @@ -43,9 +43,9 @@ namespace gr { fmdet_cf_impl::fmdet_cf_impl(float samplerate, float freq_low, float freq_high, float scl) - : gr_sync_block("fmdet_cf", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(1, 1, sizeof(float))), + : sync_block("fmdet_cf", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(1, 1, sizeof(float))), d_S1(0.1), d_S2(0.1), d_S3(0.1), d_S4(0.1) { diff --git a/gr-analog/lib/fmdet_cf_impl.h b/gr-analog/lib/fmdet_cf_impl.h index 01fce09dd2..921e20ec78 100644 --- a/gr-analog/lib/fmdet_cf_impl.h +++ b/gr-analog/lib/fmdet_cf_impl.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_ANALOG_FMDET_CF_IMPL_H #define INCLUDED_ANALOG_FMDET_CF_IMPL_H -#include <analog/fmdet_cf.h> -//#include <filter/fir_filter.h> -#include <gr_sync_block.h> +#include <gnuradio/analog/fmdet_cf.h> +//#include <gnuradio/filter/fir_filter.h> +#include <gnuradio/sync_block.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/frequency_modulator_fc_impl.cc b/gr-analog/lib/frequency_modulator_fc_impl.cc index 2da7ee15f1..9fb741690b 100644 --- a/gr-analog/lib/frequency_modulator_fc_impl.cc +++ b/gr-analog/lib/frequency_modulator_fc_impl.cc @@ -25,8 +25,8 @@ #endif #include "frequency_modulator_fc_impl.h" -#include <gr_io_signature.h> -#include <gr_fxpt.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/fxpt.h> #include <math.h> #include <boost/math/special_functions/trunc.hpp> @@ -41,9 +41,9 @@ namespace gr { } frequency_modulator_fc_impl::frequency_modulator_fc_impl(double sensitivity) - : gr_sync_block("frequency_modulator_fc", - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature(1, 1, sizeof(gr_complex))), + : sync_block("frequency_modulator_fc", + io_signature::make(1, 1, sizeof(float)), + io_signature::make(1, 1, sizeof(gr_complex))), d_sensitivity(sensitivity), d_phase(0) { } @@ -70,8 +70,8 @@ namespace gr { float oi, oq; - gr_int32 angle = gr_fxpt::float_to_fixed (d_phase); - gr_fxpt::sincos(angle, &oq, &oi); + gr_int32 angle = gr::fxpt::float_to_fixed (d_phase); + gr::fxpt::sincos(angle, &oq, &oi); out[i] = gr_complex(oi, oq); } diff --git a/gr-analog/lib/frequency_modulator_fc_impl.h b/gr-analog/lib/frequency_modulator_fc_impl.h index 36512f5164..cdd3562e09 100644 --- a/gr-analog/lib/frequency_modulator_fc_impl.h +++ b/gr-analog/lib/frequency_modulator_fc_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_FREQUENCY_MODULATOR_FC_IMPL_H #define INCLUDED_ANALOG_FREQUENCY_MODULATOR_FC_IMPL_H -#include <analog/frequency_modulator_fc.h> +#include <gnuradio/analog/frequency_modulator_fc.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/noise_source_X_impl.cc.t b/gr-analog/lib/noise_source_X_impl.cc.t index 7f371b2cfd..5d09647848 100644 --- a/gr-analog/lib/noise_source_X_impl.cc.t +++ b/gr-analog/lib/noise_source_X_impl.cc.t @@ -27,7 +27,7 @@ #endif #include "@IMPL_NAME@.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdexcept> namespace gr { @@ -41,9 +41,9 @@ namespace gr { } @IMPL_NAME@::@IMPL_NAME@(noise_type_t type, float ampl, long seed) - : gr_sync_block("@BASE_NAME@", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(1, 1, sizeof(@TYPE@))), + : sync_block("@BASE_NAME@", + io_signature::make(0, 0, 0), + io_signature::make(1, 1, sizeof(@TYPE@))), d_type(type), d_ampl(ampl), d_rng(seed) diff --git a/gr-analog/lib/noise_source_X_impl.h.t b/gr-analog/lib/noise_source_X_impl.h.t index 3a0e8d6d7c..cd7a3e1636 100644 --- a/gr-analog/lib/noise_source_X_impl.h.t +++ b/gr-analog/lib/noise_source_X_impl.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <analog/@BASE_NAME@.h> -#include <gr_random.h> +#include <gnuradio/analog/@BASE_NAME@.h> +#include <gnuradio/random.h> namespace gr { namespace analog { @@ -35,7 +35,7 @@ namespace gr { { noise_type_t d_type; float d_ampl; - gr_random d_rng; + gr::random d_rng; public: @IMPL_NAME@(noise_type_t type, float ampl, long seed = 0); diff --git a/gr-analog/lib/phase_modulator_fc_impl.cc b/gr-analog/lib/phase_modulator_fc_impl.cc index 9e9e73f8ce..9dc010dd5b 100644 --- a/gr-analog/lib/phase_modulator_fc_impl.cc +++ b/gr-analog/lib/phase_modulator_fc_impl.cc @@ -25,8 +25,8 @@ #endif #include "phase_modulator_fc_impl.h" -#include <gr_io_signature.h> -#include <gr_sincos.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/sincos.h> #include <math.h> namespace gr { @@ -40,9 +40,9 @@ namespace gr { } phase_modulator_fc_impl::phase_modulator_fc_impl(double sensitivity) - : gr_sync_block("phase_modulator_fc", - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature(1, 1, sizeof(gr_complex))), + : sync_block("phase_modulator_fc", + io_signature::make(1, 1, sizeof(float)), + io_signature::make(1, 1, sizeof(gr_complex))), d_sensitivity(sensitivity), d_phase(0) { } @@ -62,7 +62,7 @@ namespace gr { for(int i = 0; i < noutput_items; i++) { d_phase = d_sensitivity * in[i]; float oi, oq; - gr_sincosf(d_phase, &oq, &oi); + gr::sincosf(d_phase, &oq, &oi); out[i] = gr_complex(oi, oq); } diff --git a/gr-analog/lib/phase_modulator_fc_impl.h b/gr-analog/lib/phase_modulator_fc_impl.h index ac10bc891f..8b7c1df053 100644 --- a/gr-analog/lib/phase_modulator_fc_impl.h +++ b/gr-analog/lib/phase_modulator_fc_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_PHASE_MODULATOR_FC_IMPL_H #define INCLUDED_ANALOG_PHASE_MODULATOR_FC_IMPL_H -#include <analog/phase_modulator_fc.h> +#include <gnuradio/analog/phase_modulator_fc.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/pll_carriertracking_cc_impl.cc b/gr-analog/lib/pll_carriertracking_cc_impl.cc index 9213a5e681..0cc3f8b8ec 100644 --- a/gr-analog/lib/pll_carriertracking_cc_impl.cc +++ b/gr-analog/lib/pll_carriertracking_cc_impl.cc @@ -25,10 +25,10 @@ #endif #include "pll_carriertracking_cc_impl.h" -#include <gr_io_signature.h> -#include <gr_sincos.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/sincos.h> #include <math.h> -#include <gr_math.h> +#include <gnuradio/math.h> namespace gr { namespace analog { @@ -47,9 +47,9 @@ namespace gr { pll_carriertracking_cc_impl::pll_carriertracking_cc_impl(float loop_bw, float max_freq, float min_freq) - : gr_sync_block("pll_carriertracking_cc", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(1, 1, sizeof(gr_complex))), + : sync_block("pll_carriertracking_cc", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(1, 1, sizeof(gr_complex))), blocks::control_loop(loop_bw, max_freq, min_freq), d_locksig(0), d_lock_threshold(0), d_squelch_enable(false) { @@ -75,7 +75,7 @@ namespace gr { { float sample_phase; // sample_phase = atan2(sample.imag(),sample.real()); - sample_phase = gr_fast_atan2f(sample.imag(),sample.real()); + sample_phase = gr::fast_atan2f(sample.imag(),sample.real()); return mod_2pi(sample_phase-ref_phase); } @@ -109,7 +109,7 @@ namespace gr { float t_imag, t_real; for(int i = 0; i < noutput_items; i++) { - gr_sincosf(d_phase, &t_imag, &t_real); + gr::sincosf(d_phase, &t_imag, &t_real); optr[i] = iptr[i] * gr_complex(t_real, -t_imag); error = phase_detector(iptr[i], d_phase); diff --git a/gr-analog/lib/pll_carriertracking_cc_impl.h b/gr-analog/lib/pll_carriertracking_cc_impl.h index c809736709..49259f996e 100644 --- a/gr-analog/lib/pll_carriertracking_cc_impl.h +++ b/gr-analog/lib/pll_carriertracking_cc_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_PLL_CARRIERTRACKING_CC_IMPL_H #define INCLUDED_ANALOG_PLL_CARRIERTRACKING_CC_IMPL_H -#include <analog/pll_carriertracking_cc.h> +#include <gnuradio/analog/pll_carriertracking_cc.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/pll_freqdet_cf_impl.cc b/gr-analog/lib/pll_freqdet_cf_impl.cc index 9e55d9bedb..42caa0bfd5 100644 --- a/gr-analog/lib/pll_freqdet_cf_impl.cc +++ b/gr-analog/lib/pll_freqdet_cf_impl.cc @@ -25,9 +25,9 @@ #endif #include "pll_freqdet_cf_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <math.h> -#include <gr_math.h> +#include <gnuradio/math.h> namespace gr { namespace analog { @@ -44,9 +44,9 @@ namespace gr { } pll_freqdet_cf_impl::pll_freqdet_cf_impl(float loop_bw, float max_freq, float min_freq) - : gr_sync_block("pll_freqdet_cf", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(1, 1, sizeof(float))), + : sync_block("pll_freqdet_cf", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(1, 1, sizeof(float))), blocks::control_loop(loop_bw, max_freq, min_freq) { } @@ -70,7 +70,7 @@ namespace gr { pll_freqdet_cf_impl::phase_detector(gr_complex sample, float ref_phase) { float sample_phase; - sample_phase = gr_fast_atan2f(sample.imag(), sample.real()); + sample_phase = gr::fast_atan2f(sample.imag(), sample.real()); return mod_2pi(sample_phase - ref_phase); } diff --git a/gr-analog/lib/pll_freqdet_cf_impl.h b/gr-analog/lib/pll_freqdet_cf_impl.h index 3170d819b6..646b0609c0 100644 --- a/gr-analog/lib/pll_freqdet_cf_impl.h +++ b/gr-analog/lib/pll_freqdet_cf_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_PLL_FREQDET_CF_IMPL_H #define INCLUDED_ANALOG_PLL_FREQDET_CF_IMPL_H -#include <analog/pll_freqdet_cf.h> +#include <gnuradio/analog/pll_freqdet_cf.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/pll_refout_cc_impl.cc b/gr-analog/lib/pll_refout_cc_impl.cc index 3f0ccc7df5..157961318a 100644 --- a/gr-analog/lib/pll_refout_cc_impl.cc +++ b/gr-analog/lib/pll_refout_cc_impl.cc @@ -25,10 +25,10 @@ #endif #include "pll_refout_cc_impl.h" -#include <gr_io_signature.h> -#include <gr_sincos.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/sincos.h> #include <math.h> -#include <gr_math.h> +#include <gnuradio/math.h> namespace gr { namespace analog { @@ -45,9 +45,9 @@ namespace gr { } pll_refout_cc_impl::pll_refout_cc_impl(float loop_bw, float max_freq, float min_freq) - : gr_sync_block("pll_refout_cc", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(1, 1, sizeof(gr_complex))), + : sync_block("pll_refout_cc", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(1, 1, sizeof(gr_complex))), blocks::control_loop(loop_bw, max_freq, min_freq) { } @@ -71,7 +71,7 @@ namespace gr { pll_refout_cc_impl::phase_detector(gr_complex sample,float ref_phase) { float sample_phase; - sample_phase = gr_fast_atan2f(sample.imag(),sample.real()); + sample_phase = gr::fast_atan2f(sample.imag(),sample.real()); return mod_2pi(sample_phase-ref_phase); } @@ -88,7 +88,7 @@ namespace gr { int size = noutput_items; while(size-- > 0) { - gr_sincosf(d_phase,&t_imag,&t_real); + gr::sincosf(d_phase,&t_imag,&t_real); *optr++ = gr_complex(t_real,t_imag); error = phase_detector(*iptr++,d_phase); diff --git a/gr-analog/lib/pll_refout_cc_impl.h b/gr-analog/lib/pll_refout_cc_impl.h index 1734b6e138..1a7e3d5066 100644 --- a/gr-analog/lib/pll_refout_cc_impl.h +++ b/gr-analog/lib/pll_refout_cc_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_PLL_REFOUT_CC_IMPL_H #define INCLUDED_ANALOG_PLL_REFOUT_CC_IMPL_H -#include <analog/pll_refout_cc.h> +#include <gnuradio/analog/pll_refout_cc.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/probe_avg_mag_sqrd_c_impl.cc b/gr-analog/lib/probe_avg_mag_sqrd_c_impl.cc index 291809bb24..78e0c842ed 100644 --- a/gr-analog/lib/probe_avg_mag_sqrd_c_impl.cc +++ b/gr-analog/lib/probe_avg_mag_sqrd_c_impl.cc @@ -25,7 +25,7 @@ #endif #include "probe_avg_mag_sqrd_c_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <cmath> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } probe_avg_mag_sqrd_c_impl::probe_avg_mag_sqrd_c_impl(double threshold_db, double alpha) - : gr_sync_block("probe_avg_mag_sqrd_c", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(0, 0, 0)), + : sync_block("probe_avg_mag_sqrd_c", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(0, 0, 0)), d_unmuted(false), d_level(0), d_iir(alpha) { set_threshold(threshold_db); diff --git a/gr-analog/lib/probe_avg_mag_sqrd_c_impl.h b/gr-analog/lib/probe_avg_mag_sqrd_c_impl.h index 0a2685357a..cddb9a7234 100644 --- a/gr-analog/lib/probe_avg_mag_sqrd_c_impl.h +++ b/gr-analog/lib/probe_avg_mag_sqrd_c_impl.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_C_IMPL_H #define INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_C_IMPL_H -#include <analog/probe_avg_mag_sqrd_c.h> -#include <filter/single_pole_iir.h> +#include <gnuradio/analog/probe_avg_mag_sqrd_c.h> +#include <gnuradio/filter/single_pole_iir.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.cc b/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.cc index ceaf5dbf01..76d54880d4 100644 --- a/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.cc +++ b/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.cc @@ -25,7 +25,7 @@ #endif #include "probe_avg_mag_sqrd_cf_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <cmath> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } probe_avg_mag_sqrd_cf_impl::probe_avg_mag_sqrd_cf_impl(double threshold_db, double alpha) - : gr_sync_block("probe_avg_mag_sqrd_cf", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(1, 1, sizeof(float))), + : sync_block("probe_avg_mag_sqrd_cf", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(1, 1, sizeof(float))), d_unmuted(false), d_level(0), d_iir(alpha) { set_threshold(threshold_db); diff --git a/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.h b/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.h index 9cd8f8d4c3..359f7f8d53 100644 --- a/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.h +++ b/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_CF_IMPL_H #define INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_CF_IMPL_H -#include <analog/probe_avg_mag_sqrd_cf.h> -#include <filter/single_pole_iir.h> +#include <gnuradio/analog/probe_avg_mag_sqrd_cf.h> +#include <gnuradio/filter/single_pole_iir.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/probe_avg_mag_sqrd_f_impl.cc b/gr-analog/lib/probe_avg_mag_sqrd_f_impl.cc index 4ac7ef06bd..505a24a5e9 100644 --- a/gr-analog/lib/probe_avg_mag_sqrd_f_impl.cc +++ b/gr-analog/lib/probe_avg_mag_sqrd_f_impl.cc @@ -25,7 +25,7 @@ #endif #include "probe_avg_mag_sqrd_f_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <cmath> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } probe_avg_mag_sqrd_f_impl::probe_avg_mag_sqrd_f_impl(double threshold_db, double alpha) - : gr_sync_block("probe_avg_mag_sqrd_f", - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature(0, 0, 0)), + : sync_block("probe_avg_mag_sqrd_f", + io_signature::make(1, 1, sizeof(float)), + io_signature::make(0, 0, 0)), d_unmuted(false), d_level(0), d_iir(alpha) { set_threshold(threshold_db); diff --git a/gr-analog/lib/probe_avg_mag_sqrd_f_impl.h b/gr-analog/lib/probe_avg_mag_sqrd_f_impl.h index ba879763c2..bdccfc7b3a 100644 --- a/gr-analog/lib/probe_avg_mag_sqrd_f_impl.h +++ b/gr-analog/lib/probe_avg_mag_sqrd_f_impl.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_F_IMPL_H #define INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_F_IMPL_H -#include <analog/probe_avg_mag_sqrd_f.h> -#include <filter/single_pole_iir.h> +#include <gnuradio/analog/probe_avg_mag_sqrd_f.h> +#include <gnuradio/filter/single_pole_iir.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/pwr_squelch_cc_impl.cc b/gr-analog/lib/pwr_squelch_cc_impl.cc index 1bfba6846f..44fd5dc668 100644 --- a/gr-analog/lib/pwr_squelch_cc_impl.cc +++ b/gr-analog/lib/pwr_squelch_cc_impl.cc @@ -39,9 +39,9 @@ namespace gr { pwr_squelch_cc_impl::pwr_squelch_cc_impl(double threshold, double alpha, int ramp, bool gate) - : gr_block("pwr_squelch_cc", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(1, 1, sizeof(gr_complex))), + : block("pwr_squelch_cc", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(1, 1, sizeof(gr_complex))), squelch_base_cc_impl("pwr_squelch_cc", ramp, gate), d_iir(alpha) { diff --git a/gr-analog/lib/pwr_squelch_cc_impl.h b/gr-analog/lib/pwr_squelch_cc_impl.h index 72df0f3d2d..1fd2bc8a71 100644 --- a/gr-analog/lib/pwr_squelch_cc_impl.h +++ b/gr-analog/lib/pwr_squelch_cc_impl.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_ANALOG_PWR_SQUELCH_CC_IMPL_H #define INCLUDED_ANALOG_PWR_SQUELCH_CC_IMPL_H -#include <analog/pwr_squelch_cc.h> +#include <gnuradio/analog/pwr_squelch_cc.h> #include "squelch_base_cc_impl.h" -#include <filter/single_pole_iir.h> +#include <gnuradio/filter/single_pole_iir.h> #include <cmath> namespace gr { diff --git a/gr-analog/lib/pwr_squelch_ff_impl.cc b/gr-analog/lib/pwr_squelch_ff_impl.cc index c6bb6af903..812011bbb5 100644 --- a/gr-analog/lib/pwr_squelch_ff_impl.cc +++ b/gr-analog/lib/pwr_squelch_ff_impl.cc @@ -39,9 +39,9 @@ namespace gr { pwr_squelch_ff_impl::pwr_squelch_ff_impl(double threshold, double alpha, int ramp, bool gate) - : gr_block("pwr_squelch_ff", - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature(1, 1, sizeof(float))), + : block("pwr_squelch_ff", + io_signature::make(1, 1, sizeof(float)), + io_signature::make(1, 1, sizeof(float))), squelch_base_ff_impl("pwr_squelch_ff", ramp, gate), d_iir(alpha) { diff --git a/gr-analog/lib/pwr_squelch_ff_impl.h b/gr-analog/lib/pwr_squelch_ff_impl.h index 96d959b4dd..022f97c16c 100644 --- a/gr-analog/lib/pwr_squelch_ff_impl.h +++ b/gr-analog/lib/pwr_squelch_ff_impl.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_ANALOG_PWR_SQUELCH_FF_IMPL_H #define INCLUDED_ANALOG_PWR_SQUELCH_FF_IMPL_H -#include <analog/pwr_squelch_ff.h> +#include <gnuradio/analog/pwr_squelch_ff.h> #include "squelch_base_ff_impl.h" -#include <filter/single_pole_iir.h> +#include <gnuradio/filter/single_pole_iir.h> #include <cmath> namespace gr { diff --git a/gr-analog/lib/qa_analog.h b/gr-analog/lib/qa_analog.h index b66b62b5fe..cdb5c78b94 100644 --- a/gr-analog/lib/qa_analog.h +++ b/gr-analog/lib/qa_analog.h @@ -23,7 +23,7 @@ #ifndef _QA_GR_ANALOG_H_ #define _QA_GR_ANALOG_H_ -#include <attributes.h> +#include <gnuradio/attributes.h> #include <cppunit/TestSuite.h> //! collect all the tests for the gr-analog directory diff --git a/gr-analog/lib/quadrature_demod_cf_impl.cc b/gr-analog/lib/quadrature_demod_cf_impl.cc index 9490ba6bed..583de4dba4 100644 --- a/gr-analog/lib/quadrature_demod_cf_impl.cc +++ b/gr-analog/lib/quadrature_demod_cf_impl.cc @@ -25,8 +25,8 @@ #endif #include "quadrature_demod_cf_impl.h" -#include <gr_io_signature.h> -#include <gr_math.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/math.h> namespace gr { namespace analog { @@ -39,9 +39,9 @@ namespace gr { } quadrature_demod_cf_impl::quadrature_demod_cf_impl(float gain) - : gr_sync_block("quadrature_demod_cf", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(1, 1, sizeof(float))), + : sync_block("quadrature_demod_cf", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(1, 1, sizeof(float))), d_gain(gain) { set_history(2); // we need to look at the previous value @@ -62,7 +62,7 @@ namespace gr { for(int i = 0; i < noutput_items; i++) { gr_complex product = in[i] * conj(in[i-1]); - out[i] = d_gain * gr_fast_atan2f(imag(product), real(product)); + out[i] = d_gain * gr::fast_atan2f(imag(product), real(product)); } return noutput_items; diff --git a/gr-analog/lib/quadrature_demod_cf_impl.h b/gr-analog/lib/quadrature_demod_cf_impl.h index 72beb23316..2b505c3c55 100644 --- a/gr-analog/lib/quadrature_demod_cf_impl.h +++ b/gr-analog/lib/quadrature_demod_cf_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_QUADRATURE_DEMOD_CF_IMPL_H #define INCLUDED_ANALOG_QUADRATURE_DEMOD_CF_IMPL_H -#include <analog/quadrature_demod_cf.h> +#include <gnuradio/analog/quadrature_demod_cf.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/rail_ff_impl.cc b/gr-analog/lib/rail_ff_impl.cc index 106c6353ae..a0e4f7cccd 100644 --- a/gr-analog/lib/rail_ff_impl.cc +++ b/gr-analog/lib/rail_ff_impl.cc @@ -25,8 +25,8 @@ #endif #include "rail_ff_impl.h" -#include <gr_io_signature.h> -#include <gr_math.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/math.h> namespace gr { namespace analog { @@ -39,9 +39,9 @@ namespace gr { } rail_ff_impl::rail_ff_impl(float lo, float hi) - : gr_sync_block("rail_ff", - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature(1, 1, sizeof(float))), + : sync_block("rail_ff", + io_signature::make(1, 1, sizeof(float)), + io_signature::make(1, 1, sizeof(float))), d_lo(lo), d_hi(hi) { set_clipping(); @@ -81,7 +81,7 @@ namespace gr { float *out = (float*)output_items[0]; for(int i = 0; i < noutput_items; i++) { - out[i] = d_mid + gr_branchless_clip(in[i] - d_mid, d_clip); + out[i] = d_mid + gr::branchless_clip(in[i] - d_mid, d_clip); } return noutput_items; diff --git a/gr-analog/lib/rail_ff_impl.h b/gr-analog/lib/rail_ff_impl.h index 436b10b412..3617d097d9 100644 --- a/gr-analog/lib/rail_ff_impl.h +++ b/gr-analog/lib/rail_ff_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_RAIL_FF_IMPL_H #define INCLUDED_ANALOG_RAIL_FF_IMPL_H -#include <analog/rail_ff.h> +#include <gnuradio/analog/rail_ff.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/sig_source_X_impl.cc.t b/gr-analog/lib/sig_source_X_impl.cc.t index ad8b7e4b0c..c9e99f015a 100644 --- a/gr-analog/lib/sig_source_X_impl.cc.t +++ b/gr-analog/lib/sig_source_X_impl.cc.t @@ -28,10 +28,10 @@ #include "@IMPL_NAME@.h" #include <algorithm> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdexcept> #include <algorithm> -#include <gr_complex.h> +#include <gnuradio/gr_complex.h> namespace gr { namespace analog { @@ -46,9 +46,9 @@ namespace gr { @IMPL_NAME@::@IMPL_NAME@(double sampling_freq, gr_waveform_t waveform, double frequency, double ampl, @TYPE@ offset) - : gr_sync_block("@BASE_NAME@", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(1, 1, sizeof(@TYPE@))), + : sync_block("@BASE_NAME@", + io_signature::make(0, 0, 0), + io_signature::make(1, 1, sizeof(@TYPE@))), d_sampling_freq(sampling_freq), d_waveform(waveform), d_frequency(frequency), d_ampl(ampl), d_offset(offset) { diff --git a/gr-analog/lib/sig_source_X_impl.h.t b/gr-analog/lib/sig_source_X_impl.h.t index 50f1791270..930a810a67 100644 --- a/gr-analog/lib/sig_source_X_impl.h.t +++ b/gr-analog/lib/sig_source_X_impl.h.t @@ -25,9 +25,9 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <analog/@BASE_NAME@.h> -#include <gr_sync_block.h> -#include <gr_fxpt_nco.h> +#include <gnuradio/analog/@BASE_NAME@.h> +#include <gnuradio/sync_block.h> +#include <gnuradio/fxpt_nco.h> namespace gr { namespace analog { @@ -40,7 +40,7 @@ namespace gr { double d_frequency; double d_ampl; @TYPE@ d_offset; - gr_fxpt_nco d_nco; + gr::fxpt_nco d_nco; public: @IMPL_NAME@(double sampling_freq, gr_waveform_t waveform, diff --git a/gr-analog/lib/simple_squelch_cc_impl.cc b/gr-analog/lib/simple_squelch_cc_impl.cc index 02ccc535da..edaf8de9ce 100644 --- a/gr-analog/lib/simple_squelch_cc_impl.cc +++ b/gr-analog/lib/simple_squelch_cc_impl.cc @@ -25,7 +25,7 @@ #endif #include "simple_squelch_cc_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <cmath> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } simple_squelch_cc_impl::simple_squelch_cc_impl(double threshold_db, double alpha) - : gr_sync_block("simple_squelch_cc", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(1, 1, sizeof(gr_complex))), + : sync_block("simple_squelch_cc", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(1, 1, sizeof(gr_complex))), d_unmuted(false), d_iir(alpha) { set_threshold(threshold_db); diff --git a/gr-analog/lib/simple_squelch_cc_impl.h b/gr-analog/lib/simple_squelch_cc_impl.h index ba11de91e7..d1a923a296 100644 --- a/gr-analog/lib/simple_squelch_cc_impl.h +++ b/gr-analog/lib/simple_squelch_cc_impl.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_SIMPLE_SQUELCH_CC_IMPL_H #define INCLUDED_ANALOG_SIMPLE_SQUELCH_CC_IMPL_H -#include <analog/simple_squelch_cc.h> -#include <filter/single_pole_iir.h> +#include <gnuradio/analog/simple_squelch_cc.h> +#include <gnuradio/filter/single_pole_iir.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/squelch_base_cc_impl.cc b/gr-analog/lib/squelch_base_cc_impl.cc index cba7b30dba..73be18349d 100644 --- a/gr-analog/lib/squelch_base_cc_impl.cc +++ b/gr-analog/lib/squelch_base_cc_impl.cc @@ -25,15 +25,15 @@ #endif #include "squelch_base_cc_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace analog { squelch_base_cc_impl::squelch_base_cc_impl(const char *name, int ramp, bool gate) - : gr_block(name, - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature(1, 1, sizeof(float))) + : block(name, + io_signature::make(1, 1, sizeof(float)), + io_signature::make(1, 1, sizeof(float))) { set_ramp(ramp); set_gate(gate); diff --git a/gr-analog/lib/squelch_base_cc_impl.h b/gr-analog/lib/squelch_base_cc_impl.h index 19dccaa101..58802df91c 100644 --- a/gr-analog/lib/squelch_base_cc_impl.h +++ b/gr-analog/lib/squelch_base_cc_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_SQUELCH_BASE_CC_IMPL_H #define INCLUDED_GR_SQUELCH_BASE_CC_IMPL_H -#include <analog/squelch_base_cc.h> +#include <gnuradio/analog/squelch_base_cc.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/squelch_base_ff_impl.cc b/gr-analog/lib/squelch_base_ff_impl.cc index f9f07d36da..2fb0e64301 100644 --- a/gr-analog/lib/squelch_base_ff_impl.cc +++ b/gr-analog/lib/squelch_base_ff_impl.cc @@ -25,15 +25,15 @@ #endif #include "squelch_base_ff_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace analog { squelch_base_ff_impl::squelch_base_ff_impl(const char *name, int ramp, bool gate) - : gr_block(name, - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature(1, 1, sizeof(float))) + : block(name, + io_signature::make(1, 1, sizeof(float)), + io_signature::make(1, 1, sizeof(float))) { set_ramp(ramp); set_gate(gate); diff --git a/gr-analog/lib/squelch_base_ff_impl.h b/gr-analog/lib/squelch_base_ff_impl.h index 22659be746..343dc5f610 100644 --- a/gr-analog/lib/squelch_base_ff_impl.h +++ b/gr-analog/lib/squelch_base_ff_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_SQUELCH_BASE_FF_IMPL_H #define INCLUDED_GR_SQUELCH_BASE_FF_IMPL_H -#include <analog/squelch_base_ff.h> +#include <gnuradio/analog/squelch_base_ff.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/test_gr_analog.cc b/gr-analog/lib/test_gr_analog.cc index 95ee3aa8cb..e621f9d395 100644 --- a/gr-analog/lib/test_gr_analog.cc +++ b/gr-analog/lib/test_gr_analog.cc @@ -27,7 +27,7 @@ #include <cppunit/TextTestRunner.h> #include <cppunit/XmlOutputter.h> -#include <gr_unittests.h> +#include <gnuradio/unittests.h> #include "qa_analog.h" #include <iostream> diff --git a/gr-analog/swig/CMakeLists.txt b/gr-analog/swig/CMakeLists.txt index 3e93f0c77b..68b2c4a662 100644 --- a/gr-analog/swig/CMakeLists.txt +++ b/gr-analog/swig/CMakeLists.txt @@ -37,7 +37,10 @@ if(ENABLE_GR_CTRLPORT) endif(ENABLE_GR_CTRLPORT) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/analog_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/analog) +set(GR_SWIG_DOC_DIRS + ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/analog + ${CMAKE_CURRENT_BINARY_DIR}/../include/gnuradio/analog +) set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) set(GR_SWIG_TARGET_DEPS analog_generated_includes) set(GR_SWIG_LIBRARIES gnuradio-analog gnuradio-filter) diff --git a/gr-analog/swig/analog_swig.i b/gr-analog/swig/analog_swig.i index 9ae019ad8e..a2da8dd10e 100644 --- a/gr-analog/swig/analog_swig.i +++ b/gr-analog/swig/analog_swig.i @@ -29,91 +29,91 @@ %include "analog_swig_doc.i" %{ -#include <blocks/control_loop.h> +#include <gnuradio/blocks/control_loop.h> %} -%include <blocks/control_loop.h> +%include <gnuradio/blocks/control_loop.h> %{ -#include "analog/cpm.h" -#include "analog/noise_type.h" -#include "analog/agc_cc.h" -#include "analog/agc_ff.h" -#include "analog/agc2_cc.h" -#include "analog/agc2_ff.h" -#include "analog/cpfsk_bc.h" -#include "analog/ctcss_squelch_ff.h" -#include "analog/dpll_bb.h" -#include "analog/feedforward_agc_cc.h" -#include "analog/fmdet_cf.h" -#include "analog/frequency_modulator_fc.h" -#include "analog/fastnoise_source_s.h" -#include "analog/fastnoise_source_i.h" -#include "analog/fastnoise_source_f.h" -#include "analog/fastnoise_source_c.h" -#include "analog/noise_source_s.h" -#include "analog/noise_source_i.h" -#include "analog/noise_source_f.h" -#include "analog/noise_source_c.h" -#include "analog/phase_modulator_fc.h" -#include "analog/pll_carriertracking_cc.h" -#include "analog/pll_freqdet_cf.h" -#include "analog/pll_refout_cc.h" -#include "analog/probe_avg_mag_sqrd_c.h" -#include "analog/probe_avg_mag_sqrd_cf.h" -#include "analog/probe_avg_mag_sqrd_f.h" -#include "analog/pwr_squelch_cc.h" -#include "analog/pwr_squelch_ff.h" -#include "analog/quadrature_demod_cf.h" -#include "analog/rail_ff.h" -#include "analog/sig_source_s.h" -#include "analog/sig_source_i.h" -#include "analog/sig_source_f.h" -#include "analog/sig_source_c.h" -#include "analog/sig_source_waveform.h" -#include "analog/simple_squelch_cc.h" -#include "analog/squelch_base_cc.h" -#include "analog/squelch_base_ff.h" +#include "gnuradio/analog/cpm.h" +#include "gnuradio/analog/noise_type.h" +#include "gnuradio/analog/agc_cc.h" +#include "gnuradio/analog/agc_ff.h" +#include "gnuradio/analog/agc2_cc.h" +#include "gnuradio/analog/agc2_ff.h" +#include "gnuradio/analog/cpfsk_bc.h" +#include "gnuradio/analog/ctcss_squelch_ff.h" +#include "gnuradio/analog/dpll_bb.h" +#include "gnuradio/analog/feedforward_agc_cc.h" +#include "gnuradio/analog/fmdet_cf.h" +#include "gnuradio/analog/frequency_modulator_fc.h" +#include "gnuradio/analog/fastnoise_source_s.h" +#include "gnuradio/analog/fastnoise_source_i.h" +#include "gnuradio/analog/fastnoise_source_f.h" +#include "gnuradio/analog/fastnoise_source_c.h" +#include "gnuradio/analog/noise_source_s.h" +#include "gnuradio/analog/noise_source_i.h" +#include "gnuradio/analog/noise_source_f.h" +#include "gnuradio/analog/noise_source_c.h" +#include "gnuradio/analog/phase_modulator_fc.h" +#include "gnuradio/analog/pll_carriertracking_cc.h" +#include "gnuradio/analog/pll_freqdet_cf.h" +#include "gnuradio/analog/pll_refout_cc.h" +#include "gnuradio/analog/probe_avg_mag_sqrd_c.h" +#include "gnuradio/analog/probe_avg_mag_sqrd_cf.h" +#include "gnuradio/analog/probe_avg_mag_sqrd_f.h" +#include "gnuradio/analog/pwr_squelch_cc.h" +#include "gnuradio/analog/pwr_squelch_ff.h" +#include "gnuradio/analog/quadrature_demod_cf.h" +#include "gnuradio/analog/rail_ff.h" +#include "gnuradio/analog/sig_source_s.h" +#include "gnuradio/analog/sig_source_i.h" +#include "gnuradio/analog/sig_source_f.h" +#include "gnuradio/analog/sig_source_c.h" +#include "gnuradio/analog/sig_source_waveform.h" +#include "gnuradio/analog/simple_squelch_cc.h" +#include "gnuradio/analog/squelch_base_cc.h" +#include "gnuradio/analog/squelch_base_ff.h" %} -%include "analog/cpm.h" -%include "analog/noise_type.h" -%include "analog/agc_cc.h" -%include "analog/agc_ff.h" -%include "analog/agc2_cc.h" -%include "analog/agc2_ff.h" -%include "analog/cpfsk_bc.h" -%include "analog/ctcss_squelch_ff.h" -%include "analog/dpll_bb.h" -%include "analog/feedforward_agc_cc.h" -%include "analog/fmdet_cf.h" -%include "analog/frequency_modulator_fc.h" -%include "analog/fastnoise_source_s.h" -%include "analog/fastnoise_source_i.h" -%include "analog/fastnoise_source_f.h" -%include "analog/fastnoise_source_c.h" -%include "analog/noise_source_s.h" -%include "analog/noise_source_i.h" -%include "analog/noise_source_f.h" -%include "analog/noise_source_c.h" -%include "analog/phase_modulator_fc.h" -%include "analog/pll_carriertracking_cc.h" -%include "analog/pll_freqdet_cf.h" -%include "analog/pll_refout_cc.h" -%include "analog/probe_avg_mag_sqrd_c.h" -%include "analog/probe_avg_mag_sqrd_cf.h" -%include "analog/probe_avg_mag_sqrd_f.h" -%include "analog/pwr_squelch_cc.h" -%include "analog/pwr_squelch_ff.h" -%include "analog/quadrature_demod_cf.h" -%include "analog/rail_ff.h" -%include "analog/sig_source_s.h" -%include "analog/sig_source_i.h" -%include "analog/sig_source_f.h" -%include "analog/sig_source_c.h" -%include "analog/sig_source_waveform.h" -%include "analog/simple_squelch_cc.h" -%include "analog/squelch_base_cc.h" -%include "analog/squelch_base_ff.h" +%include "gnuradio/analog/cpm.h" +%include "gnuradio/analog/noise_type.h" +%include "gnuradio/analog/agc_cc.h" +%include "gnuradio/analog/agc_ff.h" +%include "gnuradio/analog/agc2_cc.h" +%include "gnuradio/analog/agc2_ff.h" +%include "gnuradio/analog/cpfsk_bc.h" +%include "gnuradio/analog/ctcss_squelch_ff.h" +%include "gnuradio/analog/dpll_bb.h" +%include "gnuradio/analog/feedforward_agc_cc.h" +%include "gnuradio/analog/fmdet_cf.h" +%include "gnuradio/analog/frequency_modulator_fc.h" +%include "gnuradio/analog/fastnoise_source_s.h" +%include "gnuradio/analog/fastnoise_source_i.h" +%include "gnuradio/analog/fastnoise_source_f.h" +%include "gnuradio/analog/fastnoise_source_c.h" +%include "gnuradio/analog/noise_source_s.h" +%include "gnuradio/analog/noise_source_i.h" +%include "gnuradio/analog/noise_source_f.h" +%include "gnuradio/analog/noise_source_c.h" +%include "gnuradio/analog/phase_modulator_fc.h" +%include "gnuradio/analog/pll_carriertracking_cc.h" +%include "gnuradio/analog/pll_freqdet_cf.h" +%include "gnuradio/analog/pll_refout_cc.h" +%include "gnuradio/analog/probe_avg_mag_sqrd_c.h" +%include "gnuradio/analog/probe_avg_mag_sqrd_cf.h" +%include "gnuradio/analog/probe_avg_mag_sqrd_f.h" +%include "gnuradio/analog/pwr_squelch_cc.h" +%include "gnuradio/analog/pwr_squelch_ff.h" +%include "gnuradio/analog/quadrature_demod_cf.h" +%include "gnuradio/analog/rail_ff.h" +%include "gnuradio/analog/sig_source_s.h" +%include "gnuradio/analog/sig_source_i.h" +%include "gnuradio/analog/sig_source_f.h" +%include "gnuradio/analog/sig_source_c.h" +%include "gnuradio/analog/sig_source_waveform.h" +%include "gnuradio/analog/simple_squelch_cc.h" +%include "gnuradio/analog/squelch_base_cc.h" +%include "gnuradio/analog/squelch_base_ff.h" GR_SWIG_BLOCK_MAGIC2(analog, agc_cc); GR_SWIG_BLOCK_MAGIC2(analog, agc_ff); |