osmocom-sdr June 2018

osmocom-sdr@lists.osmocom.org

21 participants
19 discussions

Start a nNew thread

gr-osmosdr: add clock_source= parameter

by Michael Loeffler

Hello, the attached patch allows to set the clock_source on uhd devices in programs like gqrx. Bye

4 years, 2 months

gr-osmosdr / no tagged versions since 2014

by Harald Welte

Hi! today I discovered that the gr-osmosdr package in debian unstable contains a whooping list of 96 patches. This is due to the fact that since November 2014 there hasn't been any tagged versions in the repository. I'd like to suggest to tag releases a bit more often. @horizon: What about jumping to 1.0.0 right away? Regards, Harald -- - Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

6 years, 5 months

Save the Date: OsmoCon 2018 on October 18-19, 2018

by Harald Welte

== OsmoCon 2018 == OsmoCon (Osmocom Conference) 2018 is the technical conference for Osmocom users, operators and developers! We are happy to announce the date of OsmoCon 2018. It has been scheduled on October 18 + 19, 2018 and will happen in Berlin, Germany. For the second time, the Osmocom Conference brings together users, operators and developers of the Osmocom Open Source cellular infrastructure projects, such as OsmoBTS, OsmoBSC, OsmoSGSN, OpenGGSN and others. Join us for two days of presentations and discussions with the main developers behind Open Source Mobile Communications, as well as commercial and non-profit users of the Osmocom cellular infrastructure software. You can find some initial information in our wiki at http://osmocom.org/projects/osmo-dev-con/wiki/OsmoCon2018 which will be updated as more information becomes available. == Call for Participation == We're also at the same time announcing the Call for Participation and call on everyone with experiences to share around the Osmocom member projects to submit talks, workshops, discussions or other proposals. You can find the CfP at https://pretalx.sysmocom.de/osmocon2018/cfp We are particularly looking for contributions about: * updates on features/functionality/status of individual Osmocom projects * success stories on how Osmocom projects are deployed in practice * migration from OsmoNITB to the post-NITB architecture * tutorials / workshops on how to setup / analyze Osmocom projects * statistics, reporting, operations aspects of Osmocom projects * third-party open source utilities to be used with Osmocom projects Looking forward to meeting many existing and new Osmocom users at OsmCon this October! Regards, Harald Welte -- - Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

6 years, 8 months

[PATCH] gr-osmosdr Microtelecom Perseus HF receiver support (II)

by andrea.montefusco＠gmail.com

