<div dir="ltr"><div class="gmail_default" style="font-family:verdana,sans-serif"><span style="font-family:monospace,monospace">Hi maintainer and all,<br><br>Below you find a patch that implements Microtelecom Perseus support in gr-osmosdr.<br>I have tested it in gqrx SDR software.<br></span></div><div class="gmail_default" style="font-family:verdana,sans-serif"><span style="font-family:monospace,monospace"><br>---<br> CMakeLists.txt | 1 +<br> cmake/Modules/FindLibPERSEUS.<wbr>cmake | 24 ++<br> lib/CMakeLists.txt | 8 +<br> lib/airspy/airspy_source_c.cc | 5 +-<br> lib/<a href="http://config.h.in" rel="noreferrer" target="_blank">config.h.in</a> | 1 +<br> lib/device.cc | 8 +<br> lib/perseus/CMakeLists.txt | 37 +++<br> lib/perseus/perseus_source_c.<wbr>cc | 507 ++++++++++++++++++++++++++++++<wbr>+++++++<br> lib/perseus/perseus_source_c.<wbr>h | 120 +++++++++<br> lib/rtl/rtl_source_c.cc | 2 +-<br> lib/source_impl.cc | 18 +-<br> 11 files changed, 727 insertions(+), 4 deletions(-)<br> create mode 100644 cmake/Modules/FindLibPERSEUS.<wbr>cmake<br> create mode 100644 lib/perseus/CMakeLists.txt<br> create mode 100644 lib/perseus/perseus_source_c.<wbr>cc<br> create mode 100644 lib/perseus/perseus_source_c.h<br><br>diff --git a/CMakeLists.txt b/CMakeLists.txt<br>index 296456d..94acd4c 100644<br>--- a/CMakeLists.txt<br>+++ b/CMakeLists.txt<br>@@ -173,6 +173,7 @@ find_package(Volk)<br> find_package(LibbladeRF)<br> find_package(SoapySDR NO_MODULE)<br> find_package(LibFreeSRP)<br>+find_package(LibPERSEUS)<br> find_package(Doxygen)<br> <br> if(NOT GNURADIO_RUNTIME_FOUND)<br>diff --git a/cmake/Modules/<wbr>FindLibPERSEUS.cmake b/cmake/Modules/<wbr>FindLibPERSEUS.cmake<br>new file mode 100644<br>index 0000000..5477327<br>--- /dev/null<br>+++ b/cmake/Modules/<wbr>FindLibPERSEUS.cmake<br>@@ -0,0 +1,24 @@<br>+INCLUDE(FindPkgConfig)<br>+PKG_CHECK_MODULES(PC_<wbr>LIBPERSEUS libperseus-sdr)<br>+<br>+FIND_PATH(<br>+ LIBPERSEUS_INCLUDE_DIRS<br>+ NAMES perseus-sdr.h<br>+ HINTS $ENV{LIBPERSEUS_DIR}/include<br>+ ${PC_LIBPERSEUS_INCLUDEDIR}<br>+ PATHS /usr/local/include<br>+ /usr/include<br>+)<br>+<br>+FIND_LIBRARY(<br>+ LIBPERSEUS_LIBRARIES<br>+ NAMES perseus-sdr<br>+ HINTS $ENV{LIBPERSEUS_DIR}/lib<br>+ ${PC_LIBPERSEUS_LIBDIR}<br>+ PATHS /usr/local/lib<br>+ /usr/lib<br>+)<br>+<br>+INCLUDE(<wbr>FindPackageHandleStandardArgs)<br>+FIND_PACKAGE_HANDLE_STANDARD_<wbr>ARGS(LIBPERSEUS DEFAULT_MSG LIBPERSEUS_LIBRARIES LIBPERSEUS_INCLUDE_DIRS)<br>+MARK_AS_ADVANCED(LIBPERSEUS_<wbr>LIBRARIES LIBPERSEUS_INCLUDE_DIRS)<br>diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt<br>index c05b8d9..f555816 100644<br>--- a/lib/CMakeLists.txt<br>+++ b/lib/CMakeLists.txt<br>@@ -249,6 +249,14 @@ GR_INCLUDE_SUBDIRECTORY(<wbr>freesrp)<br> endif(ENABLE_FREESRP)<br> <br> #############################<wbr>##############################<wbr>#############<br>+# Setup PERSEUS component<br>+#############################<wbr>##############################<wbr>#############<br>+GR_REGISTER_COMPONENT("<wbr>Microtelecom Perseus Receiver" ENABLE_PERSEUS LIBPERSEUS_FOUND)<br>+if(ENABLE_PERSEUS)<br>+GR_INCLUDE_SUBDIRECTORY(<wbr>perseus)<br>+endif(ENABLE_PERSEUS)<br>+<br>+#############################<wbr>##############################<wbr>#############<br> # Setup configuration file<br> #############################<wbr>##############################<wbr>#############<br> ADD_DEFINITIONS(-DHAVE_<wbr>CONFIG_H=1)<br>diff --git a/lib/airspy/airspy_source_c.<wbr>cc b/lib/airspy/airspy_source_c.<wbr>cc<br>index 50150e5..02fc6ab 100644<br>--- a/lib/airspy/airspy_source_c.<wbr>cc<br>+++ b/lib/airspy/airspy_source_c.<wbr>cc<br>@@ -350,9 +350,10 @@ osmosdr::meta_range_t airspy_source_c::get_sample_<wbr>rates()<br> {<br> osmosdr::meta_range_t range;<br> <br>- for (size_t i = 0; i < _sample_rates.size(); i++)<br>+ for (size_t i = 0; i < _sample_rates.size(); i++) {<br>+ std::cerr << "SR: [" << i << "]: " << _sample_rates[i].first << std::endl;<br> range += osmosdr::range_t( _sample_rates[i].first );<br>-<br>+ }<br> return range;<br> }<br> <br>diff --git a/lib/<a href="http://config.h.in" rel="noreferrer" target="_blank">config.h.in</a> b/lib/<a href="http://config.h.in" rel="noreferrer" target="_blank">config.h.in</a><br>index 42e72f1..dac7e39 100644<br>--- a/lib/<a href="http://config.h.in" rel="noreferrer" target="_blank">config.h.in</a><br>+++ b/lib/<a href="http://config.h.in" rel="noreferrer" target="_blank">config.h.in</a><br>@@ -19,6 +19,7 @@<br> #cmakedefine ENABLE_SOAPY<br> #cmakedefine ENABLE_REDPITAYA<br> #cmakedefine ENABLE_FREESRP<br>+#cmakedefine ENABLE_PERSEUS<br> <br> //provide NAN define for MSVC older than VC12<br> #if defined(_MSC_VER) && (_MSC_VER < 1800)<br>diff --git a/lib/device.cc b/lib/device.cc<br>index 025a22b..df0d734 100644<br>--- a/lib/device.cc<br>+++ b/lib/device.cc<br>@@ -90,6 +90,10 @@<br> #include <freesrp_source_c.h><br> #endif<br> <br>+#ifdef ENABLE_PERSEUS<br>+#include <perseus_source_c.h><br>+#endif<br>+<br> #include "arg_helpers.h"<br> <br> using namespace osmosdr;<br>@@ -194,6 +198,10 @@ devices_t device::find(const device_t &hint)<br> BOOST_FOREACH( std::string dev, soapy_source_c::get_devices() )<br> devices.push_back( device_t(dev) );<br> #endif<br>+#ifdef ENABLE_PERSEUS<br>+ BOOST_FOREACH( std::string dev, perseus_source_c::get_devices(<wbr>) )<br>+ devices.push_back( device_t(dev) );<br>+#endif<br> <br> /* software-only sources should be appended at the very end,<br> * hopefully resulting in hardware sources to be shown first<br>diff --git a/lib/perseus/CMakeLists.txt b/lib/perseus/CMakeLists.txt<br>new file mode 100644<br>index 0000000..f45a10d<br>--- /dev/null<br>+++ b/lib/perseus/CMakeLists.txt<br>@@ -0,0 +1,37 @@<br>+# Copyright 2017 Free Software Foundation, Inc.<br>+#<br>+# This file is part of GNU Radio<br>+#<br>+# GNU Radio is free software; you can redistribute it and/or modify<br>+# it under the terms of the GNU General Public License as published by<br>+# the Free Software Foundation; either version 3, or (at your option)<br>+# any later version.<br>+#<br>+# GNU Radio is distributed in the hope that it will be useful,<br>+# but WITHOUT ANY WARRANTY; without even the implied warranty of<br>+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the<br>+# GNU General Public License for more details.<br>+#<br>+# You should have received a copy of the GNU General Public License<br>+# along with GNU Radio; see the file COPYING. If not, write to<br>+# the Free Software Foundation, Inc., 51 Franklin Street,<br>+# Boston, MA 02110-1301, USA.<br>+<br>+#############################<wbr>##############################<wbr>#############<br>+# This file included, use CMake directory variables<br>+#############################<wbr>##############################<wbr>#############<br>+<br>+include_directories(<br>+ ${CMAKE_CURRENT_SOURCE_DIR}<br>+ ${LIBPERSEUS_INCLUDE_DIRS}<br>+)<br>+<br>+set(perseus_srcs<br>+ ${CMAKE_CURRENT_SOURCE_DIR}/<wbr>perseus_source_c.cc<br>+)<br>+<br>+#############################<wbr>##############################<wbr>#############<br>+# Append gnuradio-osmosdr library sources<br>+#############################<wbr>##############################<wbr>#############<br>+list(APPEND gr_osmosdr_srcs ${perseus_srcs})<br>+list(APPEND gr_osmosdr_libs ${LIBPERSEUS_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES})<br>diff --git a/lib/perseus/perseus_source_<wbr>c.cc b/lib/perseus/perseus_source_<wbr>c.cc<br>new file mode 100644<br>index 0000000..0720da4<br>--- /dev/null<br>+++ b/lib/perseus/perseus_source_<wbr>c.cc<br>@@ -0,0 +1,507 @@<br>+/* -*- c++ -*- */<br>+/*<br>+ * Copyright 2018 Andrea Montefusco IW0HDV<br>+ *<br>+ * GNU Radio is free software; you can redistribute it and/or modify<br>+ * it under the terms of the GNU General Public License as published by<br>+ * the Free Software Foundation; either version 3, or (at your option)<br>+ * any later version.<br>+ *<br>+ * GNU Radio is distributed in the hope that it will be useful,<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the<br>+ * GNU General Public License for more details.<br>+ *<br>+ * You should have received a copy of the GNU General Public License<br>+ * along with GNU Radio; see the file COPYING. If not, write to<br>+ * the Free Software Foundation, Inc., 51 Franklin Street,<br>+ * Boston, MA 02110-1301, USA.<br>+ */<br>+<br>+/*<br>+ * config.h is generated by configure. It contains the results<br>+ * of probing for features, options etc. It should be the first<br>+ * file included in your .cc file.<br>+ */<br>+#ifdef HAVE_CONFIG_H<br>+#include "config.h"<br>+#endif<br>+<br>+#include <stdexcept><br>+#include <iostream><br>+#include <algorithm><br>+<br>+#include <boost/assign.hpp><br>+#include <boost/format.hpp><br>+#include <boost/detail/endian.hpp><br>+#include <boost/algorithm/string.hpp><br>+#include <boost/thread/thread.hpp><br>+<br>+#include <gnuradio/io_signature.h><br>+<br>+#include "perseus_source_c.h"<br>+#include "arg_helpers.h"<br>+<br>+<br>+<br>+using namespace boost::assign;<br>+<br>+#define PERSEUS_FORMAT_ERROR(ret, msg) \<br>+ boost::str( boost::format(msg " (%1%)") % ret )<br>+<br>+#define PERSEUS_THROW_ON_ERROR(ret, msg) \<br>+ if ( ret != PERSEUS_NOERROR ) \<br>+ { \<br>+ throw std::runtime_error( PERSEUS_FORMAT_ERROR(ret, msg) ); \<br>+ }<br>+<br>+#define PERSEUS_FUNC_STR(func, arg) \<br>+ boost::str(boost::format(func "(%1%)") % arg) + " has failed"<br>+<br>+perseus_source_c_sptr make_perseus_source_c (const std::string & args)<br>+{<br>+ return gnuradio::get_initial_sptr(new perseus_source_c (args));<br>+}<br>+<br>+/*<br>+ * Specify constraints on number of input and output streams.<br>+ * This info is used to construct the input and output signatures<br>+ * (2nd & 3rd args to gr::block's constructor). The input and<br>+ * output signatures are used by the runtime system to<br>+ * check that a valid number and type of inputs and outputs<br>+ * are connected to this block. In this case, we accept<br>+ * only 0 input and 1 output.<br>+ */<br>+static const int MIN_IN = 0; // mininum number of input streams<br>+static const int MAX_IN = 0; // maximum number of input streams<br>+static const int MIN_OUT = 1; // minimum number of output streams<br>+static const int MAX_OUT = 1; // maximum number of output streams<br>+<br>+/*<br>+ * The private constructor<br>+ */<br>+perseus_source_c::perseus_<wbr>source_c (const std::string &args)<br>+ : gr::sync_block ("perseus_source_c",<br>+ gr::io_signature::make(MIN_<wbr>IN, MAX_IN, sizeof (gr_complex)),<br>+ gr::io_signature::make(MIN_<wbr>OUT, MAX_OUT, sizeof (gr_complex))),<br>+ _dev(NULL),<br>+ _sample_rate(0),<br>+ _center_freq(0),<br>+ _freq_corr(0),<br>+ _frun(false),<br>+ _cnt(0)<br>+{<br>+ //int ret;<br>+<br>+ dict_t dict = params_to_dict(args);<br>+<br>+ _dev = NULL;<br>+<br>+ // Set debug info dumped to stderr to the maximum verbose level<br>+ perseus_set_debug(3);<br>+<br>+ //fprintf (stderr, "Revision: %s\n", git_revision);<br>+ //fprintf (stderr, "SAMPLE RATE: %d\n", sr);<br>+ //fprintf (stderr, "NBUF: %d BUF SIZE: %d TOTAL BUFFER LENGTH: %d\n", nb, bs, nb*bs);<br>+<br>+ // Check how many Perseus receivers are connected to the system<br>+ int num_perseus = perseus_init();<br>+ std::cerr << "## Microtelecom Perseus ctor: " << num_perseus << " Perseus receivers found." << std::endl;<br>+<br>+ if (num_perseus==0) {<br>+ perseus_exit();<br>+ PERSEUS_THROW_ON_ERROR(<wbr>PERSEUS_DEVNOTFOUND, "No Perseus receivers detected");<br>+ }<br>+ // Open the first one...<br>+ if ((_dev = perseus_open(0)) == NULL) {<br>+ PERSEUS_THROW_ON_ERROR(<wbr>PERSEUS_DEVNOTFOUND, "Unable to open Perseus device");<br>+ }<br>+ // Download the standard firmware to the unit<br>+ std::cerr << "Downloading firmware..." << std::endl;<br>+ if (int rc = perseus_firmware_download(_<wbr>dev,NULL)<0) {<br>+ PERSEUS_THROW_ON_ERROR (rc, "firmware download error");<br>+ }<br>+<br>+ // Dump some information about the receiver (S/N and HW rev)<br>+ int flag;<br>+ perseus_is_preserie(_dev, &flag);<br>+ if (flag != 0)<br>+ fprintf(stderr, "The device is a preserie unit");<br>+ else {<br>+ eeprom_prodid prodid;<br>+ if (perseus_get_product_id(_dev,&<wbr>prodid)<0)<br>+ fprintf(stderr, "get product id error: %s", perseus_errorstr());<br>+ else<br>+ fprintf(stderr, "Receiver S/N: %05d-%02hX%02hX-%02hX%02hX-%<wbr>02hX%02hX - HW Release:%hd.%hd\n",<br>+ (uint16_t) <a href="http://prodid.sn" rel="noreferrer" target="_blank">prodid.sn</a>,<br>+ (uint16_t) prodid.signature[5],<br>+ (uint16_t) prodid.signature[4],<br>+ (uint16_t) prodid.signature[3],<br>+ (uint16_t) prodid.signature[2],<br>+ (uint16_t) prodid.signature[1],<br>+ (uint16_t) prodid.signature[0],<br>+ (uint16_t) prodid.hwrel,<br>+ (uint16_t) prodid.hwver);<br>+ }<br>+ // Printing all sampling rates available .....<br>+ {<br>+ int buf[BUFSIZ];<br>+<br>+ if (perseus_get_sampling_rates (_dev, buf, sizeof(buf)/sizeof(buf[0])) < 0) {<br>+ fprintf(stderr, "get sampling rates error: %s\n", perseus_errorstr());<br>+ } else {<br>+ int i = 0;<br>+ while (buf[i]) {<br>+ fprintf(stderr, "#%d: sample rate: %d\n", i, buf[i]);<br>+ <br>+ _sample_rates.push_back( std::pair<double, uint32_t>( buf[i], i ) );<br>+ i++;<br>+ }<br>+ /* since they may (and will) give us an unsorted array we have to sort it here<br>+ * to play nice with the monotonic requirement of meta-range later on */<br>+ std::sort(_sample_rates.<wbr>begin(), _sample_rates.end());<br>+<br>+ for (size_t i = 0; i < _sample_rates.size(); i++)<br>+ std::cerr << boost::format("%gM ") % (_sample_rates[i].first / 1e6);<br>+<br>+ std::cerr << std::endl;<br>+ }<br>+ }<br>+ // Configure the receiver for 2 MS/s operations<br>+ fprintf(stderr, "Configuring FPGA...\n");<br>+ if (int ret = perseus_set_sampling_rate(_<wbr>dev, 96000) < 0) { // specify the sampling rate value in Samples/second<br>+ std::cerr << "fpga configuration error: " << perseus_errorstr() << std::endl;<br>+ PERSEUS_THROW_ON_ERROR(ret, "Perseus fpga configuration error");<br>+ }<br>+<br>+ perseus_set_attenuator_in_db(<wbr>_dev, PERSEUS_ATT_0DB);<br>+ // Enable ADC Dither, Disable ADC Preamp<br>+ perseus_set_adc(_dev, true, false);<br>+ // set the NCO frequency in the middle of the range allowed<br>+ set_center_freq( (get_freq_range().start() + get_freq_range().stop()) / 2.0 );<br>+ set_sample_rate( get_sample_rates().start() );<br>+<br>+ _fifo = new boost::circular_buffer<gr_<wbr>complex>(5000000);<br>+ if (!_fifo) {<br>+ throw std::runtime_error( std::string(__FUNCTION__) + " " +<br>+ "Failed to allocate a sample FIFO!" );<br>+ }<br>+}<br>+<br>+/*<br>+ * Our virtual destructor.<br>+ */<br>+perseus_source_c::~perseus_<wbr>source_c ()<br>+{<br>+ if (_dev) {<br>+ if (_frun) stop();<br>+ int ret = perseus_close(_dev);<br>+ if ( ret != PERSEUS_NOERROR ) {<br>+ std::cerr << PERSEUS_FORMAT_ERROR(ret, "Failed to close Perseus") << std::endl;<br>+ } else<br>+ _dev = NULL;<br>+ }<br>+ perseus_exit();<br>+<br>+ if (_fifo) {<br>+ delete _fifo;<br>+ _fifo = NULL;<br>+ }<br>+}<br>+<br>+<br>+typedef union {<br>+ struct {<br>+ int32_t i;<br>+ int32_t q;<br>+ } __attribute__((__packed__)) iq;<br>+ struct {<br>+ uint8_t i1;<br>+ uint8_t i2;<br>+ uint8_t i3;<br>+ uint8_t i4;<br>+ uint8_t q1;<br>+ uint8_t q2;<br>+ uint8_t q3;<br>+ uint8_t q4;<br>+ } __attribute__((__packed__)) ;<br>+} iq_sample;<br>+<br>+<br>+int perseus_source_c::perseus_rx_<wbr>callback(void *buf, int buf_size)<br>+{<br>+ size_t i, n_avail, to_copy, num_samples;<br>+<br>+ uint8_t *samplebuf = (uint8_t*)buf;<br>+<br>+ num_samples = buf_size/6;<br>+<br>+ if (buf_size % 6)<br>+ std::cerr << "FATAL !!!!!!! not on boundary" << std::endl;<br>+<br>+ iq_sample s;<br>+<br>+ _fifo_lock.lock();<br>+<br>+ n_avail = _fifo->capacity() - _fifo->size();<br>+ to_copy = (n_avail < num_samples ? n_avail : num_samples);<br>+<br>+ for (i = 0; i < to_copy; i++ ) {<br>+ <br>+ s.i1 = s.q1 = 0;<br>+ s.i2 = *samplebuf++;<br>+ s.i3 = *samplebuf++;<br>+ s.i4 = *samplebuf++;<br>+ s.q2 = *samplebuf++;<br>+ s.q3 = *samplebuf++;<br>+ s.q4 = *samplebuf++;<br>+ <br>+ // convert 24 bit two's complements integers to float in [-1.0 - +1.0] range<br>+ <br>+ /* Push sample to the fifo */<br>+ _fifo->push_back( gr_complex( (float)(s.iq.i) / (INT_MAX - 256), (float)(s.iq.q) / (INT_MAX - 256) ) );<br>+<br>+ }<br>+ // keep a counter of processed bytes<br>+ _cnt += buf_size;<br>+<br>+ _fifo_lock.unlock();<br>+<br>+ /* We have made some new samples available to the consumer in work() */<br>+ if (to_copy) {<br>+ //std::cerr << "+" << std::flush;<br>+ _samp_avail.notify_one();<br>+ }<br>+<br>+ /* Indicate overrun, if necessary */<br>+ if (to_copy < num_samples)<br>+ std::cerr << "O" << std::flush;<br>+<br>+ return 0; // TODO: return -1 on error/stop<br>+}<br>+<br>+// static method used as callback from the libperseus-sdr library<br>+int perseus_source_c::_perseus_rx_<wbr>callback(void *buf, int buf_size, void *extra)<br>+{<br>+ perseus_source_c *obj = (perseus_source_c *)extra;<br>+<br>+ return obj->perseus_rx_callback((<wbr>float *)buf, buf_size);<br>+<br>+ return 0;<br>+}<br>+<br>+<br>+bool perseus_source_c::start()<br>+{<br>+ int ret;<br>+<br>+ if ( ! _dev )<br>+ return false;<br>+ <br>+ std::cerr << "***** START COUNTER: " << _cnt<br>+ << " mod 6 " << (_cnt % 6) << std::endl;<br>+<br>+ _frun = true;<br>+<br>+ // in order to guarantee samples stream synchronization<br>+ // re-set the sample rate each time the stream is started<br>+ set_sample_rate( get_sample_rate() );<br>+<br>+ ret = perseus_start_async_input(_<wbr>dev,<br>+ 6 * 1024 * 2 /* buffer size */,<br>+ perseus_source_c::_perseus_<wbr>rx_callback,<br>+ (void *)this);<br>+ if (ret != PERSEUS_NOERROR) {<br>+ std::cerr << "Failed to start RX streaming ("<br>+ << ret << ")" << std::endl;<br>+ return false;<br>+ } else<br>+ return true;<br>+}<br>+<br>+bool perseus_source_c::stop()<br>+{<br>+ if ( ! _dev )<br>+ return false;<br>+<br>+ _frun = false;<br>+<br>+ std::cerr << "***** STOP COUNTER: " << _cnt<br>+ << " mod 6 " << (_cnt % 6) << std::endl;<br>+<br>+ int ret = perseus_stop_async_input(_dev)<wbr>;<br>+<br>+ if ( ret != PERSEUS_NOERROR ) {<br>+ std::cerr << "Failed to stop RX streaming (" << ret << ")" << std::endl;<br>+ return false;<br>+ } else<br>+ return true;<br>+}<br>+<br>+int perseus_source_c::work( int noutput_items,<br>+ gr_vector_const_void_star &input_items,<br>+ gr_vector_void_star &output_items )<br>+{<br>+ gr_complex *out = (gr_complex *)output_items[0];<br>+<br>+ if ( _frun == false ) return WORK_DONE;<br>+<br>+ boost::unique_lock<boost::<wbr>mutex> lock(_fifo_lock);<br>+<br>+ /* Wait until we have the requested number of samples */<br>+ int n_samples_avail = _fifo->size();<br>+<br>+ while (n_samples_avail < noutput_items) {<br>+ _samp_avail.wait(lock);<br>+ n_samples_avail = _fifo->size();<br>+ }<br>+<br>+ for(int i = 0; i < noutput_items; ++i) {<br>+ out[i] = _fifo->at(0);<br>+ _fifo->pop_front();<br>+ }<br>+<br>+ return noutput_items;<br>+}<br>+<br>+std::vector<std::string> perseus_source_c::get_devices(<wbr>)<br>+{<br>+ std::vector<std::string> devices;<br>+ std::string label;<br>+<br>+ std::string args = "perseus=0,label='Perseus'";<br>+ devices.push_back( args );<br>+<br>+ return devices;<br>+}<br>+<br>+size_t perseus_source_c::get_num_<wbr>channels()<br>+{<br>+ return 1;<br>+}<br>+<br>+osmosdr::meta_range_t perseus_source_c::get_sample_<wbr>rates()<br>+{<br>+ osmosdr::meta_range_t range;<br>+<br>+ for (size_t i = 0; i < _sample_rates.size(); i++) {<br>+ range += osmosdr::range_t( _sample_rates[i].first );<br>+ std::cerr << "SR: " << i << " : ("<br>+ << _sample_rates[i].first << ")" << std::endl;<br>+ }<br>+ return range;<br>+}<br>+<br>+double perseus_source_c::set_sample_<wbr>rate( double rate )<br>+{<br>+ int ret;<br>+ if ((ret = perseus_set_sampling_rate(_<wbr>dev, rate)) < 0) {<br>+ PERSEUS_THROW_ON_ERROR(ret, "Unable to set sample rate.");<br>+ } else<br>+ _sample_rate = rate;<br>+<br>+ return get_sample_rate();<br>+}<br>+<br>+double perseus_source_c::get_sample_<wbr>rate()<br>+{<br>+ return _sample_rate;<br>+}<br>+<br>+osmosdr::freq_range_t perseus_source_c::get_freq_<wbr>range( size_t chan )<br>+{<br>+ osmosdr::freq_range_t range;<br>+<br>+ range += osmosdr::range_t( PERSEUS_DDC_FREQ_MIN, PERSEUS_DDC_FREQ_MAX );<br>+<br>+ return range;<br>+}<br>+<br>+double perseus_source_c::set_center_<wbr>freq( double freq, size_t chan )<br>+{<br>+ int ret;<br>+<br>+ if (_dev) {<br>+ ret =<br>+ perseus_set_ddc_center_freq(_<wbr>dev,<br>+ (uint64_t)(freq * (1.0 + (_freq_corr * 10e-6))),<br>+ 1);<br>+ if ( ret == PERSEUS_NOERROR ) {<br>+ _center_freq = freq;<br>+ } else {<br>+ PERSEUS_THROW_ON_ERROR( ret, PERSEUS_FUNC_STR( "perseus_set_ddc_center_freq", freq ) )<br>+ }<br>+ }<br>+<br>+ return get_center_freq( chan );<br>+}<br>+<br>+double perseus_source_c::get_center_<wbr>freq( size_t chan )<br>+{<br>+ return _center_freq;<br>+}<br>+<br>+double perseus_source_c::set_freq_<wbr>corr( double ppm, size_t chan )<br>+{<br>+ return _freq_corr = ppm;<br>+}<br>+<br>+double perseus_source_c::get_freq_<wbr>corr( size_t chan )<br>+{<br>+ return _freq_corr;<br>+}<br>+<br>+std::vector<std::string> perseus_source_c::get_gain_<wbr>names( size_t chan )<br>+{<br>+ return {};<br>+}<br>+<br>+osmosdr::gain_range_t perseus_source_c::get_gain_<wbr>range( size_t chan )<br>+{<br>+ return osmosdr::gain_range_t();<br>+}<br>+<br>+osmosdr::gain_range_t perseus_source_c::get_gain_<wbr>range( const std::string & name, size_t chan )<br>+{<br>+ return osmosdr::gain_range_t();<br>+}<br>+<br>+<br>+double perseus_source_c::set_gain( double gain, size_t chan )<br>+{<br>+ return gain;<br>+}<br>+<br>+double perseus_source_c::set_gain( double gain, const std::string & name, size_t chan)<br>+{<br>+ return gain;<br>+}<br>+<br>+double perseus_source_c::get_gain( size_t chan )<br>+{<br>+ return 0.0;<br>+}<br>+<br>+double perseus_source_c::get_gain( const std::string & name, size_t chan )<br>+{<br>+ return 0.0;<br>+}<br>+<br>+std::vector< std::string > perseus_source_c::get_<wbr>antennas( size_t chan )<br>+{<br>+ std::vector< std::string > antennas;<br>+<br>+ antennas += get_antenna( chan );<br>+<br>+ return antennas;<br>+}<br>+<br>+std::string perseus_source_c::set_antenna( const std::string & antenna, size_t chan )<br>+{<br>+ return get_antenna( chan );<br>+}<br>+<br>+std::string perseus_source_c::get_antenna( size_t chan )<br>+{<br>+ return "RX";<br>+}<br>diff --git a/lib/perseus/perseus_source_<wbr>c.h b/lib/perseus/perseus_source_<wbr>c.h<br>new file mode 100644<br>index 0000000..9eda23d<br>--- /dev/null<br>+++ b/lib/perseus/perseus_source_<wbr>c.h<br>@@ -0,0 +1,120 @@<br>+/* -*- c++ -*- */<br>+/*<br>+ * Copyright 2013 Dimitri Stolnikov <<a href="mailto:horiz0n@gmx.net" rel="noreferrer" target="_blank">horiz0n@gmx.net</a>><br>+ *<br>+ * This file is part of GNU Radio<br>+ *<br>+ * GNU Radio is free software; you can redistribute it and/or modify<br>+ * it under the terms of the GNU General Public License as published by<br>+ * the Free Software Foundation; either version 3, or (at your option)<br>+ * any later version.<br>+ *<br>+ * GNU Radio is distributed in the hope that it will be useful,<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the<br>+ * GNU General Public License for more details.<br>+ *<br>+ * You should have received a copy of the GNU General Public License<br>+ * along with GNU Radio; see the file COPYING. If not, write to<br>+ * the Free Software Foundation, Inc., 51 Franklin Street,<br>+ * Boston, MA 02110-1301, USA.<br>+ */<br>+#ifndef INCLUDED_PERSEUS_SOURCE_C_H<br>+#define INCLUDED_PERSEUS_SOURCE_C_H<br>+<br>+#include <boost/circular_buffer.hpp><br>+#include <boost/thread/mutex.hpp><br>+#include <boost/thread/condition_<wbr>variable.hpp><br>+<br>+#include <gnuradio/sync_block.h><br>+<br>+#include "source_iface.h"<br>+#include <perseus-sdr.h><br>+<br>+class perseus_source_c;<br>+<br>+typedef boost::shared_ptr<perseus_<wbr>source_c> perseus_source_c_sptr;<br>+<br>+/*!<br>+ * \brief Return a shared_ptr to a new instance of perseus_source_c.<br>+ *<br>+ * To avoid accidental use of raw pointers, perseus_source_c's<br>+ * constructor is private. make_perseus_source_c is the public<br>+ * interface for creating new instances.<br>+ */<br>+perseus_source_c_sptr make_perseus_source_c (const std::string & args = "");<br>+<br>+/*!<br>+ * \brief Provides a stream of complex samples.<br>+ * \ingroup block<br>+ */<br>+class perseus_source_c :<br>+ public gr::sync_block,<br>+ public source_iface<br>+{<br>+private:<br>+ // The friend declaration allows make_perseus_source_c to<br>+ // access the private constructor.<br>+<br>+ friend perseus_source_c_sptr make_perseus_source_c (const std::string & args);<br>+<br>+ perseus_source_c (const std::string & args);<br>+<br>+public:<br>+ ~perseus_source_c ();<br>+<br>+ bool start();<br>+ bool stop();<br>+<br>+ int work( int noutput_items,<br>+ gr_vector_const_void_star &input_items,<br>+ gr_vector_void_star &output_items );<br>+<br>+ static std::vector< std::string > get_devices();<br>+<br>+ size_t get_num_channels( void );<br>+<br>+ osmosdr::meta_range_t get_sample_rates( void );<br>+ double set_sample_rate( double rate );<br>+ double get_sample_rate( void );<br>+<br>+ osmosdr::freq_range_t get_freq_range( size_t chan = 0 );<br>+ double set_center_freq( double freq, size_t chan = 0 );<br>+ double get_center_freq( size_t chan = 0 );<br>+ double set_freq_corr( double ppm, size_t chan = 0 );<br>+ double get_freq_corr( size_t chan = 0 );<br>+<br>+ std::vector<std::string> get_gain_names( size_t chan = 0 );<br>+ osmosdr::gain_range_t get_gain_range( size_t chan = 0 );<br>+ osmosdr::gain_range_t get_gain_range( const std::string & name, size_t chan = 0 );<br>+ double set_gain( double gain, size_t chan = 0 );<br>+ double set_gain( double gain, const std::string & name, size_t chan = 0 );<br>+ double get_gain( size_t chan = 0 );<br>+ double get_gain( const std::string & name, size_t chan = 0 );<br>+<br>+ std::vector< std::string > get_antennas( size_t chan = 0 );<br>+ std::string set_antenna( const std::string & antenna, size_t chan = 0 );<br>+ std::string get_antenna( size_t chan = 0 );<br>+<br>+<br>+private:<br>+ static int _perseus_rx_callback(void *buf, int buf_size, void *extra);<br>+<br>+ int perseus_rx_callback(void *samples, int sample_count);<br>+<br>+ perseus_descr *_dev;<br>+<br>+ boost::circular_buffer<gr_<wbr>complex> *_fifo;<br>+ boost::mutex _fifo_lock;<br>+ boost::condition_variable _samp_avail;<br>+<br>+ std::vector< std::pair<double, uint32_t> > _sample_rates;<br>+ double _sample_rate;<br>+ double _center_freq;<br>+ double _freq_corr;<br>+<br>+ bool _frun;<br>+ int _cnt;<br>+};<br>+<br>+#endif /* INCLUDED_PERSEUS_SOURCE_C_H */<br>diff --git a/lib/rtl/rtl_source_c.cc b/lib/rtl/rtl_source_c.cc<br>index a371464..eb7042e 100644<br>--- a/lib/rtl/rtl_source_c.cc<br>+++ b/lib/rtl/rtl_source_c.cc<br>@@ -221,7 +221,7 @@ rtl_source_c::rtl_source_c (const std::string &args)<br> throw std::runtime_error("Failed to enable offset tuning.");<br> }<br> <br>- ret = rtlsdr_set_bias_tee(_dev, bias_tee);<br>+// ret = rtlsdr_set_bias_tee(_dev, bias_tee);<br> if (ret < 0)<br> throw std::runtime_error("Failed to set bias tee.");<br> <br>diff --git a/lib/source_impl.cc b/lib/source_impl.cc<br>index a28f314..ead4ef7 100644<br>--- a/lib/source_impl.cc<br>+++ b/lib/source_impl.cc<br>@@ -92,6 +92,9 @@<br> #include <freesrp_source_c.h><br> #endif<br> <br>+#ifdef ENABLE_PERSEUS<br>+#include <perseus_source_c.h><br>+#endif<br> <br> #include "arg_helpers.h"<br> #include "source_impl.h"<br>@@ -171,6 +174,9 @@ source_impl::source_impl( const std::string &args )<br> #ifdef ENABLE_FREESRP<br> dev_types.push_back("freesrp"<wbr>);<br> #endif<br>+#ifdef ENABLE_PERSEUS<br>+ dev_types.push_back("perseus"<wbr>);<br>+#endif<br> std::cerr << "gr-osmosdr "<br> << GR_OSMOSDR_VERSION << " (" << GR_OSMOSDR_LIBVER << ") "<br> << "gnuradio " << gr::version() << std::endl;<br>@@ -252,7 +258,10 @@ source_impl::source_impl( const std::string &args )<br> BOOST_FOREACH( std::string dev, freesrp_source_c::get_devices(<wbr>) )<br> dev_list.push_back( dev );<br> #endif<br>-<br>+#ifdef ENABLE_PERSEUS<br>+ BOOST_FOREACH( std::string dev, perseus_source_c::get_devices(<wbr>) )<br>+ dev_list.push_back( dev );<br>+#endif<br> // std::cerr << std::endl;<br> // BOOST_FOREACH( std::string dev, dev_list )<br> // std::cerr << "'" << dev << "'" << std::endl;<br>@@ -383,6 +392,13 @@ source_impl::source_impl( const std::string &args )<br> }<br> #endif<br> <br>+#ifdef ENABLE_PERSEUS<br>+ if ( dict.count("perseus") ) {<br>+ perseus_source_c_sptr src = make_perseus_source_c( arg );<br>+ block = src; iface = src.get();<br>+ }<br>+#endif<br>+<br> if ( iface != NULL && long(block.get()) != 0 ) {<br> _devs.push_back( iface );<br> <br>--<br>1.9.1<br><br><br>From 1b6cf50a7a6074754717b027075793<wbr>1c379561bc Mon Sep 17 00:00:00 2001<br>From: Andrea Montefusco IW0HDV <<a href="mailto:andrew@montefusco.com" rel="noreferrer" target="_blank">andrew@montefusco.com</a>><br>Date: Thu, 1 Feb 2018 17:33:39 +0100<br>Subject: More hardware controls added (attenuator, ADC preamp and dither,<br> preselector)<br><br>---<br> lib/perseus/perseus_source_c.<wbr>cc | 136 ++++++++++++++++++++++++++++++<wbr>++++++----<br> lib/perseus/perseus_source_c.<wbr>h | 19 +++++-<br> 2 files changed, 142 insertions(+), 13 deletions(-)<br><br>diff --git a/lib/perseus/perseus_source_<wbr>c.cc b/lib/perseus/perseus_source_<wbr>c.cc<br>index 0720da4..89674b1 100644<br>--- a/lib/perseus/perseus_source_<wbr>c.cc<br>+++ b/lib/perseus/perseus_source_<wbr>c.cc<br>@@ -89,7 +89,11 @@ perseus_source_c::perseus_<wbr>source_c (const std::string &args)<br> _center_freq(0),<br> _freq_corr(0),<br> _frun(false),<br>- _cnt(0)<br>+ _cnt(0),<br>+ _att_value(0),<br>+ _adc_preamp(false),<br>+ _adc_dither(false),<br>+ _preselector(false)<br> {<br> //int ret;<br> <br>@@ -174,9 +178,9 @@ perseus_source_c::perseus_<wbr>source_c (const std::string &args)<br> PERSEUS_THROW_ON_ERROR(ret, "Perseus fpga configuration error");<br> }<br> <br>- perseus_set_attenuator_in_db(<wbr>_dev, PERSEUS_ATT_0DB);<br>+ perseus_set_attenuator_in_db(<wbr>_dev, _att_value);<br> // Enable ADC Dither, Disable ADC Preamp<br>- perseus_set_adc(_dev, true, false);<br>+ perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0);<br> // set the NCO frequency in the middle of the range allowed<br> set_center_freq( (get_freq_range().start() + get_freq_range().stop()) / 2.0 );<br> set_sample_rate( get_sample_rates().start() );<br>@@ -425,7 +429,7 @@ double perseus_source_c::set_center_<wbr>freq( double freq, size_t chan )<br> ret =<br> perseus_set_ddc_center_freq(_<wbr>dev,<br> (uint64_t)(freq * (1.0 + (_freq_corr * 10e-6))),<br>- 1);<br>+ _preselector == true ? 1:0);<br> if ( ret == PERSEUS_NOERROR ) {<br> _center_freq = freq;<br> } else {<br>@@ -453,55 +457,165 @@ double perseus_source_c::get_freq_<wbr>corr( size_t chan )<br> <br> std::vector<std::string> perseus_source_c::get_gain_<wbr>names( size_t chan )<br> {<br>- return {};<br>+ std::vector< std::string > names;<br>+<br>+ names += "Attenuator";<br>+ names += "ADC preamp";<br>+ names += "ADC dither";<br>+<br>+ return names;<br> }<br> <br>+//<br>+// FIXME<br>+//<br> osmosdr::gain_range_t perseus_source_c::get_gain_<wbr>range( size_t chan )<br> {<br>- return osmosdr::gain_range_t();<br>+ return get_gain_range( "Attenuator", chan );<br> }<br> <br> osmosdr::gain_range_t perseus_source_c::get_gain_<wbr>range( const std::string & name, size_t chan )<br> {<br>+ if ( "Attenuator" == name ) {<br>+ return osmosdr::gain_range_t( -30, 0, 10 );<br>+ }<br>+ if ( "ADC preamp" == name ) {<br>+ return osmosdr::gain_range_t( 0, 6, 6 );<br>+ }<br>+ if ( "ADC dither" == name ) {<br>+ return osmosdr::gain_range_t( 0, 1, 1 );<br>+ }<br>+<br> return osmosdr::gain_range_t();<br> }<br> <br> <br>-double perseus_source_c::set_gain( double gain, size_t chan )<br>+double perseus_source_c::set_<wbr>attenuator( double gain, size_t chan )<br> {<br>+ int ret;<br>+<br>+ gain = - gain;<br>+ if (_dev && _att_value != gain) {<br>+ ret = perseus_set_attenuator_in_db (_dev, gain);<br>+<br>+ if ( PERSEUS_NOERROR == ret ) {<br>+ _att_value = gain;<br>+ } else {<br>+ std::cerr << "ERROR: perseus_set_attenuator_in_db: " << gain << std::endl;<br>+ }<br>+ }<br>+<br>+ return _att_value;<br>+}<br>+<br>+double perseus_source_c::set_adc_<wbr>preamp( double gain, size_t chan )<br>+{<br>+ std::cerr << "set_adc_preamp: " << gain << std::endl;<br>+<br>+ if (_dev) {<br>+ _adc_preamp = (gain != 0. ? true : false);<br>+ int ret =<br>+ perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0);<br>+ if ( PERSEUS_NOERROR != ret ) {<br>+ std::cerr << "ERROR: perseus_set_adc" << ret << std::endl;<br>+ }<br>+ }<br> return gain;<br> }<br> <br>-double perseus_source_c::set_gain( double gain, const std::string & name, size_t chan)<br>+double perseus_source_c::set_adc_<wbr>dither( double gain, size_t chan )<br> {<br>+ std::cerr << "set_adc_dither: " << gain << std::endl;<br>+<br>+ if (_dev) {<br>+ _adc_dither = (gain != 0. ? true : false);<br>+ int ret =<br>+ perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0);<br>+ if ( PERSEUS_NOERROR != ret ) {<br>+ std::cerr << "ERROR: perseus_set_adc" << ret << std::endl;<br>+ }<br>+ }<br> return gain;<br> }<br> <br>-double perseus_source_c::get_gain( size_t chan )<br>+double perseus_source_c::get_<wbr>attenuator( size_t chan )<br> {<br>- return 0.0;<br>+ return _att_value;<br> }<br> <br>+double perseus_source_c::get_adc_<wbr>preamp(size_t chan )<br>+{<br>+ double v = _adc_preamp == true ? 6. : 0.;<br>+ std::cerr << "get_adc_preamp: " << _adc_preamp << " value" << v << std::endl;<br>+ return v;<br>+}<br>+<br>+double perseus_source_c::get_adc_<wbr>dither(size_t chan )<br>+{<br>+ double v = _adc_dither == true ? 1. : 0.;<br>+ std::cerr << "get_adc_dither: " << _adc_dither << " value" << v << std::endl;<br>+ return v;<br>+}<br>+<br>+<br>+double perseus_source_c::set_gain( double gain, const std::string & name, size_t chan)<br>+{<br>+ if ( "Attenuator" == name ) {<br>+ return set_attenuator( gain, chan );<br>+ }<br>+ if ( "ADC preamp" == name ) {<br>+ return set_adc_preamp( gain, chan );<br>+ }<br>+ if ( "ADC dither" == name ) {<br>+ return set_adc_dither( gain, chan );<br>+ }<br>+ return gain;<br>+}<br>+<br>+<br> double perseus_source_c::get_gain( const std::string & name, size_t chan )<br> {<br>+ if ( "Attenuator" == name ) {<br>+ return get_attenuator( chan );<br>+ }<br>+ if ( "ADC preamp" == name ) {<br>+ return get_adc_preamp( chan );<br>+ }<br>+ if ( "ADC dither" == name ) {<br>+ return get_adc_dither( chan );<br>+ }<br> return 0.0;<br> }<br> <br>+<br>+<br> std::vector< std::string > perseus_source_c::get_<wbr>antennas( size_t chan )<br> {<br> std::vector< std::string > antennas;<br> <br>- antennas += get_antenna( chan );<br>+ antennas += "RX";<br>+ antennas += "RX+PRESELECTOR";<br> <br> return antennas;<br> }<br> <br> std::string perseus_source_c::set_antenna( const std::string & antenna, size_t chan )<br> {<br>+ if ( antenna == "RX" ) {<br>+ _preselector = false;<br>+ set_center_freq( get_center_freq() );<br>+ return "RX";<br>+ }<br>+ if ( antenna == "RX+PRESELECTOR" ) {<br>+ _preselector = true;<br>+ set_center_freq( get_center_freq() );<br>+ return "RX+PRESELECTOR";<br>+ }<br> return get_antenna( chan );<br> }<br> <br> std::string perseus_source_c::get_antenna( size_t chan )<br> {<br>+ std::cerr << "perseus_source_c::get_<wbr>antenna: " << chan << std::endl;<br> return "RX";<br> }<br>diff --git a/lib/perseus/perseus_source_<wbr>c.h b/lib/perseus/perseus_source_<wbr>c.h<br>index 9eda23d..934ff2b 100644<br>--- a/lib/perseus/perseus_source_<wbr>c.h<br>+++ b/lib/perseus/perseus_source_<wbr>c.h<br>@@ -87,9 +87,20 @@ public:<br> std::vector<std::string> get_gain_names( size_t chan = 0 );<br> osmosdr::gain_range_t get_gain_range( size_t chan = 0 );<br> osmosdr::gain_range_t get_gain_range( const std::string & name, size_t chan = 0 );<br>- double set_gain( double gain, size_t chan = 0 );<br>+<br>+ double set_gain( double gain, size_t chan = 0 ) {return gain; }<br>+ double get_gain( size_t chan = 0 ) {return _att_value; }<br>+<br>+ double set_attenuator( double gain, size_t chan = 0 );<br>+ double get_attenuator( size_t chan = 0 );<br>+<br>+ double set_adc_preamp( double gain, size_t chan = 0 );<br>+ double get_adc_preamp( size_t chan = 0 );<br>+<br>+ double set_adc_dither( double gain, size_t chan = 0 );<br>+ double get_adc_dither( size_t chan = 0 );<br>+<br> double set_gain( double gain, const std::string & name, size_t chan = 0 );<br>- double get_gain( size_t chan = 0 );<br> double get_gain( const std::string & name, size_t chan = 0 );<br> <br> std::vector< std::string > get_antennas( size_t chan = 0 );<br>@@ -115,6 +126,10 @@ private:<br> <br> bool _frun;<br> int _cnt;<br>+ double _att_value;<br>+ bool _adc_preamp;<br>+ bool _adc_dither;<br>+ bool _preselector;<br> };<br> <br> #endif /* INCLUDED_PERSEUS_SOURCE_C_H */<br>--<br>1.9.1</span><br><br clear="all"></div><br>-- <div style="font-family:verdana,sans-serif;display:inline" class="gmail_default"></div><br><div class="m_-4610180883453344991gmail_signature" data-smartmail="gmail_signature">Andrea Montefusco IW0HDV<br>------------------------------<wbr>------------<br>As my old boss, an Apollo veteran, would often remind us “It’s good to be smart, but it’s better to be lucky.”<br> Wayne Hale, Space Shuttle Flight Director</div>
</div>