From c99693eacca9d7e511b4dc04763f70dd1060e09b Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 14 Mar 2018 11:03:22 +0100 Subject: [PATCH] LimeSDR: removed useless step information from range inspection functions --- .../samplesink/limesdroutput/limesdroutput.cpp | 15 ++++++--------- plugins/samplesink/limesdroutput/limesdroutput.h | 6 +++--- .../samplesink/limesdroutput/limesdroutputgui.cpp | 8 ++++---- .../samplesource/limesdrinput/limesdrinput.cpp | 15 ++++++--------- plugins/samplesource/limesdrinput/limesdrinput.h | 6 +++--- .../samplesource/limesdrinput/limesdrinputgui.cpp | 8 ++++---- 6 files changed, 26 insertions(+), 32 deletions(-) diff --git a/plugins/samplesink/limesdroutput/limesdroutput.cpp b/plugins/samplesink/limesdroutput/limesdroutput.cpp index 6650f3618..b4151d43e 100644 --- a/plugins/samplesink/limesdroutput/limesdroutput.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutput.cpp @@ -462,31 +462,28 @@ std::size_t LimeSDROutput::getChannelIndex() return m_deviceShared.m_channel; } -void LimeSDROutput::getLORange(float& minF, float& maxF, float& stepF) const +void LimeSDROutput::getLORange(float& minF, float& maxF) const { lms_range_t range = m_deviceShared.m_deviceParams->m_loRangeTx; minF = range.min; maxF = range.max; - stepF = range.step; - qDebug("LimeSDROutput::getLORange: min: %f max: %f step: %f", range.min, range.max, range.step); + qDebug("LimeSDROutput::getLORange: min: %f max: %f", range.min, range.max); } -void LimeSDROutput::getSRRange(float& minF, float& maxF, float& stepF) const +void LimeSDROutput::getSRRange(float& minF, float& maxF) const { lms_range_t range = m_deviceShared.m_deviceParams->m_srRangeTx; minF = range.min; maxF = range.max; - stepF = range.step; - qDebug("LimeSDROutput::getSRRange: min: %f max: %f step: %f", range.min, range.max, range.step); + qDebug("LimeSDROutput::getSRRange: min: %f max: %f", range.min, range.max); } -void LimeSDROutput::getLPRange(float& minF, float& maxF, float& stepF) const +void LimeSDROutput::getLPRange(float& minF, float& maxF) const { lms_range_t range = m_deviceShared.m_deviceParams->m_lpfRangeTx; minF = range.min; maxF = range.max; - stepF = range.step; - qDebug("LimeSDROutput::getLPRange: min: %f max: %f step: %f", range.min, range.max, range.step); + qDebug("LimeSDROutput::getLPRange: min: %f max: %f", range.min, range.max); } uint32_t LimeSDROutput::getHWLog2Interp() const diff --git a/plugins/samplesink/limesdroutput/limesdroutput.h b/plugins/samplesink/limesdroutput/limesdroutput.h index 7c064b924..e51d58675 100644 --- a/plugins/samplesink/limesdroutput/limesdroutput.h +++ b/plugins/samplesink/limesdroutput/limesdroutput.h @@ -217,9 +217,9 @@ public: QString& errorMessage); std::size_t getChannelIndex(); - void getLORange(float& minF, float& maxF, float& stepF) const; - void getSRRange(float& minF, float& maxF, float& stepF) const; - void getLPRange(float& minF, float& maxF, float& stepF) const; + void getLORange(float& minF, float& maxF) const; + void getSRRange(float& minF, float& maxF) const; + void getLPRange(float& minF, float& maxF) const; uint32_t getHWLog2Interp() const; private: diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp index b2c20c87f..de4515204 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp @@ -42,17 +42,17 @@ LimeSDROutputGUI::LimeSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) : ui->setupUi(this); - float minF, maxF, stepF; + float minF, maxF; - m_limeSDROutput->getLORange(minF, maxF, stepF); + m_limeSDROutput->getLORange(minF, maxF); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); ui->centerFrequency->setValueRange(7, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz - m_limeSDROutput->getSRRange(minF, maxF, stepF); + m_limeSDROutput->getSRRange(minF, maxF); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); ui->sampleRate->setValueRange(8, (uint32_t) minF, (uint32_t) maxF); - m_limeSDROutput->getLPRange(minF, maxF, stepF); + m_limeSDROutput->getLPRange(minF, maxF); ui->lpf->setColorMapper(ColorMapper(ColorMapper::GrayYellow)); ui->lpf->setValueRange(6, (minF/1000)+1, maxF/1000); diff --git a/plugins/samplesource/limesdrinput/limesdrinput.cpp b/plugins/samplesource/limesdrinput/limesdrinput.cpp index da15bf064..b5e6f2457 100644 --- a/plugins/samplesource/limesdrinput/limesdrinput.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinput.cpp @@ -481,31 +481,28 @@ std::size_t LimeSDRInput::getChannelIndex() return m_deviceShared.m_channel; } -void LimeSDRInput::getLORange(float& minF, float& maxF, float& stepF) const +void LimeSDRInput::getLORange(float& minF, float& maxF) const { lms_range_t range = m_deviceShared.m_deviceParams->m_loRangeRx; minF = range.min; maxF = range.max; - stepF = range.step; - qDebug("LimeSDRInput::getLORange: min: %f max: %f step: %f", range.min, range.max, range.step); + qDebug("LimeSDRInput::getLORange: min: %f max: %f", range.min, range.max); } -void LimeSDRInput::getSRRange(float& minF, float& maxF, float& stepF) const +void LimeSDRInput::getSRRange(float& minF, float& maxF) const { lms_range_t range = m_deviceShared.m_deviceParams->m_srRangeRx; minF = range.min; maxF = range.max; - stepF = range.step; - qDebug("LimeSDRInput::getSRRange: min: %f max: %f step: %f", range.min, range.max, range.step); + qDebug("LimeSDRInput::getSRRange: min: %f max: %f", range.min, range.max); } -void LimeSDRInput::getLPRange(float& minF, float& maxF, float& stepF) const +void LimeSDRInput::getLPRange(float& minF, float& maxF) const { lms_range_t range = m_deviceShared.m_deviceParams->m_lpfRangeRx; minF = range.min; maxF = range.max; - stepF = range.step; - qDebug("LimeSDRInput::getLPRange: min: %f max: %f step: %f", range.min, range.max, range.step); + qDebug("LimeSDRInput::getLPRange: min: %f max: %f", range.min, range.max); } uint32_t LimeSDRInput::getHWLog2Decim() const diff --git a/plugins/samplesource/limesdrinput/limesdrinput.h b/plugins/samplesource/limesdrinput/limesdrinput.h index 398e8496f..629a5f131 100644 --- a/plugins/samplesource/limesdrinput/limesdrinput.h +++ b/plugins/samplesource/limesdrinput/limesdrinput.h @@ -238,9 +238,9 @@ public: QString& errorMessage); std::size_t getChannelIndex(); - void getLORange(float& minF, float& maxF, float& stepF) const; - void getSRRange(float& minF, float& maxF, float& stepF) const; - void getLPRange(float& minF, float& maxF, float& stepF) const; + void getLORange(float& minF, float& maxF) const; + void getSRRange(float& minF, float& maxF) const; + void getLPRange(float& minF, float& maxF) const; uint32_t getHWLog2Decim() const; private: diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp index d8385b32b..a4bec47d2 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp @@ -45,17 +45,17 @@ LimeSDRInputGUI::LimeSDRInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : ui->setupUi(this); - float minF, maxF, stepF; + float minF, maxF; - m_limeSDRInput->getLORange(minF, maxF, stepF); + m_limeSDRInput->getLORange(minF, maxF); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); ui->centerFrequency->setValueRange(7, ((uint32_t) minF)/1000, ((uint32_t) maxF)/1000); // frequency dial is in kHz - m_limeSDRInput->getSRRange(minF, maxF, stepF); + m_limeSDRInput->getSRRange(minF, maxF); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); ui->sampleRate->setValueRange(8, (uint32_t) minF, (uint32_t) maxF); - m_limeSDRInput->getLPRange(minF, maxF, stepF); + m_limeSDRInput->getLPRange(minF, maxF); ui->lpf->setColorMapper(ColorMapper(ColorMapper::GrayYellow)); ui->lpf->setValueRange(6, (minF/1000)+1, maxF/1000);