Second attempt: I removed all the changes not related to Perseus. @Sylvain: thanks for take time to review. --- CMakeLists.txt | 1 + cmake/Modules/FindLibPERSEUS.cmake | 24 ++ lib/CMakeLists.txt | 8 + lib/config.h.in | 1 + lib/device.cc | 8 + lib/perseus/CMakeLists.txt | 37 +++ lib/perseus/perseus_source_c.cc | 613 +++++++++++++++++++++++++++++++++++++ lib/perseus/perseus_source_c.h | 135 ++++++++ lib/source_impl.cc | 18 +- 9 files changed, 844 insertions(+), 1 deletion(-) create mode 100644 cmake/Modules/FindLibPERSEUS.cmake create mode 100644 lib/perseus/CMakeLists.txt create mode 100644 lib/perseus/perseus_source_c.cc create mode 100644 lib/perseus/perseus_source_c.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 296456d..94acd4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,6 +173,7 @@ find_package(Volk) find_package(LibbladeRF) find_package(SoapySDR NO_MODULE) find_package(LibFreeSRP) +find_package(LibPERSEUS) find_package(Doxygen) if(NOT GNURADIO_RUNTIME_FOUND) diff --git a/cmake/Modules/FindLibPERSEUS.cmake b/cmake/Modules/FindLibPERSEUS.cmake new file mode 100644 index 0000000..5477327 --- /dev/null +++ b/cmake/Modules/FindLibPERSEUS.cmake @@ -0,0 +1,24 @@ +INCLUDE(FindPkgConfig) +PKG_CHECK_MODULES(PC_LIBPERSEUS libperseus-sdr) + +FIND_PATH( + LIBPERSEUS_INCLUDE_DIRS + NAMES perseus-sdr.h + HINTS $ENV{LIBPERSEUS_DIR}/include + ${PC_LIBPERSEUS_INCLUDEDIR} + PATHS /usr/local/include + /usr/include +) + +FIND_LIBRARY( + LIBPERSEUS_LIBRARIES + NAMES perseus-sdr + HINTS $ENV{LIBPERSEUS_DIR}/lib + ${PC_LIBPERSEUS_LIBDIR} + PATHS /usr/local/lib + /usr/lib +) + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBPERSEUS DEFAULT_MSG LIBPERSEUS_LIBRARIES LIBPERSEUS_INCLUDE_DIRS) +MARK_AS_ADVANCED(LIBPERSEUS_LIBRARIES LIBPERSEUS_INCLUDE_DIRS) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index c05b8d9..f555816 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -249,6 +249,14 @@ GR_INCLUDE_SUBDIRECTORY(freesrp) endif(ENABLE_FREESRP) ######################################################################## +# Setup PERSEUS component +######################################################################## +GR_REGISTER_COMPONENT("Microtelecom Perseus Receiver" ENABLE_PERSEUS LIBPERSEUS_FOUND) +if(ENABLE_PERSEUS) +GR_INCLUDE_SUBDIRECTORY(perseus) +endif(ENABLE_PERSEUS) + +######################################################################## # Setup configuration file ######################################################################## ADD_DEFINITIONS(-DHAVE_CONFIG_H=1) diff --git a/lib/config.h.in b/lib/config.h.in index 42e72f1..dac7e39 100644 --- a/lib/config.h.in +++ b/lib/config.h.in @@ -19,6 +19,7 @@ #cmakedefine ENABLE_SOAPY #cmakedefine ENABLE_REDPITAYA #cmakedefine ENABLE_FREESRP +#cmakedefine ENABLE_PERSEUS //provide NAN define for MSVC older than VC12 #if defined(_MSC_VER) && (_MSC_VER < 1800) diff --git a/lib/device.cc b/lib/device.cc index 025a22b..df0d734 100644 --- a/lib/device.cc +++ b/lib/device.cc @@ -90,6 +90,10 @@ #include <freesrp_source_c.h> #endif +#ifdef ENABLE_PERSEUS +#include <perseus_source_c.h> +#endif + #include "arg_helpers.h" using namespace osmosdr; @@ -194,6 +198,10 @@ devices_t device::find(const device_t &hint) BOOST_FOREACH( std::string dev, soapy_source_c::get_devices() ) devices.push_back( device_t(dev) ); #endif +#ifdef ENABLE_PERSEUS + BOOST_FOREACH( std::string dev, perseus_source_c::get_devices() ) + devices.push_back( device_t(dev) ); +#endif /* software-only sources should be appended at the very end, * hopefully resulting in hardware sources to be shown first diff --git a/lib/perseus/CMakeLists.txt b/lib/perseus/CMakeLists.txt new file mode 100644 index 0000000..f45a10d --- /dev/null +++ b/lib/perseus/CMakeLists.txt @@ -0,0 +1,37 @@ +# Copyright 2017 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. + +######################################################################## +# This file included, use CMake directory variables +######################################################################## + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${LIBPERSEUS_INCLUDE_DIRS} +) + +set(perseus_srcs + ${CMAKE_CURRENT_SOURCE_DIR}/perseus_source_c.cc +) + +######################################################################## +# Append gnuradio-osmosdr library sources +######################################################################## +list(APPEND gr_osmosdr_srcs ${perseus_srcs}) +list(APPEND gr_osmosdr_libs ${LIBPERSEUS_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES}) diff --git a/lib/perseus/perseus_source_c.cc b/lib/perseus/perseus_source_c.cc new file mode 100644 index 0000000..bf7c9be --- /dev/null +++ b/lib/perseus/perseus_source_c.cc @@ -0,0 +1,613 @@ +/* -*- c++ -*- */ +/* + * Copyright 2018 Andrea Montefusco IW0HDV + * + * 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. + */ + +/* + * config.h is generated by configure. It contains the results + * of probing for features, options etc. It should be the first + * file included in your .cc file. + */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <stdexcept> +#include <iostream> +#include <algorithm> + +#include <boost/assign.hpp> +#include <boost/format.hpp> +#include <boost/detail/endian.hpp> +#include <boost/algorithm/string.hpp> +#include <boost/thread/thread.hpp> + +#include <gnuradio/io_signature.h> + +#include "perseus_source_c.h" +#include "arg_helpers.h" + + + +using namespace boost::assign; + +#define PERSEUS_FORMAT_ERROR(ret, msg) \ + boost::str( boost::format(msg " (%1%)") % ret ) + +#define PERSEUS_THROW_ON_ERROR(ret, msg) \ + if ( ret != PERSEUS_NOERROR ) \ + { \ + throw std::runtime_error( PERSEUS_FORMAT_ERROR(ret, msg) ); \ + } + +#define PERSEUS_FUNC_STR(func, arg) \ + boost::str(boost::format(func "(%1%)") % arg) + " has failed" + +perseus_source_c_sptr make_perseus_source_c (const std::string & args) +{ + return gnuradio::get_initial_sptr(new perseus_source_c (args)); +} + +/* + * Specify constraints on number of input and output streams. + * This info is used to construct the input and output signatures + * (2nd & 3rd args to gr::block's constructor). The input and + * output signatures are used by the runtime system to + * check that a valid number and type of inputs and outputs + * are connected to this block. In this case, we accept + * only 0 input and 1 output. + */ +static const int MIN_IN = 0; // mininum number of input streams +static const int MAX_IN = 0; // maximum number of input streams +static const int MIN_OUT = 1; // minimum number of output streams +static const int MAX_OUT = 1; // maximum number of output streams + +/* + * The private constructor + */ +perseus_source_c::perseus_source_c (const std::string &args) + : gr::sync_block ("perseus_source_c", + gr::io_signature::make(MIN_IN, MAX_IN, sizeof (gr_complex)), + gr::io_signature::make(MIN_OUT, MAX_OUT, sizeof (gr_complex))), + _dev(NULL), + _sample_rate(0), + _center_freq(0), + _freq_corr(0), + _frun(false), + _cnt(0), + _att_value(0), + _adc_preamp(false), + _adc_dither(false), + _preselector(false) +{ + dict_t dict = params_to_dict(args); + + _dev = NULL; + + // Set debug info dumped to stderr to the maximum verbose level + perseus_set_debug(3); + + // Check how many Perseus receivers are connected to the system + int num_perseus = perseus_init(); + std::cerr << "## Microtelecom Perseus ctor: " << num_perseus << " Perseus receivers found." << std::endl; + + if (num_perseus==0) { + perseus_exit(); + PERSEUS_THROW_ON_ERROR(PERSEUS_DEVNOTFOUND, "No Perseus receivers detected"); + } + // Open the first one... + if ((_dev = perseus_open(0)) == NULL) { + PERSEUS_THROW_ON_ERROR(PERSEUS_DEVNOTFOUND, "Unable to open Perseus device"); + } + // Download the standard firmware to the unit + std::cerr << "Downloading firmware..." << std::endl; + if (int rc = perseus_firmware_download(_dev,NULL)<0) { + PERSEUS_THROW_ON_ERROR (rc, "firmware download error"); + } + + // Dump some information about the receiver (S/N and HW rev) + int flag; + perseus_is_preserie(_dev, &flag); + if (flag != 0) + fprintf(stderr, "The device is a preserie unit"); + else { + eeprom_prodid prodid; + if (perseus_get_product_id(_dev,&prodid)<0) + fprintf(stderr, "get product id error: %s", perseus_errorstr()); + else + fprintf(stderr, "Receiver S/N: %05d-%02hX%02hX-%02hX%02hX-%02hX%02hX - HW Release:%hd.%hd\n", + (uint16_t) prodid.sn, + (uint16_t) prodid.signature[5], + (uint16_t) prodid.signature[4], + (uint16_t) prodid.signature[3], + (uint16_t) prodid.signature[2], + (uint16_t) prodid.signature[1], + (uint16_t) prodid.signature[0], + (uint16_t) prodid.hwrel, + (uint16_t) prodid.hwver); + } + // Printing all sampling rates available ..... + { + int buf[BUFSIZ]; + + if (perseus_get_sampling_rates (_dev, buf, sizeof(buf)/sizeof(buf[0])) < 0) { + fprintf(stderr, "get sampling rates error: %s\n", perseus_errorstr()); + } else { + int i = 0; + while (buf[i]) { + fprintf(stderr, "#%d: sample rate: %d\n", i, buf[i]); + _sample_rates.push_back( std::pair<double, uint32_t>( buf[i], i ) ); + i++; + } + /* since they may (and will) give us an unsorted array we have to sort it here + * to play nice with the monotonic requirement of meta-range later on */ + std::sort(_sample_rates.begin(), _sample_rates.end()); + + for (size_t i = 0; i < _sample_rates.size(); i++) + std::cerr << boost::format("%gM ") % (_sample_rates[i].first / 1e6); + + std::cerr << std::endl; + } + } + // Configure the receiver for 2 MS/s operations + fprintf(stderr, "Configuring FPGA...\n"); + if (int ret = perseus_set_sampling_rate(_dev, 96000) < 0) { // specify the sampling rate value in Samples/second + std::cerr << "fpga configuration error: " << perseus_errorstr() << std::endl; + PERSEUS_THROW_ON_ERROR(ret, "Perseus fpga configuration error"); + } + + perseus_set_attenuator_in_db(_dev, _att_value); + // Enable ADC Dither, Disable ADC Preamp + perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0); + // set the NCO frequency in the middle of the range allowed + set_center_freq( (get_freq_range().start() + get_freq_range().stop()) / 2.0 ); + set_sample_rate( get_sample_rates().start() ); + + _fifo = new boost::circular_buffer<gr_complex>(5000000); + if (!_fifo) { + throw std::runtime_error( std::string(__FUNCTION__) + " " + + "Failed to allocate a sample FIFO!" ); + } +} + +/* + * Our virtual destructor. + */ +perseus_source_c::~perseus_source_c () +{ + if (_dev) { + if (_frun) stop(); + int ret = perseus_close(_dev); + if ( ret != PERSEUS_NOERROR ) { + std::cerr << PERSEUS_FORMAT_ERROR(ret, "Failed to close Perseus") << std::endl; + } else + _dev = NULL; + } + perseus_exit(); + + if (_fifo) { + delete _fifo; + _fifo = NULL; + } +} + + +typedef union { + struct { + int32_t i; + int32_t q; + } __attribute__((__packed__)) iq; + struct { + uint8_t i1; + uint8_t i2; + uint8_t i3; + uint8_t i4; + uint8_t q1; + uint8_t q2; + uint8_t q3; + uint8_t q4; + } __attribute__((__packed__)) ; +} iq_sample; + + +int perseus_source_c::perseus_rx_callback(void *buf, int buf_size) +{ + size_t i, n_avail, to_copy, num_samples; + + uint8_t *samplebuf = (uint8_t*)buf; + + num_samples = buf_size/6; + + if (buf_size % 6) + std::cerr << "FATAL !!!!!!! not on boundary" << std::endl; + + iq_sample s; + + _fifo_lock.lock(); + + n_avail = _fifo->capacity() - _fifo->size(); + to_copy = (n_avail < num_samples ? n_avail : num_samples); + + for (i = 0; i < to_copy; i++ ) { + + s.i1 = s.q1 = 0; + s.i2 = *samplebuf++; + s.i3 = *samplebuf++; + s.i4 = *samplebuf++; + s.q2 = *samplebuf++; + s.q3 = *samplebuf++; + s.q4 = *samplebuf++; + + // convert 24 bit two's complements integers to float in [-1.0 - +1.0] range + // Push sample to the fifo + _fifo->push_back( gr_complex( (float)(s.iq.i) / (INT_MAX - 256), (float)(s.iq.q) / (INT_MAX - 256) ) ); + + } + // keep a counter of processed bytes + _cnt += buf_size; + + _fifo_lock.unlock(); + + /* We have made some new samples available to the consumer in work() */ + if (to_copy) { + //std::cerr << "+" << std::flush; + _samp_avail.notify_one(); + } + + /* Indicate overrun, if necessary */ + if (to_copy < num_samples) + std::cerr << "O" << std::flush; + + return 0; // TODO: return -1 on error/stop +} + +// static method used as callback from the libperseus-sdr library +int perseus_source_c::_perseus_rx_callback(void *buf, int buf_size, void *extra) +{ + perseus_source_c *obj = (perseus_source_c *)extra; + + return obj->perseus_rx_callback((float *)buf, buf_size); + + return 0; +} + + +bool perseus_source_c::start() +{ + int ret; + + if ( ! _dev ) + return false; + + std::cerr << "***** START COUNTER: " << _cnt + << " mod 6 " << (_cnt % 6) << std::endl; + + _frun = true; + + // in order to guarantee samples stream synchronization + // re-set the sample rate each time the stream is started + set_sample_rate( get_sample_rate() ); + + ret = perseus_start_async_input(_dev, + 6 * 1024 * 2 /* buffer size */, + perseus_source_c::_perseus_rx_callback, + (void *)this); + if (ret != PERSEUS_NOERROR) { + std::cerr << "Failed to start RX streaming (" + << ret << ")" << std::endl; + return false; + } else + return true; +} + +bool perseus_source_c::stop() +{ + if ( ! _dev ) + return false; + + _frun = false; + + std::cerr << "***** STOP COUNTER: " << _cnt + << " mod 6 " << (_cnt % 6) << std::endl; + + int ret = perseus_stop_async_input(_dev); + + if ( ret != PERSEUS_NOERROR ) { + std::cerr << "Failed to stop RX streaming (" << ret << ")" << std::endl; + return false; + } else + return true; +} + +int perseus_source_c::work( int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items ) +{ + gr_complex *out = (gr_complex *)output_items[0]; + + if ( _frun == false ) return WORK_DONE; + + boost::unique_lock<boost::mutex> lock(_fifo_lock); + + /* Wait until we have the requested number of samples */ + int n_samples_avail = _fifo->size(); + + while (n_samples_avail < noutput_items) { + _samp_avail.wait(lock); + n_samples_avail = _fifo->size(); + } + + for(int i = 0; i < noutput_items; ++i) { + out[i] = _fifo->at(0); + _fifo->pop_front(); + } + + return noutput_items; +} + +std::vector<std::string> perseus_source_c::get_devices() +{ + std::vector<std::string> devices; + std::string label; + + std::string args = "perseus=0,label='Perseus'"; + devices.push_back( args ); + + return devices; +} + +size_t perseus_source_c::get_num_channels() +{ + return 1; +} + +osmosdr::meta_range_t perseus_source_c::get_sample_rates() +{ + osmosdr::meta_range_t range; + + for (size_t i = 0; i < _sample_rates.size(); i++) { + range += osmosdr::range_t( _sample_rates[i].first ); + std::cerr << "SR: " << i << " : (" + << _sample_rates[i].first << ")" << std::endl; + } + return range; +} + +double perseus_source_c::set_sample_rate( double rate ) +{ + int ret; + if ((ret = perseus_set_sampling_rate(_dev, rate)) < 0) { + PERSEUS_THROW_ON_ERROR(ret, "Unable to set sample rate."); + } else + _sample_rate = rate; + + return get_sample_rate(); +} + +double perseus_source_c::get_sample_rate() +{ + return _sample_rate; +} + +osmosdr::freq_range_t perseus_source_c::get_freq_range( size_t chan ) +{ + osmosdr::freq_range_t range; + + range += osmosdr::range_t( PERSEUS_DDC_FREQ_MIN, PERSEUS_DDC_FREQ_MAX ); + + return range; +} + +double perseus_source_c::set_center_freq( double freq, size_t chan ) +{ + int ret; + + if (_dev) { + ret = + perseus_set_ddc_center_freq(_dev, + (uint64_t)(freq * (1.0 + (_freq_corr * 10e-6))), + _preselector == true ? 1:0); + if ( ret == PERSEUS_NOERROR ) { + _center_freq = freq; + } else { + PERSEUS_THROW_ON_ERROR( ret, PERSEUS_FUNC_STR( "perseus_set_ddc_center_freq", freq ) ) + } + } + + return get_center_freq( chan ); +} + +double perseus_source_c::get_center_freq( size_t chan ) +{ + return _center_freq; +} + +double perseus_source_c::set_freq_corr( double ppm, size_t chan ) +{ + return _freq_corr = ppm; +} + +double perseus_source_c::get_freq_corr( size_t chan ) +{ + return _freq_corr; +} + +std::vector<std::string> perseus_source_c::get_gain_names( size_t chan ) +{ + std::vector< std::string > names; + + names += "Attenuator"; + names += "ADC preamp"; + names += "ADC dither"; + + return names; +} + +// +// FIXME +// +osmosdr::gain_range_t perseus_source_c::get_gain_range( size_t chan ) +{ + return get_gain_range( "Attenuator", chan ); +} + +osmosdr::gain_range_t perseus_source_c::get_gain_range( const std::string & name, size_t chan ) +{ + if ( "Attenuator" == name ) { + return osmosdr::gain_range_t( -30, 0, 10 ); + } + if ( "ADC preamp" == name ) { + return osmosdr::gain_range_t( 0, 6, 6 ); + } + if ( "ADC dither" == name ) { + return osmosdr::gain_range_t( 0, 1, 1 ); + } + + return osmosdr::gain_range_t(); +} + + +double perseus_source_c::set_attenuator( double gain, size_t chan ) +{ + int ret; + + gain = - gain; + if (_dev && _att_value != gain) { + ret = perseus_set_attenuator_in_db (_dev, gain); + + if ( PERSEUS_NOERROR == ret ) { + _att_value = gain; + } else { + std::cerr << "ERROR: perseus_set_attenuator_in_db: " << gain << std::endl; + } + } + + return _att_value; +} + +double perseus_source_c::set_adc_preamp( double gain, size_t chan ) +{ + std::cerr << "set_adc_preamp: " << gain << std::endl; + + if (_dev) { + _adc_preamp = (gain != 0. ? true : false); + int ret = + perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0); + if ( PERSEUS_NOERROR != ret ) { + std::cerr << "ERROR: perseus_set_adc" << ret << std::endl; + } + } + return gain; +} + +double perseus_source_c::set_adc_dither( double gain, size_t chan ) +{ + std::cerr << "set_adc_dither: " << gain << std::endl; + + if (_dev) { + _adc_dither = (gain != 0. ? true : false); + int ret = + perseus_set_adc(_dev, _adc_dither == true ? 1:0, _adc_preamp == true ? 1:0); + if ( PERSEUS_NOERROR != ret ) { + std::cerr << "ERROR: perseus_set_adc" << ret << std::endl; + } + } + return gain; +} + +double perseus_source_c::get_attenuator( size_t chan ) +{ + return _att_value; +} + +double perseus_source_c::get_adc_preamp(size_t chan ) +{ + double v = _adc_preamp == true ? 6. : 0.; + std::cerr << "get_adc_preamp: " << _adc_preamp << " value" << v << std::endl; + return v; +} + +double perseus_source_c::get_adc_dither(size_t chan ) +{ + double v = _adc_dither == true ? 1. : 0.; + std::cerr << "get_adc_dither: " << _adc_dither << " value" << v << std::endl; + return v; +} + + +double perseus_source_c::set_gain( double gain, const std::string & name, size_t chan) +{ + if ( "Attenuator" == name ) { + return set_attenuator( gain, chan ); + } + if ( "ADC preamp" == name ) { + return set_adc_preamp( gain, chan ); + } + if ( "ADC dither" == name ) { + return set_adc_dither( gain, chan ); + } + return gain; +} + + +double perseus_source_c::get_gain( const std::string & name, size_t chan ) +{ + if ( "Attenuator" == name ) { + return get_attenuator( chan ); + } + if ( "ADC preamp" == name ) { + return get_adc_preamp( chan ); + } + if ( "ADC dither" == name ) { + return get_adc_dither( chan ); + } + return 0.0; +} + + + +std::vector< std::string > perseus_source_c::get_antennas( size_t chan ) +{ + std::vector< std::string > antennas; + + antennas += "RX"; + antennas += "RX+PRESELECTOR"; + + return antennas; +} + +std::string perseus_source_c::set_antenna( const std::string & antenna, size_t chan ) +{ + if ( antenna == "RX" ) { + _preselector = false; + set_center_freq( get_center_freq() ); + return "RX"; + } + if ( antenna == "RX+PRESELECTOR" ) { + _preselector = true; + set_center_freq( get_center_freq() ); + return "RX+PRESELECTOR"; + } + return get_antenna( chan ); +} + +std::string perseus_source_c::get_antenna( size_t chan ) +{ + std::cerr << "perseus_source_c::get_antenna: " << chan << std::endl; + return "RX"; +} diff --git a/lib/perseus/perseus_source_c.h b/lib/perseus/perseus_source_c.h new file mode 100644 index 0000000..55d3f89 --- /dev/null +++ b/lib/perseus/perseus_source_c.h @@ -0,0 +1,135 @@ +/* -*- c++ -*- */ +/* + * Copyright 2013 Dimitri Stolnikov <horiz0n(a)gmx.net> + * + * 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_PERSEUS_SOURCE_C_H +#define INCLUDED_PERSEUS_SOURCE_C_H + +#include <boost/circular_buffer.hpp> +#include <boost/thread/mutex.hpp> +#include <boost/thread/condition_variable.hpp> + +#include <gnuradio/sync_block.h> + +#include "source_iface.h" +#include <perseus-sdr.h> + +class perseus_source_c; + +typedef boost::shared_ptr<perseus_source_c> perseus_source_c_sptr; + +/*! + * \brief Return a shared_ptr to a new instance of perseus_source_c. + * + * To avoid accidental use of raw pointers, perseus_source_c's + * constructor is private. make_perseus_source_c is the public + * interface for creating new instances. + */ +perseus_source_c_sptr make_perseus_source_c (const std::string & args = ""); + +/*! + * \brief Provides a stream of complex samples. + * \ingroup block + */ +class perseus_source_c : + public gr::sync_block, + public source_iface +{ +private: + // The friend declaration allows make_perseus_source_c to + // access the private constructor. + + friend perseus_source_c_sptr make_perseus_source_c (const std::string & args); + + perseus_source_c (const std::string & args); + +public: + ~perseus_source_c (); + + bool start(); + bool stop(); + + int work( int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items ); + + static std::vector< std::string > get_devices(); + + size_t get_num_channels( void ); + + osmosdr::meta_range_t get_sample_rates( void ); + double set_sample_rate( double rate ); + double get_sample_rate( void ); + + osmosdr::freq_range_t get_freq_range( size_t chan = 0 ); + double set_center_freq( double freq, size_t chan = 0 ); + double get_center_freq( size_t chan = 0 ); + double set_freq_corr( double ppm, size_t chan = 0 ); + double get_freq_corr( size_t chan = 0 ); + + std::vector<std::string> get_gain_names( size_t chan = 0 ); + osmosdr::gain_range_t get_gain_range( size_t chan = 0 ); + osmosdr::gain_range_t get_gain_range( const std::string & name, size_t chan = 0 ); + + double set_gain( double gain, size_t chan = 0 ) {return gain; } + double get_gain( size_t chan = 0 ) {return _att_value; } + + double set_attenuator( double gain, size_t chan = 0 ); + double get_attenuator( size_t chan = 0 ); + + double set_adc_preamp( double gain, size_t chan = 0 ); + double get_adc_preamp( size_t chan = 0 ); + + double set_adc_dither( double gain, size_t chan = 0 ); + double get_adc_dither( size_t chan = 0 ); + + double set_gain( double gain, const std::string & name, size_t chan = 0 ); + double get_gain( const std::string & name, size_t chan = 0 ); + + std::vector< std::string > get_antennas( size_t chan = 0 ); + std::string set_antenna( const std::string & antenna, size_t chan = 0 ); + std::string get_antenna( size_t chan = 0 ); + + +private: + static int _perseus_rx_callback(void *buf, int buf_size, void *extra); + + int perseus_rx_callback(void *samples, int sample_count); + + perseus_descr *_dev; + + boost::circular_buffer<gr_complex> *_fifo; + boost::mutex _fifo_lock; + boost::condition_variable _samp_avail; + + std::vector< std::pair<double, uint32_t> > _sample_rates; + double _sample_rate; + double _center_freq; + double _freq_corr; + + bool _frun; + int _cnt; + double _att_value; + bool _adc_preamp; + bool _adc_dither; + bool _preselector; +}; + +#endif /* INCLUDED_PERSEUS_SOURCE_C_H */ diff --git a/lib/source_impl.cc b/lib/source_impl.cc index a28f314..ead4ef7 100644 --- a/lib/source_impl.cc +++ b/lib/source_impl.cc @@ -92,6 +92,9 @@ #include <freesrp_source_c.h> #endif +#ifdef ENABLE_PERSEUS +#include <perseus_source_c.h> +#endif #include "arg_helpers.h" #include "source_impl.h" @@ -171,6 +174,9 @@ source_impl::source_impl( const std::string &args ) #ifdef ENABLE_FREESRP dev_types.push_back("freesrp"); #endif +#ifdef ENABLE_PERSEUS + dev_types.push_back("perseus"); +#endif std::cerr << "gr-osmosdr " << GR_OSMOSDR_VERSION << " (" << GR_OSMOSDR_LIBVER << ") " << "gnuradio " << gr::version() << std::endl; @@ -252,7 +258,10 @@ source_impl::source_impl( const std::string &args ) BOOST_FOREACH( std::string dev, freesrp_source_c::get_devices() ) dev_list.push_back( dev ); #endif - +#ifdef ENABLE_PERSEUS + BOOST_FOREACH( std::string dev, perseus_source_c::get_devices() ) + dev_list.push_back( dev ); +#endif // std::cerr << std::endl; // BOOST_FOREACH( std::string dev, dev_list ) // std::cerr << "'" << dev << "'" << std::endl; @@ -383,6 +392,13 @@ source_impl::source_impl( const std::string &args ) } #endif +#ifdef ENABLE_PERSEUS + if ( dict.count("perseus") ) { + perseus_source_c_sptr src = make_perseus_source_c( arg ); + block = src; iface = src.get(); + } +#endif + if ( iface != NULL && long(block.get()) != 0 ) { _devs.push_back( iface ); -- 1.9.1

