soapy: filled in the source and sink implementation

soapy_support
Josh Blum 8 years ago
parent 3afcb7e04f
commit 6d6a483cfb
  1. 11
      lib/arg_helpers.h
  2. 194
      lib/soapy/soapy_sink_c.cc
  3. 12
      lib/soapy/soapy_sink_c.h
  4. 153
      lib/soapy/soapy_source_c.cc
  5. 12
      lib/soapy/soapy_source_c.h

@ -34,6 +34,17 @@
typedef std::map< std::string, std::string > dict_t;
typedef std::pair< std::string, std::string > pair_t;
inline std::string dict_to_args_string( const dict_t &d )
{
std::string out;
BOOST_FOREACH(const pair_t pair, d)
{
if (not out.empty()) out += ", ";
out += pair.first + "='" + pair.second + "'";
}
return out;
}
inline std::vector< std::string > args_to_vector( const std::string &args )
{
std::vector< std::string > result;

@ -38,9 +38,16 @@
#include "arg_helpers.h"
#include "soapy_sink_c.h"
#include <SoapySDR/Device.hpp>
using namespace boost::assign;
boost::mutex &get_soapy_maker_mutex(void)
{
static boost::mutex m;
return m;
}
/*
* Create a new instance of soapy_sink_c and return
* a boost shared_ptr. This is effectively the public constructor.
@ -55,239 +62,318 @@ soapy_sink_c_sptr make_soapy_sink_c (const std::string &args)
*/
soapy_sink_c::soapy_sink_c (const std::string &args)
: gr::sync_block ("soapy_sink_c",
gr::io_signature::make (1, 8, sizeof (gr_complex)),
gr::io_signature::make (0, 0, sizeof (gr_complex)))
args_to_io_signature(args),
gr::io_signature::make (0, 0, 0))
{
{
boost::mutex::scoped_lock l(get_soapy_maker_mutex());
_device = SoapySDR::Device::make(params_to_dict(args));
}
size_t num_chan = std::max(1, args_to_io_signature(args)->max_streams());
std::vector<size_t> channels;
for (size_t i = 0; i < num_chan; i++) channels.push_back(i);
_stream = _device->setupStream(SOAPY_SDR_TX, "CF32", channels);
}
soapy_sink_c::~soapy_sink_c(void)
{
_device->closeStream(_stream);
boost::mutex::scoped_lock l(get_soapy_maker_mutex());
SoapySDR::Device::unmake(_device);
}
bool soapy_sink_c::start()
{
try
{
_device->activateStream(_stream);
}
catch (const std::exception &ex)
{
std::cerr << "soapy_sink_c::start(): " << ex.what() << std::endl;
return false;
}
return true;
}
bool soapy_sink_c::stop()
{
try
{
_device->deactivateStream(_stream);
}
catch (const std::exception &ex)
{
std::cerr << "soapy_sink_c::stop(): " << ex.what() << std::endl;
return false;
}
return true;
}
int soapy_sink_c::work( int noutput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items )
{
int flags = 0;
long long timeNs = 0;
int ret = _device->writeStream(
_stream, &input_items[0],
noutput_items, flags, timeNs);
if (ret < 0) return 0; //call again
return ret;
}
std::vector<std::string> soapy_sink_c::get_devices()
{
std::vector<std::string> result;
BOOST_FOREACH(const SoapySDR::Kwargs &kw, SoapySDR::Device::enumerate())
{
result.push_back(dict_to_args_string(kw));
}
return result;
}
size_t soapy_sink_c::get_num_channels( void )
{
return _device->getNumChannels(SOAPY_SDR_TX);
}
osmosdr::meta_range_t soapy_sink_c::get_sample_rates( void )
{
osmosdr::meta_range_t result;
BOOST_FOREACH(const double rate, _device->listSampleRates(SOAPY_SDR_TX, 0))
{
result.push_back(osmosdr::range_t(rate));
}
return result;
}
double soapy_sink_c::set_sample_rate( double rate )
{
_device->setSampleRate(SOAPY_SDR_TX, 0, rate);
return this->get_sample_rate();
}
double soapy_sink_c::get_sample_rate( void )
{
return _device->getSampleRate(SOAPY_SDR_TX, 0);
}
osmosdr::freq_range_t soapy_sink_c::get_freq_range( size_t chan)
{
osmosdr::meta_range_t result;
BOOST_FOREACH(const SoapySDR::Range r, _device->getFrequencyRange(SOAPY_SDR_TX, 0))
{
result.push_back(osmosdr::range_t(r.minimum(), r.maximum()));
}
return result;
}
double soapy_sink_c::set_center_freq( double freq, size_t chan)
{
_device->setFrequency(SOAPY_SDR_TX, chan, freq);
return this->get_center_freq(chan);
}
double soapy_sink_c::get_center_freq( size_t chan)
{
return _device->getFrequency(SOAPY_SDR_TX, chan);
}
double soapy_sink_c::set_freq_corr( double ppm, size_t chan)
{
SoapySDR::Kwargs kw;
kw["CORR"] = boost::lexical_cast<std::string>(ppm);
_device->setFrequency(SOAPY_SDR_TX, chan, this->get_center_freq(chan), kw);
return this->get_freq_corr(chan);
}
double soapy_sink_c::get_freq_corr( size_t chan)
{
return _device->getFrequency(SOAPY_SDR_TX, chan, "CORR");
}
std::vector<std::string> soapy_sink_c::get_gain_names( size_t chan)
{
return _device->listGains(SOAPY_SDR_TX, chan);
}
osmosdr::gain_range_t soapy_sink_c::get_gain_range( size_t chan)
{
SoapySDR::Range r = _device->getGainRange(SOAPY_SDR_TX, chan);
return osmosdr::gain_range_t(r.minimum(), r.maximum());
}
osmosdr::gain_range_t soapy_sink_c::get_gain_range( const std::string & name,
size_t chan)
{
SoapySDR::Range r = _device->getGainRange(SOAPY_SDR_TX, chan, name);
return osmosdr::gain_range_t(r.minimum(), r.maximum());
}
bool soapy_sink_c::set_gain_mode( bool automatic, size_t chan)
{
_device->setGainMode(SOAPY_SDR_TX, chan, automatic);
return this->get_gain_mode(chan);
}
bool soapy_sink_c::get_gain_mode( size_t chan)
{
return _device->getGainMode(SOAPY_SDR_TX, chan);
}
double soapy_sink_c::set_gain( double gain, size_t chan)
{
_device->setGain(SOAPY_SDR_TX, chan, gain);
return this->get_gain(chan);
}
double soapy_sink_c::set_gain( double gain,
const std::string & name,
size_t chan)
{
_device->setGain(SOAPY_SDR_TX, chan, name, gain);
return this->get_gain(name, chan);
}
double soapy_sink_c::get_gain( size_t chan)
{
return _device->getGain(SOAPY_SDR_TX, chan);
}
double soapy_sink_c::get_gain( const std::string & name, size_t chan)
{
return _device->getGain(SOAPY_SDR_TX, chan, name);
}
double soapy_sink_c::set_if_gain( double gain, size_t chan)
{
//assumes if gain is the last one listed
const std::string name = this->get_gain_names(chan).back();
return this->set_gain(gain, name, chan);
}
double soapy_sink_c::set_bb_gain( double gain, size_t chan)
{
//assumes bb gain is the first one listed
const std::string name = this->get_gain_names(chan).front();
return this->set_gain(gain, name, chan);
}
std::vector< std::string > soapy_sink_c::get_antennas( size_t chan)
{
return _device->listAntennas(SOAPY_SDR_TX, chan);
}
std::string soapy_sink_c::set_antenna( const std::string & antenna,
size_t chan)
{
_device->setAntenna(SOAPY_SDR_TX, chan, antenna);
return this->get_antenna(chan);
}
std::string soapy_sink_c::get_antenna( size_t chan)
{
return _device->getAntenna(SOAPY_SDR_TX, chan);
}
void soapy_sink_c::set_dc_offset( const std::complex<double> &offset, size_t chan)
{
_device->setDCOffset(SOAPY_SDR_TX, chan, offset);
}
void soapy_sink_c::set_iq_balance( const std::complex<double> &balance, size_t chan)
{
_device->setIQBalance(SOAPY_SDR_TX, chan, balance);
}
double soapy_sink_c::set_bandwidth( double bandwidth, size_t chan)
{
_device->setBandwidth(SOAPY_SDR_TX, chan, bandwidth);
return this->get_bandwidth(chan);
}
double soapy_sink_c::get_bandwidth( size_t chan)
{
return _device->getBandwidth(SOAPY_SDR_TX, chan);
}
osmosdr::freq_range_t soapy_sink_c::get_bandwidth_range( size_t chan)
{
osmosdr::meta_range_t result;
BOOST_FOREACH(const double bw, _device->listBandwidths(SOAPY_SDR_TX, 0))
{
result.push_back(osmosdr::range_t(bw));
}
return result;
}
void soapy_sink_c::set_time_source(const std::string &source,
const size_t mboard)
const size_t)
{
_device->setTimeSource(source);
}
std::string soapy_sink_c::get_time_source(const size_t mboard)
std::string soapy_sink_c::get_time_source(const size_t)
{
return _device->getTimeSource();
}
std::vector<std::string> soapy_sink_c::get_time_sources(const size_t mboard)
std::vector<std::string> soapy_sink_c::get_time_sources(const size_t)
{
return _device->listTimeSources();
}
void soapy_sink_c::set_clock_source(const std::string &source,
const size_t mboard)
const size_t)
{
_device->setClockSource(source);
}
std::string soapy_sink_c::get_clock_source(const size_t mboard)
std::string soapy_sink_c::get_clock_source(const size_t)
{
return _device->getClockSource();
}
std::vector<std::string> soapy_sink_c::get_clock_sources(const size_t mboard)
std::vector<std::string> soapy_sink_c::get_clock_sources(const size_t)
{
return _device->listClockSources();
}
double soapy_sink_c::get_clock_rate(size_t mboard)
double soapy_sink_c::get_clock_rate(size_t)
{
return _device->getMasterClockRate();
}
void soapy_sink_c::set_clock_rate(double rate, size_t mboard)
void soapy_sink_c::set_clock_rate(double rate, size_t)
{
_device->setMasterClockRate(rate);
}
::osmosdr::time_spec_t soapy_sink_c::get_time_now(size_t mboard)
::osmosdr::time_spec_t soapy_sink_c::get_time_now(size_t)
{
return ::osmosdr::time_spec_t::from_ticks(_device->getHardwareTime(), 1e6);
}
::osmosdr::time_spec_t soapy_sink_c::get_time_last_pps(size_t mboard)
::osmosdr::time_spec_t soapy_sink_c::get_time_last_pps(size_t)
{
return ::osmosdr::time_spec_t::from_ticks(_device->getHardwareTime("PPS"), 1e6);
}
void soapy_sink_c::set_time_now(const ::osmosdr::time_spec_t &time_spec,
size_t mboard)
size_t)
{
_device->setHardwareTime(time_spec.to_ticks(1e9));
}
void soapy_sink_c::set_time_next_pps(const ::osmosdr::time_spec_t &time_spec)
{
_device->setHardwareTime(time_spec.to_ticks(1e9), "PPS");
}
void soapy_sink_c::set_time_unknown_pps(const ::osmosdr::time_spec_t &time_spec)
{
_device->setHardwareTime(time_spec.to_ticks(1e9), "UNKNOWN_PPS");
}

