5 files changed, 398 insertions, 0 deletions
diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt
index f0dfcf4393..50c842398e 100644
--- a/gr-blocks/lib/CMakeLists.txt
+++ b/gr-blocks/lib/CMakeLists.txt
@@ -248,6 +248,13 @@ list(APPEND gr_blocks_sources
     wavfile_source_impl.cc
 )
 
+if(ENABLE_GR_CTRLPORT)
+list(APPEND gr_blocks_sources
+  ctrlport_probe_c_impl.cc
+  ctrlport_probe2_c_impl.cc
+)
+endif(ENABLE_GR_CTRLPORT)
+
 #Add Windows DLL resource file if using MSVC
 IF(MSVC)
     include(${CMAKE_SOURCE_DIR}/cmake/Modules/GrVersion.cmake)
diff --git a/gr-blocks/lib/ctrlport_probe2_c_impl.cc b/gr-blocks/lib/ctrlport_probe2_c_impl.cc
new file mode 100644
index 0000000000..f52e605a0d
--- /dev/null
+++ b/gr-blocks/lib/ctrlport_probe2_c_impl.cc
@@ -0,0 +1,163 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012-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_c_impl.h"
+#include <gr_io_signature.h>
+
+namespace gr {
+  namespace blocks {
+
+    ctrlport_probe2_c::sptr
+    ctrlport_probe2_c::make(const std::string &id,
+                            const std::string &desc, int len)
+    {
+      return gnuradio::get_initial_sptr
+        (new ctrlport_probe2_c_impl(id, desc, len));
+    }
+
+    ctrlport_probe2_c_impl::ctrlport_probe2_c_impl(const std::string &id,
+                                                   const std::string &desc, int len)
+      : gr_sync_block("probe2_c",
+                      gr_make_io_signature(1, 1, sizeof(gr_complex)),
+                      gr_make_io_signature(0, 0, 0)),
+        d_id(id), d_desc(desc), d_len(len)
+    {
+      set_length(len);
+    }
+
+    ctrlport_probe2_c_impl::~ctrlport_probe2_c_impl()
+    {
+    }
+
+    void
+    ctrlport_probe2_c_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<gr_complex>
+    ctrlport_probe2_c_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<gr_complex> buf_copy = d_buffer;
+      assert(buf_copy.size() == d_len);
+      mutex_buffer.unlock();
+
+      return buf_copy;
+    }
+
+    void
+    ctrlport_probe2_c_impl::set_length(int len)
+    {
+      if(len > 8191) {
+        std::cerr << "probe2_c: length " << len
+                  << " exceeds maximum buffer size of 8191" << std::endl;
+        len = 8191;
+      }
+
+      d_len = len;
+      d_buffer.reserve(d_len);
+    }
+
+    int
+    ctrlport_probe2_c_impl::length() const
+    {
+      return (int)d_len;
+    }
+
+    int
+    ctrlport_probe2_c_impl::work(int noutput_items,
+                                 gr_vector_const_void_star &input_items,
+                                 gr_vector_void_star &output_items)
+    {
+      const gr_complex *in = (const gr_complex*)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_c_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_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), 
+        "volts", d_desc.c_str(), RPC_PRIVLVL_MIN,
+        DISPXY | DISPOPTSCATTER)));
+
+      d_rpc_vars.push_back(
+        rpcbasic_sptr(new rpcbasic_register_get<ctrlport_probe2_c, int>(
+          alias(), "length", &ctrlport_probe2_c::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_c, int>(
+          alias(), "length", &ctrlport_probe2_c::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_c_impl.h b/gr-blocks/lib/ctrlport_probe2_c_impl.h
new file mode 100644
index 0000000000..4d290a4e8f
--- /dev/null
+++ b/gr-blocks/lib/ctrlport_probe2_c_impl.h
@@ -0,0 +1,67 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012-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_C_IMPL_H
+#define INCLUDED_CTRLPORT_PROBE2_C_IMPL_H
+
+#include <blocks/ctrlport_probe2_c.h>
+#include <rpcregisterhelpers.h>
+#include <boost/thread/shared_mutex.hpp>
+
+namespace gr {
+  namespace blocks {
+
+    class ctrlport_probe2_c_impl : public ctrlport_probe2_c
+    {
+    private:
+      std::string d_id;
+      std::string d_desc;
+      size_t d_len;
+      boost::shared_mutex mutex_buffer;
+      mutable boost::mutex mutex_notify;
+      boost::condition_variable condition_buffer_ready;
+
+      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();
+
+      void setup_rpc();
+
+      void forecast(int noutput_items, gr_vector_int &ninput_items_required);
+
+      std::vector<gr_complex> 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_probe_c_impl.cc b/gr-blocks/lib/ctrlport_probe_c_impl.cc
new file mode 100644
index 0000000000..e11bd0496e
--- /dev/null
+++ b/gr-blocks/lib/ctrlport_probe_c_impl.cc
@@ -0,0 +1,101 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012-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_probe_c_impl.h"
+#include <gr_io_signature.h>
+
+namespace gr {
+  namespace blocks {
+
+    ctrlport_probe_c::sptr
+    ctrlport_probe_c::make(const std::string &id,
+                           const std::string &desc)
+    {
+      return gnuradio::get_initial_sptr
+        (new ctrlport_probe_c_impl(id, desc));
+    }
+
+    ctrlport_probe_c_impl::ctrlport_probe_c_impl(const std::string &id,
+                                                 const std::string &desc)
+      : gr_sync_block("probe_c",
+                      gr_make_io_signature(1, 1, sizeof(gr_complex)),
+                      gr_make_io_signature(0, 0, 0)),
+        d_id(id), d_desc(desc), d_ptr(NULL), d_ptrLen(0)
+    {
+    }
+
+    ctrlport_probe_c_impl::~ctrlport_probe_c_impl()
+    {
+    }
+
+    std::vector<gr_complex>
+    ctrlport_probe_c_impl::get()
+    {
+      if(d_ptr != NULL && d_ptrLen > 0) {
+        ptrlock.lock();
+        std::vector<gr_complex> vec(d_ptr, d_ptr+d_ptrLen);
+        ptrlock.unlock();
+        return vec;
+      }
+      else {
+        std::vector<gr_complex> vec;
+        return vec;
+      }
+    }
+
+    int
+    ctrlport_probe_c_impl::work(int noutput_items,
+                                gr_vector_const_void_star &input_items,
+                                gr_vector_void_star &output_items)
+    {
+      const gr_complex *in = (const gr_complex*)input_items[0];
+
+      // keep reference to symbols
+      ptrlock.lock();
+      d_ptr = in;
+      d_ptrLen = noutput_items;
+      ptrlock.unlock();
+    
+      return noutput_items;
+    }
+
+    void
+    ctrlport_probe_c_impl::setup_rpc()
+    {
+#ifdef GR_CTRLPORT
+      d_rpc_vars.push_back(
+        rpcbasic_sptr(new rpcbasic_register_get<ctrlport_probe_c, std::vector<std::complex<float> > >(
+          alias(), d_id.c_str(), &ctrlport_probe_c::get, 
+          pmt::make_c32vector(0,-2),
+          pmt::make_c32vector(0,2),
+          pmt::make_c32vector(0,0), 
+          "volts", d_desc.c_str(), RPC_PRIVLVL_MIN,
+          DISPXY | DISPOPTSCATTER)));
+#endif /* GR_CTRLPORT */
+    }
+
+  } /* namespace blocks */
+} /* namespace gr */
diff --git a/gr-blocks/lib/ctrlport_probe_c_impl.h b/gr-blocks/lib/ctrlport_probe_c_impl.h
new file mode 100644
index 0000000000..5d9073ac10
--- /dev/null
+++ b/gr-blocks/lib/ctrlport_probe_c_impl.h
@@ -0,0 +1,60 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012-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_PROBE_C_IMPL_H
+#define INCLUDED_CTRLPORT_PROBE_C_IMPL_H
+
+#include <blocks/ctrlport_probe_c.h>
+#include <rpcregisterhelpers.h>
+#include <boost/thread/shared_mutex.hpp>
+
+namespace gr {
+  namespace blocks {
+
+    class ctrlport_probe_c_impl : public ctrlport_probe_c
+    {
+    private:
+      boost::shared_mutex ptrlock;
+
+      std::string d_id;
+      std::string d_desc;
+      const gr_complex* d_ptr;
+      size_t d_ptrLen;
+
+    public:
+      ctrlport_probe_c_impl(const std::string &id, const std::string &desc);
+      ~ctrlport_probe_c_impl();
+
+      void setup_rpc();
+
+      std::vector<gr_complex> get();
+
+      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_GR_CTRLPORT_PROBE_C_IMPL_H */
+