comicsansg/CubicSDR
comicsansg
/
CubicSDR
mirror of https://github.com/cjcliffe/CubicSDR.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Limit frequency CORR changes to rtlsdr and rtl drivers

This commit is contained in:
Charles J. Cliffe 2015-09-26 01:41:30 -04:00
parent fc068bff7a
commit 404632f373
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/sdr/SoapySDRThread.cpp
View File

@ -139,14 +139,23 @@ void SDRThread::run() {
long long frequency = wxGetApp().getConfig()->getCenterFreq();
int ppm = devConfig->getPPM();
int direct_sampling_mode = devConfig->getDirectSampling();;
int direct_sampling_mode = devConfig->getDirectSampling();
int numElems = 0;
bool hasPPM = false;
offset.store(devConfig->getOffset());
wxGetApp().setSwapIQ(devConfig->getIQSwap());
SDRDeviceInfo *dev = devs[deviceId];
SoapySDR::Kwargs args = dev->getDeviceArgs();
std::string driverName = dev->getDriver();
if (driverName == "rtl" || driverName == "rtlsdr") {
hasPPM = true;
}
args["direct_samp"] = std::to_string(devConfig->getDirectSampling());
args["buffers"] = "6";
args["buflen"] = "16384";
@ -154,7 +163,9 @@ void SDRThread::run() {
device->setSampleRate(SOAPY_SDR_RX,0,sampleRate.load());
device->setFrequency(SOAPY_SDR_RX,0,"RF",frequency - offset.load());
device->setFrequency(SOAPY_SDR_RX,0,"CORR",ppm);
if (hasPPM) {
device->setFrequency(SOAPY_SDR_RX,0,"CORR",ppm);
}
device->setGainMode(SOAPY_SDR_RX,0,true);
SoapySDR::Stream *stream = device->setupStream(SOAPY_SDR_RX,"CF32");
@ -246,7 +257,9 @@ void SDRThread::run() {
device->setSampleRate(SOAPY_SDR_RX,0,sampleRate.load());
device->setFrequency(SOAPY_SDR_RX,0,"RF",frequency - offset.load());
device->setFrequency(SOAPY_SDR_RX,0,"CORR",ppm);
if (hasPPM) {
device->setFrequency(SOAPY_SDR_RX,0,"CORR",ppm);
}
device->setGainMode(SOAPY_SDR_RX,0, true);
SoapySDR::Stream *stream = device->setupStream(SOAPY_SDR_RX,"CF32");
@ -272,7 +285,7 @@ void SDRThread::run() {
frequency = new_freq;
device->setFrequency(SOAPY_SDR_RX,0,"RF",frequency - offset.load());
}
if (ppm_changed) {
if (ppm_changed && hasPPM) {
ppm = new_ppm;
device->setFrequency(SOAPY_SDR_RX,0,"CORR",ppm);
}