6 years, 10 months

[PATCH] SDRPlay API breaking changes & support recent hardware / API v2.13+

by Frank Werner-Krippendorf

The current NONFREE SDRplay class is unusable with recent APIs, too many breaking API changes. This patch is tested with the current up-to-date API V2.13 diff --git a/lib/sdrplay/sdrplay_source_c.cc b/lib/sdrplay/sdrplay_source_c.cc index 9a9ee40..6f20d5f 100644 --- a/lib/sdrplay/sdrplay_source_c.cc +++ b/lib/sdrplay/sdrplay_source_c.cc @@ -1,9 +1,12 @@ /* -*- c++ -*- */ /* + * Copyright 2018 Frank Werner-Krippendorf <mail(a)hb9fxq.ch> + * Copyright 2018 Jeff Long <willcode4(a)gmail.com> * Copyright 2015 SDRplay Ltd <support(a)sdrplay.com> * Copyright 2012 Dimitri Stolnikov <horiz0n(a)gmx.net> * Copyright 2012 Steve Markgraf <steve(a)steve-m.de> * + * * 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) @@ -32,179 +35,159 @@ #include "sdrplay_source_c.h" #include <gnuradio/io_signature.h> #include "osmosdr/source.h" +#include "arg_helpers.h" #include <boost/assign.hpp> #include <boost/format.hpp> +#include <boost/thread/mutex.hpp> +#include <boost/thread/condition_variable.hpp> +#include <boost/chrono.hpp> -#include <stdexcept> #include <iostream> -#include <stdio.h> -#include <math.h> - -#include <mirsdrapi-rsp.h> - -#include "arg_helpers.h" +#include <mutex> #define MAX_SUPPORTED_DEVICES 4 -struct sdrplay_dev -{ - int gRdB; - double gain_dB; - double fsHz; - double rfHz; - mir_sdr_Bw_MHzT bwType; - mir_sdr_If_kHzT ifType; - int samplesPerPacket; - int maxGain; - int minGain; - int dcMode; -}; - using namespace boost::assign; -#define BYTES_PER_SAMPLE 4 // sdrplay device delivers 16 bit signed IQ data - // containing 12 bits of information +// Index by mir_sdr_Bw_MHzT +static std::vector<double> bandwidths = { + 0, // Dummy + 200e3, + 300e3, + 600e3, + 1536e3, + 5000e3, + 6000e3, + 7000e3, + 8000e3 +}; -#define SDRPLAY_AM_MIN 150e3 -#define SDRPLAY_AM_MAX 30e6 -#define SDRPLAY_FM_MIN 64e6 -#define SDRPLAY_FM_MAX 108e6 -#define SDRPLAY_B3_MIN 162e6 -#define SDRPLAY_B3_MAX 240e6 -#define SDRPLAY_B45_MIN 470e6 -#define SDRPLAY_B45_MAX 960e6 -#define SDRPLAY_L_MIN 1450e6 -#define SDRPLAY_L_MAX 1675e6 +// TODO - RSP1 lower freq is 10e3. +#define SDRPLAY_FREQ_MIN 1e3 +#define SDRPLAY_FREQ_MAX 2000e6 -#define SDRPLAY_MAX_BUF_SIZE 504 +static std::string hwName(int hwVer) +{ + if (hwVer == 1) + return "RSP1"; + if (hwVer == 2) + return "RSP2"; + if (hwVer == 255) + return "RSP1A"; + if (hwVer == 3) + return "RSPduo"; + return "UNK"; +} -/* - * Create a new instance of sdrplay_source_c and return - * a boost shared_ptr. This is effectively the public constructor. - */ sdrplay_source_c_sptr make_sdrplay_source_c (const std::string &args) { return gnuradio::get_initial_sptr(new sdrplay_source_c (args)); } -/* - * Specify constraints on number of input and output streams. - * This info is used to construct the input and output signatures - * (2nd & 3rd args to gr::block's constructor). The input and - * output signatures are used by the runtime system to - * check that a valid number and type of inputs and outputs - * are connected to this block. In this case, we accept - * only 0 input and 1 output. - */ -static const int MIN_IN = 0; // mininum number of input streams -static const int MAX_IN = 0; // maximum number of input streams -static const int MIN_OUT = 1; // minimum number of output streams -static const int MAX_OUT = 1; // maximum number of output streams +// 0 inputs, 1 output +static const int MIN_IN = 0; +static const int MAX_IN = 0; +static const int MIN_OUT = 1; +static const int MAX_OUT = 1; -/* - * The private constructor - */ sdrplay_source_c::sdrplay_source_c (const std::string &args) : gr::sync_block ("sdrplay_source_c", gr::io_signature::make(MIN_IN, MAX_IN, sizeof (gr_complex)), gr::io_signature::make(MIN_OUT, MAX_OUT, sizeof (gr_complex))), - _running(false), - _uninit(false), - _auto_gain(false) -{ - _dev = (sdrplay_dev_t *)malloc(sizeof(sdrplay_dev_t)); - if (_dev == NULL) - { - return; -} - _dev->fsHz = 2048e3; - _dev->rfHz = 200e6; - _dev->bwType = mir_sdr_BW_1_536; - _dev->ifType = mir_sdr_IF_Zero; - _dev->samplesPerPacket = 0; - _dev->dcMode = 0; - _dev->gRdB = 60; - set_gain_limits(_dev->rfHz); - _dev->gain_dB = _dev->maxGain - _dev->gRdB; + _auto_gain(true), + _gRdB(40), + _lna(0), + _bcastNotch(0), + _dabNotch(0), + _fsHz(2e6), + _decim(1), + _rfHz(100e6), + _bwType(mir_sdr_BW_1_536), + _ifType(mir_sdr_IF_Zero), + _loMode(mir_sdr_LO_Auto), + _dcMode(true), + _iqMode(true), + _buffer(NULL), + _streaming(false), + _flowgraphRunning(false), + _reinit(false) +{ + dict_t dict = params_to_dict(args); + if (dict.count("sdrplay")) { + _devIndex = boost::lexical_cast<unsigned int>(dict["sdrplay"]); + } + else { + _devIndex = 0; + } + + unsigned int numDevices; + mir_sdr_DeviceT mirDevices[MAX_SUPPORTED_DEVICES]; + mir_sdr_GetDevices(mirDevices, &numDevices, MAX_SUPPORTED_DEVICES); + if (((_devIndex+1 > numDevices) || !mirDevices[_devIndex].devAvail)) { + std::cerr << "Failed to open SDRplay device " + std::to_string(_devIndex) << std::endl; + throw std::runtime_error("Failed to open SDRplay device " + std::to_string(_devIndex)); + } + + for (int i; i < numDevices; i++) { + std::cerr << "RSP devIndex: [" << i << "] hwVer: " << hwName(mirDevices[i].hwVer) << " SerNo: " << mirDevices[i].SerNo + << std::endl;; + } + + _hwVer = mirDevices[_devIndex].hwVer; + + int debug = 0; + if (dict.count("debug") && (boost::lexical_cast<int>(dict["debug"]) != 0)) + debug = 1; + mir_sdr_DebugEnable(debug); + + if (_hwVer == 2) { + _antenna = "A"; +} + else { + _antenna = "RX"; + } - _bufi.reserve(SDRPLAY_MAX_BUF_SIZE); - _bufq.reserve(SDRPLAY_MAX_BUF_SIZE); - - _buf_mutex.lock(); - _buf_offset = 0; - _buf_mutex.unlock(); + // bias=[0|1] to turn [off|on] bias tee. Default is off. + _biasT = 0; + if (dict.count("bias")) { + _biasT = boost::lexical_cast<int>(dict["bias"]); + } + + // lo=[120|144|168] to set first LO to 120/144/168 MHz. Default is Auto. + if (dict.count("lo")) { + int loMode = boost::lexical_cast<int>(dict["lo"]); + if (loMode == 120) + _loMode = mir_sdr_LO_120MHz; + else if (loMode == 144) + _loMode = mir_sdr_LO_144MHz; + else if (loMode == 168) + _loMode = mir_sdr_LO_168MHz; + } } -/* - * Our virtual destructor. - */ sdrplay_source_c::~sdrplay_source_c () { - free(_dev); - _dev = NULL; - _buf_mutex.lock(); - if (_running) - { - _running = false; + if (_streaming) { + stopStreaming(); } - _uninit = true; - _buf_mutex.unlock(); } -void sdrplay_source_c::reinit_device() -{ - std::cerr << "reinit_device started" << std::endl; - _buf_mutex.lock(); - std::cerr << "after mutex.lock" << std::endl; - if (_running) - { - std::cerr << "mir_sdr_Uninit started" << std::endl; - mir_sdr_Uninit(); - } - - std::cerr << "mir_sdr_Init started" << std::endl; - mir_sdr_Init(_dev->gRdB, _dev->fsHz / 1e6, _dev->rfHz / 1e6, _dev->bwType, _dev->ifType, &_dev->samplesPerPacket); - - if (_dev->dcMode) +bool sdrplay_source_c::start(void) { - std::cerr << "mir_sdr_SetDcMode started" << std::endl; - mir_sdr_SetDcMode(4, 1); - } - - _buf_offset = 0; - _buf_mutex.unlock(); - std::cerr << "reinit_device end" << std::endl; + boost::mutex::scoped_lock lock(_bufferMutex); + _flowgraphRunning = true; + return true; } -void sdrplay_source_c::set_gain_limits(double freq) +bool sdrplay_source_c::stop(void) { - if (freq <= SDRPLAY_AM_MAX) - { - _dev->minGain = -4; - _dev->maxGain = 98; - } - else if (freq <= SDRPLAY_FM_MAX) - { - _dev->minGain = 1; - _dev->maxGain = 103; - } - else if (freq <= SDRPLAY_B3_MAX) - { - _dev->minGain = 5; - _dev->maxGain = 107; - } - else if (freq <= SDRPLAY_B45_MAX) - { - _dev->minGain = 9; - _dev->maxGain = 94; - } - else if (freq <= SDRPLAY_L_MAX) - { - _dev->minGain = 24; - _dev->maxGain = 105; - } + boost::mutex::scoped_lock lock(_bufferMutex); + _flowgraphRunning = false; + // FG may be modified, so assume copied pointer is invalid + _buffer = NULL; + return true; } int sdrplay_source_c::work( int noutput_items, @@ -212,186 +195,311 @@ int sdrplay_source_c::work( int noutput_items, gr_vector_void_star &output_items ) { gr_complex *out = (gr_complex *)output_items[0]; - int cnt = noutput_items; - unsigned int sampNum; - int grChanged; - int rfChanged; - int fsChanged; - if (_uninit) - { - return WORK_DONE; - } + if (!_streaming) + startStreaming(); - if (!_running) { - reinit_device(); - _running = true; + boost::mutex::scoped_lock lock(_bufferMutex); + _buffer = out; + _bufferSpaceRemaining = noutput_items; + _bufferOffset = 0; + _bufferReady.notify_one(); + + while (_buffer && _streaming) { + _bufferReady.wait(lock); + } + } + + if (!_streaming) { + return 0; } - _buf_mutex.lock(); + return noutput_items - _bufferSpaceRemaining; +} - if (_buf_offset) +// Called by sdrplay streamer thread when data is available +void sdrplay_source_c::streamCallback(short *xi, short *xq, + unsigned int firstSampleNum, + int grChanged, int rfChanged, int fsChanged, + unsigned int numSamples, unsigned int reset) { - for (int i = _buf_offset; i < _dev->samplesPerPacket; i++) - { - *out++ = gr_complex( float(_bufi[i]) * (1.0f/2048.0f), float(_bufq[i]) * (1.0f/2048.0f) ); - } - cnt -= (_dev->samplesPerPacket - _buf_offset); - } + unsigned int i = 0; + _reinit = false; - while ((cnt - _dev->samplesPerPacket) >= 0) - { - mir_sdr_ReadPacket(_bufi.data(), _bufq.data(), &sampNum, &grChanged, &rfChanged, &fsChanged); - for (int i = 0; i < _dev->samplesPerPacket; i++) - { - *out++ = gr_complex( float(_bufi[i]) * (1.0f/2048.0f), float(_bufq[i]) * (1.0f/2048.0f) ); - } - cnt -= _dev->samplesPerPacket; - } + boost::mutex::scoped_lock lock(_bufferMutex); - _buf_offset = 0; - if (cnt) - { - mir_sdr_ReadPacket(_bufi.data(), _bufq.data(), &sampNum, &grChanged, &rfChanged, &fsChanged); - for (int i = 0; i < cnt; i++) - { - *out++ = gr_complex( float(_bufi[i]) * (1.0f/2048.0f), float(_bufq[i]) * (1.0f/2048.0f) ); - } - _buf_offset = cnt; + while (i < numSamples) { + + // Discard samples if not streaming, if flowgraph not running, or reinit needed. + if (!_streaming || _reinit || !_flowgraphRunning) + return; + + // While buffer is not ready for write, wait a short time. + while (!_buffer) { + if (boost::cv_status::timeout == + _bufferReady.wait_for(lock, boost::chrono::milliseconds(250))) + return; + } + + // Copy until out of samples or buffer is full + while ((i < numSamples) && (_bufferSpaceRemaining > 0)) { + _buffer[_bufferOffset] = + gr_complex(float(xi[i]) / 32768.0, float(xq[i]) / 32768.0); + + i++; + _bufferOffset++; + _bufferSpaceRemaining--; } - _buf_mutex.unlock(); - return noutput_items; + if (_bufferSpaceRemaining == 0) { + _buffer = NULL; + _bufferReady.notify_one(); + } + } +} + +// Callback wrapper +void sdrplay_source_c::streamCallbackWrap(short *xi, short *xq, + unsigned int firstSampleNum, + int grChanged, int rfChanged, int fsChanged, + unsigned int numSamples, unsigned int reset, unsigned int hwRemoved, + void *cbContext) +{ + sdrplay_source_c *obj = (sdrplay_source_c *)cbContext; + obj->streamCallback(xi, xq, + firstSampleNum, + grChanged, rfChanged, fsChanged, + numSamples, reset); +} + +// Called by strplay streamer thread when gain reduction is changed. +void sdrplay_source_c::gainChangeCallback(unsigned int gRdB, + unsigned int lnaGRdB) +{ + mir_sdr_GainValuesT gainVals; + + mir_sdr_GetCurrentGain(&gainVals); + + if (gRdB < 200) + { + std::cerr << "GR change, BB+MIX -" << gRdB << "dB, LNA -" << lnaGRdB << std::endl; + } + + if (gRdB < mir_sdr_GAIN_MESSAGE_START_ID) + { + // gainVals.curr is a calibrated gain value + } + else if (gRdB == mir_sdr_ADC_OVERLOAD_DETECTED) + { + mir_sdr_GainChangeCallbackMessageReceived(); + // OVERLOAD DETECTED + } + else + { + mir_sdr_GainChangeCallbackMessageReceived(); + // OVERLOAD CORRECTED + } +} + +// Callback wrapper +void sdrplay_source_c::gainChangeCallbackWrap(unsigned int gRdB, + unsigned int lnaGRdB, + void *cbContext) +{ + sdrplay_source_c *obj = (sdrplay_source_c *)cbContext; + obj->gainChangeCallback(gRdB, lnaGRdB); +} + +void sdrplay_source_c::startStreaming(void) +{ + if (_streaming) + return; + + unsigned int numDevices; + mir_sdr_DeviceT mirDevices[MAX_SUPPORTED_DEVICES]; + mir_sdr_ReleaseDeviceIdx(); + mir_sdr_GetDevices(mirDevices, &numDevices, MAX_SUPPORTED_DEVICES); + mir_sdr_SetDeviceIdx(_devIndex); + + std::cerr << "Using SDRplay " << hwName(_hwVer) << " " + << mirDevices[_devIndex].SerNo << std::endl; + + // Set bias voltage on/off (RSP1A/RSP2). + std::cerr << "Bias voltage: " << _biasT << std::endl; + if (_hwVer == 2) + mir_sdr_RSPII_BiasTControl(_biasT); + else if (_hwVer == 255) + mir_sdr_rsp1a_BiasT(_biasT); + + // Set first LO frequency + mir_sdr_SetLoMode(_loMode); + + _streaming = true; + + set_gain_mode(get_gain_mode(/*channel*/ 0), /*channel*/ 0); + + int gRdB = _gRdB; + int gRdBsystem = 0; + + mir_sdr_StreamInit(&gRdB, + _fsHz / 1e6, + _rfHz / 1e6, + _bwType, + _ifType, + checkLNA(_lna), + &gRdBsystem, + mir_sdr_USE_RSP_SET_GR, + &_samplesPerPacket, + &streamCallbackWrap, + &gainChangeCallbackWrap, + this); + + // Set decimation with halfband filter + mir_sdr_DecimateControl(_decim != 1, _decim, 1); + + mir_sdr_DCoffsetIQimbalanceControl(_dcMode, _iqMode); + + // Model-specific initialization + if (_hwVer == 2) { + set_antenna(get_antenna(), 0); + mir_sdr_RSPII_RfNotchEnable(_bcastNotch); + } + + else if (_hwVer == 255) { + mir_sdr_rsp1a_BroadcastNotch(_bcastNotch); + mir_sdr_rsp1a_DabNotch(_dabNotch); + } +} + +void sdrplay_source_c::stopStreaming(void) +{ + if (!_streaming) + return; + + _streaming = false; + + mir_sdr_StreamUninit(); + mir_sdr_ReleaseDeviceIdx(); +} + +void sdrplay_source_c::reinitDevice(int reason) +{ + // If no reason given, reinit everything + if (reason == (int)mir_sdr_CHANGE_NONE) + reason = (mir_sdr_CHANGE_GR | + mir_sdr_CHANGE_FS_FREQ | + mir_sdr_CHANGE_RF_FREQ | + mir_sdr_CHANGE_BW_TYPE | + mir_sdr_CHANGE_IF_TYPE | + mir_sdr_CHANGE_LO_MODE | + mir_sdr_CHANGE_AM_PORT); + + int gRdB; + int gRdBsystem; // Returned overall system gain reduction + + gRdB = _gRdB; + + // Tell stream CB to return + _reinit = true; + + mir_sdr_Reinit(&gRdB, + _fsHz / 1e6, + _rfHz / 1e6, + _bwType, + _ifType, + _loMode, + checkLNA(_lna), + &gRdBsystem, + mir_sdr_USE_RSP_SET_GR, + &_samplesPerPacket, + (mir_sdr_ReasonForReinitT)reason + ); + + // Set decimation with halfband filter + if (reason & (int)mir_sdr_CHANGE_FS_FREQ) + mir_sdr_DecimateControl(_decim != 1, _decim, 1); + + _bufferReady.notify_one(); } std::vector<std::string> sdrplay_source_c::get_devices() { + unsigned int numDevices; + mir_sdr_DeviceT mirDevices[MAX_SUPPORTED_DEVICES]; std::vector<std::string> devices; - std::cerr << "get_devices started" << std::endl; - - unsigned int dev_cnt = 0; - int samplesPerPacket; - while(mir_sdr_Init(60, 2.048, 200.0, mir_sdr_BW_1_536, mir_sdr_IF_Zero, &samplesPerPacket) == mir_sdr_Success) - { - dev_cnt++; - } - std::cerr << "Device count: " << dev_cnt << std::endl; + mir_sdr_GetDevices(mirDevices, &numDevices, MAX_SUPPORTED_DEVICES); - for (unsigned int i = 0; i < dev_cnt; i++) - { - mir_sdr_Uninit(); - std::string args = "sdrplay=" + boost::lexical_cast< std::string >( i ); - args += ",label='" + std::string("SDRplay RSP") + "'"; + for (unsigned int i=0; i<numDevices; i++) { + mir_sdr_DeviceT *dev = &mirDevices[i]; + if (!dev->devAvail) + continue; + std::string args = boost::str(boost::format("sdrplay=%d,label='SDRplay %s %s'") + % i % hwName((int)dev->hwVer) % dev->SerNo ); std::cerr << args << std::endl; devices.push_back( args ); } - std::cerr << "get_devices end" << std::endl; return devices; } size_t sdrplay_source_c::get_num_channels() { - std::cerr << "get_num_channels: 1" << std::endl; return 1; } osmosdr::meta_range_t sdrplay_source_c::get_sample_rates() { osmosdr::meta_range_t range; - - range += osmosdr::range_t( 2000e3, 12000e3 ); - + range += osmosdr::range_t( 62.5e3, 10e6 ); return range; } double sdrplay_source_c::set_sample_rate(double rate) { - std::cerr << "set_sample_rate start" << std::endl; - double diff = rate - _dev->fsHz; - _dev->fsHz = rate; + rate = std::min( std::max(rate,62.5e3), 10e6 ); + _fsHz = rate; - std::cerr << "rate = " << rate << std::endl; - std::cerr << "diff = " << diff << std::endl; - if (_running) - { - if (fabs(diff) < 10000.0) - { - std::cerr << "mir_sdr_SetFs started" << std::endl; - mir_sdr_SetFs(diff, 0, 0, 0); - } - else - { - std::cerr << "reinit_device started" << std::endl; - reinit_device(); + // Decimation is required for rates below 2MS/s + _decim = 1; + while (_fsHz < 2e6) { + _decim *= 2; + _fsHz *= 2; } - } - std::cerr << "set_sample_rate end" << std::endl; + + if (_streaming) + reinitDevice((int)mir_sdr_CHANGE_FS_FREQ); return get_sample_rate(); } double sdrplay_source_c::get_sample_rate() { - if (_running) - { - return _dev->fsHz; - } - -// return 0; - return _dev->fsHz; + return _fsHz/_decim; } osmosdr::freq_range_t sdrplay_source_c::get_freq_range( size_t chan ) { osmosdr::freq_range_t range; - - range += osmosdr::range_t( SDRPLAY_AM_MIN, SDRPLAY_AM_MAX ); /* LW/MW/SW (150 kHz - 30 MHz) */ - range += osmosdr::range_t( SDRPLAY_FM_MIN, SDRPLAY_FM_MAX ); /* VHF Band II (64 - 108 MHz) */ - range += osmosdr::range_t( SDRPLAY_B3_MIN, SDRPLAY_B3_MAX ); /* Band III (162 - 240 MHz) */ - range += osmosdr::range_t( SDRPLAY_B45_MIN, SDRPLAY_B45_MAX ); /* Band IV/V (470 - 960 MHz) */ - range += osmosdr::range_t( SDRPLAY_L_MIN, SDRPLAY_L_MAX ); /* L-Band (1450 - 1675 MHz) */ - + range += osmosdr::range_t(SDRPLAY_FREQ_MIN, SDRPLAY_FREQ_MAX); return range; } double sdrplay_source_c::set_center_freq( double freq, size_t chan ) { - std::cerr << "set_center_freq start" << std::endl; - std::cerr << "freq = " << freq << std::endl; - double diff = freq - _dev->rfHz; - std::cerr << "diff = " << diff << std::endl; - _dev->rfHz = freq; - set_gain_limits(freq); - if (_running) - { - if (fabs(diff) < 10000.0) - { - std::cerr << "mir_sdr_SetRf started" << std::endl; - mir_sdr_SetRf(diff, 0, 0); - } - else - { - std::cerr << "reinit_device started" << std::endl; - reinit_device(); - } + _rfHz = freq; + + if (_streaming) { + reinitDevice((int)mir_sdr_CHANGE_RF_FREQ); } - std::cerr << "set_center_freq end" << std::endl; return get_center_freq( chan ); } double sdrplay_source_c::get_center_freq( size_t chan ) { - if (_running) - { - return _dev->rfHz; - } - -// return 0; - return _dev->rfHz; + return _rfHz; } double sdrplay_source_c::set_freq_corr( double ppm, size_t chan ) @@ -408,7 +516,15 @@ std::vector<std::string> sdrplay_source_c::get_gain_names( size_t chan ) { std::vector< std::string > gains; - gains += "LNA_MIX_BB"; + gains += "LNA_ATTEN_STEP"; + gains += "IF_ATTEN_DB"; + + // RSP1A and RSP2 have broadcast notch filters, and RSP1A has a DAB + // notch filter. Show all controls for all models, mainly because + // gqrx gets confused when switching between sources with different + // sets of gains. + gains += "BCAST_NOTCH"; + gains += "DAB_NOTCH"; return gains; } @@ -417,32 +533,60 @@ osmosdr::gain_range_t sdrplay_source_c::get_gain_range( size_t chan ) { osmosdr::gain_range_t range; - for (int i = _dev->minGain; i < _dev->maxGain; i++) - { + for (int i = 20; i <= 59; i++) range += osmosdr::range_t( (float)i ); - } return range; } osmosdr::gain_range_t sdrplay_source_c::get_gain_range( const std::string & name, size_t chan ) { - return get_gain_range( chan ); + osmosdr::gain_range_t range; + int maxLnaState; + + if (name == "LNA_ATTEN_STEP") { + if (_hwVer == 2) + maxLnaState = 8; + else if (_hwVer == 255) + maxLnaState = 9; + else + maxLnaState = 3; + for (int i = 0; i <= maxLnaState; i++) + range += osmosdr::range_t((float)i); + } + // RSP1A, RSP2 + else if (name == "BCAST_NOTCH") { + range += osmosdr::range_t((float)0); + if (_hwVer == 2 || _hwVer == 255) + range += osmosdr::range_t((float)1); + } + // RSP1A + else if (name == "DAB_NOTCH") { + range += osmosdr::range_t((float)0); + if (_hwVer == 255) + range += osmosdr::range_t((float)1); + } + else { + for (int i = 20; i <= 59; i++) + range += osmosdr::range_t((float)i); + } + + return range; } bool sdrplay_source_c::set_gain_mode( bool automatic, size_t chan ) { - std::cerr << "set_gain_mode started" << std::endl; _auto_gain = automatic; - std::cerr << "automatic = " << automatic << std::endl; - if (automatic) - { - /* Start AGC */ - std::cerr << "AGC not yet implemented" << std::endl; + if (_streaming) { + if (automatic) { + mir_sdr_AgcControl(mir_sdr_AGC_5HZ, -30, 0, 0, 0, 0, checkLNA(_lna)); + } + else { + mir_sdr_AgcControl(mir_sdr_AGC_DISABLE, -30, 0, 0, 0, 0, checkLNA(_lna)); + } } - std::cerr << "set_gain_mode end" << std::endl; - return get_gain_mode(chan); + return _auto_gain; } bool sdrplay_source_c::get_gain_mode( size_t chan ) @@ -450,151 +594,216 @@ bool sdrplay_source_c::get_gain_mode( size_t chan ) return _auto_gain; } +int sdrplay_source_c::checkLNA(int lna) +{ + // Clip LNA reduction step. See table in API section 5.3. + if (_hwVer == 1) { + lna = std::min(3, lna); + } + else if (_hwVer == 255) { + if (_rfHz < 60000000) + lna = std::min(6, lna); + else if (_rfHz >= 1000000000) + lna = std::min(8, lna); + else + lna = std::min(9, lna); + } + else if (_hwVer == 2) { + if (_rfHz >= 420000000) + lna = std::min(5, lna); + else if (_rfHz < 60000000 && _antenna == "HIGHZ") + lna = std::min(4, lna); + else + lna = std::min(8, lna); + } + + return lna; +} + double sdrplay_source_c::set_gain( double gain, size_t chan ) { - std::cerr << "set_gain started" << std::endl; - _dev->gain_dB = gain; - std::cerr << "gain = " << gain << std::endl; - if (gain < _dev->minGain) + set_gain(gain, "IF_ATTEN_DB"); + return get_gain("IF_ATTEN_DB"); +} + +double sdrplay_source_c::set_gain(double gain, const std::string & name, size_t chan) { - _dev->gain_dB = _dev->minGain; + bool bcastNotchChanged = false; + bool dabNotchChanged = false; + bool gainChanged = false; + + if (name == "LNA_ATTEN_STEP") { + if (gain != _lna) + gainChanged = true; + _lna = int(gain); + } + else if (name == "IF_ATTEN_DB") { + // Ignore out-of-bounds values, since caller knows limits. (GQRX spurious calls). + if (gain >= 20.0 && gain <= 59.0 && gain != _gRdB) { + gainChanged = true; + _gRdB = int(gain); + } + } + // RSP1A, RSP2 + else if (name == "BCAST_NOTCH" && (_hwVer == 2 || _hwVer == 255)) { + if (int(gain) != _bcastNotch) + bcastNotchChanged = true; + _bcastNotch = int(gain); + } + // RSP1A + else if (name == "DAB_NOTCH" && _hwVer == 255) { + if (int(gain) != _dabNotch) + dabNotchChanged = true; + _dabNotch = int(gain); } - if (gain > _dev->maxGain) - { - _dev->gain_dB = _dev->maxGain; + + if (_streaming) { + if (gainChanged) + mir_sdr_RSP_SetGr(_gRdB, checkLNA(_lna), 1 /*absolute*/, 0 /*immediate*/); + + if (bcastNotchChanged) { + if (_hwVer == 255 ) { + mir_sdr_rsp1a_BroadcastNotch(_bcastNotch); } - _dev->gRdB = (int)(_dev->maxGain - gain); + else if (_hwVer == 2) { + mir_sdr_RSPII_RfNotchEnable(_bcastNotch); + } + } - if (_running) - { - std::cerr << "mir_sdr_SetGr started" << std::endl; - mir_sdr_SetGr(_dev->gRdB, 1, 0); + if (dabNotchChanged) { + mir_sdr_rsp1a_DabNotch(_dabNotch); + } } -std::cerr << "set_gain end" << std::endl; return get_gain( chan ); } -double sdrplay_source_c::set_gain( double gain, const std::string & name, size_t chan) -{ - return set_gain( gain, chan ); -} - double sdrplay_source_c::get_gain( size_t chan ) { - if ( _running ) - { - return _dev->gain_dB; - } - -// return 0; - return _dev->gain_dB; + return get_gain("IF_ATTEN_DB"); } double sdrplay_source_c::get_gain( const std::string & name, size_t chan ) { - return get_gain( chan ); + if (name == "LNA_ATTEN_STEP") + return _lna; + else if (name == "BCAST_NOTCH") + return _bcastNotch; + else if (name == "DAB_NOTCH") + return _dabNotch; + else if (name == "IF_ATTEN_DB") + return _gRdB; + else + return 0; } std::vector< std::string > sdrplay_source_c::get_antennas( size_t chan ) { std::vector< std::string > antennas; - antennas += get_antenna( chan ); + if (_hwVer == 2) { + antennas += "A"; + antennas += "B"; + antennas += "HIGHZ"; + } + else { + antennas += "RX"; + } return antennas; } std::string sdrplay_source_c::set_antenna( const std::string & antenna, size_t chan ) { - return get_antenna( chan ); + _antenna = antenna; + + if (_streaming) { + if (_hwVer == 2) { + // HIGHZ is ANTENNA_B with AmPortSelect + if (antenna == "HIGHZ") { + mir_sdr_RSPII_AntennaControl(mir_sdr_RSPII_ANTENNA_B); + mir_sdr_AmPortSelect(1); + } + else { + if (antenna == "A") + mir_sdr_RSPII_AntennaControl(mir_sdr_RSPII_ANTENNA_A); + else + mir_sdr_RSPII_AntennaControl(mir_sdr_RSPII_ANTENNA_B); + mir_sdr_AmPortSelect(0); + } + + reinitDevice((int)mir_sdr_CHANGE_AM_PORT); + } + } + + return antenna; } std::string sdrplay_source_c::get_antenna( size_t chan ) { - return "RX"; + return _antenna.c_str(); } void sdrplay_source_c::set_dc_offset_mode( int mode, size_t chan ) { - if ( osmosdr::source::DCOffsetOff == mode ) - { - _dev->dcMode = 0; - if (_running) - { - mir_sdr_SetDcMode(4, 1); - } - } - else if ( osmosdr::source::DCOffsetManual == mode ) - { - std::cerr << "Manual DC correction mode is not implemented." << std::endl; - _dev->dcMode = 0; - if (_running) - { - mir_sdr_SetDcMode(4, 1); - } - } - else if ( osmosdr::source::DCOffsetAutomatic == mode ) - { - _dev->dcMode = 1; - if (_running) - { + _dcMode = (osmosdr::source::DCOffsetAutomatic == mode); + + if (_dcMode) { mir_sdr_SetDcMode(4, 1); + mir_sdr_SetDcTrackTime(63); } - } + mir_sdr_DCoffsetIQimbalanceControl(_dcMode, _iqMode); } void sdrplay_source_c::set_dc_offset( const std::complex<double> &offset, size_t chan ) { - std::cerr << "Manual DC correction mode is not implemented." << std::endl; + std::cerr << "set_dc_offset(): not implemented" << std::endl; +} + +void sdrplay_source_c::set_iq_balance_mode(int mode, size_t chan) +{ + _iqMode = (osmosdr::source::IQBalanceAutomatic == mode); + + mir_sdr_DCoffsetIQimbalanceControl(_dcMode, _iqMode); } double sdrplay_source_c::set_bandwidth( double bandwidth, size_t chan ) { - if (bandwidth <= 200e3) _dev->bwType = mir_sdr_BW_0_200; - else if (bandwidth <= 300e3) _dev->bwType = mir_sdr_BW_0_300; - else if (bandwidth <= 600e3) _dev->bwType = mir_sdr_BW_0_600; - else if (bandwidth <= 1536e3) _dev->bwType = mir_sdr_BW_1_536; - else if (bandwidth <= 5000e3) _dev->bwType = mir_sdr_BW_5_000; - else if (bandwidth <= 6000e3) _dev->bwType = mir_sdr_BW_6_000; - else if (bandwidth <= 7000e3) _dev->bwType = mir_sdr_BW_7_000; - else _dev->bwType = mir_sdr_BW_8_000; + _bwType = mir_sdr_BW_8_000; - if (_running) - { - reinit_device(); + for (double bw : bandwidths) { + // Skip dummy value at index 0 + if (bw == 0) + continue; + if (bandwidth <= bw) { + _bwType = (mir_sdr_Bw_MHzT)(bw/1e3); + break; + } + } + + int actual = get_bandwidth(chan); + std::cerr << "SDRplay bandwidth requested=" << bandwidth + << " actual=" << actual << std::endl; + + if (_streaming) { + reinitDevice((int)mir_sdr_CHANGE_BW_TYPE); } - return get_bandwidth( chan ); + return actual; } double sdrplay_source_c::get_bandwidth( size_t chan ) { - double tmpbw=0.0f; - if (_dev->bwType == mir_sdr_BW_0_200) tmpbw = 200e3; - else if (_dev->bwType == mir_sdr_BW_0_300) tmpbw = 300e3; - else if (_dev->bwType == mir_sdr_BW_0_600) tmpbw = 600e3; - else if (_dev->bwType == mir_sdr_BW_1_536) tmpbw = 1536e3; - else if (_dev->bwType == mir_sdr_BW_5_000) tmpbw = 5000e3; - else if (_dev->bwType == mir_sdr_BW_6_000) tmpbw = 6000e3; - else if (_dev->bwType == mir_sdr_BW_7_000) tmpbw = 7000e3; - else tmpbw = 8000e3; - - return (double)tmpbw; + return (double)_bwType * 1e3; } osmosdr::freq_range_t sdrplay_source_c::get_bandwidth_range( size_t chan ) { osmosdr::freq_range_t range; - range += osmosdr::range_t( 200e3 ); - range += osmosdr::range_t( 300e3 ); - range += osmosdr::range_t( 600e3 ); - range += osmosdr::range_t( 1536e3 ); - range += osmosdr::range_t( 5000e3 ); - range += osmosdr::range_t( 6000e3 ); - range += osmosdr::range_t( 7000e3 ); - range += osmosdr::range_t( 8000e3 ); + // bandwidths[0] is a dummy + for (unsigned int i=1; i<bandwidths.size(); i++) + range += osmosdr::range_t(bandwidths[i]); return range; -} +} \ No newline at end of file diff --git a/lib/sdrplay/sdrplay_source_c.h b/lib/sdrplay/sdrplay_source_c.h index 2e4631e..35de63b 100644 --- a/lib/sdrplay/sdrplay_source_c.h +++ b/lib/sdrplay/sdrplay_source_c.h @@ -1,5 +1,7 @@ /* -*- c++ -*- */ /* + * Copyright 2018 Frank Werner-Krippendorf <mail(a)hb9fxq.ch> + * Copyright 2018 Jeff Long <willcode4(a)gmail.com> * Copyright 2015 SDRplay Ltd <support(a)sdrplay.com> * Copyright 2012 Dimitri Stolnikov <horiz0n(a)gmx.net> * @@ -22,17 +24,21 @@ #define INCLUDED_SDRPLAY_SOURCE_C_H #include <gnuradio/sync_block.h> - #include <gnuradio/thread/thread.h> -#include <boost/thread/mutex.hpp> -#include <boost/thread/condition_variable.hpp> #include "osmosdr/ranges.h" #include "source_iface.h" +#include <mirsdrapi-rsp.h> + class sdrplay_source_c; -typedef struct sdrplay_dev sdrplay_dev_t; + +template <typename T> +struct Range { + T min; + T max; +}; /* * We use boost::shared_ptr's instead of raw pointers for all access @@ -82,6 +88,9 @@ public: gr_vector_const_void_star &input_items, gr_vector_void_star &output_items ); + bool start( void ); + bool stop( void ); + static std::vector< std::string > get_devices(); size_t get_num_channels( void ); @@ -112,25 +121,58 @@ public: void set_dc_offset_mode( int mode, size_t chan = 0 ); void set_dc_offset( const std::complex<double> &offset, size_t chan = 0 ); + void set_iq_balance_mode( int mode, size_t chan = 0 ); double set_bandwidth( double bandwidth, size_t chan = 0 ); double get_bandwidth( size_t chan = 0 ); osmosdr::freq_range_t get_bandwidth_range( size_t chan = 0 ); private: - void reinit_device(void); - void set_gain_limits(double freq); - - sdrplay_dev_t *_dev; - - std::vector< short > _bufi; - std::vector< short > _bufq; - int _buf_offset; - boost::mutex _buf_mutex; + void startStreaming(void); + void stopStreaming(void); + void reallocateBuffers(int size, int num); + void reinitDevice(int reason); + int checkLNA(int lna); + void streamCallback(short *xi, short *xq, unsigned int firstSampleNum, + int grChanged, int rfChanged, int fsChanged, + unsigned int numSamples, unsigned int reset); + void gainChangeCallback(unsigned int gRdB, unsigned int lnaGRdB); + + static void streamCallbackWrap(short *xi, short *xq, unsigned int firstSampleNum, + int grChanged, int rfChanged, int fsChanged, + unsigned int numSamples, unsigned int reset, + unsigned int hwRemoved, void *cbContext); + static void gainChangeCallbackWrap(unsigned int gRdB, unsigned int lnaGRdB, void *cbContext); - bool _running; - bool _uninit; bool _auto_gain; + int _gain; + int _gRdB; + int _lna; + int _bcastNotch; + int _dabNotch; + double _fsHz; + int _decim; + double _rfHz; + mir_sdr_Bw_MHzT _bwType; + mir_sdr_If_kHzT _ifType; + mir_sdr_LoModeT _loMode; + int _samplesPerPacket; + bool _dcMode; + bool _iqMode; + unsigned char _hwVer; + unsigned int _devIndex; + std::string _antenna; + int _biasT; + + gr_complex *_buffer; + int _bufferOffset; + int _bufferSpaceRemaining; + boost::mutex _bufferMutex; + boost::condition_variable _bufferReady; // buffer is ready to move to other thread + + bool _streaming; + bool _flowgraphRunning; + bool _reinit; // signal streamer to return after a reinit }; #endif /* INCLUDED_SDRPLAY_SOURCE_C_H */

