diff --git a/doc/img/LimeSDROutput_plugin.png b/doc/img/LimeSDROutput_plugin.png index e3dcb8f37..de0e357ff 100644 Binary files a/doc/img/LimeSDROutput_plugin.png and b/doc/img/LimeSDROutput_plugin.png differ diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp index 937a93b42..50363c05d 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp @@ -248,6 +248,17 @@ void LimeSDROutputGUI::updateSampleRateAndFrequency() ui->deviceRateLabel->setText(tr("%1k").arg(QString::number(m_sampleRate / 1000.0f, 'g', 5))); } +void LimeSDROutputGUI::updateDACRate() +{ + uint32_t dacRate = m_settings.m_devSampleRate * (1<dacRateLabel->setText(tr("%1k").arg(QString::number(dacRate / 1000.0f, 'g', 5))); + } else { + ui->dacRateLabel->setText(tr("%1M").arg(QString::number(dacRate / 1000000.0f, 'g', 5))); + } +} + void LimeSDROutputGUI::displaySettings() { ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000); @@ -256,6 +267,8 @@ void LimeSDROutputGUI::displaySettings() ui->hwInterp->setCurrentIndex(m_settings.m_log2HardInterp); ui->swInterp->setCurrentIndex(m_settings.m_log2SoftInterp); + updateDACRate(); + ui->lpf->setValue(m_settings.m_lpfBW / 1000); ui->lpFIREnable->setChecked(m_settings.m_lpfFIREnable); @@ -404,6 +417,7 @@ void LimeSDROutputGUI::on_ncoReset_clicked(bool checked __attribute__((unused))) void LimeSDROutputGUI::on_sampleRate_changed(quint64 value) { m_settings.m_devSampleRate = value; + updateDACRate(); setNCODisplay(); sendSettings();} @@ -412,6 +426,7 @@ void LimeSDROutputGUI::on_hwInterp_currentIndexChanged(int index) if ((index <0) || (index > 5)) return; m_settings.m_log2HardInterp = index; + updateDACRate(); setNCODisplay(); sendSettings(); } diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.h b/plugins/samplesink/limesdroutput/limesdroutputgui.h index b5ab08244..0f61cd343 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.h +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.h @@ -69,6 +69,7 @@ private: void setNCODisplay(); void sendSettings(); void updateSampleRateAndFrequency(); + void updateDACRate(); void blockApplySettings(bool block); private slots: diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.ui b/plugins/samplesink/limesdroutput/limesdroutputgui.ui index f0255ed9f..c5d84b101 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.ui +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.ui @@ -53,9 +53,9 @@ 2 - + - + @@ -74,11 +74,17 @@ - + - + + + + 54 + 0 + + - I/Q sample rate kS/s + DAC rate after hardware upsampling (k or MS/s) 00000k @@ -137,43 +143,61 @@ - - - kHz - - - - - - - Qt::Horizontal - - - - 0 - 0 - - - - - - - - - 20 - 0 - - - - Channel number - - - #0 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + + + + + + + kHz + + + + + + + + 20 + 0 + + + + Channel number + + + #0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + 54 + 0 + + + + Baseband I/Q sample rate kS/s + + + 00000k + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + diff --git a/plugins/samplesink/limesdroutput/readme.md b/plugins/samplesink/limesdroutput/readme.md index 8b6f03fbe..ef28ba422 100644 --- a/plugins/samplesink/limesdroutput/readme.md +++ b/plugins/samplesink/limesdroutput/readme.md @@ -41,14 +41,22 @@ Device start / stop button. - Green square icon: device is running and can be stopped - Magenta (or pink) square icon: an error occured. In the case the device was accidentally disconnected you may click on the icon to stop, plug back in, check the source on the sampling devices control panel and start again. -

2: Baseband sample rate

+

2A: DAC sample rate

-This is the baseband sample rate in kS/s before interpolation (9) to produce the final stream that is sent to the LimeSDR device. Thus this is the device sample rate (10) divided by the interpolation factor (9). +This is the sample rate at which the DAC runs in kS/s (k) or MS/s (M) after hardware interpolation (8). Thus this is the host to device sample rate (10) multiplied by the hardware interpolation factor (8). + +

2B: Baseband sample rate

+ +This is the baseband sample rate in kS/s before interpolation (9) to produce the final stream that is sent to the LimeSDR device. Thus this is the host to device sample rate (10) divided by the software interpolation factor (9). -

3: Frequency

+

3: Center frequency

This is the center frequency of transmission in kHz. +

3A: Center frequency units

+ +This is the center frequency units thus kHz (fixed) +

4: Channel number

LimeSDR is a 2x2 MIMO device so it has two transmitting channels. This shows the corresponding Tx channel index (0 or 1).