diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-02-03 16:58:15 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-02-03 16:58:43 +0100 |
| commit | db7e26bc73fd71bc88249131f57f7edef308fa63 (patch) | |
| tree | d084ad2615012d53c50a230821761349eb978d56 /gr-filter | |
| parent | 3c63f7334d6de70d655aa97fcccbfb950645f4d4 (diff) | |
| parent | a35e10870bbb9a71b3ab66b1dc58135e08c9543e (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-filter')
21 files changed, 19 insertions, 19 deletions
diff --git a/gr-filter/CMakeLists.txt b/gr-filter/CMakeLists.txt index 972cd2c8b0..fd5f3cc25c 100644 --- a/gr-filter/CMakeLists.txt +++ b/gr-filter/CMakeLists.txt @@ -64,7 +64,7 @@ if(ENABLE_PYTHON) add_subdirectory(apps) endif(ENABLE_PYTHON) add_subdirectory(examples) -add_subdirectory(doc) +add_subdirectory(docs) ######################################################################## # Create Pkg Config File diff --git a/gr-filter/doc/CMakeLists.txt b/gr-filter/docs/CMakeLists.txt index 63447ed2ce..63447ed2ce 100644 --- a/gr-filter/doc/CMakeLists.txt +++ b/gr-filter/docs/CMakeLists.txt diff --git a/gr-filter/doc/README.filter b/gr-filter/docs/README.filter index 776acd46c7..776acd46c7 100644 --- a/gr-filter/doc/README.filter +++ b/gr-filter/docs/README.filter diff --git a/gr-filter/doc/filter.dox b/gr-filter/docs/filter.dox index e598d683f1..674e1e3c5a 100644 --- a/gr-filter/doc/filter.dox +++ b/gr-filter/docs/filter.dox @@ -157,7 +157,7 @@ with added argument to set the out-of-band attenuation (in dB). \li gr::filter::firdes::root_raised_cosine: creates a root raised cosine (RRC) pulse shaping filter. -\li gr::filter::firdes::guassian: creates a Gaussian pulse shaping +\li gr::filter::firdes::gaussian: creates a Gaussian pulse shaping filter. \li gr::filter::firdes::window: Returns the window function for the diff --git a/gr-filter/examples/gr_filtdes_api.py b/gr-filter/examples/gr_filtdes_api.py index 6d7716ce49..9e9cb1df49 100755 --- a/gr-filter/examples/gr_filtdes_api.py +++ b/gr-filter/examples/gr_filtdes_api.py @@ -30,7 +30,7 @@ returns b,a for IIR filter design ''' filtobj = filter_design.launch(sys.argv) -# Displaying all filter paramters +# Displaying all filter parameters print "Filter Count:", filtobj.get_filtercount() print "Filter type:", filtobj.get_restype() print "Filter params", filtobj.get_params() diff --git a/gr-filter/grc/filter_band_pass_filter.xml b/gr-filter/grc/filter_band_pass_filter.xml index c4c1852481..f486e5e0cf 100644 --- a/gr-filter/grc/filter_band_pass_filter.xml +++ b/gr-filter/grc/filter_band_pass_filter.xml @@ -161,6 +161,6 @@ This filter is a convenience wrapper for an fir filter and a firdes taps generat Sample rate, cutoff frequency, and transition width are in Hertz. -The beta paramater only applies to the Kaiser window. +The beta parameter only applies to the Kaiser window. </doc> </block> diff --git a/gr-filter/grc/filter_band_reject_filter.xml b/gr-filter/grc/filter_band_reject_filter.xml index a506789627..cb6fa8737a 100644 --- a/gr-filter/grc/filter_band_reject_filter.xml +++ b/gr-filter/grc/filter_band_reject_filter.xml @@ -127,6 +127,6 @@ This filter is a convenience wrapper for an fir filter and a firdes taps generat Sample rate, cutoff frequency, and transition width are in Hertz. -The beta paramater only applies to the Kaiser window. +The beta parameter only applies to the Kaiser window. </doc> </block> diff --git a/gr-filter/grc/filter_high_pass_filter.xml b/gr-filter/grc/filter_high_pass_filter.xml index 6b041145d5..a456a9da95 100644 --- a/gr-filter/grc/filter_high_pass_filter.xml +++ b/gr-filter/grc/filter_high_pass_filter.xml @@ -122,6 +122,6 @@ This filter is a convenience wrapper for an fir filter and a firdes taps generat Sample rate, cutoff frequency, and transition width are in Hertz. -The beta paramater only applies to the Kaiser window. +The beta parameter only applies to the Kaiser window. </doc> </block> diff --git a/gr-filter/grc/filter_low_pass_filter.xml b/gr-filter/grc/filter_low_pass_filter.xml index 66d15bb592..bc3fdefd8c 100644 --- a/gr-filter/grc/filter_low_pass_filter.xml +++ b/gr-filter/grc/filter_low_pass_filter.xml @@ -122,6 +122,6 @@ This filter is a convenience wrapper for an fir filter and a firdes taps generat Sample rate, cutoff frequency, and transition width are in Hertz. -The beta paramater only applies to the Kaiser window. +The beta parameter only applies to the Kaiser window. </doc> </block> diff --git a/gr-filter/grc/filter_low_pass_xlating_filter.xml b/gr-filter/grc/filter_low_pass_xlating_filter.xml index 65d5e5bff6..bf7a83beb3 100644 --- a/gr-filter/grc/filter_low_pass_xlating_filter.xml +++ b/gr-filter/grc/filter_low_pass_xlating_filter.xml @@ -139,6 +139,6 @@ This filter is a convenience wrapper for an xlating fir filter and a firdes taps Sample rate, cutoff frequency, and transition width are in Hertz. -The beta paramater only applies to the Kaiser window. +The beta parameter only applies to the Kaiser window. </doc> </block> diff --git a/gr-filter/grc/variable_band_pass_filter_taps.xml b/gr-filter/grc/variable_band_pass_filter_taps.xml index 6cdfcc0373..156f302625 100644 --- a/gr-filter/grc/variable_band_pass_filter_taps.xml +++ b/gr-filter/grc/variable_band_pass_filter_taps.xml @@ -92,6 +92,6 @@ self.$(id) = $(id) = firdes.$(type.fcn)($gain, $samp_rate, $low_cutoff_freq, $hi <doc> This is a convenience wrapper for calling firdes.band_pass() or firdes.complex_band_pass() - The beta paramater only applies to the Kaiser window. + The beta parameter only applies to the Kaiser window. </doc> </block> diff --git a/gr-filter/grc/variable_band_reject_filter_taps.xml b/gr-filter/grc/variable_band_reject_filter_taps.xml index fbf25886d3..941b6f4500 100644 --- a/gr-filter/grc/variable_band_reject_filter_taps.xml +++ b/gr-filter/grc/variable_band_reject_filter_taps.xml @@ -76,6 +76,6 @@ self.$(id) = $(id) = firdes.band_reject($gain, $samp_rate, $low_cutoff_freq, $hi <doc> This is a convenience wrapper for calling firdes.band_reject(). - The beta paramater only applies to the Kaiser window. + The beta parameter only applies to the Kaiser window. </doc> </block> diff --git a/gr-filter/grc/variable_high_pass_filter_taps.xml b/gr-filter/grc/variable_high_pass_filter_taps.xml index 08768d808a..ecf5fe1caa 100644 --- a/gr-filter/grc/variable_high_pass_filter_taps.xml +++ b/gr-filter/grc/variable_high_pass_filter_taps.xml @@ -70,6 +70,6 @@ self.$(id) = $(id) = firdes.high_pass($gain, $samp_rate, $cutoff_freq, $width, $ <doc> This variable is a convenience wrapper around a call to firdes.high_pass(...). - The beta paramater only applies to the Kaiser window. + The beta parameter only applies to the Kaiser window. </doc> </block> diff --git a/gr-filter/grc/variable_low_pass_filter_taps.xml b/gr-filter/grc/variable_low_pass_filter_taps.xml index e3367b1ec5..57cb6f16e3 100644 --- a/gr-filter/grc/variable_low_pass_filter_taps.xml +++ b/gr-filter/grc/variable_low_pass_filter_taps.xml @@ -70,6 +70,6 @@ self.$(id) = $(id) = firdes.low_pass($gain, $samp_rate, $cutoff_freq, $width, $w <doc> This variable is a convenience wrapper around a call to firdes.low_pass(...). - The beta paramater only applies to the Kaiser window. + The beta parameter only applies to the Kaiser window. </doc> </block> diff --git a/gr-filter/include/gnuradio/filter/mmse_fir_interpolator_cc.h b/gr-filter/include/gnuradio/filter/mmse_fir_interpolator_cc.h index 84d91d52d4..d61e360c5e 100644 --- a/gr-filter/include/gnuradio/filter/mmse_fir_interpolator_cc.h +++ b/gr-filter/include/gnuradio/filter/mmse_fir_interpolator_cc.h @@ -35,7 +35,7 @@ namespace gr { * \ingroup filter_primitive * * \details - * This implements a Mininum Mean Squared Error interpolator with + * This implements a Minimum Mean Squared Error interpolator with * 8 taps. It is suitable for signals where the bandwidth of * interest B = 1/(4*Ts) Where Ts is the time between samples. * diff --git a/gr-filter/include/gnuradio/filter/mmse_fir_interpolator_ff.h b/gr-filter/include/gnuradio/filter/mmse_fir_interpolator_ff.h index a69315b3d9..8bc8307eae 100644 --- a/gr-filter/include/gnuradio/filter/mmse_fir_interpolator_ff.h +++ b/gr-filter/include/gnuradio/filter/mmse_fir_interpolator_ff.h @@ -35,7 +35,7 @@ namespace gr { * \ingroup filter_primitive * * \details - * This implements a Mininum Mean Squared Error interpolator with + * This implements a Minimum Mean Squared Error interpolator with * 8 taps. It is suitable for signals where the bandwidth of * interest B = 1/(4*Ts) Where Ts is the time between samples. * diff --git a/gr-filter/include/gnuradio/filter/mmse_interp_differentiator_cc.h b/gr-filter/include/gnuradio/filter/mmse_interp_differentiator_cc.h index 5170264b2f..b323815efd 100644 --- a/gr-filter/include/gnuradio/filter/mmse_interp_differentiator_cc.h +++ b/gr-filter/include/gnuradio/filter/mmse_interp_differentiator_cc.h @@ -36,7 +36,7 @@ namespace gr { * \ingroup filter_primitive * * \details - * This implements a Mininum Mean Squared Error interpolating + * This implements a Minimum Mean Squared Error interpolating * differentiator with 8 taps. It is suitable for signals where the * derivative of a signal has a bandwidth of interest in the range * (-Fs/4, Fs/4), where Fs is the samples rate. diff --git a/gr-filter/include/gnuradio/filter/mmse_interp_differentiator_ff.h b/gr-filter/include/gnuradio/filter/mmse_interp_differentiator_ff.h index eb176cd753..3fcfce6972 100644 --- a/gr-filter/include/gnuradio/filter/mmse_interp_differentiator_ff.h +++ b/gr-filter/include/gnuradio/filter/mmse_interp_differentiator_ff.h @@ -35,7 +35,7 @@ namespace gr { * \ingroup filter_primitive * * \details - * This implements a Mininum Mean Squared Error interpolating + * This implements a Minimum Mean Squared Error interpolating * differentiator with 8 taps. It is suitable for signals where the * derivative of a signal has a bandwidth of interest in the range * (-Fs/4, Fs/4), where Fs is the samples rate. diff --git a/gr-filter/python/filter/design/api_object.py b/gr-filter/python/filter/design/api_object.py index 7661265c75..013ea56ed2 100644 --- a/gr-filter/python/filter/design/api_object.py +++ b/gr-filter/python/filter/design/api_object.py @@ -21,7 +21,7 @@ class ApiObject(): ''' Filter count variable if the filter design tool has to - return multiple filter paramters in future + return multiple filter parameters in future e.g Cascaded Filters ''' def __init__(self, filtcount = 1): diff --git a/gr-filter/python/filter/gui/polezero_plot.py b/gr-filter/python/filter/gui/polezero_plot.py index 8f35dc8d78..f9c88947cb 100644 --- a/gr-filter/python/filter/gui/polezero_plot.py +++ b/gr-filter/python/filter/gui/polezero_plot.py @@ -336,7 +336,7 @@ class CanvasPicker(Qt.QObject): if(self.__selectedPoint != -1): xData=delete(xData, self.__selectedPoint) yData=delete(yData, self.__selectedPoint) - #one less to accomodate previous delete + #one less to accommodate previous delete if(self.__selectedcPoint != -1): xData=delete(xData, self.__selectedcPoint-1) yData=delete(yData, self.__selectedcPoint-1) diff --git a/gr-filter/python/filter/optfir.py b/gr-filter/python/filter/optfir.py index 8ef2a06732..998a652386 100644 --- a/gr-filter/python/filter/optfir.py +++ b/gr-filter/python/filter/optfir.py @@ -297,7 +297,7 @@ def lporder (freq1, freq2, delta_p, delta_s): deviation (ripple), delta_s is the stopband deviation (ripple). Note, this works for high pass filters too (freq1 > freq2), but - doesnt work well if the transition is near f == 0 or f == fs/2 + doesn't work well if the transition is near f == 0 or f == fs/2 From Herrmann et al (1973), Practical design rules for optimum finite impulse response filters. Bell System Technical J., 52, 769-99 |