summaryrefslogtreecommitdiff
path: root/gr-blocks/lib
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2013-07-16 14:55:28 -0700
committerJohnathan Corgan <johnathan@corganlabs.com>2013-07-16 15:03:10 -0700
commitaf206bb5fc1a255b48dbab344a2bba7581535cb0 (patch)
tree199adbce01307e132d2ab30184404ad2eb118a05 /gr-blocks/lib
parentf0198da0bbf6af214b0d629cb77b8539ac42e02a (diff)
controlport: Added probes for byte, short, and int data types
(ctrlport_probe2_x). Had to add some more plumbing to ControlPort to handle different data types to support the new probes. TODO: in 3.8, we will remove ctrlport_probe_c and make a single GRC file for all data types and remove blocks_ctrlport_probe2_c.xml.
Diffstat (limited to 'gr-blocks/lib')
-rw-r--r--gr-blocks/lib/CMakeLists.txt4
-rw-r--r--gr-blocks/lib/ctrlport_probe2_b_impl.cc162
-rw-r--r--gr-blocks/lib/ctrlport_probe2_b_impl.h69
-rw-r--r--gr-blocks/lib/ctrlport_probe2_c_impl.cc16
-rw-r--r--gr-blocks/lib/ctrlport_probe2_c_impl.h4
-rw-r--r--gr-blocks/lib/ctrlport_probe2_f_impl.cc164
-rw-r--r--gr-blocks/lib/ctrlport_probe2_f_impl.h69
-rw-r--r--gr-blocks/lib/ctrlport_probe2_i_impl.cc163
-rw-r--r--gr-blocks/lib/ctrlport_probe2_i_impl.h69
-rw-r--r--gr-blocks/lib/ctrlport_probe2_s_impl.cc163
-rw-r--r--gr-blocks/lib/ctrlport_probe2_s_impl.h69
11 files changed, 943 insertions, 9 deletions
diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt
index 529c6de054..1f16d10a0a 100644
--- a/gr-blocks/lib/CMakeLists.txt
+++ b/gr-blocks/lib/CMakeLists.txt
@@ -253,6 +253,10 @@ if(ENABLE_GR_CTRLPORT)
list(APPEND gr_blocks_sources
ctrlport_probe_c_impl.cc
ctrlport_probe2_c_impl.cc
+ ctrlport_probe2_f_impl.cc
+ ctrlport_probe2_s_impl.cc
+ ctrlport_probe2_i_impl.cc
+ ctrlport_probe2_b_impl.cc
)
endif(ENABLE_GR_CTRLPORT)
diff --git a/gr-blocks/lib/ctrlport_probe2_b_impl.cc b/gr-blocks/lib/ctrlport_probe2_b_impl.cc
new file mode 100644
index 0000000000..74c2980a7a
--- /dev/null
+++ b/gr-blocks/lib/ctrlport_probe2_b_impl.cc
@@ -0,0 +1,162 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ctrlport_probe2_b_impl.h"
+#include <gnuradio/io_signature.h>
+
+namespace gr {
+ namespace blocks {
+
+ ctrlport_probe2_b::sptr
+ ctrlport_probe2_b::make(const std::string &id, const std::string &desc,
+ int len, unsigned int disp_mask)
+ {
+ return gnuradio::get_initial_sptr
+ (new ctrlport_probe2_b_impl(id, desc, len, disp_mask));
+ }
+
+ ctrlport_probe2_b_impl::ctrlport_probe2_b_impl(const std::string &id,
+ const std::string &desc,
+ int len, unsigned int disp_mask)
+ : sync_block("probe2_b",
+ io_signature::make(1, 1, sizeof(char)),
+ io_signature::make(0, 0, 0)),
+ d_id(id), d_desc(desc), d_len(len), d_disp_mask(disp_mask)
+ {
+ set_length(len);
+ }
+
+ ctrlport_probe2_b_impl::~ctrlport_probe2_b_impl()
+ {
+ }
+
+ void
+ ctrlport_probe2_b_impl::forecast(int noutput_items,
+ gr_vector_int &ninput_items_required)
+ {
+ // make sure all inputs have noutput_items available
+ unsigned ninputs = ninput_items_required.size();
+ for(unsigned i = 0; i < ninputs; i++)
+ ninput_items_required[i] = d_len;
+ }
+
+ // boost::shared_mutex mutex_buffer;
+ // mutable boost::mutex mutex_notify;
+ // boost::condition_variable condition_buffer_ready;
+ std::vector<signed char>
+ ctrlport_probe2_b_impl::get()
+ {
+ mutex_buffer.lock();
+ d_buffer.clear();
+ mutex_buffer.unlock();
+
+ // wait for condition
+ boost::mutex::scoped_lock lock(mutex_notify);
+ condition_buffer_ready.wait(lock);
+
+ mutex_buffer.lock();
+ std::vector<signed char> buf_copy = d_buffer;
+ assert(buf_copy.size() == d_len);
+ mutex_buffer.unlock();
+
+ return buf_copy;
+ }
+
+ void
+ ctrlport_probe2_b_impl::set_length(int len)
+ {
+ if(len > 8191) {
+ std::cerr << "probe2_b: length " << len
+ << " exceeds maximum buffer size of 8191" << std::endl;
+ len = 8191;
+ }
+
+ d_len = len;
+ d_buffer.reserve(d_len);
+ }
+
+ int
+ ctrlport_probe2_b_impl::length() const
+ {
+ return (int)d_len;
+ }
+
+ int
+ ctrlport_probe2_b_impl::work(int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+ {
+ const char *in = (const char*)input_items[0];
+
+ // copy samples to get buffer if we need samples
+ mutex_buffer.lock();
+ if(d_buffer.size() < d_len) {
+ // copy smaller of remaining buffer space and num inputs to work()
+ int num_copy = std::min( (int)(d_len - d_buffer.size()), noutput_items );
+
+ // TODO: convert this to a copy operator for speed...
+ for(int i = 0; i < num_copy; i++) {
+ d_buffer.push_back(in[i]);
+ }
+
+ // notify the waiting get() if we fill up the buffer
+ if(d_buffer.size() == d_len) {
+ condition_buffer_ready.notify_one();
+ }
+ }
+ mutex_buffer.unlock();
+
+ return noutput_items;
+ }
+
+ void
+ ctrlport_probe2_b_impl::setup_rpc()
+ {
+#ifdef GR_CTRLPORT
+ int len = static_cast<int>(d_len);
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_get<ctrlport_probe2_b, std::vector<signed char> >(
+ alias(), d_id.c_str(), &ctrlport_probe2_b::get,
+ pmt::mp(-128), pmt::mp(127), pmt::mp(0),
+ "volts", d_desc.c_str(), RPC_PRIVLVL_MIN,
+ d_disp_mask)));
+
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_get<ctrlport_probe2_b, int>(
+ alias(), "length", &ctrlport_probe2_b::length,
+ pmt::mp(1), pmt::mp(10*len), pmt::mp(len),
+ "samples", "get vector length", RPC_PRIVLVL_MIN, DISPNULL)));
+
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_set<ctrlport_probe2_b, int>(
+ alias(), "length", &ctrlport_probe2_b::set_length,
+ pmt::mp(1), pmt::mp(10*len), pmt::mp(len),
+ "samples", "set vector length", RPC_PRIVLVL_MIN, DISPNULL)));
+#endif /* GR_CTRLPORT */
+ }
+
+ } /* namespace blocks */
+} /* namespace gr */
diff --git a/gr-blocks/lib/ctrlport_probe2_b_impl.h b/gr-blocks/lib/ctrlport_probe2_b_impl.h
new file mode 100644
index 0000000000..155dd4c23c
--- /dev/null
+++ b/gr-blocks/lib/ctrlport_probe2_b_impl.h
@@ -0,0 +1,69 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_CTRLPORT_PROBE2_B_IMPL_H
+#define INCLUDED_CTRLPORT_PROBE2_B_IMPL_H
+
+#include <gnuradio/blocks/ctrlport_probe2_b.h>
+#include <gnuradio/rpcregisterhelpers.h>
+#include <boost/thread/shared_mutex.hpp>
+
+namespace gr {
+ namespace blocks {
+
+ class ctrlport_probe2_b_impl : public ctrlport_probe2_b
+ {
+ private:
+ std::string d_id;
+ std::string d_desc;
+ size_t d_len;
+ unsigned int d_disp_mask;
+ boost::shared_mutex mutex_buffer;
+ mutable boost::mutex mutex_notify;
+ boost::condition_variable condition_buffer_ready;
+
+ std::vector<signed char> d_buffer;
+
+ public:
+ ctrlport_probe2_b_impl(const std::string &id, const std::string &desc,
+ int len, unsigned int disp_mask);
+ ~ctrlport_probe2_b_impl();
+
+ void setup_rpc();
+
+ void forecast(int noutput_items, gr_vector_int &ninput_items_required);
+
+ std::vector<signed char> get();
+
+ void set_length(int len);
+ int length() const;
+
+ int work(int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_CTRLPORT_PROBE2_C_IMPL_H */
+
diff --git a/gr-blocks/lib/ctrlport_probe2_c_impl.cc b/gr-blocks/lib/ctrlport_probe2_c_impl.cc
index bc6febdb2d..3e324b0d00 100644
--- a/gr-blocks/lib/ctrlport_probe2_c_impl.cc
+++ b/gr-blocks/lib/ctrlport_probe2_c_impl.cc
@@ -32,18 +32,20 @@ namespace gr {
ctrlport_probe2_c::sptr
ctrlport_probe2_c::make(const std::string &id,
- const std::string &desc, int len)
+ const std::string &desc,
+ int len, unsigned int disp_mask)
{
return gnuradio::get_initial_sptr
- (new ctrlport_probe2_c_impl(id, desc, len));
+ (new ctrlport_probe2_c_impl(id, desc, len, disp_mask));
}
ctrlport_probe2_c_impl::ctrlport_probe2_c_impl(const std::string &id,
- const std::string &desc, int len)
+ const std::string &desc,
+ int len, unsigned int disp_mask)
: sync_block("probe2_c",
io_signature::make(1, 1, sizeof(gr_complex)),
io_signature::make(0, 0, 0)),
- d_id(id), d_desc(desc), d_len(len)
+ d_id(id), d_desc(desc), d_len(len), d_disp_mask(disp_mask)
{
set_length(len);
}
@@ -139,11 +141,9 @@ namespace gr {
d_rpc_vars.push_back(
rpcbasic_sptr(new rpcbasic_register_get<ctrlport_probe2_c, std::vector<std::complex<float> > >(
alias(), d_id.c_str(), &ctrlport_probe2_c::get,
- pmt::make_c32vector(0,-2),
- pmt::make_c32vector(0,2),
- pmt::make_c32vector(0,0),
+ pmt::mp(-2), pmt::mp(2), pmt::mp(0),
"volts", d_desc.c_str(), RPC_PRIVLVL_MIN,
- DISPXY | DISPOPTSCATTER)));
+ d_disp_mask | DISPOPTCPLX)));
d_rpc_vars.push_back(
rpcbasic_sptr(new rpcbasic_register_get<ctrlport_probe2_c, int>(
diff --git a/gr-blocks/lib/ctrlport_probe2_c_impl.h b/gr-blocks/lib/ctrlport_probe2_c_impl.h
index c58d97f078..15ff0f4ea2 100644
--- a/gr-blocks/lib/ctrlport_probe2_c_impl.h
+++ b/gr-blocks/lib/ctrlport_probe2_c_impl.h
@@ -36,6 +36,7 @@ namespace gr {
std::string d_id;
std::string d_desc;
size_t d_len;
+ unsigned int d_disp_mask;
boost::shared_mutex mutex_buffer;
mutable boost::mutex mutex_notify;
boost::condition_variable condition_buffer_ready;
@@ -43,7 +44,8 @@ namespace gr {
std::vector<gr_complex> d_buffer;
public:
- ctrlport_probe2_c_impl(const std::string &id, const std::string &desc, int len);
+ ctrlport_probe2_c_impl(const std::string &id, const std::string &desc,
+ int len, unsigned int disp_mask);
~ctrlport_probe2_c_impl();
void setup_rpc();
diff --git a/gr-blocks/lib/ctrlport_probe2_f_impl.cc b/gr-blocks/lib/ctrlport_probe2_f_impl.cc
new file mode 100644
index 0000000000..3c723f8834
--- /dev/null
+++ b/gr-blocks/lib/ctrlport_probe2_f_impl.cc
@@ -0,0 +1,164 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ctrlport_probe2_f_impl.h"
+#include <gnuradio/io_signature.h>
+
+namespace gr {
+ namespace blocks {
+
+ ctrlport_probe2_f::sptr
+ ctrlport_probe2_f::make(const std::string &id, const std::string &desc,
+ int len, unsigned int disp_mask)
+ {
+ return gnuradio::get_initial_sptr
+ (new ctrlport_probe2_f_impl(id, desc, len, disp_mask));
+ }
+
+ ctrlport_probe2_f_impl::ctrlport_probe2_f_impl(const std::string &id, const std::string &desc,
+ int len, unsigned int disp_mask)
+ : sync_block("probe2_f",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(0, 0, 0)),
+ d_id(id), d_desc(desc), d_len(len), d_disp_mask(disp_mask)
+ {
+ set_length(len);
+ }
+
+ ctrlport_probe2_f_impl::~ctrlport_probe2_f_impl()
+ {
+ }
+
+ void
+ ctrlport_probe2_f_impl::forecast(int noutput_items,
+ gr_vector_int &ninput_items_required)
+ {
+ // make sure all inputs have noutput_items available
+ unsigned ninputs = ninput_items_required.size();
+ for(unsigned i = 0; i < ninputs; i++)
+ ninput_items_required[i] = d_len;
+ }
+
+ // boost::shared_mutex mutex_buffer;
+ // mutable boost::mutex mutex_notify;
+ // boost::condition_variable condition_buffer_ready;
+ std::vector<float>
+ ctrlport_probe2_f_impl::get()
+ {
+ mutex_buffer.lock();
+ d_buffer.clear();
+ mutex_buffer.unlock();
+
+ // wait for condition
+ boost::mutex::scoped_lock lock(mutex_notify);
+ condition_buffer_ready.wait(lock);
+
+ mutex_buffer.lock();
+ std::vector<float> buf_copy = d_buffer;
+ assert(buf_copy.size() == d_len);
+ mutex_buffer.unlock();
+
+ return buf_copy;
+ }
+
+ void
+ ctrlport_probe2_f_impl::set_length(int len)
+ {
+ if(len > 8191) {
+ std::cerr << "probe2_f: length " << len
+ << " exceeds maximum buffer size of 8191" << std::endl;
+ len = 8191;
+ }
+
+ d_len = len;
+ d_buffer.reserve(d_len);
+ }
+
+ int
+ ctrlport_probe2_f_impl::length() const
+ {
+ return (int)d_len;
+ }
+
+ int
+ ctrlport_probe2_f_impl::work(int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+ {
+ const float *in = (const float*)input_items[0];
+
+ // copy samples to get buffer if we need samples
+ mutex_buffer.lock();
+ if(d_buffer.size() < d_len) {
+ // copy smaller of remaining buffer space and num inputs to work()
+ int num_copy = std::min( (int)(d_len - d_buffer.size()), noutput_items );
+
+ // TODO: convert this to a copy operator for speed...
+ for(int i = 0; i < num_copy; i++) {
+ d_buffer.push_back(in[i]);
+ }
+
+ // notify the waiting get() if we fill up the buffer
+ if(d_buffer.size() == d_len) {
+ condition_buffer_ready.notify_one();
+ }
+ }
+ mutex_buffer.unlock();
+
+ return noutput_items;
+ }
+
+ void
+ ctrlport_probe2_f_impl::setup_rpc()
+ {
+#ifdef GR_CTRLPORT
+ int len = static_cast<int>(d_len);
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_get<ctrlport_probe2_f, std::vector<float> >(
+ alias(), d_id.c_str(), &ctrlport_probe2_f::get,
+ pmt::mp(-2.0f), pmt::mp(2.0f), pmt::mp(0.0f),
+// pmt::make_f32vector(1,-2),
+// pmt::make_f32vector(1,2),
+// pmt::make_f32vector(1,0),
+ "volts", d_desc.c_str(), RPC_PRIVLVL_MIN,
+ d_disp_mask)));
+
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_get<ctrlport_probe2_f, int>(
+ alias(), "length", &ctrlport_probe2_f::length,
+ pmt::mp(1), pmt::mp(10*len), pmt::mp(len),
+ "samples", "get vector length", RPC_PRIVLVL_MIN, DISPNULL)));
+
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_set<ctrlport_probe2_f, int>(
+ alias(), "length", &ctrlport_probe2_f::set_length,
+ pmt::mp(1), pmt::mp(10*len), pmt::mp(len),
+ "samples", "set vector length", RPC_PRIVLVL_MIN, DISPNULL)));
+#endif /* GR_CTRLPORT */
+ }
+
+ } /* namespace blocks */
+} /* namespace gr */
diff --git a/gr-blocks/lib/ctrlport_probe2_f_impl.h b/gr-blocks/lib/ctrlport_probe2_f_impl.h
new file mode 100644
index 0000000000..a4aa099237
--- /dev/null
+++ b/gr-blocks/lib/ctrlport_probe2_f_impl.h
@@ -0,0 +1,69 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_CTRLPORT_PROBE2_F_IMPL_H
+#define INCLUDED_CTRLPORT_PROBE2_F_IMPL_H
+
+#include <gnuradio/blocks/ctrlport_probe2_f.h>
+#include <gnuradio/rpcregisterhelpers.h>
+#include <boost/thread/shared_mutex.hpp>
+
+namespace gr {
+ namespace blocks {
+
+ class ctrlport_probe2_f_impl : public ctrlport_probe2_f
+ {
+ private:
+ std::string d_id;
+ std::string d_desc;
+ size_t d_len;
+ unsigned int d_disp_mask;
+ boost::shared_mutex mutex_buffer;
+ mutable boost::mutex mutex_notify;
+ boost::condition_variable condition_buffer_ready;
+
+ std::vector<float> d_buffer;
+
+ public:
+ ctrlport_probe2_f_impl(const std::string &id, const std::string &desc,
+ int len, unsigned int disp_mask);
+ ~ctrlport_probe2_f_impl();
+
+ void setup_rpc();
+
+ void forecast(int noutput_items, gr_vector_int &ninput_items_required);
+
+ std::vector<float> get();
+
+ void set_length(int len);
+ int length() const;
+
+ int work(int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_CTRLPORT_PROBE2_F_IMPL_H */
+
diff --git a/gr-blocks/lib/ctrlport_probe2_i_impl.cc b/gr-blocks/lib/ctrlport_probe2_i_impl.cc
new file mode 100644
index 0000000000..be7ae4d9d3
--- /dev/null
+++ b/gr-blocks/lib/ctrlport_probe2_i_impl.cc
@@ -0,0 +1,163 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ctrlport_probe2_i_impl.h"
+#include <gnuradio/io_signature.h>
+
+namespace gr {
+ namespace blocks {
+
+ ctrlport_probe2_i::sptr
+ ctrlport_probe2_i::make(const std::string &id,
+ const std::string &desc,
+ int len, unsigned int disp_mask)
+ {
+ return gnuradio::get_initial_sptr
+ (new ctrlport_probe2_i_impl(id, desc, len, disp_mask));
+ }
+
+ ctrlport_probe2_i_impl::ctrlport_probe2_i_impl(const std::string &id,
+ const std::string &desc,
+ int len, unsigned int disp_mask)
+ : sync_block("probe2_i",
+ io_signature::make(1, 1, sizeof(int)),
+ io_signature::make(0, 0, 0)),
+ d_id(id), d_desc(desc), d_len(len), d_disp_mask(disp_mask)
+ {
+ set_length(len);
+ }
+
+ ctrlport_probe2_i_impl::~ctrlport_probe2_i_impl()
+ {
+ }
+
+ void
+ ctrlport_probe2_i_impl::forecast(int noutput_items,
+ gr_vector_int &ninput_items_required)
+ {
+ // make sure all inputs have noutput_items available
+ unsigned ninputs = ninput_items_required.size();
+ for(unsigned i = 0; i < ninputs; i++)
+ ninput_items_required[i] = d_len;
+ }
+
+ // boost::shared_mutex mutex_buffer;
+ // mutable boost::mutex mutex_notify;
+ // boost::condition_variable condition_buffer_ready;
+ std::vector<int>
+ ctrlport_probe2_i_impl::get()
+ {
+ mutex_buffer.lock();
+ d_buffer.clear();
+ mutex_buffer.unlock();
+
+ // wait for condition
+ boost::mutex::scoped_lock lock(mutex_notify);
+ condition_buffer_ready.wait(lock);
+
+ mutex_buffer.lock();
+ std::vector<int> buf_copy = d_buffer;
+ assert(buf_copy.size() == d_len);
+ mutex_buffer.unlock();
+
+ return buf_copy;
+ }
+
+ void
+ ctrlport_probe2_i_impl::set_length(int len)
+ {
+ if(len > 8191) {
+ std::cerr << "probe2_i: length " << len
+ << " exceeds maximum buffer size of 8191" << std::endl;
+ len = 8191;
+ }
+
+ d_len = len;
+ d_buffer.reserve(d_len);
+ }
+
+ int
+ ctrlport_probe2_i_impl::length() const
+ {
+ return (int)d_len;
+ }
+
+ int
+ ctrlport_probe2_i_impl::work(int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+ {
+ const int *in = (const int*)input_items[0];
+
+ // copy samples to get buffer if we need samples
+ mutex_buffer.lock();
+ if(d_buffer.size() < d_len) {
+ // copy smaller of remaining buffer space and num inputs to work()
+ int num_copy = std::min( (int)(d_len - d_buffer.size()), noutput_items );
+
+ // TODO: convert this to a copy operator for speed...
+ for(int i = 0; i < num_copy; i++) {
+ d_buffer.push_back(in[i]);
+ }
+
+ // notify the waiting get() if we fill up the buffer
+ if(d_buffer.size() == d_len) {
+ condition_buffer_ready.notify_one();
+ }
+ }
+ mutex_buffer.unlock();
+
+ return noutput_items;
+ }
+
+ void
+ ctrlport_probe2_i_impl::setup_rpc()
+ {
+#ifdef GR_CTRLPORT
+ int len = static_cast<int>(d_len);
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_get<ctrlport_probe2_i, std::vector<int> >(
+ alias(), d_id.c_str(), &ctrlport_probe2_i::get,
+ pmt::mp(-32768), pmt::mp(32767), pmt::mp(0),
+ "volts", d_desc.c_str(), RPC_PRIVLVL_MIN,
+ d_disp_mask)));
+
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_get<ctrlport_probe2_i, int>(
+ alias(), "length", &ctrlport_probe2_i::length,
+ pmt::mp(1), pmt::mp(10*len), pmt::mp(len),
+ "samples", "get vector length", RPC_PRIVLVL_MIN, DISPNULL)));
+
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_set<ctrlport_probe2_i, int>(
+ alias(), "length", &ctrlport_probe2_i::set_length,
+ pmt::mp(1), pmt::mp(10*len), pmt::mp(len),
+ "samples", "set vector length", RPC_PRIVLVL_MIN, DISPNULL)));
+#endif /* GR_CTRLPORT */
+ }
+
+ } /* namespace blocks */
+} /* namespace gr */
diff --git a/gr-blocks/lib/ctrlport_probe2_i_impl.h b/gr-blocks/lib/ctrlport_probe2_i_impl.h
new file mode 100644
index 0000000000..06493ac23a
--- /dev/null
+++ b/gr-blocks/lib/ctrlport_probe2_i_impl.h
@@ -0,0 +1,69 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_CTRLPORT_PROBE2_I_IMPL_H
+#define INCLUDED_CTRLPORT_PROBE2_I_IMPL_H
+
+#include <gnuradio/blocks/ctrlport_probe2_i.h>
+#include <gnuradio/rpcregisterhelpers.h>
+#include <boost/thread/shared_mutex.hpp>
+
+namespace gr {
+ namespace blocks {
+
+ class ctrlport_probe2_i_impl : public ctrlport_probe2_i
+ {
+ private:
+ std::string d_id;
+ std::string d_desc;
+ size_t d_len;
+ unsigned int d_disp_mask;
+ boost::shared_mutex mutex_buffer;
+ mutable boost::mutex mutex_notify;
+ boost::condition_variable condition_buffer_ready;
+
+ std::vector<int> d_buffer;
+
+ public:
+ ctrlport_probe2_i_impl(const std::string &id, const std::string &desc,
+ int len, unsigned int disp_mask);
+ ~ctrlport_probe2_i_impl();
+
+ void setup_rpc();
+
+ void forecast(int noutput_items, gr_vector_int &ninput_items_required);
+
+ std::vector<int> get();
+
+ void set_length(int len);
+ int length() const;
+
+ int work(int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_CTRLPORT_PROBE2_I_IMPL_H */
+
diff --git a/gr-blocks/lib/ctrlport_probe2_s_impl.cc b/gr-blocks/lib/ctrlport_probe2_s_impl.cc
new file mode 100644
index 0000000000..b10c419eb5
--- /dev/null
+++ b/gr-blocks/lib/ctrlport_probe2_s_impl.cc
@@ -0,0 +1,163 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ctrlport_probe2_s_impl.h"
+#include <gnuradio/io_signature.h>
+
+namespace gr {
+ namespace blocks {
+
+ ctrlport_probe2_s::sptr
+ ctrlport_probe2_s::make(const std::string &id,
+ const std::string &desc,
+ int len, unsigned disp_mask)
+ {
+ return gnuradio::get_initial_sptr
+ (new ctrlport_probe2_s_impl(id, desc, len, disp_mask));
+ }
+
+ ctrlport_probe2_s_impl::ctrlport_probe2_s_impl(const std::string &id,
+ const std::string &desc,
+ int len, unsigned disp_mask)
+ : sync_block("probe2_s",
+ io_signature::make(1, 1, sizeof(short)),
+ io_signature::make(0, 0, 0)),
+ d_id(id), d_desc(desc), d_len(len), d_disp_mask(disp_mask)
+ {
+ set_length(len);
+ }
+
+ ctrlport_probe2_s_impl::~ctrlport_probe2_s_impl()
+ {
+ }
+
+ void
+ ctrlport_probe2_s_impl::forecast(int noutput_items,
+ gr_vector_int &ninput_items_required)
+ {
+ // make sure all inputs have noutput_items available
+ unsigned ninputs = ninput_items_required.size();
+ for(unsigned i = 0; i < ninputs; i++)
+ ninput_items_required[i] = d_len;
+ }
+
+ // boost::shared_mutex mutex_buffer;
+ // mutable boost::mutex mutex_notify;
+ // boost::condition_variable condition_buffer_ready;
+ std::vector<short>
+ ctrlport_probe2_s_impl::get()
+ {
+ mutex_buffer.lock();
+ d_buffer.clear();
+ mutex_buffer.unlock();
+
+ // wait for condition
+ boost::mutex::scoped_lock lock(mutex_notify);
+ condition_buffer_ready.wait(lock);
+
+ mutex_buffer.lock();
+ std::vector<short> buf_copy = d_buffer;
+ assert(buf_copy.size() == d_len);
+ mutex_buffer.unlock();
+
+ return buf_copy;
+ }
+
+ void
+ ctrlport_probe2_s_impl::set_length(int len)
+ {
+ if(len > 8191) {
+ std::cerr << "probe2_s: length " << len
+ << " exceeds maximum buffer size of 8191" << std::endl;
+ len = 8191;
+ }
+
+ d_len = len;
+ d_buffer.reserve(d_len);
+ }
+
+ int
+ ctrlport_probe2_s_impl::length() const
+ {
+ return (int)d_len;
+ }
+
+ int
+ ctrlport_probe2_s_impl::work(int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+ {
+ const short *in = (const short*)input_items[0];
+
+ // copy samples to get buffer if we need samples
+ mutex_buffer.lock();
+ if(d_buffer.size() < d_len) {
+ // copy smaller of remaining buffer space and num inputs to work()
+ int num_copy = std::min( (int)(d_len - d_buffer.size()), noutput_items );
+
+ // TODO: convert this to a copy operator for speed...
+ for(int i = 0; i < num_copy; i++) {
+ d_buffer.push_back(in[i]);
+ }
+
+ // notify the waiting get() if we fill up the buffer
+ if(d_buffer.size() == d_len) {
+ condition_buffer_ready.notify_one();
+ }
+ }
+ mutex_buffer.unlock();
+
+ return noutput_items;
+ }
+
+ void
+ ctrlport_probe2_s_impl::setup_rpc()
+ {
+#ifdef GR_CTRLPORT
+ int len = static_cast<int>(d_len);
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_get<ctrlport_probe2_s, std::vector<short> >(
+ alias(), d_id.c_str(), &ctrlport_probe2_s::get,
+ pmt::mp(-32768), pmt::mp(32767), pmt::mp(0),
+ "volts", d_desc.c_str(), RPC_PRIVLVL_MIN,
+ d_disp_mask)));
+
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_get<ctrlport_probe2_s, int>(
+ alias(), "length", &ctrlport_probe2_s::length,
+ pmt::mp(1), pmt::mp(10*len), pmt::mp(len),
+ "samples", "get vector length", RPC_PRIVLVL_MIN, DISPNULL)));
+
+ d_rpc_vars.push_back(
+ rpcbasic_sptr(new rpcbasic_register_set<ctrlport_probe2_s, int>(
+ alias(), "length", &ctrlport_probe2_s::set_length,
+ pmt::mp(1), pmt::mp(10*len), pmt::mp(len),
+ "samples", "set vector length", RPC_PRIVLVL_MIN, DISPNULL)));
+#endif /* GR_CTRLPORT */
+ }
+
+ } /* namespace blocks */
+} /* namespace gr */
diff --git a/gr-blocks/lib/ctrlport_probe2_s_impl.h b/gr-blocks/lib/ctrlport_probe2_s_impl.h
new file mode 100644
index 0000000000..078dd56b73
--- /dev/null
+++ b/gr-blocks/lib/ctrlport_probe2_s_impl.h
@@ -0,0 +1,69 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2013 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_CTRLPORT_PROBE2_S_IMPL_H
+#define INCLUDED_CTRLPORT_PROBE2_S_IMPL_H
+
+#include <gnuradio/blocks/ctrlport_probe2_s.h>
+#include <gnuradio/rpcregisterhelpers.h>
+#include <boost/thread/shared_mutex.hpp>
+
+namespace gr {
+ namespace blocks {
+
+ class ctrlport_probe2_s_impl : public ctrlport_probe2_s
+ {
+ private:
+ std::string d_id;
+ std::string d_desc;
+ size_t d_len;
+ unsigned int d_disp_mask;
+ boost::shared_mutex mutex_buffer;
+ mutable boost::mutex mutex_notify;
+ boost::condition_variable condition_buffer_ready;
+
+ std::vector<short> d_buffer;
+
+ public:
+ ctrlport_probe2_s_impl(const std::string &id, const std::string &desc,
+ int len, unsigned int disp_mask);
+ ~ctrlport_probe2_s_impl();
+
+ void setup_rpc();
+
+ void forecast(int noutput_items, gr_vector_int &ninput_items_required);
+
+ std::vector<short> get();
+
+ void set_length(int len);
+ int length() const;
+
+ int work(int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_CTRLPORT_PROBE2_S_IMPL_H */
+
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-27 21:50:37 +0000