diff options
author | Jacob Gilbert <jacob.gilbert@protonmail.com> | 2021-01-23 07:59:51 -0800 |
---|---|---|
committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-01-25 07:51:48 -0500 |
commit | a0ddd54ffda45fe843ddede10cec8f4f38319210 (patch) | |
tree | 874ae2944ff49e38a817a10c39a9f1044d6da50d /gr-filter/python | |
parent | b464b6a450a718019647418e6eff3f437f9ae0ae (diff) |
gr-filter: update for additional window values
Recently added window options include several additional windows that take a configuration parameter. This updates this parameter from 'beta' which was previously used only for Kaiser windows to a generic 'param' which makes sense for any window requiring a configuration parameter. The default values remain 6.76 which is not legal for the Tukey window but this error will be caught if the default is used; this is a reasonable cost for backward compatability.
Signed-off-by: Jacob Gilbert <jacob.gilbert@protonmail.com>
Diffstat (limited to 'gr-filter/python')
-rw-r--r-- | gr-filter/python/filter/bindings/firdes_python.cc | 30 | ||||
-rw-r--r-- | gr-filter/python/filter/bindings/hilbert_fc_python.cc | 4 |
2 files changed, 17 insertions, 17 deletions
diff --git a/gr-filter/python/filter/bindings/firdes_python.cc b/gr-filter/python/filter/bindings/firdes_python.cc index fc7cf78866..cf8fd39444 100644 --- a/gr-filter/python/filter/bindings/firdes_python.cc +++ b/gr-filter/python/filter/bindings/firdes_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(firdes.h) */ -/* BINDTOOL_HEADER_FILE_HASH(afeccb5d25e3c88b1dcfc23d3542ec0b) */ +/* BINDTOOL_HEADER_FILE_HASH(10cf0c4b9664ba7e2931c2375c13c68c) */ /***********************************************************************************/ #include <pybind11/complex.h> @@ -38,7 +38,7 @@ void bind_firdes(py::module& m) &firdes::window, py::arg("type"), py::arg("ntaps"), - py::arg("beta"), + py::arg("param"), D(firdes, window)) @@ -49,7 +49,7 @@ void bind_firdes(py::module& m) py::arg("cutoff_freq"), py::arg("transition_width"), py::arg("window") = ::gr::fft::window::win_type::WIN_HAMMING, - py::arg("beta") = 6.7599999999999998, + py::arg("param") = 6.7599999999999998, D(firdes, low_pass)) @@ -61,7 +61,7 @@ void bind_firdes(py::module& m) py::arg("transition_width"), py::arg("attenuation_dB"), py::arg("window") = ::gr::fft::window::win_type::WIN_HAMMING, - py::arg("beta") = 6.7599999999999998, + py::arg("param") = 6.7599999999999998, D(firdes, low_pass_2)) @@ -72,7 +72,7 @@ void bind_firdes(py::module& m) py::arg("cutoff_freq"), py::arg("transition_width"), py::arg("window") = ::gr::fft::window::win_type::WIN_HAMMING, - py::arg("beta") = 6.7599999999999998, + py::arg("param") = 6.7599999999999998, D(firdes, high_pass)) @@ -84,7 +84,7 @@ void bind_firdes(py::module& m) py::arg("transition_width"), py::arg("attenuation_dB"), py::arg("window") = ::gr::fft::window::win_type::WIN_HAMMING, - py::arg("beta") = 6.7599999999999998, + py::arg("param") = 6.7599999999999998, D(firdes, high_pass_2)) @@ -96,7 +96,7 @@ void bind_firdes(py::module& m) py::arg("high_cutoff_freq"), py::arg("transition_width"), py::arg("window") = ::gr::fft::window::win_type::WIN_HAMMING, - py::arg("beta") = 6.7599999999999998, + py::arg("param") = 6.7599999999999998, D(firdes, band_pass)) @@ -109,7 +109,7 @@ void bind_firdes(py::module& m) py::arg("transition_width"), py::arg("attenuation_dB"), py::arg("window") = ::gr::fft::window::win_type::WIN_HAMMING, - py::arg("beta") = 6.7599999999999998, + py::arg("param") = 6.7599999999999998, D(firdes, band_pass_2)) @@ -121,7 +121,7 @@ void bind_firdes(py::module& m) py::arg("high_cutoff_freq"), py::arg("transition_width"), py::arg("window") = ::gr::fft::window::win_type::WIN_HAMMING, - py::arg("beta") = 6.7599999999999998, + py::arg("param") = 6.7599999999999998, D(firdes, complex_band_pass)) @@ -134,7 +134,7 @@ void bind_firdes(py::module& m) py::arg("transition_width"), py::arg("attenuation_dB"), py::arg("window") = ::gr::fft::window::win_type::WIN_HAMMING, - py::arg("beta") = 6.7599999999999998, + py::arg("param") = 6.7599999999999998, D(firdes, complex_band_pass_2)) @@ -146,7 +146,7 @@ void bind_firdes(py::module& m) py::arg("high_cutoff_freq"), py::arg("transition_width"), py::arg("window") = ::gr::fft::window::win_type::WIN_HAMMING, - py::arg("beta") = 6.7599999999999998, + py::arg("param") = 6.7599999999999998, D(firdes, band_reject)) @@ -159,7 +159,7 @@ void bind_firdes(py::module& m) py::arg("transition_width"), py::arg("attenuation_dB"), py::arg("window") = ::gr::fft::window::win_type::WIN_HAMMING, - py::arg("beta") = 6.7599999999999998, + py::arg("param") = 6.7599999999999998, D(firdes, band_reject_2)) @@ -171,7 +171,7 @@ void bind_firdes(py::module& m) py::arg("high_cutoff_freq"), py::arg("transition_width"), py::arg("window") = ::gr::fft::window::win_type::WIN_HAMMING, - py::arg("beta") = 6.7599999999999998, + py::arg("param") = 6.7599999999999998, D(firdes, complex_band_reject)) @@ -184,7 +184,7 @@ void bind_firdes(py::module& m) py::arg("transition_width"), py::arg("attenuation_dB"), py::arg("window") = ::gr::fft::window::win_type::WIN_HAMMING, - py::arg("beta") = 6.7599999999999998, + py::arg("param") = 6.7599999999999998, D(firdes, complex_band_reject_2)) @@ -192,7 +192,7 @@ void bind_firdes(py::module& m) &firdes::hilbert, py::arg("ntaps") = 19, py::arg("windowtype") = ::gr::fft::window::win_type::WIN_RECTANGULAR, - py::arg("beta") = 6.7599999999999998, + py::arg("param") = 6.7599999999999998, D(firdes, hilbert)) diff --git a/gr-filter/python/filter/bindings/hilbert_fc_python.cc b/gr-filter/python/filter/bindings/hilbert_fc_python.cc index ceb660471b..b30e6f5ee0 100644 --- a/gr-filter/python/filter/bindings/hilbert_fc_python.cc +++ b/gr-filter/python/filter/bindings/hilbert_fc_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(hilbert_fc.h) */ -/* BINDTOOL_HEADER_FILE_HASH(3f5ee100c05bf0b167c39a017a65b9eb) */ +/* BINDTOOL_HEADER_FILE_HASH(041e266d5e3108f725118a1f581b43f8) */ /***********************************************************************************/ #include <pybind11/complex.h> @@ -41,6 +41,6 @@ void bind_hilbert_fc(py::module& m) .def(py::init(&hilbert_fc::make), py::arg("ntaps"), py::arg("window") = ::gr::fft::window::win_type::WIN_HAMMING, - py::arg("beta") = 6.7599999999999998, + py::arg("param") = 6.7599999999999998, D(hilbert_fc, make)); } |