From 457c8733650ef9b41bff8dabe032ed19354c73e6 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 13 Apr 2019 21:20:22 +0200 Subject: [PATCH] HackRF input: implemented baseband or device sample rate input option --- .../hackrfinput/hackrfinputgui.cpp | 87 +++++++++++++++---- .../samplesource/hackrfinput/hackrfinputgui.h | 4 + .../hackrfinput/hackrfinputgui.ui | 25 ++++-- 3 files changed, 93 insertions(+), 23 deletions(-) diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp index 6ecb6be6c..553e2a377 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp @@ -40,6 +40,7 @@ HackRFInputGui::HackRFInputGui(DeviceUISet *deviceUISet, QWidget* parent) : ui(new Ui::HackRFInputGui), m_deviceUISet(deviceUISet), m_settings(), + m_sampleRateMode(true), m_forceSettings(true), m_doApplySettings(true), m_sampleSource(NULL), @@ -193,7 +194,48 @@ void HackRFInputGui::updateSampleRateAndFrequency() { m_deviceUISet->getSpectrum()->setSampleRate(m_sampleRate); m_deviceUISet->getSpectrum()->setCenterFrequency(m_deviceCenterFrequency); - ui->deviceRateText->setText(QString("%1k").arg(QString::number(m_sampleRate/1000.0, 'g', 5))); + displaySampleRate(); +} + +void HackRFInputGui::displaySampleRate() +{ + ui->sampleRate->blockSignals(true); + displayFcTooltip(); + + if (m_sampleRateMode) + { + ui->sampleRateMode->setStyleSheet("QToolButton { background:rgb(60,60,60); }"); + ui->sampleRateMode->setText("SR"); + ui->sampleRate->setValueRange(8, 1000000U, 20000000U); + ui->sampleRate->setValue(m_settings.m_devSampleRate); + ui->sampleRate->setToolTip("Device to host sample rate (S/s)"); + ui->deviceRateText->setToolTip("Baseband sample rate (S/s)"); + uint32_t basebandSampleRate = m_settings.m_devSampleRate/(1<deviceRateText->setText(tr("%1k").arg(QString::number(basebandSampleRate / 1000.0f, 'g', 5))); + } + else + { + ui->sampleRateMode->setStyleSheet("QToolButton { background:rgb(50,50,50); }"); + ui->sampleRateMode->setText("BB"); + ui->sampleRate->setValueRange(8, 1000000U/(1<sampleRate->setValue(m_settings.m_devSampleRate/(1<sampleRate->setToolTip("Baseband sample rate (S/s)"); + ui->deviceRateText->setToolTip("Device to host sample rate (S/s)"); + ui->deviceRateText->setText(tr("%1k").arg(QString::number(m_settings.m_devSampleRate / 1000.0f, 'g', 5))); + } + + ui->sampleRate->blockSignals(false); +} + +void HackRFInputGui::displayFcTooltip() +{ + int32_t fShift = DeviceSampleSource::calculateFrequencyShift( + m_settings.m_log2Decim, + (DeviceSampleSource::fcPos_t) m_settings.m_fcPos, + m_settings.m_devSampleRate, + DeviceSampleSource::FrequencyShiftScheme::FSHIFT_STD + ); + ui->fcPos->setToolTip(tr("Relative position of device center frequency: %1 kHz").arg(QString::number(fShift / 1000.0f, 'g', 5))); } void HackRFInputGui::displaySettings() @@ -208,7 +250,7 @@ void HackRFInputGui::displaySettings() ui->dcOffset->setChecked(m_settings.m_dcBlock); ui->iqImbalance->setChecked(m_settings.m_iqCorrection); - ui->sampleRate->setValue(m_settings.m_devSampleRate); + displaySampleRate(); ui->biasT->setChecked(m_settings.m_biasT); @@ -304,30 +346,39 @@ void HackRFInputGui::on_centerFrequency_changed(quint64 value) void HackRFInputGui::on_sampleRate_changed(quint64 value) { - m_settings.m_devSampleRate = value; + if (m_sampleRateMode) { + m_settings.m_devSampleRate = value; + } else { + m_settings.m_devSampleRate = value * (1 << m_settings.m_log2Decim); + } + + displayFcTooltip(); sendSettings(); } void HackRFInputGui::on_decim_currentIndexChanged(int index) { - if ((index <0) || (index > 6)) + if ((index <0) || (index > 6)) { return; + } + m_settings.m_log2Decim = index; - sendSettings(); + displaySampleRate(); + + if (m_sampleRateMode) { + m_settings.m_devSampleRate = ui->sampleRate->getValueNew(); + } else { + m_settings.m_devSampleRate = ui->sampleRate->getValueNew() * (1 << m_settings.m_log2Decim); + } + + sendSettings(); } void HackRFInputGui::on_fcPos_currentIndexChanged(int index) { - if (index == 0) { - m_settings.m_fcPos = HackRFInputSettings::FC_POS_INFRA; - sendSettings(); - } else if (index == 1) { - m_settings.m_fcPos = HackRFInputSettings::FC_POS_SUPRA; - sendSettings(); - } else if (index == 2) { - m_settings.m_fcPos = HackRFInputSettings::FC_POS_CENTER; - sendSettings(); - } + m_settings.m_fcPos = (HackRFInputSettings::fcPos_t) (index < 0 ? 0 : index > 2 ? 2 : index); + displayFcTooltip(); + sendSettings(); } void HackRFInputGui::on_lna_valueChanged(int value) @@ -371,6 +422,12 @@ void HackRFInputGui::on_record_toggled(bool checked) m_sampleSource->getInputMessageQueue()->push(message); } +void HackRFInputGui::on_sampleRateMode_toggled(bool checked) +{ + m_sampleRateMode = checked; + displaySampleRate(); +} + void HackRFInputGui::updateHardware() { if (m_doApplySettings) diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.h b/plugins/samplesource/hackrfinput/hackrfinputgui.h index 83c42cb1d..4bcdf34cc 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputgui.h +++ b/plugins/samplesource/hackrfinput/hackrfinputgui.h @@ -66,6 +66,7 @@ private: DeviceUISet* m_deviceUISet; HackRFInputSettings m_settings; + bool m_sampleRateMode; //!< true: device, false: base band sample rate update mode bool m_forceSettings; bool m_doApplySettings; QTimer m_updateTimer; @@ -77,6 +78,8 @@ private: MessageQueue m_inputMessageQueue; void displaySettings(); + void displaySampleRate(); + void displayFcTooltip(); void displayBandwidths(); void sendSettings(); void updateSampleRateAndFrequency(); @@ -98,6 +101,7 @@ private slots: void on_vga_valueChanged(int value); void on_startStop_toggled(bool checked); void on_record_toggled(bool checked); + void on_sampleRateMode_toggled(bool checked); void updateHardware(); void updateStatus(); void openDeviceSettingsDialog(const QPoint& p); diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.ui b/plugins/samplesource/hackrfinput/hackrfinputgui.ui index 87c0524c3..747ac1cda 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputgui.ui +++ b/plugins/samplesource/hackrfinput/hackrfinputgui.ui @@ -307,22 +307,31 @@ 2 - - - - 0 - 0 - - + - 16 + 24 0 + + + 24 + 16777215 + + + + Toggle between device to host (SR) and base band (BB) sample rate input + SR + + true + + + true +