diff options
| author | Josh Morman <jmorman@perspectalabs.com> | 2021-03-25 15:54:30 -0400 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-04-21 14:02:57 -0400 |
| commit | cfee2be5e63eef28a1835e6039ec4511d4500d88 (patch) | |
| tree | 5211991ebef676bbbf2b64a382443785db2e02e9 /gr-digital/python/digital | |
| parent | dd8c9f59f725c4023082d7298dd0509b0e21a324 (diff) | |
digital: remove simple_{correlator,framer}
Signed-off-by: Josh Morman <jmorman@perspectalabs.com>
Diffstat (limited to 'gr-digital/python/digital')
9 files changed, 0 insertions, 334 deletions
diff --git a/gr-digital/python/digital/bindings/CMakeLists.txt b/gr-digital/python/digital/bindings/CMakeLists.txt index cf38af030d..a18fc0f0bc 100644 --- a/gr-digital/python/digital/bindings/CMakeLists.txt +++ b/gr-digital/python/digital/bindings/CMakeLists.txt @@ -83,9 +83,6 @@ list(APPEND digital_python_files protocol_formatter_bb_python.cc protocol_parser_b_python.cc scrambler_bb_python.cc - simple_correlator_python.cc - simple_framer_python.cc - simple_framer_sync_python.cc symbol_sync_cc_python.cc symbol_sync_ff_python.cc timing_error_detector_type_python.cc diff --git a/gr-digital/python/digital/bindings/docstrings/simple_correlator_pydoc_template.h b/gr-digital/python/digital/bindings/docstrings/simple_correlator_pydoc_template.h deleted file mode 100644 index 31ce13f096..0000000000 --- a/gr-digital/python/digital/bindings/docstrings/simple_correlator_pydoc_template.h +++ /dev/null @@ -1,24 +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_simple_correlator = R"doc()doc"; - - -static const char* __doc_gr_digital_simple_correlator_simple_correlator = R"doc()doc"; - - -static const char* __doc_gr_digital_simple_correlator_make = R"doc()doc"; diff --git a/gr-digital/python/digital/bindings/docstrings/simple_framer_pydoc_template.h b/gr-digital/python/digital/bindings/docstrings/simple_framer_pydoc_template.h deleted file mode 100644 index bd6f2f10c5..0000000000 --- a/gr-digital/python/digital/bindings/docstrings/simple_framer_pydoc_template.h +++ /dev/null @@ -1,24 +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_simple_framer = R"doc()doc"; - - -static const char* __doc_gr_digital_simple_framer_simple_framer = R"doc()doc"; - - -static const char* __doc_gr_digital_simple_framer_make = R"doc()doc"; diff --git a/gr-digital/python/digital/bindings/python_bindings.cc b/gr-digital/python/digital/bindings/python_bindings.cc index 0cf304cf95..2621412e6a 100644 --- a/gr-digital/python/digital/bindings/python_bindings.cc +++ b/gr-digital/python/digital/bindings/python_bindings.cc @@ -93,9 +93,6 @@ void bind_protocol_formatter_async(py::module&); void bind_protocol_formatter_bb(py::module&); void bind_protocol_parser_b(py::module&); void bind_scrambler_bb(py::module&); -void bind_simple_correlator(py::module&); -void bind_simple_framer(py::module&); -void bind_simple_framer_sync(py::module&); void bind_symbol_sync_cc(py::module&); void bind_symbol_sync_ff(py::module&); void bind_timing_error_detector_type(py::module&); @@ -198,9 +195,6 @@ PYBIND11_MODULE(digital_python, m) bind_protocol_formatter_bb(m); bind_protocol_parser_b(m); bind_scrambler_bb(m); - bind_simple_correlator(m); - bind_simple_framer(m); - bind_simple_framer_sync(m); bind_symbol_sync_cc(m); bind_symbol_sync_ff(m); bind_timing_error_detector_type(m); diff --git a/gr-digital/python/digital/bindings/simple_correlator_python.cc b/gr-digital/python/digital/bindings/simple_correlator_python.cc deleted file mode 100644 index 0accdb6e61..0000000000 --- a/gr-digital/python/digital/bindings/simple_correlator_python.cc +++ /dev/null @@ -1,48 +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(simple_correlator.h) */ -/* BINDTOOL_HEADER_FILE_HASH(131b5ac5b9824450600ab24f8a1b108e) */ -/***********************************************************************************/ - -#include <pybind11/complex.h> -#include <pybind11/pybind11.h> -#include <pybind11/stl.h> - -namespace py = pybind11; - -#include <gnuradio/digital/simple_correlator.h> -// pydoc.h is automatically generated in the build directory -#include <simple_correlator_pydoc.h> - -void bind_simple_correlator(py::module& m) -{ - - using simple_correlator = ::gr::digital::simple_correlator; - - - py::class_<simple_correlator, - gr::block, - gr::basic_block, - std::shared_ptr<simple_correlator>>( - m, "simple_correlator", D(simple_correlator)) - - .def(py::init(&simple_correlator::make), - py::arg("payload_bytesize"), - D(simple_correlator, make)) - - - ; -} diff --git a/gr-digital/python/digital/bindings/simple_framer_python.cc b/gr-digital/python/digital/bindings/simple_framer_python.cc deleted file mode 100644 index 5c7f9bbf80..0000000000 --- a/gr-digital/python/digital/bindings/simple_framer_python.cc +++ /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 - * - */ - -/***********************************************************************************/ -/* 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(simple_framer.h) */ -/* BINDTOOL_HEADER_FILE_HASH(61652087ff74cf54a99f8f906e2eb281) */ -/***********************************************************************************/ - -#include <pybind11/complex.h> -#include <pybind11/pybind11.h> -#include <pybind11/stl.h> - -namespace py = pybind11; - -#include <gnuradio/digital/simple_framer.h> -// pydoc.h is automatically generated in the build directory -#include <simple_framer_pydoc.h> - -void bind_simple_framer(py::module& m) -{ - - using simple_framer = ::gr::digital::simple_framer; - - - py::class_<simple_framer, gr::block, gr::basic_block, std::shared_ptr<simple_framer>>( - m, "simple_framer", D(simple_framer)) - - .def(py::init(&simple_framer::make), - py::arg("payload_bytesize"), - D(simple_framer, make)) - - - ; -} diff --git a/gr-digital/python/digital/bindings/simple_framer_sync_python.cc b/gr-digital/python/digital/bindings/simple_framer_sync_python.cc deleted file mode 100644 index 4e22f8e03c..0000000000 --- a/gr-digital/python/digital/bindings/simple_framer_sync_python.cc +++ /dev/null @@ -1,33 +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(simple_framer_sync.h) */ -/* BINDTOOL_HEADER_FILE_HASH(1adbf6040f18f2e2884f8772902700a4) */ -/***********************************************************************************/ - -#include <pybind11/complex.h> -#include <pybind11/pybind11.h> -#include <pybind11/stl.h> - -namespace py = pybind11; - -#include <gnuradio/digital/simple_framer_sync.h> -// pydoc.h is automatically generated in the build directory -#include <simple_framer_sync_pydoc.h> - -void bind_simple_framer_sync(py::module& m) -{ - // TODO: Add the constexprs here -} diff --git a/gr-digital/python/digital/qa_simple_correlator.py b/gr-digital/python/digital/qa_simple_correlator.py deleted file mode 100644 index 9b7690c883..0000000000 --- a/gr-digital/python/digital/qa_simple_correlator.py +++ /dev/null @@ -1,53 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2013 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# SPDX-License-Identifier: GPL-3.0-or-later -# -# - - -from gnuradio import gr, gr_unittest, blocks, filter, digital - - -class test_simple_correlator(gr_unittest.TestCase): - - def setUp(self): - self.tb = gr.top_block() - - def tearDown(self): - self.tb = None - - def test_00(self): - expected_result = [ - 0x00, 0x11, 0x22, 0x33, - 0x44, 0x55, 0x66, 0x77, - 0x88, 0x99, 0xaa, 0xbb, - 0xcc, 0xdd, 0xee, 0xff - ] - - # Filter taps to expand the data to oversample by 8 - # Just using a RRC for some basic filter shape - taps = filter.firdes.root_raised_cosine(8, 8, 1.0, 0.5, 21) - - src = blocks.vector_source_b(expected_result) - frame = digital.simple_framer(4) - unpack = blocks.packed_to_unpacked_bb(1, gr.GR_MSB_FIRST) - expand = filter.interp_fir_filter_fff(8, taps) - b2f = blocks.char_to_float() - mult2 = blocks.multiply_const_ff(2) - sub1 = blocks.add_const_ff(-1) - op = digital.simple_correlator(4) - dst = blocks.vector_sink_b() - self.tb.connect(src, frame, unpack, b2f, mult2, sub1, expand) - self.tb.connect(expand, op, dst) - self.tb.run() - result_data = dst.data() - - self.assertEqual(expected_result, result_data) - - -if __name__ == '__main__': - gr_unittest.run(test_simple_correlator) diff --git a/gr-digital/python/digital/qa_simple_framer.py b/gr-digital/python/digital/qa_simple_framer.py deleted file mode 100644 index 7acfc82977..0000000000 --- a/gr-digital/python/digital/qa_simple_framer.py +++ /dev/null @@ -1,98 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2004,2007,2010,2012,2013 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# SPDX-License-Identifier: GPL-3.0-or-later -# -# - - -from gnuradio import gr, gr_unittest, digital, blocks - - -class test_simple_framer(gr_unittest.TestCase): - - def setUp(self): - self.tb = gr.top_block() - - def tearDown(self): - self.tb = None - - def test_simple_framer_001(self): - src_data = (0x00, 0x11, 0x22, 0x33, - 0x44, 0x55, 0x66, 0x77, - 0x88, 0x99, 0xaa, 0xbb, - 0xcc, 0xdd, 0xee, 0xff) - - expected_result = [ - 0xac, - 0xdd, - 0xa4, - 0xe2, - 0xf2, - 0x8c, - 0x20, - 0xfc, - 0x00, - 0x00, - 0x11, - 0x22, - 0x33, - 0x55, - 0xac, - 0xdd, - 0xa4, - 0xe2, - 0xf2, - 0x8c, - 0x20, - 0xfc, - 0x01, - 0x44, - 0x55, - 0x66, - 0x77, - 0x55, - 0xac, - 0xdd, - 0xa4, - 0xe2, - 0xf2, - 0x8c, - 0x20, - 0xfc, - 0x02, - 0x88, - 0x99, - 0xaa, - 0xbb, - 0x55, - 0xac, - 0xdd, - 0xa4, - 0xe2, - 0xf2, - 0x8c, - 0x20, - 0xfc, - 0x03, - 0xcc, - 0xdd, - 0xee, - 0xff, - 0x55] - - src = blocks.vector_source_b(src_data) - op = digital.simple_framer(4) - dst = blocks.vector_sink_b() - self.tb.connect(src, op) - self.tb.connect(op, dst) - self.tb.run() - result_data = dst.data() - self.assertEqual(expected_result, result_data) - - -if __name__ == '__main__': - gr_unittest.run(test_simple_framer) |