diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
| commit | bbfc759914da80214fabc70fbbed1edaf39f9e4b (patch) | |
| tree | 712eb6d1d95445bb6535534ce86d7faf1bfe6f90 /gr-analog | |
| parent | 3f469513b94ac992138360caca7e1b53f82214ae (diff) | |
| parent | 597b93798a804cde1783d6d2ab53b348d57c44cd (diff) | |
Merge branch 'maint'
Diffstat (limited to 'gr-analog')
71 files changed, 133 insertions, 133 deletions
diff --git a/gr-analog/CMakeLists.txt b/gr-analog/CMakeLists.txt index 44b0c739d..e0be42a0a 100644 --- a/gr-analog/CMakeLists.txt +++ b/gr-analog/CMakeLists.txt @@ -1,17 +1,17 @@ # Copyright 2012 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-analog/doc/CMakeLists.txt b/gr-analog/doc/CMakeLists.txt index 5a02547db..009c2d3dc 100644 --- a/gr-analog/doc/CMakeLists.txt +++ b/gr-analog/doc/CMakeLists.txt @@ -1,17 +1,17 @@ # Copyright 2012 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-analog/doc/README.analog b/gr-analog/doc/README.analog index b2b763cc3..9e242878b 100644 --- a/gr-analog/doc/README.analog +++ b/gr-analog/doc/README.analog @@ -7,7 +7,7 @@ imported as: See the Doxygen documentation for details about the blocks available in this package. A quick listing of the details can be found in Python -after importing by using: +after importing by using: help(analog) diff --git a/gr-analog/grc/analog_block_tree.xml b/gr-analog/grc/analog_block_tree.xml index ff64f03b7..9e7e4f603 100644 --- a/gr-analog/grc/analog_block_tree.xml +++ b/gr-analog/grc/analog_block_tree.xml @@ -2,19 +2,19 @@ <!-- Copyright 2012 Free Software Foundation, Inc. - + This file is part of GNU Radio - + GNU Radio is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. - + GNU Radio is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with GNU Radio; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, 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 diff --git a/gr-analog/lib/agc3_cc_impl.cc b/gr-analog/lib/agc3_cc_impl.cc index 86da630d8..fddefd671 100644 --- a/gr-analog/lib/agc3_cc_impl.cc +++ b/gr-analog/lib/agc3_cc_impl.cc @@ -72,12 +72,12 @@ namespace gr { gr_complex *out = (gr_complex*)output_items[0]; #ifdef __GNUC__ - // Compute a linear average on reset (no expected) + // Compute a linear average on reset (no expected) if(__builtin_expect(d_reset, false)) { float mags[noutput_items] __attribute__ ((aligned (16))); volk_32fc_magnitude_32f(mags, &in[0], noutput_items); -#else - // Compute a linear average on reset (no expected) +#else + // Compute a linear average on reset (no expected) if(!d_reset) { std::vector<float> mags(noutput_items); volk_32fc_magnitude_32f(&mags[0], &in[0], noutput_items); @@ -117,7 +117,7 @@ namespace gr { mag_sq[i] = in[idx].real()*in[idx].real() + in[idx].imag()*in[idx].imag(); } - // compute inverse square roots + // compute inverse square roots volk_32f_invsqrt_32f(&inv_mag[0], &mag_sq[0], noutput_items/d_iir_update_decim); // apply updates diff --git a/gr-analog/lib/cpfsk_bc_impl.cc b/gr-analog/lib/cpfsk_bc_impl.cc index d52993660..3c1674aaa 100644 --- a/gr-analog/lib/cpfsk_bc_impl.cc +++ b/gr-analog/lib/cpfsk_bc_impl.cc @@ -28,7 +28,7 @@ namespace gr { namespace analog { - + #define M_TWOPI (2*M_PI) cpfsk_bc::sptr diff --git a/gr-analog/lib/cpfsk_bc_impl.h b/gr-analog/lib/cpfsk_bc_impl.h index c3ae0dc86..7b8ac2adf 100644 --- a/gr-analog/lib/cpfsk_bc_impl.h +++ b/gr-analog/lib/cpfsk_bc_impl.h @@ -25,7 +25,7 @@ namespace gr { namespace analog { - + class cpfsk_bc_impl : public cpfsk_bc { private: diff --git a/gr-analog/lib/ctcss_squelch_ff_impl.cc b/gr-analog/lib/ctcss_squelch_ff_impl.cc index 5532c70d6..7714da3fe 100644 --- a/gr-analog/lib/ctcss_squelch_ff_impl.cc +++ b/gr-analog/lib/ctcss_squelch_ff_impl.cc @@ -56,7 +56,7 @@ namespace gr { } ctcss_squelch_ff_impl::ctcss_squelch_ff_impl(int rate, float freq, float level, - int len, int ramp, bool gate) + int len, int ramp, bool gate) : block("ctcss_squelch_ff", io_signature::make(1, 1, sizeof(float)), io_signature::make(1, 1, sizeof(float))), diff --git a/gr-analog/lib/ctcss_squelch_ff_impl.h b/gr-analog/lib/ctcss_squelch_ff_impl.h index 94ba31569..c0db6030d 100644 --- a/gr-analog/lib/ctcss_squelch_ff_impl.h +++ b/gr-analog/lib/ctcss_squelch_ff_impl.h @@ -68,7 +68,7 @@ namespace gr { gr_vector_int &ninput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) - { + { return squelch_base_ff_impl::general_work(noutput_items, ninput_items, input_items, diff --git a/gr-analog/lib/dpll_bb_impl.h b/gr-analog/lib/dpll_bb_impl.h index 4caa498d7..365d626b1 100644 --- a/gr-analog/lib/dpll_bb_impl.h +++ b/gr-analog/lib/dpll_bb_impl.h @@ -27,7 +27,7 @@ namespace gr { namespace analog { - + class dpll_bb_impl : public dpll_bb { private: @@ -41,7 +41,7 @@ namespace gr { void set_gain(float gain) { d_gain = gain; } void set_decision_threshold(float thresh) { d_decision_threshold = thresh; } - + float gain() const { return d_gain; } float freq() const { return d_pulse_frequency; } float phase() const { return d_pulse_phase; } diff --git a/gr-analog/lib/fastnoise_source_X_impl.cc.t b/gr-analog/lib/fastnoise_source_X_impl.cc.t index 1ec108ba0..c25230dc6 100644 --- a/gr-analog/lib/fastnoise_source_X_impl.cc.t +++ b/gr-analog/lib/fastnoise_source_X_impl.cc.t @@ -32,7 +32,7 @@ namespace gr { namespace analog { - + @BASE_NAME@::sptr @BASE_NAME@::make(noise_type_t type, float ampl, long seed, long samples) { @@ -63,9 +63,9 @@ namespace gr { d_type = type; generate(); } - + void - @IMPL_NAME@::set_amplitude(float ampl) + @IMPL_NAME@::set_amplitude(float ampl) { gr::thread::scoped_lock l(d_setlock); d_ampl = ampl; @@ -154,7 +154,7 @@ namespace gr { @TYPE@ @IMPL_NAME@::sample_unbiased() { -#if @IS_COMPLEX@ +#if @IS_COMPLEX@ gr_complex s(sample()); return gr_complex(FASTNOISE_RANDOM_SIGN * s.real(), FASTNOISE_RANDOM_SIGN * s.imag()); diff --git a/gr-analog/lib/feedforward_agc_cc_impl.cc b/gr-analog/lib/feedforward_agc_cc_impl.cc index 94894d9bf..9870c7c3c 100644 --- a/gr-analog/lib/feedforward_agc_cc_impl.cc +++ b/gr-analog/lib/feedforward_agc_cc_impl.cc @@ -46,7 +46,7 @@ namespace gr { { if(nsamples < 1) throw std::invalid_argument("feedforward_agc_cc_impl: nsamples must be >= 1"); - + set_history(nsamples); } diff --git a/gr-analog/lib/frequency_modulator_fc_impl.h b/gr-analog/lib/frequency_modulator_fc_impl.h index cdd3562e0..d2c57b3e4 100644 --- a/gr-analog/lib/frequency_modulator_fc_impl.h +++ b/gr-analog/lib/frequency_modulator_fc_impl.h @@ -27,7 +27,7 @@ namespace gr { namespace analog { - + class frequency_modulator_fc_impl : public frequency_modulator_fc { private: @@ -37,7 +37,7 @@ namespace gr { public: frequency_modulator_fc_impl(double sensitivity); ~frequency_modulator_fc_impl(); - + void set_sensitivity(float sens) { d_sensitivity = sens; } float sensitivity() const { return d_sensitivity; } diff --git a/gr-analog/lib/noise_source_X_impl.cc.t b/gr-analog/lib/noise_source_X_impl.cc.t index 5d0964784..960666f14 100644 --- a/gr-analog/lib/noise_source_X_impl.cc.t +++ b/gr-analog/lib/noise_source_X_impl.cc.t @@ -32,7 +32,7 @@ namespace gr { namespace analog { - + @BASE_NAME@::sptr @BASE_NAME@::make(noise_type_t type, float ampl, long seed) { @@ -49,7 +49,7 @@ namespace gr { d_rng(seed) { } - + @IMPL_NAME@::~@IMPL_NAME@() { } diff --git a/gr-analog/lib/pll_carriertracking_cc_impl.h b/gr-analog/lib/pll_carriertracking_cc_impl.h index 49259f996..d379fa2ca 100644 --- a/gr-analog/lib/pll_carriertracking_cc_impl.h +++ b/gr-analog/lib/pll_carriertracking_cc_impl.h @@ -27,7 +27,7 @@ namespace gr { namespace analog { - + class pll_carriertracking_cc_impl : public pll_carriertracking_cc { private: diff --git a/gr-analog/lib/pll_freqdet_cf_impl.h b/gr-analog/lib/pll_freqdet_cf_impl.h index 646b0609c..668a2b18b 100644 --- a/gr-analog/lib/pll_freqdet_cf_impl.h +++ b/gr-analog/lib/pll_freqdet_cf_impl.h @@ -27,7 +27,7 @@ namespace gr { namespace analog { - + class pll_freqdet_cf_impl : public pll_freqdet_cf { private: diff --git a/gr-analog/lib/pll_refout_cc_impl.cc b/gr-analog/lib/pll_refout_cc_impl.cc index 157961318..4822263a9 100644 --- a/gr-analog/lib/pll_refout_cc_impl.cc +++ b/gr-analog/lib/pll_refout_cc_impl.cc @@ -43,7 +43,7 @@ namespace gr { return gnuradio::get_initial_sptr (new pll_refout_cc_impl(loop_bw, max_freq, min_freq)); } - + pll_refout_cc_impl::pll_refout_cc_impl(float loop_bw, float max_freq, float min_freq) : sync_block("pll_refout_cc", io_signature::make(1, 1, sizeof(gr_complex)), diff --git a/gr-analog/lib/pll_refout_cc_impl.h b/gr-analog/lib/pll_refout_cc_impl.h index 1a7e3d506..005cb003e 100644 --- a/gr-analog/lib/pll_refout_cc_impl.h +++ b/gr-analog/lib/pll_refout_cc_impl.h @@ -27,7 +27,7 @@ namespace gr { namespace analog { - + class pll_refout_cc_impl : public pll_refout_cc { private: diff --git a/gr-analog/lib/pwr_squelch_cc_impl.cc b/gr-analog/lib/pwr_squelch_cc_impl.cc index 6c832bc39..1a414ed46 100644 --- a/gr-analog/lib/pwr_squelch_cc_impl.cc +++ b/gr-analog/lib/pwr_squelch_cc_impl.cc @@ -38,7 +38,7 @@ namespace gr { } pwr_squelch_cc_impl::pwr_squelch_cc_impl(double threshold, double alpha, - int ramp, bool gate) + int ramp, bool gate) : block("pwr_squelch_cc", io_signature::make(1, 1, sizeof(gr_complex)), io_signature::make(1, 1, sizeof(gr_complex))), diff --git a/gr-analog/lib/pwr_squelch_cc_impl.h b/gr-analog/lib/pwr_squelch_cc_impl.h index 1fd2bc8a7..eea881a73 100644 --- a/gr-analog/lib/pwr_squelch_cc_impl.h +++ b/gr-analog/lib/pwr_squelch_cc_impl.h @@ -30,7 +30,7 @@ namespace gr { namespace analog { - + class ANALOG_API pwr_squelch_cc_impl : public pwr_squelch_cc, squelch_base_cc_impl { @@ -64,7 +64,7 @@ namespace gr { gr_vector_int &ninput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) - { + { return squelch_base_cc_impl::general_work(noutput_items, ninput_items, input_items, diff --git a/gr-analog/lib/pwr_squelch_ff_impl.h b/gr-analog/lib/pwr_squelch_ff_impl.h index 022f97c16..26099d5d3 100644 --- a/gr-analog/lib/pwr_squelch_ff_impl.h +++ b/gr-analog/lib/pwr_squelch_ff_impl.h @@ -30,7 +30,7 @@ namespace gr { namespace analog { - + class ANALOG_API pwr_squelch_ff_impl : public pwr_squelch_ff, squelch_base_ff_impl { @@ -64,7 +64,7 @@ namespace gr { gr_vector_int &ninput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) - { + { return squelch_base_ff_impl::general_work(noutput_items, ninput_items, input_items, diff --git a/gr-analog/lib/quadrature_demod_cf_impl.cc b/gr-analog/lib/quadrature_demod_cf_impl.cc index 059cc8962..b038d491b 100644 --- a/gr-analog/lib/quadrature_demod_cf_impl.cc +++ b/gr-analog/lib/quadrature_demod_cf_impl.cc @@ -31,7 +31,7 @@ namespace gr { namespace analog { - + quadrature_demod_cf::sptr quadrature_demod_cf::make(float gain) { diff --git a/gr-analog/lib/quadrature_demod_cf_impl.h b/gr-analog/lib/quadrature_demod_cf_impl.h index 2b505c3c5..7a4a8eaf1 100644 --- a/gr-analog/lib/quadrature_demod_cf_impl.h +++ b/gr-analog/lib/quadrature_demod_cf_impl.h @@ -27,7 +27,7 @@ namespace gr { namespace analog { - + class quadrature_demod_cf_impl : public quadrature_demod_cf { private: diff --git a/gr-analog/lib/rail_ff_impl.cc b/gr-analog/lib/rail_ff_impl.cc index a0e4f7ccc..525cf0c76 100644 --- a/gr-analog/lib/rail_ff_impl.cc +++ b/gr-analog/lib/rail_ff_impl.cc @@ -30,7 +30,7 @@ namespace gr { namespace analog { - + rail_ff::sptr rail_ff::make(float lo, float hi) { @@ -57,7 +57,7 @@ namespace gr { d_lo = lo; set_clipping(); } - + void rail_ff_impl::set_hi(float hi) { diff --git a/gr-analog/lib/rail_ff_impl.h b/gr-analog/lib/rail_ff_impl.h index 3617d097d..7f8f3db1f 100644 --- a/gr-analog/lib/rail_ff_impl.h +++ b/gr-analog/lib/rail_ff_impl.h @@ -27,7 +27,7 @@ namespace gr { namespace analog { - + class rail_ff_impl : public rail_ff { private: diff --git a/gr-analog/lib/sig_source_X_impl.cc.t b/gr-analog/lib/sig_source_X_impl.cc.t index c9e99f015..5e0cace9c 100644 --- a/gr-analog/lib/sig_source_X_impl.cc.t +++ b/gr-analog/lib/sig_source_X_impl.cc.t @@ -35,7 +35,7 @@ namespace gr { namespace analog { - + @BASE_NAME@::sptr @BASE_NAME@::make(double sampling_freq, gr_waveform_t waveform, double frequency, double ampl, @TYPE@ offset) @@ -67,7 +67,7 @@ namespace gr { @TYPE@ *optr = (@TYPE@*)output_items[0]; @TYPE@ t; - switch(d_waveform) { + switch(d_waveform) { #if @IS_COMPLEX@ // complex? diff --git a/gr-analog/lib/simple_squelch_cc_impl.cc b/gr-analog/lib/simple_squelch_cc_impl.cc index edaf8de9c..18a399738 100644 --- a/gr-analog/lib/simple_squelch_cc_impl.cc +++ b/gr-analog/lib/simple_squelch_cc_impl.cc @@ -30,7 +30,7 @@ namespace gr { namespace analog { - + simple_squelch_cc::sptr simple_squelch_cc::make(double threshold_db, double alpha) { diff --git a/gr-analog/lib/simple_squelch_cc_impl.h b/gr-analog/lib/simple_squelch_cc_impl.h index d1a923a29..9d6c8d5f9 100644 --- a/gr-analog/lib/simple_squelch_cc_impl.h +++ b/gr-analog/lib/simple_squelch_cc_impl.h @@ -28,7 +28,7 @@ namespace gr { namespace analog { - + class simple_squelch_cc_impl : public simple_squelch_cc { private: diff --git a/gr-analog/lib/squelch_base_cc_impl.cc b/gr-analog/lib/squelch_base_cc_impl.cc index 73be18349..c62efc339 100644 --- a/gr-analog/lib/squelch_base_cc_impl.cc +++ b/gr-analog/lib/squelch_base_cc_impl.cc @@ -51,26 +51,26 @@ namespace gr { { return d_ramp; } - - void + + void squelch_base_cc_impl::set_ramp(int ramp) { d_ramp = ramp; } - - bool + + bool squelch_base_cc_impl::gate() const { return d_gate; } - void + void squelch_base_cc_impl::set_gate(bool gate) { d_gate = gate; } - - bool + + bool squelch_base_cc_impl::unmuted() const { return (d_state == ST_UNMUTED || d_state == ST_ATTACK); diff --git a/gr-analog/lib/squelch_base_ff_impl.cc b/gr-analog/lib/squelch_base_ff_impl.cc index 2fb0e6430..a729fedb2 100644 --- a/gr-analog/lib/squelch_base_ff_impl.cc +++ b/gr-analog/lib/squelch_base_ff_impl.cc @@ -51,26 +51,26 @@ namespace gr { { return d_ramp; } - - void + + void squelch_base_ff_impl::set_ramp(int ramp) { d_ramp = ramp; } - - bool + + bool squelch_base_ff_impl::gate() const { return d_gate; } - void + void squelch_base_ff_impl::set_gate(bool gate) { d_gate = gate; } - - bool + + bool squelch_base_ff_impl::unmuted() const { return (d_state == ST_UNMUTED || d_state == ST_ATTACK); @@ -109,7 +109,7 @@ namespace gr { d_envelope = 0.5-std::cos(M_PI*(++d_ramped)/d_ramp)/2.0; // use >= in case d_ramp is set to lower value elsewhere - if(d_ramped >= d_ramp) { + if(d_ramped >= d_ramp) { d_state = ST_UNMUTED; d_envelope = 1.0; } diff --git a/gr-analog/python/analog/__init__.py b/gr-analog/python/analog/__init__.py index 836d4ba93..3c4a0ff62 100644 --- a/gr-analog/python/analog/__init__.py +++ b/gr-analog/python/analog/__init__.py @@ -1,22 +1,22 @@ # Copyright 2012 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -# +# ''' Blocks and utilities for analog modulation and demodulation. diff --git a/gr-analog/python/analog/qa_agc.py b/gr-analog/python/analog/qa_agc.py index cb7266834..70c9ba578 100755 --- a/gr-analog/python/analog/qa_agc.py +++ b/gr-analog/python/analog/qa_agc.py @@ -489,7 +489,7 @@ class test_agc(gr_unittest.TestCase): length = 8 gain = 2 - + input_data = 8*(0.0,) + 24*(1.0,) + 24*(0.0,) expected_result = (8+length-1)*(0.0,) + 24*(gain*1.0,) + (0,) diff --git a/gr-analog/python/analog/qa_cpfsk.py b/gr-analog/python/analog/qa_cpfsk.py index a33a6e609..be2e0a9b7 100755 --- a/gr-analog/python/analog/qa_cpfsk.py +++ b/gr-analog/python/analog/qa_cpfsk.py @@ -34,7 +34,7 @@ class test_cpfsk_bc(gr_unittest.TestCase): def test_cpfsk_bc_001(self): # Test set/gets - + op = analog.cpfsk_bc(2, 1, 2) op.set_amplitude(2) diff --git a/gr-analog/python/analog/qa_ctcss_squelch.py b/gr-analog/python/analog/qa_ctcss_squelch.py index f5cfcbf97..3be1e9de3 100755 --- a/gr-analog/python/analog/qa_ctcss_squelch.py +++ b/gr-analog/python/analog/qa_ctcss_squelch.py @@ -32,7 +32,7 @@ class test_ctcss_squelch(gr_unittest.TestCase): def test_ctcss_squelch_001(self): # Test set/gets - + rate = 1 rate2 = 2 freq = 100 diff --git a/gr-analog/python/analog/qa_dpll.py b/gr-analog/python/analog/qa_dpll.py index 44b148603..3ae8a3684 100755 --- a/gr-analog/python/analog/qa_dpll.py +++ b/gr-analog/python/analog/qa_dpll.py @@ -32,7 +32,7 @@ class test_dpll_bb(gr_unittest.TestCase): def test_dpll_bb_001(self): # Test set/gets - + period = 1.0 gain = 0.1 op = analog.dpll_bb(period, gain) diff --git a/gr-analog/python/analog/qa_phase_modulator.py b/gr-analog/python/analog/qa_phase_modulator.py index 05fe2127c..c6223e5cd 100755 --- a/gr-analog/python/analog/qa_phase_modulator.py +++ b/gr-analog/python/analog/qa_phase_modulator.py @@ -45,11 +45,11 @@ class test_phase_modulator(gr_unittest.TestCase): src = blocks.vector_source_f(src_data) op = analog.phase_modulator_fc(sensitivity) dst = blocks.vector_sink_c() - + self.tb.connect(src, op) self.tb.connect(op, dst) self.tb.run() - + result_data = dst.data() self.assertComplexTuplesAlmostEqual(expected_result, result_data, 5) diff --git a/gr-analog/python/analog/qa_pwr_squelch.py b/gr-analog/python/analog/qa_pwr_squelch.py index e366192f6..561ca79a7 100755 --- a/gr-analog/python/analog/qa_pwr_squelch.py +++ b/gr-analog/python/analog/qa_pwr_squelch.py @@ -34,7 +34,7 @@ class test_pwr_squelch(gr_unittest.TestCase): # Test set/gets alpha = 0.0001 - + thr1 = 10 thr2 = 20 ramp = 1 @@ -80,7 +80,7 @@ class test_pwr_squelch(gr_unittest.TestCase): # Test set/gets alpha = 0.0001 - + thr1 = 10 thr2 = 20 ramp = 1 diff --git a/gr-analog/python/analog/qa_quadrature_demod.py b/gr-analog/python/analog/qa_quadrature_demod.py index bcf9aaa17..08f3f4600 100755 --- a/gr-analog/python/analog/qa_quadrature_demod.py +++ b/gr-analog/python/analog/qa_quadrature_demod.py @@ -50,11 +50,11 @@ class test_quadrature_demod(gr_unittest.TestCase): src = blocks.vector_source_c(src_data) op = analog.quadrature_demod_cf(gain) dst = blocks.vector_sink_f() - + self.tb.connect(src, op) self.tb.connect(op, dst) self.tb.run() - + result_data = dst.data() self.assertComplexTuplesAlmostEqual(expected_result, result_data, 5) diff --git a/gr-analog/python/analog/qa_rail_ff.py b/gr-analog/python/analog/qa_rail_ff.py index 4a7d3f3f7..e3990dfd3 100755 --- a/gr-analog/python/analog/qa_rail_ff.py +++ b/gr-analog/python/analog/qa_rail_ff.py @@ -40,7 +40,7 @@ class test_rail(gr_unittest.TestCase): def test_rail_001(self): # Test set/gets - + hi1 = 1 hi2 = 2 lo1 = -1 diff --git a/gr-analog/python/analog/qa_simple_squelch.py b/gr-analog/python/analog/qa_simple_squelch.py index 35f28a612..b09a3b2a8 100755 --- a/gr-analog/python/analog/qa_simple_squelch.py +++ b/gr-analog/python/analog/qa_simple_squelch.py @@ -34,7 +34,7 @@ class test_simple_squelch(gr_unittest.TestCase): # Test set/gets alpha = 0.0001 - + thr1 = 10 thr2 = 20 diff --git a/gr-analog/swig/analog_swig.i b/gr-analog/swig/analog_swig.i index d9561b32d..84ac1486d 100644 --- a/gr-analog/swig/analog_swig.i +++ b/gr-analog/swig/analog_swig.i @@ -1,18 +1,18 @@ /* * Copyright 2012 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, |