6 years, 11 months

[PATCH] Fix inline functions to use 'static inline'

by David Woodhouse

With just 'inline', if the compiler decides not to inline them, it isn't required to emit them at all. For some targets with -Os that is causing build failures. Perhaps we might consider using '__attribute__((always_inline))' for GCC builds, but 'static inline' is a good start. --- src/rtl_adsb.c | 8 ++++---- src/rtl_power.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/rtl_adsb.c b/src/rtl_adsb.c index 9087de4..7aea8dd 100644 --- a/src/rtl_adsb.c +++ b/src/rtl_adsb.c @@ -183,7 +183,7 @@ int magnitute(uint8_t *buf, int len) return len/2; } -inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d) +static inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d) /* takes 4 consecutive real samples, return 0 or 1, BADSAMPLE on error */ { int bit, bit_p; @@ -224,17 +224,17 @@ inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d return BADSAMPLE; } -inline uint16_t min16(uint16_t a, uint16_t b) +static inline uint16_t min16(uint16_t a, uint16_t b) { return a<b ? a : b; } -inline uint16_t max16(uint16_t a, uint16_t b) +static inline uint16_t max16(uint16_t a, uint16_t b) { return a>b ? a : b; } -inline int preamble(uint16_t *buf, int i) +static inline int preamble(uint16_t *buf, int i) /* returns 0/1 for preamble at index i */ { int i2; diff --git a/src/rtl_power.c b/src/rtl_power.c index 00f4d9f..625d818 100644 --- a/src/rtl_power.c +++ b/src/rtl_power.c @@ -250,7 +250,7 @@ void sine_table(int size) } } -inline int16_t FIX_MPY(int16_t a, int16_t b) +static inline int16_t FIX_MPY(int16_t a, int16_t b) /* fixed point multiply and scale */ { int c = ((int)a * (int)b) >> 14; -- 2.17.1

