From 2a5cb62885ab46ae0d8594bee26e256baed9813b Mon Sep 17 00:00:00 2001
From: Josh Morman <mormjb@gmail.com>
Date: Thu, 23 Apr 2020 11:01:05 -0400
Subject: vocoder: add pybind11 bindings
---
.../vocoder/bindings/gsm_fr_encode_sp_python.cc | 40 ++++++++++++++++++++++
1 file changed, 40 insertions(+)
create mode 100644 gr-vocoder/python/vocoder/bindings/gsm_fr_encode_sp_python.cc
(limited to 'gr-vocoder/python/vocoder/bindings/gsm_fr_encode_sp_python.cc')
diff --git a/gr-vocoder/python/vocoder/bindings/gsm_fr_encode_sp_python.cc b/gr-vocoder/python/vocoder/bindings/gsm_fr_encode_sp_python.cc
new file mode 100644
index 0000000000..587d87f191
--- /dev/null
+++ b/gr-vocoder/python/vocoder/bindings/gsm_fr_encode_sp_python.cc
@@ -0,0 +1,40 @@
+/*
+ * 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 */
+
+#include <pybind11/complex.h>
+#include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
+
+namespace py = pybind11;
+
+#include <gnuradio/vocoder/gsm_fr_encode_sp.h>
+// pydoc.h is automatically generated in the build directory
+#include <gsm_fr_encode_sp_pydoc.h>
+
+void bind_gsm_fr_encode_sp(py::module& m)
+{
+
+ using gsm_fr_encode_sp = ::gr::vocoder::gsm_fr_encode_sp;
+
+
+ py::class_<gsm_fr_encode_sp,
+ gr::sync_decimator,
+ gr::sync_block,
+ gr::block,
+ gr::basic_block,
+ std::shared_ptr<gsm_fr_encode_sp>>(
+ m, "gsm_fr_encode_sp", D(gsm_fr_encode_sp))
+
+ .def(py::init(&gsm_fr_encode_sp::make) D(gsm_fr_encode_sp, make))
+
+
+ ;
+}
--
cgit v1.2.3
From 28ca97597d0780850531be099abfed9c00b0a0ec Mon Sep 17 00:00:00 2001
From: Andrej Rode <mail@andrejro.de>
Date: Fri, 24 Apr 2020 22:04:53 +0200
Subject: vocoder: Fix semicolon error in Pybind11 bindings
---
gr-vocoder/python/vocoder/bindings/gsm_fr_decode_ps_python.cc | 2 +-
gr-vocoder/python/vocoder/bindings/gsm_fr_encode_sp_python.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'gr-vocoder/python/vocoder/bindings/gsm_fr_encode_sp_python.cc')
diff --git a/gr-vocoder/python/vocoder/bindings/gsm_fr_decode_ps_python.cc b/gr-vocoder/python/vocoder/bindings/gsm_fr_decode_ps_python.cc
index b99dcca3d2..11149ac0c0 100644
--- a/gr-vocoder/python/vocoder/bindings/gsm_fr_decode_ps_python.cc
+++ b/gr-vocoder/python/vocoder/bindings/gsm_fr_decode_ps_python.cc
@@ -33,7 +33,7 @@ void bind_gsm_fr_decode_ps(py::module& m)
std::shared_ptr<gsm_fr_decode_ps>>(
m, "gsm_fr_decode_ps", D(gsm_fr_decode_ps))
- .def(py::init(&gsm_fr_decode_ps::make) D(gsm_fr_decode_ps, make))
+ .def(py::init(&gsm_fr_decode_ps::make), D(gsm_fr_decode_ps, make))
;
diff --git a/gr-vocoder/python/vocoder/bindings/gsm_fr_encode_sp_python.cc b/gr-vocoder/python/vocoder/bindings/gsm_fr_encode_sp_python.cc
index 587d87f191..d119a61022 100644
--- a/gr-vocoder/python/vocoder/bindings/gsm_fr_encode_sp_python.cc
+++ b/gr-vocoder/python/vocoder/bindings/gsm_fr_encode_sp_python.cc
@@ -33,7 +33,7 @@ void bind_gsm_fr_encode_sp(py::module& m)
std::shared_ptr<gsm_fr_encode_sp>>(
m, "gsm_fr_encode_sp", D(gsm_fr_encode_sp))
- .def(py::init(&gsm_fr_encode_sp::make) D(gsm_fr_encode_sp, make))
+ .def(py::init(&gsm_fr_encode_sp::make),D(gsm_fr_encode_sp, make))
;
--
cgit v1.2.3
From 5cdb091ee899b9bfd500d036279409b707dd3cd6 Mon Sep 17 00:00:00 2001
From: Josh Morman <mormjb@gmail.com>
Date: Mon, 4 May 2020 10:39:42 -0400
Subject: pybind: run clang-format
---
docs/doxygen/pydoc_macros.h | 29 ++++++++-------
gnuradio-runtime/include/gnuradio/block_gateway.h | 35 +++++++++---------
gnuradio-runtime/include/pmt/pmt.h | 4 +-
gnuradio-runtime/lib/block_gateway_impl.cc | 18 ++++-----
gnuradio-runtime/lib/block_gateway_impl.h | 5 ++-
gnuradio-runtime/lib/pmt/pmt.cc | 2 +-
gnuradio-runtime/python/pmt/bindings/pmt_python.cc | 17 ++++-----
gr-blocks/python/blocks/bindings/wavfile_python.cc | 13 +++----
.../digital/bindings/adaptive_algorithm_python.cc | 3 +-
.../digital/bindings/modulate_vector_python.cc | 11 +++---
gr-fec/include/gnuradio/fec/gf2vec.h | 2 +-
gr-fec/include/gnuradio/fec/polar_common.h | 2 +-
gr-fec/lib/depuncture_bb_impl.cc | 8 +++-
gr-fec/lib/polar_encoder_systematic.cc | 3 +-
.../bindings/docstrings/tcp_sink_pydoc_template.h | 11 ++----
.../bindings/docstrings/udp_sink_pydoc_template.h | 11 ++----
.../docstrings/udp_source_pydoc_template.h | 11 ++----
.../python/network/bindings/python_bindings.cc | 1 -
.../python/network/bindings/tcp_sink_python.cc | 37 +++++++------------
.../python/network/bindings/udp_sink_python.cc | 41 ++++++++-------------
.../python/network/bindings/udp_source_python.cc | 43 ++++++++--------------
.../gr-newmod/docs/doxygen/pydoc_macros.h | 29 ++++++++-------
.../gr-newmod/python/bindings/python_bindings.cc | 3 --
.../vocoder/bindings/gsm_fr_decode_ps_python.cc | 2 +-
.../vocoder/bindings/gsm_fr_encode_sp_python.cc | 2 +-
25 files changed, 151 insertions(+), 192 deletions(-)
(limited to 'gr-vocoder/python/vocoder/bindings/gsm_fr_encode_sp_python.cc')
diff --git a/docs/doxygen/pydoc_macros.h b/docs/doxygen/pydoc_macros.h
index 746b3babcd..98bf7cd639 100644
--- a/docs/doxygen/pydoc_macros.h
+++ b/docs/doxygen/pydoc_macros.h
@@ -1,18 +1,19 @@
#ifndef PYDOC_MACROS_H
#define PYDOC_MACROS_H
-#define __EXPAND(x) x
-#define __COUNT(_1, _2, _3, _4, _5, _6, _7, COUNT, ...) COUNT
-#define __VA_SIZE(...) __EXPAND(__COUNT(__VA_ARGS__, 7, 6, 5, 4, 3, 2, 1))
-#define __CAT1(a, b) a ## b
-#define __CAT2(a, b) __CAT1(a, b)
-#define __DOC1(n1) __doc_##n1
-#define __DOC2(n1, n2) __doc_##n1##_##n2
-#define __DOC3(n1, n2, n3) __doc_##n1##_##n2##_##n3
-#define __DOC4(n1, n2, n3, n4) __doc_##n1##_##n2##_##n3##_##n4
-#define __DOC5(n1, n2, n3, n4, n5) __doc_##n1##_##n2##_##n3##_##n4##_##n5
-#define __DOC6(n1, n2, n3, n4, n5, n6) __doc_##n1##_##n2##_##n3##_##n4##_##n5##_##n6
-#define __DOC7(n1, n2, n3, n4, n5, n6, n7) __doc_##n1##_##n2##_##n3##_##n4##_##n5##_##n6##_##n7
-#define DOC(...) __EXPAND(__EXPAND(__CAT2(__DOC, __VA_SIZE(__VA_ARGS__)))(__VA_ARGS__))
+#define __EXPAND(x) x
+#define __COUNT(_1, _2, _3, _4, _5, _6, _7, COUNT, ...) COUNT
+#define __VA_SIZE(...) __EXPAND(__COUNT(__VA_ARGS__, 7, 6, 5, 4, 3, 2, 1))
+#define __CAT1(a, b) a##b
+#define __CAT2(a, b) __CAT1(a, b)
+#define __DOC1(n1) __doc_##n1
+#define __DOC2(n1, n2) __doc_##n1##_##n2
+#define __DOC3(n1, n2, n3) __doc_##n1##_##n2##_##n3
+#define __DOC4(n1, n2, n3, n4) __doc_##n1##_##n2##_##n3##_##n4
+#define __DOC5(n1, n2, n3, n4, n5) __doc_##n1##_##n2##_##n3##_##n4##_##n5
+#define __DOC6(n1, n2, n3, n4, n5, n6) __doc_##n1##_##n2##_##n3##_##n4##_##n5##_##n6
+#define __DOC7(n1, n2, n3, n4, n5, n6, n7) \
+ __doc_##n1##_##n2##_##n3##_##n4##_##n5##_##n6##_##n7
+#define DOC(...) __EXPAND(__EXPAND(__CAT2(__DOC, __VA_SIZE(__VA_ARGS__)))(__VA_ARGS__))
-#endif //PYDOC_MACROS_H
\ No newline at end of file
+#endif // PYDOC_MACROS_H
\ No newline at end of file
diff --git a/gnuradio-runtime/include/gnuradio/block_gateway.h b/gnuradio-runtime/include/gnuradio/block_gateway.h
index e8e1df87e3..d42dfbb620 100644
--- a/gnuradio-runtime/include/gnuradio/block_gateway.h
+++ b/gnuradio-runtime/include/gnuradio/block_gateway.h
@@ -37,6 +37,7 @@ class GR_RUNTIME_API block_gateway : virtual public gr::block
{
private:
py::handle d_py_handle;
+
public:
// gr::block_gateway::sptr
typedef std::shared_ptr<block_gateway> sptr;
@@ -62,18 +63,17 @@ public:
}
void _add_item_tag(unsigned int which_output,
- uint64_t abs_offset,
- const pmt::pmt_t& key,
- const pmt::pmt_t& value,
- const pmt::pmt_t& srcid = pmt::PMT_F)
+ uint64_t abs_offset,
+ const pmt::pmt_t& key,
+ const pmt::pmt_t& value,
+ const pmt::pmt_t& srcid = pmt::PMT_F)
{
return gr::block::add_item_tag(which_output, abs_offset, key, value, srcid);
}
- std::vector<tag_t> _get_tags_in_range(unsigned int which_input,
- uint64_t abs_start,
- uint64_t abs_end)
+ std::vector<tag_t>
+ _get_tags_in_range(unsigned int which_input, uint64_t abs_start, uint64_t abs_end)
{
std::vector<gr::tag_t> tags;
gr::block::get_tags_in_range(tags, which_input, abs_start, abs_end);
@@ -81,18 +81,17 @@ public:
}
std::vector<tag_t> _get_tags_in_range(unsigned int which_input,
- uint64_t abs_start,
- uint64_t abs_end,
- const pmt::pmt_t& key)
+ uint64_t abs_start,
+ uint64_t abs_end,
+ const pmt::pmt_t& key)
{
std::vector<gr::tag_t> tags;
gr::block::get_tags_in_range(tags, which_input, abs_start, abs_end, key);
return tags;
}
- std::vector<tag_t> _get_tags_in_window(unsigned int which_input,
- uint64_t rel_start,
- uint64_t rel_end)
+ std::vector<tag_t>
+ _get_tags_in_window(unsigned int which_input, uint64_t rel_start, uint64_t rel_end)
{
std::vector<gr::tag_t> tags;
gr::block::get_tags_in_window(tags, which_input, rel_start, rel_end);
@@ -100,21 +99,21 @@ public:
}
std::vector<tag_t> _get_tags_in_window(unsigned int which_input,
- uint64_t rel_start,
- uint64_t rel_end,
- const pmt::pmt_t& key)
+ uint64_t rel_start,
+ uint64_t rel_end,
+ const pmt::pmt_t& key)
{
std::vector<gr::tag_t> tags;
gr::block::get_tags_in_window(tags, which_input, rel_start, rel_end, key);
return tags;
}
- virtual void set_msg_handler_pybind(pmt::pmt_t which_port, std::string& handler_name) = 0;
+ virtual void set_msg_handler_pybind(pmt::pmt_t which_port,
+ std::string& handler_name) = 0;
protected:
virtual bool has_msg_handler(pmt::pmt_t which_port) = 0;
virtual void dispatch_msg(pmt::pmt_t which_port, pmt::pmt_t msg) = 0;
-
};
} /* namespace gr */
diff --git a/gnuradio-runtime/include/pmt/pmt.h b/gnuradio-runtime/include/pmt/pmt.h
index e13a6044d6..a977a23eaa 100644
--- a/gnuradio-runtime/include/pmt/pmt.h
+++ b/gnuradio-runtime/include/pmt/pmt.h
@@ -41,12 +41,12 @@ namespace pmt {
/*!
* \brief base class of all pmt types
*/
-class PMT_API pmt_base
+class PMT_API pmt_base
{
public:
pmt_base(){};
- pmt_base(const pmt_base&)=delete;
+ pmt_base(const pmt_base&) = delete;
virtual ~pmt_base();
virtual bool is_bool() const { return false; }
diff --git a/gnuradio-runtime/lib/block_gateway_impl.cc b/gnuradio-runtime/lib/block_gateway_impl.cc
index ced8edd1f5..f4550a8bdc 100644
--- a/gnuradio-runtime/lib/block_gateway_impl.cc
+++ b/gnuradio-runtime/lib/block_gateway_impl.cc
@@ -20,8 +20,7 @@ block_gateway::sptr block_gateway::make(const py::object& p,
gr::io_signature::sptr in_sig,
gr::io_signature::sptr out_sig)
{
- return block_gateway::sptr(
- new block_gateway_impl(p, name, in_sig, out_sig));
+ return block_gateway::sptr(new block_gateway_impl(p, name, in_sig, out_sig));
}
block_gateway_impl::block_gateway_impl(const py::handle& p,
@@ -36,10 +35,10 @@ block_gateway_impl::block_gateway_impl(const py::handle& p,
void block_gateway_impl::forecast(int noutput_items, gr_vector_int& ninput_items_required)
{
py::gil_scoped_acquire acquire;
-
- py::object ret_ninput_items_required = _py_handle.attr("handle_forecast")(noutput_items, ninput_items_required.size());
- ninput_items_required = ret_ninput_items_required.cast<std::vector<int>>();
+ py::object ret_ninput_items_required =
+ _py_handle.attr("handle_forecast")(noutput_items, ninput_items_required.size());
+ ninput_items_required = ret_ninput_items_required.cast<std::vector<int>>();
}
int block_gateway_impl::general_work(int noutput_items,
@@ -49,9 +48,11 @@ int block_gateway_impl::general_work(int noutput_items,
{
py::gil_scoped_acquire acquire;
- py::object ret = _py_handle.attr("handle_general_work")(noutput_items, ninput_items, input_items, output_items);
-
- return ret.cast<int>();;
+ py::object ret = _py_handle.attr("handle_general_work")(
+ noutput_items, ninput_items, input_items, output_items);
+
+ return ret.cast<int>();
+ ;
}
bool block_gateway_impl::start(void)
@@ -68,7 +69,6 @@ bool block_gateway_impl::stop(void)
py::object ret = _py_handle.attr("stop")();
return ret.cast<bool>();
-
}
} /* namespace gr */
diff --git a/gnuradio-runtime/lib/block_gateway_impl.h b/gnuradio-runtime/lib/block_gateway_impl.h
index 168a78650e..dc609a1248 100644
--- a/gnuradio-runtime/lib/block_gateway_impl.h
+++ b/gnuradio-runtime/lib/block_gateway_impl.h
@@ -46,7 +46,7 @@ public:
}
d_msg_handlers_pybind[which_port] = handler_name;
}
-
+
protected:
// Message handlers back into python using pybind API
typedef std::map<pmt::pmt_t, std::string, pmt::comparator> msg_handlers_pybind_t;
@@ -68,7 +68,8 @@ protected:
// d_msg_handlers_pybind[which_port]->calleval(msg); // Yes, invoke it.
py::gil_scoped_acquire acquire;
// std::string handler_name(d_msg_handlers_pybind[which_port]);
- py::object ret = _py_handle.attr(d_msg_handlers_pybind[which_port].c_str())(msg);
+ py::object ret =
+ _py_handle.attr(d_msg_handlers_pybind[which_port].c_str())(msg);
} else {
// Pass to generic dispatcher if not found
gr::basic_block::dispatch_msg(which_port, msg);
diff --git a/gnuradio-runtime/lib/pmt/pmt.cc b/gnuradio-runtime/lib/pmt/pmt.cc
index cad2d27d4a..102c8b0fa2 100644
--- a/gnuradio-runtime/lib/pmt/pmt.cc
+++ b/gnuradio-runtime/lib/pmt/pmt.cc
@@ -298,7 +298,7 @@ pmt_t pmt_from_complex(double re, double im)
return pmt_t(new pmt_complex(std::complex<double>(re, im)));
}
-pmt_t pmt_from_complex(const std::complex<double> &z)
+pmt_t pmt_from_complex(const std::complex<double>& z)
{
return pmt_t(new pmt_complex(z));
}
diff --git a/gnuradio-runtime/python/pmt/bindings/pmt_python.cc b/gnuradio-runtime/python/pmt/bindings/pmt_python.cc
index 995b6fdd84..5761d5c1c9 100644
--- a/gnuradio-runtime/python/pmt/bindings/pmt_python.cc
+++ b/gnuradio-runtime/python/pmt/bindings/pmt_python.cc
@@ -768,13 +768,13 @@ void bind_pmt(py::module& m)
D(init_u64vector, 0));
- m.def("init_u64vector",
- (pmt::pmt_t(*)(
- size_t, std::vector<uint64_t, std::allocator<uint64_t>> const&)) &
- ::pmt::init_u64vector,
- py::arg("k"),
- py::arg("data"),
- D(init_u64vector, 1));
+ m.def(
+ "init_u64vector",
+ (pmt::pmt_t(*)(size_t, std::vector<uint64_t, std::allocator<uint64_t>> const&)) &
+ ::pmt::init_u64vector,
+ py::arg("k"),
+ py::arg("data"),
+ D(init_u64vector, 1));
m.def("init_s64vector",
@@ -1174,8 +1174,7 @@ void bind_pmt(py::module& m)
m.def("u64vector_elements",
- (std::vector<uint64_t, std::allocator<uint64_t>> const (*)(
- pmt::pmt_t)) &
+ (std::vector<uint64_t, std::allocator<uint64_t>> const (*)(pmt::pmt_t)) &
::pmt::u64vector_elements,
py::arg("v"),
D(u64vector_elements, 1));
diff --git a/gr-blocks/python/blocks/bindings/wavfile_python.cc b/gr-blocks/python/blocks/bindings/wavfile_python.cc
index 70f4df7965..a02c743215 100644
--- a/gr-blocks/python/blocks/bindings/wavfile_python.cc
+++ b/gr-blocks/python/blocks/bindings/wavfile_python.cc
@@ -24,13 +24,12 @@ void bind_wavfile(py::module& m)
using wav_header_info = gr::blocks::wav_header_info;
py::class_<wav_header_info, std::shared_ptr<wav_header_info>>(m, "wav_header_info")
- .def_readwrite("sample_rate",&wav_header_info::sample_rate)
- .def_readwrite("nchans",&wav_header_info::nchans)
- .def_readwrite("bytes_per_sample",&wav_header_info::bytes_per_sample)
- .def_readwrite("first_sample_pos",&wav_header_info::first_sample_pos)
- .def_readwrite("samples_per_chan",&wav_header_info::samples_per_chan)
- .def_readwrite("data_chunk_size",&wav_header_info::data_chunk_size)
- ;
+ .def_readwrite("sample_rate", &wav_header_info::sample_rate)
+ .def_readwrite("nchans", &wav_header_info::nchans)
+ .def_readwrite("bytes_per_sample", &wav_header_info::bytes_per_sample)
+ .def_readwrite("first_sample_pos", &wav_header_info::first_sample_pos)
+ .def_readwrite("samples_per_chan", &wav_header_info::samples_per_chan)
+ .def_readwrite("data_chunk_size", &wav_header_info::data_chunk_size);
m.def("wavheader_parse",
&::gr::blocks::wavheader_parse,
diff --git a/gr-digital/python/digital/bindings/adaptive_algorithm_python.cc b/gr-digital/python/digital/bindings/adaptive_algorithm_python.cc
index e27279c41f..bd764c5bb4 100644
--- a/gr-digital/python/digital/bindings/adaptive_algorithm_python.cc
+++ b/gr-digital/python/digital/bindings/adaptive_algorithm_python.cc
@@ -25,8 +25,7 @@ void bind_adaptive_algorithm(py::module& m)
using adaptive_algorithm = ::gr::digital::adaptive_algorithm;
- py::class_<adaptive_algorithm,
- std::shared_ptr<adaptive_algorithm>>(
+ py::class_<adaptive_algorithm, std::shared_ptr<adaptive_algorithm>>(
m, "adaptive_algorithm", D(adaptive_algorithm))
.def("base", &adaptive_algorithm::base, D(adaptive_algorithm, base))
diff --git a/gr-digital/python/digital/bindings/modulate_vector_python.cc b/gr-digital/python/digital/bindings/modulate_vector_python.cc
index 6e486a841e..c6a2c80b49 100644
--- a/gr-digital/python/digital/bindings/modulate_vector_python.cc
+++ b/gr-digital/python/digital/bindings/modulate_vector_python.cc
@@ -16,14 +16,15 @@
namespace py = pybind11;
#include <gnuradio/basic_block.h>
-#include <gnuradio/runtime_types.h>
#include <gnuradio/digital/modulate_vector.h>
+#include <gnuradio/runtime_types.h>
void bind_modulate_vector(py::module& m)
{
- m.def("modulate_vector_bc",&::gr::digital::modulate_vector_bc,
- py::arg("modulator"),
- py::arg("data"),
- py::arg("taps"));
+ m.def("modulate_vector_bc",
+ &::gr::digital::modulate_vector_bc,
+ py::arg("modulator"),
+ py::arg("data"),
+ py::arg("taps"));
}
diff --git a/gr-fec/include/gnuradio/fec/gf2vec.h b/gr-fec/include/gnuradio/fec/gf2vec.h
index 2dd4f0d2ea..fc0740051b 100644
--- a/gr-fec/include/gnuradio/fec/gf2vec.h
+++ b/gr-fec/include/gnuradio/fec/gf2vec.h
@@ -11,8 +11,8 @@
#ifndef GF2VEC_H
#define GF2VEC_H
-#include <vector>
#include <stdint.h>
+#include <vector>
class GF2Vec
{
diff --git a/gr-fec/include/gnuradio/fec/polar_common.h b/gr-fec/include/gnuradio/fec/polar_common.h
index bfebe6df26..102e47e2c5 100644
--- a/gr-fec/include/gnuradio/fec/polar_common.h
+++ b/gr-fec/include/gnuradio/fec/polar_common.h
@@ -15,8 +15,8 @@
#include <vector>
#include <gnuradio/fec/api.h>
-#include <vector>
#include <stdint.h>
+#include <vector>
// Forward declaration for those objects. SWIG doesn't like them to be #include'd.
namespace gr {
diff --git a/gr-fec/lib/depuncture_bb_impl.cc b/gr-fec/lib/depuncture_bb_impl.cc
index e006725797..a6dc4fccfc 100644
--- a/gr-fec/lib/depuncture_bb_impl.cc
+++ b/gr-fec/lib/depuncture_bb_impl.cc
@@ -23,13 +23,17 @@
namespace gr {
namespace fec {
-depuncture_bb::sptr depuncture_bb::make(int puncsize, int puncpat, int delay, uint8_t symbol)
+depuncture_bb::sptr
+depuncture_bb::make(int puncsize, int puncpat, int delay, uint8_t symbol)
{
return gnuradio::get_initial_sptr(
new depuncture_bb_impl(puncsize, puncpat, delay, symbol));
}
-depuncture_bb_impl::depuncture_bb_impl(int puncsize, int puncpat, int delay, uint8_t symbol)
+depuncture_bb_impl::depuncture_bb_impl(int puncsize,
+ int puncpat,
+ int delay,
+ uint8_t symbol)
: block("depuncture_bb",
io_signature::make(1, 1, sizeof(unsigned char)),
io_signature::make(1, 1, sizeof(unsigned char))),
diff --git a/gr-fec/lib/polar_encoder_systematic.cc b/gr-fec/lib/polar_encoder_systematic.cc
index 605a83dcb9..b77f5e0730 100644
--- a/gr-fec/lib/polar_encoder_systematic.cc
+++ b/gr-fec/lib/polar_encoder_systematic.cc
@@ -30,7 +30,8 @@ generic_encoder::sptr polar_encoder_systematic::make(
polar_encoder_systematic::polar_encoder_systematic(int block_size,
int num_info_bits,
std::vector<int> frozen_bit_positions)
- : polar_common(block_size, num_info_bits, frozen_bit_positions, std::vector<uint8_t>())
+ : polar_common(
+ block_size, num_info_bits, frozen_bit_positions, std::vector<uint8_t>())
{
d_volk_syst_intermediate = (unsigned char*)volk_malloc(
sizeof(unsigned char) * block_size, volk_get_alignment());
diff --git a/gr-network/python/network/bindings/docstrings/tcp_sink_pydoc_template.h b/gr-network/python/network/bindings/docstrings/tcp_sink_pydoc_template.h
index 33286aca96..5ce85026f0 100644
--- a/gr-network/python/network/bindings/docstrings/tcp_sink_pydoc_template.h
+++ b/gr-network/python/network/bindings/docstrings/tcp_sink_pydoc_template.h
@@ -7,7 +7,7 @@
*
*/
#include "pydoc_macros.h"
-#define D(...) DOC(gr,network, __VA_ARGS__ )
+#define D(...) DOC(gr, network, __VA_ARGS__)
/*
This file contains placeholders for docstrings for the Python bindings.
Do not edit! These were automatically extracted during the binding process
@@ -15,13 +15,10 @@
*/
-
- static const char *__doc_gr_network_tcp_sink = R"doc()doc";
+static const char* __doc_gr_network_tcp_sink = R"doc()doc";
- static const char *__doc_gr_network_tcp_sink_tcp_sink = R"doc()doc";
+static const char* __doc_gr_network_tcp_sink_tcp_sink = R"doc()doc";
- static const char *__doc_gr_network_tcp_sink_make = R"doc()doc";
-
-
+static const char* __doc_gr_network_tcp_sink_make = R"doc()doc";
diff --git a/gr-network/python/network/bindings/docstrings/udp_sink_pydoc_template.h b/gr-network/python/network/bindings/docstrings/udp_sink_pydoc_template.h
index 95c60a30b8..583dcd9152 100644
--- a/gr-network/python/network/bindings/docstrings/udp_sink_pydoc_template.h
+++ b/gr-network/python/network/bindings/docstrings/udp_sink_pydoc_template.h
@@ -7,7 +7,7 @@
*
*/
#include "pydoc_macros.h"
-#define D(...) DOC(gr,network, __VA_ARGS__ )
+#define D(...) DOC(gr, network, __VA_ARGS__)
/*
This file contains placeholders for docstrings for the Python bindings.
Do not edit! These were automatically extracted during the binding process
@@ -15,13 +15,10 @@
*/
-
- static const char *__doc_gr_network_udp_sink = R"doc()doc";
+static const char* __doc_gr_network_udp_sink = R"doc()doc";
- static const char *__doc_gr_network_udp_sink_udp_sink = R"doc()doc";
+static const char* __doc_gr_network_udp_sink_udp_sink = R"doc()doc";
- static const char *__doc_gr_network_udp_sink_make = R"doc()doc";
-
-
+static const char* __doc_gr_network_udp_sink_make = R"doc()doc";
diff --git a/gr-network/python/network/bindings/docstrings/udp_source_pydoc_template.h b/gr-network/python/network/bindings/docstrings/udp_source_pydoc_template.h
index 643e28ffb3..4c08528949 100644
--- a/gr-network/python/network/bindings/docstrings/udp_source_pydoc_template.h
+++ b/gr-network/python/network/bindings/docstrings/udp_source_pydoc_template.h
@@ -7,7 +7,7 @@
*
*/
#include "pydoc_macros.h"
-#define D(...) DOC(gr,network, __VA_ARGS__ )
+#define D(...) DOC(gr, network, __VA_ARGS__)
/*
This file contains placeholders for docstrings for the Python bindings.
Do not edit! These were automatically extracted during the binding process
@@ -15,13 +15,10 @@
*/
-
- static const char *__doc_gr_network_udp_source = R"doc()doc";
+static const char* __doc_gr_network_udp_source = R"doc()doc";
- static const char *__doc_gr_network_udp_source_udp_source = R"doc()doc";
+static const char* __doc_gr_network_udp_source_udp_source = R"doc()doc";
- static const char *__doc_gr_network_udp_source_make = R"doc()doc";
-
-
+static const char* __doc_gr_network_udp_source_make = R"doc()doc";
diff --git a/gr-network/python/network/bindings/python_bindings.cc b/gr-network/python/network/bindings/python_bindings.cc
index 226cb0e609..3de111aa79 100644
--- a/gr-network/python/network/bindings/python_bindings.cc
+++ b/gr-network/python/network/bindings/python_bindings.cc
@@ -46,4 +46,3 @@ PYBIND11_MODULE(network_python, m)
bind_udp_sink(m);
bind_udp_source(m);
}
-
diff --git a/gr-network/python/network/bindings/tcp_sink_python.cc b/gr-network/python/network/bindings/tcp_sink_python.cc
index d234651096..bacd5bb98a 100644
--- a/gr-network/python/network/bindings/tcp_sink_python.cc
+++ b/gr-network/python/network/bindings/tcp_sink_python.cc
@@ -9,8 +9,8 @@
/* This file is automatically generated using bindtool */
-#include <pybind11/pybind11.h>
#include <pybind11/complex.h>
+#include <pybind11/pybind11.h>
#include <pybind11/stl.h>
namespace py = pybind11;
@@ -22,34 +22,23 @@ namespace py = pybind11;
void bind_tcp_sink(py::module& m)
{
- using tcp_sink = ::gr::network::tcp_sink;
+ using tcp_sink = ::gr::network::tcp_sink;
- py::class_<tcp_sink, gr::sync_block, gr::block, gr::basic_block,
- std::shared_ptr<tcp_sink>>(m, "tcp_sink", D(tcp_sink))
+ py::class_<tcp_sink,
+ gr::sync_block,
+ gr::block,
+ gr::basic_block,
+ std::shared_ptr<tcp_sink>>(m, "tcp_sink", D(tcp_sink))
.def(py::init(&tcp_sink::make),
- py::arg("itemsize"),
- py::arg("veclen"),
- py::arg("host"),
- py::arg("port"),
- py::arg("sinkmode"),
- D(tcp_sink,make)
- )
-
-
+ py::arg("itemsize"),
+ py::arg("veclen"),
+ py::arg("host"),
+ py::arg("port"),
+ py::arg("sinkmode"),
+ D(tcp_sink, make))
;
-
-
-
-
}
-
-
-
-
-
-
-
diff --git a/gr-network/python/network/bindings/udp_sink_python.cc b/gr-network/python/network/bindings/udp_sink_python.cc
index 40e8e6f3b8..8dc4e6da3b 100644
--- a/gr-network/python/network/bindings/udp_sink_python.cc
+++ b/gr-network/python/network/bindings/udp_sink_python.cc
@@ -9,8 +9,8 @@
/* This file is automatically generated using bindtool */
-#include <pybind11/pybind11.h>
#include <pybind11/complex.h>
+#include <pybind11/pybind11.h>
#include <pybind11/stl.h>
namespace py = pybind11;
@@ -22,36 +22,25 @@ namespace py = pybind11;
void bind_udp_sink(py::module& m)
{
- using udp_sink = ::gr::network::udp_sink;
+ using udp_sink = ::gr::network::udp_sink;
- py::class_<udp_sink, gr::sync_block, gr::block, gr::basic_block,
- std::shared_ptr<udp_sink>>(m, "udp_sink", D(udp_sink))
+ py::class_<udp_sink,
+ gr::sync_block,
+ gr::block,
+ gr::basic_block,
+ std::shared_ptr<udp_sink>>(m, "udp_sink", D(udp_sink))
.def(py::init(&udp_sink::make),
- py::arg("itemsize"),
- py::arg("veclen"),
- py::arg("host"),
- py::arg("port"),
- py::arg("header_type"),
- py::arg("payloadsize"),
- py::arg("send_eof"),
- D(udp_sink,make)
- )
-
-
+ py::arg("itemsize"),
+ py::arg("veclen"),
+ py::arg("host"),
+ py::arg("port"),
+ py::arg("header_type"),
+ py::arg("payloadsize"),
+ py::arg("send_eof"),
+ D(udp_sink, make))
;
-
-
-
-
}
-
-
-
-
-
-
-
diff --git a/gr-network/python/network/bindings/udp_source_python.cc b/gr-network/python/network/bindings/udp_source_python.cc
index f6ce27ff36..216e2c3c41 100644
--- a/gr-network/python/network/bindings/udp_source_python.cc
+++ b/gr-network/python/network/bindings/udp_source_python.cc
@@ -9,8 +9,8 @@
/* This file is automatically generated using bindtool */
-#include <pybind11/pybind11.h>
#include <pybind11/complex.h>
+#include <pybind11/pybind11.h>
#include <pybind11/stl.h>
namespace py = pybind11;
@@ -22,37 +22,26 @@ namespace py = pybind11;
void bind_udp_source(py::module& m)
{
- using udp_source = ::gr::network::udp_source;
+ using udp_source = ::gr::network::udp_source;
- py::class_<udp_source, gr::sync_block, gr::block, gr::basic_block,
- std::shared_ptr<udp_source>>(m, "udp_source", D(udp_source))
+ py::class_<udp_source,
+ gr::sync_block,
+ gr::block,
+ gr::basic_block,
+ std::shared_ptr<udp_source>>(m, "udp_source", D(udp_source))
.def(py::init(&udp_source::make),
- py::arg("itemsize"),
- py::arg("vecLen"),
- py::arg("port"),
- py::arg("header_type"),
- py::arg("payloadsize"),
- py::arg("notify_missed"),
- py::arg("source_zeros"),
- py::arg("ipv6"),
- D(udp_source,make)
- )
-
-
+ py::arg("itemsize"),
+ py::arg("vecLen"),
+ py::arg("port"),
+ py::arg("header_type"),
+ py::arg("payloadsize"),
+ py::arg("notify_missed"),
+ py::arg("source_zeros"),
+ py::arg("ipv6"),
+ D(udp_source, make))
;
-
-
-
-
}
-
-
-
-
-
-
-
diff --git a/gr-utils/modtool/templates/gr-newmod/docs/doxygen/pydoc_macros.h b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/pydoc_macros.h
index 746b3babcd..98bf7cd639 100644
--- a/gr-utils/modtool/templates/gr-newmod/docs/doxygen/pydoc_macros.h
+++ b/gr-utils/modtool/templates/gr-newmod/docs/doxygen/pydoc_macros.h
@@ -1,18 +1,19 @@
#ifndef PYDOC_MACROS_H
#define PYDOC_MACROS_H
-#define __EXPAND(x) x
-#define __COUNT(_1, _2, _3, _4, _5, _6, _7, COUNT, ...) COUNT
-#define __VA_SIZE(...) __EXPAND(__COUNT(__VA_ARGS__, 7, 6, 5, 4, 3, 2, 1))
-#define __CAT1(a, b) a ## b
-#define __CAT2(a, b) __CAT1(a, b)
-#define __DOC1(n1) __doc_##n1
-#define __DOC2(n1, n2) __doc_##n1##_##n2
-#define __DOC3(n1, n2, n3) __doc_##n1##_##n2##_##n3
-#define __DOC4(n1, n2, n3, n4) __doc_##n1##_##n2##_##n3##_##n4
-#define __DOC5(n1, n2, n3, n4, n5) __doc_##n1##_##n2##_##n3##_##n4##_##n5
-#define __DOC6(n1, n2, n3, n4, n5, n6) __doc_##n1##_##n2##_##n3##_##n4##_##n5##_##n6
-#define __DOC7(n1, n2, n3, n4, n5, n6, n7) __doc_##n1##_##n2##_##n3##_##n4##_##n5##_##n6##_##n7
-#define DOC(...) __EXPAND(__EXPAND(__CAT2(__DOC, __VA_SIZE(__VA_ARGS__)))(__VA_ARGS__))
+#define __EXPAND(x) x
+#define __COUNT(_1, _2, _3, _4, _5, _6, _7, COUNT, ...) COUNT
+#define __VA_SIZE(...) __EXPAND(__COUNT(__VA_ARGS__, 7, 6, 5, 4, 3, 2, 1))
+#define __CAT1(a, b) a##b
+#define __CAT2(a, b) __CAT1(a, b)
+#define __DOC1(n1) __doc_##n1
+#define __DOC2(n1, n2) __doc_##n1##_##n2
+#define __DOC3(n1, n2, n3) __doc_##n1##_##n2##_##n3
+#define __DOC4(n1, n2, n3, n4) __doc_##n1##_##n2##_##n3##_##n4
+#define __DOC5(n1, n2, n3, n4, n5) __doc_##n1##_##n2##_##n3##_##n4##_##n5
+#define __DOC6(n1, n2, n3, n4, n5, n6) __doc_##n1##_##n2##_##n3##_##n4##_##n5##_##n6
+#define __DOC7(n1, n2, n3, n4, n5, n6, n7) \
+ __doc_##n1##_##n2##_##n3##_##n4##_##n5##_##n6##_##n7
+#define DOC(...) __EXPAND(__EXPAND(__CAT2(__DOC, __VA_SIZE(__VA_ARGS__)))(__VA_ARGS__))
-#endif //PYDOC_MACROS_H
\ No newline at end of file
+#endif // PYDOC_MACROS_H
\ No newline at end of file
diff --git a/gr-utils/modtool/templates/gr-newmod/python/bindings/python_bindings.cc b/gr-utils/modtool/templates/gr-newmod/python/bindings/python_bindings.cc
index 83dbf33c6d..4cf0b21781 100644
--- a/gr-utils/modtool/templates/gr-newmod/python/bindings/python_bindings.cc
+++ b/gr-utils/modtool/templates/gr-newmod/python/bindings/python_bindings.cc
@@ -50,7 +50,4 @@ PYBIND11_MODULE(howto_python, m)
/**************************************/
// BINDING_FUNCTION_CALLS(
// ) END BINDING_FUNCTION_CALLS
-
-
}
-
diff --git a/gr-vocoder/python/vocoder/bindings/gsm_fr_decode_ps_python.cc b/gr-vocoder/python/vocoder/bindings/gsm_fr_decode_ps_python.cc
index 11149ac0c0..b5d7f4b69c 100644
--- a/gr-vocoder/python/vocoder/bindings/gsm_fr_decode_ps_python.cc
+++ b/gr-vocoder/python/vocoder/bindings/gsm_fr_decode_ps_python.cc
@@ -33,7 +33,7 @@ void bind_gsm_fr_decode_ps(py::module& m)
std::shared_ptr<gsm_fr_decode_ps>>(
m, "gsm_fr_decode_ps", D(gsm_fr_decode_ps))
- .def(py::init(&gsm_fr_decode_ps::make), D(gsm_fr_decode_ps, make))
+ .def(py::init(&gsm_fr_decode_ps::make), D(gsm_fr_decode_ps, make))
;
diff --git a/gr-vocoder/python/vocoder/bindings/gsm_fr_encode_sp_python.cc b/gr-vocoder/python/vocoder/bindings/gsm_fr_encode_sp_python.cc
index d119a61022..0c2daaaa49 100644
--- a/gr-vocoder/python/vocoder/bindings/gsm_fr_encode_sp_python.cc
+++ b/gr-vocoder/python/vocoder/bindings/gsm_fr_encode_sp_python.cc
@@ -33,7 +33,7 @@ void bind_gsm_fr_encode_sp(py::module& m)
std::shared_ptr<gsm_fr_encode_sp>>(
m, "gsm_fr_encode_sp", D(gsm_fr_encode_sp))
- .def(py::init(&gsm_fr_encode_sp::make),D(gsm_fr_encode_sp, make))
+ .def(py::init(&gsm_fr_encode_sp::make), D(gsm_fr_encode_sp, make))
;
--
cgit v1.2.3