forked from sdr/gr-osmosdr
soapy - check for freq corr before invoking
set_freq_corr() is often a NOP for devices. checking avoids crashes for some applications (ex GQRX)
This commit is contained in:
parent
5ecfa255d2
commit
a9e536f45b
|
@ -29,6 +29,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
#include <algorithm> //find
|
||||||
|
|
||||||
#include <boost/assign.hpp>
|
#include <boost/assign.hpp>
|
||||||
#include <boost/format.hpp>
|
#include <boost/format.hpp>
|
||||||
|
@ -163,13 +164,22 @@ double soapy_sink_c::get_center_freq( size_t chan)
|
||||||
|
|
||||||
double soapy_sink_c::set_freq_corr( double ppm, size_t chan)
|
double soapy_sink_c::set_freq_corr( double ppm, size_t chan)
|
||||||
{
|
{
|
||||||
_device->setFrequency(SOAPY_SDR_TX, chan, "CORR", ppm);
|
std::vector<std::string> components = _device->listFrequencies(SOAPY_SDR_TX, chan);
|
||||||
|
if (std::find(components.begin(), components.end(), "COOR") != components.end())
|
||||||
|
{
|
||||||
|
_device->setFrequency(SOAPY_SDR_TX, chan, "CORR", ppm);
|
||||||
|
}
|
||||||
return this->get_freq_corr(chan);
|
return this->get_freq_corr(chan);
|
||||||
}
|
}
|
||||||
|
|
||||||
double soapy_sink_c::get_freq_corr( size_t chan)
|
double soapy_sink_c::get_freq_corr( size_t chan)
|
||||||
{
|
{
|
||||||
return _device->getFrequency(SOAPY_SDR_TX, chan, "CORR");
|
std::vector<std::string> components = _device->listFrequencies(SOAPY_SDR_TX, chan);
|
||||||
|
if (std::find(components.begin(), components.end(), "COOR") != components.end())
|
||||||
|
{
|
||||||
|
return _device->getFrequency(SOAPY_SDR_TX, chan, "CORR");
|
||||||
|
}
|
||||||
|
return 0.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<std::string> soapy_sink_c::get_gain_names( size_t chan)
|
std::vector<std::string> soapy_sink_c::get_gain_names( size_t chan)
|
||||||
|
|
|
@ -29,6 +29,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
#include <algorithm> //find
|
||||||
|
|
||||||
#include <boost/assign.hpp>
|
#include <boost/assign.hpp>
|
||||||
#include <boost/format.hpp>
|
#include <boost/format.hpp>
|
||||||
|
@ -164,13 +165,22 @@ double soapy_source_c::get_center_freq( size_t chan )
|
||||||
|
|
||||||
double soapy_source_c::set_freq_corr( double ppm, size_t chan )
|
double soapy_source_c::set_freq_corr( double ppm, size_t chan )
|
||||||
{
|
{
|
||||||
_device->setFrequency(SOAPY_SDR_RX, chan, "CORR", ppm);
|
std::vector<std::string> components = _device->listFrequencies(SOAPY_SDR_RX, chan);
|
||||||
|
if (std::find(components.begin(), components.end(), "COOR") != components.end())
|
||||||
|
{
|
||||||
|
_device->setFrequency(SOAPY_SDR_RX, chan, "CORR", ppm);
|
||||||
|
}
|
||||||
return this->get_freq_corr(chan);
|
return this->get_freq_corr(chan);
|
||||||
}
|
}
|
||||||
|
|
||||||
double soapy_source_c::get_freq_corr( size_t chan )
|
double soapy_source_c::get_freq_corr( size_t chan )
|
||||||
{
|
{
|
||||||
return _device->getFrequency(SOAPY_SDR_RX, chan, "CORR");
|
std::vector<std::string> components = _device->listFrequencies(SOAPY_SDR_RX, chan);
|
||||||
|
if (std::find(components.begin(), components.end(), "COOR") != components.end())
|
||||||
|
{
|
||||||
|
return _device->getFrequency(SOAPY_SDR_RX, chan, "CORR");
|
||||||
|
}
|
||||||
|
return 0.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<std::string> soapy_source_c::get_gain_names( size_t chan )
|
std::vector<std::string> soapy_source_c::get_gain_names( size_t chan )
|
||||||
|
|
Loading…
Reference in New Issue