6 years, 11 months

[PATCH] CMake: Replace deprecated qt5_use_modules macro

by Martin Hauke

qt5_use_modules has been marked as deprecated since a while and is finally removed in Qt 5.11 Change-Id: I5ac81b654d248028bccf48ba0cfd0c11ff9409e1 --- CMakeLists.txt | 14 ++++++++------ plugins/channel/nfm/CMakeLists.txt | 6 ++++-- plugins/channel/tcpsrc/CMakeLists.txt | 6 ++++-- plugins/channel/tetra/CMakeLists.txt | 6 ++++-- plugins/samplesource/gnuradio/CMakeLists.txt | 6 ++++-- plugins/samplesource/osmosdr/CMakeLists.txt | 6 ++++-- plugins/samplesource/rtlsdr/CMakeLists.txt | 6 ++++-- 7 files changed, 32 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 72ce30e..b5a264b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.9) +cmake_minimum_required(VERSION 2.8.11) list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules) project(sdrangelove) @@ -14,7 +14,7 @@ set(CMAKE_AUTOMOC ON) find_package(Qt5Core 5.0 REQUIRED) find_package(Qt5Widgets 5.0 REQUIRED) find_package(Qt5Multimedia 5.0 REQUIRED) -#find_package(QT5OpenGL 5.0 REQUIRED) +find_package(Qt5OpenGL 5.0 REQUIRED) find_package(OpenGL REQUIRED) find_package(PkgConfig) @@ -245,6 +245,10 @@ add_library(sdrbase SHARED ) target_link_libraries(sdrbase + Qt5::Core + Qt5::Widgets + Qt5::OpenGL + Qt5::Multimedia ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${LIBUSB_LIBRARIES} @@ -260,8 +264,6 @@ endif(LIBFFTS_FOUND) set_target_properties(sdrbase PROPERTIES DEFINE_SYMBOL "sdrangelove_EXPORTS") -qt5_use_modules(sdrbase Core Widgets OpenGL Multimedia) - include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/include @@ -304,6 +306,8 @@ add_executable(sdrangelove target_link_libraries(sdrangelove sdrbase + Qt5::Widgets + Qt5::Multimedia ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ) @@ -317,8 +321,6 @@ if(WIN32) set_target_properties(sdrangelove PROPERTIES LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:windows /ENTRY:mainCRTStartup") endif(WIN32) -qt5_use_modules(sdrangelove Widgets Multimedia) - ############################################################################## add_subdirectory(plugins) diff --git a/plugins/channel/nfm/CMakeLists.txt b/plugins/channel/nfm/CMakeLists.txt index feeb891..a39931e 100644 --- a/plugins/channel/nfm/CMakeLists.txt +++ b/plugins/channel/nfm/CMakeLists.txt @@ -39,9 +39,11 @@ add_library(demodnfm SHARED ) target_link_libraries(demodnfm + Qt5::Core + Qt5::Widgets + Qt5::OpenGL + Qt5::Network ${QT_LIBRARIES} ${OPENGL_LIBRARIES} sdrbase ) - -qt5_use_modules(demodnfm Core Widgets OpenGL Multimedia) \ No newline at end of file diff --git a/plugins/channel/tcpsrc/CMakeLists.txt b/plugins/channel/tcpsrc/CMakeLists.txt index df7c4d4..86d8426 100644 --- a/plugins/channel/tcpsrc/CMakeLists.txt +++ b/plugins/channel/tcpsrc/CMakeLists.txt @@ -39,9 +39,11 @@ add_library(demodtcpsrc SHARED ) target_link_libraries(demodtcpsrc + Qt5::Core + Qt5::Widgets + Qt5::OpenGL + Qt5::Network ${QT_LIBRARIES} ${OPENGL_LIBRARIES} sdrbase ) - -qt5_use_modules(demodtcpsrc Core Widgets OpenGL Network) diff --git a/plugins/channel/tetra/CMakeLists.txt b/plugins/channel/tetra/CMakeLists.txt index f46c2bb..9da7aa4 100644 --- a/plugins/channel/tetra/CMakeLists.txt +++ b/plugins/channel/tetra/CMakeLists.txt @@ -39,9 +39,11 @@ add_library(demodtetra SHARED ) target_link_libraries(demodtetra + Qt5::Core + Qt5::Widgets + Qt5::OpenGL + Qt5::Network ${QT_LIBRARIES} ${OPENGL_LIBRARIES} sdrbase ) - -qt5_use_modules(demodtetra Core Widgets OpenGL Multimedia) diff --git a/plugins/samplesource/gnuradio/CMakeLists.txt b/plugins/samplesource/gnuradio/CMakeLists.txt index 0e08608..c5c3300 100644 --- a/plugins/samplesource/gnuradio/CMakeLists.txt +++ b/plugins/samplesource/gnuradio/CMakeLists.txt @@ -75,6 +75,10 @@ add_library(inputgnuradio SHARED ) target_link_libraries(inputgnuradio + Qt5::Core + Qt5::Widgets + Qt5::OpenGL + Qt5::Network ${QT_LIBRARIES} ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES} @@ -82,6 +86,4 @@ target_link_libraries(inputgnuradio sdrbase ) -qt5_use_modules(inputgnuradio Core Widgets OpenGL Multimedia) - endif(Boost_FOUND AND GNURADIO_RUNTIME_FOUND AND GNURADIO_OSMOSDR_FOUND) diff --git a/plugins/samplesource/osmosdr/CMakeLists.txt b/plugins/samplesource/osmosdr/CMakeLists.txt index 9dc9705..10f3cc9 100644 --- a/plugins/samplesource/osmosdr/CMakeLists.txt +++ b/plugins/samplesource/osmosdr/CMakeLists.txt @@ -45,10 +45,12 @@ add_library(inputosmosdr SHARED ) target_link_libraries(inputosmosdr + Qt5::Core + Qt5::Widgets + Qt5::OpenGL + Qt5::Network ${QT_LIBRARIES} ${LIBOSMOSDR_LIBRARIES} ${LIBUSB_LIBRARIES} sdrbase ) - -qt5_use_modules(inputosmosdr Core Widgets OpenGL Multimedia) diff --git a/plugins/samplesource/rtlsdr/CMakeLists.txt b/plugins/samplesource/rtlsdr/CMakeLists.txt index 35c4081..fa9a53a 100644 --- a/plugins/samplesource/rtlsdr/CMakeLists.txt +++ b/plugins/samplesource/rtlsdr/CMakeLists.txt @@ -41,10 +41,12 @@ add_library(inputrtlsdr SHARED ) target_link_libraries(inputrtlsdr + Qt5::Core + Qt5::Widgets + Qt5::OpenGL + Qt5::Network ${QT_LIBRARIES} ${LIBRTLSDR_LIBRARIES} ${LIBUSB_LIBRARIES} sdrbase ) - -qt5_use_modules(inputrtlsdr Core Widgets OpenGL Multimedia) -- 2.13.7

