From 65bd288a2804ef10c5ccac322cb5209907bb5d96 Mon Sep 17 00:00:00 2001
From: Josh Morman <jmorman@perspectalabs.com>
Date: Thu, 25 Mar 2021 11:14:55 -0400
Subject: digital: remove deprecated equalizers
Signed-off-by: Josh Morman <jmorman@perspectalabs.com>
---
gr-digital/python/digital/bindings/CMakeLists.txt | 3 -
.../digital/bindings/cma_equalizer_cc_python.cc | 79 ----------------------
.../docstrings/cma_equalizer_cc_pydoc_template.h | 45 ------------
.../kurtotic_equalizer_cc_pydoc_template.h | 35 ----------
.../lms_dd_equalizer_cc_pydoc_template.h | 41 -----------
.../bindings/kurtotic_equalizer_cc_python.cc | 59 ----------------
.../digital/bindings/lms_dd_equalizer_cc_python.cc | 70 -------------------
.../python/digital/bindings/python_bindings.cc | 6 --
8 files changed, 338 deletions(-)
delete mode 100644 gr-digital/python/digital/bindings/cma_equalizer_cc_python.cc
delete mode 100644 gr-digital/python/digital/bindings/docstrings/cma_equalizer_cc_pydoc_template.h
delete mode 100644 gr-digital/python/digital/bindings/docstrings/kurtotic_equalizer_cc_pydoc_template.h
delete mode 100644 gr-digital/python/digital/bindings/docstrings/lms_dd_equalizer_cc_pydoc_template.h
delete mode 100644 gr-digital/python/digital/bindings/kurtotic_equalizer_cc_python.cc
delete mode 100644 gr-digital/python/digital/bindings/lms_dd_equalizer_cc_python.cc
(limited to 'gr-digital/python/digital')
diff --git a/gr-digital/python/digital/bindings/CMakeLists.txt b/gr-digital/python/digital/bindings/CMakeLists.txt
index ade0e251a2..cf38af030d 100644
--- a/gr-digital/python/digital/bindings/CMakeLists.txt
+++ b/gr-digital/python/digital/bindings/CMakeLists.txt
@@ -15,7 +15,6 @@ list(APPEND digital_python_files
chunks_to_symbols_python.cc
clock_recovery_mm_cc_python.cc
clock_recovery_mm_ff_python.cc
- cma_equalizer_cc_python.cc
constellation_python.cc
constellation_decoder_cb_python.cc
constellation_encoder_bc_python.cc
@@ -52,10 +51,8 @@ list(APPEND digital_python_files
header_format_ofdm_python.cc
header_payload_demux_python.cc
interpolating_resampler_type_python.cc
- kurtotic_equalizer_cc_python.cc
lfsr_python.cc
linear_equalizer_python.cc
- lms_dd_equalizer_cc_python.cc
map_bb_python.cc
meas_evm_cc_python.cc
metric_type_python.cc
diff --git a/gr-digital/python/digital/bindings/cma_equalizer_cc_python.cc b/gr-digital/python/digital/bindings/cma_equalizer_cc_python.cc
deleted file mode 100644
index 3daa62ee82..0000000000
--- a/gr-digital/python/digital/bindings/cma_equalizer_cc_python.cc
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2020 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- *
- */
-
-/***********************************************************************************/
-/* This file is automatically generated using bindtool and can be manually edited */
-/* The following lines can be configured to regenerate this file during cmake */
-/* If manual edits are made, the following tags should be modified accordingly. */
-/* BINDTOOL_GEN_AUTOMATIC(0) */
-/* BINDTOOL_USE_PYGCCXML(0) */
-/* BINDTOOL_HEADER_FILE(cma_equalizer_cc.h) */
-/* BINDTOOL_HEADER_FILE_HASH(3d7ebc78bf6a6c712f19f13f3e20648a) */
-/***********************************************************************************/
-
-#include <pybind11/complex.h>
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
-
-namespace py = pybind11;
-
-#include <gnuradio/digital/cma_equalizer_cc.h>
-// pydoc.h is automatically generated in the build directory
-#include <cma_equalizer_cc_pydoc.h>
-
-void bind_cma_equalizer_cc(py::module& m)
-{
-
- using cma_equalizer_cc = ::gr::digital::cma_equalizer_cc;
-
-
- py::class_<cma_equalizer_cc,
- gr::sync_decimator,
- gr::sync_block,
- gr::block,
- gr::basic_block,
- std::shared_ptr<cma_equalizer_cc>>(
- m, "cma_equalizer_cc", D(cma_equalizer_cc))
-
- .def(py::init(&cma_equalizer_cc::make),
- py::arg("num_taps"),
- py::arg("modulus"),
- py::arg("mu"),
- py::arg("sps"),
- D(cma_equalizer_cc, make))
-
-
- .def("set_taps",
- &cma_equalizer_cc::set_taps,
- py::arg("taps"),
- D(cma_equalizer_cc, set_taps))
-
-
- .def("taps", &cma_equalizer_cc::taps, D(cma_equalizer_cc, taps))
-
-
- .def("gain", &cma_equalizer_cc::gain, D(cma_equalizer_cc, gain))
-
-
- .def("set_gain",
- &cma_equalizer_cc::set_gain,
- py::arg("mu"),
- D(cma_equalizer_cc, set_gain))
-
-
- .def("modulus", &cma_equalizer_cc::modulus, D(cma_equalizer_cc, modulus))
-
-
- .def("set_modulus",
- &cma_equalizer_cc::set_modulus,
- py::arg("mod"),
- D(cma_equalizer_cc, set_modulus))
-
- ;
-}
diff --git a/gr-digital/python/digital/bindings/docstrings/cma_equalizer_cc_pydoc_template.h b/gr-digital/python/digital/bindings/docstrings/cma_equalizer_cc_pydoc_template.h
deleted file mode 100644
index ae3a5c5df9..0000000000
--- a/gr-digital/python/digital/bindings/docstrings/cma_equalizer_cc_pydoc_template.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2020 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- *
- */
-#include "pydoc_macros.h"
-#define D(...) DOC(gr, digital, __VA_ARGS__)
-/*
- This file contains placeholders for docstrings for the Python bindings.
- Do not edit! These were automatically extracted during the binding process
- and will be overwritten during the build process
- */
-
-
-static const char* __doc_gr_digital_cma_equalizer_cc = R"doc()doc";
-
-
-static const char* __doc_gr_digital_cma_equalizer_cc_cma_equalizer_cc_0 = R"doc()doc";
-
-
-static const char* __doc_gr_digital_cma_equalizer_cc_cma_equalizer_cc_1 = R"doc()doc";
-
-
-static const char* __doc_gr_digital_cma_equalizer_cc_make = R"doc()doc";
-
-
-static const char* __doc_gr_digital_cma_equalizer_cc_set_taps = R"doc()doc";
-
-
-static const char* __doc_gr_digital_cma_equalizer_cc_taps = R"doc()doc";
-
-
-static const char* __doc_gr_digital_cma_equalizer_cc_gain = R"doc()doc";
-
-
-static const char* __doc_gr_digital_cma_equalizer_cc_set_gain = R"doc()doc";
-
-
-static const char* __doc_gr_digital_cma_equalizer_cc_modulus = R"doc()doc";
-
-
-static const char* __doc_gr_digital_cma_equalizer_cc_set_modulus = R"doc()doc";
diff --git a/gr-digital/python/digital/bindings/docstrings/kurtotic_equalizer_cc_pydoc_template.h b/gr-digital/python/digital/bindings/docstrings/kurtotic_equalizer_cc_pydoc_template.h
deleted file mode 100644
index 135c9699e8..0000000000
--- a/gr-digital/python/digital/bindings/docstrings/kurtotic_equalizer_cc_pydoc_template.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2020 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- *
- */
-#include "pydoc_macros.h"
-#define D(...) DOC(gr, digital, __VA_ARGS__)
-/*
- This file contains placeholders for docstrings for the Python bindings.
- Do not edit! These were automatically extracted during the binding process
- and will be overwritten during the build process
- */
-
-
-static const char* __doc_gr_digital_kurtotic_equalizer_cc = R"doc()doc";
-
-
-static const char* __doc_gr_digital_kurtotic_equalizer_cc_kurtotic_equalizer_cc_0 =
- R"doc()doc";
-
-
-static const char* __doc_gr_digital_kurtotic_equalizer_cc_kurtotic_equalizer_cc_1 =
- R"doc()doc";
-
-
-static const char* __doc_gr_digital_kurtotic_equalizer_cc_make = R"doc()doc";
-
-
-static const char* __doc_gr_digital_kurtotic_equalizer_cc_gain = R"doc()doc";
-
-
-static const char* __doc_gr_digital_kurtotic_equalizer_cc_set_gain = R"doc()doc";
diff --git a/gr-digital/python/digital/bindings/docstrings/lms_dd_equalizer_cc_pydoc_template.h b/gr-digital/python/digital/bindings/docstrings/lms_dd_equalizer_cc_pydoc_template.h
deleted file mode 100644
index 88b45955a9..0000000000
--- a/gr-digital/python/digital/bindings/docstrings/lms_dd_equalizer_cc_pydoc_template.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2020 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- *
- */
-#include "pydoc_macros.h"
-#define D(...) DOC(gr, digital, __VA_ARGS__)
-/*
- This file contains placeholders for docstrings for the Python bindings.
- Do not edit! These were automatically extracted during the binding process
- and will be overwritten during the build process
- */
-
-
-static const char* __doc_gr_digital_lms_dd_equalizer_cc = R"doc()doc";
-
-
-static const char* __doc_gr_digital_lms_dd_equalizer_cc_lms_dd_equalizer_cc_0 =
- R"doc()doc";
-
-
-static const char* __doc_gr_digital_lms_dd_equalizer_cc_lms_dd_equalizer_cc_1 =
- R"doc()doc";
-
-
-static const char* __doc_gr_digital_lms_dd_equalizer_cc_make = R"doc()doc";
-
-
-static const char* __doc_gr_digital_lms_dd_equalizer_cc_set_taps = R"doc()doc";
-
-
-static const char* __doc_gr_digital_lms_dd_equalizer_cc_taps = R"doc()doc";
-
-
-static const char* __doc_gr_digital_lms_dd_equalizer_cc_gain = R"doc()doc";
-
-
-static const char* __doc_gr_digital_lms_dd_equalizer_cc_set_gain = R"doc()doc";
diff --git a/gr-digital/python/digital/bindings/kurtotic_equalizer_cc_python.cc b/gr-digital/python/digital/bindings/kurtotic_equalizer_cc_python.cc
deleted file mode 100644
index e9aa8d1778..0000000000
--- a/gr-digital/python/digital/bindings/kurtotic_equalizer_cc_python.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2020 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- *
- */
-
-/***********************************************************************************/
-/* This file is automatically generated using bindtool and can be manually edited */
-/* The following lines can be configured to regenerate this file during cmake */
-/* If manual edits are made, the following tags should be modified accordingly. */
-/* BINDTOOL_GEN_AUTOMATIC(0) */
-/* BINDTOOL_USE_PYGCCXML(0) */
-/* BINDTOOL_HEADER_FILE(kurtotic_equalizer_cc.h) */
-/* BINDTOOL_HEADER_FILE_HASH(9d3ee736116dcbe107ddaccf5d2ed7f6) */
-/***********************************************************************************/
-
-#include <pybind11/complex.h>
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
-
-namespace py = pybind11;
-
-#include <gnuradio/digital/kurtotic_equalizer_cc.h>
-// pydoc.h is automatically generated in the build directory
-#include <kurtotic_equalizer_cc_pydoc.h>
-
-void bind_kurtotic_equalizer_cc(py::module& m)
-{
-
- using kurtotic_equalizer_cc = ::gr::digital::kurtotic_equalizer_cc;
-
-
- py::class_<kurtotic_equalizer_cc,
- gr::sync_decimator,
- gr::sync_block,
- gr::block,
- gr::basic_block,
- std::shared_ptr<kurtotic_equalizer_cc>>(
- m, "kurtotic_equalizer_cc", D(kurtotic_equalizer_cc))
-
- .def(py::init(&kurtotic_equalizer_cc::make),
- py::arg("num_taps"),
- py::arg("mu"),
- D(kurtotic_equalizer_cc, make))
-
-
- .def("gain", &kurtotic_equalizer_cc::gain, D(kurtotic_equalizer_cc, gain))
-
-
- .def("set_gain",
- &kurtotic_equalizer_cc::set_gain,
- py::arg("mu"),
- D(kurtotic_equalizer_cc, set_gain))
-
- ;
-}
diff --git a/gr-digital/python/digital/bindings/lms_dd_equalizer_cc_python.cc b/gr-digital/python/digital/bindings/lms_dd_equalizer_cc_python.cc
deleted file mode 100644
index db74ff1d37..0000000000
--- a/gr-digital/python/digital/bindings/lms_dd_equalizer_cc_python.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2020 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- *
- */
-
-/***********************************************************************************/
-/* This file is automatically generated using bindtool and can be manually edited */
-/* The following lines can be configured to regenerate this file during cmake */
-/* If manual edits are made, the following tags should be modified accordingly. */
-/* BINDTOOL_GEN_AUTOMATIC(0) */
-/* BINDTOOL_USE_PYGCCXML(0) */
-/* BINDTOOL_HEADER_FILE(lms_dd_equalizer_cc.h) */
-/* BINDTOOL_HEADER_FILE_HASH(2a05788ef6fd117e807fabb019bf2cac) */
-/***********************************************************************************/
-
-#include <pybind11/complex.h>
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
-
-namespace py = pybind11;
-
-#include <gnuradio/digital/lms_dd_equalizer_cc.h>
-// pydoc.h is automatically generated in the build directory
-#include <lms_dd_equalizer_cc_pydoc.h>
-
-void bind_lms_dd_equalizer_cc(py::module& m)
-{
-
- using lms_dd_equalizer_cc = ::gr::digital::lms_dd_equalizer_cc;
-
-
- py::class_<lms_dd_equalizer_cc,
- gr::sync_decimator,
- gr::sync_block,
- gr::block,
- gr::basic_block,
- std::shared_ptr<lms_dd_equalizer_cc>>(
- m, "lms_dd_equalizer_cc", D(lms_dd_equalizer_cc))
-
- .def(py::init(&lms_dd_equalizer_cc::make),
- py::arg("num_taps"),
- py::arg("mu"),
- py::arg("sps"),
- py::arg("cnst"),
- D(lms_dd_equalizer_cc, make))
-
-
- .def("set_taps",
- &lms_dd_equalizer_cc::set_taps,
- py::arg("taps"),
- D(lms_dd_equalizer_cc, set_taps))
-
-
- .def("taps", &lms_dd_equalizer_cc::taps, D(lms_dd_equalizer_cc, taps))
-
-
- .def("gain", &lms_dd_equalizer_cc::gain, D(lms_dd_equalizer_cc, gain))
-
-
- .def("set_gain",
- &lms_dd_equalizer_cc::set_gain,
- py::arg("mu"),
- D(lms_dd_equalizer_cc, set_gain))
-
- ;
-}
diff --git a/gr-digital/python/digital/bindings/python_bindings.cc b/gr-digital/python/digital/bindings/python_bindings.cc
index 2bb0070260..0cf304cf95 100644
--- a/gr-digital/python/digital/bindings/python_bindings.cc
+++ b/gr-digital/python/digital/bindings/python_bindings.cc
@@ -25,7 +25,6 @@ void bind_burst_shaper(py::module&);
void bind_chunks_to_symbols(py::module&);
void bind_clock_recovery_mm_cc(py::module&);
void bind_clock_recovery_mm_ff(py::module&);
-void bind_cma_equalizer_cc(py::module&);
void bind_constellation(py::module&);
void bind_constellation_decoder_cb(py::module&);
void bind_constellation_encoder_bc(py::module&);
@@ -62,10 +61,8 @@ void bind_header_format_default(py::module&);
void bind_header_format_ofdm(py::module&);
void bind_header_payload_demux(py::module&);
void bind_interpolating_resampler_type(py::module&);
-void bind_kurtotic_equalizer_cc(py::module&);
void bind_lfsr(py::module&);
void bind_linear_equalizer(py::module&);
-void bind_lms_dd_equalizer_cc(py::module&);
void bind_map_bb(py::module&);
void bind_meas_evm_cc(py::module&);
void bind_metric_type(py::module&);
@@ -133,7 +130,6 @@ PYBIND11_MODULE(digital_python, m)
bind_chunks_to_symbols(m);
bind_clock_recovery_mm_cc(m);
bind_clock_recovery_mm_ff(m);
- bind_cma_equalizer_cc(m);
bind_constellation(m);
bind_constellation_decoder_cb(m);
bind_constellation_encoder_bc(m);
@@ -170,10 +166,8 @@ PYBIND11_MODULE(digital_python, m)
bind_header_format_ofdm(m);
bind_header_payload_demux(m);
bind_interpolating_resampler_type(m);
- bind_kurtotic_equalizer_cc(m);
bind_lfsr(m);
bind_linear_equalizer(m);
- bind_lms_dd_equalizer_cc(m);
bind_map_bb(m);
bind_meas_evm_cc(m);
bind_metric_type(m);
--
cgit v1.2.3