Merge branch 'drahosj-master'

This commit is contained in:
Charles J. Cliffe 2019-03-14 21:02:52 -04:00
commit ea016e6638

View File

@ -128,8 +128,10 @@ bool SDRThread::init() {
} else { } else {
hasHardwareDC.store(false); hasHardwareDC.store(false);
} }
device->setGainMode(SOAPY_SDR_RX,0,agc_mode.load()); if (device->hasGainMode(SOAPY_SDR_RX, 0)) {
device->setGainMode(SOAPY_SDR_RX, 0, agc_mode.load());
}
numChannels.store(getOptimalChannelCount(sampleRate.load())); numChannels.store(getOptimalChannelCount(sampleRate.load()));
numElems.store(getOptimalElementCount(sampleRate.load(), TARGET_DISPLAY_FPS)); numElems.store(getOptimalElementCount(sampleRate.load(), TARGET_DISPLAY_FPS));
@ -504,7 +506,9 @@ void SDRThread::updateSettings() {
// } // }
if (agc_mode_changed.load()) { if (agc_mode_changed.load()) {
device->setGainMode(SOAPY_SDR_RX, 0, agc_mode.load()); if (device->hasGainMode(SOAPY_SDR_RX, 0)) {
device->setGainMode(SOAPY_SDR_RX, 0, agc_mode.load());
}
agc_mode_changed.store(false); agc_mode_changed.store(false);
if (!agc_mode.load()) { if (!agc_mode.load()) {
updateGains(); updateGains();