@ -29,6 +29,12 @@
class soapy_sink_c;
namespace SoapySDR
{
class Device;
class Stream;
}
/*
* We use boost::shared_ptr's instead of raw pointers for all access
* to gr_blocks (and many other data structures). The shared_ptr gets
@ -62,6 +68,8 @@ private:
soapy_sink_c (const std::string & args); // private constructor
~soapy_sink_c(void);
public:
bool start();
bool stop();
@ -120,6 +128,10 @@ void set_time_now(const ::osmosdr::time_spec_t &time_spec,
size_t mboard);
void set_time_next_pps(const ::osmosdr::time_spec_t &time_spec);
void set_time_unknown_pps(const ::osmosdr::time_spec_t &time_spec);
private:
SoapySDR::Device *_device;
SoapySDR::Stream *_stream;
};
#endif /* INCLUDED_SOAPY_SINK_C_H */

@ -38,9 +38,12 @@
#include "arg_helpers.h"
#include "soapy_source_c.h"
#include <SoapySDR/Device.hpp>
using namespace boost::assign;
boost::mutex &get_soapy_maker_mutex(void);
/*
* Create a new instance of soapy_source_c and return
* a boost shared_ptr. This is effectively the public constructor.
@ -55,205 +58,327 @@ soapy_source_c_sptr make_soapy_source_c (const std::string &args)
*/
soapy_source_c::soapy_source_c (const std::string &args)
: gr::sync_block ("soapy_source_c",
gr::io_signature::make (0, 0, sizeof (gr_complex)),
gr::io_signature::make (1, 8, sizeof (gr_complex)))
gr::io_signature::make (0, 0, 0),
args_to_io_signature(args))
{
{
boost::mutex::scoped_lock l(get_soapy_maker_mutex());
_device = SoapySDR::Device::make(params_to_dict(args));
}
size_t num_chan = std::max(1, args_to_io_signature(args)->max_streams());
std::vector<size_t> channels;
for (size_t i = 0; i < num_chan; i++) channels.push_back(i);
_stream = _device->setupStream(SOAPY_SDR_RX, "CF32", channels);
}
soapy_source_c::~soapy_source_c(void)
{
_device->closeStream(_stream);
boost::mutex::scoped_lock l(get_soapy_maker_mutex());
SoapySDR::Device::unmake(_device);
}
bool soapy_source_c::start()
{
try
{
_device->activateStream(_stream);
}
catch (const std::exception &ex)
{
std::cerr << "soapy_source_c::start(): " << ex.what() << std::endl;
return false;
}
return true;
}
bool soapy_source_c::stop()
{
try
{
_device->deactivateStream(_stream);
}
catch (const std::exception &ex)
{
std::cerr << "soapy_source_c::stop(): " << ex.what() << std::endl;
return false;
}
return true;
}
int soapy_source_c::work( int noutput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items )
{
int flags = 0;
long long timeNs = 0;
int ret = _device->readStream(
_stream, &output_items[0],
noutput_items, flags, timeNs);
if (ret < 0) return 0; //call again
return ret;
}
std::vector<std::string> soapy_source_c::get_devices()
{
std::vector<std::string> result;
BOOST_FOREACH(const SoapySDR::Kwargs &kw, SoapySDR::Device::enumerate())
{
result.push_back(dict_to_args_string(kw));
}
return result;
}
size_t soapy_source_c::get_num_channels( void )
{
return _device->getNumChannels(SOAPY_SDR_RX);
}
osmosdr::meta_range_t soapy_source_c::get_sample_rates( void )
{
osmosdr::meta_range_t result;
BOOST_FOREACH(const double rate, _device->listSampleRates(SOAPY_SDR_RX, 0))
{
result.push_back(osmosdr::range_t(rate));
}
return result;
}
double soapy_source_c::set_sample_rate( double rate )
{
_device->setSampleRate(SOAPY_SDR_RX, 0, rate);
return this->get_sample_rate();
}
double soapy_source_c::get_sample_rate( void )
{
return _device->getSampleRate(SOAPY_SDR_RX, 0);
}
osmosdr::freq_range_t soapy_source_c::get_freq_range( size_t chan )
{
osmosdr::meta_range_t result;
BOOST_FOREACH(const SoapySDR::Range r, _device->getFrequencyRange(SOAPY_SDR_RX, 0))
{
result.push_back(osmosdr::range_t(r.minimum(), r.maximum()));
}
return result;
}
double soapy_source_c::set_center_freq( double freq, size_t chan )
{
_device->setFrequency(SOAPY_SDR_RX, chan, freq);
return this->get_center_freq(chan);
}
double soapy_source_c::get_center_freq( size_t chan )
{
return _device->getFrequency(SOAPY_SDR_RX, chan);
}
double soapy_source_c::set_freq_corr( double ppm, size_t chan )
{
SoapySDR::Kwargs kw;
kw["CORR"] = boost::lexical_cast<std::string>(ppm);
_device->setFrequency(SOAPY_SDR_RX, chan, this->get_center_freq(chan), kw);
return this->get_freq_corr(chan);
}
double soapy_source_c::get_freq_corr( size_t chan )
{
return _device->getFrequency(SOAPY_SDR_RX, chan, "CORR");
}
std::vector<std::string> soapy_source_c::get_gain_names( size_t chan )
{
return _device->listGains(SOAPY_SDR_RX, chan);
}
osmosdr::gain_range_t soapy_source_c::get_gain_range( size_t chan )
{
SoapySDR::Range r = _device->getGainRange(SOAPY_SDR_RX, chan);
return osmosdr::gain_range_t(r.minimum(), r.maximum());
}
osmosdr::gain_range_t soapy_source_c::get_gain_range( const std::string & name,
size_t chan )
{
SoapySDR::Range r = _device->getGainRange(SOAPY_SDR_RX, chan, name);
return osmosdr::gain_range_t(r.minimum(), r.maximum());
}
bool soapy_source_c::set_gain_mode( bool automatic, size_t chan )
{
_device->setGainMode(SOAPY_SDR_RX, chan, automatic);
return this->get_gain_mode(chan);
}
bool soapy_source_c::get_gain_mode( size_t chan )
{
return _device->getGainMode(SOAPY_SDR_RX, chan);
}
double soapy_source_c::set_gain( double gain, size_t chan )
{
_device->setGain(SOAPY_SDR_RX, chan, gain);
return this->get_gain(chan);
}
double soapy_source_c::set_gain( double gain,
const std::string & name,
size_t chan )
{
_device->setGain(SOAPY_SDR_RX, chan, name, gain);
return this->get_gain(name, chan);
}
double soapy_source_c::get_gain( size_t chan )
{
return _device->getGain(SOAPY_SDR_RX, chan);
}
double soapy_source_c::soapy_source_c::get_gain( const std::string & name, size_t chan )
double soapy_source_c::get_gain( const std::string & name, size_t chan )
{
return _device->getGain(SOAPY_SDR_RX, chan, name);
}
double soapy_source_c::set_if_gain( double gain, size_t chan )
{
//assumes if gain is the last one listed
const std::string name = this->get_gain_names(chan).back();
return this->set_gain(gain, name, chan);
}
double soapy_source_c::set_bb_gain( double gain, size_t chan )
{
//assumes bb gain is the first one listed
const std::string name = this->get_gain_names(chan).front();
return this->set_gain(gain, name, chan);
}
std::vector< std::string > soapy_source_c::get_antennas( size_t chan )
{
return _device->listAntennas(SOAPY_SDR_RX, chan);
}
std::string soapy_source_c::set_antenna( const std::string & antenna,
size_t chan )
{
_device->setAntenna(SOAPY_SDR_RX, chan, antenna);
return this->get_antenna(chan);
}
std::string soapy_source_c::get_antenna( size_t chan )
{
return _device->getAntenna(SOAPY_SDR_RX, chan);
}
void soapy_source_c::set_dc_offset_mode( int mode, size_t chan )
{
_device->setDCOffsetMode(SOAPY_SDR_RX, chan, mode);
}
void soapy_source_c::set_dc_offset( const std::complex<double> &offset, size_t chan )
{
_device->setDCOffset(SOAPY_SDR_RX, chan, offset);
}
void soapy_source_c::set_iq_balance_mode( int mode, size_t chan )
{
throw std::runtime_error("soapy_source_c::set_iq_balance_mode() not supported");
}
void soapy_source_c::set_iq_balance( const std::complex<double> &balance, size_t chan )
{
_device->setIQBalance(SOAPY_SDR_RX, chan, balance);
}
double soapy_source_c::set_bandwidth( double bandwidth, size_t chan )
{
_device->setBandwidth(SOAPY_SDR_RX, chan, bandwidth);
return this->get_bandwidth(chan);
}
double soapy_source_c::get_bandwidth( size_t chan )
{
return _device->getBandwidth(SOAPY_SDR_RX, chan);
}
osmosdr::freq_range_t soapy_source_c::get_bandwidth_range( size_t chan )
{
osmosdr::meta_range_t result;
BOOST_FOREACH(const double bw, _device->listBandwidths(SOAPY_SDR_RX, 0))
{
result.push_back(osmosdr::range_t(bw));
}
return result;
}
void soapy_source_c::set_time_source(const std::string &source,
const size_t mboard)
const size_t)
{
_device->setTimeSource(source);
}
std::string soapy_source_c::get_time_source(const size_t mboard)
std::string soapy_source_c::get_time_source(const size_t)
{
return _device->getTimeSource();
}
std::vector<std::string> soapy_source_c::get_time_sources(const size_t mboard)
std::vector<std::string> soapy_source_c::get_time_sources(const size_t)
{
return _device->listTimeSources();
}
void soapy_source_c::set_clock_source(const std::string &source,
const size_t mboard)
const size_t)
{
_device->setClockSource(source);
}
std::string soapy_source_c::get_clock_source(const size_t mboard)
std::string soapy_source_c::get_clock_source(const size_t)
{
return _device->getClockSource();
}
std::vector<std::string> soapy_source_c::get_clock_sources(const size_t mboard)
std::vector<std::string> soapy_source_c::get_clock_sources(const size_t)
{
return _device->listClockSources();
}
double soapy_source_c::get_clock_rate(size_t mboard)
double soapy_source_c::get_clock_rate(size_t)
{
return _device->getMasterClockRate();
}
void soapy_source_c::set_clock_rate(double rate, size_t mboard)
void soapy_source_c::set_clock_rate(double rate, size_t)
{
_device->setMasterClockRate(rate);
}
::osmosdr::time_spec_t soapy_source_c::get_time_now(size_t mboard)
::osmosdr::time_spec_t soapy_source_c::get_time_now(size_t)
{
return ::osmosdr::time_spec_t::from_ticks(_device->getHardwareTime(), 1e6);
}
::osmosdr::time_spec_t soapy_source_c::get_time_last_pps(size_t mboard)
::osmosdr::time_spec_t soapy_source_c::get_time_last_pps(size_t)
{
return ::osmosdr::time_spec_t::from_ticks(_device->getHardwareTime("PPS"), 1e6);
}
void soapy_source_c::set_time_now(const ::osmosdr::time_spec_t &time_spec,
size_t mboard)
size_t)
{
_device->setHardwareTime(time_spec.to_ticks(1e9));
}
void soapy_source_c::set_time_next_pps(const ::osmosdr::time_spec_t &time_spec)
{
_device->setHardwareTime(time_spec.to_ticks(1e9), "PPS");
}
void soapy_source_c::set_time_unknown_pps(const ::osmosdr::time_spec_t &time_spec)
{
_device->setHardwareTime(time_spec.to_ticks(1e9), "UNKNOWN_PPS");
}

@ -29,6 +29,12 @@
class soapy_source_c;
namespace SoapySDR
{
class Device;
class Stream;
}
/*
* We use boost::shared_ptr's instead of raw pointers for all access
* to gr_blocks (and many other data structures). The shared_ptr gets
@ -62,6 +68,8 @@ private:
soapy_source_c (const std::string & args); // private constructor
~soapy_source_c(void);
public:
bool start();
bool stop();
@ -122,6 +130,10 @@ void set_time_now(const ::osmosdr::time_spec_t &time_spec,
size_t mboard);
void set_time_next_pps(const ::osmosdr::time_spec_t &time_spec);
void set_time_unknown_pps(const ::osmosdr::time_spec_t &time_spec);
private:
SoapySDR::Device *_device;
SoapySDR::Stream *_stream;
};
#endif /* INCLUDED_SOAPY_SOURCE_C_H */

Loading…
Cancel
Save