6 years, 11 months

SpyServer support on gr-osmosdr

by Lucas Teske

Hi all, So I decided to add support for SpyServer in gr-osmosdr. It is currently at a fork of mirrored in github: https://github.com/racerxdl/gr-osmosdr What should be my next steps to get this to the official branch? -- Lucas Teske Teske Virtual System GPG: BD29 7EF3 4CCB EB61 B790 06C3 351A 8000 DEAD CE11 GPG: 4A90 974B ACE0 A9A6 AF09 B3B1 6C39 C1C1 6A9D A7BE GPG: BD09 9175 6DE8 37F4 08D3 B296 DE7A 51C3 87C9 27EE

7 years

[patch] fix compilation with boost 1.67

by Maxime Vincent

Hi everyone @ gr-osmosdr, I have created a small pull request to fix compilation with boost-1.67. I filed it on your github mirror, but am not sure that's the way to make a contribution. It's available here: https://github.com/osmocom/gr-osmosdr/pull/13 I'll also include the patch here for completeness: diff -ura gr-osmosdr.orig/lib/CMakeLists.txt gr-osmosdr/lib/CMakeLists.txt --- gr-osmosdr.orig/lib/CMakeLists.txt 2018-06-10 12:06:35.662484236 +0200 +++ gr-osmosdr/lib/CMakeLists.txt 2018-06-10 12:06:51.886207437 +0200 @@ -43,6 +43,8 @@ time_spec.cc ) +list(APPEND Boost_LIBRARIES pthread) + GR_OSMOSDR_APPEND_LIBS( ${Boost_LIBRARIES} ${GNURADIO_ALL_LIBRARIES} Cheers, Maxime

