diff options
Diffstat (limited to 'gr-analog/include')
30 files changed, 47 insertions, 47 deletions
diff --git a/gr-analog/include/gnuradio/analog/CMakeLists.txt b/gr-analog/include/gnuradio/analog/CMakeLists.txt index bc2631c89..01c0518f0 100644 --- a/gr-analog/include/gnuradio/analog/CMakeLists.txt +++ b/gr-analog/include/gnuradio/analog/CMakeLists.txt @@ -47,7 +47,7 @@ macro(expand_h root) string(REGEX REPLACE "X+" ${sig} name ${root}) list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h) endforeach(sig) - + #create a command to generate the files add_custom_command( OUTPUT ${expanded_files_h} @@ -107,7 +107,7 @@ install(FILES quadrature_demod_cf.h rail_ff.h sig_source_waveform.h - simple_squelch_cc.h + simple_squelch_cc.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/analog COMPONENT "analog_devel" ) diff --git a/gr-analog/include/gnuradio/analog/agc.h b/gr-analog/include/gnuradio/analog/agc.h index ca6125082..44896250d 100644 --- a/gr-analog/include/gnuradio/analog/agc.h +++ b/gr-analog/include/gnuradio/analog/agc.h @@ -97,7 +97,7 @@ namespace gr { * * Power is approximated by absolute value */ - class ANALOG_API agc_ff + class ANALOG_API agc_ff { public: /*! diff --git a/gr-analog/include/gnuradio/analog/agc2.h b/gr-analog/include/gnuradio/analog/agc2.h index 225adc441..f7a43ba9f 100644 --- a/gr-analog/include/gnuradio/analog/agc2.h +++ b/gr-analog/include/gnuradio/analog/agc2.h @@ -172,7 +172,7 @@ namespace gr { float _gain; // current gain float _max_gain; // maximum gain }; - + } /* namespace kernel */ } /* namespace analog */ } /* namespace gr */ diff --git a/gr-analog/include/gnuradio/analog/agc2_cc.h b/gr-analog/include/gnuradio/analog/agc2_cc.h index 8a24c7928..d280fc083 100644 --- a/gr-analog/include/gnuradio/analog/agc2_cc.h +++ b/gr-analog/include/gnuradio/analog/agc2_cc.h @@ -43,7 +43,7 @@ namespace gr { public: // gr::analog::agc2_cc::sptr typedef boost::shared_ptr<agc2_cc> sptr; - + /*! * Build a complex value AGC loop block with attack and decay rates. * @@ -60,7 +60,7 @@ namespace gr { virtual float reference() const = 0; virtual float gain() const = 0; virtual float max_gain() const = 0; - + virtual void set_attack_rate(float rate) = 0; virtual void set_decay_rate(float rate) = 0; virtual void set_reference(float reference) = 0; diff --git a/gr-analog/include/gnuradio/analog/agc2_ff.h b/gr-analog/include/gnuradio/analog/agc2_ff.h index 646882371..2a11fe7b5 100644 --- a/gr-analog/include/gnuradio/analog/agc2_ff.h +++ b/gr-analog/include/gnuradio/analog/agc2_ff.h @@ -43,7 +43,7 @@ namespace gr { public: // gr::analog::agc2_ff::sptr typedef boost::shared_ptr<agc2_ff> sptr; - + /*! * Build a floating point AGC loop block with attack and decay rates. * @@ -60,7 +60,7 @@ namespace gr { virtual float reference() const = 0; virtual float gain() const = 0; virtual float max_gain() const = 0; - + virtual void set_attack_rate(float rate) = 0; virtual void set_decay_rate(float rate) = 0; virtual void set_reference(float reference) = 0; diff --git a/gr-analog/include/gnuradio/analog/agc3_cc.h b/gr-analog/include/gnuradio/analog/agc3_cc.h index eb542eae0..197a22ca0 100644 --- a/gr-analog/include/gnuradio/analog/agc3_cc.h +++ b/gr-analog/include/gnuradio/analog/agc3_cc.h @@ -38,7 +38,7 @@ namespace gr { * Unlike the AGC2 loop, this uses an initial linear calculation * at the beginning for very fast initial acquisition. Moves to * IIR model for tracking purposes. - * + * * For Power the absolute value of the complex number is used. */ class ANALOG_API agc3_cc : virtual public sync_block @@ -46,7 +46,7 @@ namespace gr { public: // gr::analog::agc3_cc::sptr typedef boost::shared_ptr<agc3_cc> sptr; - + /*! * Build a complex value AGC loop block with attack and decay rates. * @@ -54,7 +54,7 @@ namespace gr { * \param decay_rate the update rate of the loop when in decay mode. * \param reference reference value to adjust signal power to. * \param gain initial gain value. - * \param iir_update_decim stride by this number of samples before + * \param iir_update_decim stride by this number of samples before * computing an IIR gain update */ static sptr make(float attack_rate = 1e-1, float decay_rate = 1e-2, @@ -65,7 +65,7 @@ namespace gr { virtual float reference() const = 0; virtual float gain() const = 0; virtual float max_gain() const = 0; - + virtual void set_attack_rate(float rate) = 0; virtual void set_decay_rate(float rate) = 0; virtual void set_reference(float reference) = 0; diff --git a/gr-analog/include/gnuradio/analog/agc_cc.h b/gr-analog/include/gnuradio/analog/agc_cc.h index 9a489f11d..3048e63fb 100644 --- a/gr-analog/include/gnuradio/analog/agc_cc.h +++ b/gr-analog/include/gnuradio/analog/agc_cc.h @@ -42,7 +42,7 @@ namespace gr { public: // gr::analog::agc_cc::sptr typedef boost::shared_ptr<agc_cc> sptr; - + /*! * Build a complex value AGC loop block. * @@ -57,7 +57,7 @@ namespace gr { virtual float reference() const = 0; virtual float gain() const = 0; virtual float max_gain() const = 0; - + virtual void set_rate(float rate) = 0; virtual void set_reference(float reference) = 0; virtual void set_gain(float gain) = 0; diff --git a/gr-analog/include/gnuradio/analog/agc_ff.h b/gr-analog/include/gnuradio/analog/agc_ff.h index 19e2fcbee..5f3922d25 100644 --- a/gr-analog/include/gnuradio/analog/agc_ff.h +++ b/gr-analog/include/gnuradio/analog/agc_ff.h @@ -42,7 +42,7 @@ namespace gr { public: // gr::analog::agc_ff::sptr typedef boost::shared_ptr<agc_ff> sptr; - + /*! * Build a floating point AGC loop block. * @@ -52,12 +52,12 @@ namespace gr { */ static sptr make(float rate = 1e-4, float reference = 1.0, float gain = 1.0); - + virtual float rate() const = 0; virtual float reference() const = 0; virtual float gain() const = 0; virtual float max_gain() const = 0; - + virtual void set_rate(float rate) = 0; virtual void set_reference(float reference) = 0; virtual void set_gain(float gain) = 0; diff --git a/gr-analog/include/gnuradio/analog/cpfsk_bc.h b/gr-analog/include/gnuradio/analog/cpfsk_bc.h index 580c387d4..0d889d3e2 100644 --- a/gr-analog/include/gnuradio/analog/cpfsk_bc.h +++ b/gr-analog/include/gnuradio/analog/cpfsk_bc.h @@ -26,7 +26,7 @@ namespace gr { namespace analog { - + /*! * \brief Perform continuous phase 2-level frequency shift keying modulation * on an input stream of unpacked bits. @@ -37,7 +37,7 @@ namespace gr { public: // gr::analog::cpfsk_bc::sptr typedef boost::shared_ptr<cpfsk_bc> sptr; - + /*! * \brief Make a CPFSK block. * diff --git a/gr-analog/include/gnuradio/analog/cpm.h b/gr-analog/include/gnuradio/analog/cpm.h index 040f20514..e3c834147 100644 --- a/gr-analog/include/gnuradio/analog/cpm.h +++ b/gr-analog/include/gnuradio/analog/cpm.h @@ -42,7 +42,7 @@ namespace gr { GAUSSIAN, GENERIC = 999 }; - + /*! \brief Return the taps for an interpolating FIR filter * (gr::filter::interp_fir_filter_fff). * diff --git a/gr-analog/include/gnuradio/analog/ctcss_squelch_ff.h b/gr-analog/include/gnuradio/analog/ctcss_squelch_ff.h index f9ecc88a0..6d1b5291d 100644 --- a/gr-analog/include/gnuradio/analog/ctcss_squelch_ff.h +++ b/gr-analog/include/gnuradio/analog/ctcss_squelch_ff.h @@ -44,7 +44,7 @@ namespace gr { public: // gr::analog::ctcss_squelch_ff::sptr typedef boost::shared_ptr<ctcss_squelch_ff> sptr; - + /*! * \brief Make CTCSS tone squelch block. * diff --git a/gr-analog/include/gnuradio/analog/dpll_bb.h b/gr-analog/include/gnuradio/analog/dpll_bb.h index 4f9a6c0dd..a23816d97 100644 --- a/gr-analog/include/gnuradio/analog/dpll_bb.h +++ b/gr-analog/include/gnuradio/analog/dpll_bb.h @@ -28,7 +28,7 @@ namespace gr { namespace analog { - + /*! * \brief Detect the peak of a signal * \ingroup peak_detectors_blk @@ -47,7 +47,7 @@ namespace gr { virtual void set_gain(float gain) = 0; virtual void set_decision_threshold(float thresh) = 0; - + virtual float gain() const = 0; virtual float freq() const = 0; virtual float phase() const = 0; diff --git a/gr-analog/include/gnuradio/analog/feedforward_agc_cc.h b/gr-analog/include/gnuradio/analog/feedforward_agc_cc.h index 5d4abfeed..647cdf675 100644 --- a/gr-analog/include/gnuradio/analog/feedforward_agc_cc.h +++ b/gr-analog/include/gnuradio/analog/feedforward_agc_cc.h @@ -48,7 +48,7 @@ namespace gr { */ static sptr make(int nsamples, float reference); }; - + } /* namespace analog */ } /* namespace gr */ diff --git a/gr-analog/include/gnuradio/analog/fmdet_cf.h b/gr-analog/include/gnuradio/analog/fmdet_cf.h index 571795bbd..72437a875 100644 --- a/gr-analog/include/gnuradio/analog/fmdet_cf.h +++ b/gr-analog/include/gnuradio/analog/fmdet_cf.h @@ -31,7 +31,7 @@ namespace gr { /*! * \brief Implements an IQ slope detector - * \ingroup modulators_blk + * \ingroup modulators_blk * * \details * input: stream of complex; output: stream of floats diff --git a/gr-analog/include/gnuradio/analog/frequency_modulator_fc.h b/gr-analog/include/gnuradio/analog/frequency_modulator_fc.h index d6e2b277f..c573efe5c 100644 --- a/gr-analog/include/gnuradio/analog/frequency_modulator_fc.h +++ b/gr-analog/include/gnuradio/analog/frequency_modulator_fc.h @@ -28,7 +28,7 @@ namespace gr { namespace analog { - + /*! * \brief Frequency modulator block * \ingroup modulators_blk diff --git a/gr-analog/include/gnuradio/analog/noise_source_X.h.t b/gr-analog/include/gnuradio/analog/noise_source_X.h.t index 6e3ff3e90..31e742a4e 100644 --- a/gr-analog/include/gnuradio/analog/noise_source_X.h.t +++ b/gr-analog/include/gnuradio/analog/noise_source_X.h.t @@ -31,7 +31,7 @@ namespace gr { namespace analog { - + /*! * \brief Random number source * \ingroup waveform_generators_blk @@ -40,7 +40,7 @@ namespace gr { * Generate random values from different distributions. * Currently, only Gaussian and uniform are enabled. */ - class ANALOG_API @BASE_NAME@ : virtual public sync_block + class ANALOG_API @BASE_NAME@ : virtual public sync_block { public: // gr::analog::@BASE_NAME@::sptr diff --git a/gr-analog/include/gnuradio/analog/noise_type.h b/gr-analog/include/gnuradio/analog/noise_type.h index c3a2146b7..f1efa4573 100644 --- a/gr-analog/include/gnuradio/analog/noise_type.h +++ b/gr-analog/include/gnuradio/analog/noise_type.h @@ -25,7 +25,7 @@ namespace gr { namespace analog { - + typedef enum { GR_UNIFORM = 200, GR_GAUSSIAN, GR_LAPLACIAN, GR_IMPULSE } noise_type_t; diff --git a/gr-analog/include/gnuradio/analog/phase_modulator_fc.h b/gr-analog/include/gnuradio/analog/phase_modulator_fc.h index 56c39ce3e..e9e29fbf9 100644 --- a/gr-analog/include/gnuradio/analog/phase_modulator_fc.h +++ b/gr-analog/include/gnuradio/analog/phase_modulator_fc.h @@ -57,7 +57,7 @@ namespace gr { virtual void set_sensitivity(double s) = 0; virtual void set_phase(double p) = 0; }; - + } /* namespace analog */ } /* namespace gr */ diff --git a/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h b/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h index 35da29c8a..ce4170fff 100644 --- a/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h +++ b/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h @@ -29,7 +29,7 @@ namespace gr { namespace analog { - + /*! * \brief Implements a PLL which locks to the input frequency and outputs the * input signal mixed with that carrier. diff --git a/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h b/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h index 1ea7eb97e..88eb46edc 100644 --- a/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h +++ b/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h @@ -29,7 +29,7 @@ namespace gr { namespace analog { - + /*! * \brief Implements a PLL which locks to the input frequency and outputs * an estimate of that frequency. Useful for FM Demod. @@ -53,7 +53,7 @@ namespace gr { public: // gr::analog::pll_freqdet_cf::sptr typedef boost::shared_ptr<pll_freqdet_cf> sptr; - + /* \brief Make PLL block that outputs the tracked signal's frequency. * * \param loop_bw: control loop's bandwidth parameter. diff --git a/gr-analog/include/gnuradio/analog/pll_refout_cc.h b/gr-analog/include/gnuradio/analog/pll_refout_cc.h index 29a2f4319..9f9d16811 100644 --- a/gr-analog/include/gnuradio/analog/pll_refout_cc.h +++ b/gr-analog/include/gnuradio/analog/pll_refout_cc.h @@ -29,7 +29,7 @@ namespace gr { namespace analog { - + /*! * \brief Implements a PLL which locks to the input frequency and outputs a carrier * \ingroup synchronizers_blk @@ -47,14 +47,14 @@ namespace gr { * and should be set around pi/200 -- 2pi/100. \sa * pll_freqdet_cf, pll_carriertracking_cc */ - class ANALOG_API pll_refout_cc + class ANALOG_API pll_refout_cc : virtual public sync_block, virtual public blocks::control_loop { public: // gr::analog::pll_refout_cc::sptr typedef boost::shared_ptr<pll_refout_cc> sptr; - + /* \brief Make PLL block that outputs the tracked carrier signal. * * \param loop_bw: control loop's bandwidth parameter. diff --git a/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_c.h b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_c.h index fe67f3ad5..781d72f74 100644 --- a/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_c.h +++ b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_c.h @@ -27,7 +27,7 @@ namespace gr { namespace analog { - + /*! * \brief compute avg magnitude squared. * \ingroup measurement_tools_blk diff --git a/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_cf.h b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_cf.h index d491321e6..03f465b2c 100644 --- a/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_cf.h +++ b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_cf.h @@ -28,7 +28,7 @@ namespace gr { namespace analog { - + /*! * \brief compute avg magnitude squared. * \ingroup measurement_tools_blk diff --git a/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_f.h b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_f.h index 960480b96..b9424dbd9 100644 --- a/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_f.h +++ b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_f.h @@ -28,7 +28,7 @@ namespace gr { namespace analog { - + /*! * \brief compute avg magnitude squared. * \ingroup measurement_tools_blk diff --git a/gr-analog/include/gnuradio/analog/pwr_squelch_cc.h b/gr-analog/include/gnuradio/analog/pwr_squelch_cc.h index 766f76d38..6913d6293 100644 --- a/gr-analog/include/gnuradio/analog/pwr_squelch_cc.h +++ b/gr-analog/include/gnuradio/analog/pwr_squelch_cc.h @@ -29,7 +29,7 @@ namespace gr { namespace analog { - + /*! * \brief gate or zero output when input power below threshold * \ingroup level_controllers_blk @@ -44,7 +44,7 @@ namespace gr { public: // gr::analog::pwr_squelch_cc::sptr typedef boost::shared_ptr<pwr_squelch_cc> sptr; - + /*! * \brief Make power-based squelch block. * diff --git a/gr-analog/include/gnuradio/analog/pwr_squelch_ff.h b/gr-analog/include/gnuradio/analog/pwr_squelch_ff.h index abff53d5e..46046eae0 100644 --- a/gr-analog/include/gnuradio/analog/pwr_squelch_ff.h +++ b/gr-analog/include/gnuradio/analog/pwr_squelch_ff.h @@ -29,7 +29,7 @@ namespace gr { namespace analog { - + /*! * \brief gate or zero output when input power below threshold * \ingroup level_controllers_blk @@ -44,7 +44,7 @@ namespace gr { public: // gr::analog::pwr_squelch_ff::sptr typedef boost::shared_ptr<pwr_squelch_ff> sptr; - + /*! * \brief Make power-based squelch block. * diff --git a/gr-analog/include/gnuradio/analog/quadrature_demod_cf.h b/gr-analog/include/gnuradio/analog/quadrature_demod_cf.h index 888cb4a20..1e13841dc 100644 --- a/gr-analog/include/gnuradio/analog/quadrature_demod_cf.h +++ b/gr-analog/include/gnuradio/analog/quadrature_demod_cf.h @@ -28,7 +28,7 @@ namespace gr { namespace analog { - + /*! * \brief quadrature demodulator: complex in, float out * \ingroup modulators_blk diff --git a/gr-analog/include/gnuradio/analog/rail_ff.h b/gr-analog/include/gnuradio/analog/rail_ff.h index 29856bbcb..c28c1746f 100644 --- a/gr-analog/include/gnuradio/analog/rail_ff.h +++ b/gr-analog/include/gnuradio/analog/rail_ff.h @@ -28,7 +28,7 @@ namespace gr { namespace analog { - + /*! * \brief clips input values to min, max * \ingroup level_controllers_blk diff --git a/gr-analog/include/gnuradio/analog/sig_source_X.h.t b/gr-analog/include/gnuradio/analog/sig_source_X.h.t index 81c42926c..cf6cdc212 100644 --- a/gr-analog/include/gnuradio/analog/sig_source_X.h.t +++ b/gr-analog/include/gnuradio/analog/sig_source_X.h.t @@ -41,7 +41,7 @@ namespace gr { public: // gr::analog::@BASE_NAME@::sptr typedef boost::shared_ptr<@BASE_NAME@> sptr; - + /*! * Build a signal source block. * diff --git a/gr-analog/include/gnuradio/analog/simple_squelch_cc.h b/gr-analog/include/gnuradio/analog/simple_squelch_cc.h index de6252b28..53d2835ff 100644 --- a/gr-analog/include/gnuradio/analog/simple_squelch_cc.h +++ b/gr-analog/include/gnuradio/analog/simple_squelch_cc.h @@ -28,7 +28,7 @@ namespace gr { namespace analog { - + /*! * \brief simple squelch block based on average signal power and threshold in dB. * \ingroup level_controllers_blk |