summaryrefslogtreecommitdiff
path: root/gr-analog
diff options
context:
space:
mode:
Diffstat (limited to 'gr-analog')
-rw-r--r--gr-analog/CMakeLists.txt8
-rw-r--r--gr-analog/doc/CMakeLists.txt8
-rw-r--r--gr-analog/doc/README.analog2
-rw-r--r--gr-analog/grc/analog_block_tree.xml8
-rw-r--r--gr-analog/include/gnuradio/analog/CMakeLists.txt4
-rw-r--r--gr-analog/include/gnuradio/analog/agc.h2
-rw-r--r--gr-analog/include/gnuradio/analog/agc2.h2
-rw-r--r--gr-analog/include/gnuradio/analog/agc2_cc.h4
-rw-r--r--gr-analog/include/gnuradio/analog/agc2_ff.h4
-rw-r--r--gr-analog/include/gnuradio/analog/agc3_cc.h8
-rw-r--r--gr-analog/include/gnuradio/analog/agc_cc.h4
-rw-r--r--gr-analog/include/gnuradio/analog/agc_ff.h6
-rw-r--r--gr-analog/include/gnuradio/analog/cpfsk_bc.h4
-rw-r--r--gr-analog/include/gnuradio/analog/cpm.h2
-rw-r--r--gr-analog/include/gnuradio/analog/ctcss_squelch_ff.h2
-rw-r--r--gr-analog/include/gnuradio/analog/dpll_bb.h4
-rw-r--r--gr-analog/include/gnuradio/analog/feedforward_agc_cc.h2
-rw-r--r--gr-analog/include/gnuradio/analog/fmdet_cf.h2
-rw-r--r--gr-analog/include/gnuradio/analog/frequency_modulator_fc.h2
-rw-r--r--gr-analog/include/gnuradio/analog/noise_source_X.h.t4
-rw-r--r--gr-analog/include/gnuradio/analog/noise_type.h2
-rw-r--r--gr-analog/include/gnuradio/analog/phase_modulator_fc.h2
-rw-r--r--gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h2
-rw-r--r--gr-analog/include/gnuradio/analog/pll_freqdet_cf.h4
-rw-r--r--gr-analog/include/gnuradio/analog/pll_refout_cc.h6
-rw-r--r--gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_c.h2
-rw-r--r--gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_cf.h2
-rw-r--r--gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_f.h2
-rw-r--r--gr-analog/include/gnuradio/analog/pwr_squelch_cc.h4
-rw-r--r--gr-analog/include/gnuradio/analog/pwr_squelch_ff.h4
-rw-r--r--gr-analog/include/gnuradio/analog/quadrature_demod_cf.h2
-rw-r--r--gr-analog/include/gnuradio/analog/rail_ff.h2
-rw-r--r--gr-analog/include/gnuradio/analog/sig_source_X.h.t2
-rw-r--r--gr-analog/include/gnuradio/analog/simple_squelch_cc.h2
-rw-r--r--gr-analog/lib/CMakeLists.txt12
-rw-r--r--gr-analog/lib/agc3_cc_impl.cc8
-rw-r--r--gr-analog/lib/cpfsk_bc_impl.cc2
-rw-r--r--gr-analog/lib/cpfsk_bc_impl.h2
-rw-r--r--gr-analog/lib/ctcss_squelch_ff_impl.cc2
-rw-r--r--gr-analog/lib/ctcss_squelch_ff_impl.h2
-rw-r--r--gr-analog/lib/dpll_bb_impl.h4
-rw-r--r--gr-analog/lib/fastnoise_source_X_impl.cc.t8
-rw-r--r--gr-analog/lib/feedforward_agc_cc_impl.cc2
-rw-r--r--gr-analog/lib/frequency_modulator_fc_impl.h4
-rw-r--r--gr-analog/lib/noise_source_X_impl.cc.t4
-rw-r--r--gr-analog/lib/pll_carriertracking_cc_impl.h2
-rw-r--r--gr-analog/lib/pll_freqdet_cf_impl.h2
-rw-r--r--gr-analog/lib/pll_refout_cc_impl.cc2
-rw-r--r--gr-analog/lib/pll_refout_cc_impl.h2
-rw-r--r--gr-analog/lib/pwr_squelch_cc_impl.cc2
-rw-r--r--gr-analog/lib/pwr_squelch_cc_impl.h4
-rw-r--r--gr-analog/lib/pwr_squelch_ff_impl.h4
-rw-r--r--gr-analog/lib/quadrature_demod_cf_impl.cc2
-rw-r--r--gr-analog/lib/quadrature_demod_cf_impl.h2
-rw-r--r--gr-analog/lib/rail_ff_impl.cc4
-rw-r--r--gr-analog/lib/rail_ff_impl.h2
-rw-r--r--gr-analog/lib/sig_source_X_impl.cc.t4
-rw-r--r--gr-analog/lib/simple_squelch_cc_impl.cc2
-rw-r--r--gr-analog/lib/simple_squelch_cc_impl.h2
-rw-r--r--gr-analog/lib/squelch_base_cc_impl.cc14
-rw-r--r--gr-analog/lib/squelch_base_ff_impl.cc16
-rw-r--r--gr-analog/python/analog/__init__.py10
-rwxr-xr-xgr-analog/python/analog/qa_agc.py2
-rwxr-xr-xgr-analog/python/analog/qa_cpfsk.py2
-rwxr-xr-xgr-analog/python/analog/qa_ctcss_squelch.py2
-rwxr-xr-xgr-analog/python/analog/qa_dpll.py2
-rwxr-xr-xgr-analog/python/analog/qa_phase_modulator.py4
-rwxr-xr-xgr-analog/python/analog/qa_pwr_squelch.py4
-rwxr-xr-xgr-analog/python/analog/qa_quadrature_demod.py4
-rwxr-xr-xgr-analog/python/analog/qa_rail_ff.py2
-rwxr-xr-xgr-analog/python/analog/qa_simple_squelch.py2
-rw-r--r--gr-analog/swig/analog_swig.i8
72 files changed, 139 insertions, 139 deletions
diff --git a/gr-analog/CMakeLists.txt b/gr-analog/CMakeLists.txt
index 44b0c739d2..e0be42a0a5 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 5a02547dbb..009c2d3dca 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 b2b763cc30..9e242878bb 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 ff64f03b70..9e7e4f6037 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 bc2631c89a..01c0518f0b 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 ca6125082f..44896250d4 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 225adc4410..f7a43ba9f6 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 8a24c79288..d280fc0836 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 646882371e..2a11fe7b5c 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 eb542eae08..197a22ca04 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 9a489f11da..3048e63fbf 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 19e2fcbee2..5f3922d253 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 580c387d45..0d889d3e20 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 040f20514a..e3c8341478 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 f9ecc88a03..6d1b5291d0 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 4f9a6c0dd9..a23816d97f 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 5d4abfeedb..647cdf675f 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 571795bbd8..72437a875d 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 d6e2b277fe..c573efe5cc 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 6e3ff3e909..31e742a4ed 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 c3a2146b7e..f1efa4573b 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 56c39ce3ea..e9e29fbf9a 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 35da29c8af..ce4170fff1 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 1ea7eb97ec..88eb46edc5 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 29a2f43198..9f9d168111 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 fe67f3ad59..781d72f742 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 d491321e68..03f465b2c5 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 960480b962..b9424dbd96 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 766f76d385..6913d62934 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 abff53d5e0..46046eae07 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 888cb4a20b..1e13841dc7 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 29856bbcbc..c28c1746f6 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 81c42926cf..cf6cdc212d 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 de6252b288..53d2835ff3 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/CMakeLists.txt b/gr-analog/lib/CMakeLists.txt
index 473003a3bf..a1161fca03 100644
--- a/gr-analog/lib/CMakeLists.txt
+++ b/gr-analog/lib/CMakeLists.txt
@@ -71,7 +71,7 @@ macro(expand_cc root)
list(APPEND expanded_files_cc ${CMAKE_CURRENT_BINARY_DIR}/${name}.cc)
list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
endforeach(sig)
-
+
#create a command to generate the source files
add_custom_command(
OUTPUT ${expanded_files_cc}
@@ -89,15 +89,15 @@ macro(expand_cc root)
${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
${root} ${root}.h.t ${ARGN}
)
-
+
#make source files depends on headers to force generation
set_source_files_properties(${expanded_files_cc}
PROPERTIES OBJECT_DEPENDS "${expanded_files_h}"
)
-
+
#install rules for the generated cc files
- list(APPEND generated_sources ${expanded_files_cc})
- list(APPEND generated_headers ${expanded_files_h})
+ list(APPEND generated_sources ${expanded_files_cc})
+ list(APPEND generated_headers ${expanded_files_h})
endmacro(expand_cc)
@@ -189,7 +189,7 @@ if(ENABLE_TESTING)
target_link_libraries(
test-gr-analog
gnuradio-runtime
- gnuradio-analog
+ gnuradio-analog
${Boost_LIBRARIES}
${CPPUNIT_LIBRARIES}
)
diff --git a/gr-analog/lib/agc3_cc_impl.cc b/gr-analog/lib/agc3_cc_impl.cc
index 86da630d8f..fddefd6710 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 d529936608..3c1674aaa4 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 c3ae0dc864..7b8ac2adf3 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 5532c70d6f..7714da3fe4 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 94ba31569f..c0db6030d3 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 4caa498d70..365d626b13 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 1ec108ba0d..c25230dc6a 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 94894d9bf1..9870c7c3c0 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 cdd3562e09..d2c57b3e4c 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 5d09647848..960666f14d 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 49259f996e..d379fa2ca9 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 646b0609c0..668a2b18bb 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 157961318a..4822263a9c 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 1a7e3d5066..005cb003ed 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 6c832bc392..1a414ed464 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 1fd2bc8a71..eea881a733 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 022f97c16c..26099d5d31 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 059cc89627..b038d491bc 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 2b505c3c55..7a4a8eaf14 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 a0e4f7cccd..525cf0c76e 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 3617d097d9..7f8f3db1f7 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 c9e99f015a..5e0cace9c4 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 edaf8de9ce..18a3997387 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 d1a923a296..9d6c8d5f99 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 73be18349d..c62efc339b 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 2fb0e64301..a729fedb24 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 836d4ba935..3c4a0ff624 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 cb72668341..70c9ba578c 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 a33a6e6092..be2e0a9b7e 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 f5cfcbf976..3be1e9de3b 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 44b1486035..3ae8a3684b 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 05fe2127c0..c6223e5cd4 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 e366192f68..561ca79a7c 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 bcf9aaa17f..08f3f4600e 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 4a7d3f3f7d..e3990dfd3a 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 35f28a6122..b09a3b2a87 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 d9561b32d5..84ac1486d9 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,