7 years

Re: Usability of i2c of fl2k?

by Steve Markgraf

Hi Torben, I'm replying with the mailing-list in Cc, as this might also be interesting for others. As mentioned earlier, the issue is that the FL2000 has a very inflexible I2C implementation that was only intended (I guess?) for I2C EEPROMs. The PCF8574 you want to use is much simpler, as it expects only one data byte after being addressed. If you can live with only 6 of the 8 outputs on your port expander, you might still be able to get it working. What the FL2000 does for an I2C write is the following: START, I2C_ADDR(W), REG_ADDR, DATA[0], STOP START, I2C_ADDR(W), REG_ADDR+1, DATA[1], STOP START, I2C_ADDR(W), REG_ADDR+2, DATA[2], STOP START, I2C_ADDR(W), REG_ADDR+3, DATA[3], STOP As you can see, REG_ADDR is the first byte of data that is being sent to the device after the address. This is where you need to put the data you want to set on the IO expander outputs. As the FL2000 auto-increments the register address, you need to set the lowest 2 bits to 0, so that the increment is not carried to the higher bits. But that also means that output 0 and 1 of your port-expander will toggle with each write and are not controllable by you. >From the datasheet of the PCF8574: "If other data bytes are sent from the master, following the acknowledge, they are ignored by this device." That means that DATA[0-3] are completely ignored, which probably means that the device will send a NAK for that byte. So the transfer always will fail from the view of the FL2000, so you must ignore the return value of fl2k_i2c_write(), which means you also have no feedback if the slave is actually present or not. The first thing I would suggest trying is writing a non-zero reg_addr to all possible slave addresses and observe the output of the port expander. If you have a logic analyzer, I suggest to use that and have a look at the I2C bus. If all that doesn't work, using a small MCU and dealing with the FL2000 I2C oddities there is probably the easiest solution. Regards, Steve On 17.06.2018 21:11, Torben Keil wrote: > Hi Steve, > > I tried my luck with i2c... but I wasn't successful. > There's a PCF8574 (Portextender) connected directly on the I2C interface > of fl2k. > > Here's my code: > > torben@Mworkstation: <mailto:torben@Mworkstation:>~/Amateurfunk/C++$ cat > fl2k_i2c.cpp > // g++ fl2k_i2c.cpp -L/home/torben/Amateurfunk/osmo-fl2k/build/src > -I/home/torben/Amateurfunk/osmo-fl2k/include -losmo-fl2k -o fl2k-i2c_test > #include "osmo-fl2k.h" > #include <iostream> > #include <bitset> > > int main (int argc, char *argv[] ) { > int status; > fl2k_dev_t *dev = NULL; > uint8_t i2c_addr = 0b01000001; // Letztes Bit: Read / #Write > uint8_t reg_addr = 0; > uint8_t *data = new uint8_t[10]; > uint32_t dev_index = 0; > > fl2k_open(&dev, (uint32_t)dev_index); > if (NULL == dev) { > std::cerr << "Failed to open fl2k device " << dev_index > << std::endl; > return -1; > } > > for (i2c_addr=0; i2c_addr<128; i2c_addr++) { > status = fl2k_i2c_read(dev, i2c_addr, reg_addr, data); > if( status >= 0 ) { > std::cout << "Adress: " << i2c_addr; > std::cout << "; I2C-Status: " << status << "; Data: "; > for( int i=0; i<static_cast<int>(status); i++) { > std::cout << " " << std::bitset<8>(data[i]); > } > std::cout << std::endl; > > } > > > data[0]=127; > for (i2c_addr=0; i2c_addr<128; i2c_addr++) { > //fl2k_i2c_write(fl2k_dev_t *dev, uint8_t i2c_addr, uint8_t > reg_addr, uint8_t *data); > status = fl2k_i2c_write(dev, i2c_addr, 0, data); > if( status >= 0 ) { > std::cout << "Write Adress: " << i2c_addr; > std::cout << "; I2C-Status: " << status << std::endl; > } else { > std::cout << static_cast<int>(i2c_addr) << "\t"; > } > } > } > > fl2k_close(dev); > > free(data); > > return 0; > > } > > Output of that program after a fresh reboot of the system: > torben@Mworkstation:~/Amateurfunk/C++$ ./fl2k-i2c_test > Kernel mass storage driver is attached, detaching driver. This may take > more than 10 seconds! > 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 > 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 > 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 > 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 > 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 > 117 118 119 120 121 122 123 124 125 126 127 > > So there's nothing reachable via I2C. > > What am I doing wrong here? > > > Greetings, > Torben > > > > Am 17.06.2018 03:18, schrieb Steve Markgraf: >> Hi Torben, >> >> On 16.06.2018 09:40, Torben Keil wrote: >>> do you have a git repository for the code so that I could have a try? >> >> I've debugged and cleaned up the I2C code and just pushed it. >> I2C transfers with the FL2000 seem to fail from time to time, so make >> sure to check the return code of fl2k_i2c_read()/fl2k_i2c_write(). >> >> Regards, >> Steve

7 years

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

osmocom-sdr June 2018