From 92856056cf440cfd60dd1feaaa5f1169105a081a Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 15 Sep 2019 13:31:37 +0200 Subject: [PATCH] BladeRF, HackRF: minor fixes --- plugins/samplesink/bladerf2output/bladerf2outputthread.cpp | 2 +- plugins/samplesink/hackrfoutput/hackrfoutput.cpp | 2 +- plugins/samplesource/bladerf2input/bladerf2input.cpp | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/plugins/samplesink/bladerf2output/bladerf2outputthread.cpp b/plugins/samplesink/bladerf2output/bladerf2outputthread.cpp index d76758ca2..9578ef974 100644 --- a/plugins/samplesink/bladerf2output/bladerf2outputthread.cpp +++ b/plugins/samplesink/bladerf2output/bladerf2outputthread.cpp @@ -183,7 +183,7 @@ void BladeRF2OutputThread::callbackMO(qint16* buf, qint32 samplesPerChannel) if (status < 0) { - qCritical("BladeRF2OutputThread::callbackMI: cannot interleave buffer: %s", bladerf_strerror(status)); + qCritical("BladeRF2OutputThread::callbackMO: cannot interleave buffer: %s", bladerf_strerror(status)); return; } } diff --git a/plugins/samplesink/hackrfoutput/hackrfoutput.cpp b/plugins/samplesink/hackrfoutput/hackrfoutput.cpp index 03b62c644..0b5cc37f3 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutput.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutput.cpp @@ -440,7 +440,7 @@ bool HackRFOutput::applySettings(const HackRFOutputSettings& settings, bool forc settings.m_log2Interp, (DeviceSampleSink::fcPos_t) settings.m_fcPos, settings.m_devSampleRate, - m_settings.m_transverterMode); + settings.m_transverterMode); setDeviceCenterFrequency(deviceCenterFrequency, settings.m_LOppmTenths); if (m_deviceAPI->getSourceBuddies().size() > 0) diff --git a/plugins/samplesource/bladerf2input/bladerf2input.cpp b/plugins/samplesource/bladerf2input/bladerf2input.cpp index 45bebf88d..0c6d6fb4e 100644 --- a/plugins/samplesource/bladerf2input/bladerf2input.cpp +++ b/plugins/samplesource/bladerf2input/bladerf2input.cpp @@ -874,9 +874,6 @@ bool BladeRF2Input::applySettings(const BladeRF2InputSettings& settings, bool fo if ((m_settings.m_LOppmTenths != settings.m_LOppmTenths) || force) { reverseAPIKeys.append("LOppmTenths"); } - if ((m_settings.m_devSampleRate != settings.m_devSampleRate) || force) { - reverseAPIKeys.append("devSampleRate"); - } if ((m_settings.m_centerFrequency != settings.m_centerFrequency) || (m_settings.m_transverterMode != settings.m_transverterMode) @@ -941,9 +938,6 @@ bool BladeRF2Input::applySettings(const BladeRF2InputSettings& settings, bool fo if ((m_settings.m_globalGain != settings.m_globalGain) || force) { reverseAPIKeys.append("globalGain"); } - if ((m_settings.m_gainMode != settings.m_gainMode) || force) { - reverseAPIKeys.append("gainMode"); - } if ((m_settings.m_globalGain != settings.m_globalGain) || ((m_settings.m_gainMode != settings.m_gainMode) && (settings.m_gainMode == BLADERF_GAIN_MANUAL)) || force)