Merge branch 'master' into rig_control

This commit is contained in:
Charles J. Cliffe 2016-01-04 00:56:39 -05:00
commit cb3c899a52
1 changed files with 4 additions and 4 deletions

View File

@ -245,10 +245,10 @@ void SDRThread::updateSettings() {
freq_changed.store(false);
}
double devFreq = device->getFrequency(SOAPY_SDR_RX,0);
if (((long long)devFreq + offset.load()) != frequency.load()) {
wxGetApp().setFrequency((long long)devFreq + offset.load());
}
// double devFreq = device->getFrequency(SOAPY_SDR_RX,0);
// if (((long long)devFreq + offset.load()) != frequency.load()) {
// wxGetApp().setFrequency((long long)devFreq + offset.load());
// }
if (agc_mode_changed.load()) {
SDRDeviceInfo *devInfo = deviceInfo.load();